Merge branch 'master' into release

# Conflicts:
#	dom/media/webm/WebMDemuxer.cpp

CLOBBER

@@ -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

TRADEMARK

@@ -1,8 +0,0 @@
-TRADEMARK NOTICE
-================
-
-The name "Goanna" and visual representations (logo) have not been
-registered by the Copyright owners as a trademark in any jurisdiction.
-However, because Goanna has been distributed and maintained world-wide,
-continually since 2015, the Copyright owners claim "common-law trademark
-protection" in any jurisdiction where common-law trademark is recognized.

accessible/atk/Platform.cpp

@@ -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

build/gyp.mozbuild

@@ -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,

build/moz.configure/init.configure

@@ -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'):

build/moz.configure/old.configure

@@ -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',

build/unix/run-mozilla.sh

@@ -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

config/system-headers

@@ -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

devtools/client/inspector/shared/tooltips-overlay.js

@@ -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;
       }
     }

devtools/client/jsonview/converter-child.js

@@ -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 = "css/main.css";
 
   let script = doc.createElement("script");
-  script.src = appRoot + "lib/require.js";
-  script.dataset.main = appRoot + "viewer-config.js";
+  script.src = "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", {

devtools/client/jsonview/test/browser.ini

@@ -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]

devtools/client/jsonview/test/browser_jsonview_csp_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");
-});

devtools/client/jsonview/test/csp_json.json

@@ -1 +0,0 @@
-{"csp": true}

devtools/client/jsonview/test/csp_json.json^headers^

@@ -1,2 +0,0 @@
-Content-Type: application/json
-Content-Security-Policy: default-src 'none'; base-uri 'none';

devtools/client/jsonview/viewer-config.js

@@ -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",

devtools/client/preferences/moz.build

@@ -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',
 ]

devtools/client/shared/css-angle.js

@@ -10,8 +10,7 @@ const SPECIALVALUES = new Set([
   "initial",
   "inherit",
   "unset",
-  "revert",
-  "revert-layer"
+  "revert"
 ]);
 
 const {getCSSLexer} = require("devtools/shared/css/lexer");

devtools/client/shared/widgets/FilterWidget.js

@@ -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

devtools/client/styleeditor/StyleSheetEditor.jsm

@@ -103,6 +103,12 @@ function StyleSheetEditor(styleSheet, win, file, isNew, walker, highlighter) {
     }
   };
 
+  this._styleSheetFilePath = null;
+  if (styleSheet.href &&
+      Services.io.extractScheme(this.styleSheet.href) == "file") {
+    this._styleSheetFilePath = this.styleSheet.href;
+  }
+
   this._onPropertyChange = this._onPropertyChange.bind(this);
   this._onError = this._onError.bind(this);
   this._onMediaRuleMatchesChange = this._onMediaRuleMatchesChange.bind(this);
