Issue #3129 - Add palette_neon_intrinsics.c to moz.build

Issue #3122 - Put base paths in the json viewer client deps.
The dependency modules are requested early. Seems CSP can block baseURL on these networking requests, so add the base manually to the resource paths to prevent network requests before the html base element is resolved and active.
2026-06-23 08:11:16 +02:00 · 2026-06-22 18:54:00 +02:00 · 2026-06-21 14:23:55 +02:00 · 2026-06-21 14:23:47 +02:00 · 2026-06-21 14:23:40 +02:00 · 2026-06-21 14:23:07 +02:00
813 changed files with 46058 additions and 4799 deletions
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.

-Clobber for removal of network tickler
+Clobber for Idle GC backout
@@ -18,6 +18,10 @@
 #endif
 #include <gtk/gtk.h>

+#if (MOZ_WIDGET_GTK == 3)
+extern "C" __attribute__((weak,visibility("default"))) int atk_bridge_adaptor_init(int*, char **[]);
+#endif
+
 using namespace mozilla;
 using namespace mozilla::a11y;

@@ -29,20 +33,12 @@ extern "C" {
 typedef GType (* AtkGetTypeType) (void);
 typedef void (*GnomeAccessibilityInit) (void);
 typedef void (*GnomeAccessibilityShutdown) (void);
-#if (MOZ_WIDGET_GTK == 3)
-typedef int (*AtkBridgeAdaptorInit) (int*, char***);
-#endif
 }

 static PRLibrary* sATKLib = nullptr;
 static const char sATKLibName[] = "libatk-1.0.so.0";
 static const char sATKHyperlinkImplGetTypeSymbol[] =
  "atk_hyperlink_impl_get_type";
-#if (MOZ_WIDGET_GTK == 3)
-static PRLibrary* sAtkBridgeAdaptorLib = nullptr;
-static const char sAtkBridgeAdaptorLibName[] = "libatk-bridge-2.0.so.0";
-static const char sAtkBridgeAdaptorInitSymbol[] = "atk_bridge_adaptor_init";
-#endif

 gboolean toplevel_event_watcher(GSignalInvocationHint*, guint, const GValue*,
                                gpointer);
@@ -131,38 +127,6 @@ LoadGtkModule(GnomeAccessibilityModule& aModule)
    return NS_OK;
 }