@@ -658,7 +664,8 @@ StyleSheetEditor.prototype = {
     if (this._friendlyName) {
       defaultName = OS.Path.basename(this._friendlyName);
     }
-    showFilePicker(file, true, this._window, onFile, defaultName);
+    showFilePicker(file || this._styleSheetFilePath, true, this._window,
+                   onFile, defaultName);
   },
 
   /**

devtools/client/styleeditor/test/browser_styleeditor_filesave.js

@@ -1,112 +1,98 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-// Test that 'Save' function works.
-
-const TESTCASE_URI_HTML = TEST_BASE_HTTP + "simple.html";
-const TESTCASE_URI_CSS = TEST_BASE_HTTP + "simple.css";
-
-var tempScope = {};
-Components.utils.import("resource://gre/modules/FileUtils.jsm", tempScope);
-Components.utils.import("resource://gre/modules/NetUtil.jsm", tempScope);
-var FileUtils = tempScope.FileUtils;
-var NetUtil = tempScope.NetUtil;
-
-add_task(function* () {
-  let htmlFile = yield copy(TESTCASE_URI_HTML, "simple.html");
-  const cssFile = await copy(TESTCASE_URI_CSS, "simple.css");
-  let uri = Services.io.newFileURI(htmlFile);
-  let filePath = uri.resolve("");
-
-  let { ui } = yield openStyleEditorForURL(filePath);
-
-  let editor = ui.editors[0];
-  yield editor.getSourceEditor();
-
-  is(
-    editor.savedFile,
-    null,
-    "savedFile should not be pre-populated from the source file"
-  );
-
-  info("Editing the style sheet.");
-  let dirty = editor.sourceEditor.once("dirty-change");
-  let beginCursor = {line: 0, ch: 0};
-  editor.sourceEditor.replaceText("DIRTY TEXT", beginCursor, beginCursor);
-
-  yield dirty;
-
-  is(editor.sourceEditor.isClean(), false, "Editor is dirty.");
-  ok(editor.summary.classList.contains("unsaved"),
-     "Star icon is present in the corresponding summary.");
-
-  info(
-    "Saving the changes with an explicit file (simulating a user-chosen save location)."
-  );
-  dirty = editor.sourceEditor.once("dirty-change");
-
-  editor.saveToFile(cssFile, function (file) {
-    ok(file, "file should get saved when explicitly passing a file");
-  });
-
-  yield dirty;
-
-  is(editor.sourceEditor.isClean(), true, "Editor is clean.");
-  ok(!editor.summary.classList.contains("unsaved"),
-     "Star icon is not present in the corresponding summary.");
-
-  is(
-    editor.savedFile?.path,
-    cssFile.path,
-    "savedFile should now be set on the editor"
-  );
-});
-
-function copy(srcChromeURL, destFileName) {
-  let deferred = defer();
-  let destFile = FileUtils.getFile("ProfD", [destFileName]);
-  write(read(srcChromeURL), destFile, deferred.resolve);
-
-  return deferred.promise;
-}
-
-function read(srcChromeURL) {
-  let scriptableStream = Cc["@mozilla.org/scriptableinputstream;1"]
-    .getService(Ci.nsIScriptableInputStream);
-
-  let channel = NetUtil.newChannel({
-    uri: srcChromeURL,
-    loadUsingSystemPrincipal: true
-  });
-  let input = channel.open2();
-  scriptableStream.init(input);
-
-  let data = "";
-  while (input.available()) {
-    data = data.concat(scriptableStream.read(input.available()));
-  }
-  scriptableStream.close();
-  input.close();
-
-  return data;
-}
-
-function write(data, file, callback) {
-  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-    .createInstance(Ci.nsIScriptableUnicodeConverter);
-
-  converter.charset = "UTF-8";
-
-  let istream = converter.convertToInputStream(data);
-  let ostream = FileUtils.openSafeFileOutputStream(file);
-
-  NetUtil.asyncCopy(istream, ostream, function (status) {
-    if (!Components.isSuccessCode(status)) {
-      info("Couldn't write to " + file.path);
-      return;
-    }
-
-    callback(file);
-  });
-}
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+// Test that 'Save' function works.
+
+const TESTCASE_URI_HTML = TEST_BASE_HTTP + "simple.html";
+const TESTCASE_URI_CSS = TEST_BASE_HTTP + "simple.css";
+
+var tempScope = {};
+Components.utils.import("resource://gre/modules/FileUtils.jsm", tempScope);
+Components.utils.import("resource://gre/modules/NetUtil.jsm", tempScope);
+var FileUtils = tempScope.FileUtils;
+var NetUtil = tempScope.NetUtil;
+
+add_task(function* () {
+  let htmlFile = yield copy(TESTCASE_URI_HTML, "simple.html");
+  yield copy(TESTCASE_URI_CSS, "simple.css");
+  let uri = Services.io.newFileURI(htmlFile);
+  let filePath = uri.resolve("");
+
+  let { ui } = yield openStyleEditorForURL(filePath);
+
+  let editor = ui.editors[0];
+  yield editor.getSourceEditor();
+
+  info("Editing the style sheet.");
+  let dirty = editor.sourceEditor.once("dirty-change");
+  let beginCursor = {line: 0, ch: 0};
+  editor.sourceEditor.replaceText("DIRTY TEXT", beginCursor, beginCursor);
+
+  yield dirty;
+
+  is(editor.sourceEditor.isClean(), false, "Editor is dirty.");
+  ok(editor.summary.classList.contains("unsaved"),
+     "Star icon is present in the corresponding summary.");
+
+  info("Saving the changes.");
+  dirty = editor.sourceEditor.once("dirty-change");
+
+  editor.saveToFile(null, function (file) {
+    ok(file, "file should get saved directly when using a file:// URI");
+  });
+
+  yield dirty;
+
+  is(editor.sourceEditor.isClean(), true, "Editor is clean.");
+  ok(!editor.summary.classList.contains("unsaved"),
+     "Star icon is not present in the corresponding summary.");
+});
+
+function copy(srcChromeURL, destFileName) {
+  let deferred = defer();
+  let destFile = FileUtils.getFile("ProfD", [destFileName]);
+  write(read(srcChromeURL), destFile, deferred.resolve);
+
+  return deferred.promise;
+}
+
+function read(srcChromeURL) {
+  let scriptableStream = Cc["@mozilla.org/scriptableinputstream;1"]
+    .getService(Ci.nsIScriptableInputStream);
+
+  let channel = NetUtil.newChannel({
+    uri: srcChromeURL,
+    loadUsingSystemPrincipal: true
+  });
+  let input = channel.open2();
+  scriptableStream.init(input);
+
+  let data = "";
+  while (input.available()) {
+    data = data.concat(scriptableStream.read(input.available()));
+  }
+  scriptableStream.close();
+  input.close();
+
+  return data;
+}
+
+function write(data, file, callback) {
+  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+    .createInstance(Ci.nsIScriptableUnicodeConverter);
+
+  converter.charset = "UTF-8";
+
+  let istream = converter.convertToInputStream(data);
+  let ostream = FileUtils.openSafeFileOutputStream(file);
+
+  NetUtil.asyncCopy(istream, ostream, function (status) {
+    if (!Components.isSuccessCode(status)) {
+      info("Couldn't write to " + file.path);
+      return;
+    }
+
+    callback(file);
+  });
+}

devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js

@@ -28,10 +28,7 @@ add_task(function* () {
   let HTMLFile = yield copy(TESTCASE_URI_HTML, ["sourcemaps.html"]);
   let CSSFile = yield copy(TESTCASE_URI_CSS,
     ["sourcemap-css", "sourcemaps.css"]);
-  const SCSSFile = await copy(TESTCASE_URI_SCSS, [
-    "sourcemap-sass",
-    "sourcemaps.scss",
-  ]);
+  yield copy(TESTCASE_URI_SCSS, ["sourcemap-sass", "sourcemaps.scss"]);
   yield copy(TESTCASE_URI_MAP, ["sourcemap-css", "sourcemaps.css.map"]);
   yield copy(TESTCASE_URI_REG_CSS, ["simple.css"]);
 
@@ -62,7 +59,7 @@ add_task(function* () {
 
   // Edit and save Sass in the editor. This will start off a file-watching
   // process waiting for the CSS file to change.
-  yield editSCSS(SCSSFile, editor);
+  yield editSCSS(editor);
 
   // We can't run Sass or another compiler, so we fake it by just
   // directly changing the CSS file.
@@ -76,12 +73,12 @@ add_task(function* () {
   is(color, "rgb(0, 0, 255)", "div is blue after saving file");
 });
 
-function editSCSS(SCSSFile, editor) {
+function editSCSS(editor) {
   let deferred = defer();
 
   editor.sourceEditor.setText(CSS_TEXT);
 
-  editor.saveToFile(SCSSFile, function (file) {
+  editor.saveToFile(null, function (file) {
     ok(file, "Scss file should be saved");
     deferred.resolve();
   });

devtools/shared/css/color.js

@@ -20,8 +20,7 @@ const SPECIALVALUES = new Set([
   "inherit",
   "transparent",
   "unset",
-  "revert",
-  "revert-layer"
+  "revert"
 ]);
 
 /**

devtools/shared/css/generated/mach_commands.py

@@ -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))

dom/base/MutableBlobStorage.cpp

@@ -196,7 +196,7 @@ public:
   {
     MOZ_ASSERT(!NS_IsMainThread());
 
-    int32_t written = mLength < INT32_MAX ? PR_Write(mFD, mData, mLength) : -1;
+    int32_t written = PR_Write(mFD, mData, mLength);
     if (NS_WARN_IF(written < 0 || uint32_t(written) != mLength)) {
       return NS_DispatchToMainThread(
         new ErrorPropagationRunnable(mBlobStorage, NS_ERROR_FAILURE));

dom/base/nsAttrValue.h

@@ -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))

dom/bindings/ToJSValue.h

@@ -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;
 }
 

dom/canvas/WebGLTransformFeedback.cpp

@@ -39,44 +39,6 @@ WebGLTransformFeedback::Delete()
 
 ////////////////////////////////////////
 
-// Validation helper for beginning/resuming the TF and computing the
-// vertex capacity.
-bool
-WebGLTransformFeedback::PrepareTransformFeedback() {
-    const auto& prog = mContext->mCurrentProgram;
-    if (!prog ||
-        !prog->IsLinked() ||
-        !prog->LinkInfo()->componentsPerTFVert.size()) {
-        mContext->ErrorInvalidOperation("Current program not valid for transform feedback.");
-        return false;
-    }
-
-    const auto& linkInfo = prog->LinkInfo();
-    const auto& componentsPerTFVert = linkInfo->componentsPerTFVert;
-    
-    mActive_VertCapacity = 0;
-
-    size_t minVertCapacity = SIZE_MAX;
-    for (size_t i = 0; i < componentsPerTFVert.size(); i++) {
-        const auto& indexedBinding = mIndexedBindings[i];
-        const auto& componentsPerVert = componentsPerTFVert[i];
-
-        const auto& buffer = indexedBinding.mBufferBinding;
-        if (!buffer) {
-            mContext->ErrorInvalidOperation("No buffer attached to required transform feedback index %u.",
-                                            (uint32_t)i);
-            return false;
-        }
-
-        const size_t vertCapacity = buffer->ByteLength() / 4 / componentsPerVert;
-        minVertCapacity = std::min(minVertCapacity, vertCapacity);
-    }
-    
-    mActive_VertCapacity = minVertCapacity;
-    
-    return true;
-}
-
 void
 WebGLTransformFeedback::BeginTransformFeedback(GLenum primMode)
 {
@@ -97,10 +59,37 @@ WebGLTransformFeedback::BeginTransformFeedback(GLenum primMode)
         return;
     }
 
-    if (!PrepareTransformFeedback()) {
+    const auto& prog = mContext->mCurrentProgram;
+    if (!prog ||
+        !prog->IsLinked() ||
+        !prog->LinkInfo()->componentsPerTFVert.size())
+    {
+        mContext->ErrorInvalidOperation("%s: Current program not valid for transform"
+                                        " feedback.",
+                                        funcName);
         return;
     }
 
+    const auto& linkInfo = prog->LinkInfo();
+    const auto& componentsPerTFVert = linkInfo->componentsPerTFVert;
+
+    size_t minVertCapacity = SIZE_MAX;
+    for (size_t i = 0; i < componentsPerTFVert.size(); i++) {
+        const auto& indexedBinding = mIndexedBindings[i];
+        const auto& componentsPerVert = componentsPerTFVert[i];
+
+        const auto& buffer = indexedBinding.mBufferBinding;
+        if (!buffer) {
+            mContext->ErrorInvalidOperation("%s: No buffer attached to required transform"
+                                            " feedback index %u.",
+                                            funcName, (uint32_t)i);
+            return;
+        }
+
+        const size_t vertCapacity = buffer->ByteLength() / 4 / componentsPerVert;
+        minVertCapacity = std::min(minVertCapacity, vertCapacity);
+    }
+
     ////
 
     const auto& gl = mContext->gl;
@@ -112,9 +101,10 @@ WebGLTransformFeedback::BeginTransformFeedback(GLenum primMode)
     mIsActive = true;
     MOZ_ASSERT(!mIsPaused);
 
-    mActive_Program = mContext->mCurrentProgram;
+    mActive_Program = prog;
     mActive_PrimMode = primMode;
     mActive_VertPosition = 0;
+    mActive_VertCapacity = minVertCapacity;
 
     ////
 
@@ -183,12 +173,6 @@ WebGLTransformFeedback::ResumeTransformFeedback()
         return;
     }
 
-    // Re-run prepare in case some of the buffers have been modified
-    // while the TF was paused.
-    if (!PrepareTransformFeedback()) {
-        return;
-    }
-
     ////
 
     const auto& gl = mContext->gl;

dom/canvas/WebGLTransformFeedback.h

@@ -44,7 +44,6 @@ public:
     WebGLTransformFeedback(WebGLContext* webgl, GLuint tf);
 private:
     ~WebGLTransformFeedback();
-    bool PrepareTransformFeedback();
 
 public:
     NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLTransformFeedback)

dom/html/HTMLImageElement.cpp

@@ -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);
 }

dom/html/HTMLImageElement.h

@@ -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);
 

dom/html/HTMLSharedElement.cpp

@@ -18,8 +18,6 @@
 #include "nsContentUtils.h"
 #include "nsIContentSecurityPolicy.h"
 #include "nsIURI.h"
-#include "nsNetUtil.h"
-#include "nsIProtocolHandler.h"
 
 NS_IMPL_NS_NEW_HTML_ELEMENT(Shared)
 
@@ -188,8 +186,6 @@ SetBaseURIUsingFirstBaseWithHref(nsIDocument* aDocument, nsIContent* aMustMatch)
         newBaseURI = nullptr;
       }
       if (csp && newBaseURI) {
-        bool isLocalResource = false;
-        rv = NS_URIChainHasFlags(newBaseURI, nsIProtocolHandler::URI_IS_LOCAL_RESOURCE, &isLocalResource);
         // base-uri is only enforced if explicitly defined in the
         // policy - do *not* consult default-src, see:
         // http://www.w3.org/TR/CSP2/#directive-default-src
@@ -197,7 +193,7 @@ SetBaseURIUsingFirstBaseWithHref(nsIDocument* aDocument, nsIContent* aMustMatch)
         rv = csp->Permits(newBaseURI, nsIContentSecurityPolicy::BASE_URI_DIRECTIVE,
                           true /* aSpecific */, true /* aSendViolationReports */,
                           &cspPermitsBaseURI);
-        if ((NS_FAILED(rv) || !cspPermitsBaseURI) && !isLocalResource) {
+        if (NS_FAILED(rv) || !cspPermitsBaseURI) {
           newBaseURI = nullptr;
         }
       }

dom/html/nsGenericHTMLElement.cpp

@@ -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);

dom/ipc/ContentChild.cpp

@@ -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

dom/media/AudioChannelFormat.h

@@ -105,6 +105,8 @@ gDownMixMatrices[CUSTOM_CHANNEL_LAYOUTS*(CUSTOM_CHANNEL_LAYOUTS - 1)/2] =
  * Given an array of input channels, downmix to aOutputChannelCount, and copy
  * the results to the channel buffers in aOutputChannels.  Don't call this with
  * input count <= output count.
+ * Each of aOutputChannels must be non-null.
+ * aChannelArray elements may be null.
  */
 template<typename T>
 void AudioChannelsDownMix(const nsTArray<const T*>& aChannelArray,
@@ -119,7 +121,11 @@ void AudioChannelsDownMix(const nsTArray<const T*>& aChannelArray,
   if (inputChannelCount > 6) {
     // Just drop the unknown channels.
     for (uint32_t o = 0; o < aOutputChannelCount; ++o) {
-      PodCopy(aOutputChannels[o], inputChannels[o], aDuration);
+      if (inputChannels[o]) {
+        PodCopy(aOutputChannels[o], inputChannels[o], aDuration);
+      } else {
+        std::fill_n(aOutputChannels[o], aDuration, static_cast<T>(0));
+      }
     }
     return;
   }
@@ -138,13 +144,19 @@ void AudioChannelsDownMix(const nsTArray<const T*>& aChannelArray,
     // want an input channel to contribute to nothing
     T outputChannels[CUSTOM_CHANNEL_LAYOUTS + 1] = {0};
     for (uint32_t c = 0; c < inputChannelCount; ++c) {
-      outputChannels[m.mInputDestination[c]] +=
-        m.mInputCoefficient[c]*(static_cast<const T*>(inputChannels[c]))[s];
+      if (inputChannels[c]) {
+        outputChannels[m.mInputDestination[c]] +=
+            m.mInputCoefficient[c] *
+            (static_cast<const T*>(inputChannels[c]))[s];
+      }
     }
     // Utilize the fact that in every layout, C is the third channel.
     if (m.mCExtraDestination != IGNORE) {
-      outputChannels[m.mCExtraDestination] +=
-        m.mInputCoefficient[SURROUND_C]*(static_cast<const T*>(inputChannels[SURROUND_C]))[s];
+      if (inputChannels[SURROUND_C]) {
+        outputChannels[m.mCExtraDestination] +=
+            m.mInputCoefficient[SURROUND_C] *
+            (static_cast<const T*>(inputChannels[SURROUND_C]))[s];
+      }
     }
 
     for (uint32_t c = 0; c < aOutputChannelCount; ++c) {

dom/media/AudioSegment.cpp

@@ -121,13 +121,19 @@ AudioSegment::Mix(AudioMixer& aMixer, uint32_t aOutputChannels,
       }
       if (channelData.Length() < aOutputChannels) {
         // Up-mix.
-        AudioChannelsUpMix(&channelData, aOutputChannels, SilentChannel::ZeroChannel<AudioDataValue>());
+        AudioChannelsUpMix(&channelData, aOutputChannels, static_cast<const AudioDataValue*>(nullptr));
         for (uint32_t channel = 0; channel < aOutputChannels; channel++) {
           AudioDataValue* ptr =
             PointerForOffsetInChannel(buf.Elements(), outBufferLength,
                                       aOutputChannels, channel, offsetSamples);
-          PodCopy(ptr, reinterpret_cast<const AudioDataValue*>(channelData[channel]),
-                  frames);
+          if (channelData[channel]) {
+            PodCopy(
+                ptr,
+                reinterpret_cast<const AudioDataValue*>(channelData[channel]),
+                frames);
+          } else {
+            PodZero(ptr, frames);
+          }
         }
         MOZ_ASSERT(channelData.Length() == aOutputChannels);
       } else if (channelData.Length() > aOutputChannels) {

dom/media/AudioSegment.h

@@ -61,15 +61,22 @@ template <typename SrcT, typename DestT>
 static void
 InterleaveAndConvertBuffer(const SrcT* const* aSourceChannels,
                            uint32_t aLength, float aVolume,
-                           uint32_t aChannels,
+                           uint32_t aChannelCount,
                            DestT* aOutput)
 {
-  DestT* output = aOutput;
-  for (size_t i = 0; i < aLength; ++i) {
-    for (size_t channel = 0; channel < aChannels; ++channel) {
-      float v = AudioSampleToFloat(aSourceChannels[channel][i])*aVolume;
-      *output = FloatToAudioSample<DestT>(v);
-      ++output;
+  for (size_t channel = 0; channel < aChannelCount; ++channel) {
+    DestT* output = aOutput;
+    if (aSourceChannels[channel]) {
+      for (size_t i = 0; i < aLength; ++i) {
+        float v = AudioSampleToFloat(aSourceChannels[channel][i])*aVolume;
+        *output = FloatToAudioSample<DestT>(v);
+        output += aChannelCount;
+      }
+    } else {
+      for (size_t i = 0; i < aLength; ++i) {
+        *output = static_cast<DestT>(0);
+        output += aChannelCount;
+      }
     }
   }
 }
@@ -93,7 +100,7 @@ DeinterleaveAndConvertBuffer(const SrcT* aSourceBuffer,
 class SilentChannel
 {
 public:
-  static const int AUDIO_PROCESSING_FRAMES = 4096; /* > 10ms of 48KHz audio */
+  static const int AUDIO_PROCESSING_FRAMES = 640; /* > 10ms of 48KHz audio */
   static const uint8_t gZeroChannel[MAX_AUDIO_SAMPLE_SIZE*AUDIO_PROCESSING_FRAMES];
   // We take advantage of the fact that zero in float and zero in int have the
   // same all-zeros bit layout.
@@ -408,7 +415,7 @@ void WriteChunk(AudioChunk& aChunk,
   if (channelData.Length() < aOutputChannels) {
     // Up-mix. Note that this might actually make channelData have more
     // than aOutputChannels temporarily.
-    AudioChannelsUpMix(&channelData, aOutputChannels, SilentChannel::ZeroChannel<SrcT>());
+    AudioChannelsUpMix(&channelData, aOutputChannels, static_cast<const SrcT*>(nullptr));
   }
   if (channelData.Length() > aOutputChannels) {
     // Down-mix.

dom/media/MediaInfo.h

@@ -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

dom/media/VideoUtils.cpp

@@ -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 &&

dom/media/mediasource/ContainerParser.cpp

@@ -439,7 +439,7 @@ private:
     Maybe<size_t> mInitOffset;
     Maybe<size_t> mMediaOffset;
     bool mValid = true;
-    char mLastInvalidBox[5]{};
+    char mLastInvalidBox[5];
   };
 
 public:

dom/media/webaudio/AudioNodeEngine.cpp

@@ -26,7 +26,7 @@ ThreadSharedFloatArrayBufferList::Create(uint32_t aChannelCount,
     new ThreadSharedFloatArrayBufferList(aChannelCount);
 
   for (uint32_t i = 0; i < aChannelCount; ++i) {
-    float* channelData = js_pod_calloc<float>(aLength);
+    float* channelData = js_pod_malloc<float>(aLength);
     if (!channelData) {
       return nullptr;
     }

dom/media/webaudio/AudioNodeEngine.h

@@ -40,8 +40,8 @@ public:
   }
   /**
    * Create with buffers suitable for transfer to
-   * JS_NewArrayBufferWithContents().  The buffer contents are
-   * zero-initialized; callers should set them using GetDataForWrite().
+   * JS_NewArrayBufferWithContents().  The buffer contents are uninitialized
+   * and so should be set using GetDataForWrite().
    */
   static already_AddRefed<ThreadSharedFloatArrayBufferList>
   Create(uint32_t aChannelCount, size_t aLength, const mozilla::fallible_t&);

dom/media/webm/WebMDemuxer.cpp

@@ -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 ||

dom/media/webrtc/MediaEngine.h

@@ -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;
 

dom/media/webrtc/MediaEngineCameraVideoSource.cpp

@@ -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) {

dom/media/webrtc/MediaEngineCameraVideoSource.h

@@ -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
 
 

dom/media/webrtc/MediaEngineWebRTCAudio.cpp

@@ -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"

dom/media/webrtc/SingleRwFifo.cpp

@@ -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

dom/media/webrtc/moz.build

@@ -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',

dom/plugins/base/nsPluginsDirWin.cpp

@@ -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
           }
         }

dom/plugins/ipc/PluginInstanceChild.cpp

@@ -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();
     }

dom/plugins/ipc/PluginInstanceChild.h

@@ -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)

dom/plugins/ipc/PluginModuleChild.cpp

@@ -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;
         }

dom/plugins/ipc/moz.build

@@ -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']
 

dom/url/URL.cpp

@@ -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>

dom/url/URL.h

@@ -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);

dom/url/tests/test_url.html

@@ -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");

dom/url/tests/urlApi_worker.js

@@ -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");

dom/webidl/CSSStyleSheet.webidl

@@ -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"]

dom/webidl/Element.webidl

@@ -34,6 +34,7 @@ interface Element : Node {
 
   [SameObject]
   readonly attribute NamedNodeMap attributes;
+  [Pure]
   sequence<DOMString> getAttributeNames();
   [Pure]
   DOMString? getAttribute(DOMString name);
@@ -158,7 +159,7 @@ interface Element : Node {
    * this property returns an object with computed values for grid
    * tracks and lines.
    */
-  [ChromeOnly]
+  [ChromeOnly, Pure]
   sequence<Grid> getGridFragments();
 };
 

dom/webidl/HTMLElement.webidl

@@ -23,7 +23,7 @@ interface HTMLElement : Element {
   [CEReactions, SetterThrows, Pure]
            attribute DOMString dir;
 
-  [CEReactions, GetterThrows]
+  [CEReactions, GetterThrows, Pure]
            attribute [TreatNullAs=EmptyString] DOMString innerText;
 
   // user interaction

dom/webidl/HTMLInputElement.webidl

@@ -51,7 +51,7 @@ interface HTMLInputElement : HTMLElement {
            attribute boolean formNoValidate;
   [CEReactions, Pure, SetterThrows]
            attribute DOMString formTarget;
-  [CEReactions, SetterThrows]
+  [CEReactions, Pure, SetterThrows]
            attribute unsigned long height;
   [Pure]
            attribute boolean indeterminate;

dom/webidl/URL.webidl

@@ -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]

dom/workers/RuntimeService.cpp

@@ -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")));

dom/workers/WorkerPrefs.h

@@ -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)

gfx/2d/DrawTargetSkia.cpp

@@ -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");

gfx/2d/ScaledFontMac.cpp

@@ -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)
 {

gfx/2d/ScaledFontMac.h

@@ -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);

gfx/cairo/cairo/src/cairo-cff-subset.c

@@ -805,10 +805,6 @@ cairo_cff_font_read_cid_fontdict (cairo_cff_font_t *font, unsigned char *ptr)
         }
         operand = decode_integer (operand, &size);
         decode_integer (operand, &offset);
-        if (unlikely (offset < 0 || (unsigned long)offset > font->data_length)) {
-            status = CAIRO_INT_STATUS_UNSUPPORTED;
-            goto fail;
-        }
         status = cff_dict_init (&font->fd_private_dict[i]);
 	if (unlikely (status))
             goto fail;
@@ -870,8 +866,6 @@ cairo_cff_font_read_top_dict (cairo_cff_font_t *font)
     operand = cff_dict_get_operands (font->top_dict, CHARSTRINGS_OP, &size);
     decode_integer (operand, &offset);
     p = font->data + offset;
-    if (unlikely (p < font->data || p > font->data_end))
-        return CAIRO_INT_STATUS_UNSUPPORTED;
     status = cff_index_read (&font->charstrings_index, &p, font->data_end);
     if (unlikely (status))
         goto fail;
@@ -880,58 +874,49 @@ cairo_cff_font_read_top_dict (cairo_cff_font_t *font)
     if (font->is_cid) {
         operand = cff_dict_get_operands (font->top_dict, FDSELECT_OP, &size);
         decode_integer (operand, &offset);
-        p = font->data + offset;
-        if (unlikely (p < font->data || p > font->data_end))
-            return CAIRO_INT_STATUS_UNSUPPORTED;
-        status = cairo_cff_font_read_fdselect (font, p);
-        if (unlikely (status))
-            goto fail;
+        status = cairo_cff_font_read_fdselect (font, font->data + offset);
+	if (unlikely (status))
+	    goto fail;
 
         operand = cff_dict_get_operands (font->top_dict, FDARRAY_OP, &size);
         decode_integer (operand, &offset);
-        p = font->data + offset;
-        if (unlikely (p < font->data || p > font->data_end))
-            return CAIRO_INT_STATUS_UNSUPPORTED;
-        status = cairo_cff_font_read_cid_fontdict (font, p);
-        if (unlikely (status))
-            goto fail;
+        status = cairo_cff_font_read_cid_fontdict (font, font->data + offset);
+	if (unlikely (status))
+	    goto fail;
     } else {
         operand = cff_dict_get_operands (font->top_dict, PRIVATE_OP, &size);
         operand = decode_integer (operand, &size);
         decode_integer (operand, &offset);
-        p = font->data + offset;
-        if (unlikely (p < font->data || p > font->data_end))
-            return CAIRO_INT_STATUS_UNSUPPORTED;
         status = cairo_cff_font_read_private_dict (font,
                                                    font->private_dict,
-                                                   &font->local_sub_index,
-                                                   p,
-                                                   size);
-        if (unlikely (status))
-            goto fail;
+						   &font->local_sub_index,
+						   font->data + offset,
+						   size);
+	if (unlikely (status))
+	    goto fail;
     }
 
     /* Use maximum sized encoding to reserve space for later modification. */
     end_buf = encode_integer_max (buf, 0);
     status = cff_dict_set_operands (font->top_dict,
-                                    CHARSTRINGS_OP, buf, end_buf - buf);
+	                            CHARSTRINGS_OP, buf, end_buf - buf);
     if (unlikely (status))
-        goto fail;
+	goto fail;
 
     status = cff_dict_set_operands (font->top_dict,
-                                    FDSELECT_OP, buf, end_buf - buf);
+	                            FDSELECT_OP, buf, end_buf - buf);
     if (unlikely (status))
-        goto fail;
+	goto fail;
 
     status = cff_dict_set_operands (font->top_dict,
-                                    FDARRAY_OP, buf, end_buf - buf);
+	                            FDARRAY_OP, buf, end_buf - buf);
     if (unlikely (status))