-#if (MOZ_WIDGET_GTK == 3)
-static bool
-InitAtkBridgeAdaptor()
-{
-  AtkBridgeAdaptorInit initBridge =
-    reinterpret_cast<AtkBridgeAdaptorInit>(
-      PR_FindFunctionSymbolAndLibrary(sAtkBridgeAdaptorInitSymbol,
-                                      &sAtkBridgeAdaptorLib));
-
-  if (!initBridge) {
-    sAtkBridgeAdaptorLib = PR_LoadLibrary(sAtkBridgeAdaptorLibName);
-    if (sAtkBridgeAdaptorLib) {
-      initBridge =
-        reinterpret_cast<AtkBridgeAdaptorInit>(
-          PR_FindFunctionSymbol(sAtkBridgeAdaptorLib,
-                                sAtkBridgeAdaptorInitSymbol));
-      if (!initBridge) {
-        PR_UnloadLibrary(sAtkBridgeAdaptorLib);
-        sAtkBridgeAdaptorLib = nullptr;
-      }
-    }
-  }
-
-  if (!initBridge) {
-    return false;
-  }
-
-  initBridge(nullptr, nullptr);
-  return true;
-}
-#endif
-
 void
 a11y::PlatformInit()
 {
@@ -217,7 +181,9 @@ a11y::PlatformInit()
  // Init atk-bridge now
  PR_SetEnv("NO_AT_BRIDGE=0");
 #if (MOZ_WIDGET_GTK == 3)
-  if (!InitAtkBridgeAdaptor())
+  if (atk_bridge_adaptor_init) {
+    atk_bridge_adaptor_init(nullptr, nullptr);
+  } else
 #endif
  {
    nsresult rv = LoadGtkModule(sAtkBridge);
@@ -262,13 +228,6 @@ a11y::PlatformShutdown()
        sAtkBridge.init = nullptr;
        sAtkBridge.shutdown = nullptr;
    }
-#if (MOZ_WIDGET_GTK == 3)
-    if (sAtkBridgeAdaptorLib) {
-        // Do not shutdown/unload atk-bridge; an exit function registered by
-        // the bridge will take care of it.
-        sAtkBridgeAdaptorLib = nullptr;
-    }
-#endif
 #if (MOZ_WIDGET_GTK == 2)
    if (sGail.lib) {
        // Do not shutdown gail because
@@ -43,6 +43,8 @@ gyp_vars.update({
    'arm_neon': 0,
    'arm_neon_optional': 1,

+    'moz_webrtc_omx': 0,
+    'moz_webrtc_mediacodec': 0,

    # Turn off multi monitor screen share
    'multi_monitor_screenshare%' : 0,
@@ -344,7 +344,7 @@ def split_triplet(triplet):
    if cpu.endswith('86') or (cpu.startswith('i') and '86' in cpu):
        canonical_cpu = 'x86'
        endianness = 'little'
-    elif cpu == 'x86_64':
+    elif cpu in ('x86_64', 'ia64'):
        canonical_cpu = cpu
        endianness = 'little'
    elif cpu in ('s390', 's390x'):
@@ -164,7 +164,6 @@ def old_configure_options(*options):
    '--enable-negotiateauth',
    '--enable-nfc',
    '--enable-npapi',
-    '--enable-npapi-gtk2',
    '--enable-nspr-build',
    '--enable-official-branding',
    '--enable-official-vendor',
@@ -290,6 +290,11 @@ fi
 if [ -n "$LD_LIBRARY_PATH_64" ]; then
 	LD_LIBRARY_PATH_64=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH_64:+":$LD_LIBRARY_PATH_64"}
 fi
+#
+#
+## Set SHLIB_PATH for HPUX
+SHLIB_PATH=${MOZ_DIST_BIN}:${MRE_HOME}${SHLIB_PATH:+":$SHLIB_PATH"}
+#
 ## Set LIBPATH for AIX
 LIBPATH=${MOZ_DIST_BIN}:${MRE_HOME}${LIBPATH:+":$LIBPATH"}
 #
@@ -334,6 +339,7 @@ then
  fi
  echo "DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH"
  echo "     LIBRARY_PATH=$LIBRARY_PATH"
+  echo "       SHLIB_PATH=$SHLIB_PATH"
  echo "          LIBPATH=$LIBPATH"
  echo "       ADDON_PATH=$ADDON_PATH"
  echo "      MOZ_PROGRAM=$MOZ_PROGRAM"
@@ -344,7 +350,7 @@ then
 fi
 #
 export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
-export LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
+export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH

 if [ $moz_debug -eq 1 ]
 then
@@ -448,6 +448,7 @@ gtk/gtkx.h
 gtk/gtkunixprint.h
 HIToolbox/HIToolbox.h
 hlink.h
+ia64/sys/inline.h
 Icons.h
 iconv.h
 ieeefp.h
@@ -143,8 +143,7 @@ TooltipsOverlay.prototype = {
    // Font preview tooltip
    if (type === VIEW_NODE_VALUE_TYPE && prop.property === "font-family") {
      let value = prop.value.toLowerCase();
-      if (value !== "inherit" && value !== "unset" && value !== "initial" &&
-          value !== "revert" && value !== "revert-layer") {
+      if (value !== "inherit" && value !== "unset" && value !== "initial" && value !== "revert") {
        tooltipType = TOOLTIP_FONTFAMILY_TYPE;
      }
    }
@@ -204,22 +204,21 @@ function initialHTML(doc) {
    os = "linux";
  }

-  // The appRoot URI is prepended to all URIs instead of using a <base> element
-  // because the latter can cause spurious network requests (UXP Issue #3122)
-  let appRoot = "resource://devtools/client/jsonview/";
+  let base = doc.createElement("base");
+  base.href = "resource://devtools/client/jsonview/";

  let style = doc.createElement("link");
  style.rel = "stylesheet";
  style.type = "text/css";
-  style.href = appRoot +"css/main.css";
+  style.href = base.href +"css/main.css";

  let script = doc.createElement("script");
-  script.src = appRoot + "lib/require.js";
-  script.dataset.main = appRoot + "viewer-config.js";
+  script.src = base.href + "lib/require.js";
+  script.dataset.main = "viewer-config";
  script.defer = true;

  let head = doc.createElement("head");
-  head.append(style, script);
+  head.append(base, style, script);

  return "<!DOCTYPE html>\n" +
    startTag("html", {
@@ -4,8 +4,6 @@ subsuite = devtools
 support-files =
  array_json.json
  array_json.json^headers^
-  csp_json.json
-  csp_json.json^headers^
  doc_frame_script.js
  head.js
  invalid_json.json
@@ -24,7 +22,6 @@ subsuite = clipboard
 subsuite = clipboard
 [browser_jsonview_copy_rawdata.js]
 subsuite = clipboard
-[browser_jsonview_csp_json.js]
 [browser_jsonview_filter.js]
 [browser_jsonview_invalid_json.js]
 [browser_jsonview_valid_json.js]
@@ -1,17 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-const TEST_JSON_URL = URL_ROOT + "csp_json.json";
-
-add_task(function* () {
-  info("Test CSP JSON started");
-
-  yield addJsonViewTab(TEST_JSON_URL);
-
-  let count = yield getElementCount(".jsonPanelBox .treeTable .treeRow");
-  is(count, 1, "There must be one row");
-});
@@ -1 +0,0 @@
-{"csp": true}
@@ -1,2 +0,0 @@
-Content-Type: application/json
-Content-Security-Policy: default-src 'none'; base-uri 'none';
@@ -23,7 +23,7 @@
 * of the code base, so it's consistent and modules can be easily reused.
 */
 require.config({
-  baseUrl: "resource://devtools/client/jsonview/",
+  baseUrl: ".",
  paths: {
    "devtools/client/shared": "resource://devtools/client/shared",
    "devtools/shared": "resource://devtools/shared",
@@ -3,6 +3,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/.

-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
    'devtools.js',
 ]
@@ -10,8 +10,7 @@ const SPECIALVALUES = new Set([
  "initial",
  "inherit",
  "unset",
-  "revert",
-  "revert-layer"
+  "revert"
 ]);

 const {getCSSLexer} = require("devtools/shared/css/lexer");
@@ -99,14 +99,7 @@ const filterList = [
 ];

 // Valid values that shouldn't be parsed for filters.
-const SPECIAL_VALUES = new Set([
-  "none",
-  "unset",
-  "initial",
-  "inherit",
-  "revert",
-  "revert-layer"
-]);
+const SPECIAL_VALUES = new Set(["none", "unset", "initial", "inherit", "revert"]);

 /**
 * A CSS Filter editor widget used to add/remove/modify
@@ -20,8 +20,7 @@ const SPECIALVALUES = new Set([
  "inherit",
  "transparent",
  "unset",
-  "revert",
-  "revert-layer"
+  "revert"
 ]);

 /**
@@ -43,7 +43,7 @@ class MachCommands(MachCommandBase):
        if not os.path.exists(generated_dir):
            generated_dir = mozpath.join(self.topsrcdir, 'platform',
                'devtools/shared/css/generated')
-        if not os.path.exists(generated_dir):
+        else:
            raise Exception('Directory expected at %s does not exist.' % generated_dir)
        self.generated_dir = generated_dir

@@ -75,9 +75,6 @@ class MachCommands(MachCommandBase):
        contents = subprocess.check_output([xpcshell_path, '-g', gre_path,
                                            '-a', browser_path, script_path],
                                           env = sub_env)
-        if not isinstance(contents, str):
-            contents = contents.decode('utf-8')
-
        # Extract just the output between the delimiters as the xpcshell output can
        # have extra output that we don't want.
        contents = contents.split('DEVTOOLS_CSS_DB_DELIMITER')[1]
@@ -91,13 +88,13 @@ class MachCommands(MachCommandBase):
        destination_path = mozpath.join(self.generated_dir,
            'properties-db.js')

-        with open(js_template_path, 'r') as handle:
+        with open(js_template_path, 'rb') as handle:
            js_template = handle.read()

        preamble = '/* THIS IS AN AUTOGENERATED FILE.  DO NOT EDIT */\n\n'
        contents = string.Template(js_template).substitute(substitutions)

-        with open(destination_path, 'w') as destination:
+        with open(destination_path, 'wb') as destination:
            destination.write(preamble + contents)

        print(('The database was successfully generated at ' + destination_path))
@@ -274,7 +274,7 @@ public:
    }

    template<typename T,
-             typename = typename std::enable_if_t<std::is_enum_v<T>>>
+             typename = typename std::enable_if<std::is_enum<T>::value>::type>
    EnumTable(const char* aTag, T aValue)
      : tag(aTag)
      , value(static_cast<int16_t>(aValue))
@@ -97,7 +97,7 @@ ToJSValue(JSContext* aCx,
  return true;
 }

-// Accept floating point types
+// accept floating point types
 inline bool
 ToJSValue(JSContext* aCx,
          float aArgument,
@@ -106,7 +106,7 @@ ToJSValue(JSContext* aCx,
  // Make sure we're called in a compartment
  MOZ_ASSERT(JS::CurrentGlobalOrNull(aCx));

-  aValue.set(JS_NumberValue(double(aArgument)));
+  aValue.setNumber(aArgument);
  return true;
 }

@@ -876,12 +876,20 @@ HTMLImageElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
  return HTMLImageElementBinding::Wrap(aCx, this, aGivenProto);
 }

+#ifdef DEBUG
+nsIDOMHTMLFormElement*
+HTMLImageElement::GetForm() const
+{
+  return mForm;
+}
+#endif
+
 void
 HTMLImageElement::SetForm(nsIDOMHTMLFormElement* aForm)
 {
  NS_PRECONDITION(aForm, "Don't pass null here");
-  MOZ_ASSERT(!mForm && !HasFlag(ADDED_TO_FORM),
-             "We don't support switching from one non-null form to another.");
+  NS_ASSERTION(!mForm,
+               "We don't support switching from one non-null form to another.");

  mForm = static_cast<HTMLFormElement*>(aForm);
 }
@@ -216,8 +216,9 @@ public:
    SetHTMLAttr(nsGkAtoms::lowsrc, aLowsrc, aError);
  }

-  HTMLFormElement* GetForm() const { return mForm; };
-
+#ifdef DEBUG
+  nsIDOMHTMLFormElement* GetForm() const;
+#endif
  void SetForm(nsIDOMHTMLFormElement* aForm);
  void ClearForm(bool aRemoveFromForm);

@@ -1487,15 +1487,8 @@ nsGenericHTMLElement::MapImageSizeAttributesInto(const nsMappedAttributes* aAttr
    }

    if (w && h && *w != 0 && *h != 0) {
-      nsCSSValue width;
-      width.SetFloatValue(float(*w), eCSSUnit_Number);
-      nsCSSValue height;
-      height.SetFloatValue(float(*h), eCSSUnit_Number);
-      nsCSSValue ratio;
-      ratio.SetPairValue(width, height);
-      nsCSSValue autoValue;
-      autoValue.SetAutoValue();
-      aData->ValueForAspectRatio()->SetPairValue(autoValue, ratio);
+      nsCSSValue* aspect_ratio = aData->ValueForAspectRatio();
+      aspect_ratio->SetFloatValue((float(*w) / float(*h)), eCSSUnit_Number);
    }
  }
 }
@@ -1831,8 +1824,8 @@ void
 nsGenericHTMLFormElement::SetForm(nsIDOMHTMLFormElement* aForm)
 {
  NS_PRECONDITION(aForm, "Don't pass null here");
-  MOZ_ASSERT(!mForm && !HasFlag(ADDED_TO_FORM),
-             "We don't support switching from one non-null form to another.");
+  NS_ASSERTION(!mForm,
+               "We don't support switching from one non-null form to another.");

  // keep a *weak* ref to the form here
  mForm = static_cast<HTMLFormElement*>(aForm);
@@ -2455,7 +2455,7 @@ ContentChild::RecvUpdateWindow(const uintptr_t& aChildId)
  if (parentInstance) {
  // sync! update call to the plugin instance that forces the
  // plugin to paint its child window.
-  Unused << parentInstance->CallUpdateWindow();
+  parentInstance->CallUpdateWindow();
  }
  return true;
 #else
@@ -367,13 +367,12 @@ public:
  {
  }

-  static const uint32_t MIN_RATE = 8000;
  static const uint32_t MAX_RATE = 640000;

  bool IsValid() const override
  {
    return mChannels > 0 && mChannels <= MAX_AUDIO_CHANNELS
-           && mRate >= MIN_RATE && mRate <= MAX_RATE;
+           && mRate > 0 && mRate <= MAX_RATE;
  }

  AudioInfo* GetAsAudioInfo() override
@@ -179,18 +179,12 @@ IsValidVideoRegion(const nsIntSize& aFrame, const nsIntRect& aPicture,
    aFrame.height <= PlanarYCbCrImage::MAX_DIMENSION &&
    aFrame.width * aFrame.height <= MAX_VIDEO_WIDTH * MAX_VIDEO_HEIGHT &&
    aFrame.width * aFrame.height != 0 &&
-    aPicture.width > 0 &&
    aPicture.width <= PlanarYCbCrImage::MAX_DIMENSION &&
-    aPicture.x >= 0 &&
    aPicture.x < PlanarYCbCrImage::MAX_DIMENSION &&
    aPicture.x + aPicture.width < PlanarYCbCrImage::MAX_DIMENSION &&
-    aPicture.XMost() <= aFrame.width &&
-    aPicture.height > 0 &&
    aPicture.height <= PlanarYCbCrImage::MAX_DIMENSION &&
-    aPicture.y >= 0 &&
    aPicture.y < PlanarYCbCrImage::MAX_DIMENSION &&
    aPicture.y + aPicture.height < PlanarYCbCrImage::MAX_DIMENSION &&
-    aPicture.YMost() <= aFrame.height &&
    aPicture.width * aPicture.height <= MAX_VIDEO_WIDTH * MAX_VIDEO_HEIGHT &&
    aPicture.width * aPicture.height != 0 &&
    aDisplay.width <= PlanarYCbCrImage::MAX_DIMENSION &&
@@ -439,7 +439,7 @@ private:
    Maybe<size_t> mInitOffset;
    Maybe<size_t> mMediaOffset;
    bool mValid = true;
-    char mLastInvalidBox[5]{};
+    char mLastInvalidBox[5];
  };

 public:
@@ -20,7 +20,6 @@
 #include "WebMBufferedParser.h"
 #include "gfx2DGlue.h"
 #include "mozilla/Atomics.h"
-#include "mozilla/CheckedInt.h"
 #include "mozilla/EndianUtils.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/SharedThreadPool.h"
@@ -353,27 +352,19 @@ WebMDemuxer::ReadMetadata()
          mInfo.mVideo.mExtraData = new MediaByteBuffer(length);
          mInfo.mVideo.mExtraData->AppendElements(data, length);
          break;
-        }
+	}
        default:
          NS_WARNING("Unknown WebM video codec");
          return NS_ERROR_FAILURE;
      }
      // Picture region, taking into account cropping, before scaling
      // to the display size.
-      CheckedInt<uint32_t> cropH = CheckedInt<uint32_t>(params.crop_left) + params.crop_right;
-      CheckedInt<uint32_t> cropV = CheckedInt<uint32_t>(params.crop_top) + params.crop_bottom;
-      if (!cropH.isValid() || !cropV.isValid() ||
-          cropH.value() >= params.width || cropV.value() >= params.height) {
-        WEBM_DEBUG("Invalid crop values left: {} right: {} top: {} bottom: {}",
-                   params.crop_left, params.crop_right, params.crop_top,
-                   params.crop_bottom);
-        // Ignore invalid crop parameters.
-        continue;
-      }
+      unsigned int cropH = params.crop_right + params.crop_left;
+      unsigned int cropV = params.crop_bottom + params.crop_top;
      nsIntRect pictureRect(params.crop_left,
                            params.crop_top,
-                            params.width - cropH.value(),
-                            params.height - cropV.value());
+                            params.width - cropH,
+                            params.height - cropV);

      // If the cropping data appears invalid then use the frame data
      if (pictureRect.width <= 0 ||
@@ -29,7 +29,8 @@ enum {
 * Abstract interface for managing audio and video devices. Each platform
 * must implement a concrete class that will map these classes and methods
 * to the appropriate backend. For example, on Desktop platforms, these will
- * correspond to equivalent webrtc (GIPS) calls.
+ * correspond to equivalent webrtc (GIPS) calls, and on B2G they will map to
+ * a Gonk interface.
 */
 class MediaEngineVideoSource;
 class MediaEngineAudioSource;
@@ -301,6 +302,7 @@ public:

  /* If implementation of MediaEngineSource supports TakePhoto(), the picture
   * should be return via aCallback object. Otherwise, it returns NS_ERROR_NOT_IMPLEMENTED.
+   * Currently, only Gonk MediaEngineSource implementation supports it.
   */
  virtual nsresult TakePhoto(MediaEnginePhotoCallback* aCallback) = 0;

@@ -36,8 +36,8 @@ bool MediaEngineCameraVideoSource::AppendToTrack(SourceMediaStream* aSource,
  return aSource->AppendToTrack(aID, &(segment));
 }

-// Subclasses should overload one or both of these methods to provide
-// capabilities.
+// Sub-classes (B2G or desktop) should overload one of both of these two methods
+// to provide capabilities
 size_t
 MediaEngineCameraVideoSource::NumCapabilities() const
 {
@@ -324,6 +324,21 @@ MediaEngineCameraVideoSource::SetName(nsString aName)
  bool hasFacingMode = false;
  VideoFacingModeEnum facingMode = VideoFacingModeEnum::User;

+  // Set facing mode based on device name.
+#if defined(ANDROID)
+  // Names are generated. Example: "Camera 0, Facing back, Orientation 90"
+  //
+  // See media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/
+  // webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
+
+  if (aName.Find(NS_LITERAL_STRING("Facing back")) != kNotFound) {
+    hasFacingMode = true;
+    facingMode = VideoFacingModeEnum::Environment;
+  } else if (aName.Find(NS_LITERAL_STRING("Facing front")) != kNotFound) {
+    hasFacingMode = true;
+    facingMode = VideoFacingModeEnum::User;
+  }
+#endif // ANDROID
 #ifdef XP_MACOSX
  // Kludge to test user-facing cameras on OSX.
  if (aName.Find(NS_LITERAL_STRING("Face")) != -1) {
@@ -108,7 +108,7 @@ protected:
  nsTArray<PrincipalHandle> mPrincipalHandles; // Directly mapped to mSources.
  RefPtr<layers::Image> mImage;
  RefPtr<layers::ImageContainer> mImageContainer;
-  int mWidth, mHeight; // protected with mMonitor
+  int mWidth, mHeight; // protected with mMonitor on Gonk due to different threading
  // end of data protected by mMonitor


@@ -15,7 +15,7 @@
 #ifdef FF
 #undef FF
 #endif
-#include "SingleRwFifo.h"
+#include "webrtc/modules/audio_device/opensl/single_rw_fifo.h"

 #define CHANNELS 1
 #define ENCODING "L16"
@@ -1,99 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "SingleRwFifo.h"
-
-#include <assert.h>
-
-#if defined(_MSC_VER)
-#include <windows.h>
-#endif
-
-static int
-UpdatePos(int pos, int capacity)
-{
-  return (pos + 1) % capacity;
-}
-
-namespace webrtc {
-
-namespace subtle {
-
-#if defined(_MSC_VER)
-inline void
-MemoryBarrier()
-{
-  ::MemoryBarrier();
-}
-#elif defined(__GNUC__) || defined(__clang__)
-inline void
-MemoryBarrier()
-{
-  __sync_synchronize();
-}
-#else
-#error Add an implementation of MemoryBarrier() for this platform!
-#endif
-
-}  // namespace subtle
-
-SingleRwFifo::SingleRwFifo(int capacity)
-  : capacity_(capacity)
-  , size_(0)
-  , read_pos_(0)
-  , write_pos_(0)
-{
-  queue_.reset(new int8_t*[capacity_]);
-}
-
-SingleRwFifo::~SingleRwFifo()
-{
-}
-
-void
-SingleRwFifo::Push(int8_t* mem)
-{
-  assert(mem);
-
-  // Ensure that there is space for the new data in the FIFO. There is only one
-  // writer, so the other thread is guaranteed only to decrease the size.
-  const int free_slots = capacity() - size();
-  if (free_slots <= 0) {
-    // Size can be queried outside of Push. The caller is expected to ensure
-    // that Push will be successful before calling it.
-    assert(false);
-    return;
-  }
-  queue_[write_pos_] = mem;
-  // Ensure that |size_| is updated after the stored pointer is visible.
-  subtle::MemoryBarrier();
-  ++size_;
-  write_pos_ = UpdatePos(write_pos_, capacity());
-}
-
-int8_t*
-SingleRwFifo::Pop()
-{
-  int8_t* ret_val = nullptr;
-  if (size() <= 0) {
-    // Size can be queried outside of Pop. The caller is expected to ensure
-    // that Pop will be successful before calling it.
-    assert(false);
-    return ret_val;
-  }
-  ret_val = queue_[read_pos_];
-  // Ensure that |size_| is updated after the stored pointer is read.
-  subtle::MemoryBarrier();
-  --size_;
-  read_pos_ = UpdatePos(read_pos_, capacity());
-  return ret_val;
-}
-
-}  // namespace webrtc
@@ -38,7 +38,6 @@ if CONFIG['MOZ_WEBRTC']:
    # MediaEngineWebRTC.cpp needs to be built separately.
    SOURCES += [
        'MediaEngineWebRTC.cpp',
-        'SingleRwFifo.cpp',
    ]
    LOCAL_INCLUDES += [
        '/dom/base',
@@ -69,7 +68,8 @@ include('/ipc/chromium/chromium-config.mozbuild')

 # Suppress some GCC/clang warnings being treated as errors:
 #  - about attributes on forward declarations for types that are already
-#    defined, which complains about important MOZ_EXPORT attributes.
+#    defined, which complains about important MOZ_EXPORT attributes for
+#    android API types
 if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
    CXXFLAGS += [
        '-Wno-error=attributes',
@@ -194,7 +194,7 @@ static void FreeStringArray(uint32_t variants, char ** array)

 static bool CanLoadPlugin(char16ptr_t aBinaryPath)
 {
-#if defined(_M_IX86) || defined(_M_X64)
+#if defined(_M_IX86) || defined(_M_X64) || defined(_M_IA64)
  bool canLoad = false;

  HANDLE file = CreateFileW(aBinaryPath, GENERIC_READ,
@@ -214,6 +214,8 @@ static bool CanLoadPlugin(char16ptr_t aBinaryPath)
            canLoad = (arch == IMAGE_FILE_MACHINE_I386);
 #elif defined(_M_X64)
            canLoad = (arch == IMAGE_FILE_MACHINE_AMD64);
+#elif defined(_M_IA64)
+            canLoad = (arch == IMAGE_FILE_MACHINE_IA64);
 #endif
          }
        }
@@ -55,12 +55,7 @@ using namespace std;
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdk.h>
-#if (GTK_MAJOR_VERSION == 3)
-#include <gtk/gtkx.h>
-#endif
-#ifdef MOZ_ENABLE_NPAPI_GTK2
 #include "gtk2xtbin.h"
-#endif

 #elif defined(OS_WIN)

@@ -213,9 +208,7 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface,
    memset(&mWsInfo, 0, sizeof(mWsInfo));
 #ifdef MOZ_WIDGET_GTK
    mWsInfo.display = nullptr;
-#ifdef MOZ_ENABLE_NPAPI_GTK2
    mXtClient.top_widget = nullptr;
-#endif
 #else
    mWsInfo.display = DefaultXDisplay();
 #endif
@@ -627,17 +620,15 @@ PluginInstanceChild::NPN_SetValue(NPPVariable aVar, void* aValue)
        NPWindowType newWindowType = windowed ? NPWindowTypeWindow : NPWindowTypeDrawable;
 #ifdef MOZ_WIDGET_GTK
        if (mWindow.type != newWindowType && mWsInfo.display) {
-            // plugin type has been changed but we already have a valid display
-            // so update it for the recent plugin mode
-#ifdef MOZ_ENABLE_NPAPI_GTK2
-            if (!mXEmbed && windowed) {
-                mWsInfo.display = xt_client_get_display();
-            } else
-#endif
-            {
-                // Use default GTK display for XEmbed and windowless plugins.
-                mWsInfo.display = DefaultXDisplay();
-            }
+           // plugin type has been changed but we already have a valid display
+           // so update it for the recent plugin mode
+           if (mXEmbed || !windowed) {
+               // Use default GTK display for XEmbed and windowless plugins
+               mWsInfo.display = DefaultXDisplay();
+           }
+           else {
+               mWsInfo.display = xt_client_get_display();
+           }
        }
 #endif
        mWindow.type = newWindowType;
@@ -1223,18 +1214,12 @@ bool PluginInstanceChild::CreateWindow(const NPRemoteWindow& aWindow)
    if (mXEmbed) {
        mWindow.window = reinterpret_cast<void*>(aWindow.window);
    }
-#ifdef MOZ_ENABLE_NPAPI_GTK2
    else {
        Window browserSocket = (Window)(aWindow.window);
        xt_client_init(&mXtClient, mWsInfo.visual, mWsInfo.colormap, mWsInfo.depth);
        xt_client_create(&mXtClient, browserSocket, mWindow.width, mWindow.height); 
        mWindow.window = (void *)XtWindow(mXtClient.child_widget);
-    }
-#else
-    else {
-        mWindow.window = reinterpret_cast<void*>(aWindow.window);
-    }
-#endif
+    }  
 #else
    mWindow.window = reinterpret_cast<void*>(aWindow.window);
 #endif
@@ -1254,7 +1239,7 @@ void PluginInstanceChild::DeleteWindow()
  if (!mWindow.window)
      return;

-#ifdef MOZ_ENABLE_NPAPI_GTK2
+#ifdef MOZ_WIDGET_GTK
  if (mXtClient.top_widget) {     
      xt_client_unrealize(&mXtClient);
      xt_client_destroy(&mXtClient); 
@@ -1336,7 +1321,7 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPRemoteWindow& aWindow)
        CreateWindow(aWindow);
    }

-#ifdef MOZ_ENABLE_NPAPI_GTK2
+#ifdef MOZ_WIDGET_GTK
    if (mXEmbed && gtk_check_version(2,18,7) != nullptr) { // older
        if (aWindow.type == NPWindowTypeWindow) {
            GdkWindow* socket_window = gdk_window_lookup(static_cast<GdkNativeWindow>(aWindow.window));
@@ -1471,27 +1456,19 @@ PluginInstanceChild::Initialize()
    if (mWindow.type == NPWindowTypeWindow) {
        AnswerNPP_GetValue_NPPVpluginNeedsXEmbed(&mXEmbed, &rv);

-#ifdef MOZ_ENABLE_NPAPI_GTK2
        // Set up Xt loop for windowed plugins without XEmbed support
        if (!mXEmbed) {
           xt_client_xloop_create();
        }
-#endif
    }

-    // Use default GTK display for XEmbed and windowless plugins.
+    // Use default GTK display for XEmbed and windowless plugins
    if (mXEmbed || mWindow.type != NPWindowTypeWindow) {
        mWsInfo.display = DefaultXDisplay();
    }
-#ifdef MOZ_ENABLE_NPAPI_GTK2
    else {
        mWsInfo.display = xt_client_get_display();
    }
-#else
-    else {
-        mWsInfo.display = DefaultXDisplay();
-    }
-#endif
 #endif 

    return true;
@@ -4679,7 +4656,7 @@ PluginInstanceChild::Destroy()

    mPendingAsyncCalls.Clear();
    
-#if defined(MOZ_WIDGET_GTK) && defined(MOZ_ENABLE_NPAPI_GTK2)
+#ifdef MOZ_WIDGET_GTK
    if (mWindow.type == NPWindowTypeWindow && !mXEmbed) {
      xt_client_xloop_destroy();
    }
@@ -36,7 +36,7 @@

 #include <map>

-#if defined(MOZ_WIDGET_GTK) && defined(MOZ_ENABLE_NPAPI_GTK2)
+#ifdef MOZ_WIDGET_GTK
 #include "gtk2xtbin.h"
 #endif

@@ -462,8 +462,6 @@ private:
    NPSetWindowCallbackStruct mWsInfo;
 #ifdef MOZ_WIDGET_GTK
    bool mXEmbed;
-#endif
-#ifdef MOZ_ENABLE_NPAPI_GTK2
    XtClient mXtClient;
 #endif
 #elif defined(OS_WIN)
@@ -12,9 +12,6 @@

 #ifdef MOZ_WIDGET_GTK
 #include <gtk/gtk.h>
-#if (GTK_MAJOR_VERSION == 3)
-#include <gtk/gtkx.h>
-#endif
 #endif

 #include "nsIFile.h"
@@ -1104,11 +1101,7 @@ _getvalue(NPP aNPP,
                return InstCast(aNPP)->NPN_GetValue(aVariable, aValue);
            } 
            else {
-#ifdef MOZ_ENABLE_NPAPI_GTK2
                *(void **)aValue = xt_client_get_display();
-#else
-                *(void **)aValue = DefaultXDisplay();
-#endif
            }          
            return NPERR_NO_ERROR;
        }
@@ -143,13 +143,11 @@ LOCAL_INCLUDES += [

 DEFINES['FORCE_PR_LOG'] = True

-if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3' and
-        CONFIG['MOZ_ENABLE_NPAPI'] and
-        CONFIG['MOZ_ENABLE_NPAPI_GTK2']):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gtk3':
+    CXXFLAGS += CONFIG['TK_CFLAGS']
+else:
    # Force build against gtk+2 for struct offsets and such.
    CXXFLAGS += CONFIG['MOZ_GTK2_CFLAGS']
-else:
-    CXXFLAGS += CONFIG['TK_CFLAGS']

 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

@@ -1789,26 +1789,17 @@ URL::IsValidURL(const GlobalObject& aGlobal, const nsAString& aURL,
  return URLWorker::IsValidURL(aGlobal, aURL, aRv);
 }

-already_AddRefed<URL>
-URL::Parse(const GlobalObject& aGlobal, const nsAString& aURL,
-           const Optional<nsAString>& aBase)
-{
+bool
+URL::CanParse(const GlobalObject& aGlobal, const nsAString& aURL,
+              const Optional<nsAString>& aBase) {
  ErrorResult rv;
  RefPtr<URL> parsed = URL::Constructor(aGlobal, aURL, aBase, rv);
  if (rv.Failed() || !parsed) {
    rv.SuppressException();
-    return nullptr;
+    return false;
  }

-  return parsed.forget();
-}
-
-bool
-URL::CanParse(const GlobalObject& aGlobal, const nsAString& aURL,
-              const Optional<nsAString>& aBase)
-{
-  RefPtr<URL> parsed = URL::Parse(aGlobal, aURL, aBase);
-  return !!parsed;
+  return true;
 }

 already_AddRefed<URLSearchParams>
@@ -88,10 +88,6 @@ public:
  IsValidURL(const GlobalObject& aGlobal, const nsAString& aURL,
             ErrorResult& aRv);

-  static already_AddRefed<URL>
-  Parse(const GlobalObject& aGlobal, const nsAString& aURL,
-        const Optional<nsAString>& aBase);
-
  static bool
  CanParse(const GlobalObject& aGlobal, const nsAString& aURL,
           const Optional<nsAString>& aBase);
@@ -448,34 +448,6 @@
                !URL.canParse("/static/client/runtime.js", "mailto:test@example.com"),
                "URL.canParse rejects root-relative input against opaque mailto: base",
            );
-            ok("parse" in URL, "URL.parse exists");
-            is(URL.parse.length, 1, "URL.parse has one required argument");
-            var parsed = URL.parse("/static/client/runtime.js", "x:/");
-            ok(parsed instanceof URL, "URL.parse returns a URL object on success");
-            is(parsed.href, "x:/static/client/runtime.js", "URL.parse resolves against a base");
-            is(URL.parse("/static/client/runtime.js"), null, "URL.parse returns null for invalid input");
-            is(
-                URL.parse("/static/client/runtime.js", "mailto:test@example.com"),
-                null,
-                "URL.parse returns null for an invalid base/input combination",
-            );
-
-            var conversionOrder = [];
-            parsed = URL.parse(
-                { toString: function() { conversionOrder.push("url"); return "child"; } },
-                { toString: function() { conversionOrder.push("base"); return "https://example.com/root/"; } },
-            );
-            is(conversionOrder.join(","), "url,base", "URL.parse converts its arguments in order");
-            is(parsed.href, "https://example.com/root/child", "URL.parse uses converted arguments");
-
-            var sentinel = {};
-            var thrown;
-            try {
-                URL.parse({ toString: function() { throw sentinel; } });
-            } catch (e) {
-                thrown = e;
-            }
-            is(thrown, sentinel, "URL.parse propagates argument conversion exceptions");
            SimpleTest.doesThrow(() => {
                new URL("/static/client/runtime.js", "mailto:test@example.com");
            }, "constructor rejects root-relative input against opaque mailto: base");
@@ -301,64 +301,6 @@ onmessage = function () {
    !URL.canParse("/static/client/runtime.js", "mailto:test@example.com"),
    "URL.canParse rejects root-relative input against opaque mailto: base",
  );
-  ok("parse" in URL, "URL.parse exists");
-  is(URL.parse.length, 1, "URL.parse has one required argument");
-  let parsed = URL.parse("/static/client/runtime.js", "x:/");
-  ok(parsed instanceof URL, "URL.parse returns a URL object on success");
-  is(
-    parsed.href,
-    "x:/static/client/runtime.js",
-    "URL.parse resolves against a base",
-  );
-  is(
-    URL.parse("/static/client/runtime.js"),
-    null,
-    "URL.parse returns null for invalid input",
-  );
-  is(
-    URL.parse("/static/client/runtime.js", "mailto:test@example.com"),
-    null,
-    "URL.parse returns null for an invalid base/input combination",
-  );
-
-  const conversionOrder = [];
-  parsed = URL.parse(
-    {
-      toString() {
-        conversionOrder.push("url");
-        return "child";
-      },
-    },
-    {
-      toString() {
-        conversionOrder.push("base");
-        return "https://example.com/root/";
-      },
-    },
-  );
-  is(
-    conversionOrder.join(","),
-    "url,base",
-    "URL.parse converts its arguments in order",
-  );
-  is(
-    parsed.href,
-    "https://example.com/root/child",
-    "URL.parse uses converted arguments",
-  );
-
-  const sentinel = {};
-  let thrown;
-  try {
-    URL.parse({
-      toString() {
-        throw sentinel;
-      },
-    });
-  } catch (e) {
-    thrown = e;
-  }
-  is(thrown, sentinel, "URL.parse propagates argument conversion exceptions");
  let mailtoRelativeFailed = false;
  try {
    new URL("/static/client/runtime.js", "mailto:test@example.com");
@@ -25,8 +25,6 @@ interface CSSStyleSheet : StyleSheet {
  unsigned long insertRule(DOMString rule, optional unsigned long index = 0);
  [Throws, NeedsSubjectPrincipal]
  void deleteRule(unsigned long index);
-  [Throws]
-  void replaceSync(DOMString text);

  // Non-standard WebKit things, see https://github.com/w3c/csswg-drafts/pull/3900.
  [Throws, NeedsSubjectPrincipal, BinaryName="cssRules"]
@@ -23,7 +23,6 @@ interface URL {
  [Throws]
  stringifier;
  
-  static URL? parse(USVString url, optional USVString base);
  static boolean canParse(USVString url, optional USVString base);

  [Throws]
@@ -301,7 +301,6 @@ LoadContextOptions(const char* aPrefName, void* /* aClosure */)
                .setAsyncStack(GetWorkerPref<bool>(NS_LITERAL_CSTRING("asyncstack")))
                .setWerror(GetWorkerPref<bool>(NS_LITERAL_CSTRING("werror")))
                .setStreams(GetWorkerPref<bool>(NS_LITERAL_CSTRING("streams")))
-                .setWeakRefs(GetWorkerPref<bool>(NS_LITERAL_CSTRING("weakrefs")))
                .setExtraWarnings(GetWorkerPref<bool>(NS_LITERAL_CSTRING("strict")))
                .setArrayProtoValues(GetWorkerPref<bool>(
                      NS_LITERAL_CSTRING("array_prototype_values")));
@@ -35,7 +35,6 @@ WORKER_SIMPLE_PREF("dom.serviceWorkers.openWindow.enabled", OpenWindowEnabled, O
 WORKER_SIMPLE_PREF("dom.storageManager.enabled", StorageManagerEnabled, STORAGEMANAGER_ENABLED)
 WORKER_SIMPLE_PREF("dom.push.enabled", PushEnabled, PUSH_ENABLED)
 WORKER_SIMPLE_PREF("dom.streams.enabled", StreamsEnabled, STREAMS_ENABLED)
-WORKER_SIMPLE_PREF("javascript.options.weakrefs", WeakRefsEnabled, WEAKREFS_ENABLED)
 WORKER_SIMPLE_PREF("dom.requestcontext.enabled", RequestContextEnabled, REQUESTCONTEXT_ENABLED)
 WORKER_SIMPLE_PREF("gfx.offscreencanvas.enabled", OffscreenCanvasEnabled, OFFSCREENCANVAS_ENABLED)
 WORKER_SIMPLE_PREF("dom.webkitBlink.dirPicker.enabled", WebkitBlinkDirectoryPickerEnabled, DOM_WEBKITBLINK_DIRPICKER_WEBKITBLINK)
@@ -1117,7 +1117,6 @@ DrawTargetSkia::BorrowCGContext(const DrawOptions &aOptions)
                        kCGImageAlphaOnly :
                        kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host;

-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
  mCG = CGBitmapContextCreateWithData(mCanvasData,
                                      mCGSize.width,
                                      mCGSize.height,
@@ -1127,15 +1126,6 @@ DrawTargetSkia::BorrowCGContext(const DrawOptions &aOptions)
                                      bitmapInfo,
                                      NULL, /* Callback when released */
                                      NULL);
-#else
-  mCG = CGBitmapContextCreate(mCanvasData,
-                              mCGSize.width,
-                              mCGSize.height,
-                              8, /* bits per component */
-                              stride,
-                              mColorSpace,
-                              bitmapInfo);
-#endif
  if (!mCG) {
    ReleaseBits(mCanvasData);
    NS_WARNING("Could not create bitmap around skia data\n");
@@ -115,7 +115,7 @@ ScaledFontMac::GetPathForGlyphs(const GlyphBuffer &aBuffer, const DrawTarget *aT
  return ScaledFontBase::GetPathForGlyphs(aBuffer, aTarget);
 }

-#ifndef USE_SKIA
+#if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)
 void
 ScaledFontMac::CopyGlyphsToBuilder(const GlyphBuffer &aBuffer, PathBuilder *aBuilder, const Matrix *aTransformHint)
 {
@@ -32,7 +32,7 @@ public:
  virtual SkTypeface* GetSkTypeface();
 #endif
  virtual already_AddRefed<Path> GetPathForGlyphs(const GlyphBuffer &aBuffer, const DrawTarget *aTarget);
-#ifndef USE_SKIA
+#if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)
  virtual void CopyGlyphsToBuilder(const GlyphBuffer &aBuffer, PathBuilder *aBuilder, const Matrix *aTransformHint);
 #endif
  virtual bool GetFontFileData(FontFileDataOutput aDataCallback, void *aBaton);
@@ -24,21 +24,15 @@
 *  Skia's 32bit backend only supports 1 sizzle order at a time (compile-time).
 *  This is specified by 4 defines SK_A32_SHIFT, SK_R32_SHIFT, ... for G and B.
 *
- *  For easier compatibility with Skia's GPU backend, Skia normally restricts
- *  these to either (in memory-byte-order) RGBA or BGRA. Mozilla's big-endian
- *  PowerPC port uses CoreGraphics' native ARGB pixels, so we also accept ARGB.
- *  Note that this "order" does not directly correspond to the same shift-order,
- *  since we have to take endianess into account.
+ *  For easier compatibility with Skia's GPU backend, we further restrict these
+ *  to either (in memory-byte-order) RGBA or BGRA. Note that this "order" does
+ *  not directly correspond to the same shift-order, since we have to take endianess
+ *  into account.
 *
 *  Here we enforce this constraint.
 */

 #ifdef SK_CPU_BENDIAN
-    #define SK_ARGB_A32_SHIFT   24
-    #define SK_ARGB_R32_SHIFT   16
-    #define SK_ARGB_G32_SHIFT   8
-    #define SK_ARGB_B32_SHIFT   0
-
    #define SK_RGBA_R32_SHIFT   24
    #define SK_RGBA_G32_SHIFT   16
    #define SK_RGBA_B32_SHIFT   8
@@ -49,11 +43,6 @@
    #define SK_BGRA_R32_SHIFT   8
    #define SK_BGRA_A32_SHIFT   0
 #else
-    #define SK_ARGB_A32_SHIFT   0
-    #define SK_ARGB_R32_SHIFT   8
-    #define SK_ARGB_G32_SHIFT   16
-    #define SK_ARGB_B32_SHIFT   24
-
    #define SK_RGBA_R32_SHIFT   0
    #define SK_RGBA_G32_SHIFT   8
    #define SK_RGBA_B32_SHIFT   16
@@ -65,18 +54,10 @@
    #define SK_BGRA_A32_SHIFT   24
 #endif

-#if (defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)) || \
-    (defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_ARGB)) || \
-    (defined(SK_PMCOLOR_IS_BGRA) && defined(SK_PMCOLOR_IS_ARGB))
-    #error "can't define PMCOLOR to more than one byte order"
+#if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
+    #error "can't define PMCOLOR to be RGBA and BGRA"
 #endif

-#define LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_ARGB  \
-    (SK_A32_SHIFT == SK_ARGB_A32_SHIFT &&    \
-     SK_R32_SHIFT == SK_ARGB_R32_SHIFT &&    \
-     SK_G32_SHIFT == SK_ARGB_G32_SHIFT &&    \
-     SK_B32_SHIFT == SK_ARGB_B32_SHIFT)
-
 #define LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA  \
    (SK_A32_SHIFT == SK_RGBA_A32_SHIFT &&    \
     SK_R32_SHIFT == SK_RGBA_R32_SHIFT &&    \
@@ -95,10 +76,6 @@
 #define SK_G_INDEX  (SK_G32_SHIFT/8)
 #define SK_B_INDEX  (SK_B32_SHIFT/8)

-#if defined(SK_PMCOLOR_IS_ARGB) && !LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_ARGB
-    #error "SK_PMCOLOR_IS_ARGB does not match SK_*32_SHIFT values"
-#endif
-
 #if defined(SK_PMCOLOR_IS_RGBA) && !LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA
    #error "SK_PMCOLOR_IS_RGBA does not match SK_*32_SHIFT values"
 #endif
@@ -107,22 +84,19 @@
    #error "SK_PMCOLOR_IS_BGRA does not match SK_*32_SHIFT values"
 #endif

-#if !defined(SK_PMCOLOR_IS_ARGB) && !defined(SK_PMCOLOR_IS_RGBA) && !defined(SK_PMCOLOR_IS_BGRA)
+#if !defined(SK_PMCOLOR_IS_RGBA) && !defined(SK_PMCOLOR_IS_BGRA)
    // deduce which to define from the _SHIFT defines

-    #if LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_ARGB
-        #define SK_PMCOLOR_IS_ARGB
-    #elif LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA
+    #if LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA
        #define SK_PMCOLOR_IS_RGBA
    #elif LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_BGRA
        #define SK_PMCOLOR_IS_BGRA
    #else
-        #error "need 32bit packing to be either ARGB, RGBA, or BGRA"
+        #error "need 32bit packing to be either RGBA or BGRA"
    #endif
 #endif

 // hide these now that we're done
-#undef LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_ARGB
 #undef LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA
 #undef LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_BGRA

@@ -157,38 +131,19 @@ static inline uint32_t SkPackARGB_as_BGRA(U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
           (g << SK_BGRA_G32_SHIFT) | (b << SK_BGRA_B32_SHIFT);
 }

-static inline SkPMColor SkPackARGB_as_PMColor(U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
-    SkASSERT_IS_BYTE(a);
-    SkASSERT_IS_BYTE(r);
-    SkASSERT_IS_BYTE(g);
-    SkASSERT_IS_BYTE(b);
-    return (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
-           (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
-}
-
 static inline SkPMColor SkSwizzle_RGBA_to_PMColor(uint32_t c) {
 #ifdef SK_PMCOLOR_IS_RGBA
    return c;
-#elif defined(SK_PMCOLOR_IS_BGRA)
-    return SkSwizzle_RB(c);
 #else
-    return SkPackARGB_as_PMColor((c >> SK_RGBA_A32_SHIFT) & 0xFF,
-                                 (c >> SK_RGBA_R32_SHIFT) & 0xFF,
-                                 (c >> SK_RGBA_G32_SHIFT) & 0xFF,
-                                 (c >> SK_RGBA_B32_SHIFT) & 0xFF);
+    return SkSwizzle_RB(c);
 #endif
 }

 static inline SkPMColor SkSwizzle_BGRA_to_PMColor(uint32_t c) {
 #ifdef SK_PMCOLOR_IS_BGRA
    return c;
-#elif defined(SK_PMCOLOR_IS_RGBA)
-    return SkSwizzle_RB(c);
 #else
-    return SkPackARGB_as_PMColor((c >> SK_BGRA_A32_SHIFT) & 0xFF,
-                                 (c >> SK_BGRA_R32_SHIFT) & 0xFF,
-                                 (c >> SK_BGRA_G32_SHIFT) & 0xFF,
-                                 (c >> SK_BGRA_B32_SHIFT) & 0xFF);
+    return SkSwizzle_RB(c);
 #endif
 }

@@ -457,7 +412,8 @@ static inline SkPMColor SkPackARGB32(U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
    SkASSERT(g <= a);
    SkASSERT(b <= a);

-    return SkPackARGB_as_PMColor(a, r, g, b);
+    return (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
+           (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
 }

 static inline uint32_t SkPackPMColor_as_RGBA(SkPMColor c) {
@@ -591,7 +547,8 @@ static inline SkPMColor SkFastFourByteInterp(SkPMColor src,
 *  values are premultiplied in the debug version.
 */
 static inline SkPMColor SkPackARGB32NoCheck(U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
-    return SkPackARGB_as_PMColor(a, r, g, b);
+    return (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
+           (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
 }

 static inline
@@ -82,13 +82,8 @@ enum SkColorType {
    kN32_SkColorType = kBGRA_8888_SkColorType,
 #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
    kN32_SkColorType = kRGBA_8888_SkColorType,
-#elif defined(MOZ_SKIA) && SK_PMCOLOR_BYTE_ORDER(A,R,G,B)
-    // Big-endian PowerPC Mozilla surfaces use native uint32 ARGB memory.
-    // Moz2D's legacy A8R8G8B8_UINT32 format aliases to B8G8R8A8, so keep
-    // kN32 on Skia's BGRA path while the channel shifts above describe ARGB.
-    kN32_SkColorType = kBGRA_8888_SkColorType,
 #else
-    #error "SK_*32_SHIFT values must correspond to BGRA, RGBA, or Mozilla ARGB byte order"
+    #error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
 #endif
 };

@@ -275,19 +275,17 @@ enum GrPixelConfig {
 static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;

 // Aliases for pixel configs that match skia's byte order.
+#ifndef SK_CPU_LENDIAN
+    #error "Skia gpu currently assumes little endian"
+#endif
 #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
    static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
    static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSBGRA_8888_GrPixelConfig;
 #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
    static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig;
    static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSRGBA_8888_GrPixelConfig;
-#elif defined(MOZ_SKIA) && SK_PMCOLOR_BYTE_ORDER(A,R,G,B)
-    // Mozilla's big-endian PowerPC path stores native 32-bit pixels as ARGB,
-    // while Moz2D routes those surfaces through Skia's BGRA color type.
-    static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
-    static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSBGRA_8888_GrPixelConfig;
 #else
-    #error "SK_*32_SHIFT values must correspond to GL_BGRA, GL_RGBA, or Mozilla ARGB format."
+    #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format."
 #endif

 // Returns true if the pixel config is a GPU-specific compressed format
@@ -306,11 +306,7 @@ static inline SkPMColor premultiply_argb_as_bgra(U8CPU a, U8CPU r, U8CPU g, U8CP
        b = SkMulDiv255Round(b, a);
    }

-#ifdef SK_PMCOLOR_IS_ARGB
-    return SkPackARGB_as_PMColor(a, r, g, b);
-#else
    return SkPackARGB_as_BGRA(a, r, g, b);
-#endif
 }

 static inline bool is_rgba(SkColorType colorType) {
@@ -51,16 +51,10 @@ struct SkPM4f {
    Sk4f to4f_pmorder() const { return swizzle_rb_if_bgra(this->to4f()); }

    SkPMColor toPMColor() const {
-#ifdef SK_PMCOLOR_IS_ARGB
-        Sk4f value = this->to4f();
-        Sk4b bytes = SkNx_cast<uint8_t>(value * Sk4f(255) + Sk4f(0.5f));
-        return SkPackARGB_as_PMColor(bytes[3], bytes[0], bytes[1], bytes[2]);
-#else
        Sk4f value = swizzle_rb_if_bgra(this->to4f());
        SkPMColor result;
        SkNx_cast<uint8_t>(value * Sk4f(255) + Sk4f(0.5f)).store(&result);
        return result;
-#endif
    }

    void toF16(uint16_t[4]) const;
@@ -22,50 +22,29 @@ static inline float get_alpha(const Sk4f& px) {


 static inline Sk4f Sk4f_fromL32(uint32_t px) {
-#ifdef SK_PMCOLOR_IS_ARGB
-    return Sk4f(SkGetPackedR32(px), SkGetPackedG32(px),
-                SkGetPackedB32(px), SkGetPackedA32(px)) * (1/255.0f);
-#else
    return SkNx_cast<float>(Sk4b::Load(&px)) * (1/255.0f);
-#endif
 }

 static inline Sk4f Sk4f_fromS32(uint32_t px) {
-#ifdef SK_PMCOLOR_IS_ARGB
-    return { sk_linear_from_srgb[SkGetPackedR32(px)],
-             sk_linear_from_srgb[SkGetPackedG32(px)],
-             sk_linear_from_srgb[SkGetPackedB32(px)],
-                    (1/255.0f) * SkGetPackedA32(px) };
-#else
    return { sk_linear_from_srgb[(px >>  0) & 0xff],
             sk_linear_from_srgb[(px >>  8) & 0xff],
             sk_linear_from_srgb[(px >> 16) & 0xff],
                    (1/255.0f) * (px >> 24)          };
-#endif
 }

 static inline uint32_t Sk4f_toL32(const Sk4f& px) {
-#ifdef SK_PMCOLOR_IS_ARGB
-    Sk4b bytes = SkNx_cast<uint8_t>(Sk4f_round(px * 255.0f));
-    return SkPackARGB_as_PMColor(bytes[3], bytes[0], bytes[1], bytes[2]);
-#else
    uint32_t l32;
    SkNx_cast<uint8_t>(Sk4f_round(px * 255.0f)).store(&l32);
    return l32;
-#endif
 }

 static inline uint32_t Sk4f_toS32(const Sk4f& px) {
    Sk4i  rgb = sk_linear_to_srgb(px),
         srgb = { rgb[0], rgb[1], rgb[2], (int)(255.0f * px[3] + 0.5f) };

-#ifdef SK_PMCOLOR_IS_ARGB
-    return SkPackARGB_as_PMColor(srgb[3], srgb[0], srgb[1], srgb[2]);
-#else
    uint32_t s32;
    SkNx_cast<uint8_t>(srgb).store(&s32);
    return s32;
-#endif
 }


@@ -121,10 +121,9 @@ SkDEBUGCODE(static const unsigned kRunRecordMagic = 0xb10bcafe;)
 namespace {
 struct RunRecordStorageEquivalent {
    RunFont  fFont;
-    uint32_t fCount;
    SkPoint  fOffset;
-    SkTextBlob::GlyphPositioning fPositioning;
-    bool     fExtended;
+    uint32_t fCount;
+    uint32_t fFlags;
    SkDEBUGCODE(unsigned fMagic;)
 };
 }
@@ -44,25 +44,6 @@ static Sk4x4f load_4_srgb(const void* vptr) {

    Sk4x4f rgba;

-#ifdef SK_PMCOLOR_IS_ARGB
-    rgba.r = { sk_linear_from_srgb[SkGetPackedR32(ptr[0])],
-               sk_linear_from_srgb[SkGetPackedR32(ptr[1])],
-               sk_linear_from_srgb[SkGetPackedR32(ptr[2])],
-               sk_linear_from_srgb[SkGetPackedR32(ptr[3])] };
-
-    rgba.g = { sk_linear_from_srgb[SkGetPackedG32(ptr[0])],
-               sk_linear_from_srgb[SkGetPackedG32(ptr[1])],
-               sk_linear_from_srgb[SkGetPackedG32(ptr[2])],
-               sk_linear_from_srgb[SkGetPackedG32(ptr[3])] };
-
-    rgba.b = { sk_linear_from_srgb[SkGetPackedB32(ptr[0])],
-               sk_linear_from_srgb[SkGetPackedB32(ptr[1])],
-               sk_linear_from_srgb[SkGetPackedB32(ptr[2])],
-               sk_linear_from_srgb[SkGetPackedB32(ptr[3])] };
-
-    rgba.a = SkNx_cast<float>(Sk4i(SkGetPackedA32(ptr[0]), SkGetPackedA32(ptr[1]),
-                                   SkGetPackedA32(ptr[2]), SkGetPackedA32(ptr[3]))) * (1/255.0f);
-#else
    rgba.r = { sk_linear_from_srgb[(ptr[0] >>  0) & 0xff],
               sk_linear_from_srgb[(ptr[1] >>  0) & 0xff],
               sk_linear_from_srgb[(ptr[2] >>  0) & 0xff],
@@ -79,28 +60,15 @@ static Sk4x4f load_4_srgb(const void* vptr) {
               sk_linear_from_srgb[(ptr[3] >> 16) & 0xff] };

    rgba.a = SkNx_cast<float>((Sk4i::Load(ptr) >> 24) & 0xff) * (1/255.0f);
-#endif

    return rgba;
 }

 static void store_4_srgb(void* ptr, const Sk4x4f& p) {
-#ifdef SK_PMCOLOR_IS_ARGB
-    uint32_t* dst = (uint32_t*)ptr;
-    Sk4i r = sk_linear_to_srgb(p.r);
-    Sk4i g = sk_linear_to_srgb(p.g);
-    Sk4i b = sk_linear_to_srgb(p.b);
-    Sk4i a = Sk4f_round(255.0f*p.a);
-    dst[0] = SkPackARGB_as_PMColor(a[0], r[0], g[0], b[0]);
-    dst[1] = SkPackARGB_as_PMColor(a[1], r[1], g[1], b[1]);
-    dst[2] = SkPackARGB_as_PMColor(a[2], r[2], g[2], b[2]);
-    dst[3] = SkPackARGB_as_PMColor(a[3], r[3], g[3], b[3]);
-#else
    ( sk_linear_to_srgb(p.r) <<  0
    | sk_linear_to_srgb(p.g) <<  8
    | sk_linear_to_srgb(p.b) << 16
    | Sk4f_round(255.0f*p.a) << 24).store(ptr);
-#endif
 }

 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -423,7 +391,7 @@ SkXfermode::D32Proc SkXfermode::GetD32Proc(SkXfermode* xfer, uint32_t flags) {
 #include "SkColorPriv.h"

 static Sk4f lcd16_to_unit_4f(uint16_t rgb) {
-#if defined(SK_PMCOLOR_IS_RGBA) || defined(SK_PMCOLOR_IS_ARGB)
+#ifdef SK_PMCOLOR_IS_RGBA
    Sk4i rgbi = Sk4i(SkGetPackedR16(rgb), SkGetPackedG16(rgb), SkGetPackedB16(rgb), 0);
 #else
    Sk4i rgbi = Sk4i(SkGetPackedB16(rgb), SkGetPackedG16(rgb), SkGetPackedR16(rgb), 0);
@@ -251,7 +251,7 @@ bool GrDrawTarget::drawBatches(GrBatchFlushState* flushState) {
            if (currentRT) {
                static const GrGpuCommandBuffer::LoadAndStoreInfo kBasicLoadStoreInfo
                    { GrGpuCommandBuffer::LoadOp::kLoad,GrGpuCommandBuffer::StoreOp::kStore,
-                      static_cast<GrColor>(GrColor_ILLEGAL) };
+                      GrColor_ILLEGAL };
                commandBuffer.reset(fGpu->createCommandBuffer(currentRT,
                                                              kBasicLoadStoreInfo,   // Color
                                                              kBasicLoadStoreInfo)); // Stencil
@@ -69,18 +69,11 @@ inline Sk4px Sk4px::Wide::div255() const {
 }

 inline Sk4px Sk4px::alphas() const {
-#ifdef SK_PMCOLOR_IS_ARGB
-    return Sk16b((*this)[ 0], (*this)[ 0], (*this)[ 0], (*this)[ 0],
-                 (*this)[ 4], (*this)[ 4], (*this)[ 4], (*this)[ 4],
-                 (*this)[ 8], (*this)[ 8], (*this)[ 8], (*this)[ 8],
-                 (*this)[12], (*this)[12], (*this)[12], (*this)[12]);
-#else
    static_assert(SK_A32_SHIFT == 24, "This method assumes little-endian.");
    return Sk16b((*this)[ 3], (*this)[ 3], (*this)[ 3], (*this)[ 3],
                 (*this)[ 7], (*this)[ 7], (*this)[ 7], (*this)[ 7],
                 (*this)[11], (*this)[11], (*this)[11], (*this)[11],
                 (*this)[15], (*this)[15], (*this)[15], (*this)[15]);
-#endif
 }

 inline Sk4px Sk4px::Load4Alphas(const SkAlpha a[4]) {
@@ -98,33 +91,19 @@ inline Sk4px Sk4px::Load2Alphas(const SkAlpha a[2]) {
 }

 inline Sk4px Sk4px::zeroAlphas() const {
-#ifdef SK_PMCOLOR_IS_ARGB
-    return Sk16b(0, (*this)[ 1], (*this)[ 2], (*this)[ 3],
-                 0, (*this)[ 5], (*this)[ 6], (*this)[ 7],
-                 0, (*this)[ 9], (*this)[10], (*this)[11],
-                 0, (*this)[13], (*this)[14], (*this)[15]);
-#else
    static_assert(SK_A32_SHIFT == 24, "This method assumes little-endian.");
    return Sk16b((*this)[ 0], (*this)[ 1], (*this)[ 2], 0,
                 (*this)[ 4], (*this)[ 5], (*this)[ 6], 0,
                 (*this)[ 8], (*this)[ 9], (*this)[10], 0,
                 (*this)[12], (*this)[13], (*this)[14], 0);
-#endif
 }

 inline Sk4px Sk4px::zeroColors() const {
-#ifdef SK_PMCOLOR_IS_ARGB
-    return Sk16b((*this)[ 0], 0,0,0,
-                 (*this)[ 4], 0,0,0,
-                 (*this)[ 8], 0,0,0,
-                 (*this)[12], 0,0,0);
-#else
    static_assert(SK_A32_SHIFT == 24, "This method assumes little-endian.");
    return Sk16b(0,0,0, (*this)[ 3],
                 0,0,0, (*this)[ 7],
                 0,0,0, (*this)[11],
                 0,0,0, (*this)[15]);
-#endif
 }

 }  // namespace
@@ -72,10 +72,6 @@ static void color_cube_filter_span(const SkPMColor src[],
        // color is BGRA (SkColor order), dst is SkPMColor order, so may need to swap R+B.
    #if defined(SK_PMCOLOR_IS_RGBA)
        color = SkNx_shuffle<2,1,0,3>(color);
-    #elif defined(SK_PMCOLOR_IS_ARGB)
-        Sk4b bytes = SkNx_cast<uint8_t>(color);
-        dst[i] = SkPackARGB32NoCheck(a, bytes[2], bytes[1], bytes[0]);
-        continue;
    #endif
        uint8_t* dstBytes = (uint8_t*)(dst+i);
        SkNx_cast<uint8_t>(color).store(dstBytes);
@@ -73,39 +73,7 @@ static CFArrayRef SkCTFontManagerCopyAvailableFontFamilyNames() {
 #ifdef SK_BUILD_FOR_IOS
    return CFArrayCreate(nullptr, nullptr, 0, nullptr);
 #else
-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
    return CTFontManagerCopyAvailableFontFamilyNames();
-#else
-    CFMutableArrayRef familyNames =
-            CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
-    if (!familyNames) {
-        return nullptr;
-    }
-
-    ATSFontFamilyIterator iterator;
-    OSStatus status = ATSFontFamilyIteratorCreate(kATSFontContextGlobal,
-                                                  nullptr,
-                                                  nullptr,
-                                                  kATSOptionFlagsDefaultScope,
-                                                  &iterator);
-    if (status != noErr) {
-        CFRelease(familyNames);
-        return nullptr;
-    }
-
-    ATSFontFamilyRef family;
-    while (ATSFontFamilyIteratorNext(iterator, &family) == noErr) {
-        CFStringRef familyName = nullptr;
-        if (ATSFontFamilyGetName(family, kATSOptionFlagsDefault, &familyName) == noErr &&
-            familyName) {
-            CFArrayAppendValue(familyNames, familyName);
-            CFRelease(familyName);
-        }
-    }
-
-    ATSFontFamilyIteratorRelease(&iterator);
-    return familyNames;
-#endif
 #endif
 }

@@ -940,7 +908,6 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&

        // Skia handles quantization and subpixel positioning,
        // so disable quantization and enabe subpixel positioning in CG.
-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
        CGContextSetAllowsFontSubpixelQuantization(fCG, false);
        CGContextSetShouldSubpixelQuantizeFonts(fCG, false);

@@ -949,7 +916,6 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
        // then CG cannot draw the glyph in the correct location without subpixel positioning.
        CGContextSetAllowsFontSubpixelPositioning(fCG, true);
        CGContextSetShouldSubpixelPositionFonts(fCG, true);
-#endif

        CGContextSetTextDrawingMode(fCG, kCGTextFill);

@@ -1005,13 +971,7 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
    // So always make the font transform identity and place the transform on the context.
    point = CGPointApplyAffineTransform(point, context.fInvTransform);

-#if defined(MAC_OS_X_VERSION_10_7) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
    CTFontDrawGlyphs(context.fCTFont, &glyphID, &point, 1, fCG);
-#else
-    CGContextSetFont(fCG, CTFontCopyGraphicsFont(context.fCTFont, NULL));
-    CGContextSetFontSize(fCG, CTFontGetSize(context.fCTFont));
-    CGContextShowGlyphsAtPositions(fCG, &glyphID, &point, 1);
-#endif

    SkASSERT(rowBytesPtr);
    *rowBytesPtr = rowBytes;
@@ -1722,7 +1682,6 @@ SkAdvancedTypefaceMetrics* SkTypeface_Mac::onGetAdvancedTypefaceMetrics(

 static SK_SFNT_ULONG get_font_type_tag(const SkTypeface_Mac* typeface) {
    CTFontRef ctFont = typeface->fFontRef.get();
-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
    AutoCFRelease<CFNumberRef> fontFormatRef(
            static_cast<CFNumberRef>(CTFontCopyAttribute(ctFont, kCTFontFormatAttribute)));
    if (!fontFormatRef) {
@@ -1752,35 +1711,6 @@ static SK_SFNT_ULONG get_font_type_tag(const SkTypeface_Mac* typeface) {
            //Just the presence of the FontForge 'FFTM' table seems to throw it off.
            return SkSFNTHeader::fontType_WindowsTrueType::TAG;
    }
-#else
-    AutoCFRelease<CFStringRef> postScriptName(CTFontCopyPostScriptName(ctFont));
-    if (!postScriptName) {
-        return 0;
-    }
-
-    ATSFontRef atsFont =
-            ATSFontFindFromPostScriptName(postScriptName, kATSOptionFlagsDefault);
-    if (atsFont == kInvalidFont) {
-        return 0;
-    }
-
-    SkSFNTHeader header;
-    ByteCount headerSize = sizeof(header);
-    if (ATSFontGetTableDirectory(atsFont, headerSize, &header, &headerSize) != noErr ||
-        headerSize < sizeof(header.fontType)) {
-        return 0;
-    }
-
-    switch (header.fontType) {
-        case SkSFNTHeader::fontType_OpenTypeCFF::TAG:
-        case SkSFNTHeader::fontType_WindowsTrueType::TAG:
-        case SkSFNTHeader::fontType_MacTrueType::TAG:
-        case SkSFNTHeader::fontType_PostScript::TAG:
-            return header.fontType;
-        default:
-            return SkSFNTHeader::fontType_WindowsTrueType::TAG;
-    }
-#endif
 }

 SkStreamAsset* SkTypeface_Mac::onOpenStream(int* ttcIndex) const {
@@ -336,20 +336,7 @@ gfxGraphiteShaper::SetGlyphsFromSegment(DrawTarget      *aDrawTarget,
            // not a one-to-one mapping with simple metrics: use DetailedGlyph
            AutoTArray<gfxShapedText::DetailedGlyph,8> details;
            float clusterLoc;
-
-            uint32_t glyph_start = c.baseGlyph;
-            uint32_t glyph_end = glyph_start + c.nGlyphs;
-            if (glyph_end < glyph_start) {
-                return NS_ERROR_ILLEGAL_VALUE;
-            }
-            if (glyph_end - glyph_start > 0xFFFF) {
-                return NS_ERROR_ILLEGAL_VALUE;
-            }
-            if (!details.SetCapacity(glyph_end - glyph_start, fallible)) {
-                return NS_ERROR_OUT_OF_MEMORY;
-            }
-
-            for (uint32_t j = glyph_start; j < glyph_end; ++j) {
+            for (uint32_t j = c.baseGlyph; j < c.baseGlyph + c.nGlyphs; ++j) {
                gfxShapedText::DetailedGlyph* d = details.AppendElement();
                d->mGlyphID = gids[j];
                d->mYOffset = roundY ? NSToIntRound(-yLocs[j]) * dev2appUnits :
@@ -231,13 +231,11 @@ gfxTextRun::ComputeLigatureData(Range aPartRange,
    LigatureData result;
    const CompressedGlyph *charGlyphs = mCharacterGlyphs;

-    uint32_t i = aPartRange.start;
-    while (i && !charGlyphs[i].IsLigatureGroupStart()) {
-        --i;
+    uint32_t i;
+    for (i = aPartRange.start; !charGlyphs[i].IsLigatureGroupStart(); --i) {
+        NS_ASSERTION(i > 0, "Ligature at the start of the run??");
    }
-    NS_ASSERTION(charGlyphs[i].IsLigatureGroupStart(), "Ligature at run start?");
    result.mRange.start = i;
-
    for (i = aPartRange.start + 1;
         i < GetLength() && !charGlyphs[i].IsLigatureGroupStart(); ++i) {
    }
@@ -1706,27 +1704,21 @@ gfxFontGroup::GetFontAt(int32_t i, uint32_t aCh)

    RefPtr<gfxFont> font = ff.Font();
    if (!font) {
-        RefPtr<gfxFontEntry> fe = ff.FontEntry();
-        if (!fe) {
-            return nullptr;
-        }
-        RefPtr<gfxCharacterMap> unicodeRangeMap;
+        gfxFontEntry* fe = mFonts[i].FontEntry();
+        gfxCharacterMap* unicodeRangeMap = nullptr;
        if (fe->mIsUserFontContainer) {
-            // This raw pointer is OK because fe holds a strong ref to the object.
-            gfxUserFontEntry* ufe = static_cast<gfxUserFontEntry*>(fe.get());
+            gfxUserFontEntry* ufe = static_cast<gfxUserFontEntry*>(fe);
            if (ufe->LoadState() == gfxUserFontEntry::STATUS_NOT_LOADED &&
                ufe->CharacterInUnicodeRange(aCh) &&
                !FontLoadingForFamily(ff.Family(), aCh)) {
                ufe->Load();
                ff.CheckState(mSkipDrawing);
            }
-            unicodeRangeMap = ufe->GetUnicodeRangeMap();
-            // Update fe to refer to the actual platform font entry, rather than the
-            // webfont wrapper. After this, we no longer have a strong ref to ufe.
            fe = ufe->GetPlatformFontEntry();
            if (!fe) {
                return nullptr;
            }
+            unicodeRangeMap = ufe->GetUnicodeRangeMap();
        }
        font = fe->FindOrMakeFont(&mStyle, mFonts[i].NeedsBold(),
                                  unicodeRangeMap);
@@ -1637,13 +1637,10 @@ RasterImage::NotifyDecodeComplete(const DecoderFinalStatus& aStatus,

  if (!(aDecoderFlags & DecoderFlags::FIRST_FRAME_ONLY) &&
      mHasBeenDecoded && mAnimationState) {
-    // If we've successfully finished a full decode of all animation frames
-    // then let our animation state know it's complete and to not to expect
-    // any more frames.
-    if (aStatus.mFinished && !aStatus.mHadError) {
-      mAnimationState->NotifyDecodeComplete();
-      mAnimationState->UpdateState(mAnimationFinished, this, mSize);
-    }
+    // We've finished a full decode of all animation frames and our AnimationState
+    // has been notified about them all, so let it know not to expect anymore.
+    mAnimationState->NotifyDecodeComplete();
+    mAnimationState->UpdateState(mAnimationFinished, this, mSize);
  }

  // Only act on errors if we have no usable frames from the decoder.
@@ -66,28 +66,10 @@ struct WeakCell {
    WeakCellKind kind;
    WeakRef<JSObject*> object;
    WeakRef<JS::Symbol*> symbol;
-    bool enabled;

-    WeakCell()
-        : kind(WeakCellKind::Empty)
-        , object(nullptr)
-        , symbol(nullptr)
-        , enabled(true)
-    {}
-
-    explicit WeakCell(JSObject* obj, bool enabled)
-        : kind(WeakCellKind::Object)
-        , object(obj)
-        , symbol(nullptr)
-        , enabled(enabled)
-    {}
-
-    explicit WeakCell(JS::Symbol* sym, bool enabled)
-        : kind(WeakCellKind::Symbol)
-        , object(nullptr)
-        , symbol(sym)
-        , enabled(enabled)
-    {}
+    WeakCell() : kind(WeakCellKind::Empty), object(nullptr), symbol(nullptr) {}
+    explicit WeakCell(JSObject* obj) : kind(WeakCellKind::Object), object(obj), symbol(nullptr) {}
+    explicit WeakCell(JS::Symbol* sym) : kind(WeakCellKind::Symbol), object(nullptr), symbol(sym) {}

    void clear() {
        kind = WeakCellKind::Empty;
@@ -119,9 +101,7 @@ struct WeakCell {
            if (!target)
                return;

-            if (!enabled) {
-              // Do nothing
-            } else if (IsInsideNursery(target)) {
+            if (IsInsideNursery(target)) {
                TraceManuallyBarrieredEdge(trc, object.unsafeGet(), name);
            } else {
                if (trc->isMarkingTracer() && !target->asTenured().zone()->isCollecting())
@@ -130,7 +110,7 @@ struct WeakCell {
            }
        } else if (kind == WeakCellKind::Symbol) {
            JS::Symbol* target = symbol.unbarrieredGet();
-            if (enabled && target) {
+            if (target) {
                if (trc->isMarkingTracer() && !target->asTenured().zone()->isCollecting())
                    return;
                TraceWeakEdge(trc, &symbol, name);
@@ -144,16 +124,14 @@ struct WeakCell {
            if (!target)
                return;

-            if (!enabled) {
-              // Do nothing
-            } else if (IsInsideNursery(target)) {
+            if (IsInsideNursery(target)) {
                TraceManuallyBarrieredEdge(trc, object.unsafeGet(), name);
            } else if (target->asTenured().zone()->isCollecting()) {
                TraceWeakEdge(trc, &object, name);
            }
        } else if (kind == WeakCellKind::Symbol) {
            JS::Symbol* target = symbol.unbarrieredGet();
-            if (enabled && target && target->asTenured().zone()->isCollecting())
+            if (target && target->asTenured().zone()->isCollecting())
                TraceWeakEdge(trc, &symbol, name);
        }
    }
@@ -165,24 +143,22 @@ struct FinalizationRecord {
    WeakCell unregisterToken;
    bool active;
    bool queued;
-    bool enabled;

    FinalizationRecord(HandleValue targetValue, HandleValue heldValue,
-                       HandleValue unregisterTokenValue, bool enabled)
+                       HandleValue unregisterTokenValue)
      : heldValue(heldValue),
        active(true),
-        queued(false),
-        enabled(enabled)
+        queued(false)
    {
        if (targetValue.isObject())
-            target = WeakCell(NormalizeWeakObject(&targetValue.toObject()), enabled);
+            target = WeakCell(NormalizeWeakObject(&targetValue.toObject()));
        else
-            target = WeakCell(targetValue.toSymbol(), enabled);
+            target = WeakCell(targetValue.toSymbol());

        if (unregisterTokenValue.isObject())
-            unregisterToken = WeakCell(NormalizeWeakObject(&unregisterTokenValue.toObject()), enabled);
+            unregisterToken = WeakCell(NormalizeWeakObject(&unregisterTokenValue.toObject()));
        else if (unregisterTokenValue.isSymbol())
-            unregisterToken = WeakCell(unregisterTokenValue.toSymbol(), enabled);
+            unregisterToken = WeakCell(unregisterTokenValue.toSymbol());
    }

    void trace(JSTracer* trc) {
@@ -241,15 +217,13 @@ struct FinalizationRegistryObject::Data {
    FinalizationRecordVector records;
    FinalizationRecordVector cleanupQueue;
    bool queuedForCleanup;
-    bool enabled;

-    explicit Data(JSObject* cleanupCallback, bool enabled)
+    explicit Data(JSObject* cleanupCallback)
      : cleanupCallback(cleanupCallback),
        cleanupJob(nullptr),
        records(SystemAllocPolicy()),
        cleanupQueue(SystemAllocPolicy()),
-        queuedForCleanup(false),
-        enabled(enabled)
+        queuedForCleanup(false)
    {}

    ~Data() {
@@ -258,13 +232,11 @@ struct FinalizationRegistryObject::Data {
    }

    void trace(JSTracer* trc) {
-        if (enabled) {
-          JS::TraceEdge(trc, &cleanupCallback, "FinalizationRegistry cleanup callback");
-          if (cleanupJob.unbarrieredGet())
-              JS::TraceEdge(trc, &cleanupJob, "FinalizationRegistry cleanup job");
-          for (size_t i = 0; i < records.length(); i++)
-              records[i]->trace(trc);
-        }
+        JS::TraceEdge(trc, &cleanupCallback, "FinalizationRegistry cleanup callback");
+        if (cleanupJob.unbarrieredGet())
+            JS::TraceEdge(trc, &cleanupJob, "FinalizationRegistry cleanup job");
+        for (size_t i = 0; i < records.length(); i++)
+            records[i]->trace(trc);
    }

    bool appendRecord(FinalizationRecord* record) {
@@ -345,7 +317,7 @@ FinalizationRegistry_register_impl(JSContext* cx, const CallArgs& args)
        unregisterToken.setUndefined();
    }

-    FinalizationRecord* record = cx->new_<FinalizationRecord>(target, heldValue, unregisterToken, cx->options().weakRefs());
+    FinalizationRecord* record = cx->new_<FinalizationRecord>(target, heldValue, unregisterToken);
    if (!record)
        return false;

@@ -429,7 +401,7 @@ FinalizationRegistryObject::create(JSContext* cx, HandleObject cleanupCallback,
    if (!obj)
        return nullptr;

-    Data* data = cx->new_<Data>(cleanupCallback, cx->options().weakRefs());
+    Data* data = cx->new_<Data>(cleanupCallback);
    if (!data)
        return nullptr;

@@ -8,11 +8,8 @@
 #include "mozilla/CheckedInt.h"
 #include "mozilla/TypeTraits.h"

-#include <algorithm>
-
 #include "jscntxt.h"

-#include "builtin/SelfHostingDefines.h"
 #include "irregexp/RegExpParser.h"
 #include "jit/InlinableNatives.h"
 #include "vm/RegExpStatics.h"
@@ -1757,9 +1754,7 @@ js::RegExpGetSubstitution(JSContext* cx, HandleArrayObject matchResult, HandleLi
    // Step 6.
    MOZ_ASSERT(position <= string->length());

-    // String substitutions can only reference $1 through $99.
-    uint32_t nCaptures = std::min<uint32_t>(matchResultLength - 1,
-                                            REGEXP_MAX_SUBSTITUTION_CAPTURES);
+    uint32_t nCaptures = matchResultLength - 1;
    Rooted<CapturesVector> captures(cx, CapturesVector(cx));
    if (!captures.reserve(nCaptures))
        return false;
@@ -463,12 +463,6 @@ function RegExpGetComplexReplacement(result, matched, S, position,
    // Step 14.k.i (reordered).
    _DefineDataProperty(captures, capturesLength++, matched);

-    // String substitutions can only reference $1 through $99. Keep getting and
-    // stringifying all captures because those operations are observable.
-    var storedCaptures = functionalReplace ?
-                           nCaptures :
-                           std_Math_min(nCaptures, REGEXP_MAX_SUBSTITUTION_CAPTURES);
-
    // Step 14.g, 14.i, 14.i.iv.
    for (var n = 1; n <= nCaptures; n++) {
        // Step 14.i.i.
@@ -479,9 +473,7 @@ function RegExpGetComplexReplacement(result, matched, S, position,
            capN = ToString(capN);

        // Step 14.i.iii.
-        if (n <= storedCaptures) {
-            _DefineDataProperty(captures, capturesLength++, capN);
-        }
+        _DefineDataProperty(captures, capturesLength++, capN);
    }

    // Step 14.j.
@@ -79,8 +79,6 @@

 #define REGEXP_FLAGS_SLOT 2

-#define REGEXP_MAX_SUBSTITUTION_CAPTURES 99
-
 #define REGEXP_IGNORECASE_FLAG  0x01
 #define REGEXP_GLOBAL_FLAG      0x02
 #define REGEXP_MULTILINE_FLAG   0x04
@@ -140,9 +140,9 @@ WeakRefObject::create(JSContext* cx, HandleValue target, HandleObject proto /* =

    Referent* data;
    if (target.isObject())
-        data = cx->new_<Referent>(&target.toObject(), cx->options().weakRefs());
+        data = cx->new_<Referent>(&target.toObject());
    else
-        data = cx->new_<Referent>(target.toSymbol(), cx->options().weakRefs());
+        data = cx->new_<Referent>(target.toSymbol());

    if (!data)
        return nullptr;
@@ -210,9 +210,7 @@ WeakRefObject::trace(JSTracer* trc, JSObject* obj)
            if (!target)
                return;

-            if (!data->enabled) {
-                // Pref disabled, don't do anything.
-            } else if (IsInsideNursery(target)) {
+            if (IsInsideNursery(target)) {
                // Weak edges must be tenured; trace strongly while referent is in the nursery.
                TraceManuallyBarrieredEdge(trc, data->objectTarget.unsafeGet(),
                                           "WeakRef nursery referent");
@@ -222,7 +220,7 @@ WeakRefObject::trace(JSTracer* trc, JSObject* obj)
        } else {
            MOZ_ASSERT(data->isSymbol());
            JS::Symbol* target = data->symbolTarget.unbarrieredGet();
-            if (data->enabled && target)
+            if (target)
                TraceWeakEdge(trc, &data->symbolTarget, "WeakRef symbol referent");
        }
    }
@@ -22,27 +22,17 @@ class WeakRefObject : public NativeObject
            Symbol
        };

-        explicit Referent(JSObject* obj, bool enabled)
-          : kind(Kind::Object)
-          , objectTarget(obj)
-          , symbolTarget(nullptr)
-          , enabled(enabled)
-        {}
-        
-        explicit Referent(JS::Symbol* sym, bool enabled)
-          : kind(Kind::Symbol)
-          , objectTarget(nullptr)
-          , symbolTarget(sym)
-          , enabled(enabled)
-        {}
-        
+        explicit Referent(JSObject* obj)
+          : kind(Kind::Object), objectTarget(obj), symbolTarget(nullptr) {}
+        explicit Referent(JS::Symbol* sym)
+          : kind(Kind::Symbol), objectTarget(nullptr), symbolTarget(sym) {}
+
        bool isObject() const { return kind == Kind::Object; }
        bool isSymbol() const { return kind == Kind::Symbol; }

        Kind kind;
        WeakRef<JSObject*> objectTarget;
        WeakRef<JS::Symbol*> symbolTarget;
-        bool enabled;
    };

    static const Class class_;
@@ -416,13 +416,13 @@ MapMemoryAt(void* desired, size_t length, int prot = PROT_READ | PROT_WRITE,
            int flags = MAP_PRIVATE | MAP_ANON, int fd = -1, off_t offset = 0)

 // Solaris manages 64-bit address space in a different manner from every other
-// AMD64 operating system, but fortunately the fix is the same one
-// required for every operating system on 64-bit SPARC and ARM.
+// AMD64 operating system, but fortunately the fix is the same one 
+// required for every operating system on 64-bit SPARC, Itanium, and ARM. 
 // Most people's intuition failed them here and they thought this couldn't
 // possibly be correct on AMD64, but for Solaris/illumos it is.	
 	
 {
-#if defined(__aarch64__) || (defined(__sun) && defined(__x86_64__)) || (defined(__sparc__) && defined(__arch64__) && (defined(__NetBSD__) || defined(__linux__)))
+#if defined(__ia64__) || defined(__aarch64__) || (defined(__sun) && defined(__x86_64__)) || (defined(__sparc__) && defined(__arch64__) && (defined(__NetBSD__) || defined(__linux__)))
    MOZ_ASSERT((0xffff800000000000ULL & (uintptr_t(desired) + length - 1)) == 0);
 #endif
    void* region = mmap(desired, length, prot, flags, fd, offset);
@@ -445,14 +445,14 @@ static inline void*
 MapMemory(size_t length, int prot = PROT_READ | PROT_WRITE,
          int flags = MAP_PRIVATE | MAP_ANON, int fd = -1, off_t offset = 0)
 {
-#if defined(__sparc__) && defined(__arch64__) && defined(__NetBSD__)
+#if defined(__ia64__) || (defined(__sparc__) && defined(__arch64__) && defined(__NetBSD__))
    /*
     * The JS engine assumes that all allocated pointers have their high 17 bits clear,
-     * which mmap on this platform doesn't support directly. However, we can emulate it
-     * by passing mmap an "addr" parameter with those bits clear. The mmap will return
-     * that address, or the nearest available memory above that address, providing a
-     * near-guarantee that those bits are clear. If they are not, we return nullptr below
-     * to indicate out-of-memory.
+     * which ia64's mmap doesn't support directly. However, we can emulate it by passing
+     * mmap an "addr" parameter with those bits clear. The mmap will return that address,
+     * or the nearest available memory above that address, providing a near-guarantee
+     * that those bits are clear. If they are not, we return nullptr below to indicate
+     * out-of-memory.
     *
     * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual
     * address space.
@@ -479,7 +479,7 @@ MapMemory(size_t length, int prot = PROT_READ | PROT_WRITE,
    * different due to the different mmap behavior.
    *
    * TODO: Merge with the above code block if this implementation works for
-    * sparc64.
+    * ia64 and sparc64.
    */
    const uintptr_t start = UINT64_C(0x0000070000000000);
    const uintptr_t end   = UINT64_C(0x0000800000000000);
@@ -8185,7 +8185,7 @@ CodeGenerator::visitStoreElementV(LStoreElementV* lir)
 template <typename T> void
 CodeGenerator::emitStoreElementHoleT(T* lir)
 {
-    static_assert(std::is_same_v<T, LStoreElementHoleT> || std::is_same_v<T, LFallibleStoreElementT>,
+    static_assert(std::is_same<T, LStoreElementHoleT>::value || std::is_same<T, LFallibleStoreElementT>::value,
                  "emitStoreElementHoleT called with unexpected argument type");

    OutOfLineStoreElementHole* ool = new(alloc()) OutOfLineStoreElementHole(lir);
@@ -8244,7 +8244,7 @@ CodeGenerator::visitStoreElementHoleT(LStoreElementHoleT* lir)
 template <typename T> void
 CodeGenerator::emitStoreElementHoleV(T* lir)
 {
-    static_assert(std::is_same_v<T, LStoreElementHoleV> || std::is_same_v<T, LFallibleStoreElementV>,
+    static_assert(std::is_same<T, LStoreElementHoleV>::value || std::is_same<T, LFallibleStoreElementV>::value,
                  "emitStoreElementHoleV called with unexpected parameter type");

    OutOfLineStoreElementHole* ool = new(alloc()) OutOfLineStoreElementHole(lir);
@@ -494,9 +494,6 @@ OnLeaveBaselineFrame(JSContext* cx, const JitFrameIterator& frame, jsbytecode* p
 {
    BaselineFrame* baselineFrame = frame.baselineFrame();
    if (jit::DebugEpilogue(cx, baselineFrame, pc, frameOk)) {
-        if (!baselineFrame->hasReturnValue()) {
-            baselineFrame->setReturnValue(UndefinedValue());
-        }
        rfe->kind = ResumeFromException::RESUME_FORCED_RETURN;
        rfe->framePointer = frame.fp() - BaselineFrame::FramePointerOffset;
        rfe->stackPointer = reinterpret_cast<uint8_t*>(baselineFrame);
@@ -320,6 +320,7 @@ size_t AssemblerLOONGARCH64::bytesNeeded() const {

 // write a blob of binary into the instruction stream
 BufferOffset AssemblerLOONGARCH64::writeInst(uint32_t x, uint32_t* dest) {
+  MOZ_ASSERT(hasCreator());
  if (dest == nullptr) {
    return m_buffer.putInt(x);
  }
@@ -212,8 +212,6 @@ static constexpr Register WasmTableCallIndexReg = ABINonArgReg3;
 static constexpr Register WasmIonExitRegCallee = t0;
 static constexpr Register WasmIonExitRegE0 = a0;
 static constexpr Register WasmIonExitRegE1 = a1;
-static constexpr Register WasmIonExitRegReturnData = JSReturnReg_Data;
-static constexpr Register WasmIonExitRegReturnType = JSReturnReg_Type;
 static constexpr Register WasmIonExitRegD0 = a0;
 static constexpr Register WasmIonExitRegD1 = a1;
 static constexpr Register WasmIonExitRegD2 = t0;
@@ -1013,8 +1013,8 @@ CodeGeneratorLoongArch64::visitTestI64AndBranch(LTestI64AndBranch* lir)
 void
 CodeGeneratorLoongArch64::setReturnDoubleRegs(LiveRegisterSet* regs)
 {
-    MOZ_ASSERT(ReturnFloat32Reg.encoding() == FloatRegisters::f0);
-    MOZ_ASSERT(ReturnDoubleReg.encoding() == FloatRegisters::f0);
+    MOZ_ASSERT(ReturnFloat32Reg.reg_ == FloatRegisters::f0);
+    MOZ_ASSERT(ReturnDoubleReg.reg_ == FloatRegisters::f0);
    FloatRegister f1 = { FloatRegisters::f1, FloatRegisters::Single };
    regs->add(ReturnFloat32Reg);
    regs->add(f1);
@@ -2395,7 +2395,7 @@ void MacroAssemblerLOONGARCH64::wasmLoadImpl(const wasm::MemoryAccessDesc& acces
                                         Register ptrScratch,
                                         AnyRegister output, Register tmp) {
  uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::OffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
  MOZ_ASSERT_IF(offset, ptrScratch != InvalidReg);

  // Maybe add the offset.
@@ -2442,7 +2442,7 @@ void MacroAssemblerLOONGARCH64::wasmStoreImpl(const wasm::MemoryAccessDesc& acce
                                          Register memoryBase, Register ptr,
                                          Register ptrScratch, Register tmp) {
  uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::OffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
  MOZ_ASSERT_IF(offset, ptrScratch != InvalidReg);

  // Maybe add the offset.
@@ -2488,7 +2488,7 @@ void MacroAssemblerLOONGARCH64Compat::wasmLoadI64Impl(
    const wasm::MemoryAccessDesc& access, Register memoryBase, Register ptr,
    Register ptrScratch, Register64 output, Register tmp) {
  uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::OffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
  MOZ_ASSERT_IF(offset, ptrScratch != InvalidReg);

  // Maybe add the offset.
@@ -2534,7 +2534,7 @@ void MacroAssemblerLOONGARCH64Compat::wasmStoreI64Impl(
    const wasm::MemoryAccessDesc& access, Register64 value, Register memoryBase,
    Register ptr, Register ptrScratch, Register tmp) {
  uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::OffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
  MOZ_ASSERT_IF(offset, ptrScratch != InvalidReg);

  // Maybe add the offset.
@@ -2774,13 +2774,12 @@ CodeOffset MacroAssembler::nopPatchableToNearJump() {
 }

 void MacroAssembler::patchNopToNearJump(uint8_t* jump, uint8_t* target) {
-  MOZ_ASSERT(reinterpret_cast<Instruction*>(jump)->encode() == NopInst);
+  MOZ_ASSERT(reinterpret_cast<Instruction*>(jump)->is<InstNOP>());
  new (jump) InstJump(op_b, JOffImm26(target - jump));
 }

 void MacroAssembler::patchNearJumpToNop(uint8_t* jump) {
-  MOZ_ASSERT(reinterpret_cast<Instruction*>(jump)->extractBitField(31, 26) ==
-             (uint32_t)op_b >> 26);
+  MOZ_ASSERT(reinterpret_cast<Instruction*>(jump)->is<InstJump>());
  new (jump) InstNOP();
 }

@@ -301,7 +301,7 @@ void unmapPages(void* p, size_t size) { }
 void*
 mapMemoryAt(void* desired, size_t length)
 {
-#if defined(__aarch64__) || \
+#if defined(__ia64__) || defined(__aarch64__) || \
    (defined(__sparc__) && defined(__arch64__) && (defined(__NetBSD__) || defined(__linux__)))
    MOZ_RELEASE_ASSERT(0xffff800000000000ULL & (uintptr_t(desired) + length - 1) == 0);
 #endif
@@ -324,7 +324,7 @@ mapMemory(size_t length)
    int fd = -1;
    off_t offset = 0;
    // The test code must be aligned with the implementation in gc/Memory.cpp.
-#if defined(__sparc__) && defined(__arch64__) && defined(__NetBSD__)
+#if defined(__ia64__) || (defined(__sparc__) && defined(__arch64__) && defined(__NetBSD__))
    void* region = mmap((void*)0x0000070000000000, length, prot, flags, fd, offset);
    if (region == MAP_FAILED)
        return nullptr;
@@ -999,8 +999,7 @@ class JS_PUBLIC_API(ContextOptions) {
        strictMode_(false),
        extraWarnings_(false),
        arrayProtoValues_(true),
-        streams_(false),
-        weakRefs_(false)
+        streams_(false)
    {
    }

@@ -1140,13 +1139,12 @@ class JS_PUBLIC_API(ContextOptions) {
        return *this;
    }

-    bool weakRefs() const { return weakRefs_; }
+    bool weakRefs() const { return true; }
    ContextOptions& setWeakRefs(bool flag) {
-        weakRefs_ = flag;
+        (void) flag;
        return *this;
    }
    ContextOptions& toggleWeakRefs() {
-        weakRefs_ = !weakRefs_;
        return *this;
    }

@@ -1167,7 +1165,6 @@ class JS_PUBLIC_API(ContextOptions) {
    bool extraWarnings_ : 1;
    bool arrayProtoValues_ : 1;
    bool streams_ : 1;
-    bool weakRefs_ : 1;
 };

 JS_PUBLIC_API(ContextOptions&)
@@ -312,13 +312,12 @@ cvt_s(SprintfState* ss, const char* s, int width, int prec, int flags)
        s = generic_null_str(s);

    // Limit string length by precision value
-    size_t slen = strnlen(s, size_t(prec));
-    if (slen > INT_MAX) {
-        return false;
-    }
+    int slen = int(generic_strlen(s));
+    if (0 < prec && prec < slen)
+        slen = prec;

    // and away we go
-    return fill2(ss, s, int(slen), width, flags);
+    return fill2(ss, s, slen, width, flags);
 }

 /*
@@ -976,12 +976,6 @@ CanUpperCaseSpecialCasing(Latin1Char charCode)
 static inline bool
 CanUpperCaseSpecialCasing(char16_t charCode)
 {
-    // Update mapping for U+00DF LATIN SMALL LETTER SHARP S inline,
-    // overriding Unicode data files to force the use of
-    // U+1E9E LATIN CAPITAL LETTER SHARP S.
-    if (charCode == unicode::LATIN_SMALL_LETTER_SHARP_S)
-        return true;
-
    return unicode::CanUpperCaseSpecialCasing(charCode);
 }

@@ -997,11 +991,6 @@ LengthUpperCaseSpecialCasing(Latin1Char charCode)
 static inline size_t
 LengthUpperCaseSpecialCasing(char16_t charCode)
 {
-    // U+00DF LATIN SMALL LETTER SHARP S is uppercased according to ICU or
-    // to U+1E9E LATIN CAPITAL LETTER SHARP S.
-    if (charCode == unicode::LATIN_SMALL_LETTER_SHARP_S)
-        return 1;
-
    MOZ_ASSERT(CanUpperCaseSpecialCasing(charCode));

    return unicode::LengthUpperCaseSpecialCasing(charCode);
@@ -1021,13 +1010,6 @@ AppendUpperCaseSpecialCasing(char16_t charCode, Latin1Char* elements, size_t* in
 static inline void
 AppendUpperCaseSpecialCasing(char16_t charCode, char16_t* elements, size_t* index)
 {
-    // U+00DF LATIN SMALL LETTER SHARP S is uppercased according to ICU or
-    // to U+1E9E LATIN CAPITAL LETTER SHARP S.
-    if (charCode == unicode::LATIN_SMALL_LETTER_SHARP_S) {
-        elements[(*index)++] = 0x1E9E;
-        return;
-    }
-
    unicode::AppendUpperCaseSpecialCasing(charCode, elements, index);
 }

@@ -1043,7 +1025,6 @@ ToUpperCaseImpl(DestChar* destChars, const SrcChar* srcChars, size_t startIndex,
    MOZ_ASSERT(srcLength <= destLength);

    size_t j = startIndex;
-    size_t upperLength = srcLength;
    for (size_t i = startIndex; i < srcLength; i++) {
        char16_t c = srcChars[i];
        if (!IsSame<DestChar, Latin1Char>::value) {
@@ -1059,10 +1040,9 @@ ToUpperCaseImpl(DestChar* destChars, const SrcChar* srcChars, size_t startIndex,
            }
        }

-        if (MOZ_UNLIKELY(c > 0x7f && CanUpperCaseSpecialCasing(static_cast<DestChar>(c)))) {
+        if (MOZ_UNLIKELY(c > 0x7f && CanUpperCaseSpecialCasing(static_cast<SrcChar>(c)))) {
            // Return if the output buffer is too small.
-            upperLength += (LengthUpperCaseSpecialCasing(static_cast<DestChar>(c)) - 1);
-            if (upperLength > destLength)
+            if (srcLength == destLength)
                return i;

            AppendUpperCaseSpecialCasing(c, destChars, &j);
@@ -1091,18 +1071,14 @@ ToUpperCaseImpl(Latin1Char* destChars, const char16_t* srcChars, size_t startInd

 template <typename CharT>
 static size_t
-ToUpperCaseLength(const CharT* chars, size_t startIndex, size_t length, bool force16)
+ToUpperCaseLength(const CharT* chars, size_t startIndex, size_t length)
 {
    size_t upperLength = length;
    for (size_t i = startIndex; i < length; i++) {
        char16_t c = chars[i];

-        if (c > 0x7f &&
-            (force16 && CanUpperCaseSpecialCasing(c) ||
-             CanUpperCaseSpecialCasing(static_cast<CharT>(c))))
-            upperLength += (force16
-                ? LengthUpperCaseSpecialCasing(c)
-                : LengthUpperCaseSpecialCasing(static_cast<CharT>(c))) - 1;
+        if (c > 0x7f && CanUpperCaseSpecialCasing(static_cast<CharT>(c)))
+            upperLength += LengthUpperCaseSpecialCasing(static_cast<CharT>(c)) - 1;
    }
    return upperLength;
 }
@@ -1141,7 +1117,7 @@ ToUpperCase(JSContext* cx, const SrcChar* chars, size_t startIndex, size_t lengt

    size_t readChars = ToUpperCaseImpl(buf.get(), chars, startIndex, length, length);
    if (readChars < length) {
-        size_t actualLength = ToUpperCaseLength(chars, readChars, length, !IsSame<DestChar, Latin1Char>::value);
+        size_t actualLength = ToUpperCaseLength(chars, readChars, length);

        *resultLength = actualLength;
        DestCharPtr buf2 = ReallocChars(cx, Move(buf), length + 1, actualLength + 1);
@@ -1202,8 +1178,7 @@ ToUpperCase(JSContext* cx, JSLinearString* str)
        //
        // If the original string is Latin-1, it can -- unless the string
        // contains U+00B5 MICRO SIGN or U+00FF SMALL LETTER Y WITH DIAERESIS,
-        // the only Latin-1 codepoints that don't uppercase within Latin-1, or
-        // it contains U+00DF LATIN SMALL LETTER SHARP S, which we override.
+        // the only Latin-1 codepoints that don't uppercase within Latin-1.
        // Search for those codepoints to decide whether the new string can be
        // Latin-1.
        // If the original string is a two-byte string, its uppercase form is
@@ -1220,9 +1195,6 @@ ToUpperCase(JSContext* cx, JSLinearString* str)
                    MOZ_ASSERT(unicode::ToUpperCase(c) > JSString::MAX_LATIN1_CHAR);
                    resultIsLatin1 = false;
                    break;
-                } else if (c == unicode::LATIN_SMALL_LETTER_SHARP_S) {
-                    resultIsLatin1 = false;
-                    break;
                } else {
                    MOZ_ASSERT(unicode::ToUpperCase(c) <= JSString::MAX_LATIN1_CHAR);
                }
@@ -2871,8 +2843,8 @@ static JSString* ReplaceAll(JSContext* cx, JSLinearString* str,

    // Step 13.
    StringBuffer result(cx);
-    if (std::is_same_v<StrChar, char16_t> ||
-      std::is_same_v<RepChar, char16_t>) {
+    if (std::is_same<StrChar, char16_t>::value ||
+      std::is_same<RepChar, char16_t>::value) {
        if (!result.ensureTwoByteChars()) {
          return nullptr;
        }
@@ -2954,8 +2926,8 @@ static JSString* ReplaceAllInterleave(JSContext* cx, JSLinearString* str,

    // Step 13.
    StringBuffer result(cx);
-    if (std::is_same_v<StrChar, char16_t> ||
-        std::is_same_v<RepChar, char16_t>) {
+    if (std::is_same<StrChar, char16_t>::value ||
+        std::is_same<RepChar, char16_t>::value) {
        if (!result.ensureTwoByteChars()) {
            return nullptr;
        }
@@ -309,26 +309,26 @@ InflateUTF8StringToBuffer(ContextT* cx, const UTF8Chars src, CharT* dst, size_t*
            while (v & (0x80 >> n))
                n++;

-        #define INVALID(report, arg, n2)                                  \
-            do {                                                          \
-                if (Action == CountAndReportInvalids) {                   \
-                    report(cx, arg);                                      \
-                    return false;                                         \
-                } else if (Action == AssertNoInvalids) {                  \
-                    MOZ_CRASH("invalid UTF-8 string: " # report);         \
-                } else {                                                  \
-                    if (Action == Copy) {                                 \
-                        if (std::is_same_v<decltype(dst[0]), Latin1Char>) \
-                            dst[j] = CharT(REPLACE_UTF8_LATIN1);          \
-                        else                                              \
-                            dst[j] = CharT(REPLACE_UTF8);                 \
-                    } else {                                              \
-                        MOZ_ASSERT(Action == CountAndIgnoreInvalids ||    \
-                                   Action == FindEncoding);               \
-                    }                                                     \
-                    n = n2;                                               \
-                    goto invalidMultiByteCodeUnit;                        \
-                }                                                         \
+        #define INVALID(report, arg, n2)                                \
+            do {                                                        \
+                if (Action == CountAndReportInvalids) {                 \
+                    report(cx, arg);                                    \
+                    return false;                                       \
+                } else if (Action == AssertNoInvalids) {                \
+                    MOZ_CRASH("invalid UTF-8 string: " # report);       \
+                } else {                                                \
+                    if (Action == Copy) {                               \
+                        if (std::is_same<decltype(dst[0]), Latin1Char>::value) \
+                            dst[j] = CharT(REPLACE_UTF8_LATIN1);        \
+                        else                                            \
+                            dst[j] = CharT(REPLACE_UTF8);               \
+                    } else {                                            \
+                        MOZ_ASSERT(Action == CountAndIgnoreInvalids ||  \
+                                   Action == FindEncoding);             \
+                    }                                                   \
+                    n = n2;                                             \
+                    goto invalidMultiByteCodeUnit;                      \
+                }                                                       \
            } while (0)

            // Check the leading byte.
@@ -1138,7 +1138,7 @@ class StaticStrings
    }

    template <typename CharT,
-              typename = typename std::enable_if_t<!std::is_const_v<CharT>>>
+              typename = typename std::enable_if<!std::is_const<CharT>::value>::type>
    MOZ_ALWAYS_INLINE JSAtom* lookup(CharT* chars, size_t length) {
        // Collapse the remaining |CharT*| to |const CharT*| to avoid excess
        // instantiations.
@@ -677,12 +677,12 @@ class ElementSpecific
            return true;
        }

-        if (std::is_same_v<T, int64_t>) {
+        if (std::is_same<T, int64_t>::value) {
            JS_TRY_VAR_OR_RETURN_FALSE(cx, *result, ToBigInt64(cx, v));
            return true;
        }

-        if (std::is_same_v<T, uint64_t>) {
+        if (std::is_same<T, uint64_t>::value) {
            JS_TRY_VAR_OR_RETURN_FALSE(cx, *result, ToBigUint64(cx, v));
            return true;
        }
@@ -839,7 +839,7 @@ wasm::ToggleProfiling(const Code& code, const CallSite& callSite, bool enabled)
 #elif defined(JS_CODEGEN_LOONGARCH64)
    uint8_t* caller = callerRetAddr - sizeof(uint32_t);
    Instruction* callerInsn = reinterpret_cast<Instruction*>(caller);
-    MOZ_ASSERT(callerInsn->extractBitField(31, 26) == ((uint32_t)op_bl >> 26));
+    MOZ_ASSERT(callerInsn->extractOpcode() == ((uint32_t)op_bl >> OpcodeShift));
    int32_t calleeOffset =
        int32_t(reinterpret_cast<InstJump*>(callerInsn)->extractImm26Value() << 8) >> 6;
    void* callee = caller + calleeOffset;
@@ -1442,7 +1442,6 @@ ReloadPrefsCallback(const char* pref, void* data)
    bool extraWarnings = Preferences::GetBool(JS_OPTIONS_DOT_STR "strict");
    
    bool streams = Preferences::GetBool(JS_OPTIONS_DOT_STR "streams");
-    bool weakRefs = Preferences::GetBool(JS_OPTIONS_DOT_STR "weakrefs");

    bool unboxedObjects = Preferences::GetBool(JS_OPTIONS_DOT_STR "unboxed_objects");
    
@@ -1469,8 +1468,7 @@ ReloadPrefsCallback(const char* pref, void* data)
                             .setWerror(werror)
                             .setExtraWarnings(extraWarnings)
                             .setArrayProtoValues(arrayProtoValues)
-                             .setStreams(streams)
-                             .setWeakRefs(weakRefs);
+                             .setStreams(streams);

    JS_SetParallelParsingEnabled(cx, parallelParsing);
    JS_SetOffthreadIonCompilationEnabled(cx, offthreadIonCompilation);
@@ -411,13 +411,6 @@ DottedCornerFinder::FindBestOverlap(Float aMinR, Float aMinBorderRadius,
        mCount = mMaxCount;
        break;
      }
-      // GetCountAndLastOverlap() failed without writing |count| and
-      // |actualOverlap|: the walk needed more than mMaxCount circles, i.e.
-      // this overlap produces too many circles.  Narrow the search toward
-      // smaller overlaps.
-      upper = overlap;
-      overlap = (upper + lower) / 2.0f;
-      continue;
    }

    if (j == 0) {
@@ -5107,28 +5107,19 @@ nsLayoutUtils::IntrinsicForAxis(PhysicalAxis              aAxis,
           styleMinBSize.GetCoordValue() == 0)) ||
        styleMaxBSize.GetUnit() != eStyleUnit_None) {

-      AspectRatio ratio = aFrame->GetAspectRatio();
+      AspectRatio ratio = aFrame->GetIntrinsicRatio();
      if (ratio) {
+        // Convert 'ratio' if necessary, so that it's storing ISize/BSize:
+        if (!horizontalAxis) {
+          ratio = ratio.Inverted();
+        }
        AddStateBitToAncestors(aFrame,
            NS_FRAME_DESCENDANT_INTRINSIC_ISIZE_DEPENDS_ON_BSIZE);

-        const WritingMode wm = aFrame->GetWritingMode();
-        LogicalSize boxSizingAdjust(wm);
-        boxSizingAdjust.ISize(wm) =
-          GetDefiniteSizeTakenByBoxSizing(boxSizing, aFrame, isInlineAxis,
-                                          aFlags & IGNORE_PADDING,
-                                          aPercentageBasis);
        nscoord bSizeTakenByBoxSizing =
          GetDefiniteSizeTakenByBoxSizing(boxSizing, aFrame, !isInlineAxis,
                                          aFlags & IGNORE_PADDING,
                                          aPercentageBasis);
-        boxSizingAdjust.BSize(wm) = bSizeTakenByBoxSizing;
-        auto iSizeFromBSize = [&](nscoord aBSize) {
-          LogicalAxis dependentAxis =
-            isInlineAxis ? eLogicalAxisInline : eLogicalAxisBlock;
-          return ratio.ComputeRatioDependentSize(
-              dependentAxis, wm, aBSize, boxSizingAdjust);
-        };
        // NOTE: This is only the minContentSize if we've been passed MIN_INTRINSIC_ISIZE
        // (which is fine, because this should only be used inside a check for that flag).
        nscoord minContentSize = result;
@@ -5137,14 +5128,14 @@ nsLayoutUtils::IntrinsicForAxis(PhysicalAxis              aAxis,
            (aPercentageBasis.isNothing() &&
             GetPercentBSize(styleBSize, aFrame, horizontalAxis, h))) {
          h = std::max(0, h - bSizeTakenByBoxSizing);
-          result = iSizeFromBSize(h);
+          result = ratio.ApplyTo(h);
        }

        if (GetDefiniteSize(styleMaxBSize, aFrame, !isInlineAxis, aPercentageBasis, &h) ||
            (aPercentageBasis.isNothing() &&
             GetPercentBSize(styleMaxBSize, aFrame, horizontalAxis, h))) {
          h = std::max(0, h - bSizeTakenByBoxSizing);
-          nscoord maxISize = iSizeFromBSize(h);
+          nscoord maxISize = ratio.ApplyTo(h);
          if (maxISize < result) {
            result = maxISize;
          }
@@ -5157,7 +5148,7 @@ nsLayoutUtils::IntrinsicForAxis(PhysicalAxis              aAxis,
            (aPercentageBasis.isNothing() &&
             GetPercentBSize(styleMinBSize, aFrame, horizontalAxis, h))) {
          h = std::max(0, h - bSizeTakenByBoxSizing);
-          nscoord minISize = iSizeFromBSize(h);
+          nscoord minISize = ratio.ApplyTo(h);
          if (minISize > result) {
            result = minISize;
          }
@@ -234,18 +234,7 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
 {
  WritingMode wm = GetWritingMode();
  LogicalSize availSize = aButtonReflowInput.ComputedSize(wm);
-
-  // Identify if the inner anonymous block is actually functioning as a flex or grid container.
-  nsIAtom* kidType = aFirstKid->GetType();
-  bool isFlexOrGrid = (kidType == nsGkAtoms::flexContainerFrame ||
-                       kidType == nsGkAtoms::gridContainerFrame);
-
-  // Preserve the button's definite BSize ONLY for flex/grid children so they
-  // see a definite containing block main size. For standard buttons, clobber
-  // to intrinsic so standard vertical centering (extraSpace) calculations work.
-  if (!isFlexOrGrid || aButtonReflowInput.ComputedBSize() == NS_INTRINSICSIZE) {
-    availSize.BSize(wm) = NS_INTRINSICSIZE;
-  }
+  availSize.BSize(wm) = NS_INTRINSICSIZE;

  // shorthand for a value we need to use in a bunch of places
  const LogicalMargin& clbp = aButtonReflowInput.ComputedLogicalBorderPadding();
@@ -259,12 +248,6 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
                                  aFirstKid,
                                  availSize);

-  // Apply the definite BSize directly on the inner reflow input ONLY if it's
-  // a flex or grid container, allowing it to be used as-is.
-  if (isFlexOrGrid && aButtonReflowInput.ComputedBSize() != NS_INTRINSICSIZE) {
-    contentsReflowInput.SetComputedBSize(aButtonReflowInput.ComputedBSize());
-  }
-
  nsReflowStatus contentsReflowStatus;
  ReflowOutput contentsDesiredSize(aButtonReflowInput);
  childPos.B(wm) = 0; // This will be set properly later, after reflowing the
@@ -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/. */
-
-#include "mozilla/AspectRatio.h"
-
-#include "mozilla/WritingModes.h"
-
-namespace mozilla {
-
-nscoord
-AspectRatio::ComputeRatioDependentSize(
-    LogicalAxis aRatioDependentAxis,
-    const WritingMode& aWM,
-    nscoord aRatioDeterminingSize,
-    const LogicalSize& aContentBoxToBoxSizingAdjust) const
-{
-  MOZ_DIAGNOSTIC_ASSERT(*this);
-
-  LogicalSize adjust(aWM);
-  if (mUseBoxSizing == UseBoxSizing::Yes) {
-    adjust = aContentBoxToBoxSizingAdjust;
-  }
-
-  AspectRatio logicalRatio = aWM.IsVertical() ? Inverted() : *this;
-  nscoord result;
-  if (aRatioDependentAxis == eLogicalAxisInline) {
-    result = logicalRatio.ApplyTo(aRatioDeterminingSize +
-                                  adjust.BSize(aWM)) -
-             adjust.ISize(aWM);
-  } else {
-    result = logicalRatio.Inverted().ApplyTo(aRatioDeterminingSize +
-                                             adjust.ISize(aWM)) -
-             adjust.BSize(aWM);
-  }
-  return std::max(nscoord(0), result);
-}
-
-} // namespace mozilla
@@ -9,46 +9,21 @@
 /* The aspect ratio of a box, in a "width / height" format. */

 #include "mozilla/Attributes.h"
-#include "mozilla/LogicalTypes.h"
 #include "nsCoord.h"
-#include "nsSize.h"
 #include <algorithm>
 #include <limits>

 namespace mozilla {

-class LogicalSize;
-class WritingMode;
-
-enum class UseBoxSizing : uint8_t {
-  // Natural ratios and "auto <ratio>" always use content-box dimensions.
-  No,
-  // A specified <ratio> uses the dimensions selected by box-sizing.
-  Yes,
-};
-
 struct AspectRatio {
-  AspectRatio()
-    : mRatio(0.0f)
-    , mUseBoxSizing(UseBoxSizing::No)
-  {}
+  AspectRatio() : mRatio(0.0f) {}
+  explicit AspectRatio(float aRatio) : mRatio(std::max(aRatio, 0.0f)) {}

-  explicit AspectRatio(float aRatio,
-                       UseBoxSizing aUseBoxSizing = UseBoxSizing::No)
-    : mRatio(std::max(aRatio, 0.0f))
-    , mUseBoxSizing(aUseBoxSizing)
-  {}
-
-  static AspectRatio FromSize(float aWidth, float aHeight,
-                              UseBoxSizing aUseBoxSizing = UseBoxSizing::No) {
+  static AspectRatio FromSize(float aWidth, float aHeight) {
    if (aWidth == 0.0f || aHeight == 0.0f) {
      return AspectRatio();
    }
-    float ratio = aWidth / aHeight;
-    if (!std::isfinite(ratio)) {
-      return AspectRatio();
-    }
-    return AspectRatio(ratio, aUseBoxSizing);
+    return AspectRatio(aWidth / aHeight);
  }

  static AspectRatio FromSize(nsSize aSize) {
@@ -80,23 +55,11 @@ struct AspectRatio {
    // 0.0f in the division here (so that valid ratios always generate other
    // valid ratios when inverted).
    return AspectRatio(
-        std::max(std::numeric_limits<float>::epsilon(), 1.0f / mRatio),
-        mUseBoxSizing);
+        std::max(std::numeric_limits<float>::epsilon(), 1.0f / mRatio));
  }

-  /**
-   * Computes a content-box size in the ratio-dependent axis from a
-   * content-box size in the ratio-determining axis.
-   */
-  nscoord ComputeRatioDependentSize(
-      LogicalAxis aRatioDependentAxis,
-      const WritingMode& aWM,
-      nscoord aRatioDeterminingSize,
-      const LogicalSize& aContentBoxToBoxSizingAdjust) const;
-
  bool operator==(const AspectRatio& aOther) const {
-    return mRatio == aOther.mRatio &&
-           mUseBoxSizing == aOther.mUseBoxSizing;
+    return mRatio == aOther.mRatio;
  }

  bool operator!=(const AspectRatio& aOther) const {
@@ -110,7 +73,6 @@ struct AspectRatio {
 private:
  // 0.0f represents no aspect ratio.
  float mRatio;
-  UseBoxSizing mUseBoxSizing;
 };

 }  // namespace mozilla
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#ifndef mozilla_LogicalTypes_h
-#define mozilla_LogicalTypes_h
-
-namespace mozilla {
-
-// Logical axis, edge, side and corner constants for use in various places.
-enum LogicalAxis {
-  eLogicalAxisBlock  = 0x0,
-  eLogicalAxisInline = 0x1
-};
-enum LogicalEdge {
-  eLogicalEdgeStart  = 0x0,
-  eLogicalEdgeEnd    = 0x1
-};
-enum LogicalSide {
-  eLogicalSideBStart = (eLogicalAxisBlock  << 1) | eLogicalEdgeStart,  // 0x0
-  eLogicalSideBEnd   = (eLogicalAxisBlock  << 1) | eLogicalEdgeEnd,    // 0x1
-  eLogicalSideIStart = (eLogicalAxisInline << 1) | eLogicalEdgeStart,  // 0x2
-  eLogicalSideIEnd   = (eLogicalAxisInline << 1) | eLogicalEdgeEnd     // 0x3
-};
-
-enum LogicalCorner
-{
-  eLogicalCornerBStartIStart = 0,
-  eLogicalCornerBStartIEnd   = 1,
-  eLogicalCornerBEndIEnd     = 2,
-  eLogicalCornerBEndIStart   = 3
-};
-
-} // namespace mozilla
-
-#endif // mozilla_LogicalTypes_h
@@ -6,7 +6,6 @@
 #ifndef WritingModes_h_
 #define WritingModes_h_

-#include "mozilla/LogicalTypes.h"
 #include "nsRect.h"
 #include "nsStyleContext.h"
 #include "nsBidiUtils.h"
@@ -110,7 +110,6 @@ EXPORTS += [
 EXPORTS.mozilla += [
    'AspectRatio.h',
    'CSSAlignUtils.h',
-    'LogicalTypes.h',
    'ReflowInput.h',
    'ReflowOutput.h',
    'WritingModes.h',
@@ -125,7 +124,6 @@ EXPORTS.mozilla.layout += [
 ]

 UNIFIED_SOURCES += [
-    'AspectRatio.cpp',
    'AsyncScrollBase.cpp',
    'BlockReflowInput.cpp',
    'CSSAlignUtils.cpp',
@@ -1945,7 +1945,7 @@ FlexItem::FlexItem(ReflowInput& aFlexItemReflowInput,
  : mFrame(aFlexItemReflowInput.mFrame),
    mFlexGrow(aFlexGrow),
    mFlexShrink(aFlexShrink),
-    mIntrinsicRatio(mFrame->GetAspectRatio()),
+    mIntrinsicRatio(mFrame->GetIntrinsicRatio()),
    mBorderPadding(aFlexItemReflowInput.ComputedPhysicalBorderPadding()),
    mMargin(aFlexItemReflowInput.ComputedPhysicalMargin()),
    mMainMinSize(aMainMinSize),
@@ -4655,44 +4655,10 @@ nsFrame::GetIntrinsicSize()
 /* virtual */ AspectRatio
 nsFrame::GetIntrinsicRatio()
 {
-  return AspectRatio();
-}
-
-AspectRatio
-nsIFrame::GetAspectRatio()
-{
-  // The property does not apply to inline boxes or internal ruby/table boxes.
-  nsIAtom* type = GetType();
-  if (type == nsGkAtoms::inlineFrame ||
-      RubyUtils::IsRubyBox(type) ||
-      type == nsGkAtoms::tableCellFrame ||
-      type == nsGkAtoms::tableColFrame ||
-      type == nsGkAtoms::tableColGroupFrame ||
-      type == nsGkAtoms::tableRowFrame ||
-      type == nsGkAtoms::tableRowGroupFrame) {
-    return AspectRatio();
-  }
-
-  const StyleAspectRatio& styleRatio = StylePosition()->mAspectRatio;
-
-  // A non-auto, non-degenerate ratio overrides the natural ratio and uses the
-  // box selected by box-sizing.
-  if (!styleRatio.mAuto && styleRatio.HasUsableRatio()) {
-    return AspectRatio::FromSize(styleRatio.mWidth, styleRatio.mHeight,
-                                 UseBoxSizing::Yes);
-  }
-
-  if (AspectRatio intrinsicRatio = GetIntrinsicRatio()) {
-    return intrinsicRatio;
-  }
-
-  // The fallback in "auto <ratio>" always operates on the content box.
-  if (styleRatio.HasUsableRatio()) {
-    return AspectRatio::FromSize(styleRatio.mWidth, styleRatio.mHeight,
-                                 UseBoxSizing::No);
-  }
-
-  return AspectRatio();
+  const nsStylePosition* stylePos = StylePosition();
+  return stylePos->mAspectRatio == 0.0f
+         ? AspectRatio()
+         : AspectRatio(stylePos->mAspectRatio);
 }

 void
@@ -4761,11 +4727,11 @@ nsFrame::ComputeSize(nsRenderingContext* aRenderingContext,
                     const LogicalSize&  aPadding,
                     ComputeSizeFlags    aFlags)
 {
-  AspectRatio aspectRatio = GetAspectRatio();
-  if (aspectRatio) {
+  AspectRatio intrinsicRatio = GetIntrinsicRatio();
+  if (intrinsicRatio) {
    return ComputeSizeWithIntrinsicDimensions(aRenderingContext, aWM,
                                              GetIntrinsicSize(),
-                                              aspectRatio,
+                                              intrinsicRatio,
                                              aCBSize, aMargin,
                                              aBorder, aPadding,
                                              aFlags);
@@ -5010,6 +4976,8 @@ nsFrame::ComputeSizeWithIntrinsicDimensions(nsRenderingContext*  aRenderingConte
                                            const LogicalSize&   aPadding,
                                            ComputeSizeFlags     aFlags)
 {
+  auto logicalRatio =
+      aWM.IsVertical() ? aIntrinsicRatio.Inverted() : aIntrinsicRatio;
  const nsStylePosition* stylePos = StylePosition();
  const nsStyleCoord* inlineStyleCoord = &stylePos->ISize(aWM);
  const nsStyleCoord* blockStyleCoord = &stylePos->BSize(aWM);
@@ -5071,14 +5039,6 @@ nsFrame::ComputeSizeWithIntrinsicDimensions(nsRenderingContext*  aRenderingConte
  if (stylePos->mBoxSizing == StyleBoxSizing::Border) {
    boxSizingAdjust = aBorder + aPadding;
  }
-  auto iSizeFromBSize = [&](nscoord aBSize) {
-    return aIntrinsicRatio.ComputeRatioDependentSize(
-        eLogicalAxisInline, aWM, aBSize, boxSizingAdjust);
-  };
-  auto bSizeFromISize = [&](nscoord aISize) {
-    return aIntrinsicRatio.ComputeRatioDependentSize(
-        eLogicalAxisBlock, aWM, aISize, boxSizingAdjust);
-  };
  nscoord boxSizingToMarginEdgeISize =
    aMargin.ISize(aWM) + aBorder.ISize(aWM) + aPadding.ISize(aWM) -
      boxSizingAdjust.ISize(aWM);
@@ -5169,8 +5129,7 @@ nsFrame::ComputeSizeWithIntrinsicDimensions(nsRenderingContext*  aRenderingConte
    bSize = nsLayoutUtils::ComputeBSizeValue(aCBSize.BSize(aWM),
                boxSizingAdjust.BSize(aWM),
                *blockStyleCoord);
-  } else if (MOZ_UNLIKELY(isGridItem) &&
-             !(aFlags & nsIFrame::eUseAutoBSize)) {
+  } else if (MOZ_UNLIKELY(isGridItem)) {
    MOZ_ASSERT(!IS_TRUE_OVERFLOW_CONTAINER(this));
    // 'auto' block-size for grid-level box - apply 'stretch' as needed:
    auto cbSize = aCBSize.BSize(aWM);
@@ -5271,9 +5230,9 @@ nsFrame::ComputeSizeWithIntrinsicDimensions(nsRenderingContext*  aRenderingConte

      if (hasIntrinsicISize) {
        tentISize = intrinsicISize;
-      } else if (hasIntrinsicBSize && aIntrinsicRatio) {
-        tentISize = iSizeFromBSize(intrinsicBSize);
-      } else if (aIntrinsicRatio) {
+      } else if (hasIntrinsicBSize && logicalRatio) {
+        tentISize = logicalRatio.ApplyTo(intrinsicBSize);
+      } else if (logicalRatio) {
        tentISize = aCBSize.ISize(aWM) - boxSizingToMarginEdgeISize; // XXX scrollbar?
        if (tentISize < 0) tentISize = 0;
      } else {
@@ -5290,8 +5249,8 @@ nsFrame::ComputeSizeWithIntrinsicDimensions(nsRenderingContext*  aRenderingConte

      if (hasIntrinsicBSize) {
        tentBSize = intrinsicBSize;
-      } else if (aIntrinsicRatio) {
-        tentBSize = bSizeFromISize(tentISize);
+      } else if (logicalRatio) {
+        tentBSize = logicalRatio.Inverted().ApplyTo(tentISize);
      } else {
        tentBSize = nsPresContext::CSSPixelsToAppUnits(150);
      }
@@ -5302,39 +5261,39 @@ nsFrame::ComputeSizeWithIntrinsicDimensions(nsRenderingContext*  aRenderingConte
        stretchB = (stretchI == eStretch ? eStretch : eStretchPreservingRatio);
      }

-      if (aIntrinsicRatio) {
+      if (logicalRatio) {
        if (stretchI == eStretch) {
          tentISize = iSize;  // * / 'stretch'
          if (stretchB == eStretch) {
            tentBSize = bSize;  // 'stretch' / 'stretch'
          } else if (stretchB == eStretchPreservingRatio) {
            // 'normal' / 'stretch'
-            tentBSize = bSizeFromISize(iSize);
+            tentBSize = logicalRatio.Inverted().ApplyTo(iSize);
          }
        } else if (stretchB == eStretch) {
          tentBSize = bSize;  // 'stretch' / * (except 'stretch')
          if (stretchI == eStretchPreservingRatio) {
            // 'stretch' / 'normal'
-            tentISize = iSizeFromBSize(bSize);
+            tentISize = logicalRatio.ApplyTo(bSize);
          }
        } else if (stretchI == eStretchPreservingRatio) {
          tentISize = iSize;  // * (except 'stretch') / 'normal'
-          tentBSize = bSizeFromISize(iSize);
+          tentBSize = logicalRatio.Inverted().ApplyTo(iSize);
          if (stretchB == eStretchPreservingRatio && tentBSize > bSize) {
            // Stretch within the CB size with preserved intrinsic ratio.
            tentBSize = bSize;  // 'normal' / 'normal'
-            tentISize = iSizeFromBSize(bSize);
+            tentISize = logicalRatio.ApplyTo(bSize);
          }
        } else if (stretchB == eStretchPreservingRatio) {
          tentBSize = bSize;  // 'normal' / * (except 'normal' and 'stretch')
-          tentISize = iSizeFromBSize(bSize);
+          tentISize = logicalRatio.ApplyTo(bSize);
        }
      }

      // ComputeAutoSizeWithIntrinsicDimensions preserves the ratio when applying
      // the min/max-size.  We don't want that when we have 'stretch' in either
      // axis because tentISize/tentBSize is likely not according to ratio now.
-      if (aIntrinsicRatio && stretchI != eStretch && stretchB != eStretch) {
+      if (logicalRatio && stretchI != eStretch && stretchB != eStretch) {
        nsSize autoSize = nsLayoutUtils::
          ComputeAutoSizeWithIntrinsicDimensions(minISize, minBSize,
                                                 maxISize, maxBSize,
@@ -5355,8 +5314,8 @@ nsFrame::ComputeSizeWithIntrinsicDimensions(nsRenderingContext*  aRenderingConte
      // 'auto' iSize, non-'auto' bSize
      bSize = NS_CSS_MINMAX(bSize, minBSize, maxBSize);
      if (stretchI != eStretch) {
-        if (aIntrinsicRatio) {
-          iSize = iSizeFromBSize(bSize);
+        if (logicalRatio) {
+          iSize = logicalRatio.ApplyTo(bSize);
        } else if (hasIntrinsicISize) {
          if (!((aFlags & ComputeSizeFlags::eIClampMarginBoxMinSize) &&
                intrinsicISize > iSize)) {
@@ -5375,8 +5334,8 @@ nsFrame::ComputeSizeWithIntrinsicDimensions(nsRenderingContext*  aRenderingConte
      // non-'auto' iSize, 'auto' bSize
      iSize = NS_CSS_MINMAX(iSize, minISize, maxISize);
      if (stretchB != eStretch) {
-        if (aIntrinsicRatio) {
-          bSize = bSizeFromISize(iSize);
+        if (logicalRatio) {
+          bSize = logicalRatio.Inverted().ApplyTo(iSize);
        } else if (hasIntrinsicBSize) {
          if (!((aFlags & ComputeSizeFlags::eBClampMarginBoxMinSize) &&
                intrinsicBSize > bSize)) {
@@ -318,11 +318,7 @@ nsHTMLFramesetFrame::Init(nsIContent*       aContent,
        mChildFrameborder[mChildCount] = GetFrameBorder(child);
        mChildBorderColors[mChildCount].Set(GetBorderColor(child));
      }
-      if (MOZ_LIKELY(!child->GetPrimaryFrame())) {
-        // Child might have a pre-existing primary frame if we're doing fixed-pos
-        // replication... So, only set it if there is no primary frame yet.
-        child->SetPrimaryFrame(frame);
-      }
+      child->SetPrimaryFrame(frame);

      mFrames.AppendFrame(nullptr, frame);