-        goto fail;
+	goto fail;
 
     status = cff_dict_set_operands (font->top_dict,
-                                    CHARSET_OP, buf, end_buf - buf);
+	                            CHARSET_OP, buf, end_buf - buf);
     if (unlikely (status))
-        goto fail;
+	goto fail;
 
     cff_dict_remove (font->top_dict, ENCODING_OP);
     cff_dict_remove (font->top_dict, PRIVATE_OP);
@@ -1000,26 +985,26 @@ cairo_cff_font_set_ros_strings (cairo_cff_font_t *font)
                                     (unsigned char *)registry,
                                     strlen(registry));
     if (unlikely (status))
-        return status;
+	return status;
 
     sid2 = NUM_STD_STRINGS + _cairo_array_num_elements (&font->strings_subset_index);
     status = cff_index_append_copy (&font->strings_subset_index,
                                     (unsigned char *)ordering,
-                                    strlen(ordering));
+				    strlen(ordering));
     if (unlikely (status))
-        return status;
+	return status;
 
     p = encode_integer (buf, sid1);
     p = encode_integer (p, sid2);
     p = encode_integer (p, 0);
     status = cff_dict_set_operands (font->top_dict, ROS_OP, buf, p - buf);
     if (unlikely (status))
-        return status;
+	return status;
 
     p = encode_integer (buf, font->scaled_font_subset->num_glyphs);
     status = cff_dict_set_operands (font->top_dict, CIDCOUNT_OP, buf, p - buf);
     if (unlikely (status))
-        return status;
+	return status;
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1053,7 +1038,7 @@ cairo_cff_font_subset_dict_string(cairo_cff_font_t   *font,
     p = encode_integer (buf, sid);
     status = cff_dict_set_operands (dict, operator, buf, p - buf);
     if (unlikely (status))
-        return status;
+	return status;
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1116,19 +1101,19 @@ cairo_cff_font_subset_fontdict (cairo_cff_font_t  *font)
     font->fdselect_subset = calloc (font->scaled_font_subset->num_glyphs,
                                      sizeof (int));
     if (unlikely (font->fdselect_subset == NULL))
-        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
     font->fd_subset_map = calloc (font->num_fontdicts, sizeof (int));
     if (unlikely (font->fd_subset_map == NULL))
-        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
     font->private_dict_offset = calloc (font->num_fontdicts, sizeof (int));
     if (unlikely (font->private_dict_offset == NULL))
-        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
     reverse_map = calloc (font->num_fontdicts, sizeof (int));
     if (unlikely (reverse_map == NULL))
-        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
     for (i = 0; i < font->num_fontdicts; i++)
         reverse_map[i] = -1;
@@ -1158,22 +1143,22 @@ cairo_cff_font_create_cid_fontdict (cairo_cff_font_t *font)
     font->num_fontdicts = 1;
     font->fd_dict = malloc (sizeof (cairo_hash_table_t *));
     if (unlikely (font->fd_dict == NULL))
-        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
     if (cff_dict_init (&font->fd_dict[0])) {
-        free (font->fd_dict);
-        font->fd_dict = NULL;
-        font->num_fontdicts = 0;
-        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	free (font->fd_dict);
+	font->fd_dict = NULL;
+	font->num_fontdicts = 0;
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
     }
 
     font->fd_subset_map = malloc (sizeof (int));
     if (unlikely (font->fd_subset_map == NULL))
-        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
     font->private_dict_offset = malloc (sizeof (int));
     if (unlikely (font->private_dict_offset == NULL))
-        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
     font->fd_subset_map[0] = 0;
     font->num_subset_fontdicts = 1;
@@ -1184,7 +1169,7 @@ cairo_cff_font_create_cid_fontdict (cairo_cff_font_t *font)
     end_buf = encode_integer_max (end_buf, 0);
     status = cff_dict_set_operands (font->fd_dict[0], PRIVATE_OP, buf, end_buf - buf);
     if (unlikely (status))
-        return status;
+	return status;
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1223,7 +1208,7 @@ cairo_cff_font_subset_font (cairo_cff_font_t  *font)
 
     status = cairo_cff_font_set_ros_strings (font);
     if (unlikely (status))
-        return status;
+	return status;
 
     status = cairo_cff_font_subset_charstrings (font);
     if (unlikely (status))
@@ -1234,7 +1219,7 @@ cairo_cff_font_subset_font (cairo_cff_font_t  *font)
     else
         status = cairo_cff_font_create_cid_fontdict (font);
     if (unlikely (status))
-        return status;
+	return status;
 
     status = cairo_cff_font_subset_strings (font);
     if (unlikely (status))
@@ -1286,7 +1271,7 @@ cairo_cff_font_write_name (cairo_cff_font_t *font)
                                     (unsigned char *) font->subset_font_name,
                                     strlen(font->subset_font_name));
     if (unlikely (status))
-        goto FAIL;
+	goto FAIL;
 
     status = cff_index_write (&index, &font->output);
     if (unlikely (status))
@@ -1479,9 +1464,9 @@ cairo_cff_font_write_cid_fontdict (cairo_cff_font_t *font)
         if (unlikely (status))
             return status;
 
-        offset_array_ptr = (uint32_t *) _cairo_array_index (&font->output, offset_array);
+	offset_array_ptr = (uint32_t *) _cairo_array_index (&font->output, offset_array);
         *offset_array_ptr = cpu_to_be32(_cairo_array_num_elements (&font->output) - offset_base);
-        offset_array += sizeof(uint32_t);
+	offset_array += sizeof(uint32_t);
     }
 
     return CAIRO_STATUS_SUCCESS;
@@ -1581,15 +1566,15 @@ cairo_cff_font_write_cid_private_dict_and_local_sub (cairo_cff_font_t  *font)
                                                     0,
                                                     font->fd_dict[0],
                                                     font->private_dict);
-        if (unlikely (status))
-            return status;
+	if (unlikely (status))
+	    return status;
 
         status = cairo_cff_font_write_local_sub (font,
                                                  0,
                                                  font->private_dict,
                                                  &font->local_sub_index);
-        if (unlikely (status))
-            return status;
+	if (unlikely (status))
+	    return status;
     }
 
     return CAIRO_STATUS_SUCCESS;
@@ -1713,7 +1698,7 @@ _cairo_cff_font_create (cairo_scaled_font_subset_t  *scaled_font_subset,
 
     backend = scaled_font_subset->scaled_font->backend;
     if (!backend->load_truetype_table)
-        return CAIRO_INT_STATUS_UNSUPPORTED;
+	return CAIRO_INT_STATUS_UNSUPPORTED;
 
     data_length = 0;
     status = backend->load_truetype_table( scaled_font_subset->scaled_font,
@@ -1751,12 +1736,12 @@ _cairo_cff_font_create (cairo_scaled_font_subset_t  *scaled_font_subset,
     _cairo_array_init (&font->output, sizeof (char));
     status = _cairo_array_grow_by (&font->output, 4096);
     if (unlikely (status))
-        goto fail2;
+	goto fail2;
 
     font->subset_font_name = strdup (subset_name);
     if (unlikely (font->subset_font_name == NULL)) {
         status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        goto fail2;
+	goto fail2;
     }
     font->x_min = (int16_t) be16_to_cpu (head.x_min);
     font->y_min = (int16_t) be16_to_cpu (head.y_min);
@@ -1770,18 +1755,18 @@ _cairo_cff_font_create (cairo_scaled_font_subset_t  *scaled_font_subset,
 
     font->font_name = NULL;
     status = _cairo_truetype_read_font_name (scaled_font_subset->scaled_font,
-                                             &font->ps_name,
-                                             &font->font_name);
+					     &font->ps_name,
+					     &font->font_name);
     if (_cairo_status_is_error (status))
-        goto fail3;
+	goto fail3;
 
     /* If the PS name is not found, create a CairoFont-x-y name. */
     if (font->ps_name == NULL) {
         font->ps_name = malloc (30);
         if (unlikely (font->ps_name == NULL)) {
-            status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
             goto fail3;
-        }
+	}
 
         snprintf(font->ps_name, 30, "CairoFont-%u-%u",
                  scaled_font_subset->font_id,
@@ -1796,7 +1781,7 @@ _cairo_cff_font_create (cairo_scaled_font_subset_t  *scaled_font_subset,
 
     status = cairo_cff_font_create_set_widths (font);
     if (unlikely (status))
-        goto fail5;
+	goto fail5;
 
     font->data_length = data_length;
     font->data = malloc (data_length);
@@ -1814,11 +1799,11 @@ _cairo_cff_font_create (cairo_scaled_font_subset_t  *scaled_font_subset,
 
     status = cff_dict_init (&font->top_dict);
     if (unlikely (status))
-        goto fail6;
+	goto fail6;
 
     status = cff_dict_init (&font->private_dict);
     if (unlikely (status))
-        goto fail7;
+	goto fail7;
 
     cff_index_init (&font->strings_index);
     cff_index_init (&font->charstrings_index);
@@ -1846,7 +1831,7 @@ fail5:
     free (font->widths);
 fail4:
     if (font->font_name)
-        free (font->font_name);
+	free (font->font_name);
 fail3:
     free (font->subset_font_name);
 fail2:
@@ -1863,7 +1848,7 @@ cairo_cff_font_destroy (cairo_cff_font_t *font)
 
     free (font->widths);
     if (font->font_name)
-        free (font->font_name);
+	free (font->font_name);
     free (font->ps_name);
     free (font->subset_font_name);
     _cairo_array_fini (&font->output);
@@ -1917,7 +1902,7 @@ cairo_cff_font_destroy (cairo_cff_font_t *font)
 
 cairo_status_t
 _cairo_cff_subset_init (cairo_cff_subset_t          *cff_subset,
-                        const char                    *subset_name,
+                        const char		    *subset_name,
                         cairo_scaled_font_subset_t  *font_subset)
 {
     cairo_cff_font_t *font = NULL; /* squelch bogus compiler warning */
@@ -1928,32 +1913,32 @@ _cairo_cff_subset_init (cairo_cff_subset_t          *cff_subset,
 
     status = _cairo_cff_font_create (font_subset, &font, subset_name);
     if (unlikely (status))
-        return status;
+	return status;
 
     status = cairo_cff_font_generate (font, &data, &length);
     if (unlikely (status))
-        goto fail1;
+	goto fail1;
 
     cff_subset->ps_name = strdup (font->ps_name);
     if (unlikely (cff_subset->ps_name == NULL)) {
-        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        goto fail1;
+	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	goto fail1;
     }
 
     if (font->font_name) {
-        cff_subset->font_name = strdup (font->font_name);
-        if (cff_subset->font_name == NULL) {
-            status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-            goto fail2;
-        }
+	cff_subset->font_name = strdup (font->font_name);
+	if (cff_subset->font_name == NULL) {
+	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    goto fail2;
+	}
     } else {
-        cff_subset->font_name = NULL;
+	cff_subset->font_name = NULL;
     }
 
     cff_subset->widths = calloc (sizeof (double), font->scaled_font_subset->num_glyphs);
     if (unlikely (cff_subset->widths == NULL)) {
-        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        goto fail3;
+	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	goto fail3;
     }
     for (i = 0; i < font->scaled_font_subset->num_glyphs; i++)
         cff_subset->widths[i] = (double)font->widths[i]/font->units_per_em;
@@ -1967,8 +1952,8 @@ _cairo_cff_subset_init (cairo_cff_subset_t          *cff_subset,
 
     cff_subset->data = malloc (length);
     if (unlikely (cff_subset->data == NULL)) {
-        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        goto fail4;
+	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	goto fail4;
     }
 
     memcpy (cff_subset->data, data, length);
@@ -1982,7 +1967,7 @@ _cairo_cff_subset_init (cairo_cff_subset_t          *cff_subset,
     free (cff_subset->widths);
  fail3:
     if (cff_subset->font_name)
-        free (cff_subset->font_name);
+	free (cff_subset->font_name);
  fail2:
     free (cff_subset->ps_name);
  fail1:
@@ -1996,7 +1981,7 @@ _cairo_cff_subset_fini (cairo_cff_subset_t *subset)
 {
     free (subset->ps_name);
     if (subset->font_name)
-        free (subset->font_name);
+	free (subset->font_name);
     free (subset->widths);
     free (subset->data);
 }
@@ -2011,7 +1996,7 @@ _cairo_cff_font_fallback_create (cairo_scaled_font_subset_t  *scaled_font_subset
 
     font = calloc (1, sizeof (cairo_cff_font_t));
     if (unlikely (font == NULL))
-        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
     font->backend = NULL;
     font->scaled_font_subset = scaled_font_subset;
@@ -2019,18 +2004,18 @@ _cairo_cff_font_fallback_create (cairo_scaled_font_subset_t  *scaled_font_subset
     _cairo_array_init (&font->output, sizeof (char));
     status = _cairo_array_grow_by (&font->output, 4096);
     if (unlikely (status))
-        goto fail1;
+	goto fail1;
 
     font->subset_font_name = strdup (subset_name);
     if (unlikely (font->subset_font_name == NULL)) {
         status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        goto fail1;
+	goto fail1;
     }
 
     font->ps_name = strdup (subset_name);
     if (unlikely (font->ps_name == NULL)) {
         status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        goto fail2;
+	goto fail2;
     }
     font->font_name = NULL;
 
@@ -2053,11 +2038,11 @@ _cairo_cff_font_fallback_create (cairo_scaled_font_subset_t  *scaled_font_subset
 
     status = cff_dict_init (&font->top_dict);
     if (unlikely (status))
-        goto fail4;
+	goto fail4;
 
     status = cff_dict_init (&font->private_dict);
     if (unlikely (status))
-        goto fail5;
+	goto fail5;
 
     cff_index_init (&font->strings_index);
     cff_index_init (&font->charstrings_index);
@@ -2083,7 +2068,7 @@ fail4:
     free (font->widths);
 fail3:
     if (font->font_name)
-        free (font->font_name);
+	free (font->font_name);
     free (font->ps_name);
 fail2:
     free (font->subset_font_name);
@@ -2120,39 +2105,39 @@ cairo_cff_font_fallback_generate (cairo_cff_font_t           *font,
     end_buf = encode_integer (end_buf, type2_subset->x_max);
     end_buf = encode_integer (end_buf, type2_subset->y_max);
     status = cff_dict_set_operands (font->top_dict,
-                                    FONTBBOX_OP, buf, end_buf - buf);
+	                            FONTBBOX_OP, buf, end_buf - buf);
     if (unlikely (status))
-        return status;
+	return status;
 
     end_buf = encode_integer_max (buf, 0);
     status = cff_dict_set_operands (font->top_dict,
-                                    CHARSTRINGS_OP, buf, end_buf - buf);
+	                            CHARSTRINGS_OP, buf, end_buf - buf);
     if (unlikely (status))
-        return status;
+	return status;
 
     status = cff_dict_set_operands (font->top_dict,
-                                    FDSELECT_OP, buf, end_buf - buf);
+	                            FDSELECT_OP, buf, end_buf - buf);
     if (unlikely (status))
-        return status;
+	return status;
 
     status = cff_dict_set_operands (font->top_dict,
-                                    FDARRAY_OP, buf, end_buf - buf);
+	                            FDARRAY_OP, buf, end_buf - buf);
     if (unlikely (status))
-        return status;
+	return status;
 
     status = cff_dict_set_operands (font->top_dict,
-                                    CHARSET_OP, buf, end_buf - buf);
+	                            CHARSET_OP, buf, end_buf - buf);
     if (unlikely (status))
-        return status;
+	return status;
 
     status = cairo_cff_font_set_ros_strings (font);
     if (unlikely (status))
-        return status;
+	return status;
 
     /* Create CID FD dictionary */
     status = cairo_cff_font_create_cid_fontdict (font);
     if (unlikely (status))
-        return status;
+	return status;
 
     /* Create charstrings */
     for (i = 0; i < font->scaled_font_subset->num_glyphs; i++) {
@@ -2178,7 +2163,7 @@ cairo_cff_font_fallback_generate (cairo_cff_font_t           *font,
 
 cairo_status_t
 _cairo_cff_fallback_init (cairo_cff_subset_t          *cff_subset,
-                          const char                      *subset_name,
+                          const char		      *subset_name,
                           cairo_scaled_font_subset_t  *font_subset)
 {
     cairo_cff_font_t *font = NULL; /* squelch bogus compiler warning */
@@ -2190,27 +2175,27 @@ _cairo_cff_fallback_init (cairo_cff_subset_t          *cff_subset,
 
     status = _cairo_cff_font_fallback_create (font_subset, &font, subset_name);
     if (unlikely (status))
-        return status;
+	return status;
 
     status = _cairo_type2_charstrings_init (&type2_subset, font_subset);
     if (unlikely (status))
-        goto fail1;
+	goto fail1;
 
     status = cairo_cff_font_fallback_generate (font, &type2_subset, &data, &length);
     if (unlikely (status))
-        goto fail2;
+	goto fail2;
 
     cff_subset->font_name = NULL;
     cff_subset->ps_name = strdup (font->ps_name);
     if (unlikely (cff_subset->ps_name == NULL)) {
-        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        goto fail2;
+	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	goto fail2;
     }
 
     cff_subset->widths = calloc (sizeof (double), font->scaled_font_subset->num_glyphs);
     if (unlikely (cff_subset->widths == NULL)) {
-        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        goto fail3;
+	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	goto fail3;
     }
 
     for (i = 0; i < font->scaled_font_subset->num_glyphs; i++)
@@ -2225,8 +2210,8 @@ _cairo_cff_fallback_init (cairo_cff_subset_t          *cff_subset,
 
     cff_subset->data = malloc (length);
     if (unlikely (cff_subset->data == NULL)) {
-        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        goto fail4;
+	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	goto fail4;
     }
 
     memcpy (cff_subset->data, data, length);

gfx/skia/skia/include/core/SkColorPriv.h

@@ -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

gfx/skia/skia/include/core/SkImageInfo.h

@@ -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
 };
 

gfx/skia/skia/include/gpu/GrTypes.h

@@ -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

gfx/skia/skia/src/codec/SkCodecPriv.h

@@ -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) {

gfx/skia/skia/src/core/SkPM4f.h

@@ -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;

gfx/skia/skia/src/core/SkPM4fPriv.h

@@ -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
 }
 
 

gfx/skia/skia/src/core/SkTextBlob.cpp

@@ -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;)
 };
 }

gfx/skia/skia/src/core/SkXfermode4f.cpp

@@ -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);

gfx/skia/skia/src/gpu/GrDrawTarget.cpp

@@ -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

gfx/skia/skia/src/opts/Sk4px_none.h

@@ -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

gfx/skia/skia/src/opts/SkColorCubeFilter_opts.h

@@ -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);

gfx/skia/skia/src/ports/SkFontHost_mac.cpp

@@ -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 {

gfx/thebes/gfxGraphiteShaper.cpp

@@ -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 :

gfx/thebes/gfxTextRun.cpp

@@ -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);

image/RasterImage.cpp

@@ -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.

js/src/builtin/FinalizationRegistryObject.cpp

@@ -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;
 

js/src/builtin/RegExp.cpp

@@ -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;

js/src/builtin/RegExp.js

@@ -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.

js/src/builtin/SelfHostingDefines.h

@@ -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

js/src/builtin/WeakRefObject.cpp

@@ -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");
         }
     }

js/src/builtin/WeakRefObject.h

@@ -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_;

js/src/gc/Memory.cpp

@@ -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);

js/src/jit-test/tests/ion/bug1106171-sink.js

@@ -1,3 +1,4 @@
+// |jit-test| --ion-sink=on
 // Sink Algorithm should not move instruction into merge blocks
 // which have no corresponding pc.
 

js/src/jit/CodeGenerator.cpp

@@ -2439,7 +2439,7 @@ static const VMFunction GetOrCreateModuleMetaObjectInfo =
 void
 CodeGenerator::visitModuleMetadata(LModuleMetadata* lir)
 {
-    pushArg(ImmGCPtr(lir->mir()->module()));
+    pushArg(ImmPtr(lir->mir()->module()));
     callVM(GetOrCreateModuleMetaObjectInfo, lir);
 }
 
@@ -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);

js/src/jit/IonOptimizationLevels.cpp

@@ -34,6 +34,7 @@ OptimizationInfo::initNormalOptimizationInfo()
     rangeAnalysis_ = true;
     reordering_ = true;
     sincos_ = true;
+    sink_ = true;
 
     registerAllocator_ = RegisterAllocator_Backtracking;
 
@@ -68,6 +69,7 @@ OptimizationInfo::initWasmOptimizationInfo()
     eliminateRedundantChecks_ = false;
     scalarReplacement_ = false;        // wasm has no objects.
     sincos_ = false;
+    sink_ = false;
 }
 
 uint32_t

js/src/jit/IonOptimizationLevels.h

@@ -86,6 +86,9 @@ class OptimizationInfo
     // Toggles whether sincos is used.
     bool sincos_;
 
+    // Toggles whether sink is used.
+    bool sink_;
+
     // Describes which register allocator to use.
     IonRegisterAllocator registerAllocator_;
 
@@ -191,6 +194,10 @@ class OptimizationInfo
         return sincos_ && !JitOptions.disableSincos;
     }
 
+    bool sinkEnabled() const {
+        return sink_ && !JitOptions.disableSink;
+    }
+
     bool eaaEnabled() const {
         return eaa_ && !JitOptions.disableEaa;
     }

js/src/jit/JitFrames.cpp

@@ -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);

js/src/jit/JitOptions.cpp

@@ -130,6 +130,9 @@ DefaultJitOptions::DefaultJitOptions()
         SET_DEFAULT(disableSincos, true);
     #endif
 
+    // Toggles whether sink code motion is globally disabled.
+    SET_DEFAULT(disableSink, true);
+
     // Whether functions are compiled immediately.
     SET_DEFAULT(eagerCompilation, false);
 

js/src/jit/JitOptions.h

@@ -63,6 +63,7 @@ struct DefaultJitOptions
     bool disableCacheIR;
     bool disableSharedStubs;
     bool disableSincos;
+    bool disableSink;
     bool eagerCompilation;
     bool forceInlineCaches;
     bool limitScriptSize;

js/src/jit/Sink.cpp

@@ -44,6 +44,9 @@ CommonDominator(MBasicBlock* commonDominator, MBasicBlock* defBlock)
 bool
 Sink(MIRGenerator* mir, MIRGraph& graph)
 {
+    TempAllocator& alloc = graph.alloc();
+    bool sinkEnabled = mir->optimizationInfo().sinkEnabled();
+
     for (PostorderIterator block = graph.poBegin(); block != graph.poEnd(); block++) {
         if (mir->shouldCancel("Sink"))
             return false;
@@ -103,6 +106,125 @@ Sink(MIRGenerator* mir, MIRGraph& graph)
                 JitSpewDef(JitSpew_Sink, "  No live uses, recover the instruction on bailout\n", ins);
                 continue;
             }
+
+            // This guard is temporarly moved here as the above code deals with
+            // Dead Code elimination, which got moved into this Sink phase, as
+            // the Dead Code elimination used to move instructions with no-live
+            // uses to the bailout path.
+            if (!sinkEnabled)
+                continue;
+
+            // To move an effectful instruction, we would have to verify that the
+            // side-effect is not observed. In the mean time, we just inhibit
+            // this optimization on effectful instructions.
+            if (ins->isEffectful())
+                continue;
+
+            // If all the uses are under a loop, we might not want to work
+            // against LICM by moving everything back into the loop, but if the
+            // loop is it-self inside an if, then we still want to move the
+            // computation under this if statement.
+            while (block->loopDepth() < usesDominator->loopDepth()) {
+                MOZ_ASSERT(usesDominator != usesDominator->immediateDominator());
+                usesDominator = usesDominator->immediateDominator();
+            }
+
+            // Only move instructions if there is a branch between the dominator
+            // of the uses and the original instruction. This prevent moving the
+            // computation of the arguments into an inline function if there is
+            // no major win.
+            MBasicBlock* lastJoin = usesDominator;
+            while (*block != lastJoin && lastJoin->numPredecessors() == 1) {
+                MOZ_ASSERT(lastJoin != lastJoin->immediateDominator());
+                MBasicBlock* next = lastJoin->immediateDominator();
+                if (next->numSuccessors() > 1)
+                    break;
+                lastJoin = next;
+            }
+            if (*block == lastJoin)
+                continue;
+
+            // Skip to the next instruction if we cannot find a common dominator
+            // for all the uses of this instruction, or if the common dominator
+            // correspond to the block of the current instruction.
+            if (!usesDominator || usesDominator == *block)
+                continue;
+
+            // Only instruction which can be recovered on bailout and which are
+            // sinkable can be moved into blocks which are below while filling
+            // the resume points with a clone which is recovered on bailout.
+
+            // If the instruction has live uses and if it is clonable, then we
+            // can clone the instruction for all non-dominated uses and move the
+            // instruction into the block which is dominating all live uses.
+            if (!ins->canClone())
+                continue;
+
+            // If the block is a split-edge block, which is created for folding
+            // test conditions, then the block has no resume point and has
+            // multiple predecessors.  In such case, we cannot safely move
+            // bailing instruction to these blocks as we have no way to bailout.
+            if (!usesDominator->entryResumePoint() && usesDominator->numPredecessors() != 1)
+                continue;
+
+            JitSpewDef(JitSpew_Sink, "  Can Clone & Recover, sink instruction\n", ins);
+            JitSpew(JitSpew_Sink, "  into Block %u", usesDominator->id());
+
+            // Copy the arguments and clone the instruction.
+            MDefinitionVector operands(alloc);
+            for (size_t i = 0, end = ins->numOperands(); i < end; i++) {
+                if (!operands.append(ins->getOperand(i)))
+                    return false;
+            }
+
+            MInstruction* clone = ins->clone(alloc, operands);
+            ins->block()->insertBefore(ins, clone);
+            clone->setRecoveredOnBailout();
+
+            // We should not update the producer of the entry resume point, as
+            // it cannot refer to any instruction within the basic block excepts
+            // for Phi nodes.
+            MResumePoint* entry = usesDominator->entryResumePoint();
+
+            // Replace the instruction by its clone in all the resume points /
+            // recovered-on-bailout instructions which are not in blocks which
+            // are dominated by the usesDominator block.
+            for (MUseIterator i(ins->usesBegin()), e(ins->usesEnd()); i != e; ) {
+                MUse* use = *i++;
+                MNode* consumer = use->consumer();
+
+                // If the consumer is a Phi, then we look for the index of the
+                // use to find the corresponding predecessor block, which is
+                // then used as the consumer block.
+                MBasicBlock* consumerBlock = consumer->block();
+                if (consumer->isDefinition() && consumer->toDefinition()->isPhi()) {
+                    consumerBlock = consumerBlock->getPredecessor(
+                        consumer->toDefinition()->toPhi()->indexOf(use));
+                }
+
+                // Keep the current instruction for all dominated uses, except
+                // for the entry resume point of the block in which the
+                // instruction would be moved into.
+                if (usesDominator->dominates(consumerBlock) &&
+                    (!consumer->isResumePoint() || consumer->toResumePoint() != entry))
+                {
+                    continue;
+                }
+
+                use->replaceProducer(clone);
+            }
+
+            // As we move this instruction in a different block, we should
+            // verify that we do not carry over a resume point which would refer
+            // to an outdated state of the control flow.
+            if (ins->resumePoint())
+                ins->clearResumePoint();
+
+            // Now, that all uses which are not dominated by usesDominator are
+            // using the cloned instruction, we can safely move the instruction
+            // into the usesDominator block.
+            MInstruction* at = usesDominator->safeInsertTop(nullptr, MBasicBlock::IgnoreRecover);
+            block->moveBefore(at, ins);
         }
     }
 

js/src/jit/loongarch64/Assembler-loongarch64.cpp

@@ -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);
   }