From 25a9e2348cdccaf88660303a21f23315209038d2 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Thu, 30 Nov 2017 18:13:21 -0800
Subject: [PATCH 001/219] Bug 1418226 - Create a store for payment dialog
 unprivileged UI state. r=jaws

MozReview-Commit-ID: HHEYdXahhcI

--HG--
extra : rebase_source : 09dbe6851331dad7b7e81b58c65ac6f6c2eb28f6
---
 .../static/browser_all_files_referenced.js    |   3 +
 toolkit/components/payments/.eslintrc.js      |   2 +-
 toolkit/components/payments/jar.mn            |   3 +-
 toolkit/components/payments/moz.build         |   2 +
 .../components/payments/res/PaymentsStore.js  |  92 +++++++++++++
 .../payments/test/unit/.eslintrc.js           |   7 +
 toolkit/components/payments/test/unit/head.js |  11 ++
 .../payments/test/unit/test_PaymentsStore.js  | 126 ++++++++++++++++++
 .../payments/test/unit/xpcshell.ini           |   4 +
 9 files changed, 248 insertions(+), 2 deletions(-)
 create mode 100644 toolkit/components/payments/res/PaymentsStore.js
 create mode 100644 toolkit/components/payments/test/unit/.eslintrc.js
 create mode 100644 toolkit/components/payments/test/unit/head.js
 create mode 100644 toolkit/components/payments/test/unit/test_PaymentsStore.js
 create mode 100644 toolkit/components/payments/test/unit/xpcshell.ini

diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
index 602dc584694d..e48c9e388f2e 100644
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -20,6 +20,9 @@ var gExceptionPaths = [
   "resource://gre/defaults/pref/",
   "resource://shield-recipe-client/node_modules/jexl/lib/",
 
+  // These resources are referenced using relative paths from html files.
+  "resource://payments/",
+
   // https://github.com/mozilla/normandy/issues/577
   "resource://shield-recipe-client/test/",
 
diff --git a/toolkit/components/payments/.eslintrc.js b/toolkit/components/payments/.eslintrc.js
index 3beca6564bfb..06f0bb37ea47 100644
--- a/toolkit/components/payments/.eslintrc.js
+++ b/toolkit/components/payments/.eslintrc.js
@@ -30,7 +30,7 @@ module.exports = {
     "max-len": ["error", 100],
     "max-nested-callbacks": ["error", 4],
     "new-parens": "error",
-    "no-console": "error",
+    "no-console": ["error", { allow: ["error"] }],
     "no-fallthrough": "error",
     "no-multi-str": "error",
     "no-multiple-empty-lines": ["error", {
diff --git a/toolkit/components/payments/jar.mn b/toolkit/components/payments/jar.mn
index a05a66c1d82b..d577756f2caa 100644
--- a/toolkit/components/payments/jar.mn
+++ b/toolkit/components/payments/jar.mn
@@ -10,8 +10,9 @@ toolkit.jar:
     content/payments/paymentDialog.xhtml              (content/paymentDialog.xhtml)
 %   resource payments %res/payments/
     res/payments                                      (res/paymentRequest.*)
+    res/payments/components/                          (res/components/*.js)
     res/payments/debugging.html                       (res/debugging.html)
     res/payments/debugging.js                         (res/debugging.js)
-    res/payments/components/                          (res/components/*.js)
     res/payments/mixins/                              (res/mixins/*.js)
+    res/payments/PaymentsStore.js                     (res/PaymentsStore.js)
     res/payments/vendor/                              (res/vendor/*)
diff --git a/toolkit/components/payments/moz.build b/toolkit/components/payments/moz.build
index ad93a1b8a3ee..b461b7fb3d18 100644
--- a/toolkit/components/payments/moz.build
+++ b/toolkit/components/payments/moz.build
@@ -23,3 +23,5 @@ SPHINX_TREES['docs'] = 'docs'
 TESTING_JS_MODULES += [
     'test/PaymentTestUtils.jsm',
 ]
+
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
diff --git a/toolkit/components/payments/res/PaymentsStore.js b/toolkit/components/payments/res/PaymentsStore.js
new file mode 100644
index 000000000000..a1b6518aa375
--- /dev/null
+++ b/toolkit/components/payments/res/PaymentsStore.js
@@ -0,0 +1,92 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+/**
+ * The PaymentsStore class provides lightweight storage with an async publish/subscribe mechanism.
+ * Synchronous state changes are batched to improve application performance and to reduce partial
+ * state propagation.
+ */
+
+/* exported PaymentsStore */
+
+class PaymentsStore {
+  /**
+   * @param {object} [defaultState = {}] The initial state of the store.
+   */
+  constructor(defaultState = {}) {
+    this._state = defaultState;
+    this._nextNotifification = 0;
+    this._subscribers = new Set();
+  }
+
+  /**
+   * Get the current state as a shallow clone with a shallow freeze.
+   * You shouldn't modify any part of the returned state object as that would bypass notifying
+   * subscribers and could lead to subscribers assuming old state.
+   *
+   * @returns {Object} containing the current state
+   */
+  getState() {
+    return Object.freeze(Object.assign({}, this._state));
+  }
+
+  /**
+   * Augment the current state with the keys of `obj` and asynchronously notify
+   * state subscribers. As a result, multiple synchronous state changes will lead
+   * to a single subscriber notification which leads to better performance and
+   * reduces partial state changes.
+   *
+   * @param {Object} obj The object to augment the state with. Keys in the object
+   *                     will be shallow copied with Object.assign.
+   *
+   * @example If the state is currently {a:3} then setState({b:"abc"}) will result in a state of
+   *          {a:3, b:"abc"}.
+   */
+  async setState(obj) {
+    Object.assign(this._state, obj);
+    let thisChangeNum = ++this._nextNotifification;
+
+    // Let any synchronous setState calls that happen after the current setState call
+    // complete first.
+    // Their effects on the state will be batched up before the callback is actually called below.
+    await Promise.resolve();
+
+    // Don't notify for state changes that are no longer the most recent. We only want to call the
+    // callback once with the latest state.
+    if (thisChangeNum !== this._nextNotifification) {
+      return;
+    }
+
+    for (let subscriber of this._subscribers) {
+      try {
+        subscriber.stateChangeCallback(this.getState());
+      } catch (ex) {
+        console.error(ex);
+      }
+    }
+  }
+
+  /**
+   * Subscribe the object to state changes notifications via a `stateChangeCallback` method.
+   *
+   * @param {Object} component to receive state change callbacks via a `stateChangeCallback` method.
+   *                           If the component is already subscribed, do nothing.
+   */
+  subscribe(component) {
+    if (this._subscribers.has(component)) {
+      return;
+    }
+
+    this._subscribers.add(component);
+  }
+
+  /**
+   * @param {Object} component to stop receiving state change callbacks.
+   */
+  unsubscribe(component) {
+    this._subscribers.delete(component);
+  }
+}
diff --git a/toolkit/components/payments/test/unit/.eslintrc.js b/toolkit/components/payments/test/unit/.eslintrc.js
new file mode 100644
index 000000000000..70fe35407782
--- /dev/null
+++ b/toolkit/components/payments/test/unit/.eslintrc.js
@@ -0,0 +1,7 @@
+"use strict";
+
+module.exports = {
+  "extends": [
+    "plugin:mozilla/xpcshell-test"
+  ]
+};
diff --git a/toolkit/components/payments/test/unit/head.js b/toolkit/components/payments/test/unit/head.js
new file mode 100644
index 000000000000..29f5aea01eee
--- /dev/null
+++ b/toolkit/components/payments/test/unit/head.js
@@ -0,0 +1,11 @@
+const {interfaces: Ci, classes: Cc, results: Cr, utils: Cu} = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+// ================================================
+// Load mocking/stubbing library, sinon
+// docs: http://sinonjs.org/releases/v2.3.2/
+Cu.import("resource://gre/modules/Timer.jsm");
+Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js", this);
+/* globals sinon */
+// ================================================
diff --git a/toolkit/components/payments/test/unit/test_PaymentsStore.js b/toolkit/components/payments/test/unit/test_PaymentsStore.js
new file mode 100644
index 000000000000..686cfed32fa1
--- /dev/null
+++ b/toolkit/components/payments/test/unit/test_PaymentsStore.js
@@ -0,0 +1,126 @@
+"use strict";
+
+/* import-globals-from ../../res/PaymentsStore.js */
+Services.scriptloader.loadSubScript("resource://payments/PaymentsStore.js", this);
+
+add_task(async function test_defaultState() {
+  do_check_true(!!PaymentsStore, "Check PaymentsStore import");
+  let ps = new PaymentsStore({
+    foo: "bar",
+  });
+
+  let state = ps.getState();
+  do_check_true(!!state, "Check state is truthy");
+  do_check_eq(state.foo, "bar", "Check .foo");
+
+  Assert.throws(() => state.foo = "new", TypeError, "Assigning to existing prop. should throw");
+  Assert.throws(() => state.other = "something", TypeError, "Adding a new prop. should throw");
+  Assert.throws(() => delete state.foo, TypeError, "Deleting a prop. should throw");
+});
+
+add_task(async function test_setState() {
+  let ps = new PaymentsStore({});
+
+  ps.setState({
+    one: "one",
+  });
+  let state = ps.getState();
+  do_check_eq(Object.keys(state).length, 1, "Should only have 1 prop. set");
+  do_check_eq(state.one, "one", "Check .one");
+
+  ps.setState({
+    two: 2,
+  });
+  state = ps.getState();
+  do_check_eq(Object.keys(state).length, 2, "Should have 2 props. set");
+  do_check_eq(state.one, "one", "Check .one");
+  do_check_eq(state.two, 2, "Check .two");
+
+  ps.setState({
+    one: "a",
+    two: "b",
+  });
+  state = ps.getState();
+  do_check_eq(state.one, "a", "Check .one");
+  do_check_eq(state.two, "b", "Check .two");
+
+  do_print("check consecutive setState for the same prop");
+  ps.setState({
+    one: "c",
+  });
+  ps.setState({
+    one: "d",
+  });
+  state = ps.getState();
+  do_check_eq(Object.keys(state).length, 2, "Should have 2 props. set");
+  do_check_eq(state.one, "d", "Check .one");
+  do_check_eq(state.two, "b", "Check .two");
+});
+
+add_task(async function test_subscribe_unsubscribe() {
+  let ps = new PaymentsStore({});
+  let subscriber = {
+    stateChangePromise: null,
+    _stateChangeResolver: null,
+
+    reset() {
+      this.stateChangePromise = new Promise(resolve => {
+        this._stateChangeResolver = resolve;
+      });
+    },
+
+    stateChangeCallback(state) {
+      this._stateChangeResolver(state);
+      this.stateChangePromise = new Promise(resolve => {
+        this._stateChangeResolver = resolve;
+      });
+    },
+  };
+
+  sinon.spy(subscriber, "stateChangeCallback");
+  subscriber.reset();
+  ps.subscribe(subscriber);
+  do_print("subscribe the same listener twice to ensure it still doesn't call the callback");
+  ps.subscribe(subscriber);
+  do_check_true(subscriber.stateChangeCallback.notCalled,
+                "Check not called synchronously when subscribing");
+
+  let changePromise = subscriber.stateChangePromise;
+  ps.setState({
+    a: 1,
+  });
+  do_check_true(subscriber.stateChangeCallback.notCalled,
+                "Check not called synchronously for changes");
+  let state = await changePromise;
+  do_check_eq(state, subscriber.stateChangeCallback.getCall(0).args[0],
+              "Check resolved state is last state");
+  do_check_eq(JSON.stringify(state), `{"a":1}`, "Check callback state");
+
+  do_print("Testing consecutive setState");
+  subscriber.reset();
+  subscriber.stateChangeCallback.reset();
+  changePromise = subscriber.stateChangePromise;
+  ps.setState({
+    a: 2,
+  });
+  ps.setState({
+    a: 3,
+  });
+  do_check_true(subscriber.stateChangeCallback.notCalled,
+                "Check not called synchronously for changes");
+  state = await changePromise;
+  do_check_eq(state, subscriber.stateChangeCallback.getCall(0).args[0],
+              "Check resolved state is last state");
+  do_check_eq(JSON.stringify(subscriber.stateChangeCallback.getCall(0).args[0]), `{"a":3}`,
+              "Check callback state matches second setState");
+
+  do_print("test unsubscribe");
+  subscriber.stateChangeCallback = function unexpectedChange() {
+    do_check_true(false, "stateChangeCallback shouldn't be called after unsubscribing");
+  };
+  ps.unsubscribe(subscriber);
+  ps.setState({
+    a: 4,
+  });
+  await Promise.resolve("giving a chance for the callback to be called");
+});
diff --git a/toolkit/components/payments/test/unit/xpcshell.ini b/toolkit/components/payments/test/unit/xpcshell.ini
new file mode 100644
index 000000000000..66707caf446b
--- /dev/null
+++ b/toolkit/components/payments/test/unit/xpcshell.ini
@@ -0,0 +1,4 @@
+[DEFAULT]
+head = head.js
+
+[test_PaymentsStore.js]

From 50105cec036ce6ba60241df2435bc17c1489e81c Mon Sep 17 00:00:00 2001
From: Alastor Wu <alwu@mozilla.com>
Date: Fri, 1 Dec 2017 10:54:13 +0800
Subject: [PATCH 002/219] Bug 1417300 - adjust sample time before calculating
 the total decoded duration. r=jya

We do not want to perform the adjustment of the timestamp after reading the ogg
chain but before. Otherwise the parent's mDecodedAudioDuration would be adjusted
causing the sample's time to be twice the value it should be.

MozReview-Commit-ID: 50VrOCzrwFg

--HG--
extra : rebase_source : 48b1efecb138ca7fa0e4c0584e21be1b6850cce3
---
 dom/media/ogg/OggDemuxer.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dom/media/ogg/OggDemuxer.cpp b/dom/media/ogg/OggDemuxer.cpp
index 588e84a957aa..55c9222e54bb 100644
--- a/dom/media/ogg/OggDemuxer.cpp
+++ b/dom/media/ogg/OggDemuxer.cpp
@@ -1348,13 +1348,17 @@ OggTrackDemuxer::NextSample()
   if (mType == TrackInfo::kAudioTrack) {
     data->mTrackInfo = mParent->mSharedAudioTrackInfo;
   }
+  // We do not want to perform the adjustment of the timestamp after reading
+  // the ogg chain but before. Otherwise the parent's mDecodedAudioDuration
+  // would be adjusted causing the sample's time to be twice the value it
+  // should be.
+  data->mTime += mParent->mDecodedAudioDuration;
   if (eos) {
     // We've encountered an end of bitstream packet; check for a chained
     // bitstream following this one.
     // This will also update mSharedAudioTrackInfo.
     mParent->ReadOggChain(data->GetEndTime());
   }
-  data->mTime += mParent->mDecodedAudioDuration;
   return data;
 }
 

From 95e86e857a436768ccb5c8996e8a902a8cfc5c4b Mon Sep 17 00:00:00 2001
From: Morris Tseng <mtseng@mozilla.com>
Date: Thu, 30 Nov 2017 10:36:46 +0800
Subject: [PATCH 003/219] Bug 1421930 - Add crashtest. r=mattwoodrow

MozReview-Commit-ID: BXTREZhY3fK

--HG--
extra : rebase_source : e2ec2186e9b1b39aa5c9b2fdd1bc871412ec35e5
---
 layout/painting/crashtests/1419917.html    | 15 +++++++++++++++
 layout/painting/crashtests/crashtests.list |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 layout/painting/crashtests/1419917.html

diff --git a/layout/painting/crashtests/1419917.html b/layout/painting/crashtests/1419917.html
new file mode 100644
index 000000000000..a60dd15403a7
--- /dev/null
+++ b/layout/painting/crashtests/1419917.html
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <style>
+      :nth-last-child(2) { -moz-appearance:listbox }
+    </style>
+    <script>
+    try { o1 = document.createElement('tr') } catch(e) { }
+    try { o2 = document.createElement('th') } catch(e) { }
+    try { o3 = document.createElement('canvas') } catch(e) { }
+    try { document.documentElement.appendChild(o1) } catch(e) { }
+    try { o1.appendChild(o2) } catch(e) { }
+    try { o1.appendChild(o3) } catch(e) { }
+    </script>
+  </head>
+</html>
diff --git a/layout/painting/crashtests/crashtests.list b/layout/painting/crashtests/crashtests.list
index 60c19c30f09d..6df48b95f9fe 100644
--- a/layout/painting/crashtests/crashtests.list
+++ b/layout/painting/crashtests/crashtests.list
@@ -4,3 +4,4 @@ load 1413073-1.html
 load 1413073-2.html
 load 1405881-1.html
 load 1418722-1.html
+load 1419917.html

From f8dabfd76dd14c56dfd0c623120b68abfc058110 Mon Sep 17 00:00:00 2001
From: Nevin Chen <cnevinchen@gmail.com>
Date: Thu, 30 Nov 2017 17:58:05 +0800
Subject: [PATCH 004/219] Bug 1421946 - Make Switchboard accept duplicated
 experiment names. r=maliu

MozReview-Commit-ID: IL2WLraknMt

--HG--
extra : rebase_source : 1ac61425d5be8ffd18b237519036b21218f35e9d
---
 .../gecko/switchboard/SwitchBoard.java        | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/switchboard/SwitchBoard.java b/mobile/android/base/java/org/mozilla/gecko/switchboard/SwitchBoard.java
index e7361a6ef808..d78663060f99 100644
--- a/mobile/android/base/java/org/mozilla/gecko/switchboard/SwitchBoard.java
+++ b/mobile/android/base/java/org/mozilla/gecko/switchboard/SwitchBoard.java
@@ -142,34 +142,25 @@ public class SwitchBoard {
         }
 
         try {
-            // TODO: cache the array into a mapping so we don't do a loop everytime we are looking for a experiment key
             final JSONArray experiments = new JSONObject(config).getJSONArray(KEY_DATA);
-            JSONObject experiment = null;
 
+            // Allow repeated experiment names. Only return false after we've iterated all experiments and can't find a match.
             for (int i = 0; i < experiments.length(); i++) {
                 JSONObject entry = experiments.getJSONObject(i);
                 final String name = entry.getString(KEY_NAME);
-                if (name.equals(experimentName)) {
-                    experiment = entry;
-                    break;
+                final boolean isTarget = name.equals(experimentName);
+                if (isTarget) {
+                    final boolean isMatch = isMatch(c, entry.optJSONObject(KEY_MATCH));
+                    final JSONObject buckets = entry.getJSONObject(KEY_BUCKETS);
+                    final boolean isInBucket = isInBucket(c, buckets.getInt(KEY_MIN), buckets.getInt(KEY_MAX));
+                    if (isMatch && isInBucket) {
+                        return true;
+                    }
                 }
             }
 
-            if (experiment == null) {
-                return false;
-            }
+            return false;
 
-            if (!isMatch(c, experiment.optJSONObject(KEY_MATCH))) {
-                return false;
-            }
-
-            final JSONObject buckets = experiment.getJSONObject(KEY_BUCKETS);
-            final boolean inExperiment = isInBucket(c, buckets.getInt(KEY_MIN), buckets.getInt(KEY_MAX));
-
-            if (DEBUG) {
-                Log.d(TAG, experimentName + " = " + inExperiment);
-            }
-            return inExperiment;
         } catch (JSONException e) {
             // If the experiment name is not found in the JSON, just return false.
             // There is no need to log an error, since we don't really care if an

From 2f6593bbd3bfedf0eed4b3d682b5c0ef673eea40 Mon Sep 17 00:00:00 2001
From: Kilik Kuo <kikuo@mozilla.com>
Date: Fri, 1 Dec 2017 10:59:57 +0800
Subject: [PATCH 005/219] Bug 1421920 - Remove unnecessary script in
 test_eme_unsetMediaKeys_then_capture.html for further debugging. r=jwwang
 There're several causes for Bug 1414464. Removing unnecessary script in this
 test to eliminate the uncertainty for further debugging.

MozReview-Commit-ID: IWvvlzJ24gw

--HG--
extra : rebase_source : 0307c8c1874be276f906a617bcaded9c27885d60
---
 .../test/test_eme_unsetMediaKeys_then_capture.html  | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/dom/media/test/test_eme_unsetMediaKeys_then_capture.html b/dom/media/test/test_eme_unsetMediaKeys_then_capture.html
index b128420c70dd..7229be60b068 100644
--- a/dom/media/test/test_eme_unsetMediaKeys_then_capture.html
+++ b/dom/media/test/test_eme_unsetMediaKeys_then_capture.html
@@ -37,14 +37,9 @@ function startTest(test, token)
 
   function onVideoEnded(ev) {
     ok(true, TimeStamp(token) + " (ENCRYPTED) content playback ended.");
-    v.removeEventListener("ended", onVideoEnded);
 
     function playClearVideo() {
-      var p1 = once(v, 'ended', (e) => {
-        ok(true, TimeStamp(token) + " (CLEAR) content playback ended.");
-        console.log(" bipbop.mp4 playback ended !!");
-      });
-      var p2 = once(v, 'loadeddata', (e) => {
+      var p1 = once(v, 'loadeddata', (e) => {
         ok(true, TimeStamp(token) + " Receiving event 'loadeddata' for (CLEAR) content.");
         canvasElem = document.createElement('canvas');
         document.body.appendChild(canvasElem);
@@ -62,7 +57,7 @@ function startTest(test, token)
       });
       v.src = 'bipbop_225w_175kbps.mp4';
       v.play();
-      Promise.all([p1, p2, closeSessions()]).then(() => {
+      Promise.all([p1]).then(() => {
         manager.finished(token);
       }, () => {
         ok(false, TimeStamp(token) + " Something wrong.");
@@ -70,7 +65,7 @@ function startTest(test, token)
       });
     }
 
-    Promise.all(sessions.map(s => s.close()))
+    closeSessions()
     .then(() => {
       v.setMediaKeys(null)
       .then(() => {
@@ -82,7 +77,7 @@ function startTest(test, token)
     });
   }
 
-  v.addEventListener("ended", onVideoEnded);
+  once(v, "ended", onVideoEnded);
 
   // Create a MediaKeys object and set to HTMLMediaElement then start the playback.
   Promise.all([

From fd883fdb12508e03895062f49f4eb6aa9acceff3 Mon Sep 17 00:00:00 2001
From: Thomas Nguyen <tnguyen@mozilla.com>
Date: Mon, 23 Oct 2017 18:14:28 +0800
Subject: [PATCH 006/219] Bug 1345433 - Bring back assertion that history
 entries need a valid triggeringPrincipal r=JanH,smaug

MozReview-Commit-ID: 9GfGIxkqfhM

--HG--
extra : rebase_source : 9568fb89e43400453d42980a267aee733d551e13
---
 docshell/base/nsDocShell.cpp             | 4 +++-
 docshell/shistory/nsSHEntry.cpp          | 5 +++++
 mobile/android/chrome/content/browser.js | 5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index b852c914bcc0..6c7872eaf0b2 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -13028,8 +13028,10 @@ nsDocShell::LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType)
     srcdoc = VoidString();
   }
 
+  // If there is no valid triggeringPrincipal, we deny the load
+  MOZ_ASSERT(triggeringPrincipal, "need a valid triggeringPrincipal to load from history");
   if (!triggeringPrincipal) {
-    triggeringPrincipal = nsContentUtils::GetSystemPrincipal();
+    return NS_ERROR_FAILURE;
   }
 
   // Passing nullptr as aSourceDocShell gives the same behaviour as before
diff --git a/docshell/shistory/nsSHEntry.cpp b/docshell/shistory/nsSHEntry.cpp
index e92d67a4a8d0..ab86d08876bf 100644
--- a/docshell/shistory/nsSHEntry.cpp
+++ b/docshell/shistory/nsSHEntry.cpp
@@ -550,6 +550,11 @@ nsSHEntry::GetTriggeringPrincipal(nsIPrincipal** aTriggeringPrincipal)
 NS_IMETHODIMP
 nsSHEntry::SetTriggeringPrincipal(nsIPrincipal* aTriggeringPrincipal)
 {
+  MOZ_ASSERT(aTriggeringPrincipal, "need a valid triggeringPrincipal");
+  if (!aTriggeringPrincipal) {
+    return NS_ERROR_FAILURE;
+  }
+
   mShared->mTriggeringPrincipal = aTriggeringPrincipal;
   return NS_OK;
 }
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 3ea937791267..6f2d3f42f91b 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -115,6 +115,8 @@ XPCOMUtils.defineLazyServiceGetter(this, "FontEnumerator",
   "@mozilla.org/gfx/fontenumerator;1",
   "nsIFontEnumerator");
 
+XPCOMUtils.defineLazyModuleGetter(this, "Utils", "resource://gre/modules/sessionstore/Utils.jsm");
+
 var GlobalEventDispatcher = EventDispatcher.instance;
 var WindowEventDispatcher = EventDispatcher.for(window);
 
@@ -3689,7 +3691,8 @@ Tab.prototype = {
     this.browser.__SS_data = {
       entries: [{
         url: uri,
-        title: truncate(title, MAX_TITLE_LENGTH)
+        title: truncate(title, MAX_TITLE_LENGTH),
+        triggeringPrincipal_base64: Utils.SERIALIZED_SYSTEMPRINCIPAL
       }],
       index: 1,
       desktopMode: this.desktopMode,

From d67c09f7dd0a1b7e91a5dd82e0268e1be8bc59a9 Mon Sep 17 00:00:00 2001
From: Thomas Nguyen <tnguyen@mozilla.com>
Date: Mon, 23 Oct 2017 18:15:40 +0800
Subject: [PATCH 007/219] Bug 1345433 - Ensure tests load pass valid
 triggeringPrincipal. r=ckerschb,JanH

MozReview-Commit-ID: LWcP7drDPwL

--HG--
extra : rebase_source : 3741530254b3cb2627f798cf22eacf64c29a8b9e
---
 .../browser/browser_ext_tabs_discarded.js     |  5 ++++-
 .../test/browser/browser_ext_tabs_lazy.js     |  7 ++++--
 .../test/browser_906076_lazy_tabs.js          | 22 +++++++++----------
 .../test/browser_tab_label_during_restore.js  |  8 +++----
 .../test/browser_scratchpad_sessions.js       |  4 ++--
 .../org/mozilla/gecko/tests/SessionTest.java  | 10 +++++++++
 6 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_discarded.js b/browser/components/extensions/test/browser/browser_ext_tabs_discarded.js
index ea9b08bba1b8..e9f46a955a7c 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_discarded.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_discarded.js
@@ -3,7 +3,10 @@
 /* global gBrowser SessionStore */
 "use strict";
 
-let lazyTabState = {entries: [{url: "http://example.com/", title: "Example Domain"}]};
+const {Utils} = Cu.import("resource://gre/modules/sessionstore/Utils.jsm", {});
+const triggeringPrincipal_base64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
+
+let lazyTabState = {entries: [{url: "http://example.com/", triggeringPrincipal_base64, title: "Example Domain"}]};
 
 add_task(async function test_discarded() {
   let extension = ExtensionTestUtils.loadExtension({
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_lazy.js b/browser/components/extensions/test/browser/browser_ext_tabs_lazy.js
index 96556f284ee2..d0c7030aab42 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_lazy.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_lazy.js
@@ -1,10 +1,13 @@
 "use strict";
 
+const {Utils} = Cu.import("resource://gre/modules/sessionstore/Utils.jsm", {});
+const triggeringPrincipal_base64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
+
 const SESSION = {
   windows: [{
     tabs: [
-      {entries: [{url: "about:blank"}]},
-      {entries: [{url: "https://example.com/"}]},
+      {entries: [{url: "about:blank", triggeringPrincipal_base64}]},
+      {entries: [{url: "https://example.com/", triggeringPrincipal_base64}]},
     ],
   }],
 };
diff --git a/browser/components/sessionstore/test/browser_906076_lazy_tabs.js b/browser/components/sessionstore/test/browser_906076_lazy_tabs.js
index d92b7e0a3edd..60acdc7ea340 100644
--- a/browser/components/sessionstore/test/browser_906076_lazy_tabs.js
+++ b/browser/components/sessionstore/test/browser_906076_lazy_tabs.js
@@ -4,16 +4,16 @@
 const TEST_STATE = {
   windows: [{
     tabs: [
-      { entries: [{ url: "http://example.com" }] },
-      { entries: [{ url: "http://example.com" }] },
-      { entries: [{ url: "http://example.com" }] },
-      { entries: [{ url: "http://example.com" }] },
-      { entries: [{ url: "http://example.com" }] },
-      { entries: [{ url: "http://example.com" }] },
-      { entries: [{ url: "http://example.com" }] },
-      { entries: [{ url: "http://example.com" }] },
-      { entries: [{ url: "http://example.com" }] },
-      { entries: [{ url: "http://example.com" }] },
+      { entries: [{ url: "http://example.com", triggeringPrincipal_base64 }] },
+      { entries: [{ url: "http://example.com", triggeringPrincipal_base64 }] },
+      { entries: [{ url: "http://example.com", triggeringPrincipal_base64 }] },
+      { entries: [{ url: "http://example.com", triggeringPrincipal_base64 }] },
+      { entries: [{ url: "http://example.com", triggeringPrincipal_base64 }] },
+      { entries: [{ url: "http://example.com", triggeringPrincipal_base64 }] },
+      { entries: [{ url: "http://example.com", triggeringPrincipal_base64 }] },
+      { entries: [{ url: "http://example.com", triggeringPrincipal_base64 }] },
+      { entries: [{ url: "http://example.com", triggeringPrincipal_base64 }] },
+      { entries: [{ url: "http://example.com", triggeringPrincipal_base64 }] },
     ]
   }]
 };
@@ -21,7 +21,7 @@ const TEST_STATE = {
 const TEST_STATE_2 = {
   windows: [{
     tabs: [
-      { entries: [{ url: "about:robots" }]
+      { entries: [{ url: "about:robots", triggeringPrincipal_base64 }]
       },
       { entries: [],
         userTypedValue: "http://example.com",
diff --git a/browser/components/sessionstore/test/browser_tab_label_during_restore.js b/browser/components/sessionstore/test/browser_tab_label_during_restore.js
index 0d9917a18a1d..fb6617d67ab8 100644
--- a/browser/components/sessionstore/test/browser_tab_label_during_restore.js
+++ b/browser/components/sessionstore/test/browser_tab_label_during_restore.js
@@ -40,10 +40,10 @@ add_task(async function() {
   await promiseBrowserState({
     windows: [{
       tabs: [
-        { entries: [{ url: REMOTE_URL }] },
-        { entries: [{ url: ABOUT_ROBOTS_URI }] },
-        { entries: [{ url: REMOTE_URL }] },
-        { entries: [{ url: NO_TITLE_URL }] },
+        { entries: [{ url: REMOTE_URL, triggeringPrincipal_base64 }] },
+        { entries: [{ url: ABOUT_ROBOTS_URI, triggeringPrincipal_base64 }] },
+        { entries: [{ url: REMOTE_URL, triggeringPrincipal_base64 }] },
+        { entries: [{ url: NO_TITLE_URL, triggeringPrincipal_base64 }] },
       ]
     }]
   });
diff --git a/devtools/client/scratchpad/test/browser_scratchpad_sessions.js b/devtools/client/scratchpad/test/browser_scratchpad_sessions.js
index a6d1728ddd9e..12410771d62b 100644
--- a/devtools/client/scratchpad/test/browser_scratchpad_sessions.js
+++ b/devtools/client/scratchpad/test/browser_scratchpad_sessions.js
@@ -3,13 +3,13 @@
 "use strict";
 
 const {Utils} = Cu.import("resource://gre/modules/sessionstore/Utils.jsm", {});
-const triggeringPrincipalBase64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
+const triggeringPrincipal_base64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
 const ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
 
 const testState = {
   windows: [{
     tabs: [
-      { entries: [{ url: "about:blank", triggeringPrincipalBase64 }] },
+      { entries: [{ url: "about:blank", triggeringPrincipal_base64 }] },
     ]
   }],
   scratchpads: [
diff --git a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/SessionTest.java b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/SessionTest.java
index 35a4739c2145..1c5ac11d3f47 100644
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/SessionTest.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/SessionTest.java
@@ -56,6 +56,7 @@ public abstract class SessionTest extends UITest {
     protected class PageInfo {
         private final String url;
         private final String title;
+        private final String triggeringPrincipal_base64;
 
         public PageInfo(String key) {
             if (key.startsWith("about:")) {
@@ -64,6 +65,8 @@ public abstract class SessionTest extends UITest {
                 url = getPage(key);
             }
             title = key;
+            triggeringPrincipal_base64 =
+              "SmIS26zLEdO3ZQBgsLbOywAAAAAAAAAAwAAAAAAAAEY=";
         }
     }
 
@@ -271,6 +274,8 @@ public abstract class SessionTest extends UITest {
                     final JSONObject entry = new JSONObject();
                     entry.put("url", page.url);
                     entry.put("title", page.title);
+                    entry.put("triggeringPrincipal_base64",
+                              page.triggeringPrincipal_base64);
                     entries.put(entry);
                 }
 
@@ -363,12 +368,17 @@ public abstract class SessionTest extends UITest {
                     final JSONObject entry = entries.getJSONObject(j);
                     final String url = entry.getString("url");
                     final String title = entry.optString("title");
+                    final String principal =
+                      entry.getString("triggeringPrincipal_base64");
                     final PageInfo page = pages[j];
 
                     asserter.is(url, page.url, "URL in JSON matches session URL");
                     if (!page.url.startsWith("about:")) {
                         asserter.is(title, page.title, "title in JSON matches session title");
                     }
+
+                    asserter.is(principal, page.triggeringPrincipal_base64,
+                                "principal in JSON matches session principal");
                 }
             }
         } catch (JSONException e) {

From a407c868302f121447bfa720a3528447734b59ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Delphine=20Leb=C3=A9del?= <dlebedel@mozilla.com>
Date: Thu, 30 Nov 2017 18:13:43 -0800
Subject: [PATCH 008/219] Bug 1422200 - Add vi to maemo-locales for 
 multi-locale builds, r=flod

MozReview-Commit-ID: FFJGTFPi17E

--HG--
extra : rebase_source : 828a0d93ed114e724d38793f239462982fcd9b9b
---
 mobile/android/locales/maemo-locales | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/android/locales/maemo-locales b/mobile/android/locales/maemo-locales
index 3476dc405182..045d2848f519 100644
--- a/mobile/android/locales/maemo-locales
+++ b/mobile/android/locales/maemo-locales
@@ -83,6 +83,7 @@ tr
 uk
 ur
 uz
+vi
 wo
 xh
 zam

From cfd1a43f56e983ae99b9a6770520e930acf25f8f Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Wed, 29 Nov 2017 16:55:00 +0100
Subject: [PATCH 009/219] Bug 1408936 - Enable
 browser_webconsole_eval_in_debugger_stackframe.js in new console frontend;
 r=bgrins.

MozReview-Commit-ID: 6IiuekmfENG

--HG--
extra : rebase_source : c190b35c66dfb93db86aa38f6c23e48e2be15ab7
---
 .../test/mochitest/browser.ini                |   1 -
 ..._webconsole_eval_in_debugger_stackframe.js | 213 ++++++------------
 2 files changed, 70 insertions(+), 144 deletions(-)

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
index 4403ebdbe633..62a7e6e911ee 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -276,7 +276,6 @@ skip-if = true #	Bug 1403907
 [browser_webconsole_errors_after_page_reload.js]
 skip-if = true # Bug 1408935
 [browser_webconsole_eval_in_debugger_stackframe.js]
-skip-if = true # Bug 1408936
 [browser_webconsole_eval_in_debugger_stackframe2.js]
 skip-if = true # Bug 1408893
 [browser_webconsole_execution_scope.js]
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js
index bc923ff4495b..3a0cddde9f5c 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js
@@ -9,149 +9,76 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "test/test-eval-in-stackframe.html";
+                 "new-console-output/test/mochitest/test-eval-in-stackframe.html";
 
-var gWebConsole, gJSTerm, gDebuggerWin, gThread, gDebuggerController;
-var gStackframes;
+add_task(async function () {
+  // Force the old debugger UI since it's directly used (see Bug 1301705).
+  await pushPref("devtools.debugger.new-debugger-frontend", false);
 
-// Force the old debugger UI since it's directly used (see Bug 1301705)
-Services.prefs.setBoolPref("devtools.debugger.new-debugger-frontend", false);
-registerCleanupFunction(function* () {
-  Services.prefs.clearUserPref("devtools.debugger.new-debugger-frontend");
-});
-
-function test() {
-  loadTab(TEST_URI).then(() => {
-    openConsole().then(consoleOpened);
-  });
-}
-
-function consoleOpened(hud) {
-  gWebConsole = hud;
-  gJSTerm = hud.jsterm;
-  gJSTerm.execute("foo").then(onExecuteFoo);
-}
-
-function onExecuteFoo() {
-  isnot(gWebConsole.outputNode.textContent.indexOf("globalFooBug783499"), -1,
-        "|foo| value is correct");
-
-  gJSTerm.clearOutput();
-
-  // Test for Bug 690529 - Web Console and Scratchpad should evaluate
-  // expressions in the scope of the content window, not in a sandbox.
-  executeSoon(() => {
-    gJSTerm.execute("foo2 = 'newFoo'; window.foo2").then(onNewFoo2);
-  });
-}
-
-function onNewFoo2(msg) {
-  is(gWebConsole.outputNode.textContent.indexOf("undefined"), -1,
-     "|undefined| is not displayed after adding |foo2|");
-
-  ok(msg, "output result found");
-
-  isnot(msg.textContent.indexOf("newFoo"), -1,
-        "'newFoo' is displayed after adding |foo2|");
-
-  gJSTerm.clearOutput();
-
-  info("openDebugger");
-  executeSoon(() => openDebugger().then(debuggerOpened));
-}
-
-function debuggerOpened(aResult) {
-  gDebuggerWin = aResult.panelWin;
-  gDebuggerController = gDebuggerWin.DebuggerController;
-  gThread = gDebuggerController.activeThread;
-  gStackframes = gDebuggerController.StackFrames;
-
-  info("openConsole");
-  executeSoon(() =>
-    openConsole().then(() =>
-      gJSTerm.execute("foo + foo2").then(onExecuteFooAndFoo2)
-    )
-  );
-}
-
-function onExecuteFooAndFoo2() {
-  let expected = "globalFooBug783499newFoo";
-  isnot(gWebConsole.outputNode.textContent.indexOf(expected), -1,
-        "|foo + foo2| is displayed after starting the debugger");
-
-  executeSoon(() => {
-    gJSTerm.clearOutput();
-
-    info("openDebugger");
-    openDebugger().then(() => {
-      gThread.addOneTimeListener("framesadded", onFramesAdded);
-
-      info("firstCall()");
-      ContentTask.spawn(gBrowser.selectedBrowser, {}, function* () {
-        content.wrappedJSObject.firstCall();
-      });
-    });
-  });
-}
-
-function onFramesAdded() {
-  info("onFramesAdded, openConsole() now");
-  executeSoon(() =>
-    openConsole().then(() =>
-      gJSTerm.execute("foo + foo2").then(onExecuteFooAndFoo2InSecondCall)
-    )
-  );
-}
-
-function onExecuteFooAndFoo2InSecondCall() {
-  let expected = "globalFooBug783499foo2SecondCall";
-  isnot(gWebConsole.outputNode.textContent.indexOf(expected), -1,
-        "|foo + foo2| from |secondCall()|");
-
-  function runOpenConsole() {
-    openConsole().then(() => {
-      gJSTerm.execute("foo + foo2 + foo3").then(onExecuteFoo23InFirstCall);
-    });
-  }
-
-  executeSoon(() => {
-    gJSTerm.clearOutput();
-
-    info("openDebugger and selectFrame(1)");
-
-    openDebugger().then(() => {
-      gStackframes.selectFrame(1);
-
-      info("openConsole");
-      executeSoon(() => runOpenConsole());
-    });
-  });
-}
-
-function onExecuteFoo23InFirstCall() {
-  let expected = "fooFirstCallnewFoofoo3FirstCall";
-  isnot(gWebConsole.outputNode.textContent.indexOf(expected), -1,
-        "|foo + foo2 + foo3| from |firstCall()|");
-
-  executeSoon(() =>
-    gJSTerm.execute("foo = 'abba'; foo3 = 'bug783499'; foo + foo3").then(
-                    onExecuteFooAndFoo3ChangesInFirstCall));
-}
-
-var onExecuteFooAndFoo3ChangesInFirstCall = Task.async(function*() {
-  let expected = "abbabug783499";
-  isnot(gWebConsole.outputNode.textContent.indexOf(expected), -1,
-        "|foo + foo3| updated in |firstCall()|");
-
-  yield ContentTask.spawn(gBrowser.selectedBrowser, null, function*() {
-    is(content.wrappedJSObject.foo, "globalFooBug783499",
-       "|foo| in content window");
-    is(content.wrappedJSObject.foo2, "newFoo", "|foo2| in content window");
-    ok(!content.wrappedJSObject.foo3,
-       "|foo3| was not added to the content window");
-  });
-
-  gWebConsole = gJSTerm = gDebuggerWin = gThread = gDebuggerController =
-    gStackframes = null;
-  executeSoon(finishTest);
+  info("open the console");
+  const hud = await openNewTabAndConsole(TEST_URI);
+  const {jsterm} = hud;
+
+  info("Check `foo` value");
+  let onResultMessage = waitForMessage(hud, "globalFooBug783499");
+  jsterm.execute("foo");
+  await onResultMessage;
+  ok(true, "|foo| value is correct");
+
+  info("Assign and check `foo2` value");
+  onResultMessage = waitForMessage(hud, "newFoo");
+  jsterm.execute("foo2 = 'newFoo'; window.foo2");
+  await onResultMessage;
+  ok(true, "'newFoo' is displayed after adding `foo2`");
+
+  info("Open the debugger and then select the console again");
+  const {panel} = await openDebugger();
+  const {activeThread, StackFrames: stackFrames} = panel.panelWin.DebuggerController;
+
+  await openConsole();
+
+  info("Check `foo + foo2` value");
+  onResultMessage = waitForMessage(hud, "globalFooBug783499newFoo");
+  jsterm.execute("foo + foo2");
+  await onResultMessage;
+
+  info("Select the debugger again");
+  await openDebugger();
+
+  const onFirstCallFramesAdded = activeThread.addOneTimeListener("framesadded");
+  // firstCall calls secondCall, which has a debugger statement, so we'll be paused.
+  ContentTask.spawn(gBrowser.selectedBrowser, {}, function () {
+    content.wrappedJSObject.firstCall();
+  });
+  await onFirstCallFramesAdded;
+
+  info("frames added, select the console again");
+  await openConsole();
+
+  info("Check `foo + foo2` value when paused");
+  onResultMessage = waitForMessage(hud, "globalFooBug783499foo2SecondCall");
+  jsterm.execute("foo + foo2");
+  ok(true, "`foo + foo2` from `secondCall()`");
+
+  info("select the debugger and select the frame (1)");
+  await openDebugger();
+  stackFrames.selectFrame(1);
+  await openConsole();
+
+  info("Check `foo + foo2 + foo3` value when paused on a given frame");
+  onResultMessage = waitForMessage(hud, "fooFirstCallnewFoofoo3FirstCall");
+  jsterm.execute("foo + foo2 + foo3");
+  await onResultMessage;
+  ok(true, "`foo + foo2 + foo3` from `firstCall()`");
+
+  onResultMessage = waitForMessage(hud, "abbabug783499");
+  jsterm.execute("foo = 'abba'; foo3 = 'bug783499'; foo + foo3");
+  await onResultMessage;
+  ok(true, "`foo + foo3` updated in `firstCall()`");
+
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
+    is(content.wrappedJSObject.foo, "globalFooBug783499", "`foo` in content window");
+    is(content.wrappedJSObject.foo2, "newFoo", "`foo2` in content window");
+    ok(!content.wrappedJSObject.foo3, "`foo3` was not added to the content window");
+  });
 });

From a2b4c53cf7138ac26b9d84d2cf3537e75267a571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sta=C5=9B=20Ma=C5=82olepszy?= <stas@mozilla.com>
Date: Thu, 30 Nov 2017 14:18:24 +0100
Subject: [PATCH 010/219] Bug 1421932 - Update compare-locales to 2.5.1,
 python-fluent to 0.4.4. r=Pike

MozReview-Commit-ID: GedJNGewU9R

--HG--
extra : rebase_source : ba770bbb6b5bfcd17b7cee74c07372e7a823e51b
---
 .../compare_locales/__init__.py               |    2 +-
 .../compare-locales/compare_locales/checks.py |   25 +-
 .../compare_locales/compare.py                |    5 +-
 .../compare-locales/compare_locales/merge.py  |  115 +
 .../compare-locales/compare_locales/parser.py |  425 ++--
 .../compare-locales/compare_locales/paths.py  |   16 +-
 .../compare_locales/plurals.py                |  160 ++
 .../compare_locales/tests/test_defines.py     |  112 +-
 .../compare_locales/tests/test_dtd.py         |   72 +-
 .../compare_locales/tests/test_ftl.py         |   76 +-
 .../compare_locales/tests/test_merge.py       |    4 +-
 .../tests/test_merge_comments.py              |  186 ++
 .../compare_locales/tests/test_merge_dtd.py   |  133 ++
 .../compare_locales/tests/test_merge_ftl.py   |  316 +++
 .../tests/test_merge_messages.py              |   93 +
 .../tests/test_merge_properties.py            |   41 +
 .../tests/test_merge_unknown.py               |   21 +
 .../tests/test_merge_whitespace.py            |   76 +
 .../compare_locales/tests/test_parser.py      |   24 +-
 .../compare_locales/tests/test_properties.py  |   47 +-
 third_party/python/fluent/PKG-INFO            |   16 -
 .../python/fluent/fluent/migrate/__init__.py  |    5 +-
 .../python/fluent/fluent/migrate/context.py   |  174 +-
 .../python/fluent/fluent/migrate/errors.py    |   10 +
 .../python/fluent/fluent/migrate/helpers.py   |    6 -
 .../python/fluent/fluent/migrate/merge.py     |    7 +-
 .../fluent/fluent/migrate/transforms.py       |   79 +-
 third_party/python/fluent/setup.cfg           |    4 -
 third_party/python/fluent/setup.py            |   24 -
 third_party/python/fluent/tools/fluentfmt.py  |   23 +
 .../python/fluent/tools/migrate/README.md     |   39 +
 .../python/fluent/tools/migrate/blame.py      |   60 +
 .../fluent/tools/migrate/examples/__init__.py |    0
 .../tools/migrate/examples/about_dialog.ftl   |   12 +
 .../tools/migrate/examples/about_dialog.py    |   85 +
 .../migrate/examples/about_downloads.ftl      |   38 +
 .../tools/migrate/examples/about_downloads.py |  179 ++
 .../fluent/tools/migrate/examples/brand.ftl   |   13 +
 .../tools/migrate/examples/bug_1291693.py     | 1917 +++++++++++++++++
 .../fluent/tools/migrate/examples/menubar.ftl |  336 +++
 .../fluent/tools/migrate/examples/toolbar.ftl |   24 +
 .../fluent/tools/migrate/migrate-l10n.py      |  124 ++
 third_party/python/fluent/tools/parse.py      |   25 +
 third_party/python/fluent/tools/serialize.py  |   23 +
 44 files changed, 4738 insertions(+), 434 deletions(-)
 create mode 100644 third_party/python/compare-locales/compare_locales/merge.py
 create mode 100644 third_party/python/compare-locales/compare_locales/plurals.py
 create mode 100644 third_party/python/compare-locales/compare_locales/tests/test_merge_comments.py
 create mode 100644 third_party/python/compare-locales/compare_locales/tests/test_merge_dtd.py
 create mode 100644 third_party/python/compare-locales/compare_locales/tests/test_merge_ftl.py
 create mode 100644 third_party/python/compare-locales/compare_locales/tests/test_merge_messages.py
 create mode 100644 third_party/python/compare-locales/compare_locales/tests/test_merge_properties.py
 create mode 100644 third_party/python/compare-locales/compare_locales/tests/test_merge_unknown.py
 create mode 100644 third_party/python/compare-locales/compare_locales/tests/test_merge_whitespace.py
 delete mode 100644 third_party/python/fluent/PKG-INFO
 create mode 100644 third_party/python/fluent/fluent/migrate/errors.py
 delete mode 100644 third_party/python/fluent/setup.cfg
 delete mode 100644 third_party/python/fluent/setup.py
 create mode 100755 third_party/python/fluent/tools/fluentfmt.py
 create mode 100644 third_party/python/fluent/tools/migrate/README.md
 create mode 100644 third_party/python/fluent/tools/migrate/blame.py
 create mode 100644 third_party/python/fluent/tools/migrate/examples/__init__.py
 create mode 100644 third_party/python/fluent/tools/migrate/examples/about_dialog.ftl
 create mode 100644 third_party/python/fluent/tools/migrate/examples/about_dialog.py
 create mode 100644 third_party/python/fluent/tools/migrate/examples/about_downloads.ftl
 create mode 100644 third_party/python/fluent/tools/migrate/examples/about_downloads.py
 create mode 100644 third_party/python/fluent/tools/migrate/examples/brand.ftl
 create mode 100644 third_party/python/fluent/tools/migrate/examples/bug_1291693.py
 create mode 100644 third_party/python/fluent/tools/migrate/examples/menubar.ftl
 create mode 100644 third_party/python/fluent/tools/migrate/examples/toolbar.ftl
 create mode 100755 third_party/python/fluent/tools/migrate/migrate-l10n.py
 create mode 100755 third_party/python/fluent/tools/parse.py
 create mode 100755 third_party/python/fluent/tools/serialize.py

diff --git a/third_party/python/compare-locales/compare_locales/__init__.py b/third_party/python/compare-locales/compare_locales/__init__.py
index 5647aa0233b2..97438c17666d 100644
--- a/third_party/python/compare-locales/compare_locales/__init__.py
+++ b/third_party/python/compare-locales/compare_locales/__init__.py
@@ -1 +1 @@
-version = "2.1"
+version = "2.5.1"
diff --git a/third_party/python/compare-locales/compare_locales/checks.py b/third_party/python/compare-locales/compare_locales/checks.py
index 2d0642a15878..e4c59c8915de 100644
--- a/third_party/python/compare-locales/compare_locales/checks.py
+++ b/third_party/python/compare-locales/compare_locales/checks.py
@@ -213,7 +213,8 @@ class DTDChecker(Checker):
         if self.__known_entities is None and self.reference is not None:
             self.__known_entities = set()
             for ent in self.reference:
-                self.__known_entities.update(self.entities_for_value(ent.val))
+                self.__known_entities.update(
+                    self.entities_for_value(ent.raw_val))
         return self.__known_entities if self.__known_entities is not None \
             else self.entities_for_value(refValue)
 
@@ -248,7 +249,7 @@ class DTDChecker(Checker):
 
         Return a checker that offers just those entities.
         """
-        refValue, l10nValue = refEnt.val, l10nEnt.val
+        refValue, l10nValue = refEnt.raw_val, l10nEnt.raw_val
         # find entities the refValue references,
         # reusing markup from DTDParser.
         reflist = self.known_entities(refValue)
@@ -434,19 +435,15 @@ class FluentChecker(Checker):
     '''
     pattern = re.compile('.*\.ftl')
 
-    # Positions yielded by FluentChecker.check are absolute offsets from the
-    # beginning of the file.  This is different from the base Checker behavior
-    # which yields offsets from the beginning of the current entity's value.
     def check(self, refEnt, l10nEnt):
         ref_entry = refEnt.entry
         l10n_entry = l10nEnt.entry
         # verify that values match, either both have a value or none
         if ref_entry.value is not None and l10n_entry.value is None:
-            yield ('error', l10n_entry.span.start,
-                   'Missing value', 'fluent')
+            yield ('error', 0, 'Missing value', 'fluent')
         if ref_entry.value is None and l10n_entry.value is not None:
-            yield ('error', l10n_entry.value.span.start,
-                   'Obsolete value', 'fluent')
+            offset = l10n_entry.value.span.start - l10n_entry.span.start
+            yield ('error', offset, 'Obsolete value', 'fluent')
 
         # verify that we're having the same set of attributes
         ref_attr_names = set((attr.id.name for attr in ref_entry.attributes))
@@ -461,9 +458,12 @@ class FluentChecker(Checker):
         # only warn to not trigger a merge skip
         for attr_name, cnt in l10n_attr_counts.items():
             if cnt > 1:
+                offset = (
+                    l10n_entry.attributes[l10n_pos[attr_name]].span.start
+                    - l10n_entry.span.start)
                 yield (
                     'warning',
-                    l10n_entry.attributes[l10n_pos[attr_name]].span.start,
+                    offset,
                     'Attribute "{}" occurs {} times'.format(
                         attr_name, cnt),
                     'fluent')
@@ -471,8 +471,7 @@ class FluentChecker(Checker):
         missing_attr_names = sorted(ref_attr_names - l10n_attr_names,
                                     key=lambda k: ref_pos[k])
         for attr_name in missing_attr_names:
-            yield ('error', l10n_entry.span.start,
-                   'Missing attribute: ' + attr_name, 'fluent')
+            yield ('error', 0, 'Missing attribute: ' + attr_name, 'fluent')
 
         obsolete_attr_names = sorted(l10n_attr_names - ref_attr_names,
                                      key=lambda k: l10n_pos[k])
@@ -482,7 +481,7 @@ class FluentChecker(Checker):
             if attr.id.name in obsolete_attr_names
         ]
         for attr in obsolete_attrs:
-            yield ('error', attr.span.start,
+            yield ('error', attr.span.start - l10n_entry.span.start,
                    'Obsolete attribute: ' + attr.id.name, 'fluent')
 
 
diff --git a/third_party/python/compare-locales/compare_locales/compare.py b/third_party/python/compare-locales/compare_locales/compare.py
index ef1c2bdd052e..ca9a867e4c88 100644
--- a/third_party/python/compare-locales/compare_locales/compare.py
+++ b/third_party/python/compare-locales/compare_locales/compare.py
@@ -10,10 +10,7 @@ import shutil
 import re
 from collections import defaultdict
 
-try:
-    from json import dumps
-except:
-    from simplejson import dumps
+from json import dumps
 
 from compare_locales import parser
 from compare_locales import paths, mozpath
diff --git a/third_party/python/compare-locales/compare_locales/merge.py b/third_party/python/compare-locales/compare_locales/merge.py
new file mode 100644
index 000000000000..22978bd756ae
--- /dev/null
+++ b/third_party/python/compare-locales/compare_locales/merge.py
@@ -0,0 +1,115 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+'Merge resources across channels.'
+
+from collections import OrderedDict, defaultdict
+from codecs import encode
+
+
+from compare_locales import parser as cl
+from compare_locales.compare import AddRemove
+
+
+class MergeNotSupportedError(ValueError):
+    pass
+
+
+def merge_channels(name, *resources):
+    try:
+        parser = cl.getParser(name)
+    except UserWarning:
+        raise MergeNotSupportedError(
+            'Unsupported file format ({}).'.format(name))
+
+    # A map of comments to the keys of entities they belong to.
+    comments = {}
+
+    def parse_resource(resource):
+        # The counter dict keeps track of number of identical comments.
+        counter = defaultdict(int)
+        parser.readContents(resource)
+        pairs = [get_key_value(entity, counter) for entity in parser.walk()]
+        return OrderedDict(pairs)
+
+    def get_key_value(entity, counter):
+        if isinstance(entity, cl.Comment):
+            counter[entity.all] += 1
+            # Use the (value, index) tuple as the key. AddRemove will
+            # de-deplicate identical comments at the same index.
+            return ((entity.all, counter[entity.all]), entity)
+
+        if isinstance(entity, cl.Whitespace):
+            # Use the Whitespace instance as the key so that it's always
+            # unique. Adjecent whitespace will be folded into the longer one in
+            # prune.
+            return (entity, entity)
+
+        # When comments change, AddRemove gives us one 'add' and one 'delete'
+        # (because a comment's key is its content).  In merge_two we'll try to
+        # de-duplicate comments by looking at the entity they belong to.  Set
+        # up the back-reference from the comment to its entity here.
+        if isinstance(entity, cl.Entity) and entity.pre_comment:
+            comments[entity.pre_comment] = entity.key
+
+        return (entity.key, entity)
+
+    entities = reduce(
+        lambda x, y: merge_two(comments, x, y),
+        map(parse_resource, resources))
+
+    return encode(serialize_legacy_resource(entities), parser.encoding)
+
+
+def merge_two(comments, newer, older):
+    diff = AddRemove()
+    diff.set_left(newer.keys())
+    diff.set_right(older.keys())
+
+    def get_entity(key):
+        entity = newer.get(key, None)
+
+        # Always prefer the newer version.
+        if entity is not None:
+            return entity
+
+        entity = older.get(key)
+
+        # If it's an old comment attached to an entity, try to find that
+        # entity in newer and return None to use its comment instead in prune.
+        if isinstance(entity, cl.Comment) and entity in comments:
+            next_entity = newer.get(comments[entity], None)
+            if next_entity is not None and next_entity.pre_comment:
+                # We'll prune this before returning the merged result.
+                return None
+
+        return entity
+
+    # Create a flat sequence of all entities in order reported by AddRemove.
+    contents = [(key, get_entity(key)) for _, key in diff]
+
+    def prune(acc, cur):
+        _, entity = cur
+        if entity is None:
+            # Prune Nones which stand for duplicated comments.
+            return acc
+
+        if len(acc) and isinstance(entity, cl.Whitespace):
+            _, prev_entity = acc[-1]
+
+            if isinstance(prev_entity, cl.Whitespace):
+                # Prefer the longer whitespace.
+                if len(entity.all) > len(prev_entity.all):
+                    acc[-1] = (entity, entity)
+                return acc
+
+        acc.append(cur)
+        return acc
+
+    pruned = reduce(prune, contents, [])
+    return OrderedDict(pruned)
+
+
+def serialize_legacy_resource(entities):
+    return "".join((entity.all for entity in entities.values()))
diff --git a/third_party/python/compare-locales/compare_locales/parser.py b/third_party/python/compare-locales/compare_locales/parser.py
index d800fe7f935d..e85d7ac75c3c 100644
--- a/third_party/python/compare-locales/compare_locales/parser.py
+++ b/third_party/python/compare-locales/compare_locales/parser.py
@@ -8,6 +8,13 @@ import codecs
 from collections import Counter
 import logging
 
+try:
+    from html import unescape as html_unescape
+except ImportError:
+    from HTMLParser import HTMLParser
+    html_parser = HTMLParser()
+    html_unescape = html_parser.unescape
+
 from fluent.syntax import FluentParser as FTLParser
 from fluent.syntax import ast as ftl
 
@@ -32,28 +39,20 @@ class EntityBase(object):
     Abstraction layer for a localizable entity.
     Currently supported are grammars of the form:
 
-    1: pre white space
-    2: entity definition
-    3: entity key (name)
-    4: entity value
-    5: post white space
-                                                 <--[1]
+    1: entity definition
+    2: entity key (name)
+    3: entity value
+
     <!ENTITY key "value">
 
-    <-------[2]--------->
+    <--- definition ---->
     '''
-    def __init__(self, ctx, pre_comment,
-                 span, pre_ws_span, def_span,
-                 key_span, val_span, post_span):
+    def __init__(self, ctx, pre_comment, span, key_span, val_span):
         self.ctx = ctx
         self.span = span
-        self.pre_ws_span = pre_ws_span
-        self.def_span = def_span
         self.key_span = key_span
         self.val_span = val_span
-        self.post_span = post_span
         self.pre_comment = pre_comment
-        pass
 
     def position(self, offset=0):
         """Get the 1-based line and column of the character
@@ -65,7 +64,7 @@ class EntityBase(object):
             pos = self.span[1]
         else:
             pos = self.span[0] + offset
-        return self.ctx.lines(pos)[0]
+        return self.ctx.linecol(pos)
 
     def value_position(self, offset=0):
         """Get the 1-based line and column of the character
@@ -73,41 +72,32 @@ class EntityBase(object):
 
         If offset is negative, return the end of the value.
         """
+        assert self.val_span is not None
         if offset < 0:
             pos = self.val_span[1]
         else:
             pos = self.val_span[0] + offset
-        return self.ctx.lines(pos)[0]
+        return self.ctx.linecol(pos)
 
     # getter helpers
 
     def get_all(self):
         return self.ctx.contents[self.span[0]:self.span[1]]
 
-    def get_pre_ws(self):
-        return self.ctx.contents[self.pre_ws_span[0]:self.pre_ws_span[1]]
-
-    def get_def(self):
-        return self.ctx.contents[self.def_span[0]:self.def_span[1]]
-
     def get_key(self):
         return self.ctx.contents[self.key_span[0]:self.key_span[1]]
 
     def get_raw_val(self):
+        if self.val_span is None:
+            return None
         return self.ctx.contents[self.val_span[0]:self.val_span[1]]
 
-    def get_post(self):
-        return self.ctx.contents[self.post_span[0]:self.post_span[1]]
-
     # getters
 
     all = property(get_all)
-    pre_ws = property(get_pre_ws)
-    definition = property(get_def)
     key = property(get_key)
     val = property(get_raw_val)
     raw_val = property(get_raw_val)
-    post = property(get_post)
 
     def __repr__(self):
         return self.key
@@ -132,22 +122,15 @@ class Entity(EntityBase):
 
 
 class Comment(EntityBase):
-    def __init__(self, ctx, span, pre_ws_span, def_span,
-                 post_span):
+    def __init__(self, ctx, span):
         self.ctx = ctx
         self.span = span
-        self.pre_ws_span = pre_ws_span
-        self.def_span = def_span
-        self.post_span = post_span
+        self.val_span = None
 
     @property
     def key(self):
         return None
 
-    @property
-    def val(self):
-        return None
-
     def __repr__(self):
         return self.all
 
@@ -163,7 +146,6 @@ class Junk(object):
     def __init__(self, ctx, span):
         self.ctx = ctx
         self.span = span
-        self.pre_ws = self.definition = self.post = ''
         self.__class__.junkid += 1
         self.key = '_junk_%d_%d-%d' % (self.__class__.junkid, span[0], span[1])
 
@@ -177,7 +159,7 @@ class Junk(object):
             pos = self.span[1]
         else:
             pos = self.span[0] + offset
-        return self.ctx.lines(pos)[0]
+        return self.ctx.linecol(pos)
 
     # getter helpers
     def get_all(self):
@@ -185,6 +167,7 @@ class Junk(object):
 
     # getters
     all = property(get_all)
+    raw_val = property(get_all)
     val = property(get_all)
 
     def __repr__(self):
@@ -197,9 +180,7 @@ class Whitespace(EntityBase):
     '''
     def __init__(self, ctx, span):
         self.ctx = ctx
-        self.key_span = self.val_span = self.span = span
-        self.def_span = self.pre_ws_span = (span[0], span[0])
-        self.post_span = (span[1], span[1])
+        self.span = self.key_span = self.val_span = span
 
     def __repr__(self):
         return self.raw_val
@@ -207,26 +188,28 @@ class Whitespace(EntityBase):
 
 class Parser(object):
     capabilities = CAN_SKIP | CAN_MERGE
-    tail = re.compile('\s+\Z')
+    reWhitespace = re.compile('\s+', re.M)
 
     class Context(object):
         "Fixture for content and line numbers"
         def __init__(self, contents):
             self.contents = contents
+            # Subclasses may use bitmasks to keep state.
+            self.state = 0
             self._lines = None
 
-        def lines(self, *positions):
-            # return line and column tuples, 1-based
+        def linecol(self, position):
+            "Returns 1-based line and column numbers."
             if self._lines is None:
                 nl = re.compile('\n', re.M)
                 self._lines = [m.end()
                                for m in nl.finditer(self.contents)]
-            line_nrs = [bisect.bisect(self._lines, p) for p in positions]
-            # compute columns
-            pos_ = [
-                (1 + line, 1 + p - (self._lines[line-1] if line else 0))
-                for line, p in zip(line_nrs, positions)]
-            return pos_
+
+            line_offset = bisect.bisect(self._lines, position)
+            line_start = self._lines[line_offset - 1] if line_offset else 0
+            col_offset = position - line_start
+
+            return line_offset + 1, col_offset + 1
 
     def __init__(self):
         if not hasattr(self, 'encoding'):
@@ -251,65 +234,56 @@ class Parser(object):
         self.ctx = Parser.Context(contents)
 
     def parse(self):
-        l = []
-        m = {}
-        for e in self:
-            m[e.key] = len(l)
-            l.append(e)
-        return (l, m)
+        list_ = list(self)
+        map_ = dict((e.key, i) for i, e in enumerate(list_))
+        return (list_, map_)
 
     def __iter__(self):
-        return self.walk(onlyEntities=True)
+        return self.walk(only_localizable=True)
 
-    def walk(self, onlyEntities=False):
+    def walk(self, only_localizable=False):
         if not self.ctx:
             # loading file failed, or we just didn't load anything
             return
         ctx = self.ctx
         contents = ctx.contents
-        offset = 0
-        entity, offset = self.getEntity(ctx, offset)
-        while entity:
-            if (not onlyEntities or
-                    isinstance(entity, Entity) or
-                    type(entity) is Junk):
-                yield entity
-            entity, offset = self.getEntity(ctx, offset)
-        if len(contents) > offset:
-            yield Junk(ctx, (offset, len(contents)))
 
-    def getEntity(self, ctx, offset):
+        next_offset = 0
+        while next_offset < len(contents):
+            entity = self.getNext(ctx, next_offset)
+
+            if isinstance(entity, (Entity, Junk)):
+                yield entity
+            elif not only_localizable:
+                yield entity
+
+            next_offset = entity.span[1]
+
+    def getNext(self, ctx, offset):
+        m = self.reWhitespace.match(ctx.contents, offset)
+        if m:
+            return Whitespace(ctx, m.span())
         m = self.reKey.match(ctx.contents, offset)
         if m:
-            offset = m.end()
-            entity = self.createEntity(ctx, m)
-            return (entity, offset)
+            return self.createEntity(ctx, m)
         m = self.reComment.match(ctx.contents, offset)
         if m:
-            offset = m.end()
-            self.last_comment = Comment(ctx, *[m.span(i) for i in xrange(4)])
-            return (self.last_comment, offset)
-        return self.getTrailing(ctx, offset, self.reKey, self.reComment)
+            self.last_comment = Comment(ctx, m.span())
+            return self.last_comment
+        return self.getJunk(ctx, offset, self.reKey, self.reComment)
 
-    def getTrailing(self, ctx, offset, *expressions):
+    def getJunk(self, ctx, offset, *expressions):
         junkend = None
         for exp in expressions:
             m = exp.search(ctx.contents, offset)
             if m:
                 junkend = min(junkend, m.start()) if junkend else m.start()
-        if junkend is None:
-            if self.tail.match(ctx.contents, offset):
-                white_end = len(ctx.contents)
-                return (Whitespace(ctx, (offset, white_end)), white_end)
-            else:
-                return (None, offset)
-        return (Junk(ctx, (offset, junkend)), junkend)
+        return Junk(ctx, (offset, junkend or len(ctx.contents)))
 
     def createEntity(self, ctx, m):
         pre_comment = self.last_comment
         self.last_comment = None
-        return Entity(ctx, pre_comment,
-                      *[m.span(i) for i in xrange(6)])
+        return Entity(ctx, pre_comment, m.span(), m.span('key'), m.span('val'))
 
     @classmethod
     def findDuplicates(cls, entities):
@@ -326,21 +300,22 @@ def getParser(path):
     raise UserWarning("Cannot find Parser")
 
 
-# Subgroups of the match will:
-# 1: pre white space
-# 2: pre comments
-# 3: entity definition
-# 4: entity key (name)
-# 5: entity value
-# 6: post comment (and white space) in the same line (dtd only)
-#                                            <--[1]
-# <!-- pre comments -->                      <--[2]
-# <!ENTITY key "value"> <!-- comment -->
-#
-# <-------[3]---------><------[6]------>
-
-
 class DTDEntity(Entity):
+    @property
+    def val(self):
+        '''Unescape HTML entities into corresponding Unicode characters.
+
+        Named (&amp;), decimal (&#38;), and hex (&#x26; and &#x0026;) formats
+        are supported. Unknown entities are left intact.
+
+        As of Python 2.7 and Python 3.6 the following 252 named entities are
+        recognized and unescaped:
+
+            https://github.com/python/cpython/blob/2.7/Lib/htmlentitydefs.py
+            https://github.com/python/cpython/blob/3.6/Lib/html/entities.py
+        '''
+        return html_unescape(self.raw_val)
+
     def value_position(self, offset=0):
         # DTDChecker already returns tuples of (line, col) positions
         if isinstance(offset, tuple):
@@ -374,22 +349,21 @@ class DTDParser(Parser):
     #     [#x0300-#x036F] | [#x203F-#x2040]
     NameChar = NameStartChar + ur'\-\.0-9' + u'\xB7\u0300-\u036F\u203F-\u2040'
     Name = '[' + NameStartChar + '][' + NameChar + ']*'
-    reKey = re.compile('(?:(?P<pre>\s*)(?P<entity><!ENTITY\s+(?P<key>' + Name +
-                       ')\s+(?P<val>\"[^\"]*\"|\'[^\']*\'?)\s*>)'
-                       '(?P<post>\s+)?)',
+    reKey = re.compile('<!ENTITY\s+(?P<key>' + Name + ')\s+'
+                       '(?P<val>\"[^\"]*\"|\'[^\']*\'?)\s*>',
                        re.DOTALL | re.M)
     # add BOM to DTDs, details in bug 435002
     reHeader = re.compile(u'^\ufeff')
-    reComment = re.compile('(\s*)(<!--(-?[%s])*?-->)(\s*)' % CharMinusDash,
+    reComment = re.compile('<!--(?P<val>-?[%s])*?-->' % CharMinusDash,
                            re.S)
-    rePE = re.compile(u'(?:(\s*)'
-                      u'(<!ENTITY\s+%\s+(' + Name +
-                      u')\s+SYSTEM\s+(\"[^\"]*\"|\'[^\']*\')\s*>\s*%' + Name +
-                      u';)([ \t]*(?:' + XmlComment + u'\s*)*\n?)?)')
+    rePE = re.compile(u'<!ENTITY\s+%\s+(?P<key>' + Name + ')\s+'
+                      u'SYSTEM\s+(?P<val>\"[^\"]*\"|\'[^\']*\')\s*>\s*'
+                      u'%' + Name + ';'
+                      u'(?:[ \t]*(?:' + XmlComment + u'\s*)*\n?)?')
 
-    def getEntity(self, ctx, offset):
+    def getNext(self, ctx, offset):
         '''
-        Overload Parser.getEntity to special-case ParsedEntities.
+        Overload Parser.getNext to special-case ParsedEntities.
         Just check for a parsed entity if that method claims junk.
 
         <!ENTITY % foo SYSTEM "url">
@@ -397,14 +371,14 @@ class DTDParser(Parser):
         '''
         if offset is 0 and self.reHeader.match(ctx.contents):
             offset += 1
-        entity, inneroffset = Parser.getEntity(self, ctx, offset)
+        entity = Parser.getNext(self, ctx, offset)
         if (entity and isinstance(entity, Junk)) or entity is None:
             m = self.rePE.match(ctx.contents, offset)
             if m:
-                inneroffset = m.end()
                 self.last_comment = None
-                entity = DTDEntity(ctx, '', *[m.span(i) for i in xrange(6)])
-        return (entity, inneroffset)
+                entity = DTDEntity(
+                    ctx, '', m.span(), m.span('key'), m.span('val'))
+        return entity
 
     def createEntity(self, ctx, m):
         valspan = m.span('val')
@@ -412,10 +386,7 @@ class DTDParser(Parser):
         pre_comment = self.last_comment
         self.last_comment = None
         return DTDEntity(ctx, pre_comment,
-                         m.span(),
-                         m.span('pre'),
-                         m.span('entity'), m.span('key'), valspan,
-                         m.span('post'))
+                         m.span(), m.span('key'), valspan)
 
 
 class PropertiesEntity(Entity):
@@ -438,28 +409,26 @@ class PropertiesEntity(Entity):
 
 class PropertiesParser(Parser):
     def __init__(self):
-        self.reKey = re.compile('^(\s*)'
-                                '([^#!\s\n][^=:\n]*?)\s*[:=][ \t]*', re.M)
-        self.reComment = re.compile('(\s*)(((?:[#!][^\n]*\n?)+))', re.M)
+        self.reKey = re.compile(
+            '(?P<key>[^#!\s\n][^=:\n]*?)\s*[:=][ \t]*', re.M)
+        self.reComment = re.compile('(?:[#!][^\n]*\n)*(?:[#!][^\n]*)', re.M)
         self._escapedEnd = re.compile(r'\\+$')
         self._trailingWS = re.compile(r'\s*(?:\n|\Z)', re.M)
         Parser.__init__(self)
 
-    def getEntity(self, ctx, offset):
+    def getNext(self, ctx, offset):
         # overwritten to parse values line by line
         contents = ctx.contents
+
+        m = self.reWhitespace.match(contents, offset)
+        if m:
+            return Whitespace(ctx, m.span())
+
         m = self.reComment.match(contents, offset)
         if m:
-            spans = [m.span(i) for i in xrange(3)]
-            start_trailing = offset = m.end()
-            while offset < len(contents):
-                m = self._trailingWS.match(contents, offset)
-                if not m:
-                    break
-                offset = m.end()
-            spans.append((start_trailing, offset))
-            self.last_comment = Comment(ctx, *spans)
-            return (self.last_comment, offset)
+            self.last_comment = Comment(ctx, m.span())
+            return self.last_comment
+
         m = self.reKey.match(contents, offset)
         if m:
             startline = offset = m.end()
@@ -477,35 +446,31 @@ class PropertiesParser(Parser):
                 if len(_e.group()) % 2 == 0:
                     break
                 startline = offset
+
             # strip trailing whitespace
             ws = self._trailingWS.search(contents, startline)
             if ws:
                 endval = ws.start()
-                offset = ws.end()
+
             pre_comment = self.last_comment
             self.last_comment = None
             entity = PropertiesEntity(
                 ctx, pre_comment,
-                (m.start(), offset),   # full span
-                m.span(1),  # leading whitespan
-                (m.start(2), offset),   # entity def span
-                m.span(2),   # key span
-                (m.end(), endval),   # value span
-                (offset, offset))  # post comment span, empty
-            return (entity, offset)
-        return self.getTrailing(ctx, offset, self.reKey, self.reComment)
+                (m.start(), endval),   # full span
+                m.span('key'),
+                (m.end(), endval))   # value span
+            return entity
+
+        return self.getJunk(ctx, offset, self.reKey, self.reComment)
 
 
 class DefinesInstruction(EntityBase):
     '''Entity-like object representing processing instructions in inc files
     '''
-    def __init__(self, ctx, span, pre_ws_span, def_span, val_span, post_span):
+    def __init__(self, ctx, span, val_span):
         self.ctx = ctx
         self.span = span
-        self.pre_ws_span = pre_ws_span
-        self.def_span = def_span
         self.key_span = self.val_span = val_span
-        self.post_span = post_span
 
     def __repr__(self):
         return self.raw_val
@@ -514,53 +479,61 @@ class DefinesInstruction(EntityBase):
 class DefinesParser(Parser):
     # can't merge, #unfilter needs to be the last item, which we don't support
     capabilities = CAN_COPY
-    tail = re.compile(r'(?!)')  # never match
+    reWhitespace = re.compile('\n+', re.M)
+
+    EMPTY_LINES = 1 << 0
+    PAST_FIRST_LINE = 1 << 1
 
     def __init__(self):
-        self.reComment = re.compile(
-            '((?:[ \t]*\n)*)'
-            '((?:^# .*?(?:\n|\Z))+)'
-            '((?:[ \t]*(?:\n|\Z))*)', re.M)
-        self.reKey = re.compile('((?:[ \t]*\n)*)'
-                                '(#define[ \t]+(\w+)(?:[ \t](.*?))?(?:\n|\Z))'
-                                '((?:[ \t]*(?:\n|\Z))*)',
-                                re.M)
-        self.rePI = re.compile('((?:[ \t]*\n)*)'
-                               '(#(\w+)[ \t]+(.*?)(?:\n|\Z))'
-                               '((?:[ \t]*(?:\n|\Z))*)',
-                               re.M)
+        self.reComment = re.compile('(?:^# .*?\n)*(?:^# [^\n]*)', re.M)
+        # corresponds to
+        # https://hg.mozilla.org/mozilla-central/file/72ee4800d4156931c89b58bd807af4a3083702bb/python/mozbuild/mozbuild/preprocessor.py#l561  # noqa
+        self.reKey = re.compile(
+            '#define[ \t]+(?P<key>\w+)(?:[ \t](?P<val>[^\n]*))?', re.M)
+        self.rePI = re.compile('#(?P<val>\w+[ \t]+[^\n]+)', re.M)
         Parser.__init__(self)
 
-    def getEntity(self, ctx, offset):
+    def getNext(self, ctx, offset):
         contents = ctx.contents
+
+        m = self.reWhitespace.match(contents, offset)
+        if m:
+            if ctx.state & self.EMPTY_LINES:
+                return Whitespace(ctx, m.span())
+            if ctx.state & self.PAST_FIRST_LINE and len(m.group()) == 1:
+                return Whitespace(ctx, m.span())
+            else:
+                return Junk(ctx, m.span())
+
+        # We're not in the first line anymore.
+        ctx.state |= self.PAST_FIRST_LINE
+
         m = self.reComment.match(contents, offset)
         if m:
-            offset = m.end()
-            self.last_comment = Comment(ctx, *[m.span(i) for i in xrange(4)])
-            return (self.last_comment, offset)
+            self.last_comment = Comment(ctx, m.span())
+            return self.last_comment
         m = self.reKey.match(contents, offset)
         if m:
-            offset = m.end()
-            return (self.createEntity(ctx, m), offset)
+            return self.createEntity(ctx, m)
         m = self.rePI.match(contents, offset)
         if m:
-            offset = m.end()
-            return (DefinesInstruction(ctx, *[m.span(i) for i in xrange(5)]),
-                    offset)
-        return self.getTrailing(ctx, offset,
-                                self.reComment, self.reKey, self.rePI)
+            instr = DefinesInstruction(ctx, m.span(), m.span('val'))
+            if instr.val == 'filter emptyLines':
+                ctx.state |= self.EMPTY_LINES
+            if instr.val == 'unfilter emptyLines':
+                ctx.state &= ~ self.EMPTY_LINES
+            return instr
+        return self.getJunk(
+            ctx, offset, self.reComment, self.reKey, self.rePI)
 
 
 class IniSection(EntityBase):
     '''Entity-like object representing sections in ini files
     '''
-    def __init__(self, ctx, span, pre_ws_span, def_span, val_span, post_span):
+    def __init__(self, ctx, span, val_span):
         self.ctx = ctx
         self.span = span
-        self.pre_ws_span = pre_ws_span
-        self.def_span = def_span
         self.key_span = self.val_span = val_span
-        self.post_span = post_span
 
     def __repr__(self):
         return self.raw_val
@@ -577,37 +550,28 @@ class IniParser(Parser):
     ...
     '''
     def __init__(self):
-        self.reComment = re.compile(
-            '((?:[ \t]*\n)*)'
-            '((?:^[;#].*?(?:\n|\Z))+)'
-            '((?:[ \t]*(?:\n|\Z))*)', re.M)
-        self.reSection = re.compile(
-            '((?:[ \t]*\n)*)'
-            '(\[(.*?)\])'
-            '((?:[ \t]*(?:\n|\Z))*)', re.M)
-        self.reKey = re.compile(
-            '((?:[ \t]*\n)*)'
-            '((.+?)=(.*))'
-            '((?:[ \t]*(?:\n|\Z))*)', re.M)
+        self.reComment = re.compile('(?:^[;#][^\n]*\n)*(?:^[;#][^\n]*)', re.M)
+        self.reSection = re.compile('\[(?P<val>.*?)\]', re.M)
+        self.reKey = re.compile('(?P<key>.+?)=(?P<val>.*)', re.M)
         Parser.__init__(self)
 
-    def getEntity(self, ctx, offset):
+    def getNext(self, ctx, offset):
         contents = ctx.contents
+        m = self.reWhitespace.match(contents, offset)
+        if m:
+            return Whitespace(ctx, m.span())
         m = self.reComment.match(contents, offset)
         if m:
-            offset = m.end()
-            self.last_comment = Comment(ctx, *[m.span(i) for i in xrange(4)])
-            return (self.last_comment, offset)
+            self.last_comment = Comment(ctx, m.span())
+            return self.last_comment
         m = self.reSection.match(contents, offset)
         if m:
-            offset = m.end()
-            return (IniSection(ctx, *[m.span(i) for i in xrange(5)]), offset)
+            return IniSection(ctx, m.span(), m.span('val'))
         m = self.reKey.match(contents, offset)
         if m:
-            offset = m.end()
-            return (self.createEntity(ctx, m), offset)
-        return self.getTrailing(ctx, offset,
-                                self.reComment, self.reSection, self.reKey)
+            return self.createEntity(ctx, m)
+        return self.getJunk(
+            ctx, offset, self.reComment, self.reSection, self.reKey)
 
 
 class FluentAttribute(EntityBase):
@@ -642,10 +606,16 @@ class FluentEntity(Entity):
         if entry.value is not None:
             self.val_span = (entry.value.span.start, entry.value.span.end)
         else:
-            self.val_span = (0, 0)
+            self.val_span = None
 
         self.entry = entry
 
+        # EntityBase instances are expected to have pre_comment. It's used by
+        # other formats to associate a Comment with an Entity. FluentEntities
+        # don't need it because message comments are part of the entry AST and
+        # are not separate Comment instances.
+        self.pre_comment = None
+
     _word_count = None
 
     def count_words(self):
@@ -665,18 +635,10 @@ class FluentEntity(Entity):
         return self.entry.equals(
             other.entry, ignored_fields=self.ignored_fields)
 
-    # Positions yielded by FluentChecker.check are absolute offsets from the
-    # beginning of the file.  This is different from the base Checker behavior
-    # which yields offsets from the beginning of the current entity's value.
-    def position(self, pos=None):
-        if pos is None:
-            pos = self.entry.span.start
-        return self.ctx.lines(pos)[0]
-
-    # FluentEntities don't differentiate between entity and value positions
-    # because all positions are absolute from the beginning of the file.
-    def value_position(self, pos=None):
-        return self.position(pos)
+    # In Fluent we treat entries as a whole.  FluentChecker reports errors at
+    # offsets calculated from the beginning of the entry.
+    def value_position(self, offset=0):
+        return self.position(offset)
 
     @property
     def attributes(self):
@@ -684,6 +646,16 @@ class FluentEntity(Entity):
             yield FluentAttribute(self, attr_node)
 
 
+class FluentSection(EntityBase):
+    def __init__(self, ctx, entry):
+        self.entry = entry
+        self.ctx = ctx
+
+        self.span = (entry.span.start, entry.span.end)
+        self.key_span = self.val_span = (
+            entry.name.span.start, entry.name.span.end)
+
+
 class FluentParser(Parser):
     capabilities = CAN_SKIP
 
@@ -691,12 +663,32 @@ class FluentParser(Parser):
         super(FluentParser, self).__init__()
         self.ftl_parser = FTLParser()
 
-    def walk(self, onlyEntities=False):
+    def walk(self, only_localizable=False):
         if not self.ctx:
             # loading file failed, or we just didn't load anything
             return
+
         resource = self.ftl_parser.parse(self.ctx.contents)
+
+        if resource.comment:
+            last_span_end = resource.comment.span.end
+
+            if not only_localizable:
+                if 0 < resource.comment.span.start:
+                    yield Whitespace(
+                        self.ctx, (0, resource.comment.span.start))
+                yield Comment(
+                    self.ctx,
+                    (resource.comment.span.start, resource.comment.span.end))
+        else:
+            last_span_end = 0
+
         for entry in resource.body:
+            if not only_localizable:
+                if entry.span.start > last_span_end:
+                    yield Whitespace(
+                        self.ctx, (last_span_end, entry.span.start))
+
             if isinstance(entry, ftl.Message):
                 yield FluentEntity(self.ctx, entry)
             elif isinstance(entry, ftl.Junk):
@@ -708,6 +700,19 @@ class FluentParser(Parser):
                 ws, we = re.search('\s*$', entry.content).span()
                 end -= we - ws
                 yield Junk(self.ctx, (start, end))
+            elif isinstance(entry, ftl.Comment) and not only_localizable:
+                span = (entry.span.start, entry.span.end)
+                yield Comment(self.ctx, span)
+            elif isinstance(entry, ftl.Section) and not only_localizable:
+                yield FluentSection(self.ctx, entry)
+
+            last_span_end = entry.span.end
+
+        # Yield Whitespace at the EOF.
+        if not only_localizable:
+            eof_offset = len(self.ctx.contents)
+            if eof_offset > last_span_end:
+                yield Whitespace(self.ctx, (last_span_end, eof_offset))
 
 
 __constructors = [('\\.dtd$', DTDParser()),
diff --git a/third_party/python/compare-locales/compare_locales/paths.py b/third_party/python/compare-locales/compare_locales/paths.py
index 4153a00b44d2..1e8b63e663cc 100644
--- a/third_party/python/compare-locales/compare_locales/paths.py
+++ b/third_party/python/compare-locales/compare_locales/paths.py
@@ -135,7 +135,7 @@ class ProjectConfig(object):
         def filter_(module, path, entity=None):
             try:
                 rv = filter(module, path, entity=entity)
-            except:
+            except BaseException:  # we really want to handle EVERYTHING here
                 return 'error'
             rv = {
                 True: 'error',
@@ -434,7 +434,7 @@ class TOMLParser(object):
         try:
             with open(self.path, 'rb') as fin:
                 self.data = toml.load(fin)
-        except:
+        except (toml.TomlError, IOError):
             raise ConfigNotFound(self.path)
 
     def processEnv(self):
@@ -542,7 +542,7 @@ class L10nConfigParser(object):
         '''
         try:
             depth = cp.get('general', 'depth')
-        except:
+        except (NoSectionError, NoOptionError):
             depth = '.'
         return depth
 
@@ -554,13 +554,13 @@ class L10nConfigParser(object):
         '''
         filter_path = mozpath.join(mozpath.dirname(self.inipath), 'filter.py')
         try:
-            l = {}
-            execfile(filter_path, {}, l)
-            if 'test' in l and callable(l['test']):
-                filters = [l['test']]
+            local = {}
+            execfile(filter_path, {}, local)
+            if 'test' in local and callable(local['test']):
+                filters = [local['test']]
             else:
                 filters = []
-        except:
+        except BaseException:  # we really want to handle EVERYTHING here
             filters = []
 
         for c in self.children:
diff --git a/third_party/python/compare-locales/compare_locales/plurals.py b/third_party/python/compare-locales/compare_locales/plurals.py
new file mode 100644
index 000000000000..3506f00e72f5
--- /dev/null
+++ b/third_party/python/compare-locales/compare_locales/plurals.py
@@ -0,0 +1,160 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+'Mapping of locales to CLDR plural categories as implemented by PluralForm.jsm'
+
+CATEGORIES_BY_INDEX = (
+    # 0 (Chinese)
+    ('other',),
+    # 1 (English)
+    ('one', 'other'),
+    # 2 (French)
+    ('one', 'other'),
+    # 3 (Latvian)
+    ('zero', 'one', 'other'),
+    # 4 (Scottish Gaelic)
+    ('one', 'two', 'few', 'other'),
+    # 5 (Romanian)
+    ('one', 'few', 'other'),
+    # 6 (Lithuanian)
+    # CLDR: one, few, many (fractions), other
+    ('one', 'other', 'few'),
+    # 7 (Russian)
+    # CLDR: one, few, many, other (fractions)
+    ('one', 'few', 'many'),
+    # 8 (Slovak)
+    # CLDR: one, few, many (fractions), other
+    ('one', 'few', 'other'),
+    # 9 (Polish)
+    # CLDR: one, few, many, other (fractions)
+    ('one', 'few', 'many'),
+    # 10 (Slovenian)
+    ('one', 'two', 'few', 'other'),
+    # 11 (Irish Gaelic)
+    ('one', 'two', 'few', 'many', 'other'),
+    # 12 (Arabic)
+    # CLDR: zero, one, two, few, many, other
+    ('one', 'two', 'few', 'many', 'other', 'zero'),
+    # 13 (Maltese)
+    ('one', 'few', 'many', 'other'),
+    # 14 (Macedonian)
+    # CLDR: one, other
+    ('one', 'two', 'other'),
+    # 15 (Icelandic)
+    ('one', 'other'),
+    # 16 (Breton)
+    ('one', 'two', 'few', 'many', 'other'),
+    # 17 (Shuar)
+    # CLDR: (missing)
+    ('zero', 'other')
+)
+
+CATEGORIES_BY_LOCALE = {
+    'ach': CATEGORIES_BY_INDEX[1],
+    'af': CATEGORIES_BY_INDEX[1],
+    'an': CATEGORIES_BY_INDEX[1],
+    'ar': CATEGORIES_BY_INDEX[12],
+    'as': CATEGORIES_BY_INDEX[1],
+    'ast': CATEGORIES_BY_INDEX[1],
+    'az': CATEGORIES_BY_INDEX[0],
+    'be': CATEGORIES_BY_INDEX[7],
+    'bg': CATEGORIES_BY_INDEX[1],
+    'bn-BD': CATEGORIES_BY_INDEX[1],
+    'bn-IN': CATEGORIES_BY_INDEX[1],
+    'br': CATEGORIES_BY_INDEX[1],
+    'bs': CATEGORIES_BY_INDEX[1],
+    'ca': CATEGORIES_BY_INDEX[1],
+    'cak': CATEGORIES_BY_INDEX[1],
+    'cs': CATEGORIES_BY_INDEX[8],
+    'cy': CATEGORIES_BY_INDEX[1],
+    'da': CATEGORIES_BY_INDEX[1],
+    'de': CATEGORIES_BY_INDEX[1],
+    'dsb': CATEGORIES_BY_INDEX[10],
+    'el': CATEGORIES_BY_INDEX[1],
+    'en-GB': CATEGORIES_BY_INDEX[1],
+    'en-US': CATEGORIES_BY_INDEX[1],
+    'en-ZA': CATEGORIES_BY_INDEX[1],
+    'eo': CATEGORIES_BY_INDEX[1],
+    'es-AR': CATEGORIES_BY_INDEX[1],
+    'es-CL': CATEGORIES_BY_INDEX[1],
+    'es-ES': CATEGORIES_BY_INDEX[1],
+    'es-MX': CATEGORIES_BY_INDEX[1],
+    'et': CATEGORIES_BY_INDEX[1],
+    'eu': CATEGORIES_BY_INDEX[1],
+    'fa': CATEGORIES_BY_INDEX[0],
+    'ff': CATEGORIES_BY_INDEX[1],
+    'fi': CATEGORIES_BY_INDEX[1],
+    'fr': CATEGORIES_BY_INDEX[2],
+    'fy-NL': CATEGORIES_BY_INDEX[1],
+    'ga-IE': CATEGORIES_BY_INDEX[11],
+    'gd': CATEGORIES_BY_INDEX[4],
+    'gl': CATEGORIES_BY_INDEX[1],
+    'gn': CATEGORIES_BY_INDEX[1],
+    'gu-IN': CATEGORIES_BY_INDEX[2],
+    'he': CATEGORIES_BY_INDEX[1],
+    'hi-IN': CATEGORIES_BY_INDEX[1],
+    'hr': CATEGORIES_BY_INDEX[7],
+    'hsb': CATEGORIES_BY_INDEX[10],
+    'hu': CATEGORIES_BY_INDEX[1],
+    'hy-AM': CATEGORIES_BY_INDEX[1],
+    'ia': CATEGORIES_BY_INDEX[1],
+    'id': CATEGORIES_BY_INDEX[0],
+    'is': CATEGORIES_BY_INDEX[15],
+    'it': CATEGORIES_BY_INDEX[1],
+    'ja': CATEGORIES_BY_INDEX[0],
+    'ja-JP-mac': CATEGORIES_BY_INDEX[0],
+    'jiv': CATEGORIES_BY_INDEX[17],
+    'ka': CATEGORIES_BY_INDEX[0],
+    'kab': CATEGORIES_BY_INDEX[1],
+    'kk': CATEGORIES_BY_INDEX[1],
+    'km': CATEGORIES_BY_INDEX[1],
+    'kn': CATEGORIES_BY_INDEX[1],
+    'ko': CATEGORIES_BY_INDEX[0],
+    'lij': CATEGORIES_BY_INDEX[1],
+    'lo': CATEGORIES_BY_INDEX[0],
+    'lt': CATEGORIES_BY_INDEX[6],
+    'ltg': CATEGORIES_BY_INDEX[3],
+    'lv': CATEGORIES_BY_INDEX[3],
+    'mai': CATEGORIES_BY_INDEX[1],
+    'mk': CATEGORIES_BY_INDEX[15],
+    'ml': CATEGORIES_BY_INDEX[1],
+    'mr': CATEGORIES_BY_INDEX[1],
+    'ms': CATEGORIES_BY_INDEX[1],
+    'my': CATEGORIES_BY_INDEX[1],
+    'nb-NO': CATEGORIES_BY_INDEX[1],
+    'ne-NP': CATEGORIES_BY_INDEX[1],
+    'nl': CATEGORIES_BY_INDEX[1],
+    'nn-NO': CATEGORIES_BY_INDEX[1],
+    'oc': CATEGORIES_BY_INDEX[1],
+    'or': CATEGORIES_BY_INDEX[1],
+    'pa-IN': CATEGORIES_BY_INDEX[1],
+    'pl': CATEGORIES_BY_INDEX[9],
+    'pt-BR': CATEGORIES_BY_INDEX[1],
+    'pt-PT': CATEGORIES_BY_INDEX[1],
+    'rm': CATEGORIES_BY_INDEX[1],
+    'ro': CATEGORIES_BY_INDEX[1],
+    'ru': CATEGORIES_BY_INDEX[7],
+    'si': CATEGORIES_BY_INDEX[1],
+    'sk': CATEGORIES_BY_INDEX[8],
+    'sl': CATEGORIES_BY_INDEX[10],
+    'son': CATEGORIES_BY_INDEX[1],
+    'sq': CATEGORIES_BY_INDEX[1],
+    'sr': CATEGORIES_BY_INDEX[7],
+    'sv-SE': CATEGORIES_BY_INDEX[1],
+    'ta': CATEGORIES_BY_INDEX[1],
+    'te': CATEGORIES_BY_INDEX[1],
+    'th': CATEGORIES_BY_INDEX[0],
+    'tl': CATEGORIES_BY_INDEX[1],
+    'tr': CATEGORIES_BY_INDEX[0],
+    'trs': CATEGORIES_BY_INDEX[1],
+    'uk': CATEGORIES_BY_INDEX[7],
+    'ur': CATEGORIES_BY_INDEX[1],
+    'uz': CATEGORIES_BY_INDEX[0],
+    'vi': CATEGORIES_BY_INDEX[1],
+    'wo': CATEGORIES_BY_INDEX[0],
+    'xh': CATEGORIES_BY_INDEX[1],
+    'zam': CATEGORIES_BY_INDEX[1],
+    'zh-CN': CATEGORIES_BY_INDEX[1],
+    'zh-TW': CATEGORIES_BY_INDEX[0]
+}
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_defines.py b/third_party/python/compare-locales/compare_locales/tests/test_defines.py
index 43ed4e33e5aa..e699148be283 100644
--- a/third_party/python/compare-locales/compare_locales/tests/test_defines.py
+++ b/third_party/python/compare-locales/compare_locales/tests/test_defines.py
@@ -11,8 +11,7 @@ from compare_locales.tests import ParserTestMixin
 mpl2 = '''\
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-'''
+# You can obtain one at http://mozilla.org/MPL/2.0/.'''
 
 
 class TestDefinesParser(ParserTestMixin, unittest.TestCase):
@@ -20,7 +19,8 @@ class TestDefinesParser(ParserTestMixin, unittest.TestCase):
     filename = 'defines.inc'
 
     def testBrowser(self):
-        self._test(mpl2 + '''#filter emptyLines
+        self._test(mpl2 + '''
+#filter emptyLines
 
 #define MOZ_LANGPACK_CREATOR mozilla.org
 
@@ -32,13 +32,19 @@ class TestDefinesParser(ParserTestMixin, unittest.TestCase):
 
 ''', (
             ('Comment', mpl2),
+            ('Whitespace', '\n'),
             ('DefinesInstruction', 'filter emptyLines'),
+            ('Whitespace', '\n\n'),
             ('MOZ_LANGPACK_CREATOR', 'mozilla.org'),
+            ('Whitespace', '\n\n'),
             ('Comment', '#define'),
-            ('DefinesInstruction', 'unfilter emptyLines')))
+            ('Whitespace', '\n\n'),
+            ('DefinesInstruction', 'unfilter emptyLines'),
+            ('Junk', '\n\n')))
 
     def testBrowserWithContributors(self):
-        self._test(mpl2 + '''#filter emptyLines
+        self._test(mpl2 + '''
+#filter emptyLines
 
 #define MOZ_LANGPACK_CREATOR mozilla.org
 
@@ -50,15 +56,22 @@ class TestDefinesParser(ParserTestMixin, unittest.TestCase):
 
 ''', (
             ('Comment', mpl2),
+            ('Whitespace', '\n'),
             ('DefinesInstruction', 'filter emptyLines'),
+            ('Whitespace', '\n\n'),
             ('MOZ_LANGPACK_CREATOR', 'mozilla.org'),
+            ('Whitespace', '\n\n'),
             ('Comment', 'non-English'),
+            ('Whitespace', '\n'),
             ('MOZ_LANGPACK_CONTRIBUTORS',
              '<em:contributor>Joe Solon</em:contributor>'),
-            ('DefinesInstruction', 'unfilter emptyLines')))
+            ('Whitespace', '\n\n'),
+            ('DefinesInstruction', 'unfilter emptyLines'),
+            ('Junk', '\n\n')))
 
     def testCommentWithNonAsciiCharacters(self):
-        self._test(mpl2 + '''#filter emptyLines
+        self._test(mpl2 + '''
+#filter emptyLines
 
 # e.g. #define seamonkey_l10n <DT><A HREF="urn:foo">SeaMonkey v češtině</a>
 #define seamonkey_l10n_long
@@ -67,15 +80,81 @@ class TestDefinesParser(ParserTestMixin, unittest.TestCase):
 
 ''', (
             ('Comment', mpl2),
+            ('Whitespace', '\n'),
             ('DefinesInstruction', 'filter emptyLines'),
+            ('Whitespace', '\n\n'),
             ('Comment', u'češtině'),
+            ('Whitespace', '\n'),
             ('seamonkey_l10n_long', ''),
+            ('Whitespace', '\n\n'),
+            ('DefinesInstruction', 'unfilter emptyLines'),
+            ('Junk', '\n\n')))
+
+    def test_no_empty_lines(self):
+        self._test('''#define MOZ_LANGPACK_CREATOR mozilla.org
+#define MOZ_LANGPACK_CREATOR mozilla.org
+''', (
+            ('MOZ_LANGPACK_CREATOR', 'mozilla.org'),
+            ('Whitespace', '\n'),
+            ('MOZ_LANGPACK_CREATOR', 'mozilla.org'),
+            ('Whitespace', '\n')))
+
+    def test_empty_line_between(self):
+        self._test('''#define MOZ_LANGPACK_CREATOR mozilla.org
+
+#define MOZ_LANGPACK_CREATOR mozilla.org
+''', (
+            ('MOZ_LANGPACK_CREATOR', 'mozilla.org'),
+            ('Junk', '\n'),
+            ('MOZ_LANGPACK_CREATOR', 'mozilla.org'),
+            ('Whitespace', '\n')))
+
+    def test_empty_line_at_the_beginning(self):
+        self._test('''
+#define MOZ_LANGPACK_CREATOR mozilla.org
+#define MOZ_LANGPACK_CREATOR mozilla.org
+''', (
+            ('Junk', '\n'),
+            ('MOZ_LANGPACK_CREATOR', 'mozilla.org'),
+            ('Whitespace', '\n'),
+            ('MOZ_LANGPACK_CREATOR', 'mozilla.org'),
+            ('Whitespace', '\n')))
+
+    def test_filter_empty_lines(self):
+        self._test('''#filter emptyLines
+
+#define MOZ_LANGPACK_CREATOR mozilla.org
+#define MOZ_LANGPACK_CREATOR mozilla.org
+#unfilter emptyLines''', (
+            ('DefinesInstruction', 'filter emptyLines'),
+            ('Whitespace', '\n\n'),
+            ('MOZ_LANGPACK_CREATOR', 'mozilla.org'),
+            ('Whitespace', '\n'),
+            ('MOZ_LANGPACK_CREATOR', 'mozilla.org'),
+            ('Whitespace', '\n'),
             ('DefinesInstruction', 'unfilter emptyLines')))
 
+    def test_unfilter_empty_lines_with_trailing(self):
+        self._test('''#filter emptyLines
+
+#define MOZ_LANGPACK_CREATOR mozilla.org
+#define MOZ_LANGPACK_CREATOR mozilla.org
+#unfilter emptyLines
+''', (
+            ('DefinesInstruction', 'filter emptyLines'),
+            ('Whitespace', '\n\n'),
+            ('MOZ_LANGPACK_CREATOR', 'mozilla.org'),
+            ('Whitespace', '\n'),
+            ('MOZ_LANGPACK_CREATOR', 'mozilla.org'),
+            ('Whitespace', '\n'),
+            ('DefinesInstruction', 'unfilter emptyLines'),
+            ('Whitespace', '\n')))
+
     def testToolkit(self):
         self._test('''#define MOZ_LANG_TITLE English (US)
 ''', (
-            ('MOZ_LANG_TITLE', 'English (US)'),))
+            ('MOZ_LANG_TITLE', 'English (US)'),
+            ('Whitespace', '\n')))
 
     def testToolkitEmpty(self):
         self._test('', tuple())
@@ -90,6 +169,23 @@ class TestDefinesParser(ParserTestMixin, unittest.TestCase):
         self._test('\n\n', (('Junk', '\n\n'),))
         self._test(' \n\n', (('Junk', ' \n\n'),))
 
+    def test_whitespace_value(self):
+        '''Test that there's only one whitespace between key and value
+        '''
+        # funny formatting of trailing whitespace to make it explicit
+        # and flake-8 happy
+        self._test('''\
+#define one \n\
+#define two  \n\
+#define tre   \n\
+''', (
+            ('one', ''),
+            ('Whitespace', '\n'),
+            ('two', ' '),
+            ('Whitespace', '\n'),
+            ('tre', '  '),
+            ('Whitespace', '\n'),))
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_dtd.py b/third_party/python/compare-locales/compare_locales/tests/test_dtd.py
index 5d098ed9eed7..1e6676b11d23 100644
--- a/third_party/python/compare-locales/compare_locales/tests/test_dtd.py
+++ b/third_party/python/compare-locales/compare_locales/tests/test_dtd.py
@@ -30,12 +30,17 @@ class TestDTD(ParserTestMixin, unittest.TestCase):
 '''
     quoteRef = (
         ('good.one', 'one'),
-        ('Junk', '<!ENTITY bad.one "bad " quote">'),
+        ('Whitespace', '\n'),
+        ('Junk', '<!ENTITY bad.one "bad " quote">\n'),
         ('good.two', 'two'),
-        ('Junk', '<!ENTITY bad.two "bad "quoted" word">'),
+        ('Whitespace', '\n'),
+        ('Junk', '<!ENTITY bad.two "bad "quoted" word">\n'),
         ('good.three', 'three'),
+        ('Whitespace', '\n'),
         ('good.four', 'good \' quote'),
-        ('good.five', 'good \'quoted\' word'),)
+        ('Whitespace', '\n'),
+        ('good.five', 'good \'quoted\' word'),
+        ('Whitespace', '\n'),)
 
     def test_quotes(self):
         self._test(self.quoteContent, self.quoteRef)
@@ -47,7 +52,7 @@ class TestDTD(ParserTestMixin, unittest.TestCase):
             return qr.sub(lambda m: m.group(0) == '"' and "'" or '"', s)
 
         self._test(quot2apos(self.quoteContent),
-                   map(lambda t: (t[0], quot2apos(t[1])), self.quoteRef))
+                   ((ref[0], quot2apos(ref[1])) for ref in self.quoteRef))
 
     def test_parsed_ref(self):
         self._test('''<!ENTITY % fooDTD SYSTEM "chrome://brand.dtd">
@@ -62,8 +67,13 @@ class TestDTD(ParserTestMixin, unittest.TestCase):
 <!ENTITY commented "out">
 -->
 ''',
-                   (('first', 'string'), ('second', 'string'),
-                    ('Comment', 'out')))
+                   (
+                       ('first', 'string'),
+                       ('Whitespace', '\n'),
+                       ('second', 'string'),
+                       ('Whitespace', '\n'),
+                       ('Comment', 'out'),
+                       ('Whitespace', '\n')))
 
     def test_license_header(self):
         p = parser.getParser('foo.dtd')
@@ -71,11 +81,11 @@ class TestDTD(ParserTestMixin, unittest.TestCase):
         entities = list(p.walk())
         self.assert_(isinstance(entities[0], parser.Comment))
         self.assertIn('MPL', entities[0].all)
-        e = entities[1]
+        e = entities[2]
         self.assert_(isinstance(e, parser.Entity))
         self.assertEqual(e.key, 'foo')
         self.assertEqual(e.val, 'value')
-        self.assertEqual(len(entities), 2)
+        self.assertEqual(len(entities), 4)
         p.readContents('''\
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -85,11 +95,11 @@ class TestDTD(ParserTestMixin, unittest.TestCase):
         entities = list(p.walk())
         self.assert_(isinstance(entities[0], parser.Comment))
         self.assertIn('MPL', entities[0].all)
-        e = entities[1]
+        e = entities[2]
         self.assert_(isinstance(e, parser.Entity))
         self.assertEqual(e.key, 'foo')
         self.assertEqual(e.val, 'value')
-        self.assertEqual(len(entities), 2)
+        self.assertEqual(len(entities), 4)
 
     def testBOM(self):
         self._test(u'\ufeff<!ENTITY foo.label "stuff">'.encode('utf-8'),
@@ -97,7 +107,7 @@ class TestDTD(ParserTestMixin, unittest.TestCase):
 
     def test_trailing_whitespace(self):
         self._test('<!ENTITY foo.label "stuff">\n  \n',
-                   (('foo.label', 'stuff'),))
+                   (('foo.label', 'stuff'), ('Whitespace', '\n  \n')))
 
     def test_unicode_comment(self):
         self._test('<!-- \xe5\x8f\x96 -->',
@@ -118,20 +128,12 @@ escaped value">
         one, two = list(self.parser)
         self.assertEqual(one.position(), (1, 1))
         self.assertEqual(one.value_position(), (1, 16))
-        self.assertEqual(one.position(-1), (2, 1))
+        self.assertEqual(one.position(-1), (1, 23))
         self.assertEqual(two.position(), (2, 1))
         self.assertEqual(two.value_position(), (2, 16))
         self.assertEqual(two.value_position(-1), (3, 14))
         self.assertEqual(two.value_position(10), (3, 5))
 
-    def test_post(self):
-        self.parser.readContents('<!ENTITY a "a"><!ENTITY b "b">')
-        a, b = list(self.parser)
-        self.assertEqual(a.post, '')
-        self.parser.readContents('<!ENTITY a "a"> <!ENTITY b "b">')
-        a, b = list(self.parser)
-        self.assertEqual(a.post, ' ')
-
     def test_word_count(self):
         self.parser.readContents('''\
 <!ENTITY a "one">
@@ -145,6 +147,36 @@ escaped value">
         self.assertEqual(c.count_words(), 1)
         self.assertEqual(d.count_words(), 3)
 
+    def test_html_entities(self):
+        self.parser.readContents('''\
+<!ENTITY named "&amp;">
+<!ENTITY numcode "&#38;">
+<!ENTITY shorthexcode "&#x26;">
+<!ENTITY longhexcode "&#x0026;">
+<!ENTITY unknown "&unknownEntity;">
+''')
+        entities = iter(self.parser)
+
+        entity = next(entities)
+        self.assertEqual(entity.raw_val, '&amp;')
+        self.assertEqual(entity.val, '&')
+
+        entity = next(entities)
+        self.assertEqual(entity.raw_val, '&#38;')
+        self.assertEqual(entity.val, '&')
+
+        entity = next(entities)
+        self.assertEqual(entity.raw_val, '&#x26;')
+        self.assertEqual(entity.val, '&')
+
+        entity = next(entities)
+        self.assertEqual(entity.raw_val, '&#x0026;')
+        self.assertEqual(entity.val, '&')
+
+        entity = next(entities)
+        self.assertEqual(entity.raw_val, '&unknownEntity;')
+        self.assertEqual(entity.val, '&unknownEntity;')
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_ftl.py b/third_party/python/compare-locales/compare_locales/tests/test_ftl.py
index ce09e10c0029..6c5fe7759ecb 100644
--- a/third_party/python/compare-locales/compare_locales/tests/test_ftl.py
+++ b/third_party/python/compare-locales/compare_locales/tests/test_ftl.py
@@ -5,6 +5,7 @@
 
 import unittest
 
+from compare_locales import parser
 from compare_locales.tests import ParserTestMixin
 
 
@@ -102,7 +103,7 @@ abc =
 
         [abc] = list(self.parser)
         self.assertEqual(abc.key, 'abc')
-        self.assertEqual(abc.val, '\n    A\n    B\n    C')
+        self.assertEqual(abc.val, '    A\n    B\n    C')
         self.assertEqual(abc.all, 'abc =\n    A\n    B\n    C')
 
     def test_message_with_attribute(self):
@@ -124,10 +125,81 @@ abc
 
         [abc] = list(self.parser)
         self.assertEqual(abc.key, 'abc')
-        self.assertEqual(abc.val, '')
+        self.assertEqual(abc.val, None)
         self.assertEqual(abc.all, 'abc\n    .attr = Attr')
         attributes = list(abc.attributes)
         self.assertEqual(len(attributes), 1)
         attr = attributes[0]
         self.assertEqual(attr.key, 'attr')
         self.assertEqual(attr.val, 'Attr')
+
+    def test_non_localizable(self):
+        self.parser.readContents('''\
+// Resource Comment
+
+foo = Foo
+
+// Section Comment
+[[ Section Header ]]
+
+bar = Bar
+
+// Standalone Comment
+
+// Baz Comment
+baz = Baz
+''')
+        entities = self.parser.walk()
+
+        entity = next(entities)
+        self.assertTrue(isinstance(entity, parser.Comment))
+        self.assertEqual(entity.all, '// Resource Comment')
+
+        entity = next(entities)
+        self.assertTrue(isinstance(entity, parser.Whitespace))
+        self.assertEqual(entity.all, '\n\n')
+
+        entity = next(entities)
+        self.assertTrue(isinstance(entity, parser.FluentEntity))
+        self.assertEqual(entity.val, 'Foo')
+
+        entity = next(entities)
+        self.assertTrue(isinstance(entity, parser.Whitespace))
+        self.assertEqual(entity.all, '\n\n')
+
+        entity = next(entities)
+        self.assertTrue(isinstance(entity, parser.FluentSection))
+        self.assertEqual(
+            entity.all, '// Section Comment\n[[ Section Header ]]')
+        self.assertEqual(entity.val, 'Section Header ')
+        self.assertEqual(
+            entity.entry.comment.content, 'Section Comment')
+
+        entity = next(entities)
+        self.assertTrue(isinstance(entity, parser.Whitespace))
+        self.assertEqual(entity.all, '\n\n')
+
+        entity = next(entities)
+        self.assertTrue(isinstance(entity, parser.FluentEntity))
+        self.assertEqual(entity.val, 'Bar')
+
+        entity = next(entities)
+        self.assertTrue(isinstance(entity, parser.Whitespace))
+        self.assertEqual(entity.all, '\n\n')
+
+        entity = next(entities)
+        self.assertTrue(isinstance(entity, parser.Comment))
+        self.assertEqual(entity.all, '// Standalone Comment')
+
+        entity = next(entities)
+        self.assertTrue(isinstance(entity, parser.Whitespace))
+        self.assertEqual(entity.all, '\n\n')
+
+        entity = next(entities)
+        self.assertTrue(isinstance(entity, parser.FluentEntity))
+        self.assertEqual(entity.val, 'Baz')
+        self.assertEqual(entity.entry.comment.content, 'Baz Comment')
+
+        entity = next(entities)
+        self.assertTrue(isinstance(entity, parser.Whitespace))
+        self.assertEqual(entity.all, '\n')
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_merge.py b/third_party/python/compare-locales/compare_locales/tests/test_merge.py
index b5fa81753c4a..0b3486cb5b3f 100644
--- a/third_party/python/compare-locales/compare_locales/tests/test_merge.py
+++ b/third_party/python/compare-locales/compare_locales/tests/test_merge.py
@@ -293,9 +293,9 @@ class TestDTD(unittest.TestCase, ContentMixin):
              'details': {
                  'l10n.dtd': [
                      {'error': u'Unparsed content "<!ENTY bar '
-                               u'\'gimmick\'>" '
+                               u'\'gimmick\'>\n" '
                                u'from line 2 column 1 to '
-                               u'line 2 column 22'},
+                               u'line 3 column 1'},
                      {'missingEntity': u'bar'}]
                 }
              })
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_merge_comments.py b/third_party/python/compare-locales/compare_locales/tests/test_merge_comments.py
new file mode 100644
index 000000000000..17b4822c640d
--- /dev/null
+++ b/third_party/python/compare-locales/compare_locales/tests/test_merge_comments.py
@@ -0,0 +1,186 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import unittest
+from compare_locales.merge import merge_channels
+
+
+class TestMergeComments(unittest.TestCase):
+    name = "foo.properties"
+
+    def test_comment_added_in_first(self):
+        channels = (b"""
+foo = Foo 1
+# Bar Comment 1
+bar = Bar 1
+""", b"""
+foo = Foo 2
+bar = Bar 2
+""")
+        self.assertMultiLineEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+# Bar Comment 1
+bar = Bar 1
+""")
+
+    def test_comment_still_in_last(self):
+        channels = (b"""
+foo = Foo 1
+bar = Bar 1
+""", b"""
+foo = Foo 2
+# Bar Comment 2
+bar = Bar 2
+""")
+        self.assertMultiLineEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+# Bar Comment 2
+bar = Bar 1
+""")
+
+    def test_comment_changed(self):
+        channels = (b"""
+foo = Foo 1
+# Bar Comment 1
+bar = Bar 1
+""", b"""
+foo = Foo 2
+# Bar Comment 2
+bar = Bar 2
+""")
+        self.assertMultiLineEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+# Bar Comment 1
+bar = Bar 1
+""")
+
+
+class TestMergeStandaloneComments(unittest.TestCase):
+    name = "foo.properties"
+
+    def test_comment_added_in_first(self):
+        channels = (b"""
+# Standalone Comment 1
+
+# Foo Comment 1
+foo = Foo 1
+""", b"""
+# Foo Comment 2
+foo = Foo 2
+""")
+        self.assertMultiLineEqual(
+            merge_channels(self.name, *channels), b"""
+# Standalone Comment 1
+
+# Foo Comment 1
+foo = Foo 1
+""")
+
+    def test_comment_still_in_last(self):
+        channels = (b"""
+# Foo Comment 1
+foo = Foo 1
+""", b"""
+# Standalone Comment 2
+
+# Foo Comment 2
+foo = Foo 2
+""")
+        self.assertMultiLineEqual(
+            merge_channels(self.name, *channels), b"""
+# Standalone Comment 2
+
+# Foo Comment 1
+foo = Foo 1
+""")
+
+    def test_comments_in_both(self):
+        channels = (b"""
+# Standalone Comment 1
+
+# Foo Comment 1
+foo = Foo 1
+""", b"""
+# Standalone Comment 2
+
+# Foo Comment 2
+foo = Foo 2
+""")
+        self.assertMultiLineEqual(
+            merge_channels(self.name, *channels), b"""
+# Standalone Comment 2
+
+# Standalone Comment 1
+
+# Foo Comment 1
+foo = Foo 1
+""")
+
+    def test_identical_comments_in_both(self):
+        channels = (b"""
+# Standalone Comment
+
+# Foo Comment 1
+foo = Foo 1
+""", b"""
+# Standalone Comment
+
+# Foo Comment 2
+foo = Foo 2
+""")
+        self.assertMultiLineEqual(
+            merge_channels(self.name, *channels), b"""
+# Standalone Comment
+
+# Foo Comment 1
+foo = Foo 1
+""")
+
+    def test_standalone_which_is_attached_in_first(self):
+        channels = (b"""
+# Ambiguous Comment
+foo = Foo 1
+
+# Bar Comment 1
+bar = Bar 1
+""", b"""
+# Ambiguous Comment
+
+# Bar Comment 2
+bar = Bar 2
+""")
+        self.assertMultiLineEqual(
+            merge_channels(self.name, *channels), b"""
+# Ambiguous Comment
+
+foo = Foo 1
+
+# Bar Comment 1
+bar = Bar 1
+""")
+
+    def test_standalone_which_is_attached_in_second(self):
+        channels = (b"""
+# Ambiguous Comment
+
+# Bar Comment 1
+bar = Bar 1
+""", b"""
+# Ambiguous Comment
+foo = Foo 1
+
+# Bar Comment 2
+bar = Bar 2
+""")
+        self.assertMultiLineEqual(
+            merge_channels(self.name, *channels), b"""
+# Ambiguous Comment
+foo = Foo 1
+
+# Bar Comment 1
+bar = Bar 1
+""")
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_merge_dtd.py b/third_party/python/compare-locales/compare_locales/tests/test_merge_dtd.py
new file mode 100644
index 000000000000..3893ad128bbe
--- /dev/null
+++ b/third_party/python/compare-locales/compare_locales/tests/test_merge_dtd.py
@@ -0,0 +1,133 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import unittest
+from compare_locales.merge import merge_channels
+
+
+class TestMergeDTD(unittest.TestCase):
+    name = "foo.dtd"
+    maxDiff = None
+
+    def test_no_changes(self):
+        channels = (b"""
+<!ENTITY foo "Foo 1">
+""", b"""
+<!ENTITY foo "Foo 2">
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+<!ENTITY foo "Foo 1">
+""")
+
+    def test_trailing_whitespace(self):
+        channels = (b"""
+<!ENTITY foo "Foo 1">
+""", b"""
+<!ENTITY foo "Foo 2"> \n""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+<!ENTITY foo "Foo 1"> \n""")
+
+    def test_browser_dtd(self):
+        channels = (b"""\
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE : FILE This file contains the browser main menu ... -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.separator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.separator " - ">
+<!-- LOCALIZATION NOTE (mainWindow.privatebrowsing2): This will be appended ...
+                                                      inside the ... -->
+<!ENTITY mainWindow.privatebrowsing2 "(Private Browsing)">
+""", b"""\
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE : FILE This file contains the browser main menu ... -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.privatebrowsing): This will be appended ...
+                                                     inside the ... -->
+<!ENTITY mainWindow.privatebrowsing "(Private Browsing)">
+""")
+
+        self.assertMultiLineEqual(
+            merge_channels(self.name, *channels), b"""\
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE : FILE This file contains the browser main menu ... -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.privatebrowsing): This will be appended ...
+                                                     inside the ... -->
+<!ENTITY mainWindow.privatebrowsing "(Private Browsing)">
+<!-- LOCALIZATION NOTE (mainWindow.separator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.separator " - ">
+<!-- LOCALIZATION NOTE (mainWindow.privatebrowsing2): This will be appended ...
+                                                      inside the ... -->
+<!ENTITY mainWindow.privatebrowsing2 "(Private Browsing)">
+""")
+
+    def test_aboutServiceWorkers_dtd(self):
+        channels = (b"""\
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY title                     "About Service Workers">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY maintitle                 "Registered Service Workers">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY warning_not_enabled       "Service Workers are not enabled.">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY warning_no_serviceworkers "No Service Workers registered.">
+""", b"""\
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY title                     "About Service Workers">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY maintitle                 "Registered Service Workers">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY warning_not_enabled       "Service Workers are not enabled.">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY warning_no_serviceworkers "No Service Workers registered.">
+""")
+
+        self.assertMultiLineEqual(
+            merge_channels(self.name, *channels), b"""\
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY title                     "About Service Workers">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY maintitle                 "Registered Service Workers">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY warning_not_enabled       "Service Workers are not enabled.">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY warning_no_serviceworkers "No Service Workers registered.">
+""")
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_merge_ftl.py b/third_party/python/compare-locales/compare_locales/tests/test_merge_ftl.py
new file mode 100644
index 000000000000..c22721bfd406
--- /dev/null
+++ b/third_party/python/compare-locales/compare_locales/tests/test_merge_ftl.py
@@ -0,0 +1,316 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import unittest
+from compare_locales.merge import merge_channels
+
+
+class TestMergeFluent(unittest.TestCase):
+    name = "foo.ftl"
+
+    def test_no_changes(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+""")
+
+    def test_attribute_in_first(self):
+        channels = (b"""
+foo = Foo 1
+    .attr = Attr 1
+""", b"""
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+    .attr = Attr 1
+""")
+
+    def test_attribute_in_last(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+foo = Foo 2
+    .attr = Attr 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+""")
+
+    def test_attribute_changed(self):
+        channels = (b"""
+foo = Foo 1
+    .attr = Attr 1
+""", b"""
+foo = Foo 2
+    .attr = Attr 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+    .attr = Attr 1
+""")
+
+    def test_tag_in_first(self):
+        channels = (b"""
+foo = Foo 1
+    #tag
+""", b"""
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+    #tag
+""")
+
+    def test_tag_in_last(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+foo = Foo 2
+    #tag
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+""")
+
+    def test_tag_changed(self):
+        channels = (b"""
+foo = Foo 1
+    #tag1
+""", b"""
+foo = Foo 2
+    #tag2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+    #tag1
+""")
+
+    def test_section_in_first(self):
+        channels = (b"""
+[[ Section 1 ]]
+foo = Foo 1
+""", b"""
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+[[ Section 1 ]]
+foo = Foo 1
+""")
+
+    def test_section_in_last(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+[[ Section 2 ]]
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+[[ Section 2 ]]
+foo = Foo 1
+""")
+
+    def test_section_changed(self):
+        channels = (b"""
+[[ Section 1 ]]
+foo = Foo 1
+""", b"""
+[[ Section 2 ]]
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+[[ Section 2 ]]
+[[ Section 1 ]]
+foo = Foo 1
+""")
+
+    def test_message_comment_in_first(self):
+        channels = (b"""
+// Comment 1
+foo = Foo 1
+""", b"""
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+// Comment 1
+foo = Foo 1
+""")
+
+    def test_message_comment_in_last(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+// Comment 2
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+""")
+
+    def test_message_comment_changed(self):
+        channels = (b"""
+// Comment 1
+foo = Foo 1
+""", b"""
+// Comment 2
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+// Comment 1
+foo = Foo 1
+""")
+
+    def test_section_comment_in_first(self):
+        channels = (b"""
+// Comment 1
+[[ Section ]]
+""", b"""
+[[ Section ]]
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+// Comment 1
+[[ Section ]]
+""")
+
+    def test_section_comment_in_last(self):
+        channels = (b"""
+[[ Section ]]
+""", b"""
+// Comment 2
+[[ Section ]]
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+[[ Section ]]
+""")
+
+    def test_section_comment_changed(self):
+        channels = (b"""
+// Comment 1
+[[ Section ]]
+""", b"""
+// Comment 2
+[[ Section ]]
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+// Comment 1
+[[ Section ]]
+""")
+
+    def test_standalone_comment_in_first(self):
+        channels = (b"""
+foo = Foo 1
+
+// Comment 1
+""", b"""
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+
+// Comment 1
+""")
+
+    def test_standalone_comment_in_last(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+foo = Foo 2
+
+// Comment 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+
+// Comment 2
+""")
+
+    def test_standalone_comment_changed(self):
+        channels = (b"""
+foo = Foo 1
+
+// Comment 1
+""", b"""
+foo = Foo 2
+
+// Comment 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+
+// Comment 2
+
+// Comment 1
+""")
+
+    def test_resource_comment_in_first(self):
+        channels = (b"""
+// Resource Comment 1
+
+foo = Foo 1
+""", b"""
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+// Resource Comment 1
+
+foo = Foo 1
+""")
+
+    def test_resource_comment_in_last(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+// Resource Comment 1
+
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+// Resource Comment 1
+
+foo = Foo 1
+""")
+
+    def test_resource_comment_changed(self):
+        channels = (b"""
+// Resource Comment 1
+
+foo = Foo 1
+""", b"""
+// Resource Comment 2
+
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+// Resource Comment 2
+
+// Resource Comment 1
+
+foo = Foo 1
+""")
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_merge_messages.py b/third_party/python/compare-locales/compare_locales/tests/test_merge_messages.py
new file mode 100644
index 000000000000..cd9a3e203bce
--- /dev/null
+++ b/third_party/python/compare-locales/compare_locales/tests/test_merge_messages.py
@@ -0,0 +1,93 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import unittest
+from compare_locales.merge import merge_channels
+
+
+class TestMergeTwo(unittest.TestCase):
+    name = "foo.properties"
+
+    def test_no_changes(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+""")
+
+    def test_message_added_in_first(self):
+        channels = (b"""
+foo = Foo 1
+bar = Bar 1
+""", b"""
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+bar = Bar 1
+""")
+
+    def test_message_still_in_last(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+foo = Foo 2
+bar = Bar 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+bar = Bar 2
+""")
+
+    def test_message_reordered(self):
+        channels = (b"""
+foo = Foo 1
+bar = Bar 1
+""", b"""
+bar = Bar 2
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+bar = Bar 1
+""")
+
+
+class TestMergeThree(unittest.TestCase):
+    name = "foo.properties"
+
+    def test_no_changes(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+foo = Foo 2
+""", b"""
+foo = Foo 3
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+""")
+
+    def test_message_still_in_last(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+foo = Foo 2
+""", b"""
+foo = Foo 3
+bar = Bar 3
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+bar = Bar 3
+""")
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_merge_properties.py b/third_party/python/compare-locales/compare_locales/tests/test_merge_properties.py
new file mode 100644
index 000000000000..931e4752e019
--- /dev/null
+++ b/third_party/python/compare-locales/compare_locales/tests/test_merge_properties.py
@@ -0,0 +1,41 @@
+# coding=utf8
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from codecs import decode, encode
+import unittest
+
+from compare_locales.merge import merge_channels
+
+
+class TestMergeProperties(unittest.TestCase):
+    name = "foo.properties"
+
+    def test_no_changes(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+""")
+
+    def test_encoding(self):
+        channels = (encode(u"""
+foo = Foo 1…
+""", "utf8"), encode(u"""
+foo = Foo 2…
+""", "utf8"))
+        output = merge_channels(self.name, *channels)
+        self.assertEqual(output, encode(u"""
+foo = Foo 1…
+""", "utf8"))
+
+        u_output = decode(output, "utf8")
+        self.assertEqual(u_output, u"""
+foo = Foo 1…
+""")
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_merge_unknown.py b/third_party/python/compare-locales/compare_locales/tests/test_merge_unknown.py
new file mode 100644
index 000000000000..8ac6951e4255
--- /dev/null
+++ b/third_party/python/compare-locales/compare_locales/tests/test_merge_unknown.py
@@ -0,0 +1,21 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import unittest
+
+from compare_locales.merge import merge_channels, MergeNotSupportedError
+
+
+class TestMergeUnknown(unittest.TestCase):
+    name = "foo.unknown"
+
+    def test_not_supported_error(self):
+        channels = (b"""
+foo = Foo 1
+""", b"""
+foo = Foo 2
+""")
+        pattern = "Unsupported file format \(foo\.unknown\)\."
+        with self.assertRaisesRegexp(MergeNotSupportedError, pattern):
+            merge_channels(self.name, *channels)
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_merge_whitespace.py b/third_party/python/compare-locales/compare_locales/tests/test_merge_whitespace.py
new file mode 100644
index 000000000000..a3b39d7c462b
--- /dev/null
+++ b/third_party/python/compare-locales/compare_locales/tests/test_merge_whitespace.py
@@ -0,0 +1,76 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import unittest
+from compare_locales.merge import merge_channels
+
+
+class TestMergeWhitespace(unittest.TestCase):
+    name = "foo.properties"
+
+    def test_trailing_spaces(self):
+        channels = (b"""
+foo = Foo 1
+      """, b"""
+foo = Foo 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+      """)
+
+    def test_blank_lines_between_messages(self):
+        channels = (b"""
+foo = Foo 1
+
+bar = Bar 1
+""", b"""
+foo = Foo 2
+bar = Bar 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+
+bar = Bar 1
+""")
+
+    def test_no_eol(self):
+        channels = (b"""
+foo = Foo 1""", b"""
+foo = Foo 2
+bar = Bar 2
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+foo = Foo 1
+bar = Bar 2
+""")
+
+    def test_still_in_last_with_blank(self):
+        channels = (b"""
+
+foo = Foo 1
+
+baz = Baz 1
+
+""", b"""
+
+foo = Foo 2
+
+bar = Bar 2
+
+baz = Baz 2
+
+""")
+        self.assertEqual(
+            merge_channels(self.name, *channels), b"""
+
+foo = Foo 1
+
+bar = Bar 2
+
+baz = Baz 1
+
+""")
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_parser.py b/third_party/python/compare-locales/compare_locales/tests/test_parser.py
index b8f632382ede..e88ff7189002 100644
--- a/third_party/python/compare-locales/compare_locales/tests/test_parser.py
+++ b/third_party/python/compare-locales/compare_locales/tests/test_parser.py
@@ -8,27 +8,31 @@ from compare_locales import parser
 
 
 class TestParserContext(unittest.TestCase):
-    def test_lines(self):
-        "Test that Parser.Context.lines returns 1-based tuples"
+    def test_linecol(self):
+        "Should return 1-based line and column numbers."
         ctx = parser.Parser.Context('''first line
 second line
 third line
 ''')
         self.assertEqual(
-            ctx.lines(0, 1),
-            [(1, 1), (1, 2)]
+            ctx.linecol(0),
+            (1, 1)
         )
         self.assertEqual(
-            ctx.lines(len('first line')),
-            [(1, len('first line') + 1)]
+            ctx.linecol(1),
+            (1, 2)
         )
         self.assertEqual(
-            ctx.lines(len('first line') + 1),
-            [(2, 1)]
+            ctx.linecol(len('first line')),
+            (1, len('first line') + 1)
         )
         self.assertEqual(
-            ctx.lines(len(ctx.contents)),
-            [(4, 1)]
+            ctx.linecol(len('first line') + 1),
+            (2, 1)
+        )
+        self.assertEqual(
+            ctx.linecol(len(ctx.contents)),
+            (4, 1)
         )
 
     def test_empty_parser(self):
diff --git a/third_party/python/compare-locales/compare_locales/tests/test_properties.py b/third_party/python/compare-locales/compare_locales/tests/test_properties.py
index ebf83a1f033c..86730828c5dc 100644
--- a/third_party/python/compare-locales/compare_locales/tests/test_properties.py
+++ b/third_party/python/compare-locales/compare_locales/tests/test_properties.py
@@ -22,11 +22,15 @@ two_lines_triple = This line is one of two and ends in \\\
 and still has another line coming
 ''', (
             ('one_line', 'This is one line'),
+            ('Whitespace', '\n'),
             ('two_line', u'This is the first of two lines'),
+            ('Whitespace', '\n'),
             ('one_line_trailing', u'This line ends in \\'),
+            ('Whitespace', '\n'),
             ('Junk', 'and has junk\n'),
             ('two_lines_triple', 'This line is one of two and ends in \\'
-             'and still has another line coming')))
+             'and still has another line coming'),
+            ('Whitespace', '\n')))
 
     def testProperties(self):
         # port of netwerk/test/PropertiesTest.cpp
@@ -63,7 +67,11 @@ and an end''', (('bar', 'one line with a # part that looks like a comment '
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 foo=value
-''', (('Comment', 'MPL'), ('foo', 'value')))
+''', (
+            ('Comment', 'MPL'),
+            ('Whitespace', '\n\n'),
+            ('foo', 'value'),
+            ('Whitespace', '\n')))
 
     def test_escapes(self):
         self.parser.readContents(r'''
@@ -87,15 +95,20 @@ second = string
 
 #
 #commented out
-''', (('first', 'string'), ('second', 'string'),
-            ('Comment', 'commented out')))
+''', (
+            ('first', 'string'),
+            ('Whitespace', '\n'),
+            ('second', 'string'),
+            ('Whitespace', '\n\n'),
+            ('Comment', 'commented out'),
+            ('Whitespace', '\n')))
 
     def test_trailing_newlines(self):
         self._test('''\
 foo = bar
 
 \x20\x20
-  ''', (('foo', 'bar'),))
+  ''', (('foo', 'bar'), ('Whitespace', '\n\n\x20\x20\n ')))
 
     def test_just_comments(self):
         self._test('''\
@@ -105,7 +118,11 @@ foo = bar
 
 # LOCALIZATION NOTE These strings are used inside the Promise debugger
 # which is available as a panel in the Debugger.
-''', (('Comment', 'MPL'), ('Comment', 'LOCALIZATION NOTE')))
+''', (
+            ('Comment', 'MPL'),
+            ('Whitespace', '\n\n'),
+            ('Comment', 'LOCALIZATION NOTE'),
+            ('Whitespace', '\n')))
 
     def test_just_comments_without_trailing_newline(self):
         self._test('''\
@@ -115,7 +132,9 @@ foo = bar
 
 # LOCALIZATION NOTE These strings are used inside the Promise debugger
 # which is available as a panel in the Debugger.''', (
-            ('Comment', 'MPL'), ('Comment', 'LOCALIZATION NOTE')))
+            ('Comment', 'MPL'),
+            ('Whitespace', '\n\n'),
+            ('Comment', 'LOCALIZATION NOTE')))
 
     def test_trailing_comment_and_newlines(self):
         self._test('''\
@@ -124,13 +143,15 @@ foo = bar
 
 
 
-''',  (('Comment', 'LOCALIZATION NOTE'),))
+''',  (
+            ('Comment', 'LOCALIZATION NOTE'),
+            ('Whitespace', '\n\n\n')))
 
     def test_empty_file(self):
         self._test('', tuple())
         self._test('\n', (('Whitespace', '\n'),))
         self._test('\n\n', (('Whitespace', '\n\n'),))
-        self._test(' \n\n', (('Whitespace', ' \n\n'),))
+        self._test(' \n\n', (('Whitespace', '\n\n'),))
 
     def test_positions(self):
         self.parser.readContents('''\
@@ -146,6 +167,14 @@ escaped value
         self.assertEqual(two.value_position(-1), (3, 14))
         self.assertEqual(two.value_position(10), (3, 3))
 
+    # Bug 1399059 comment 18
+    def test_z(self):
+        self.parser.readContents('''\
+one = XYZ ABC
+''')
+        one, = list(self.parser)
+        self.assertEqual(one.val, 'XYZ ABC')
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/third_party/python/fluent/PKG-INFO b/third_party/python/fluent/PKG-INFO
deleted file mode 100644
index 4c8d934fd4cd..000000000000
--- a/third_party/python/fluent/PKG-INFO
+++ /dev/null
@@ -1,16 +0,0 @@
-Metadata-Version: 1.1
-Name: fluent
-Version: 0.4.2
-Summary: Localization library for expressive translations.
-Home-page: https://github.com/projectfluent/python-fluent
-Author: Mozilla
-Author-email: l10n-drivers@mozilla.org
-License: APL 2
-Description: UNKNOWN
-Keywords: fluent,localization,l10n
-Platform: UNKNOWN
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.5
diff --git a/third_party/python/fluent/fluent/migrate/__init__.py b/third_party/python/fluent/fluent/migrate/__init__.py
index d1c1bf761daa..3582468d244a 100644
--- a/third_party/python/fluent/fluent/migrate/__init__.py
+++ b/third_party/python/fluent/fluent/migrate/__init__.py
@@ -1,10 +1,13 @@
 # coding=utf8
 
 from .context import MergeContext                      # noqa: F401
+from .errors import (                                  # noqa: F401
+    MigrationError, NotSupportedError, UnreadableReferenceError
+)
 from .transforms import (                              # noqa: F401
     Source, COPY, REPLACE_IN_TEXT, REPLACE, PLURALS, CONCAT
 )
 from .helpers import (                                 # noqa: F401
-    LITERAL, EXTERNAL_ARGUMENT, MESSAGE_REFERENCE
+    EXTERNAL_ARGUMENT, MESSAGE_REFERENCE
 )
 from .changesets import convert_blame_to_changesets    # noqa: F401
diff --git a/third_party/python/fluent/fluent/migrate/context.py b/third_party/python/fluent/fluent/migrate/context.py
index 8ee779f32f5c..7cb0e023796b 100644
--- a/third_party/python/fluent/fluent/migrate/context.py
+++ b/third_party/python/fluent/fluent/migrate/context.py
@@ -5,6 +5,11 @@ import os
 import codecs
 import logging
 
+try:
+    from itertools import zip_longest
+except ImportError:
+    from itertools import izip_longest as zip_longest
+
 import fluent.syntax.ast as FTL
 from fluent.syntax.parser import FluentParser
 from fluent.syntax.serializer import FluentSerializer
@@ -18,7 +23,7 @@ except ImportError:
 from .cldr import get_plural_categories
 from .transforms import Source
 from .merge import merge_resource
-from .util import get_message
+from .errors import NotSupportedError, UnreadableReferenceError
 
 
 class MergeContext(object):
@@ -41,7 +46,7 @@ class MergeContext(object):
         - A list of `FTL.Message` objects some of whose nodes are special
           helper or transform nodes:
 
-              helpers: LITERAL, EXTERNAL_ARGUMENT, MESSAGE_REFERENCE
+              helpers: EXTERNAL_ARGUMENT, MESSAGE_REFERENCE
               transforms: COPY, REPLACE_IN_TEXT, REPLACE, PLURALS, CONCAT
     """
 
@@ -79,6 +84,10 @@ class MergeContext(object):
         f = codecs.open(path, 'r', 'utf8')
         try:
             contents = f.read()
+        except UnicodeDecodeError as err:
+            logger = logging.getLogger('migrate')
+            logger.warn('Unable to read file {}: {}'.format(path, err))
+            raise err
         finally:
             f.close()
 
@@ -94,7 +103,7 @@ class MergeContext(object):
             logger = logging.getLogger('migrate')
             for annot in annots:
                 msg = annot.message
-                logger.warn(u'Syntax error in {}: {}'.format(path, msg))
+                logger.warn('Syntax error in {}: {}'.format(path, msg))
 
         return ast
 
@@ -105,52 +114,37 @@ class MergeContext(object):
         # Transform the parsed result which is an iterator into a dict.
         return {entity.key: entity.val for entity in parser}
 
-    def add_reference(self, path, realpath=None):
-        """Add an FTL AST to this context's reference resources."""
-        fullpath = os.path.join(self.reference_dir, realpath or path)
-        try:
-            ast = self.read_ftl_resource(fullpath)
-        except IOError as err:
-            logger = logging.getLogger('migrate')
-            logger.error(u'Missing reference file: {}'.format(path))
-            raise err
-        except UnicodeDecodeError as err:
-            logger = logging.getLogger('migrate')
-            logger.error(u'Error reading file {}: {}'.format(path, err))
-            raise err
-        else:
-            self.reference_resources[path] = ast
+    def maybe_add_localization(self, path):
+        """Add a localization resource to migrate translations from.
 
-    def add_localization(self, path):
-        """Add an existing localization resource.
+        Only legacy resources can be added as migration sources.  The resource
+        may be missing on disk.
 
-        If it's an FTL resource, add an FTL AST.  Otherwise, it's a legacy
-        resource.  Use a compare-locales parser to create a dict of (key,
-        string value) tuples.
+        Uses a compare-locales parser to create a dict of (key, string value)
+        tuples.
         """
-        fullpath = os.path.join(self.localization_dir, path)
-        if fullpath.endswith('.ftl'):
-            try:
-                ast = self.read_ftl_resource(fullpath)
-            except IOError:
-                logger = logging.getLogger('migrate')
-                logger.warn(u'Missing localization file: {}'.format(path))
-            except UnicodeDecodeError as err:
-                logger = logging.getLogger('migrate')
-                logger.warn(u'Error reading file {}: {}'.format(path, err))
-            else:
-                self.localization_resources[path] = ast
-        else:
-            try:
-                collection = self.read_legacy_resource(fullpath)
-            except IOError:
-                logger = logging.getLogger('migrate')
-                logger.warn(u'Missing localization file: {}'.format(path))
-            else:
-                self.localization_resources[path] = collection
+        if path.endswith('.ftl'):
+            error_message = (
+                'Migrating translations from Fluent files is not supported '
+                '({})'.format(path))
+            logging.getLogger('migrate').error(error_message)
+            raise NotSupportedError(error_message)
 
-    def add_transforms(self, path, transforms):
-        """Define transforms for path.
+        try:
+            fullpath = os.path.join(self.localization_dir, path)
+            collection = self.read_legacy_resource(fullpath)
+        except IOError:
+            logger = logging.getLogger('migrate')
+            logger.warn('Missing localization file: {}'.format(path))
+        else:
+            self.localization_resources[path] = collection
+
+    def add_transforms(self, target, reference, transforms):
+        """Define transforms for target using reference as template.
+
+        `target` is a path of the destination FTL file relative to the
+        localization directory. `reference` is a path to the template FTL
+        file relative to the reference directory.
 
         Each transform is an extended FTL node with `Transform` nodes as some
         values.  Transforms are stored in their lazy AST form until
@@ -165,27 +159,83 @@ class MergeContext(object):
                 acc.add((cur.path, cur.key))
             return acc
 
+        refpath = os.path.join(self.reference_dir, reference)
+        try:
+            ast = self.read_ftl_resource(refpath)
+        except IOError as err:
+            error_message = 'Missing reference file: {}'.format(refpath)
+            logging.getLogger('migrate').error(error_message)
+            raise UnreadableReferenceError(error_message)
+        except UnicodeDecodeError as err:
+            error_message = 'Error reading file {}: {}'.format(refpath, err)
+            logging.getLogger('migrate').error(error_message)
+            raise UnreadableReferenceError(error_message)
+        else:
+            # The reference file will be used by the merge function as
+            # a template for serializing the merge results.
+            self.reference_resources[target] = ast
+
         for node in transforms:
             # Scan `node` for `Source` nodes and collect the information they
             # store into a set of dependencies.
             dependencies = fold(get_sources, node, set())
             # Set these sources as dependencies for the current transform.
-            self.dependencies[(path, node.id.name)] = dependencies
+            self.dependencies[(target, node.id.name)] = dependencies
 
-        path_transforms = self.transforms.setdefault(path, [])
+            # Read all legacy translation files defined in Source transforms.
+            for path in set(path for path, _ in dependencies):
+                self.maybe_add_localization(path)
+
+        path_transforms = self.transforms.setdefault(target, [])
         path_transforms += transforms
 
+        if target not in self.localization_resources:
+            fullpath = os.path.join(self.localization_dir, target)
+            try:
+                ast = self.read_ftl_resource(fullpath)
+            except IOError:
+                logger = logging.getLogger('migrate')
+                logger.info(
+                    'Localization file {} does not exist and '
+                    'it will be created'.format(target))
+            except UnicodeDecodeError:
+                logger = logging.getLogger('migrate')
+                logger.warn(
+                    'Localization file {} will be re-created and some '
+                    'translations might be lost'.format(target))
+            else:
+                self.localization_resources[target] = ast
+
     def get_source(self, path, key):
-        """Get an entity value from the localized source.
+        """Get an entity value from a localized legacy source.
 
         Used by the `Source` transform.
         """
-        if path.endswith('.ftl'):
-            resource = self.localization_resources[path]
-            return get_message(resource.body, key)
-        else:
-            resource = self.localization_resources[path]
-            return resource.get(key, None)
+        resource = self.localization_resources[path]
+        return resource.get(key, None)
+
+    def messages_equal(self, res1, res2):
+        """Compare messages of two FTL resources.
+
+        Uses FTL.BaseNode.equals to compare all messages in two FTL resources.
+        If the order or number of messages differ, the result is also False.
+        """
+        def message_id(message):
+            "Return the message's identifer name for sorting purposes."
+            return message.id.name
+
+        messages1 = sorted(
+            (entry for entry in res1.body if isinstance(entry, FTL.Message)),
+            key=message_id)
+        messages2 = sorted(
+            (entry for entry in res2.body if isinstance(entry, FTL.Message)),
+            key=message_id)
+        for msg1, msg2 in zip_longest(messages1, messages2):
+            if msg1 is None or msg2 is None:
+                return False
+            if not msg1.equals(msg2):
+                return False
+        return True
 
     def merge_changeset(self, changeset=None):
         """Return a generator of FTL ASTs for the changeset.
@@ -200,10 +250,11 @@ class MergeContext(object):
         """
 
         if changeset is None:
-            # Merge all known legacy translations.
+            # Merge all known legacy translations. Used in tests.
             changeset = {
                 (path, key)
                 for path, strings in self.localization_resources.iteritems()
+                if not path.endswith('.ftl')
                 for key in strings.iterkeys()
             }
 
@@ -240,11 +291,14 @@ class MergeContext(object):
                 self, reference, current, transforms, in_changeset
             )
 
-            # If none of the transforms is in the given changeset, the merged
-            # snapshot is identical to the current translation. We compare
-            # JSON trees rather then use filtering by `in_changeset` to account
-            # for translations removed from `reference`.
-            if snapshot.to_json() == current.to_json():
+            # Skip this path if the messages in the merged snapshot are
+            # identical to those in the current state of the localization file.
+            # This may happen when:
+            #
+            #   - none of the transforms is in the changset, or
+            #   - all messages which would be migrated by the context's
+            #     transforms already exist in the current state.
+            if self.messages_equal(current, snapshot):
                 continue
 
             # Store the merged snapshot on the context so that the next merge
diff --git a/third_party/python/fluent/fluent/migrate/errors.py b/third_party/python/fluent/fluent/migrate/errors.py
new file mode 100644
index 000000000000..e52984f02be2
--- /dev/null
+++ b/third_party/python/fluent/fluent/migrate/errors.py
@@ -0,0 +1,10 @@
+class MigrationError(ValueError):
+    pass
+
+
+class NotSupportedError(MigrationError):
+    pass
+
+
+class UnreadableReferenceError(MigrationError):
+    pass
diff --git a/third_party/python/fluent/fluent/migrate/helpers.py b/third_party/python/fluent/fluent/migrate/helpers.py
index 01fa3fb6fc00..f0e9c0886824 100644
--- a/third_party/python/fluent/fluent/migrate/helpers.py
+++ b/third_party/python/fluent/fluent/migrate/helpers.py
@@ -13,12 +13,6 @@ from __future__ import unicode_literals
 import fluent.syntax.ast as FTL
 
 
-def LITERAL(value):
-    """Create a Pattern with a single TextElement."""
-    elements = [FTL.TextElement(value)]
-    return FTL.Pattern(elements)
-
-
 def EXTERNAL_ARGUMENT(name):
     """Create an ExternalArgument expression."""
 
diff --git a/third_party/python/fluent/fluent/migrate/merge.py b/third_party/python/fluent/fluent/migrate/merge.py
index 3112cb549903..586393e544f5 100644
--- a/third_party/python/fluent/fluent/migrate/merge.py
+++ b/third_party/python/fluent/fluent/migrate/merge.py
@@ -11,9 +11,10 @@ def merge_resource(ctx, reference, current, transforms, in_changeset):
     """Transform legacy translations into FTL.
 
     Use the `reference` FTL AST as a template.  For each en-US string in the
-    reference, first check if it's in the currently processed changeset with
-    `in_changeset`; then check for an existing translation in the current FTL
-    `localization` or for a migration specification in `transforms`.
+    reference, first check for an existing translation in the current FTL
+    `localization` and use it if it's present; then if the string has
+    a transform defined in the migration specification and if it's in the
+    currently processed changeset, evaluate the transform.
     """
 
     def merge_body(body):
diff --git a/third_party/python/fluent/fluent/migrate/transforms.py b/third_party/python/fluent/fluent/migrate/transforms.py
index b1a1ac2412b9..6a8e5e364f80 100644
--- a/third_party/python/fluent/fluent/migrate/transforms.py
+++ b/third_party/python/fluent/fluent/migrate/transforms.py
@@ -8,36 +8,35 @@ they are evaluated by a MergeContext.
 All Transforms evaluate to Fluent Patterns. This makes them suitable for
 defining migrations of values of message, attributes and variants.  The special
 CONCAT Transform is capable of joining multiple Patterns returned by evaluating
-other Transforms into a single Pattern.  It can also concatenate Fluent
-Expressions, like MessageReferences and ExternalArguments.
+other Transforms into a single Pattern.  It can also concatenate Pattern
+elements: TextElements and Placeables.
 
 The COPY, REPLACE and PLURALS Transforms inherit from Source which is a special
 AST Node defining the location (the file path and the id) of the legacy
 translation.  During the migration, the current MergeContext scans the
 migration spec for Source nodes and extracts the information about all legacy
-translations being migrated. Thus,
+translations being migrated. For instance,
 
     COPY('file.dtd', 'hello')
 
 is equivalent to:
 
-    LITERAL(Source('file.dtd', 'hello'))
+    FTL.Pattern([
+        FTL.TextElement(Source('file.dtd', 'hello'))
+    ])
 
-where LITERAL is a helper defined in the helpers.py module for creating Fluent
-Patterns from the text passed as the argument.
-
-The LITERAL helper and the special REPLACE_IN_TEXT Transforms are useful for
-working with text rather than (path, key) source definitions.  This is the case
-when the migrated translation requires some hardcoded text, e.g. <a> and </a>
-when multiple translations become a single one with a DOM overlay.
+Sometimes it's useful to work with text rather than (path, key) source
+definitions.  This is the case when the migrated translation requires some
+hardcoded text, e.g. <a> and </a> when multiple translations become a single
+one with a DOM overlay. In such cases it's best to use the AST nodes:
 
     FTL.Message(
         id=FTL.Identifier('update-failed'),
         value=CONCAT(
             COPY('aboutDialog.dtd', 'update.failed.start'),
-            LITERAL('<a>'),
+            FTL.TextElement('<a>'),
             COPY('aboutDialog.dtd', 'update.failed.linkText'),
-            LITERAL('</a>'),
+            FTL.TextElement('</a>'),
             COPY('aboutDialog.dtd', 'update.failed.end'),
         )
     )
@@ -45,7 +44,8 @@ when multiple translations become a single one with a DOM overlay.
 The REPLACE_IN_TEXT Transform also takes text as input, making in possible to
 pass it as the foreach function of the PLURALS Transform.  In this case, each
 slice of the plural string will be run through a REPLACE_IN_TEXT operation.
-Those slices are strings, so a REPLACE(path, key, …) isn't suitable for them.
+Those slices are strings, so a REPLACE(path, key, …) wouldn't be suitable for
+them.
 
     FTL.Message(
         FTL.Identifier('delete-all'),
@@ -66,7 +66,13 @@ Those slices are strings, so a REPLACE(path, key, …) isn't suitable for them.
 from __future__ import unicode_literals
 
 import fluent.syntax.ast as FTL
-from .helpers import LITERAL
+from .errors import NotSupportedError
+
+
+def pattern_from_text(value):
+    return FTL.Pattern([
+        FTL.TextElement(value)
+    ])
 
 
 def evaluate(ctx, node):
@@ -87,27 +93,25 @@ class Transform(FTL.BaseNode):
 class Source(Transform):
     """Declare the source translation to be migrated with other transforms.
 
-    When evaluated `Source` returns a simple string value.  All \\uXXXX from
-    the original translations are converted beforehand to the literal
-    characters they encode.
+    When evaluated, `Source` returns a simple string value. Escaped characters
+    are unescaped by the compare-locales parser according to the file format:
 
-    HTML entities are left unchanged for now because we can't know if they
-    should be converted to the characters they represent or not.  Consider the
-    following example in which `&amp;` could be replaced with the literal `&`:
+      - in properties files: \\uXXXX,
+      - in DTD files: known named, decimal, and hexadecimal HTML entities.
 
-        Privacy &amp; History
+    Consult the following files for the list of known named HTML entities:
 
-    vs. these two examples where the HTML encoding should be preserved:
-
-        Erreur&nbsp;!
-        Use /help &lt;command&gt; for more information.
+    https://github.com/python/cpython/blob/2.7/Lib/htmlentitydefs.py
+    https://github.com/python/cpython/blob/3.6/Lib/html/entities.py
 
     """
 
-    # XXX Perhaps there's a strict subset of HTML entities which must or must
-    # not be replaced?
-
     def __init__(self, path, key):
+        if path.endswith('.ftl'):
+            raise NotSupportedError(
+                'Migrating translations from Fluent files is not supported '
+                '({})'.format(path))
+
         self.path = path
         self.key = key
 
@@ -120,7 +124,7 @@ class COPY(Source):
 
     def __call__(self, ctx):
         source = super(self.__class__, self).__call__(ctx)
-        return LITERAL(source)
+        return pattern_from_text(source)
 
 
 class REPLACE_IN_TEXT(Transform):
@@ -210,10 +214,12 @@ class PLURALS(Source):
     Build an `FTL.SelectExpression` with the supplied `selector` and variants
     extracted from the source.  The source needs to be a semicolon-separated
     list of variants.  Each variant will be run through the `foreach` function,
-    which should return an `FTL.Node` or a `Transform`.
+    which should return an `FTL.Node` or a `Transform`. By default, the
+    `foreach` function transforms the source text into a Pattern with a single
+    TextElement.
     """
 
-    def __init__(self, path, key, selector, foreach=LITERAL):
+    def __init__(self, path, key, selector, foreach=pattern_from_text):
         super(self.__class__, self).__init__(path, key)
         self.selector = selector
         self.foreach = foreach
@@ -223,6 +229,13 @@ class PLURALS(Source):
         selector = evaluate(ctx, self.selector)
         variants = value.split(';')
         keys = ctx.plural_categories
+
+        # A special case for languages with one plural category. We don't need
+        # to insert a SelectExpression at all for them.
+        if len(keys) == len(variants) == 1:
+            variant, = variants
+            return evaluate(ctx, self.foreach(variant))
+
         last_index = min(len(variants), len(keys)) - 1
 
         def createVariant(zipped_enum):
@@ -264,7 +277,7 @@ class CONCAT(Transform):
                 return acc
 
             raise RuntimeError(
-                'CONCAT accepts FTL Patterns and Expressions.'
+                'CONCAT accepts FTL Patterns, TextElements and Placeables.'
             )
 
         # Merge adjecent `FTL.TextElement` nodes.
diff --git a/third_party/python/fluent/setup.cfg b/third_party/python/fluent/setup.cfg
deleted file mode 100644
index 8bfd5a12f85b..000000000000
--- a/third_party/python/fluent/setup.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-
diff --git a/third_party/python/fluent/setup.py b/third_party/python/fluent/setup.py
deleted file mode 100644
index 22e7048653a8..000000000000
--- a/third_party/python/fluent/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-
-from setuptools import setup
-
-setup(name='fluent',
-      version='0.4.2',
-      description='Localization library for expressive translations.',
-      author='Mozilla',
-      author_email='l10n-drivers@mozilla.org',
-      license='APL 2',
-      url='https://github.com/projectfluent/python-fluent',
-      keywords=['fluent', 'localization', 'l10n'],
-      classifiers=[
-          'Development Status :: 3 - Alpha',
-          'Intended Audience :: Developers',
-          'License :: OSI Approved :: Apache Software License',
-          'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 3.5',
-      ],
-      packages=['fluent', 'fluent.syntax', 'fluent.migrate'],
-      package_data={
-          'fluent.migrate': ['cldr_data/*']
-      }
-      )
diff --git a/third_party/python/fluent/tools/fluentfmt.py b/third_party/python/fluent/tools/fluentfmt.py
new file mode 100755
index 000000000000..d22d7896a895
--- /dev/null
+++ b/third_party/python/fluent/tools/fluentfmt.py
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+
+import sys
+
+sys.path.append('./')
+import codecs
+from fluent.syntax import parse, serialize
+
+
+def read_file(path):
+    with codecs.open(path, 'r', encoding='utf-8') as file:
+        text = file.read()
+    return text
+
+
+def pretty_print(fileType, data):
+    ast = parse(data)
+    print(serialize(ast))
+
+if __name__ == "__main__":
+    file_type = 'ftl'
+    f = read_file(sys.argv[1])
+    pretty_print(file_type, f)
diff --git a/third_party/python/fluent/tools/migrate/README.md b/third_party/python/fluent/tools/migrate/README.md
new file mode 100644
index 000000000000..b92aa089fe95
--- /dev/null
+++ b/third_party/python/fluent/tools/migrate/README.md
@@ -0,0 +1,39 @@
+# Migration Tools
+
+`migrate-l10n.py` is a CLI script which uses the `fluent.migrate` module under
+the hood to run migrations on existing translations.
+
+## Examples
+
+The `examples/` directory contains a number of sample migrations. To run them
+you'll need at least one clone of a localization repository, e.g. from
+https://hg.mozilla.org/l10n-central/.
+
+Amend your `PYTHONPATH` to make sure that all `fluent.*` modules can be found:
+
+    $ export PYTHONPATH=$(pwd)/../..:$PYTHONPATH
+
+Then run migrations passing the `examples` directory as the reference:
+
+    $ ./migrate-l10n.py --lang it --reference-dir examples --localization-dir ~/moz/l10n-central/it examples.about_dialog examples.about_downloads examples.bug_1291693
+
+Here's what the output should look like:
+
+    Annotating /home/stas/moz/l10n-central/it
+    Running migration examples.bug_1291693
+      Writing to /home/stas/moz/l10n-central/it/browser/branding/official/brand.ftl
+        Committing changeset: Bug 1291693 - Migrate the menubar to FTL, part 1
+      Writing to /home/stas/moz/l10n-central/it/browser/menubar.ftl
+      Writing to /home/stas/moz/l10n-central/it/browser/toolbar.ftl
+      Writing to /home/stas/moz/l10n-central/it/browser/branding/official/brand.ftl
+        Committing changeset: Bug 1291693 - Migrate the menubar to FTL, part 2
+    Running migration examples.about_dialog
+      Writing to /home/stas/moz/l10n-central/it/browser/about_dialog.ftl
+        Committing changeset: Migrate about:dialog, part 1
+    Running migration examples.about_downloads
+      Writing to /home/stas/moz/l10n-central/it/mobile/about_downloads.ftl
+        Committing changeset: Migrate about:download in Firefox for Android, part 1
+      Writing to /home/stas/moz/l10n-central/it/mobile/about_downloads.ftl
+        Committing changeset: Migrate about:download in Firefox for Android, part 2
+      Writing to /home/stas/moz/l10n-central/it/mobile/about_downloads.ftl
+        Committing changeset: Migrate about:download in Firefox for Android, part 3
diff --git a/third_party/python/fluent/tools/migrate/blame.py b/third_party/python/fluent/tools/migrate/blame.py
new file mode 100644
index 000000000000..076c7f80b317
--- /dev/null
+++ b/third_party/python/fluent/tools/migrate/blame.py
@@ -0,0 +1,60 @@
+import argparse
+import json
+import hglib
+from hglib.util import b, cmdbuilder
+from compare_locales.parser import getParser, Junk
+
+
+class Blame(object):
+    def __init__(self, repopath):
+        self.client = hglib.open(repopath)
+        self.users = []
+        self.blame = {}
+
+    def main(self):
+        args = cmdbuilder(
+            b('annotate'), self.client.root(), d=True, u=True, T='json')
+        blame_json = ''.join(self.client.rawcommand(args))
+        file_blames = json.loads(blame_json)
+
+        for file_blame in file_blames:
+            self.handleFile(file_blame)
+
+        return {'authors': self.users,
+                'blame': self.blame}
+
+    def handleFile(self, file_blame):
+        abspath = file_blame['abspath']
+
+        try:
+            parser = getParser(abspath)
+        except UserWarning:
+            return
+
+        self.blame[abspath] = {}
+
+        parser.readFile(file_blame['path'])
+        entities, emap = parser.parse()
+        for e in entities:
+            if isinstance(e, Junk):
+                continue
+            entity_lines = file_blame['lines'][
+                (e.value_position()[0] - 1):e.value_position(-1)[0]
+            ]
+            # ignore timezone
+            entity_lines.sort(key=lambda blame: -blame['date'][0])
+            line_blame = entity_lines[0]
+            user = line_blame['user']
+            timestamp = line_blame['date'][0]  # ignore timezone
+            if user not in self.users:
+                self.users.append(user)
+            userid = self.users.index(user)
+            self.blame[abspath][e.key] = [userid, timestamp]
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument("repopath")
+    args = parser.parse_args()
+    blame = Blame(args.repopath)
+    blimey = blame.main()
+    print(json.dumps(blimey, indent=4, separators=(',', ': ')))
diff --git a/third_party/python/fluent/tools/migrate/examples/__init__.py b/third_party/python/fluent/tools/migrate/examples/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/third_party/python/fluent/tools/migrate/examples/about_dialog.ftl b/third_party/python/fluent/tools/migrate/examples/about_dialog.ftl
new file mode 100644
index 000000000000..21901565d404
--- /dev/null
+++ b/third_party/python/fluent/tools/migrate/examples/about_dialog.ftl
@@ -0,0 +1,12 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+update-failed =
+    Update failed. <label>Download the latest version</label>
+channel-description =
+    You are currently on the <label>{ $channelName }</label> update channel.
+community =
+    { brand-short-name } is designed by <label>{ vendor-short-name }</label>,
+    a <label>global community</label> working together to keep the Web
+    open, public and accessible to all.
diff --git a/third_party/python/fluent/tools/migrate/examples/about_dialog.py b/third_party/python/fluent/tools/migrate/examples/about_dialog.py
new file mode 100644
index 000000000000..e45def1873f7
--- /dev/null
+++ b/third_party/python/fluent/tools/migrate/examples/about_dialog.py
@@ -0,0 +1,85 @@
+# coding=utf8
+
+import fluent.syntax.ast as FTL
+from fluent.migrate import (
+    CONCAT, EXTERNAL_ARGUMENT, MESSAGE_REFERENCE, COPY, REPLACE
+)
+
+
+def migrate(ctx):
+    """Migrate about:dialog, part {index}"""
+
+    ctx.add_transforms('browser/about_dialog.ftl', 'about_dialog.ftl', [
+        FTL.Message(
+            id=FTL.Identifier('update-failed'),
+            value=CONCAT(
+                COPY(
+                    'browser/chrome/browser/aboutDialog.dtd',
+                    'update.failed.start'
+                ),
+                FTL.TextElement('<a>'),
+                COPY(
+                    'browser/chrome/browser/aboutDialog.dtd',
+                    'update.failed.linkText'
+                ),
+                FTL.TextElement('</a>'),
+                COPY(
+                    'browser/chrome/browser/aboutDialog.dtd',
+                    'update.failed.end'
+                )
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('channel-description'),
+            value=CONCAT(
+                COPY(
+                    'browser/chrome/browser/aboutDialog.dtd',
+                    'channel.description.start'
+                ),
+                FTL.Placeable(EXTERNAL_ARGUMENT('channelname')),
+                COPY(
+                    'browser/chrome/browser/aboutDialog.dtd',
+                    'channel.description.end'
+                )
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('community'),
+            value=CONCAT(
+                REPLACE(
+                    'browser/chrome/browser/aboutDialog.dtd',
+                    'community.start2',
+                    {
+                        '&brandShortName;': MESSAGE_REFERENCE(
+                            'brand-short-name'
+                        )
+                    }
+                ),
+                FTL.TextElement('<a>'),
+                REPLACE(
+                    'browser/chrome/browser/aboutDialog.dtd',
+                    'community.mozillaLink',
+                    {
+                        '&vendorShortName;': MESSAGE_REFERENCE(
+                            'vendor-short-name'
+                        )
+                    }
+                ),
+                FTL.TextElement('</a>'),
+                COPY(
+                    'browser/chrome/browser/aboutDialog.dtd',
+                    'community.middle2'
+                ),
+                FTL.TextElement('<a>'),
+                COPY(
+                    'browser/chrome/browser/aboutDialog.dtd',
+                    'community.creditsLink'
+                ),
+                FTL.TextElement('</a>'),
+                COPY(
+                    'browser/chrome/browser/aboutDialog.dtd',
+                    'community.end3'
+                )
+            )
+        ),
+    ])
diff --git a/third_party/python/fluent/tools/migrate/examples/about_downloads.ftl b/third_party/python/fluent/tools/migrate/examples/about_downloads.ftl
new file mode 100644
index 000000000000..e591eee86cf8
--- /dev/null
+++ b/third_party/python/fluent/tools/migrate/examples/about_downloads.ftl
@@ -0,0 +1,38 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+title  = Downloads
+header = Your Downloads
+empty  = No Downloads
+
+open-menuitem
+    .label = Open
+retry-menuitem
+    .label = Retry
+remove-menuitem
+    .label = Delete
+pause-menuitem
+    .label = Pause
+resume-menuitem
+    .label = Resume
+cancel-menuitem
+    .label = Cancel
+remove-all-menuitem
+    .label = Delete All
+
+delete-all-title = Delete All
+delete-all-message =
+    { $num ->
+        [1] Delete this download?
+       *[other] Delete { $num } downloads?
+    }
+
+download-state-downloading = Downloading…
+download-state-canceled = Canceled
+download-state-failed = Failed
+download-state-paused = Paused
+download-state-starting = Starting…
+download-state-unknown = Unknown
+
+download-size-unknown = Unknown size
diff --git a/third_party/python/fluent/tools/migrate/examples/about_downloads.py b/third_party/python/fluent/tools/migrate/examples/about_downloads.py
new file mode 100644
index 000000000000..edfc8234366d
--- /dev/null
+++ b/third_party/python/fluent/tools/migrate/examples/about_downloads.py
@@ -0,0 +1,179 @@
+# coding=utf8
+
+import fluent.syntax.ast as FTL
+from fluent.migrate import EXTERNAL_ARGUMENT, COPY, PLURALS, REPLACE_IN_TEXT
+
+
+def migrate(ctx):
+    """Migrate about:download in Firefox for Android, part {index}"""
+
+    ctx.add_transforms('mobile/about_downloads.ftl', 'about_downloads.ftl', [
+        FTL.Message(
+            id=FTL.Identifier('title'),
+            value=COPY(
+                'mobile/android/chrome/aboutDownloads.dtd',
+                'aboutDownloads.title'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('header'),
+            value=COPY(
+                'mobile/android/chrome/aboutDownloads.dtd',
+                'aboutDownloads.header'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('empty'),
+            value=COPY(
+                'mobile/android/chrome/aboutDownloads.dtd',
+                'aboutDownloads.empty'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('open-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'mobile/android/chrome/aboutDownloads.dtd',
+                        'aboutDownloads.open'
+                    )
+                )
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('retry-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'mobile/android/chrome/aboutDownloads.dtd',
+                        'aboutDownloads.retry'
+                    )
+                )
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('remove-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'mobile/android/chrome/aboutDownloads.dtd',
+                        'aboutDownloads.remove'
+                    )
+                )
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('pause-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'mobile/android/chrome/aboutDownloads.dtd',
+                        'aboutDownloads.pause'
+                    )
+                )
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('resume-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'mobile/android/chrome/aboutDownloads.dtd',
+                        'aboutDownloads.resume'
+                    )
+                )
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('cancel-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'mobile/android/chrome/aboutDownloads.dtd',
+                        'aboutDownloads.cancel'
+                    )
+                )
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('remove-all-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'mobile/android/chrome/aboutDownloads.dtd',
+                        'aboutDownloads.removeAll'
+                    )
+                )
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('delete-all-title'),
+            value=COPY(
+                'mobile/android/chrome/aboutDownloads.properties',
+                'downloadAction.deleteAll'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('delete-all-message'),
+            value=PLURALS(
+                'mobile/android/chrome/aboutDownloads.properties',
+                'downloadMessage.deleteAll',
+                EXTERNAL_ARGUMENT('num'),
+                lambda text: REPLACE_IN_TEXT(
+                    text,
+                    {
+                        '#1': EXTERNAL_ARGUMENT('num')
+                    }
+                )
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('download-state-downloading'),
+            value=COPY(
+                'mobile/android/chrome/aboutDownloads.properties',
+                'downloadState.downloading'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('download-state-canceled'),
+            value=COPY(
+                'mobile/android/chrome/aboutDownloads.properties',
+                'downloadState.canceled'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('download-state-failed'),
+            value=COPY(
+                'mobile/android/chrome/aboutDownloads.properties',
+                'downloadState.failed'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('download-state-paused'),
+            value=COPY(
+                'mobile/android/chrome/aboutDownloads.properties',
+                'downloadState.paused'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('download-state-starting'),
+            value=COPY(
+                'mobile/android/chrome/aboutDownloads.properties',
+                'downloadState.starting'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('download-size-unknown'),
+            value=COPY(
+                'mobile/android/chrome/aboutDownloads.properties',
+                'downloadState.unknownSize'
+            )
+        ),
+    ])
diff --git a/third_party/python/fluent/tools/migrate/examples/brand.ftl b/third_party/python/fluent/tools/migrate/examples/brand.ftl
new file mode 100644
index 000000000000..f9aae63e09f1
--- /dev/null
+++ b/third_party/python/fluent/tools/migrate/examples/brand.ftl
@@ -0,0 +1,13 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brand-shorter-name = Firefox
+brand-short-name = Firefox
+brand-full-name = Mozilla Firefox
+vendor-short-name = Mozilla
+
+trademark-info =
+    Firefox and the Firefox logos are trademarks of the Mozilla Foundation.
+
+sync-brand-short-name = Sync
diff --git a/third_party/python/fluent/tools/migrate/examples/bug_1291693.py b/third_party/python/fluent/tools/migrate/examples/bug_1291693.py
new file mode 100644
index 000000000000..b05327bff8b6
--- /dev/null
+++ b/third_party/python/fluent/tools/migrate/examples/bug_1291693.py
@@ -0,0 +1,1917 @@
+# coding=utf8
+
+import fluent.syntax.ast as FTL
+from fluent.migrate import MESSAGE_REFERENCE, COPY, REPLACE
+
+
+def migrate(ctx):
+    """Bug 1291693 - Migrate the menubar to FTL, part {index}"""
+
+    ctx.add_transforms('browser/menubar.ftl', 'menubar.ftl', [
+        FTL.Message(
+            id=FTL.Identifier('file-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fileMenu.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fileMenu.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('tab-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'tabCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'tabCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('tab-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'tabCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('new-user-context-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'newUserContext.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'newUserContext.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('new-navigator-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'newNavigatorCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'newNavigatorCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('new-navigator-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'newNavigatorCmd.key',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('new-private-window-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'newPrivateWindow.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'newPrivateWindow.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('new-non-remote-window-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'newNonRemoteWindow.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('open-location-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'openLocationCmd.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('open-file-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'openFileCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'openFileCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('open-file-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'openFileCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('close-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'closeCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'closeCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('close-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'closeCmd.key',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('close-window-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'closeWindow.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'closeWindow.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('save-page-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'savePageCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'savePageCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('save-page-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'savePageCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('email-page-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'emailPageCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'emailPageCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('print-setup-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'printSetupCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'printSetupCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('print-preview-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'printPreviewCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'printPreviewCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('print-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'printCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'printCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('print-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'printCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('go-offline-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'goOfflineCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'goOfflineCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('quit-application-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'quitApplicationCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'quitApplicationCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('quit-application-menuitem-win'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'quitApplicationCmdWin2.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'quitApplicationCmdWin2.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('quit-application-menuitem-mac'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'quitApplicationCmdMac2.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('quit-application-command-unix'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'quitApplicationCmdUnix.key',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('edit-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'editMenu.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'editMenu.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('undo-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'undoCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'undoCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('undo-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'undoCmd.key',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('redo-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'redoCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'redoCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('redo-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'redoCmd.key',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('cut-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'cutCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'cutCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('cut-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'cutCmd.key',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('copy-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'copyCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'copyCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('copy-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'copyCmd.key',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('paste-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pasteCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pasteCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('paste-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pasteCmd.key',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('delete-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'deleteCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'deleteCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('select-all-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'selectAllCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'selectAllCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('select-all-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'selectAllCmd.key',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('find-on-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'findOnCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'findOnCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('find-on-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'findOnCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('find-again-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'findAgainCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'findAgainCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('find-again-command1'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'findAgainCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('find-again-command2'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'findAgainCmd.commandkey2',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('find-selection-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'findSelectionCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('bidi-switch-text-direction-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bidiSwitchTextDirectionItem.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bidiSwitchTextDirectionItem.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('bidi-switch-text-direction-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bidiSwitchTextDirectionItem.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('preferences-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'preferencesCmd2.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'preferencesCmd2.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('preferences-menuitem-unix'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'preferencesCmdUnix.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'preferencesCmdUnix.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('view-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'viewMenu.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'viewMenu.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('view-toolbar-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'viewToolbarsMenu.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'viewToolbarsMenu.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('view-sidebar-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'viewSidebarMenu.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'viewSidebarMenu.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('view-customize-toolbar-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'viewCustomizeToolbar.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'viewCustomizeToolbar.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-zoom-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoom.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoom.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-zoom-enlarge-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomEnlargeCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomEnlargeCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-zoom-enlarge-command1'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomEnlargeCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-zoom-enlarge-command2'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomEnlargeCmd.commandkey2',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-zoom-enlarge-command3'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomEnlargeCmd.commandkey3',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-zoom-reduce-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomReduceCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomReduceCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-zoom-reduce-command1'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomReduceCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-zoom-reduce-command2'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomReduceCmd.commandkey2',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-zoom-reset-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomResetCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomResetCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-zoom-reset-command1'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomResetCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-zoom-reset-command2'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomResetCmd.commandkey2',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-zoom-toggle-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomToggleCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullZoomToggleCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('page-style-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pageStyleMenu.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pageStyleMenu.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('page-style-no-style-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pageStyleNoStyle.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pageStyleNoStyle.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('page-style-persistent-only-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pageStylePersistentOnly.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pageStylePersistentOnly.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('show-all-tabs-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'showAllTabsCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'showAllTabsCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('bidi-switch-page-direction-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bidiSwitchPageDirectionItem.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bidiSwitchPageDirectionItem.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('enter-full-screen-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'enterFullScreenCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'enterFullScreenCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('exit-full-screen-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'exitFullScreenCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'exitFullScreenCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-screen-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullScreenCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullScreenCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('full-screen-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'fullScreenCmd.macCommandKey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('history-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'historyMenu.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'historyMenu.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('show-all-history-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'showAllHistoryCmd2.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('show-all-history-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'showAllHistoryCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('clear-recent-history-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'clearRecentHistory.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('history-synced-tabs-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'syncTabsMenu3.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('history-restore-last-session-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'historyRestoreLastSession.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('history-undo-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'historyUndoMenu.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('history-undo-window-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'historyUndoWindowMenu.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('bookmarks-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bookmarksMenu.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bookmarksMenu.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('show-all-bookmarks-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'showAllBookmarks2.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('show-all-bookmarks-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bookmarksCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('show-all-bookmarks-command-gtk'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bookmarksGtkCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('bookmark-this-page-broadcaster'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bookmarkThisPageCmd.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('edit-this-page-broadcaster'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'editThisBookmarkCmd.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('bookmark-this-page-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bookmarkThisPageCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('subscribe-to-page-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'subscribeToPageMenupopup.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('subscribe-to-page-menupopup'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'subscribeToPageMenupopup.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('add-cur-pages-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'addCurPagesCmd.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('recent-bookmarks-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'recentBookmarks.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('other-bookmarks-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'otherBookmarksCmd.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('personalbar-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'personalbarCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'personalbarCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('tools-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'toolsMenu.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'toolsMenu.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('downloads-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'downloads.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'downloads.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('downloads-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'downloads.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('downloads-command-unix'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'downloadsUnix.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('addons-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'addons.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'addons.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('addons-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'addons.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('sync-sign-in-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    REPLACE(
+                        'browser/chrome/browser/browser.dtd',
+                        'syncSignIn.label',
+                        {
+                            '&syncBrand.shortName.label;': MESSAGE_REFERENCE(
+                                'sync-brand-short-name'
+                            )
+                        }
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'syncSignIn.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('sync-sync-now-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'syncSyncNowItem.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'syncSyncNowItem.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('sync-re-auth-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    REPLACE(
+                        'browser/chrome/browser/browser.dtd',
+                        'syncReAuthItem.label',
+                        {
+                            '&syncBrand.shortName.label;': MESSAGE_REFERENCE(
+                                'sync-brand-short-name'
+                            )
+                        }
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'syncReAuthItem.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('sync-toolbar-button'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'syncToolbarButton.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('web-developer-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'webDeveloperMenu.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'webDeveloperMenu.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('page-source-broadcaster'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pageSourceCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pageSourceCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('page-source-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pageSourceCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('page-info-menuitem'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pageInfoCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pageInfoCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('page-info-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'pageInfoCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('mirror-tab-menu'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'mirrorTabCmd.label',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'mirrorTabCmd.accesskey',
+                    )
+                ),
+            ]
+        ),
+    ])
+
+    ctx.add_transforms('browser/toolbar.ftl', 'toolbar.ftl', [
+        FTL.Message(
+            id=FTL.Identifier('urlbar-textbox'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('placeholder'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'urlbar.placeholder2',
+                    )
+                ),
+                FTL.Attribute(
+                    FTL.Identifier('accesskey'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'urlbar.accesskey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('view-bookmarks-broadcaster'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bookmarksButton.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('view-bookmarks-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bookmarksCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('view-bookmarks-command-win'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'bookmarksWinCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('view-history-broadcaster'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'historyButton.label',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('view-history-command'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('key'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'historySidebarCmd.commandkey',
+                    )
+                ),
+            ]
+        ),
+        FTL.Message(
+            id=FTL.Identifier('view-tabs-broadcaster'),
+            attributes=[
+                FTL.Attribute(
+                    FTL.Identifier('label'),
+                    COPY(
+                        'browser/chrome/browser/browser.dtd',
+                        'syncedTabs.sidebar.label',
+                    )
+                ),
+            ]
+        ),
+    ])
+
+    ctx.add_transforms('browser/branding/official/brand.ftl', 'brand.ftl', [
+        FTL.Message(
+            id=FTL.Identifier('brand-shorter-name'),
+            value=COPY(
+                'browser/branding/official/brand.dtd',
+                'brandShorterName'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('brand-short-name'),
+            value=COPY(
+                'browser/branding/official/brand.dtd',
+                'brandShortName'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('brand-full-name'),
+            value=COPY(
+                'browser/branding/official/brand.dtd',
+                'brandFullName'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('vendor-short-name'),
+            value=COPY(
+                'browser/branding/official/brand.dtd',
+                'vendorShortName'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('trademark-info'),
+            value=COPY(
+                'browser/branding/official/brand.dtd',
+                'trademarkInfo.part1'
+            )
+        ),
+        FTL.Message(
+            id=FTL.Identifier('sync-brand-short-name'),
+            value=COPY(
+                'browser/branding/official/brand.properties',
+                'syncBrandShortName'
+            )
+        ),
+    ])
diff --git a/third_party/python/fluent/tools/migrate/examples/menubar.ftl b/third_party/python/fluent/tools/migrate/examples/menubar.ftl
new file mode 100644
index 000000000000..c4a2ab59e1a0
--- /dev/null
+++ b/third_party/python/fluent/tools/migrate/examples/menubar.ftl
@@ -0,0 +1,336 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+[[ File menu ]]
+
+file-menu
+    .label = File
+    .accesskey = F
+tab-menuitem
+    .label = New Tab
+    .accesskey = T
+tab-command
+    .key = t
+new-user-context-menu
+    .label = New Container Tab
+    .accesskey = C
+new-navigator-menuitem
+    .label = New Window
+    .accesskey = N
+new-navigator-command
+    .key = N
+new-private-window-menuitem
+    .label = New Private Window
+    .accesskey = W
+new-non-remote-window-menuitem
+    .label = New Non-e10s Window
+
+// Only displayed on OS X, and only on windows that aren't main browser windows,
+// or when there are no windows but Firefox is still running.
+open-location-menuitem
+    .label = Open Location…
+open-file-menuitem
+    .label = Open File…
+    .accesskey = O
+open-file-command
+    .key = o
+
+close-menuitem
+    .label = Close
+    .accesskey = C
+close-command
+    .key = W
+close-window-menuitem
+    .label = Close Window
+    .accesskey = d
+
+// .accesskey2 is for content area context menu
+save-page-menuitem
+    .label = Save Page As…
+    .accesskey = A
+    .accesskey2 = P
+save-page-command
+    .key = s
+
+email-page-menuitem
+    .label = Email Link…
+    .accesskey = E
+
+print-setup-menuitem
+    .label = Page Setup…
+    .accesskey = u
+print-preview-menuitem
+    .label = Print Preview…
+    .accesskey = v
+print-menuitem
+    .label = Print…
+    .accesskey = P
+print-command
+    .key = p
+
+go-offline-menuitem
+    .label = Work Offline
+    .accesskey = k
+
+quit-application-menuitem
+    .label = Quit
+    .accesskey = Q
+quit-application-menuitem-win
+    .label = Exit
+    .accesskey = x
+quit-application-menuitem-mac
+    .label = Quit { brand-shorter-name }
+// Used by both Linux and OSX builds
+quit-application-command-unix
+    .key = Q
+
+[[ Edit menu ]]
+
+edit-menu
+    .label = Edit
+    .accesskey = E
+undo-menuitem
+    .label = Undo
+    .accesskey = U
+undo-command
+    .key = Z
+redo-menuitem
+    .label = Redo
+    .accesskey = R
+redo-command
+    .key = Y
+cut-menuitem
+    .label = Cut
+    .accesskey = t
+cut-command
+    .key = X
+copy-menuitem
+    .label = Copy
+    .accesskey = C
+copy-command
+    .key = C
+paste-menuitem
+    .label = Paste
+    .accesskey = P
+paste-command
+    .key = V
+delete-menuitem
+    .label = Delete
+    .accesskey = D
+select-all-menuitem
+    .label = Select All
+    .accesskey = A
+select-all-command
+    .key = A
+
+find-on-menuitem
+    .label = Find in This Page…
+    .accesskey = F
+find-on-command
+    .key = f
+find-again-menuitem
+    .label = Find Again
+    .accesskey = g
+find-again-command1
+    .key = g
+find-again-command2
+    .keycode = VK_F3
+find-selection-command
+    .key = e
+
+bidi-switch-text-direction-menuitem
+    .label = Switch Text Direction
+    .accesskey = w
+bidi-switch-text-direction-command
+    .key = X
+
+preferences-menuitem
+    .label = Options
+    .accesskey = O
+preferences-menuitem-unix
+    .label = Preferences
+    .accesskey = n
+
+
+[[ View menu ]]
+
+view-menu
+    .label = View
+    .accesskey = V
+view-toolbars-menu
+    .label = Toolbars
+    .accesskey = T
+view-sidebar-menu
+    .label = Sidebar
+    .accesskey = e
+view-customize-toolbar-menuitem
+    .label = Customize…
+    .accesskey = C
+
+full-zoom-menu
+    .label = Zoom
+    .accesskey = Z
+full-zoom-enlarge-menuitem
+    .label = Zoom In
+    .accesskey = I
+full-zoom-enlarge-command1
+    .key = +
+full-zoom-enlarge-command2
+    .key =
+full-zoom-enlarge-command3
+    .key = ""
+full-zoom-reduce-menuitem
+    .label = Zoom Out
+    .accesskey = O
+full-zoom-reduce-command1
+    .key = -
+full-zoom-reduce-command2
+    .key = ""
+full-zoom-reset-menuitem
+    .label = Reset
+    .accesskey = R
+full-zoom-reset-command1
+    .key = 0
+full-zoom-reset-command2
+    .key = ""
+full-zoom-toggle-menuitem
+    .label = Zoom Text Only
+    .accesskey = T
+
+page-style-menu
+    .label = Page Style
+    .accesskey = y
+page-style-no-style-menuitem
+    .label = No Style
+    .accesskey = n
+page-style-persistent-only-menuitem
+    .label = Basic Page Style
+    .accesskey = b
+
+show-all-tabs-menuitem
+    .label = Show All Tabs
+    .accesskey = A
+bidi-switch-page-direction-menuitem
+    .label = Switch Page Direction
+    .accesskey = D
+
+// Match what Safari and other Apple applications use on OS X Lion.
+[[ Full Screen controls ]]
+
+enter-full-screen-menuitem
+    .label = Enter Full Screen
+    .accesskey = F
+exit-full-screen-menuitem
+    .label = Exit Full Screen
+    .accesskey = F
+full-screen-menuitem
+    .label = Full Screen
+    .accesskey = F
+full-screen-command
+    .key = f
+
+
+[[ History menu ]]
+
+history-menu
+    .label = History
+    .accesskey = s
+show-all-history-menuitem
+    .label = Show All History
+show-all-history-command
+    .key = H
+clear-recent-history-menuitem
+    .label = Clean Recent History…
+history-synced-tabs-menuitem
+    .label = Synced Tabs
+history-restore-last-session-menuitem
+    .label = Restore Previous Session
+history-undo-menu
+    .label = Recently Closed Tabs
+history-undo-window-menu
+    .label = Recently Closed Windows
+
+
+[[ Bookmarks menu ]]
+
+bookmarks-menu
+    .label = Bookmarks
+    .accesskey = B
+show-all-bookmarks-menuitem
+    .label = Show All Bookmarks
+show-all-bookmarks-command
+    .key = b
+// .key should not contain the letters A-F since the are reserved shortcut
+// keys on Linux.
+show-all-bookmarks-command-gtk
+    .key = o
+bookmark-this-page-broadcaster
+    .label = Bookmark This Page
+edit-this-page-broadcaster
+    .label = Edit This Page
+bookmark-this-page-command
+    .key = d
+subscribe-to-page-menuitem
+    .label = Subscribe to This Page…
+subscribe-to-page-menupopup
+    .label = Subscribe to This Page…
+add-cur-pages-menuitem
+    .label = Bookmark All Tabs…
+recent-bookmarks-menuitem
+    .label = Recently Bookmarked
+
+other-bookmarks-menu
+    .label = Other Bookmarks
+personalbar-menu
+    .label = Bookmarks Toolbar
+    .accesskey = B
+
+
+[[ Tools menu ]]
+
+tools-menu
+    .label = Tools
+    .accesskey = T
+downloads-menuitem
+    .label = Downloads
+    .accesskey = D
+downloads-command
+    .key = j
+downloads-command-unix
+    .key = y
+addons-menuitem
+    .label = Add-ons
+    .accesskey = A
+addons-command
+    .key = A
+
+sync-sign-in-menuitem
+    .label = Sign In To { sync-brand-short-name }…
+    .accesskey = Y
+sync-sync-now-menuitem
+    .label = Sync Now
+    .accesskey = S
+sync-re-auth-menuitem
+    .label = Reconnect to { sync-brand-short-name }…
+    .accesskey = R
+sync-toolbar-button
+    .label = Sync
+
+web-developer-menu
+    .label = Web Developer
+    .accesskey = W
+
+page-source-broadcaster
+    .label = Page Source
+    .accesskey = o
+page-source-command
+    .key = u
+page-info-menuitem
+    .label = Page Info
+    .accesskey = I
+page-info-command
+    .key = i
+mirror-tab-menu
+    .label = Mirror Tab
+    .accesskey = m
diff --git a/third_party/python/fluent/tools/migrate/examples/toolbar.ftl b/third_party/python/fluent/tools/migrate/examples/toolbar.ftl
new file mode 100644
index 000000000000..1d056553d19f
--- /dev/null
+++ b/third_party/python/fluent/tools/migrate/examples/toolbar.ftl
@@ -0,0 +1,24 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+urlbar-textbox
+    .placeholder = Search or enter address
+    .accesskey = d
+
+
+[[ Toolbar items ]]
+
+view-bookmarks-broadcaster
+    .label = Bookmarks
+view-bookmarks-command
+    .key = b
+view-bookmarks-command-win
+    .key = i
+
+view-history-broadcaster
+    .label = History
+view-history-command
+    .key = h
+view-tabs-broadcaster
+    .label = Synced Tabs
diff --git a/third_party/python/fluent/tools/migrate/migrate-l10n.py b/third_party/python/fluent/tools/migrate/migrate-l10n.py
new file mode 100755
index 000000000000..d8cf5cb1ebee
--- /dev/null
+++ b/third_party/python/fluent/tools/migrate/migrate-l10n.py
@@ -0,0 +1,124 @@
+#!/usr/bin/env python
+# coding=utf8
+
+import os
+import sys
+import json
+import logging
+import argparse
+import importlib
+
+import hglib
+from hglib.util import b
+
+from fluent.migrate import (
+    MergeContext, MigrationError, convert_blame_to_changesets
+)
+from blame import Blame
+
+
+def main(lang, reference_dir, localization_dir, blame, migrations, dry_run):
+    """Run migrations and commit files with the result."""
+    changesets = convert_blame_to_changesets(blame)
+    client = hglib.open(localization_dir)
+
+    for migration in migrations:
+
+        print('Running migration {}'.format(migration.__name__))
+
+        # For each migration create a new context.
+        ctx = MergeContext(lang, reference_dir, localization_dir)
+
+        try:
+            # Add the migration spec.
+            migration.migrate(ctx)
+        except MigrationError as err:
+            sys.exit(err.message)
+
+        # Keep track of how many changesets we're committing.
+        index = 0
+
+        for changeset in changesets:
+            # Run the migration for the changeset.
+            snapshot = ctx.serialize_changeset(changeset['changes'])
+
+            # Did it change any files?
+            if not snapshot:
+                continue
+
+            # Write serialized FTL files to disk.
+            for path, content in snapshot.iteritems():
+                fullpath = os.path.join(localization_dir, path)
+                print('  Writing to {}'.format(fullpath))
+                if not dry_run:
+                    fulldir = os.path.dirname(fullpath)
+                    if not os.path.isdir(fulldir):
+                        os.makedirs(fulldir)
+                    with open(fullpath, 'w') as f:
+                        f.write(content.encode('utf8'))
+                        f.close()
+
+            index += 1
+            author = changeset['author'].encode('utf8')
+            message = migration.migrate.__doc__.format(
+                index=index,
+                author=author
+            )
+
+            print('    Committing changeset: {}'.format(message))
+            if not dry_run:
+                client.commit(
+                    b(message), user=b(author), addremove=True
+                )
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        description='Migrate translations to FTL.'
+    )
+    parser.add_argument(
+        'migrations', metavar='MIGRATION', type=str, nargs='+',
+        help='migrations to run (Python modules)'
+    )
+    parser.add_argument(
+        '--lang', type=str,
+        help='target language code'
+    )
+    parser.add_argument(
+        '--reference-dir', type=str,
+        help='directory with reference FTL files'
+    )
+    parser.add_argument(
+        '--localization-dir', type=str,
+        help='directory for localization files'
+    )
+    parser.add_argument(
+        '--blame', type=argparse.FileType(), default=None,
+        help='path to a JSON with blame information'
+    )
+    parser.add_argument(
+        '--dry-run', action='store_true',
+        help='do not write to disk nor commit any changes'
+    )
+    parser.set_defaults(dry_run=False)
+
+    logger = logging.getLogger('migrate')
+    logger.setLevel(logging.INFO)
+
+    args = parser.parse_args()
+
+    if args.blame:
+        # Load pre-computed blame from a JSON file.
+        blame = json.load(args.blame)
+    else:
+        # Compute blame right now.
+        print('Annotating {}'.format(args.localization_dir))
+        blame = Blame(args.localization_dir).main()
+
+    main(
+        lang=args.lang,
+        reference_dir=args.reference_dir,
+        localization_dir=args.localization_dir,
+        blame=blame,
+        migrations=map(importlib.import_module, args.migrations),
+        dry_run=args.dry_run
+    )
diff --git a/third_party/python/fluent/tools/parse.py b/third_party/python/fluent/tools/parse.py
new file mode 100755
index 000000000000..8e026c2b6f2c
--- /dev/null
+++ b/third_party/python/fluent/tools/parse.py
@@ -0,0 +1,25 @@
+#!/usr/bin/python
+
+import sys
+
+sys.path.append('./')
+import codecs
+from fluent.syntax import parse
+import json
+
+
+def read_file(path):
+    with codecs.open(path, 'r', encoding='utf-8') as file:
+        text = file.read()
+    return text
+
+
+def print_ast(fileType, data):
+    ast = parse(data)
+    print(json.dumps(ast.to_json(), indent=2, ensure_ascii=False))
+
+
+if __name__ == "__main__":
+    file_type = 'ftl'
+    f = read_file(sys.argv[1])
+    print_ast(file_type, f)
diff --git a/third_party/python/fluent/tools/serialize.py b/third_party/python/fluent/tools/serialize.py
new file mode 100755
index 000000000000..69b75575fb69
--- /dev/null
+++ b/third_party/python/fluent/tools/serialize.py
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+
+import sys
+import json
+
+sys.path.append('./')
+import codecs
+from fluent.syntax import ast, serialize
+
+
+def read_json(path):
+    with codecs.open(path, 'r', encoding='utf-8') as file:
+        return json.load(file)
+
+
+def pretty_print(fileType, data):
+    resource = ast.from_json(data)
+    print(serialize(resource))
+
+if __name__ == "__main__":
+    file_type = 'ftl'
+    f = read_json(sys.argv[1])
+    pretty_print(file_type, f)

From 476410d40e7cc80b0b245efd45e94d7f36a68d4f Mon Sep 17 00:00:00 2001
From: Michael Kaply <mozilla@kaply.com>
Date: Thu, 30 Nov 2017 16:35:34 -0600
Subject: [PATCH 011/219] Bug 1417502 - Update Yandex search params per Yandex.
 r=flod

MozReview-Commit-ID: ERkD09pt0cn

--HG--
extra : rebase_source : ea7abe1f7c1e04fef162e1092cbb92058de6a83f
---
 browser/locales/searchplugins/yandex-az.xml | 2 +-
 browser/locales/searchplugins/yandex-by.xml | 2 +-
 browser/locales/searchplugins/yandex-kk.xml | 2 +-
 browser/locales/searchplugins/yandex-ru.xml | 2 +-
 browser/locales/searchplugins/yandex-tr.xml | 2 +-
 browser/locales/searchplugins/yandex-uk.xml | 2 +-
 mobile/locales/searchplugins/yandex-ru.xml  | 4 ++--
 mobile/locales/searchplugins/yandex-tr.xml  | 4 ++--
 mobile/locales/searchplugins/yandex.by.xml  | 4 ++--
 mobile/locales/searchplugins/yandex.xml     | 4 ++--
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/browser/locales/searchplugins/yandex-az.xml b/browser/locales/searchplugins/yandex-az.xml
index 8b7d4d301f9a..dd752acbc355 100644
--- a/browser/locales/searchplugins/yandex-az.xml
+++ b/browser/locales/searchplugins/yandex-az.xml
@@ -10,7 +10,7 @@
 <Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.ru/suggest-ff.cgi">
   <Param name="part" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="https://yandex.ru/yandsearch" resultdomain="yandex.ru">
+<Url type="text/html" method="GET" template="https://yandex.ru/search" resultdomain="yandex.ru">
   <MozParam name="clid" condition="purpose" purpose="searchbar"   value="2186618"/>
   <MozParam name="clid" condition="purpose" purpose="keyword"     value="2186621"/>
   <MozParam name="clid" condition="purpose" purpose="contextmenu" value="2186623"/>
diff --git a/browser/locales/searchplugins/yandex-by.xml b/browser/locales/searchplugins/yandex-by.xml
index ce9c9bfa5786..87ae7f0ad70b 100644
--- a/browser/locales/searchplugins/yandex-by.xml
+++ b/browser/locales/searchplugins/yandex-by.xml
@@ -10,7 +10,7 @@
 <Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.by/suggest-ff.cgi">
   <Param name="part" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="https://yandex.by/yandsearch" resultdomain="yandex.by">
+<Url type="text/html" method="GET" template="https://yandex.by/search" resultdomain="yandex.by">
   <MozParam name="clid" condition="purpose" purpose="searchbar"   value="2186618"/>
   <MozParam name="clid" condition="purpose" purpose="keyword"     value="2186621"/>
   <MozParam name="clid" condition="purpose" purpose="contextmenu" value="2186623"/>
diff --git a/browser/locales/searchplugins/yandex-kk.xml b/browser/locales/searchplugins/yandex-kk.xml
index 78ce3f3d7332..6f1045ddbdee 100644
--- a/browser/locales/searchplugins/yandex-kk.xml
+++ b/browser/locales/searchplugins/yandex-kk.xml
@@ -10,7 +10,7 @@
 <Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.kz/suggest-ff.cgi">
   <Param name="part" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="https://yandex.kz/yandsearch" resultdomain="yandex.kz">
+<Url type="text/html" method="GET" template="https://yandex.kz/search" resultdomain="yandex.kz">
   <MozParam name="clid" condition="purpose" purpose="searchbar"   value="2186618"/>
   <MozParam name="clid" condition="purpose" purpose="keyword"     value="2186621"/>
   <MozParam name="clid" condition="purpose" purpose="contextmenu" value="2186623"/>
diff --git a/browser/locales/searchplugins/yandex-ru.xml b/browser/locales/searchplugins/yandex-ru.xml
index 8342ab9cfdac..b00c5b9afb22 100644
--- a/browser/locales/searchplugins/yandex-ru.xml
+++ b/browser/locales/searchplugins/yandex-ru.xml
@@ -10,7 +10,7 @@
 <Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.ru/suggest-ff.cgi">
   <Param name="part" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="https://yandex.ru/yandsearch" resultdomain="yandex.ru">
+<Url type="text/html" method="GET" template="https://yandex.ru/search" resultdomain="yandex.ru">
   <MozParam name="clid" condition="purpose" purpose="searchbar"   value="2186618"/>
   <MozParam name="clid" condition="purpose" purpose="keyword"     value="2186621"/>
   <MozParam name="clid" condition="purpose" purpose="contextmenu" value="2186623"/>
diff --git a/browser/locales/searchplugins/yandex-tr.xml b/browser/locales/searchplugins/yandex-tr.xml
index 8afca0b58935..2a3bc69a8bd4 100644
--- a/browser/locales/searchplugins/yandex-tr.xml
+++ b/browser/locales/searchplugins/yandex-tr.xml
@@ -10,7 +10,7 @@
 <Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.com.tr/suggest-ff.cgi">
   <Param name="part" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="https://yandex.com.tr/yandsearch" resultdomain="yandex.com.tr">
+<Url type="text/html" method="GET" template="https://yandex.com.tr/search" resultdomain="yandex.com.tr">
   <MozParam name="clid" condition="purpose" purpose="searchbar"   value="2186618"/>
   <MozParam name="clid" condition="purpose" purpose="keyword"     value="2186621"/>
   <MozParam name="clid" condition="purpose" purpose="contextmenu" value="2186623"/>
diff --git a/browser/locales/searchplugins/yandex-uk.xml b/browser/locales/searchplugins/yandex-uk.xml
index 18e7661c8cbb..f66cb31d0e7a 100644
--- a/browser/locales/searchplugins/yandex-uk.xml
+++ b/browser/locales/searchplugins/yandex-uk.xml
@@ -10,7 +10,7 @@
 <Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.ua/suggest-ff.cgi">
   <Param name="part" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="https://www.yandex.ua/yandsearch" resultdomain="yandex.ua">
+<Url type="text/html" method="GET" template="https://www.yandex.ua/search" resultdomain="yandex.ua">
   <MozParam name="clid" condition="purpose" purpose="searchbar"   value="2186618"/>
   <MozParam name="clid" condition="purpose" purpose="keyword"     value="2186621"/>
   <MozParam name="clid" condition="purpose" purpose="contextmenu" value="2186623"/>
diff --git a/mobile/locales/searchplugins/yandex-ru.xml b/mobile/locales/searchplugins/yandex-ru.xml
index 85828e2b1d09..68d5f6bbf82d 100644
--- a/mobile/locales/searchplugins/yandex-ru.xml
+++ b/mobile/locales/searchplugins/yandex-ru.xml
@@ -9,11 +9,11 @@
 <Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.net/suggest-ff.cgi">
   <Param name="part" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="https://yandex.ru/yandsearch">
+<Url type="text/html" method="GET" template="https://yandex.ru/search">
   <Param name="clid" value="2186727"/>
   <Param name="text" value="{searchTerms}"/>
 </Url>
-<Url type="application/x-moz-tabletsearch" method="GET" template="https://yandex.ru/yandsearch">
+<Url type="application/x-moz-tabletsearch" method="GET" template="https://yandex.ru/search">
   <Param name="clid" value="2186733"/>
   <Param name="text" value="{searchTerms}"/>
 </Url>
diff --git a/mobile/locales/searchplugins/yandex-tr.xml b/mobile/locales/searchplugins/yandex-tr.xml
index 17b07f9c4cb0..5d798c746cdb 100644
--- a/mobile/locales/searchplugins/yandex-tr.xml
+++ b/mobile/locales/searchplugins/yandex-tr.xml
@@ -11,11 +11,11 @@
   <Param name="part" value="{searchTerms}"/>
   <Param name="uil" value="tr"/>
 </Url>
-<Url type="text/html" method="GET" template="https://yandex.com.tr/yandsearch">
+<Url type="text/html" method="GET" template="https://yandex.com.tr/search">
   <Param name="clid" value="2186727"/>
   <Param name="text" value="{searchTerms}"/>
 </Url>
-<Url type="application/x-moz-tabletsearch" method="GET" template="https://yandex.com.tr/yandsearch">
+<Url type="application/x-moz-tabletsearch" method="GET" template="https://yandex.com.tr/search">
   <Param name="clid" value="2186733"/>
   <Param name="text" value="{searchTerms}"/>
 </Url>
diff --git a/mobile/locales/searchplugins/yandex.by.xml b/mobile/locales/searchplugins/yandex.by.xml
index a7febdcd545c..a4c6ea7a55c7 100644
--- a/mobile/locales/searchplugins/yandex.by.xml
+++ b/mobile/locales/searchplugins/yandex.by.xml
@@ -10,11 +10,11 @@
 <Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.by/suggest-ff.cgi">
   <Param name="part" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="https://yandex.by/yandsearch">
+<Url type="text/html" method="GET" template="https://yandex.by/search">
   <Param name="clid" value="2186727"/>
   <Param name="text" value="{searchTerms}"/>
 </Url>
-<Url type="application/x-moz-tabletsearch" method="GET" template="https://yandex.by/yandsearch">
+<Url type="application/x-moz-tabletsearch" method="GET" template="https://yandex.by/search">
   <Param name="clid" value="2186733"/>
   <Param name="text" value="{searchTerms}"/>
 </Url>
diff --git a/mobile/locales/searchplugins/yandex.xml b/mobile/locales/searchplugins/yandex.xml
index 4daae4695836..801ff5cbefc1 100644
--- a/mobile/locales/searchplugins/yandex.xml
+++ b/mobile/locales/searchplugins/yandex.xml
@@ -9,11 +9,11 @@
 <Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.net/suggest-ff.cgi">
   <Param name="part" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="https://yandex.kz/yandsearch">
+<Url type="text/html" method="GET" template="https://yandex.kz/search">
   <Param name="clid" value="2186727"/>
   <Param name="text" value="{searchTerms}"/>
 </Url>
-<Url type="application/x-moz-tabletsearch" method="GET" template="https://yandex.kz/yandsearch">
+<Url type="application/x-moz-tabletsearch" method="GET" template="https://yandex.kz/search">
   <Param name="clid" value="2186733"/>
   <Param name="text" value="{searchTerms}"/>
 </Url>

From f6da4e9275b5339d68079155fa93fd69b3f885bc Mon Sep 17 00:00:00 2001
From: Kilik Kuo <kikuo@mozilla.com>
Date: Thu, 30 Nov 2017 17:46:06 +0800
Subject: [PATCH 012/219] Bug 1365505 - [P1][Fennec] Enable HLS support by
 default for all brandings. r=jolin

MozReview-Commit-ID: AVGfgKR0zRX

--HG--
extra : rebase_source : b1d54aea01ccdf5a4b58e98744efc1b36fb0e941
---
 mobile/android/app/mobile.js | 2 --
 mobile/android/moz.configure | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index b0761877656f..7acf43fc1a4a 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -609,9 +609,7 @@ pref("media.mediadrm-widevinecdm.visible", true);
 pref("media.eme.enabled", true);
 #endif
 
-#ifdef NIGHTLY_BUILD
 pref("media.hls.enabled", true);
-#endif
 
 // Whether to suspend decoding of videos in background tabs.
 pref("media.suspend-bkgnd-video.enabled", true);
diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
index dc89b4c50ccb..e31882deedcf 100644
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -80,7 +80,7 @@ project_flag('MOZ_SWITCHBOARD',
 
 project_flag('MOZ_ANDROID_HLS_SUPPORT',
              help='Enable HLS (HTTP Live Streaming) support (currently using the ExoPlayer library)',
-             default=milestone.is_nightly)
+             default=True)
 
 option(env='MOZ_ANDROID_ACTIVITY_STREAM',
        help='Enable Activity Stream on Android (replacing the default HomePager)',

From b5261ea9427072457e5eab6297cbff8fe49c76b7 Mon Sep 17 00:00:00 2001
From: Kilik Kuo <kikuo@mozilla.com>
Date: Thu, 30 Nov 2017 17:53:00 +0800
Subject: [PATCH 013/219] Bug 1365505 - [P2][Fennec] Only include exoplayer &
 HLSDecoder related components when building --with-gradle. r=maliu

MozReview-Commit-ID: 7Y0bZynN66i

--HG--
extra : rebase_source : 6730f4e09c559074387b3fcf9dd2fb038628d448
---
 dom/html/moz.build                    | 2 +-
 dom/media/moz.build                   | 4 ++--
 mobile/android/base/Makefile.in       | 4 ----
 mobile/android/base/moz.build         | 4 ++--
 mobile/android/geckoview/build.gradle | 3 ++-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/dom/html/moz.build b/dom/html/moz.build
index 4ea37e8389f1..e015bf48667b 100644
--- a/dom/html/moz.build
+++ b/dom/html/moz.build
@@ -248,7 +248,7 @@ LOCAL_INCLUDES += [
 
 FINAL_LIBRARY = 'xul'
 
-if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
+if CONFIG['MOZ_ANDROID_HLS_SUPPORT'] and CONFIG['MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE']:
     DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True
 
 if CONFIG['GNU_CXX']:
diff --git a/dom/media/moz.build b/dom/media/moz.build
index bb6598481fa0..a34b66ed30b7 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -55,7 +55,7 @@ DIRS += [
     'webvtt',
 ]
 
-if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
+if CONFIG['MOZ_ANDROID_HLS_SUPPORT'] and CONFIG['MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE']:
     DIRS += ['hls']
 
 if CONFIG['MOZ_FMP4']:
@@ -324,7 +324,7 @@ if CONFIG['MOZ_WEBRTC']:
 
 DEFINES['MOZILLA_INTERNAL_API'] = True
 
-if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
+if CONFIG['MOZ_ANDROID_HLS_SUPPORT'] and CONFIG['MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE']:
     DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 295e09349349..39832508182a 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -153,10 +153,6 @@ GECKOVIEW_JARS = \
   sync-thirdparty.jar \
   $(NULL)
 
-ifdef MOZ_ANDROID_HLS_SUPPORT
-GECKOVIEW_JARS += exoplayer2.jar
-endif
-
 ifdef MOZ_WEBRTC
 GECKOVIEW_JARS += webrtc.jar
 endif
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 91528cf873d9..2e94fce755d2 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -462,7 +462,7 @@ gvjar.sources += [geckoview_source_dir + 'java/org/mozilla/gecko/' + x
     'WakeLockDelegate.java',
 ]]
 
-if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
+if CONFIG['MOZ_ANDROID_HLS_SUPPORT'] and CONFIG['MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE']:
     gvjar.sources += [geckoview_source_dir + 'java/org/mozilla/gecko/' + x for x in [
         'media/GeckoHlsAudioRenderer.java',
         'media/GeckoHlsPlayer.java',
@@ -1430,7 +1430,7 @@ gvjar.sources += ['generated/org/mozilla/gecko/' + x for x in [
     'process/IProcessManager.java',
 ]]
 
-if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
+if CONFIG['MOZ_ANDROID_HLS_SUPPORT'] and CONFIG['MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE']:
     gvjar.extra_jars += [
         'exoplayer2.jar',
     ]
diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle
index 0333ece02a46..6825d0a725fe 100644
--- a/mobile/android/geckoview/build.gradle
+++ b/mobile/android/geckoview/build.gradle
@@ -130,7 +130,8 @@ android {
             java {
                 srcDir "${topsrcdir}/mobile/android/geckoview/src/thirdparty/java"
 
-                if (!mozconfig.substs.MOZ_ANDROID_HLS_SUPPORT) {
+                if (!mozconfig.substs.MOZ_ANDROID_HLS_SUPPORT ||
+                    !mozconfig.substs.get('MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE')) {
                     exclude 'com/google/android/exoplayer2/**'
                     exclude 'org/mozilla/gecko/media/GeckoHlsAudioRenderer.java'
                     exclude 'org/mozilla/gecko/media/GeckoHlsPlayer.java'

From 545f2e85ea25cfcb8890e6860d4262fc50ee0408 Mon Sep 17 00:00:00 2001
From: Michael Kaply <mozilla@kaply.com>
Date: Thu, 30 Nov 2017 16:21:21 -0600
Subject: [PATCH 014/219] Bug 1416063 - Switch duckduckgo to ddg for mobile.
 r=flod

MozReview-Commit-ID: DID75cJDNeI

--HG--
extra : rebase_source : 8f4c42123dd8f1d55b56813b73fb0ea3439c2a9c
---
 mobile/locales/search/list.json      | 73 +++++++++++++++-------------
 mobile/locales/searchplugins/ddg.xml | 23 +++++++++
 2 files changed, 62 insertions(+), 34 deletions(-)
 create mode 100644 mobile/locales/searchplugins/ddg.xml

diff --git a/mobile/locales/search/list.json b/mobile/locales/search/list.json
index 01e94559428e..80db7e49f3fa 100644
--- a/mobile/locales/search/list.json
+++ b/mobile/locales/search/list.json
@@ -1,7 +1,7 @@
 {
   "default": {
     "visibleDefaultEngines": [
-      "google", "yahoo", "bing", "amazondotcom", "duckduckgo", "twitter", "wikipedia"
+      "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
     ]
   },
   "regionOverrides": {
@@ -75,14 +75,14 @@
     "az": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "bing", "amazondotcom", "azerdict", "duckduckgo", "wikipedia-az"
+          "google", "bing", "amazondotcom", "azerdict", "ddg", "wikipedia-az"
         ]
       }
     },
     "be": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "bing", "yahoo", "duckduckgo", "wikipedia-be", "yandex.by"
+          "google", "bing", "yahoo", "ddg", "wikipedia-be", "yandex.by"
         ]
       }
     },
@@ -96,7 +96,7 @@
     "bn-BD": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo", "bing", "duckduckgo", "wikipedia-bn"
+          "google", "yahoo", "bing", "ddg", "wikipedia-bn"
         ]
       }
     },
@@ -131,21 +131,21 @@
     "cak": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-espanol", "amazondotcom", "duckduckgo", "wikipedia-es"
+          "google", "yahoo-espanol", "amazondotcom", "ddg", "wikipedia-es"
         ]
       }
     },
     "cs": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "bing", "duckduckgo", "heureka-cz", "mapy-cz", "seznam-cz", "wikipedia-cz"
+          "google", "bing", "ddg", "heureka-cz", "mapy-cz", "seznam-cz", "wikipedia-cz"
         ]
       }
     },
     "cy": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-en-GB", "bing", "amazon-co-uk", "duckduckgo", "wikipedia-cy"
+          "google", "yahoo-en-GB", "bing", "amazon-co-uk", "ddg", "wikipedia-cy"
         ]
       }
     },
@@ -159,7 +159,7 @@
     "de": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-de", "bing", "amazon-de", "duckduckgo", "qwant", "twitter", "wikipedia-de"
+          "google", "yahoo-de", "bing", "amazon-de", "ddg", "qwant", "twitter", "wikipedia-de"
         ]
       }
     },
@@ -180,29 +180,29 @@
     "en-GB": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-en-GB",  "bing", "amazon-co-uk", "duckduckgo", "qwant", "twitter", "wikipedia"
+          "google", "yahoo-en-GB",  "bing", "amazon-co-uk", "ddg", "qwant", "twitter", "wikipedia"
         ]
       }
     },
     "en-US": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo", "bing", "amazondotcom", "duckduckgo", "twitter", "wikipedia"
+          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
         ]
       },
       "US": {
         "visibleDefaultEngines": [
-          "yahoo", "google-nocodes", "bing", "amazondotcom", "duckduckgo", "twitter", "wikipedia"
+          "yahoo", "google-nocodes", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
         ]
       },
       "CA": {
         "visibleDefaultEngines": [
-          "google-nocodes", "yahoo", "bing", "amazondotcom", "duckduckgo", "twitter", "wikipedia"
+          "google-nocodes", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
         ]
       },
       "experimental-hidden": {
         "visibleDefaultEngines": [
-          "amazon-ca", "amazon-au", "google-2018"
+          "amazon-ca", "amazon-au", "google-2018", "duckduckgo"
         ]
       }
     },
@@ -216,7 +216,7 @@
     "eo": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo", "bing", "duckduckgo", "reta-vortaro", "twitter", "wikipedia-eo"
+          "google", "yahoo", "bing", "ddg", "reta-vortaro", "twitter", "wikipedia-eo"
         ]
       }
     },
@@ -237,14 +237,14 @@
     "es-ES": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-es", "bing", "duckduckgo", "twitter", "wikipedia-es"
+          "google", "yahoo-es", "bing", "ddg", "twitter", "wikipedia-es"
         ]
       }
     },
     "es-MX": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-mx", "bing", "amazondotcom", "duckduckgo", "mercadolibre-mx", "twitter", "wikipedia-es"
+          "google", "yahoo-mx", "bing", "amazondotcom", "ddg", "mercadolibre-mx", "twitter", "wikipedia-es"
         ]
       },
       "experimental-hidden": {
@@ -291,7 +291,7 @@
     "fr": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-france", "bing", "duckduckgo", "qwant", "twitter", "wikipedia-fr"
+          "google", "yahoo-france", "bing", "ddg", "qwant", "twitter", "wikipedia-fr"
         ]
       }
     },
@@ -317,7 +317,7 @@
     "gd": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-en-GB", "bing", "duckduckgo", "faclair-beag", "wikipedia-gd"
+          "google", "yahoo-en-GB", "bing", "ddg", "faclair-beag", "wikipedia-gd"
         ]
       }
     },
@@ -359,7 +359,7 @@
     "hr": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo", "bing", "amazon-co-uk", "duckduckgo", "twitter", "wikipedia-hr"
+          "google", "yahoo", "bing", "amazon-co-uk", "ddg", "twitter", "wikipedia-hr"
         ]
       }
     },
@@ -387,7 +387,7 @@
     "ia": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo", "bing", "amazondotcom", "duckduckgo", "twitter", "wikipedia-ia"
+          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia"
         ]
       }
     },
@@ -408,7 +408,7 @@
     "it": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-it", "bing", "duckduckgo", "twitter", "wikipedia-it"
+          "google", "yahoo-it", "bing", "ddg", "twitter", "wikipedia-it"
         ]
       }
     },
@@ -422,7 +422,7 @@
     "ka": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo", "bing", "amazondotcom", "duckduckgo", "wikipedia-ka"
+          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-ka"
         ]
       }
     },
@@ -506,7 +506,7 @@
     "ml": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-in", "bing", "duckduckgo", "twitter", "wikipedia-ml"
+          "google", "yahoo-in", "bing", "ddg", "twitter", "wikipedia-ml"
         ]
       }
     },
@@ -534,7 +534,7 @@
     "nb-NO": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "duckduckgo", "gulesider-mobile-NO", "twitter", "wikipedia-NO"
+          "google", "ddg", "gulesider-mobile-NO", "twitter", "wikipedia-NO"
         ]
       }
     },
@@ -548,7 +548,7 @@
     "nl": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo", "bing", "bolcom-nl", "duckduckgo", "twitter", "wikipedia-nl"
+          "google", "yahoo", "bing", "bolcom-nl", "ddg", "twitter", "wikipedia-nl"
         ]
       },
       "experimental-hidden": {
@@ -560,7 +560,7 @@
     "nn-NO": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "duckduckgo", "gulesider-mobile-NO", "twitter", "wikipedia-NN"
+          "google", "ddg", "gulesider-mobile-NO", "twitter", "wikipedia-NN"
         ]
       }
     },
@@ -588,7 +588,7 @@
     "pl": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "bing", "duckduckgo", "twitter", "wikipedia-pl"
+          "google", "bing", "ddg", "twitter", "wikipedia-pl"
         ]
       }
     },
@@ -614,7 +614,7 @@
     "rm": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-ch", "bing", "duckduckgo", "leo_ende_de", "pledarigrond", "wikipedia-rm"
+          "google", "yahoo-ch", "bing", "ddg", "leo_ende_de", "pledarigrond", "wikipedia-rm"
         ]
       }
     },
@@ -663,7 +663,7 @@
     "sr": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo", "bing", "duckduckgo", "twitter", "wikipedia-sr"
+          "google", "yahoo", "bing", "ddg", "twitter", "wikipedia-sr"
         ]
       }
     },
@@ -677,7 +677,7 @@
     "ta": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-in", "bing", "amazon-in", "duckduckgo", "wikipedia-ta", "wiktionary-ta"
+          "google", "yahoo-in", "bing", "amazon-in", "ddg", "wikipedia-ta", "wiktionary-ta"
         ]
       }
     },
@@ -720,7 +720,7 @@
     "ur": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-in", "bing", "amazon-in", "duckduckgo", "twitter", "wikipedia-ur"
+          "google", "yahoo-in", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur"
         ]
       }
     },
@@ -734,14 +734,14 @@
     "vi": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "coccoc", "duckduckgo", "twitter", "wikipedia-vi"
+          "google", "coccoc", "ddg", "twitter", "wikipedia-vi"
         ]
       }
     },
     "wo": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-france", "bing", "duckduckgo", "wikipedia-wo"
+          "google", "yahoo-france", "bing", "ddg", "wikipedia-wo"
         ]
       }
     },
@@ -769,7 +769,12 @@
     "zh-TW": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "bing", "duckduckgo", "wikipedia-zh-TW"
+          "google", "bing", "ddg", "wikipedia-zh-TW"
+        ]
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": [
+          "duckduckgo"
         ]
       }
     }
diff --git a/mobile/locales/searchplugins/ddg.xml b/mobile/locales/searchplugins/ddg.xml
new file mode 100644
index 000000000000..2e5d1d2802c4
--- /dev/null
+++ b/mobile/locales/searchplugins/ddg.xml
@@ -0,0 +1,23 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>DuckDuckGo</ShortName>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAADAFBMVEUAAADeWDPeWTTgWTPfWDPfYDXfWTPeWDP////90QplvEa1tbX+/Pv+/f31zcLibk/66OPeWTX88u8tT47jcVL++vnto4/pknrniG3zxrn77ur439jrmoTgZ0XgYT777OfuqZbsoo7eWzfuq5nqln/9+fj65uDwtqfniW/kd1nfXTn99/b21Mr0x7vxuqvlfF/keFrgZEL89fP88/H3187zwrTsoIvmgWbhaUf0y7/tppPLhHHfXzz88Ozry8LojXPnhmvia0tLqUTZZETdXTrNZjbeWjLzqBj7xQ78ywzevrW6qaTDloroinDNf2nSdFrneyf0rRb3uhL5wg/55N/429PlxbzTt687U4tsZ4rQeGBDokS7dTjaWzTfXjHjbCzlcCvmdijriyLvnRz3txL59PXw+e7p3+P139ja79XUydTu08v0z8X0yr/gwbi8trW1tLTOubPJtrG+47DvsaDvr52ZiZ1lYITFkoPIjHzpkHjke17TclfXb1NuwFJctkVUr0XZYDvCbzjgYS/tjyD1shX6+fv2+/X//fPz8fPq6u/s9+ru4+Xh19//+t7j893g8tra0dn02tPy2dLk0M//9sz20cfDr8HHtsDJ6L22pLu5trbZvLTEuLS2srC54auXg5a/npX/7JGW0oH+53qQz3n+5XDlf2P+4Vjjc1TWa03Wak1mvUdrt0VWsUV2rkN7qUKCpUL+3D2jiDzhZC/iZy7pgCXumB7xpBr4vxD9zwv+0gr99vT65uL54Nrv2tbV6tXFvM/Sz87S7Mnsz8fexMe0q8W+tcKoosH/9MDnxr15g7vG5rqom7h2frbKtbWWjLPovrL/8bGIhLG7rLBib7CMhK+t163xvK1wc63Zs6jwt6e0mqSnk6PtsqLSrKKikKG8pZ+9pJ7opZJjapJFW5DEm4+h1o5wbI6OeI0yT4uY0Iqc1IjrnIZEUYOJzHF7wW7be2Deel9arlvXakz700R9qUOakT6mhjyohTy0ejrGbDbtkyPulB7+1hzwnxsGHbstAAAAB3RSTlMA87tkxxjIlnWKoAAAB3BJREFUaN7NmmV4EzEYx/ELvR5tqQJjXaFFtwIbY8Od4e7u7u7u7u7u7u7u7u7ubkmPcpfkpAz6PPy+FLo0/96rkcaAxI4Tk/EDMePEjoGIG4vxG7HiQgH/zY8UoH0YvxI7RjzGr8SJEZPxKzFjMH7Gd4FkJps1wBHkCLDaTMn+tUBqR7MUWiCgTdHMkfpfCRhSJUoIpEiYKJXh7wVMKbHZSY2Upr8TSB/CeedKHOzOZC0W0SWimDWTOzix920uJH30BXQJAE/2cGduBie3Mzw74Emgi55AmuRmgHAlshmknWNL5AIIc/I00RBIp+etHBTIyBMYxHtIn+6PBSyeqAy1ZGOUyWYJ88St5c8EAnnrhydl1Ekaznsi8A8EkiYBEHsE4xsRdgBJktRnAZ3e85UyMEze16mcWTJ1jlB5kgyeB9brfBTQoSDnsqA4KXG/PB9KZd02xazNwqFU0fkkkFSPnOZkeLqd8qaa3qEUT1YtGpLUB4FAZP+0Nv4/r5pyQCBxTgWFXGmRHwLVBZA5tb/mz1uhcOHC5XM0NHslEmVTUNAix6kKWJD9vfbJW7lE1xKVi3cqeiNHKK+QUUHBip7WoiKQDn2NIHJQ7pzXRwOecs4M8p5GD59OUSANcnBTIgaDygIxXDmnEFC0efVplASSI1diXzHfnbSAolykTD6gjEuuIKBD3swlfudtUyBFChk7RaDaqsMFyEcMEb+xOAeQJqNM2w/HIokUSI8yIFJsn8tAjuQylQ/V1vRyAiFkBHW0ywpoZRYVFsEIlICJgw1ASEWUZ0CaYQf3D8oo0x9gB+JM0gIp4Ufbigd3OgwgQycfawwwdh0/c/5S41zSCkFwQEpJAQPU1mLVqkhDOHjyuZMTJozCHwBlQ4NyMl3UBfusQUogFRkAeVlYt/cdGQpk6CKtkAj+KRUuIPyhs3hkCRbm2MQGQI5waQEbKopSAmHQxViaF2dh3tUDsqSVXqwY4HopTEIgNfxIZmxkVlZ+1Xi2PXS8TT7ZUtMCDvh2JkJAD3gGDwY4j4wVbx4AbmkBJxzgoAUyI11CYAxA9K9kND7sD0S4KhrvnegAkkgL5Ea2oAVSQKPiAyuzfCVqbzRe29Eeq9jPjUZjJWCWKdsw+FJQAsm0gPxGi9nCAAEfoOLdSkDM1cfGijA3ZNbuwTChkpECJjy4EPnYVgAx0wiZCTAaTBxEVLUCwj/dQKQdQxS97RicIi0Aol4Ho7GDZLguYHjW1i4dP37BUusZnkwARhgpYCWCCFGUtfMmHzuWA1IsQqNqfqsb/xe1hLmspEAAfDOAEMjKNgFKcMlq9i1VKP5vyvThP1cMzUUKWIhCgejKNgdyDBx+aPY7OLnA5h99RI3TQgqgKluMEOiFvEwzbv7q71viExSqs47x0oVvXPQTWBnayxTDF8anKV27OtH6HTI+oL1MMHsLNXvBOjUZATkfWHm7qXl5LmWajSVFGaAQRTa+X6p4+bQ3XkrVLYheiNmV8sDEVyg6lzHm8/P380zbB5+cymS6FpVlKC9P4WgLoYSioWsRXU21BtrL2/AIJQSUqyndD6jtdHF2L8DgY7RudXxY9Vq1+9bA+kEzyY5Gbwy6sYWJBF7NR2bttd4hNdbXKY3eiqI7Gt2Tgykvt2xNLhm/FvwV/f1KRUX127TZG6416Z5MryrM1B7uNmvGBewMUzKqEJVspdZhq4qEMusiOpc7sg1xgSSe5lISmkVg04Ya5LpIbmWXkfYysUPY/tuxJTdElS5Tpm6U4F5qZUevTTlyr76EnUrsbRgVMmBrU2p1fZFcpk2fhgu41ASSY6tran9gJrd3s9hQXCFS5fwoTH5/wIQQ4ohOcPWFwZtXca8corRH0y4iV1/lcYF2ivNHhirt0ZgEdLLlZbF9FB5ovatJbQ4SqOyTnQzGdKJtcr+d8HmF5gN5IILCQKey0w/VEV5GbXPki6eTBsBXYfWUf5VGo1lBhGhitMFVPatIkoxum23gbN0fjPDYqFr+/NWYj8s0CNxG4/mzCtXTFje+kUJtc4bGw7xGA550h68rV2l48pPPr02nel5ElO1ebGtBQNOjpwajNyMQACAWn068QADWNrXIRDx5CIGqwricnBBBqmd2XIC4bZYVCSyXE8hpxs7s1E4dQRbBy6igTlITeMZhp47q56bA7Y2lbqig7vEKSPvA0A6Q56bqJ79JdKK2OdIrkKcHcvWaTyvFURQZjJ38+np2Hfpr+Xer5VZQn59v6csqkDcXFsBEW/Neo1nGmz8hfnbt++l7sIlvm6MB6O5JgxFgyM5G9b0FqVfVL8I9SYLA6NwfaFNGwraJCuoczdI5jcBvcv1+2LYupfsD9RsQs1u3BBXUIUfrE70fkfuKS+0GRP0Oh8u4exqgyAmblzOYw+5won8LZbYn5ggBfZbxLuwW6q/v0bQJ7Xp79rTatAkT2+3ZtaJ7tP/6JvDXXWYYkCIM3mX+u9vYzMRtbGZHar/cJ1uCLH94n/wf3YhHE7//aMDvP3vw+w83/P3TE///eAYRO54ff/7zEz3OGZzH90bqAAAAAElFTkSuQmCC</Image>
+<Url type="application/x-suggestions+json" method="GET" template="https://ac.duckduckgo.com/ac/">
+  <Param name="q" value="{searchTerms}"/>
+  <Param name="type" value="list"/>
+</Url>
+<!-- this is effectively x-moz-phonesearch, but search service expects a text/html entry -->
+<Url type="text/html" method="GET" template="https://duckduckgo.com/">
+  <Param name="q" value="{searchTerms}" />
+  <Param name="t" value="fpas" />
+</Url>
+<Url type="application/x-moz-tabletsearch" method="GET" template="https://duckduckgo.com/">
+  <Param name="q" value="{searchTerms}" />
+  <Param name="t" value="ftas" />
+</Url>
+<SearchForm>https://duckduckgo.com</SearchForm>
+</SearchPlugin>

From 250a624c2aecd1134e75ec15aa8c4a9bb7338f43 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Tue, 28 Nov 2017 23:21:54 +0100
Subject: [PATCH 015/219] Bug 1407285 - Support spaces in MOZ_MACBUNDLE_NAME
 and in various Makefile and tools r=glandium

MozReview-Commit-ID: Eda1qiPCTJ0

--HG--
extra : rebase_source : c85c5e8bfb5a0f0dc673ea0b6fce1ac1162d9497
---
 browser/app/Makefile.in                    | 32 +++++++++++-----------
 browser/installer/Makefile.in              |  6 ++--
 browser/locales/Makefile.in                |  4 +--
 old-configure.in                           |  6 ++--
 toolkit/mozapps/installer/packager.mk      |  2 +-
 tools/update-packaging/common.sh           | 28 +++++++++----------
 tools/update-packaging/make_full_update.sh |  8 +++---
 7 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index 320cc1e71ec7..f7e49a9ae214 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -78,24 +78,24 @@ MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_A
 .PHONY: repackage
 tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME) features
 	rm -rf $(dist_dest)
-	$(MKDIR) -p $(dist_dest)/Contents/MacOS
-	$(MKDIR) -p $(dist_dest)/$(LPROJ)
-	rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents $(dist_dest) --exclude English.lproj
-	rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(dist_dest)/$(LPROJ)
-	sed -e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' -e 's/%MOZ_MACBUNDLE_ID%/$(MOZ_MACBUNDLE_ID)/' -e 's/%MAC_BUNDLE_VERSION%/$(MAC_BUNDLE_VERSION)/' -e 's|%MOZ_DEVELOPER_REPO_PATH%|$(topsrcdir)|' -e 's|%MOZ_DEVELOPER_OBJ_PATH%|$(topobjdir)|' $(srcdir)/macbuild/Contents/Info.plist.in > $(dist_dest)/Contents/Info.plist
-	sed -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(dist_dest)/$(LPROJ)/InfoPlist.strings
-	rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ $(dist_dest)/Contents/Resources
-	rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ $(dist_dest)/Contents/MacOS
-	$(RM) $(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME)
-	rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) $(dist_dest)/Contents/MacOS
-	cp -RL $(DIST)/branding/firefox.icns $(dist_dest)/Contents/Resources/firefox.icns
-	cp -RL $(DIST)/branding/document.icns $(dist_dest)/Contents/Resources/document.icns
-	$(MKDIR) -p $(dist_dest)/Contents/Library/LaunchServices
+	$(MKDIR) -p '$(dist_dest)/Contents/MacOS'
+	$(MKDIR) -p '$(dist_dest)/$(LPROJ)'
+	rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents '$(dist_dest)' --exclude English.lproj
+	rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ '$(dist_dest)/$(LPROJ)'
+	sed -e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' -e 's/%MOZ_MACBUNDLE_ID%/$(MOZ_MACBUNDLE_ID)/' -e 's/%MAC_BUNDLE_VERSION%/$(MAC_BUNDLE_VERSION)/' -e 's|%MOZ_DEVELOPER_REPO_PATH%|$(topsrcdir)|' -e 's|%MOZ_DEVELOPER_OBJ_PATH%|$(topobjdir)|' $(srcdir)/macbuild/Contents/Info.plist.in > '$(dist_dest)/Contents/Info.plist'
+	sed -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > '$(dist_dest)/$(LPROJ)/InfoPlist.strings'
+	rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ '$(dist_dest)/Contents/Resources'
+	rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS'
+	$(RM) '$(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME)'
+	rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(dist_dest)/Contents/MacOS'
+	cp -RL $(DIST)/branding/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns'
+	cp -RL $(DIST)/branding/document.icns '$(dist_dest)/Contents/Resources/document.icns'
+	$(MKDIR) -p '$(dist_dest)/Contents/Library/LaunchServices'
 ifdef MOZ_UPDATER
-	mv -f $(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater $(dist_dest)/Contents/Library/LaunchServices
-	ln -s ../../../../Library/LaunchServices/org.mozilla.updater $(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater
+	mv -f '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' '$(dist_dest)/Contents/Library/LaunchServices'
+	ln -s ../../../../Library/LaunchServices/org.mozilla.updater '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater'
 endif
-	printf APPLMOZB > $(dist_dest)/Contents/PkgInfo
+	printf APPLMOZB > '$(dist_dest)/Contents/PkgInfo'
 endif
 
 .PHONY: features
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index cf0aaab67e1f..e3bc79992f27 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -110,19 +110,19 @@ include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
 ifeq (bundle, $(MOZ_FS_LAYOUT))
 BINPATH = $(_BINPATH)
-DEFINES += -DAPPNAME=$(_APPNAME)
+DEFINES += -DAPPNAME='$(_APPNAME)'
 else
 # Every other platform just winds up in dist/bin
 BINPATH = bin
 endif
-DEFINES += -DBINPATH=$(BINPATH)
+DEFINES += -DBINPATH='$(BINPATH)'
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 RESPATH = $(_APPNAME)/Contents/Resources
 else
 RESPATH = $(BINPATH)
 endif
-DEFINES += -DRESPATH=$(RESPATH)
+DEFINES += -DRESPATH="$(RESPATH)"
 
 LPROJ_ROOT = $(firstword $(subst -, ,$(AB_CD)))
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index f2661af39675..b0371b1acb93 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -171,10 +171,10 @@ endif
 ident:
 	@printf 'fx_revision '
 	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
-	    $(STAGEDIST)/application.ini App SourceStamp
+	    '$(STAGEDIST)'/application.ini App SourceStamp
 	@printf 'buildid '
 	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
-	    $(STAGEDIST)/application.ini App BuildID
+	    '$(STAGEDIST)'/application.ini App BuildID
 
 # test target, depends on make package
 # try to repack x-test, with just toolkit/defines.inc being there
diff --git a/old-configure.in b/old-configure.in
index f99ceb3a16cd..21db2fb4e2d8 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -4537,13 +4537,13 @@ MOZ_ARG_WITH_STRING(macbundlename-prefix,
                           Prefix for MOZ_MACBUNDLE_NAME],
 [ MOZ_MACBUNDLE_NAME_PREFIX="$withval"])
 
-MOZ_MACBUNDLE_NAME=`echo $MOZ_APP_DISPLAYNAME | tr -d ' '`
+MOZ_MACBUNDLE_NAME=$MOZ_APP_DISPLAYNAME
 if test "$MOZ_MACBUNDLE_NAME_PREFIX"; then
-  MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX}${MOZ_MACBUNDLE_NAME}"
+  MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX} ${MOZ_MACBUNDLE_NAME}"
 fi
 
 if test "$MOZ_DEBUG"; then
-  MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}Debug.app
+  MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME} Debug.app"
 else
   MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}.app
 fi
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 32bbe1f66d3e..f610e6597627 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -46,7 +46,7 @@ stage-package: multilocale.json locale-manifest.in $(MOZ_PKG_MANIFEST) $(MOZ_PKG
 		$(if $(JARLOG_DIR),$(addprefix --jarlog ,$(wildcard $(JARLOG_FILE_AB_CD)))) \
 		$(if $(OPTIMIZEJARS),--optimizejars) \
 		$(addprefix --compress ,$(JAR_COMPRESSION)) \
-		$(MOZ_PKG_MANIFEST) $(DIST) $(DIST)/$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \
+		$(MOZ_PKG_MANIFEST) '$(DIST)' '$(DIST)'/$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \
 		$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DEFINES) $(ACDEFINES) $(MOZ_PKG_DUPEFLAGS) $(DIST)/$(MOZ_PKG_DIR)
 ifndef MOZ_IS_COMM_TOPDIR
diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh
index 1fbf8f0c1b97..d3f6533d0569 100755
--- a/tools/update-packaging/common.sh
+++ b/tools/update-packaging/common.sh
@@ -83,15 +83,15 @@ make_add_instruction() {
     # before performing this add instruction.
     testdir=$(echo "$f" | sed 's/\(.*distribution\/extensions\/[^\/]*\)\/.*/\1/')
     notice "     add-if \"$testdir\" \"$f\""
-    echo "add-if \"$testdir\" \"$f\"" >> $filev2
+    echo "add-if \"$testdir\" \"$f\"" >> "$filev2"
     if [ ! $filev3 = "" ]; then
-      echo "add-if \"$testdir\" \"$f\"" >> $filev3
+      echo "add-if \"$testdir\" \"$f\"" >> "$filev3"
     fi
   else
     notice "        add \"$f\"$forced"
-    echo "add \"$f\"" >> $filev2
+    echo "add \"$f\"" >> "$filev2"
     if [ ! $filev3 = "" ]; then
-      echo "add \"$f\"" >> $filev3
+      echo "add \"$f\"" >> "$filev3"
     fi
   fi
 }
@@ -138,12 +138,12 @@ make_patch_instruction() {
     # before performing this add instruction.
     testdir=$(echo "$f" | sed 's/\(.*distribution\/extensions\/[^\/]*\)\/.*/\1/')
     notice "   patch-if \"$testdir\" \"$f.patch\" \"$f\""
-    echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> $filev2
-    echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> $filev3
+    echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> "$filev2"
+    echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> "$filev3"
   else
     notice "      patch \"$f.patch\" \"$f\""
-    echo "patch \"$f.patch\" \"$f\"" >> $filev2
-    echo "patch \"$f.patch\" \"$f\"" >> $filev3
+    echo "patch \"$f.patch\" \"$f\"" >> "$filev2"
+    echo "patch \"$f.patch\" \"$f\"" >> "$filev3"
   fi
 }
 
@@ -172,18 +172,18 @@ append_remove_instructions() {
         if [ ! $(echo "$f" | grep -c '^#') = 1 ]; then
           if [ $(echo "$f" | grep -c '\/$') = 1 ]; then
             notice "      rmdir \"$f\""
-            echo "rmdir \"$f\"" >> $filev2
-            echo "rmdir \"$f\"" >> $filev3
+            echo "rmdir \"$f\"" >> "$filev2"
+            echo "rmdir \"$f\"" >> "$filev3"
           elif [ $(echo "$f" | grep -c '\/\*$') = 1 ]; then
             # Remove the *
             f=$(echo "$f" | sed -e 's:\*$::')
             notice "    rmrfdir \"$f\""
-            echo "rmrfdir \"$f\"" >> $filev2
-            echo "rmrfdir \"$f\"" >> $filev3
+            echo "rmrfdir \"$f\"" >> "$filev2"
+            echo "rmrfdir \"$f\"" >> "$filev3"
           else
             notice "     remove \"$f\""
-            echo "remove \"$f\"" >> $filev2
-            echo "remove \"$f\"" >> $filev3
+            echo "remove \"$f\"" >> "$filev2"
+            echo "remove \"$f\"" >> "$filev3"
           fi
         fi
       fi
diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh
index a25cbc1ebd9e..5ff098e01b33 100755
--- a/tools/update-packaging/make_full_update.sh
+++ b/tools/update-packaging/make_full_update.sh
@@ -67,13 +67,13 @@ list_files files
 popd
 
 # Add the type of update to the beginning of the update manifests.
-> $updatemanifestv2
-> $updatemanifestv3
+> "$updatemanifestv2"
+> "$updatemanifestv3"
 notice ""
 notice "Adding type instruction to update manifests"
 notice "       type complete"
-echo "type \"complete\"" >> $updatemanifestv2
-echo "type \"complete\"" >> $updatemanifestv3
+echo "type \"complete\"" >> "$updatemanifestv2"
+echo "type \"complete\"" >> "$updatemanifestv3"
 
 notice ""
 notice "Adding file add instructions to update manifests"

From 211750c567ee8f8a0044985653c69645e020b952 Mon Sep 17 00:00:00 2001
From: yulia <ystartsev@mozilla.com>
Date: Thu, 30 Nov 2017 11:21:00 +0100
Subject: [PATCH 016/219] Bug 1419801 - Update Debugger Frontend (11-22).
 jdescottes, jlast r=jdescottes

MozReview-Commit-ID: Kihg60TpspW

--HG--
extra : rebase_source : 64ea5bdcdc353b228ea39486fbf645a40591f9a3
---
 devtools/client/debugger/new/README.mozilla   |   2 +-
 devtools/client/debugger/new/debugger.css     |   5 +
 devtools/client/debugger/new/debugger.js      | 147 ++++++++++++---
 devtools/client/debugger/new/parser-worker.js | 178 ++++++++++++------
 .../mochitest/browser_dbg-debugger-buttons.js |   2 +-
 .../mochitest/browser_dbg-editor-select.js    |   5 +-
 .../browser_dbg-expressions-error.js          |   5 +-
 .../mochitest/browser_dbg-pretty-print.js     |   4 +-
 .../test/mochitest/browser_dbg-sourcemaps2.js |  14 +-
 .../mochitest/browser_dbg-wasm-sourcemaps.js  |   1 +
 .../debugger/new/test/mochitest/head.js       |  34 ++--
 .../client/locales/en-US/debugger.properties  |   8 +
 12 files changed, 296 insertions(+), 109 deletions(-)

diff --git a/devtools/client/debugger/new/README.mozilla b/devtools/client/debugger/new/README.mozilla
index 937e9c289496..c62f99f7c6f1 100644
--- a/devtools/client/debugger/new/README.mozilla
+++ b/devtools/client/debugger/new/README.mozilla
@@ -1,7 +1,7 @@
 This is the debugger.html project output.
 See https://github.com/devtools-html/debugger.html
 
-Taken from upstream commit: d2e91e574acbe3d5b546508d028bd278eaabd286
+Taken from upstream commit: efa4ca367dadb1bb54525f9fe305dd38c0ec6323
 
 Packages:
 - babel-plugin-transform-es2015-modules-commonjs @6.26.0
diff --git a/devtools/client/debugger/new/debugger.css b/devtools/client/debugger/new/debugger.css
index e0bc4eec9adc..f1df5b5285f5 100644
--- a/devtools/client/debugger/new/debugger.css
+++ b/devtools/client/debugger/new/debugger.css
@@ -1758,6 +1758,11 @@ html .toggle-button-end.vertical svg {
 .source-footer .blackbox-summary {
   color: var(--theme-body-color);
 }
+
+.source-footer .mapped-source {
+  color: var(--theme-body-color);
+  padding: 2.5px;
+}
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
diff --git a/devtools/client/debugger/new/debugger.js b/devtools/client/debugger/new/debugger.js
index dd3e19419fbe..a9d4b132c893 100644
--- a/devtools/client/debugger/new/debugger.js
+++ b/devtools/client/debugger/new/debugger.js
@@ -14266,7 +14266,7 @@ module.exports = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 1792 1
 /* 960 */
 /***/ (function(module, exports) {
 
-module.exports = "# This Source Code Form is subject to the terms of the Mozilla Public\n# License, v. 2.0. If a copy of the MPL was not distributed with this\n# file, You can obtain one at http://mozilla.org/MPL/2.0/.\n\n# LOCALIZATION NOTE These strings are used inside the Debugger\n# which is available from the Web Developer sub-menu -> 'Debugger'.\n# The correct localization of this file might be to keep it in\n# English, or another language commonly spoken among web developers.\n# You want to make that choice consistent across the developer tools.\n# A good criteria is the language in which you'd find the best\n# documentation on web development on the web.\n\n# LOCALIZATION NOTE (collapsePanes): This is the tooltip for the button\n# that collapses the left and right panes in the debugger UI.\ncollapsePanes=Collapse panes\n\n# LOCALIZATION NOTE (copySource): This is the text that appears in the\n# context menu to copy the selected source of file open.\ncopySource=Copy\ncopySource.accesskey=y\n\n# LOCALIZATION NOTE (copySourceUri2): This is the text that appears in the\n# context menu to copy the source URI of file open.\ncopySourceUri2=Copy source URI\ncopySourceUri2.accesskey=u\n\n# LOCALIZATION NOTE (setDirectoryRoot): This is the text that appears in the\n# context menu to set a directory as root directory\nsetDirectoryRoot.label=Set directory root\nsetDirectoryRoot.accesskey=r\n\n# LOCALIZATION NOTE (copyFunction): This is the text that appears in the\n# context menu to copy the function the user selected\ncopyFunction.label=Copy function\ncopyFunction.accesskey=F\n\n# LOCALIZATION NOTE (copyStackTrace): This is the text that appears in the\n# context menu to copy the stack trace methods, file names and row number.\ncopyStackTrace=Copy stack trace\ncopyStackTrace.accesskey=c\n\n# LOCALIZATION NOTE (expandPanes): This is the tooltip for the button\n# that expands the left and right panes in the debugger UI.\nexpandPanes=Expand panes\n\n# LOCALIZATION NOTE (pauseButtonTooltip): The tooltip that is displayed for the pause\n# button when the debugger is in a running state.\npauseButtonTooltip=Pause %S\n\n# LOCALIZATION NOTE (pausePendingButtonTooltip): The tooltip that is displayed for\n# the pause button after it's been clicked but before the next JavaScript to run.\npausePendingButtonTooltip=Waiting for next execution\n\n# LOCALIZATION NOTE (resumeButtonTooltip): The label that is displayed on the pause\n# button when the debugger is in a paused state.\nresumeButtonTooltip=Resume %S\n\n# LOCALIZATION NOTE (stepOverTooltip): The label that is displayed on the\n# button that steps over a function call.\nstepOverTooltip=Step over %S\n\n# LOCALIZATION NOTE (stepInTooltip): The label that is displayed on the\n# button that steps into a function call.\nstepInTooltip=Step in %S\n\n# LOCALIZATION NOTE (stepOutTooltip): The label that is displayed on the\n# button that steps out of a function call.\nstepOutTooltip=Step out %S\n\n# LOCALIZATION NOTE (workersHeader): The text to display in the events\n# header.\nworkersHeader=Workers\n\n# LOCALIZATION NOTE (noWorkersText): The text to display in the workers list\n# when there are no workers.\nnoWorkersText=This page has no workers.\n\n# LOCALIZATION NOTE (noSourcesText): The text to display in the sources list\n# when there are no sources.\nnoSourcesText=This page has no sources.\n\n# LOCALIZATION NOTE (noEventListenersText): The text to display in the events tab\n# when there are no events.\nnoEventListenersText=No event listeners to display.\n\n# LOCALIZATION NOTE (eventListenersHeader): The text to display in the events\n# header.\neventListenersHeader=Event listeners\n\n# LOCALIZATION NOTE (noStackFramesText): The text to display in the call stack tab\n# when there are no stack frames.\nnoStackFramesText=No stack frames to display\n\n# LOCALIZATION NOTE (eventCheckboxTooltip): The tooltip text to display when\n# the user hovers over the checkbox used to toggle an event breakpoint.\neventCheckboxTooltip=Toggle breaking on this event\n\n# LOCALIZATION NOTE (eventOnSelector): The text to display in the events tab\n# for every event item, between the event type and event selector.\neventOnSelector=on\n\n# LOCALIZATION NOTE (eventInSource): The text to display in the events tab\n# for every event item, between the event selector and listener's owner source.\neventInSource=in\n\n# LOCALIZATION NOTE (eventNodes): The text to display in the events tab when\n# an event is listened on more than one target node.\neventNodes=%S nodes\n\n# LOCALIZATION NOTE (eventNative): The text to display in the events tab when\n# a listener is added from plugins, thus getting translated to native code.\neventNative=[native code]\n\n# LOCALIZATION NOTE (*Events): The text to display in the events tab for\n# each group of sub-level event entries.\nanimationEvents=Animation\naudioEvents=Audio\nbatteryEvents=Battery\nclipboardEvents=Clipboard\ncompositionEvents=Composition\ndeviceEvents=Device\ndisplayEvents=Display\ndragAndDropEvents=Drag and Drop\ngamepadEvents=Gamepad\nindexedDBEvents=IndexedDB\ninteractionEvents=Interaction\nkeyboardEvents=Keyboard\nmediaEvents=HTML5 Media\nmouseEvents=Mouse\nmutationEvents=Mutation\nnavigationEvents=Navigation\npointerLockEvents=Pointer Lock\nsensorEvents=Sensor\nstorageEvents=Storage\ntimeEvents=Time\ntouchEvents=Touch\notherEvents=Other\n\n# LOCALIZATION NOTE (blackboxCheckboxTooltip2): The tooltip text to display when\n# the user hovers over the checkbox used to toggle blackboxing its associated\n# source.\nblackboxCheckboxTooltip2=Toggle blackboxing\n\n# LOCALIZATION NOTE (sources.search.key2): Key shortcut to open the search for\n# searching all the source files the debugger has seen.\nsources.search.key2=CmdOrCtrl+P\n\n# LOCALIZATION NOTE (sources.search.alt.key): A second key shortcut to open the\n# search for searching all the source files the debugger has seen.\nsources.search.alt.key=CmdOrCtrl+O\n\n# LOCALIZATION NOTE (projectTextSearch.key): A key shortcut to open the\n# full project text search for searching all the files the debugger has seen.\nprojectTextSearch.key=CmdOrCtrl+Shift+F\n\n# LOCALIZATION NOTE (functionSearch.key): A key shortcut to open the\n# modal for searching functions in a file.\nfunctionSearch.key=CmdOrCtrl+Shift+O\n\n# LOCALIZATION NOTE (toggleBreakpoint.key): A key shortcut to toggle\n# breakpoints.\ntoggleBreakpoint.key=CmdOrCtrl+B\n\n# LOCALIZATION NOTE (toggleCondPanel.key): A key shortcut to toggle\n# the conditional breakpoint panel.\ntoggleCondPanel.key=CmdOrCtrl+Shift+B\n\n# LOCALIZATION NOTE (stepOut.key): A key shortcut to\n# step out.\nstepOut.key=Shift+F11\n\n# LOCALIZATION NOTE (shortcuts.header.editor): Sections header in\n# the shortcuts modal for keyboard shortcuts related to editing.\nshortcuts.header.editor=Editor\n\n# LOCALIZATION NOTE (shortcuts.header.stepping): Sections header in\n# the shortcuts modal for keyboard shortcuts related to stepping.\nshortcuts.header.stepping=Stepping\n\n# LOCALIZATION NOTE (shortcuts.header.search): Sections header in\n# the shortcuts modal for keyboard shortcuts related to search.\nshortcuts.header.search=Search\n\n# LOCALIZATION NOTE (projectTextSearch.placeholder): A placeholder shown\n# when searching across all of the files in a project.\nprojectTextSearch.placeholder=Find in files…\n\n# LOCALIZATION NOTE (projectTextSearch.noResults): The center pane Text Search\n# message when the query did not match any text of all files in a project.\nprojectTextSearch.noResults=No results found\n\n# LOCALIZATION NOTE (sources.noSourcesAvailable): Text shown when the debugger\n# does not have any sources.\nsources.noSourcesAvailable=This page has no sources\n\n# LOCALIZATION NOTE (sourceSearch.search.key2): Key shortcut to open the search\n# for searching within a the currently opened files in the editor\nsourceSearch.search.key2=CmdOrCtrl+F\n\n# LOCALIZATION NOTE (sourceSearch.search.placeholder): placeholder text in\n# the source search input bar\nsourceSearch.search.placeholder=Search in file…\n\n# LOCALIZATION NOTE (sourceSearch.search.again.key2): Key shortcut to highlight\n# the next occurrence of the last search triggered from a source search\nsourceSearch.search.again.key2=CmdOrCtrl+G\n\n# LOCALIZATION NOTE (sourceSearch.search.againPrev.key2): Key shortcut to highlight\n# the previous occurrence of the last search triggered from a source search\nsourceSearch.search.againPrev.key2=CmdOrCtrl+Shift+G\n\n# LOCALIZATION NOTE (sourceSearch.resultsSummary1): Shows a summary of\n# the number of matches for autocomplete\nsourceSearch.resultsSummary1=%d results\n\n# LOCALIZATION NOTE (noMatchingStringsText): The text to display in the\n# global search results when there are no matching strings after filtering.\nnoMatchingStringsText=No matches found\n\n# LOCALIZATION NOTE (emptySearchText): This is the text that appears in the\n# filter text box when it is empty and the scripts container is selected.\nemptySearchText=Search scripts (%S)\n\n# LOCALIZATION NOTE (emptyVariablesFilterText): This is the text that\n# appears in the filter text box for the variables view container.\nemptyVariablesFilterText=Filter variables\n\n# LOCALIZATION NOTE (emptyPropertiesFilterText): This is the text that\n# appears in the filter text box for the editor's variables view bubble.\nemptyPropertiesFilterText=Filter properties\n\n# LOCALIZATION NOTE (searchPanelFilter): This is the text that appears in the\n# filter panel popup for the filter scripts operation.\nsearchPanelFilter=Filter scripts (%S)\n\n# LOCALIZATION NOTE (searchPanelGlobal): This is the text that appears in the\n# filter panel popup for the global search operation.\nsearchPanelGlobal=Search in all files (%S)\n\n# LOCALIZATION NOTE (searchPanelFunction): This is the text that appears in the\n# filter panel popup for the function search operation.\nsearchPanelFunction=Search for function definition (%S)\n\n# LOCALIZATION NOTE (searchPanelToken): This is the text that appears in the\n# filter panel popup for the token search operation.\nsearchPanelToken=Find in this file (%S)\n\n# LOCALIZATION NOTE (searchPanelGoToLine): This is the text that appears in the\n# filter panel popup for the line search operation.\nsearchPanelGoToLine=Go to line (%S)\n\n# LOCALIZATION NOTE (searchPanelVariable): This is the text that appears in the\n# filter panel popup for the variables search operation.\nsearchPanelVariable=Filter variables (%S)\n\n# LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that\n# are displayed in the breakpoints menu item popup.\nbreakpointMenuItem.setConditional=Configure conditional breakpoint\nbreakpointMenuItem.enableSelf2.label=Enable\nbreakpointMenuItem.enableSelf2.accesskey=E\nbreakpointMenuItem.disableSelf2.label=Disable\nbreakpointMenuItem.disableSelf2.accesskey=D\nbreakpointMenuItem.deleteSelf2.label=Remove\nbreakpointMenuItem.deleteSelf2.accesskey=R\nbreakpointMenuItem.enableOthers2.label=Enable others\nbreakpointMenuItem.enableOthers2.accesskey=o\nbreakpointMenuItem.disableOthers2.label=Disable others\nbreakpointMenuItem.disableOthers2.accesskey=s\nbreakpointMenuItem.deleteOthers2.label=Remove others\nbreakpointMenuItem.deleteOthers2.accesskey=h\nbreakpointMenuItem.enableAll2.label=Enable all\nbreakpointMenuItem.enableAll2.accesskey=b\nbreakpointMenuItem.disableAll2.label=Disable all\nbreakpointMenuItem.disableAll2.accesskey=k\nbreakpointMenuItem.deleteAll2.label=Remove all\nbreakpointMenuItem.deleteAll2.accesskey=a\nbreakpointMenuItem.removeCondition2.label=Remove condition\nbreakpointMenuItem.removeCondition2.accesskey=c\nbreakpointMenuItem.addCondition2.label=Add condition\nbreakpointMenuItem.addCondition2.accesskey=A\nbreakpointMenuItem.editCondition2.label=Edit condition\nbreakpointMenuItem.editCondition2.accesskey=n\nbreakpointMenuItem.enableSelf=Enable breakpoint\nbreakpointMenuItem.enableSelf.accesskey=E\nbreakpointMenuItem.disableSelf=Disable breakpoint\nbreakpointMenuItem.disableSelf.accesskey=D\nbreakpointMenuItem.deleteSelf=Remove breakpoint\nbreakpointMenuItem.deleteSelf.accesskey=R\nbreakpointMenuItem.enableOthers=Enable others\nbreakpointMenuItem.enableOthers.accesskey=o\nbreakpointMenuItem.disableOthers=Disable others\nbreakpointMenuItem.disableOthers.accesskey=s\nbreakpointMenuItem.deleteOthers=Remove others\nbreakpointMenuItem.deleteOthers.accesskey=h\nbreakpointMenuItem.enableAll=Enable all breakpoints\nbreakpointMenuItem.enableAll.accesskey=b\nbreakpointMenuItem.disableAll=Disable all breakpoints\nbreakpointMenuItem.disableAll.accesskey=k\nbreakpointMenuItem.deleteAll=Remove all breakpoints\nbreakpointMenuItem.deleteAll.accesskey=a\nbreakpointMenuItem.removeCondition.label=Remove breakpoint condition\nbreakpointMenuItem.removeCondition.accesskey=c\nbreakpointMenuItem.editCondition.label=Edit breakpoint condition\nbreakpointMenuItem.editCondition.accesskey=n\n\n# LOCALIZATION NOTE (breakpoints.header): Breakpoints right sidebar pane header.\nbreakpoints.header=Breakpoints\n\n# LOCALIZATION NOTE (breakpoints.none): The text that appears when there are\n# no breakpoints present\nbreakpoints.none=No breakpoints\n\n# LOCALIZATION NOTE (breakpoints.enable): The text that may appear as a tooltip\n# when hovering over the 'disable breakpoints' switch button in right sidebar\nbreakpoints.enable=Enable breakpoints\n\n# LOCALIZATION NOTE (breakpoints.disable): The text that may appear as a tooltip\n# when hovering over the 'disable breakpoints' switch button in right sidebar\nbreakpoints.disable=Disable breakpoints\n\n# LOCALIZATION NOTE (breakpoints.removeBreakpointTooltip): The tooltip that is displayed\n# for remove breakpoint button in right sidebar\nbreakpoints.removeBreakpointTooltip=Remove breakpoint\n\n# LOCALIZATION NOTE (callStack.header): Call Stack right sidebar pane header.\ncallStack.header=Call stack\n\n# LOCALIZATION NOTE (callStack.notPaused): Call Stack right sidebar pane\n# message when not paused.\ncallStack.notPaused=Not paused\n\n# LOCALIZATION NOTE (callStack.collapse): Call Stack right sidebar pane\n# message to hide some of the frames that are shown.\ncallStack.collapse=Collapse rows\n\n# LOCALIZATION NOTE (callStack.expand): Call Stack right sidebar pane\n# message to show more of the frames.\ncallStack.expand=Expand rows\n\n# LOCALIZATION NOTE (editor.searchResults): Editor Search bar message\n# for the summarizing the selected search result. e.g. 5 of 10 results.\neditor.searchResults=%d of %d results\n\n# LOCALIZATION NOTE (sourceSearch.singleResult): Copy shown when there is one result.\neditor.singleResult=1 result\n\n# LOCALIZATION NOTE (editor.noResults): Editor Search bar message\n# for when no results found.\neditor.noResults=No results\n\n# LOCALIZATION NOTE (editor.searchResults.nextResult): Editor Search bar\n# tooltip for traversing to the Next Result\neditor.searchResults.nextResult=Next result\n\n# LOCALIZATION NOTE (editor.searchResults.prevResult): Editor Search bar\n# tooltip for traversing to the Previous Result\neditor.searchResults.prevResult=Previous result\n\n# LOCALIZATION NOTE (editor.searchTypeToggleTitle): Search bar title for\n# toggling search type buttons(function search, variable search)\neditor.searchTypeToggleTitle=Search for:\n\n# LOCALIZATION NOTE (editor.continueToHere.label): Editor gutter context\n# menu item for jumping to a new paused location\neditor.continueToHere.label=Continue to here\neditor.continueToHere.accesskey=H\n\n# LOCALIZATION NOTE (editor.addBreakpoint): Editor gutter context menu item\n# for adding a breakpoint on a line.\neditor.addBreakpoint=Add breakpoint\n\n# LOCALIZATION NOTE (editor.disableBreakpoint): Editor gutter context menu item\n# for disabling a breakpoint on a line.\neditor.disableBreakpoint=Disable breakpoint\neditor.disableBreakpoint.accesskey=D\n\n# LOCALIZATION NOTE (editor.enableBreakpoint): Editor gutter context menu item\n# for enabling a breakpoint on a line.\neditor.enableBreakpoint=Enable breakpoint\n\n# LOCALIZATION NOTE (editor.removeBreakpoint): Editor gutter context menu item\n# for removing a breakpoint on a line.\neditor.removeBreakpoint=Remove breakpoint\n\n# LOCALIZATION NOTE (editor.editBreakpoint): Editor gutter context menu item\n# for setting a breakpoint condition on a line.\neditor.editBreakpoint=Edit breakpoint\n\n# LOCALIZATION NOTE (editor.addConditionalBreakpoint): Editor gutter context\n# menu item for adding a breakpoint condition on a line.\neditor.addConditionalBreakpoint=Add conditional breakpoint\neditor.addConditionalBreakpoint.accesskey=c\n\n# LOCALIZATION NOTE (editor.conditionalPanel.placeholder): Placeholder text for\n# input element inside ConditionalPanel component\neditor.conditionalPanel.placeholder=This breakpoint will pause when the expression is true\n\n# LOCALIZATION NOTE (editor.conditionalPanel.placeholder): Tooltip text for\n# close button inside ConditionalPanel component\neditor.conditionalPanel.close=Cancel edit breakpoint and close\n\n# LOCALIZATION NOTE (editor.jumpToMappedLocation1): Context menu item\n# for navigating to a source mapped location\neditor.jumpToMappedLocation1=Jump to %S location\neditor.jumpToMappedLocation1.accesskey=m\n\n# LOCALIZATION NOTE (framework.disableGrouping): This is the text that appears in the\n# context menu to disable framework grouping.\nframework.disableGrouping=Disable framework grouping\nframework.disableGrouping.accesskey=u\n\n# LOCALIZATION NOTE (framework.enableGrouping): This is the text that appears in the\n# context menu to enable framework grouping.\nframework.enableGrouping=Enable framework grouping\nframework.enableGrouping.accesskey=u\n\n# LOCALIZATION NOTE (generated): Source Map term for a server source location\ngenerated=Generated\n\n# LOCALIZATION NOTE (original): Source Map term for a debugger UI source location\noriginal=original\n\n# LOCALIZATION NOTE (expressions.placeholder): Placeholder text for expression\n# input element\nexpressions.placeholder=Add watch expression\nexpressions.label=Add watch expression\nexpressions.accesskey=e\n\n# LOCALIZATION NOTE (sourceTabs.closeTab): Editor source tab context menu item\n# for closing the selected tab below the mouse.\nsourceTabs.closeTab=Close tab\nsourceTabs.closeTab.accesskey=c\n\n# LOCALIZATION NOTE (sourceTabs.closeOtherTabs): Editor source tab context menu item\n# for closing the other tabs.\nsourceTabs.closeOtherTabs=Close other tabs\nsourceTabs.closeOtherTabs.accesskey=o\n\n# LOCALIZATION NOTE (sourceTabs.closeTabsToEnd): Editor source tab context menu item\n# for closing the tabs to the end (the right for LTR languages) of the selected tab.\nsourceTabs.closeTabsToEnd=Close tabs to the right\nsourceTabs.closeTabsToEnd.accesskey=e\n\n# LOCALIZATION NOTE (sourceTabs.closeAllTabs): Editor source tab context menu item\n# for closing all tabs.\nsourceTabs.closeAllTabs=Close all tabs\nsourceTabs.closeAllTabs.accesskey=a\n\n# LOCALIZATION NOTE (sourceTabs.revealInTree): Editor source tab context menu item\n# for revealing source in tree.\nsourceTabs.revealInTree=Reveal in tree\nsourceTabs.revealInTree.accesskey=r\n\n# LOCALIZATION NOTE (sourceTabs.prettyPrint): Editor source tab context menu item\n# for pretty printing the source.\nsourceTabs.prettyPrint=Pretty print source\nsourceTabs.prettyPrint.accesskey=p\n\n# LOCALIZATION NOTE (sourceFooter.blackbox): Tooltip text associated\n# with the blackbox button\nsourceFooter.blackbox=Blackbox source\nsourceFooter.blackbox.accesskey=B\n\n# LOCALIZATION NOTE (sourceFooter.unblackbox): Tooltip text associated\n# with the blackbox button\nsourceFooter.unblackbox=Unblackbox source\nsourceFooter.unblackbox.accesskey=b\n\n# LOCALIZATION NOTE (sourceFooter.blackboxed): Text associated\n# with a blackboxed source\nsourceFooter.blackboxed=Blackboxed source\n\n# LOCALIZATION NOTE (sourceFooter.codeCoverage): Text associated\n# with a code coverage button\nsourceFooter.codeCoverage=Code coverage\n\n# LOCALIZATION NOTE (sourceTabs.closeTabButtonTooltip): The tooltip that is displayed\n# for close tab button in source tabs.\nsourceTabs.closeTabButtonTooltip=Close tab\n\n# LOCALIZATION NOTE (scopes.header): Scopes right sidebar pane header.\nscopes.header=Scopes\n\n# LOCALIZATION NOTE (scopes.notAvailable): Scopes right sidebar pane message\n# for when the debugger is paused, but there isn't pause data.\nscopes.notAvailable=Scopes unavailable\n\n# LOCALIZATION NOTE (scopes.notPaused): Scopes right sidebar pane message\n# for when the debugger is not paused.\nscopes.notPaused=Not paused\n\n# LOCALIZATION NOTE (scopes.block): Refers to a block of code in\n# the scopes pane when the debugger is paused.\nscopes.block=Block\n\n# LOCALIZATION NOTE (sources.header): Sources left sidebar header\nsources.header=Sources\n\n# LOCALIZATION NOTE (outline.header): Outline left sidebar header\noutline.header=Outline\n\n# LOCALIZATION NOTE (outline.noFunctions): Outline text when there are no functions to display\noutline.noFunctions=No functions\n\n# LOCALIZATION NOTE (sources.search): Sources left sidebar prompt\n# e.g. Cmd+P to search. On a mac, we use the command unicode character.\n# On windows, it's ctrl.\nsources.search=%S to search\n\n# LOCALIZATION NOTE (watchExpressions.header): Watch Expressions right sidebar\n# pane header.\nwatchExpressions.header=Watch expressions\n\n# LOCALIZATION NOTE (watchExpressions.refreshButton): Watch Expressions header\n# button for refreshing the expressions.\nwatchExpressions.refreshButton=Refresh\n\n# LOCALIZATION NOTE (welcome.search): The center pane welcome panel's\n# search prompt. e.g. cmd+p to search for files. On windows, it's ctrl, on\n# a mac we use the unicode character.\nwelcome.search=%S to search for sources\n\n# LOCALIZATION NOTE (welcome.findInFiles): The center pane welcome panel's\n# search prompt. e.g. cmd+f to search for files. On windows, it's ctrl+shift+f, on\n# a mac we use the unicode character.\nwelcome.findInFiles=%S to find in files\n\n# LOCALIZATION NOTE (welcome.searchFunction): Label displayed in the welcome\n# panel. %S is replaced by the keyboard shortcut to search for functions.\nwelcome.searchFunction=%S to search for functions in file\n\n# LOCALIZATION NOTE (sourceSearch.search): The center pane Source Search\n# prompt for searching for files.\nsourceSearch.search=Search sources…\n\n# LOCALIZATION NOTE (sourceSearch.noResults): The center pane Source Search\n# message when the query did not match any of the sources.\nsourceSearch.noResults2=No results found\n\n# LOCALIZATION NOTE (ignoreExceptions): The pause on exceptions button tooltip\n# when the debugger will not pause on exceptions.\nignoreExceptions=Ignore exceptions. Click to pause on uncaught exceptions\n\n# LOCALIZATION NOTE (pauseOnUncaughtExceptions): The pause on exceptions button\n# tooltip when the debugger will pause on uncaught exceptions.\npauseOnUncaughtExceptions=Pause on uncaught exceptions. Click to pause on all exceptions\n\n# LOCALIZATION NOTE (pauseOnExceptions): The pause on exceptions button tooltip\n# when the debugger will pause on all exceptions.\npauseOnExceptions=Pause on all exceptions. Click to ignore exceptions\n\n# LOCALIZATION NOTE (loadingText): The text that is displayed in the script\n# editor when the loading process has started but there is no file to display\n# yet.\nloadingText=Loading\\u2026\n\n# LOCALIZATION NOTE (errorLoadingText3): The text that is displayed in the debugger\n# viewer when there is an error loading a file\nerrorLoadingText3=Error loading this URI: %S\n\n# LOCALIZATION NOTE (addWatchExpressionText): The text that is displayed in the\n# watch expressions list to add a new item.\naddWatchExpressionText=Add watch expression\n\n# LOCALIZATION NOTE (addWatchExpressionButton): The button that is displayed in the\n# variables view popup.\naddWatchExpressionButton=Watch\n\n# LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the\n# variables pane when there are no variables to display.\nemptyVariablesText=No variables to display\n\n# LOCALIZATION NOTE (scopeLabel): The text that is displayed in the variables\n# pane as a header for each variable scope (e.g. \"Global scope, \"With scope\",\n# etc.).\nscopeLabel=%S scope\n\n# LOCALIZATION NOTE (watchExpressionsScopeLabel): The name of the watch\n# expressions scope. This text is displayed in the variables pane as a header for\n# the watch expressions scope.\nwatchExpressionsScopeLabel=Watch expressions\n\n# LOCALIZATION NOTE (globalScopeLabel): The name of the global scope. This text\n# is added to scopeLabel and displayed in the variables pane as a header for\n# the global scope.\nglobalScopeLabel=Global\n\n# LOCALIZATION NOTE (variablesViewErrorStacktrace): This is the text that is\n# shown before the stack trace in an error.\nvariablesViewErrorStacktrace=Stack trace:\n\n# LOCALIZATION NOTE (variablesViewMoreObjects): the text that is displayed\n# when you have an object preview that does not show all of the elements. At the end of the list\n# you see \"N more...\" in the web console output.\n# This is a semi-colon list of plural forms.\n# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals\n# #1 number of remaining items in the object\n# example: 3 more…\nvariablesViewMoreObjects=#1 more…;#1 more…\n\n# LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed\n# in the variables list on an item with an editable name.\nvariablesEditableNameTooltip=Double click to edit\n\n# LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed\n# in the variables list on an item with an editable value.\nvariablesEditableValueTooltip=Click to change value\n\n# LOCALIZATION NOTE (variablesCloseButtonTooltip): The text that is displayed\n# in the variables list on an item which can be removed.\nvariablesCloseButtonTooltip=Click to remove\n\n# LOCALIZATION NOTE (variablesEditButtonTooltip): The text that is displayed\n# in the variables list on a getter or setter which can be edited.\nvariablesEditButtonTooltip=Click to set value\n\n# LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed\n# in a tooltip on the \"open in inspector\" button in the the variables list for a\n# DOMNode item.\nvariablesDomNodeValueTooltip=Click to select the node in the inspector\n\n# LOCALIZATION NOTE (configurable|...|Tooltip): The text that is displayed\n# in the variables list on certain variables or properties as tooltips.\n# Expanations of what these represent can be found at the following links:\n# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty\n# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isExtensible\n# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isFrozen\n# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isSealed\n# It's probably best to keep these in English.\nconfigurableTooltip=configurable\nenumerableTooltip=enumerable\nwritableTooltip=writable\nfrozenTooltip=frozen\nsealedTooltip=sealed\nextensibleTooltip=extensible\noverriddenTooltip=overridden\nWebIDLTooltip=WebIDL\n\n# LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed\n# in the variables list as a separator between the name and value.\nvariablesSeparatorLabel=:\n\n# LOCALIZATION NOTE (watchExpressionsSeparatorLabel2): The text that is displayed\n# in the watch expressions list as a separator between the code and evaluation.\nwatchExpressionsSeparatorLabel2=\\u0020→\n\n# LOCALIZATION NOTE (functionSearchSeparatorLabel): The text that is displayed\n# in the functions search panel as a separator between function's inferred name\n# and its real name (if available).\nfunctionSearchSeparatorLabel=←\n\n# LOCALIZATION NOTE(gotoLineModal.placeholder): The placeholder\n# text displayed when the user searches for specific lines in a file\ngotoLineModal.placeholder=Go to line…\ngotoLineModal.key=CmdOrCtrl+Shift+;\n\n# LOCALIZATION NOTE(symbolSearch.search.functionsPlaceholder): The placeholder\n# text displayed when the user searches for functions in a file\nsymbolSearch.search.functionsPlaceholder=Search functions…\n\n# LOCALIZATION NOTE(symbolSearch.search.variablesPlaceholder): The placeholder\n# text displayed when the user searches for variables in a file\nsymbolSearch.search.variablesPlaceholder=Search variables…\n\n# LOCALIZATION NOTE(symbolSearch.search.key2): The Key Shortcut for\n# searching for a function or variable\nsymbolSearch.search.key2=CmdOrCtrl+Shift+O\n\n# LOCALIZATION NOTE(symbolSearch.searchModifier.modifiersLabel): A label\n# preceding the group of modifiers\nsymbolSearch.searchModifier.modifiersLabel=Modifiers:\n\n# LOCALIZATION NOTE(symbolSearch.searchModifier.regex): A search option\n# when searching text in a file\nsymbolSearch.searchModifier.regex=Regex\n\n# LOCALIZATION NOTE(symbolSearch.searchModifier.caseSensitive): A search option\n# when searching text in a file\nsymbolSearch.searchModifier.caseSensitive=Case sensitive\n\n# LOCALIZATION NOTE(symbolSearch.searchModifier.wholeWord): A search option\n# when searching text in a file\nsymbolSearch.searchModifier.wholeWord=Whole word\n\n# LOCALIZATION NOTE (resumptionOrderPanelTitle): This is the text that appears\n# as a description in the notification panel popup, when multiple debuggers are\n# open in separate tabs and the user tries to resume them in the wrong order.\n# The substitution parameter is the URL of the last paused window that must be\n# resumed first.\nresumptionOrderPanelTitle=There are one or more paused debuggers. Please resume the most-recently paused debugger first at: %S\n\nvariablesViewOptimizedOut=(optimized away)\nvariablesViewUninitialized=(uninitialized)\nvariablesViewMissingArgs=(unavailable)\n\nanonymousSourcesLabel=Anonymous sources\n\nexperimental=This is an experimental feature\n\n# LOCALIZATION NOTE (whyPaused.debuggerStatement): The text that is displayed\n# in a info block explaining how the debugger is currently paused due to a `debugger`\n# statement in the code\nwhyPaused.debuggerStatement=Paused on debugger statement\n\n# LOCALIZATION NOTE (whyPaused.breakpoint): The text that is displayed\n# in a info block explaining how the debugger is currently paused on a breakpoint\nwhyPaused.breakpoint=Paused on breakpoint\n\n# LOCALIZATION NOTE (whyPaused.exception): The text that is displayed\n# in a info block explaining how the debugger is currently paused on an exception\nwhyPaused.exception=Paused on exception\n\n# LOCALIZATION NOTE (whyPaused.resumeLimit): The text that is displayed\n# in a info block explaining how the debugger is currently paused while stepping\n# in or out of the stack\nwhyPaused.resumeLimit=Paused while stepping\n\n# LOCALIZATION NOTE (whyPaused.pauseOnDOMEvents): The text that is displayed\n# in a info block explaining how the debugger is currently paused on a\n# dom event\nwhyPaused.pauseOnDOMEvents=Paused on event listener\n\n# LOCALIZATION NOTE (whyPaused.breakpointConditionThrown): The text that is displayed\n# in an info block when evaluating a conditional breakpoint throws an error\nwhyPaused.breakpointConditionThrown=Error with conditional breakpoint\n\n# LOCALIZATION NOTE (whyPaused.xhr): The text that is displayed\n# in a info block explaining how the debugger is currently paused on an\n# xml http request\nwhyPaused.xhr=Paused on XMLHttpRequest\n\n# LOCALIZATION NOTE (whyPaused.promiseRejection): The text that is displayed\n# in a info block explaining how the debugger is currently paused on a\n# promise rejection\nwhyPaused.promiseRejection=Paused on promise rejection\n\n# LOCALIZATION NOTE (whyPaused.assert): The text that is displayed\n# in a info block explaining how the debugger is currently paused on an\n# assert\nwhyPaused.assert=Paused on assertion\n\n# LOCALIZATION NOTE (whyPaused.debugCommand): The text that is displayed\n# in a info block explaining how the debugger is currently paused on a\n# debugger statement\nwhyPaused.debugCommand=Paused on debugged function\n\n# LOCALIZATION NOTE (whyPaused.other): The text that is displayed\n# in a info block explaining how the debugger is currently paused on an event\n# listener breakpoint set\nwhyPaused.other=Debugger paused\n\n# LOCALIZATION NOTE (ctrl): The text that is used for documenting\n# keyboard shortcuts that use the control key\nctrl=Ctrl\n\n# LOCALIZATION NOTE (anonymous): The text that is displayed when the\n# display name is null.\nanonymous=(anonymous)\n\n# LOCALIZATION NOTE (shortcuts.toggleBreakpoint): text describing\n# keyboard shortcut action for toggling breakpoint\nshortcuts.toggleBreakpoint=Toggle Breakpoint\nshortcuts.toggleBreakpoint.accesskey=B\n\n# LOCALIZATION NOTE (shortcuts.toggleCondPanel): text describing\n# keyboard shortcut action for toggling conditional panel keyboard\nshortcuts.toggleCondPanel=Toggle Conditional Panel\n\n# LOCALIZATION NOTE (shortcuts.pauseOrResume): text describing\n# keyboard shortcut action for pause of resume\nshortcuts.pauseOrResume=Pause/Resume\n\n# LOCALIZATION NOTE (shortcuts.stepOver): text describing\n# keyboard shortcut action for stepping over\nshortcuts.stepOver=Step Over\n\n# LOCALIZATION NOTE (shortcuts.stepIn): text describing\n# keyboard shortcut action for stepping in\nshortcuts.stepIn=Step In\n\n# LOCALIZATION NOTE (shortcuts.stepOut): text describing\n# keyboard shortcut action for stepping out\nshortcuts.stepOut=Step Out\n\n# LOCALIZATION NOTE (shortcuts.fileSearch): text describing\n# keyboard shortcut action for source file search\nshortcuts.fileSearch=Source File Search\n\n# LOCALIZATION NOTE (shortcuts.searchAgain): text describing\n# keyboard shortcut action for searching again\nshortcuts.searchAgain=Search Again\n\n# LOCALIZATION NOTE (shortcuts.projectSearch): text describing\n# keyboard shortcut action for full project search\nshortcuts.projectSearch=Full Project Search\n\n# LOCALIZATION NOTE (shortcuts.functionSearch): text describing\n# keyboard shortcut action for function search\nshortcuts.functionSearch=Function Search\n\n# LOCALIZATION NOTE (shortcuts.buttonName): text describing\n# keyboard shortcut button text\nshortcuts.buttonName=Keyboard shortcuts\n"
+module.exports = "# This Source Code Form is subject to the terms of the Mozilla Public\n# License, v. 2.0. If a copy of the MPL was not distributed with this\n# file, You can obtain one at http://mozilla.org/MPL/2.0/.\n\n# LOCALIZATION NOTE These strings are used inside the Debugger\n# which is available from the Web Developer sub-menu -> 'Debugger'.\n# The correct localization of this file might be to keep it in\n# English, or another language commonly spoken among web developers.\n# You want to make that choice consistent across the developer tools.\n# A good criteria is the language in which you'd find the best\n# documentation on web development on the web.\n\n# LOCALIZATION NOTE (collapsePanes): This is the tooltip for the button\n# that collapses the left and right panes in the debugger UI.\ncollapsePanes=Collapse panes\n\n# LOCALIZATION NOTE (copySource): This is the text that appears in the\n# context menu to copy the selected source of file open.\ncopySource=Copy\ncopySource.accesskey=y\n\n# LOCALIZATION NOTE (copySourceUri2): This is the text that appears in the\n# context menu to copy the source URI of file open.\ncopySourceUri2=Copy source URI\ncopySourceUri2.accesskey=u\n\n# LOCALIZATION NOTE (setDirectoryRoot): This is the text that appears in the\n# context menu to set a directory as root directory\nsetDirectoryRoot.label=Set directory root\nsetDirectoryRoot.accesskey=r\n\n# LOCALIZATION NOTE (copyFunction): This is the text that appears in the\n# context menu to copy the function the user selected\ncopyFunction.label=Copy function\ncopyFunction.accesskey=F\n\n# LOCALIZATION NOTE (copyStackTrace): This is the text that appears in the\n# context menu to copy the stack trace methods, file names and row number.\ncopyStackTrace=Copy stack trace\ncopyStackTrace.accesskey=c\n\n# LOCALIZATION NOTE (expandPanes): This is the tooltip for the button\n# that expands the left and right panes in the debugger UI.\nexpandPanes=Expand panes\n\n# LOCALIZATION NOTE (pauseButtonTooltip): The tooltip that is displayed for the pause\n# button when the debugger is in a running state.\npauseButtonTooltip=Pause %S\n\n# LOCALIZATION NOTE (pausePendingButtonTooltip): The tooltip that is displayed for\n# the pause button after it's been clicked but before the next JavaScript to run.\npausePendingButtonTooltip=Waiting for next execution\n\n# LOCALIZATION NOTE (resumeButtonTooltip): The label that is displayed on the pause\n# button when the debugger is in a paused state.\nresumeButtonTooltip=Resume %S\n\n# LOCALIZATION NOTE (stepOverTooltip): The label that is displayed on the\n# button that steps over a function call.\nstepOverTooltip=Step over %S\n\n# LOCALIZATION NOTE (stepInTooltip): The label that is displayed on the\n# button that steps into a function call.\nstepInTooltip=Step in %S\n\n# LOCALIZATION NOTE (stepOutTooltip): The label that is displayed on the\n# button that steps out of a function call.\nstepOutTooltip=Step out %S\n\n# LOCALIZATION NOTE (workersHeader): The text to display in the events\n# header.\nworkersHeader=Workers\n\n# LOCALIZATION NOTE (noWorkersText): The text to display in the workers list\n# when there are no workers.\nnoWorkersText=This page has no workers.\n\n# LOCALIZATION NOTE (noSourcesText): The text to display in the sources list\n# when there are no sources.\nnoSourcesText=This page has no sources.\n\n# LOCALIZATION NOTE (noEventListenersText): The text to display in the events tab\n# when there are no events.\nnoEventListenersText=No event listeners to display.\n\n# LOCALIZATION NOTE (eventListenersHeader): The text to display in the events\n# header.\neventListenersHeader=Event listeners\n\n# LOCALIZATION NOTE (noStackFramesText): The text to display in the call stack tab\n# when there are no stack frames.\nnoStackFramesText=No stack frames to display\n\n# LOCALIZATION NOTE (eventCheckboxTooltip): The tooltip text to display when\n# the user hovers over the checkbox used to toggle an event breakpoint.\neventCheckboxTooltip=Toggle breaking on this event\n\n# LOCALIZATION NOTE (eventOnSelector): The text to display in the events tab\n# for every event item, between the event type and event selector.\neventOnSelector=on\n\n# LOCALIZATION NOTE (eventInSource): The text to display in the events tab\n# for every event item, between the event selector and listener's owner source.\neventInSource=in\n\n# LOCALIZATION NOTE (eventNodes): The text to display in the events tab when\n# an event is listened on more than one target node.\neventNodes=%S nodes\n\n# LOCALIZATION NOTE (eventNative): The text to display in the events tab when\n# a listener is added from plugins, thus getting translated to native code.\neventNative=[native code]\n\n# LOCALIZATION NOTE (*Events): The text to display in the events tab for\n# each group of sub-level event entries.\nanimationEvents=Animation\naudioEvents=Audio\nbatteryEvents=Battery\nclipboardEvents=Clipboard\ncompositionEvents=Composition\ndeviceEvents=Device\ndisplayEvents=Display\ndragAndDropEvents=Drag and Drop\ngamepadEvents=Gamepad\nindexedDBEvents=IndexedDB\ninteractionEvents=Interaction\nkeyboardEvents=Keyboard\nmediaEvents=HTML5 Media\nmouseEvents=Mouse\nmutationEvents=Mutation\nnavigationEvents=Navigation\npointerLockEvents=Pointer Lock\nsensorEvents=Sensor\nstorageEvents=Storage\ntimeEvents=Time\ntouchEvents=Touch\notherEvents=Other\n\n# LOCALIZATION NOTE (blackboxCheckboxTooltip2): The tooltip text to display when\n# the user hovers over the checkbox used to toggle blackboxing its associated\n# source.\nblackboxCheckboxTooltip2=Toggle blackboxing\n\n# LOCALIZATION NOTE (sources.search.key2): Key shortcut to open the search for\n# searching all the source files the debugger has seen.\nsources.search.key2=CmdOrCtrl+P\n\n# LOCALIZATION NOTE (sources.search.alt.key): A second key shortcut to open the\n# search for searching all the source files the debugger has seen.\nsources.search.alt.key=CmdOrCtrl+O\n\n# LOCALIZATION NOTE (projectTextSearch.key): A key shortcut to open the\n# full project text search for searching all the files the debugger has seen.\nprojectTextSearch.key=CmdOrCtrl+Shift+F\n\n# LOCALIZATION NOTE (functionSearch.key): A key shortcut to open the\n# modal for searching functions in a file.\nfunctionSearch.key=CmdOrCtrl+Shift+O\n\n# LOCALIZATION NOTE (toggleBreakpoint.key): A key shortcut to toggle\n# breakpoints.\ntoggleBreakpoint.key=CmdOrCtrl+B\n\n# LOCALIZATION NOTE (toggleCondPanel.key): A key shortcut to toggle\n# the conditional breakpoint panel.\ntoggleCondPanel.key=CmdOrCtrl+Shift+B\n\n# LOCALIZATION NOTE (stepOut.key): A key shortcut to\n# step out.\nstepOut.key=Shift+F11\n\n# LOCALIZATION NOTE (shortcuts.header.editor): Sections header in\n# the shortcuts modal for keyboard shortcuts related to editing.\nshortcuts.header.editor=Editor\n\n# LOCALIZATION NOTE (shortcuts.header.stepping): Sections header in\n# the shortcuts modal for keyboard shortcuts related to stepping.\nshortcuts.header.stepping=Stepping\n\n# LOCALIZATION NOTE (shortcuts.header.search): Sections header in\n# the shortcuts modal for keyboard shortcuts related to search.\nshortcuts.header.search=Search\n\n# LOCALIZATION NOTE (projectTextSearch.placeholder): A placeholder shown\n# when searching across all of the files in a project.\nprojectTextSearch.placeholder=Find in files…\n\n# LOCALIZATION NOTE (projectTextSearch.noResults): The center pane Text Search\n# message when the query did not match any text of all files in a project.\nprojectTextSearch.noResults=No results found\n\n# LOCALIZATION NOTE (sources.noSourcesAvailable): Text shown when the debugger\n# does not have any sources.\nsources.noSourcesAvailable=This page has no sources\n\n# LOCALIZATION NOTE (sourceSearch.search.key2): Key shortcut to open the search\n# for searching within a the currently opened files in the editor\nsourceSearch.search.key2=CmdOrCtrl+F\n\n# LOCALIZATION NOTE (sourceSearch.search.placeholder): placeholder text in\n# the source search input bar\nsourceSearch.search.placeholder=Search in file…\n\n# LOCALIZATION NOTE (sourceSearch.search.again.key2): Key shortcut to highlight\n# the next occurrence of the last search triggered from a source search\nsourceSearch.search.again.key2=CmdOrCtrl+G\n\n# LOCALIZATION NOTE (sourceSearch.search.againPrev.key2): Key shortcut to highlight\n# the previous occurrence of the last search triggered from a source search\nsourceSearch.search.againPrev.key2=CmdOrCtrl+Shift+G\n\n# LOCALIZATION NOTE (sourceSearch.resultsSummary1): Shows a summary of\n# the number of matches for autocomplete\nsourceSearch.resultsSummary1=%d results\n\n# LOCALIZATION NOTE (noMatchingStringsText): The text to display in the\n# global search results when there are no matching strings after filtering.\nnoMatchingStringsText=No matches found\n\n# LOCALIZATION NOTE (emptySearchText): This is the text that appears in the\n# filter text box when it is empty and the scripts container is selected.\nemptySearchText=Search scripts (%S)\n\n# LOCALIZATION NOTE (emptyVariablesFilterText): This is the text that\n# appears in the filter text box for the variables view container.\nemptyVariablesFilterText=Filter variables\n\n# LOCALIZATION NOTE (emptyPropertiesFilterText): This is the text that\n# appears in the filter text box for the editor's variables view bubble.\nemptyPropertiesFilterText=Filter properties\n\n# LOCALIZATION NOTE (searchPanelFilter): This is the text that appears in the\n# filter panel popup for the filter scripts operation.\nsearchPanelFilter=Filter scripts (%S)\n\n# LOCALIZATION NOTE (searchPanelGlobal): This is the text that appears in the\n# filter panel popup for the global search operation.\nsearchPanelGlobal=Search in all files (%S)\n\n# LOCALIZATION NOTE (searchPanelFunction): This is the text that appears in the\n# filter panel popup for the function search operation.\nsearchPanelFunction=Search for function definition (%S)\n\n# LOCALIZATION NOTE (searchPanelToken): This is the text that appears in the\n# filter panel popup for the token search operation.\nsearchPanelToken=Find in this file (%S)\n\n# LOCALIZATION NOTE (searchPanelGoToLine): This is the text that appears in the\n# filter panel popup for the line search operation.\nsearchPanelGoToLine=Go to line (%S)\n\n# LOCALIZATION NOTE (searchPanelVariable): This is the text that appears in the\n# filter panel popup for the variables search operation.\nsearchPanelVariable=Filter variables (%S)\n\n# LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that\n# are displayed in the breakpoints menu item popup.\nbreakpointMenuItem.setConditional=Configure conditional breakpoint\nbreakpointMenuItem.enableSelf2.label=Enable\nbreakpointMenuItem.enableSelf2.accesskey=E\nbreakpointMenuItem.disableSelf2.label=Disable\nbreakpointMenuItem.disableSelf2.accesskey=D\nbreakpointMenuItem.deleteSelf2.label=Remove\nbreakpointMenuItem.deleteSelf2.accesskey=R\nbreakpointMenuItem.enableOthers2.label=Enable others\nbreakpointMenuItem.enableOthers2.accesskey=o\nbreakpointMenuItem.disableOthers2.label=Disable others\nbreakpointMenuItem.disableOthers2.accesskey=s\nbreakpointMenuItem.deleteOthers2.label=Remove others\nbreakpointMenuItem.deleteOthers2.accesskey=h\nbreakpointMenuItem.enableAll2.label=Enable all\nbreakpointMenuItem.enableAll2.accesskey=b\nbreakpointMenuItem.disableAll2.label=Disable all\nbreakpointMenuItem.disableAll2.accesskey=k\nbreakpointMenuItem.deleteAll2.label=Remove all\nbreakpointMenuItem.deleteAll2.accesskey=a\nbreakpointMenuItem.removeCondition2.label=Remove condition\nbreakpointMenuItem.removeCondition2.accesskey=c\nbreakpointMenuItem.addCondition2.label=Add condition\nbreakpointMenuItem.addCondition2.accesskey=A\nbreakpointMenuItem.editCondition2.label=Edit condition\nbreakpointMenuItem.editCondition2.accesskey=n\nbreakpointMenuItem.enableSelf=Enable breakpoint\nbreakpointMenuItem.enableSelf.accesskey=E\nbreakpointMenuItem.disableSelf=Disable breakpoint\nbreakpointMenuItem.disableSelf.accesskey=D\nbreakpointMenuItem.deleteSelf=Remove breakpoint\nbreakpointMenuItem.deleteSelf.accesskey=R\nbreakpointMenuItem.enableOthers=Enable others\nbreakpointMenuItem.enableOthers.accesskey=o\nbreakpointMenuItem.disableOthers=Disable others\nbreakpointMenuItem.disableOthers.accesskey=s\nbreakpointMenuItem.deleteOthers=Remove others\nbreakpointMenuItem.deleteOthers.accesskey=h\nbreakpointMenuItem.enableAll=Enable all breakpoints\nbreakpointMenuItem.enableAll.accesskey=b\nbreakpointMenuItem.disableAll=Disable all breakpoints\nbreakpointMenuItem.disableAll.accesskey=k\nbreakpointMenuItem.deleteAll=Remove all breakpoints\nbreakpointMenuItem.deleteAll.accesskey=a\nbreakpointMenuItem.removeCondition.label=Remove breakpoint condition\nbreakpointMenuItem.removeCondition.accesskey=c\nbreakpointMenuItem.editCondition.label=Edit breakpoint condition\nbreakpointMenuItem.editCondition.accesskey=n\n\n# LOCALIZATION NOTE (breakpoints.header): Breakpoints right sidebar pane header.\nbreakpoints.header=Breakpoints\n\n# LOCALIZATION NOTE (breakpoints.none): The text that appears when there are\n# no breakpoints present\nbreakpoints.none=No breakpoints\n\n# LOCALIZATION NOTE (breakpoints.enable): The text that may appear as a tooltip\n# when hovering over the 'disable breakpoints' switch button in right sidebar\nbreakpoints.enable=Enable breakpoints\n\n# LOCALIZATION NOTE (breakpoints.disable): The text that may appear as a tooltip\n# when hovering over the 'disable breakpoints' switch button in right sidebar\nbreakpoints.disable=Disable breakpoints\n\n# LOCALIZATION NOTE (breakpoints.removeBreakpointTooltip): The tooltip that is displayed\n# for remove breakpoint button in right sidebar\nbreakpoints.removeBreakpointTooltip=Remove breakpoint\n\n# LOCALIZATION NOTE (callStack.header): Call Stack right sidebar pane header.\ncallStack.header=Call stack\n\n# LOCALIZATION NOTE (callStack.notPaused): Call Stack right sidebar pane\n# message when not paused.\ncallStack.notPaused=Not paused\n\n# LOCALIZATION NOTE (callStack.collapse): Call Stack right sidebar pane\n# message to hide some of the frames that are shown.\ncallStack.collapse=Collapse rows\n\n# LOCALIZATION NOTE (callStack.expand): Call Stack right sidebar pane\n# message to show more of the frames.\ncallStack.expand=Expand rows\n\n# LOCALIZATION NOTE (editor.searchResults): Editor Search bar message\n# for the summarizing the selected search result. e.g. 5 of 10 results.\neditor.searchResults=%d of %d results\n\n# LOCALIZATION NOTE (sourceSearch.singleResult): Copy shown when there is one result.\neditor.singleResult=1 result\n\n# LOCALIZATION NOTE (editor.noResults): Editor Search bar message\n# for when no results found.\neditor.noResults=No results\n\n# LOCALIZATION NOTE (editor.searchResults.nextResult): Editor Search bar\n# tooltip for traversing to the Next Result\neditor.searchResults.nextResult=Next result\n\n# LOCALIZATION NOTE (editor.searchResults.prevResult): Editor Search bar\n# tooltip for traversing to the Previous Result\neditor.searchResults.prevResult=Previous result\n\n# LOCALIZATION NOTE (editor.searchTypeToggleTitle): Search bar title for\n# toggling search type buttons(function search, variable search)\neditor.searchTypeToggleTitle=Search for:\n\n# LOCALIZATION NOTE (editor.continueToHere.label): Editor gutter context\n# menu item for jumping to a new paused location\neditor.continueToHere.label=Continue to here\neditor.continueToHere.accesskey=H\n\n# LOCALIZATION NOTE (editor.addBreakpoint): Editor gutter context menu item\n# for adding a breakpoint on a line.\neditor.addBreakpoint=Add breakpoint\n\n# LOCALIZATION NOTE (editor.disableBreakpoint): Editor gutter context menu item\n# for disabling a breakpoint on a line.\neditor.disableBreakpoint=Disable breakpoint\neditor.disableBreakpoint.accesskey=D\n\n# LOCALIZATION NOTE (editor.enableBreakpoint): Editor gutter context menu item\n# for enabling a breakpoint on a line.\neditor.enableBreakpoint=Enable breakpoint\n\n# LOCALIZATION NOTE (editor.removeBreakpoint): Editor gutter context menu item\n# for removing a breakpoint on a line.\neditor.removeBreakpoint=Remove breakpoint\n\n# LOCALIZATION NOTE (editor.editBreakpoint): Editor gutter context menu item\n# for setting a breakpoint condition on a line.\neditor.editBreakpoint=Edit breakpoint\n\n# LOCALIZATION NOTE (editor.addConditionalBreakpoint): Editor gutter context\n# menu item for adding a breakpoint condition on a line.\neditor.addConditionalBreakpoint=Add conditional breakpoint\neditor.addConditionalBreakpoint.accesskey=c\n\n# LOCALIZATION NOTE (editor.conditionalPanel.placeholder): Placeholder text for\n# input element inside ConditionalPanel component\neditor.conditionalPanel.placeholder=This breakpoint will pause when the expression is true\n\n# LOCALIZATION NOTE (editor.conditionalPanel.placeholder): Tooltip text for\n# close button inside ConditionalPanel component\neditor.conditionalPanel.close=Cancel edit breakpoint and close\n\n# LOCALIZATION NOTE (editor.jumpToMappedLocation1): Context menu item\n# for navigating to a source mapped location\neditor.jumpToMappedLocation1=Jump to %S location\neditor.jumpToMappedLocation1.accesskey=m\n\n# LOCALIZATION NOTE (framework.disableGrouping): This is the text that appears in the\n# context menu to disable framework grouping.\nframework.disableGrouping=Disable framework grouping\nframework.disableGrouping.accesskey=u\n\n# LOCALIZATION NOTE (framework.enableGrouping): This is the text that appears in the\n# context menu to enable framework grouping.\nframework.enableGrouping=Enable framework grouping\nframework.enableGrouping.accesskey=u\n\n# LOCALIZATION NOTE (generated): Source Map term for a server source location\ngenerated=Generated\n\n# LOCALIZATION NOTE (original): Source Map term for a debugger UI source location\noriginal=original\n\n# LOCALIZATION NOTE (expressions.placeholder): Placeholder text for expression\n# input element\nexpressions.placeholder=Add watch expression\nexpressions.label=Add watch expression\nexpressions.accesskey=e\n\n# LOCALIZATION NOTE (sourceTabs.closeTab): Editor source tab context menu item\n# for closing the selected tab below the mouse.\nsourceTabs.closeTab=Close tab\nsourceTabs.closeTab.accesskey=c\n\n# LOCALIZATION NOTE (sourceTabs.closeOtherTabs): Editor source tab context menu item\n# for closing the other tabs.\nsourceTabs.closeOtherTabs=Close other tabs\nsourceTabs.closeOtherTabs.accesskey=o\n\n# LOCALIZATION NOTE (sourceTabs.closeTabsToEnd): Editor source tab context menu item\n# for closing the tabs to the end (the right for LTR languages) of the selected tab.\nsourceTabs.closeTabsToEnd=Close tabs to the right\nsourceTabs.closeTabsToEnd.accesskey=e\n\n# LOCALIZATION NOTE (sourceTabs.closeAllTabs): Editor source tab context menu item\n# for closing all tabs.\nsourceTabs.closeAllTabs=Close all tabs\nsourceTabs.closeAllTabs.accesskey=a\n\n# LOCALIZATION NOTE (sourceTabs.revealInTree): Editor source tab context menu item\n# for revealing source in tree.\nsourceTabs.revealInTree=Reveal in tree\nsourceTabs.revealInTree.accesskey=r\n\n# LOCALIZATION NOTE (sourceTabs.prettyPrint): Editor source tab context menu item\n# for pretty printing the source.\nsourceTabs.prettyPrint=Pretty print source\nsourceTabs.prettyPrint.accesskey=p\n\n# LOCALIZATION NOTE (sourceFooter.blackbox): Tooltip text associated\n# with the blackbox button\nsourceFooter.blackbox=Blackbox source\nsourceFooter.blackbox.accesskey=B\n\n# LOCALIZATION NOTE (sourceFooter.unblackbox): Tooltip text associated\n# with the blackbox button\nsourceFooter.unblackbox=Unblackbox source\nsourceFooter.unblackbox.accesskey=b\n\n# LOCALIZATION NOTE (sourceFooter.blackboxed): Text associated\n# with a blackboxed source\nsourceFooter.blackboxed=Blackboxed source\n\n# LOCALIZATION NOTE (sourceFooter.mappedSource): Text associated\n# with a mapped source. %S is replaced by the source map origin.\nsourceFooter.mappedSource=(From %S)\n\n# LOCALIZATION NOTE (sourceFooter.mappedSourceTooltip): Tooltip text associated\n# with a mapped source. %S is replaced by the source map origin.\nsourceFooter.mappedSourceTooltip=(Source mapped from %S)\n\n# LOCALIZATION NOTE (sourceFooter.codeCoverage): Text associated\n# with a code coverage button\nsourceFooter.codeCoverage=Code coverage\n\n# LOCALIZATION NOTE (sourceTabs.closeTabButtonTooltip): The tooltip that is displayed\n# for close tab button in source tabs.\nsourceTabs.closeTabButtonTooltip=Close tab\n\n# LOCALIZATION NOTE (scopes.header): Scopes right sidebar pane header.\nscopes.header=Scopes\n\n# LOCALIZATION NOTE (scopes.notAvailable): Scopes right sidebar pane message\n# for when the debugger is paused, but there isn't pause data.\nscopes.notAvailable=Scopes unavailable\n\n# LOCALIZATION NOTE (scopes.notPaused): Scopes right sidebar pane message\n# for when the debugger is not paused.\nscopes.notPaused=Not paused\n\n# LOCALIZATION NOTE (scopes.block): Refers to a block of code in\n# the scopes pane when the debugger is paused.\nscopes.block=Block\n\n# LOCALIZATION NOTE (sources.header): Sources left sidebar header\nsources.header=Sources\n\n# LOCALIZATION NOTE (outline.header): Outline left sidebar header\noutline.header=Outline\n\n# LOCALIZATION NOTE (outline.noFunctions): Outline text when there are no functions to display\noutline.noFunctions=No functions\n\n# LOCALIZATION NOTE (sources.search): Sources left sidebar prompt\n# e.g. Cmd+P to search. On a mac, we use the command unicode character.\n# On windows, it's ctrl.\nsources.search=%S to search\n\n# LOCALIZATION NOTE (watchExpressions.header): Watch Expressions right sidebar\n# pane header.\nwatchExpressions.header=Watch expressions\n\n# LOCALIZATION NOTE (watchExpressions.refreshButton): Watch Expressions header\n# button for refreshing the expressions.\nwatchExpressions.refreshButton=Refresh\n\n# LOCALIZATION NOTE (welcome.search): The center pane welcome panel's\n# search prompt. e.g. cmd+p to search for files. On windows, it's ctrl, on\n# a mac we use the unicode character.\nwelcome.search=%S to search for sources\n\n# LOCALIZATION NOTE (welcome.findInFiles): The center pane welcome panel's\n# search prompt. e.g. cmd+f to search for files. On windows, it's ctrl+shift+f, on\n# a mac we use the unicode character.\nwelcome.findInFiles=%S to find in files\n\n# LOCALIZATION NOTE (welcome.searchFunction): Label displayed in the welcome\n# panel. %S is replaced by the keyboard shortcut to search for functions.\nwelcome.searchFunction=%S to search for functions in file\n\n# LOCALIZATION NOTE (sourceSearch.search): The center pane Source Search\n# prompt for searching for files.\nsourceSearch.search=Search sources…\n\n# LOCALIZATION NOTE (sourceSearch.noResults): The center pane Source Search\n# message when the query did not match any of the sources.\nsourceSearch.noResults2=No results found\n\n# LOCALIZATION NOTE (ignoreExceptions): The pause on exceptions button tooltip\n# when the debugger will not pause on exceptions.\nignoreExceptions=Ignore exceptions. Click to pause on uncaught exceptions\n\n# LOCALIZATION NOTE (pauseOnUncaughtExceptions): The pause on exceptions button\n# tooltip when the debugger will pause on uncaught exceptions.\npauseOnUncaughtExceptions=Pause on uncaught exceptions. Click to pause on all exceptions\n\n# LOCALIZATION NOTE (pauseOnExceptions): The pause on exceptions button tooltip\n# when the debugger will pause on all exceptions.\npauseOnExceptions=Pause on all exceptions. Click to ignore exceptions\n\n# LOCALIZATION NOTE (loadingText): The text that is displayed in the script\n# editor when the loading process has started but there is no file to display\n# yet.\nloadingText=Loading\\u2026\n\n# LOCALIZATION NOTE (errorLoadingText3): The text that is displayed in the debugger\n# viewer when there is an error loading a file\nerrorLoadingText3=Error loading this URI: %S\n\n# LOCALIZATION NOTE (addWatchExpressionText): The text that is displayed in the\n# watch expressions list to add a new item.\naddWatchExpressionText=Add watch expression\n\n# LOCALIZATION NOTE (addWatchExpressionButton): The button that is displayed in the\n# variables view popup.\naddWatchExpressionButton=Watch\n\n# LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the\n# variables pane when there are no variables to display.\nemptyVariablesText=No variables to display\n\n# LOCALIZATION NOTE (scopeLabel): The text that is displayed in the variables\n# pane as a header for each variable scope (e.g. \"Global scope, \"With scope\",\n# etc.).\nscopeLabel=%S scope\n\n# LOCALIZATION NOTE (watchExpressionsScopeLabel): The name of the watch\n# expressions scope. This text is displayed in the variables pane as a header for\n# the watch expressions scope.\nwatchExpressionsScopeLabel=Watch expressions\n\n# LOCALIZATION NOTE (globalScopeLabel): The name of the global scope. This text\n# is added to scopeLabel and displayed in the variables pane as a header for\n# the global scope.\nglobalScopeLabel=Global\n\n# LOCALIZATION NOTE (variablesViewErrorStacktrace): This is the text that is\n# shown before the stack trace in an error.\nvariablesViewErrorStacktrace=Stack trace:\n\n# LOCALIZATION NOTE (variablesViewMoreObjects): the text that is displayed\n# when you have an object preview that does not show all of the elements. At the end of the list\n# you see \"N more...\" in the web console output.\n# This is a semi-colon list of plural forms.\n# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals\n# #1 number of remaining items in the object\n# example: 3 more…\nvariablesViewMoreObjects=#1 more…;#1 more…\n\n# LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed\n# in the variables list on an item with an editable name.\nvariablesEditableNameTooltip=Double click to edit\n\n# LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed\n# in the variables list on an item with an editable value.\nvariablesEditableValueTooltip=Click to change value\n\n# LOCALIZATION NOTE (variablesCloseButtonTooltip): The text that is displayed\n# in the variables list on an item which can be removed.\nvariablesCloseButtonTooltip=Click to remove\n\n# LOCALIZATION NOTE (variablesEditButtonTooltip): The text that is displayed\n# in the variables list on a getter or setter which can be edited.\nvariablesEditButtonTooltip=Click to set value\n\n# LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed\n# in a tooltip on the \"open in inspector\" button in the the variables list for a\n# DOMNode item.\nvariablesDomNodeValueTooltip=Click to select the node in the inspector\n\n# LOCALIZATION NOTE (configurable|...|Tooltip): The text that is displayed\n# in the variables list on certain variables or properties as tooltips.\n# Expanations of what these represent can be found at the following links:\n# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty\n# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isExtensible\n# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isFrozen\n# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isSealed\n# It's probably best to keep these in English.\nconfigurableTooltip=configurable\nenumerableTooltip=enumerable\nwritableTooltip=writable\nfrozenTooltip=frozen\nsealedTooltip=sealed\nextensibleTooltip=extensible\noverriddenTooltip=overridden\nWebIDLTooltip=WebIDL\n\n# LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed\n# in the variables list as a separator between the name and value.\nvariablesSeparatorLabel=:\n\n# LOCALIZATION NOTE (watchExpressionsSeparatorLabel2): The text that is displayed\n# in the watch expressions list as a separator between the code and evaluation.\nwatchExpressionsSeparatorLabel2=\\u0020→\n\n# LOCALIZATION NOTE (functionSearchSeparatorLabel): The text that is displayed\n# in the functions search panel as a separator between function's inferred name\n# and its real name (if available).\nfunctionSearchSeparatorLabel=←\n\n# LOCALIZATION NOTE(gotoLineModal.placeholder): The placeholder\n# text displayed when the user searches for specific lines in a file\ngotoLineModal.placeholder=Go to line…\ngotoLineModal.key=CmdOrCtrl+Shift+;\n\n# LOCALIZATION NOTE(symbolSearch.search.functionsPlaceholder): The placeholder\n# text displayed when the user searches for functions in a file\nsymbolSearch.search.functionsPlaceholder=Search functions…\n\n# LOCALIZATION NOTE(symbolSearch.search.variablesPlaceholder): The placeholder\n# text displayed when the user searches for variables in a file\nsymbolSearch.search.variablesPlaceholder=Search variables…\n\n# LOCALIZATION NOTE(symbolSearch.search.key2): The Key Shortcut for\n# searching for a function or variable\nsymbolSearch.search.key2=CmdOrCtrl+Shift+O\n\n# LOCALIZATION NOTE(symbolSearch.searchModifier.modifiersLabel): A label\n# preceding the group of modifiers\nsymbolSearch.searchModifier.modifiersLabel=Modifiers:\n\n# LOCALIZATION NOTE(symbolSearch.searchModifier.regex): A search option\n# when searching text in a file\nsymbolSearch.searchModifier.regex=Regex\n\n# LOCALIZATION NOTE(symbolSearch.searchModifier.caseSensitive): A search option\n# when searching text in a file\nsymbolSearch.searchModifier.caseSensitive=Case sensitive\n\n# LOCALIZATION NOTE(symbolSearch.searchModifier.wholeWord): A search option\n# when searching text in a file\nsymbolSearch.searchModifier.wholeWord=Whole word\n\n# LOCALIZATION NOTE (resumptionOrderPanelTitle): This is the text that appears\n# as a description in the notification panel popup, when multiple debuggers are\n# open in separate tabs and the user tries to resume them in the wrong order.\n# The substitution parameter is the URL of the last paused window that must be\n# resumed first.\nresumptionOrderPanelTitle=There are one or more paused debuggers. Please resume the most-recently paused debugger first at: %S\n\nvariablesViewOptimizedOut=(optimized away)\nvariablesViewUninitialized=(uninitialized)\nvariablesViewMissingArgs=(unavailable)\n\nanonymousSourcesLabel=Anonymous sources\n\nexperimental=This is an experimental feature\n\n# LOCALIZATION NOTE (whyPaused.debuggerStatement): The text that is displayed\n# in a info block explaining how the debugger is currently paused due to a `debugger`\n# statement in the code\nwhyPaused.debuggerStatement=Paused on debugger statement\n\n# LOCALIZATION NOTE (whyPaused.breakpoint): The text that is displayed\n# in a info block explaining how the debugger is currently paused on a breakpoint\nwhyPaused.breakpoint=Paused on breakpoint\n\n# LOCALIZATION NOTE (whyPaused.exception): The text that is displayed\n# in a info block explaining how the debugger is currently paused on an exception\nwhyPaused.exception=Paused on exception\n\n# LOCALIZATION NOTE (whyPaused.resumeLimit): The text that is displayed\n# in a info block explaining how the debugger is currently paused while stepping\n# in or out of the stack\nwhyPaused.resumeLimit=Paused while stepping\n\n# LOCALIZATION NOTE (whyPaused.pauseOnDOMEvents): The text that is displayed\n# in a info block explaining how the debugger is currently paused on a\n# dom event\nwhyPaused.pauseOnDOMEvents=Paused on event listener\n\n# LOCALIZATION NOTE (whyPaused.breakpointConditionThrown): The text that is displayed\n# in an info block when evaluating a conditional breakpoint throws an error\nwhyPaused.breakpointConditionThrown=Error with conditional breakpoint\n\n# LOCALIZATION NOTE (whyPaused.xhr): The text that is displayed\n# in a info block explaining how the debugger is currently paused on an\n# xml http request\nwhyPaused.xhr=Paused on XMLHttpRequest\n\n# LOCALIZATION NOTE (whyPaused.promiseRejection): The text that is displayed\n# in a info block explaining how the debugger is currently paused on a\n# promise rejection\nwhyPaused.promiseRejection=Paused on promise rejection\n\n# LOCALIZATION NOTE (whyPaused.assert): The text that is displayed\n# in a info block explaining how the debugger is currently paused on an\n# assert\nwhyPaused.assert=Paused on assertion\n\n# LOCALIZATION NOTE (whyPaused.debugCommand): The text that is displayed\n# in a info block explaining how the debugger is currently paused on a\n# debugger statement\nwhyPaused.debugCommand=Paused on debugged function\n\n# LOCALIZATION NOTE (whyPaused.other): The text that is displayed\n# in a info block explaining how the debugger is currently paused on an event\n# listener breakpoint set\nwhyPaused.other=Debugger paused\n\n# LOCALIZATION NOTE (ctrl): The text that is used for documenting\n# keyboard shortcuts that use the control key\nctrl=Ctrl\n\n# LOCALIZATION NOTE (anonymous): The text that is displayed when the\n# display name is null.\nanonymous=(anonymous)\n\n# LOCALIZATION NOTE (shortcuts.toggleBreakpoint): text describing\n# keyboard shortcut action for toggling breakpoint\nshortcuts.toggleBreakpoint=Toggle Breakpoint\nshortcuts.toggleBreakpoint.accesskey=B\n\n# LOCALIZATION NOTE (shortcuts.toggleCondPanel): text describing\n# keyboard shortcut action for toggling conditional panel keyboard\nshortcuts.toggleCondPanel=Toggle Conditional Panel\n\n# LOCALIZATION NOTE (shortcuts.pauseOrResume): text describing\n# keyboard shortcut action for pause of resume\nshortcuts.pauseOrResume=Pause/Resume\n\n# LOCALIZATION NOTE (shortcuts.stepOver): text describing\n# keyboard shortcut action for stepping over\nshortcuts.stepOver=Step Over\n\n# LOCALIZATION NOTE (shortcuts.stepIn): text describing\n# keyboard shortcut action for stepping in\nshortcuts.stepIn=Step In\n\n# LOCALIZATION NOTE (shortcuts.stepOut): text describing\n# keyboard shortcut action for stepping out\nshortcuts.stepOut=Step Out\n\n# LOCALIZATION NOTE (shortcuts.fileSearch): text describing\n# keyboard shortcut action for source file search\nshortcuts.fileSearch=Source File Search\n\n# LOCALIZATION NOTE (shortcuts.searchAgain): text describing\n# keyboard shortcut action for searching again\nshortcuts.searchAgain=Search Again\n\n# LOCALIZATION NOTE (shortcuts.projectSearch): text describing\n# keyboard shortcut action for full project search\nshortcuts.projectSearch=Full Project Search\n\n# LOCALIZATION NOTE (shortcuts.functionSearch): text describing\n# keyboard shortcut action for function search\nshortcuts.functionSearch=Function Search\n\n# LOCALIZATION NOTE (shortcuts.buttonName): text describing\n# keyboard shortcut button text\nshortcuts.buttonName=Keyboard shortcuts\n"
 
 /***/ }),
 /* 961 */,
@@ -17425,6 +17425,8 @@ var _ui = __webpack_require__(1439);
 
 var _devtoolsSourceEditor = __webpack_require__(1386);
 
+var _devtoolsSourceMap = __webpack_require__(1360);
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 const { findNext, findPrev } = sourceSearchUtils;
@@ -17442,8 +17444,10 @@ function shouldShowFooter(selectedSource, horizontal) {
   if (!horizontal) {
     return true;
   }
-
-  return shouldShowPrettyPrint(selectedSource);
+  if (!selectedSource) {
+    return false;
+  }
+  return shouldShowPrettyPrint(selectedSource) || (0, _devtoolsSourceMap.isOriginalId)(selectedSource.get("id"));
 }
 
 function traverseResults(e, ctx, query, dir, modifiers) {
@@ -18400,6 +18404,7 @@ exports.removeSourcesFromTabList = removeSourcesFromTabList;
 exports.getNewSelectedSourceId = getNewSelectedSourceId;
 exports.getSource = getSource;
 exports.getSourceByURL = getSourceByURL;
+exports.getGeneratedSource = getGeneratedSource;
 exports.getPendingSelectedLocation = getPendingSelectedLocation;
 exports.getPrettySource = getPrettySource;
 exports.getSourceInSources = getSourceInSources;
@@ -18416,6 +18421,8 @@ var _makeRecord2 = _interopRequireDefault(_makeRecord);
 
 var _source = __webpack_require__(1356);
 
+var _devtoolsSourceMap = __webpack_require__(1360);
+
 var _prefs = __webpack_require__(226);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -18667,6 +18674,13 @@ function getSourceByURL(state, url) {
   return getSourceByUrlInSources(state.sources.sources, url);
 }
 
+function getGeneratedSource(state, source) {
+  if (!(0, _devtoolsSourceMap.isOriginalId)(source.id)) {
+    return null;
+  }
+  return getSource(state, (0, _devtoolsSourceMap.originalToGeneratedId)(source.id));
+}
+
 function getPendingSelectedLocation(state) {
   return state.sources.pendingSelectedLocation;
 }
@@ -19880,6 +19894,9 @@ const libraryMap = [{
 }, {
   label: "ExtJS",
   pattern: /\/ext-all[\.\-]/
+}, {
+  label: "MobX",
+  pattern: /mobx/i
 }, {
   label: "Underscore",
   pattern: /underscore/i
@@ -34029,6 +34046,7 @@ const svg = {
   express: __webpack_require__(1003),
   pug: __webpack_require__(1004),
   extjs: __webpack_require__(1043),
+  mobx: __webpack_require__(1733),
   marko: __webpack_require__(1649),
   nextjs: __webpack_require__(1650),
   showSources: __webpack_require__(1044),
@@ -35295,15 +35313,13 @@ var _classnames = __webpack_require__(175);
 
 var _classnames2 = _interopRequireDefault(_classnames);
 
-var _redux = __webpack_require__(3);
-
 var _reactRedux = __webpack_require__(1189);
 
 var _selectors = __webpack_require__(1352);
 
-var _actions = __webpack_require__(1354);
+var _sourceTree = __webpack_require__(1532);
 
-var _actions2 = _interopRequireDefault(_actions);
+var _sources = __webpack_require__(1373);
 
 var _ManagedTree = __webpack_require__(1404);
 
@@ -35540,7 +35556,7 @@ class SourcesTree extends _react.Component {
   }
 
   render() {
-    const { setExpandedState, expanded } = this.props;
+    const expanded = this.props.expanded;
     const {
       focusedItem,
       sourceTree,
@@ -35549,6 +35565,14 @@ class SourcesTree extends _react.Component {
       highlightItems
     } = this.state;
 
+    const onExpand = (item, expandedState) => {
+      this.props.setExpandedState(expandedState);
+    };
+
+    const onCollapse = (item, expandedState) => {
+      this.props.setExpandedState(expandedState);
+    };
+
     const isEmpty = sourceTree.contents.length === 0;
     const treeProps = {
       key: isEmpty ? "empty" : "full",
@@ -35563,8 +35587,8 @@ class SourcesTree extends _react.Component {
       listItems,
       highlightItems,
       expanded,
-      onExpand: (item, expandedState) => setExpandedState(expandedState),
-      onCollapse: (item, expandedState) => setExpandedState(expandedState),
+      onExpand,
+      onCollapse,
       renderItem: this.renderItem
     };
 
@@ -35607,7 +35631,9 @@ class SourcesTree extends _react.Component {
  * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
 
 // React
-exports.default = (0, _reactRedux.connect)(state => {
+
+
+const mapStateToProps = state => {
   return {
     shownSource: (0, _selectors.getShownSource)(state),
     selectedSource: (0, _selectors.getSelectedSource)(state),
@@ -35616,7 +35642,14 @@ exports.default = (0, _reactRedux.connect)(state => {
     projectRoot: (0, _selectors.getProjectDirectoryRoot)(state),
     sources: (0, _selectors.getSources)(state)
   };
-}, dispatch => (0, _redux.bindActionCreators)(_actions2.default, dispatch))(SourcesTree);
+};
+
+const actionCreators = {
+  setExpandedState: _sourceTree.setExpandedState,
+  selectSource: _sources.selectSource
+};
+
+exports.default = (0, _reactRedux.connect)(mapStateToProps, actionCreators)(SourcesTree);
 
 /***/ }),
 /* 1554 */
@@ -36247,6 +36280,8 @@ var _devtoolsConfig = __webpack_require__(1355);
 
 var _source = __webpack_require__(1356);
 
+var _sources = __webpack_require__(1369);
+
 var _editor = __webpack_require__(1358);
 
 var _PaneToggle = __webpack_require__(1407);
@@ -36257,6 +36292,10 @@ __webpack_require__(1322);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
+
 class SourceFooter extends _react.PureComponent {
   prettyPrintButton() {
     const { selectedSource, togglePrettyPrint } = this.props;
@@ -36371,6 +36410,35 @@ class SourceFooter extends _react.PureComponent {
     );
   }
 
+  renderSourceSummary() {
+    const { mappedSource, jumpToMappedLocation, selectedSource } = this.props;
+    if (mappedSource) {
+      const bundleSource = mappedSource.toJS();
+      const filename = (0, _source.getFilename)(bundleSource);
+      const tooltip = L10N.getFormatStr("sourceFooter.mappedSourceTooltip", filename);
+      const title = L10N.getFormatStr("sourceFooter.mappedSource", filename);
+      const mappedSourceLocation = {
+        sourceId: selectedSource.get("id"),
+        line: 1,
+        column: 1
+      };
+      return _react2.default.createElement(
+        "button",
+        {
+          className: "mapped-source",
+          onClick: () => jumpToMappedLocation(mappedSourceLocation),
+          title: tooltip
+        },
+        _react2.default.createElement(
+          "span",
+          null,
+          title
+        )
+      );
+    }
+    return null;
+  }
+
   render() {
     const { selectedSource, horizontal } = this.props;
 
@@ -36382,18 +36450,19 @@ class SourceFooter extends _react.PureComponent {
       "div",
       { className: "source-footer" },
       this.renderCommands(),
+      this.renderSourceSummary(),
       this.renderToggleButton()
     );
   }
-} /* This Source Code Form is subject to the terms of the Mozilla Public
-   * License, v. 2.0. If a copy of the MPL was not distributed with this
-   * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
+}
 
 exports.default = (0, _reactRedux.connect)(state => {
   const selectedSource = (0, _selectors.getSelectedSource)(state);
   const selectedId = selectedSource && selectedSource.get("id");
+  const source = selectedSource.toJS();
   return {
     selectedSource,
+    mappedSource: (0, _sources.getGeneratedSource)(state, source),
     prettySource: (0, _selectors.getPrettySource)(state, selectedId),
     endPanelCollapsed: (0, _selectors.getPaneCollapse)(state, "end")
   };
@@ -39846,7 +39915,7 @@ class Breakpoints extends _react.Component {
   }
 
   render() {
-    const { breakpoints, selectedSource, editor, sourceMetaData } = this.props;
+    const { breakpoints, selectedSource, editor } = this.props;
 
     if (!selectedSource || !breakpoints || selectedSource.get("isBlackBoxed")) {
       return null;
@@ -39860,7 +39929,6 @@ class Breakpoints extends _react.Component {
           key: (0, _breakpoint.makeLocationId)(bp.location),
           breakpoint: bp,
           selectedSource: selectedSource,
-          sourceMetaData: sourceMetaData,
           editor: editor
         });
       })
@@ -39872,8 +39940,7 @@ class Breakpoints extends _react.Component {
 
 exports.default = (0, _reactRedux.connect)(state => ({
   breakpoints: (0, _visibleBreakpoints2.default)(state),
-  selectedSource: (0, _selectors.getSelectedSource)(state),
-  sourceMetaData: (0, _selectors.getSourceMetaData)(state, (0, _selectors.getSelectedSource)(state).id)
+  selectedSource: (0, _selectors.getSelectedSource)(state)
 }), dispatch => (0, _redux.bindActionCreators)(_actions2.default, dispatch))(Breakpoints);
 
 /***/ }),
@@ -39934,7 +40001,7 @@ class Breakpoint extends _react.Component {
   }
 
   addBreakpoint() {
-    const { breakpoint, editor, selectedSource, sourceMetaData } = this.props;
+    const { breakpoint, editor, selectedSource } = this.props;
 
     // Hidden Breakpoints are never rendered on the client
     if (breakpoint.hidden) {
@@ -39950,8 +40017,6 @@ class Breakpoint extends _react.Component {
     const sourceId = selectedSource.get("id");
     const line = (0, _editor.toEditorLine)(sourceId, breakpoint.location.line);
 
-    (0, _editor.showSourceText)(editor, selectedSource.toJS(), sourceMetaData);
-
     editor.codeMirror.setGutterMarker(line, "breakpoints", makeMarker(breakpoint.disabled));
 
     editor.codeMirror.addLineClass(line, "line", "new-breakpoint");
@@ -41324,8 +41389,6 @@ class SecondaryPanes extends _react.Component {
 
   getStartItems() {
     const scopesContent = this.props.horizontal ? this.getScopeItem() : null;
-    const isPaused = () => !!this.props.pauseData;
-
     const items = [{
       header: L10N.getStr("breakpoints.header"),
       className: "breakpoints-pane",
@@ -41339,8 +41402,7 @@ class SecondaryPanes extends _react.Component {
       opened: _prefs.prefs.callStackVisible,
       onToggle: opened => {
         _prefs.prefs.callStackVisible = opened;
-      },
-      shouldOpen: isPaused
+      }
     }, scopesContent];
 
     if ((0, _devtoolsConfig.isEnabled)("eventListeners")) {
@@ -46022,6 +46084,39 @@ exports.default = Badge;
 
 // removed by extract-text-webpack-plugin
 
+/***/ }),
+/* 1706 */,
+/* 1707 */,
+/* 1708 */,
+/* 1709 */,
+/* 1710 */,
+/* 1711 */,
+/* 1712 */,
+/* 1713 */,
+/* 1714 */,
+/* 1715 */,
+/* 1716 */,
+/* 1717 */,
+/* 1718 */,
+/* 1719 */,
+/* 1720 */,
+/* 1721 */,
+/* 1722 */,
+/* 1723 */,
+/* 1724 */,
+/* 1725 */,
+/* 1726 */,
+/* 1727 */,
+/* 1728 */,
+/* 1729 */,
+/* 1730 */,
+/* 1731 */,
+/* 1732 */,
+/* 1733 */
+/***/ (function(module, exports) {
+
+module.exports = "<svg version=\"1.1\" id=\"Layer_1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" viewBox=\"0 0 1200 1200\" style=\"enable-background:new 0 0 1200 1200;\" xml:space=\"preserve\"><style type=\"text/css\"> .st0{clip-path:url(#SVGID_2_);} .st1{fill:url(#SVGID_3_);} .st2{fill:url(#SVGID_4_);} .st3{opacity:0.28;fill:#C24411;} .st4{fill:#FFFFFF;} </style><g><defs><path id=\"SVGID_1_\" d=\"M1088.7,1165.5H111.3c-42.4,0-76.7-34.4-76.7-76.7V111.3c0-42.4,34.4-76.7,76.7-76.7h977.4 c42.4,0,76.7,34.4,76.7,76.7v977.4C1165.5,1131.1,1131.1,1165.5,1088.7,1165.5z\"></path></defs><clipPath id=\"SVGID_2_\"><use xlink:href=\"#SVGID_1_\" style=\"overflow:visible;\"></use></clipPath><g class=\"st0\"><linearGradient id=\"SVGID_3_\" gradientUnits=\"userSpaceOnUse\" x1=\"426.6738\" y1=\"482.4993\" x2=\"1284.413\" y2=\"1239.9835\"><stop offset=\"0\" style=\"stop-color:#F77122\"></stop><stop offset=\"1\" style=\"stop-color:#D6560A\"></stop></linearGradient><polygon class=\"st1\" points=\"573.6,1896.7 -87.9,1286.6 1204.5,-115 1866,495 \"></polygon><linearGradient id=\"SVGID_4_\" gradientUnits=\"userSpaceOnUse\" x1=\"1128.9907\" y1=\"-135.8044\" x2=\"-496.2911\" y2=\"788.1552\"><stop offset=\"0\" style=\"stop-color:#D6560A\"></stop><stop offset=\"1\" style=\"stop-color:#F77122\"></stop></linearGradient><polygon class=\"st2\" points=\"-66.9,1307.6 -644.1,775.5 648.4,-626.1 1225.5,-94 \"></polygon><rect x=\"-143.7\" y=\"-143.6\" transform=\"matrix(0.9658 -0.2591 0.2591 0.9658 -201.3159 92.1307)\" class=\"st3\" width=\"785\" height=\"1906.5\"></rect></g></g><g><path class=\"st4\" d=\"M384.9,900.1H245.4v-45.3h85.6V345.2h-85.6v-45.3h139.5V900.1z\"></path><path class=\"st4\" d=\"M745.7,463c-16.1,60.4-35,118.2-56.7,173.6c-21.7,55.4-42.7,105-62.9,148.8H574 c-20.3-43.8-41.2-93.4-62.9-148.8c-21.7-55.4-40.6-113.2-56.7-173.6h62c5,20.3,10.8,41.9,17.7,64.8s14,45.7,21.7,68.2 c7.6,22.5,15.4,44.3,23.2,65.4c7.8,21.1,15.3,39.9,22.3,56.4c7-16.5,14.5-35.3,22.3-56.4c7.8-21.1,15.6-42.9,23.2-65.4 c7.6-22.5,14.9-45.3,21.7-68.2s12.7-44.5,17.7-64.8H745.7z\"></path><path class=\"st4\" d=\"M815.1,299.9h139.5v45.3h-85.6v509.6h85.6v45.3H815.1V299.9z\"></path></g></svg>"
+
 /***/ })
 /******/ ]);
 });
\ No newline at end of file
diff --git a/devtools/client/debugger/new/parser-worker.js b/devtools/client/debugger/new/parser-worker.js
index 93d7ba4e916f..60a607282b68 100644
--- a/devtools/client/debugger/new/parser-worker.js
+++ b/devtools/client/debugger/new/parser-worker.js
@@ -27467,66 +27467,8 @@ module.exports = function(module) {
 
 /***/ }),
 /* 794 */,
-/* 795 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var createToPairs = __webpack_require__(812),
-    keys = __webpack_require__(205);
-
-/**
- * Creates an array of own enumerable string keyed-value pairs for `object`
- * which can be consumed by `_.fromPairs`. If `object` is a map or set, its
- * entries are returned.
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @alias entries
- * @category Object
- * @param {Object} object The object to query.
- * @returns {Array} Returns the key-value pairs.
- * @example
- *
- * function Foo() {
- *   this.a = 1;
- *   this.b = 2;
- * }
- *
- * Foo.prototype.c = 3;
- *
- * _.toPairs(new Foo);
- * // => [['a', 1], ['b', 2]] (iteration order is not guaranteed)
- */
-var toPairs = createToPairs(keys);
-
-module.exports = toPairs;
-
-
-/***/ }),
-/* 796 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var arrayMap = __webpack_require__(110);
-
-/**
- * The base implementation of `_.toPairs` and `_.toPairsIn` which creates an array
- * of key-value pairs for `object` corresponding to the property names of `props`.
- *
- * @private
- * @param {Object} object The object to query.
- * @param {Array} props The property names to get values for.
- * @returns {Object} Returns the key-value pairs.
- */
-function baseToPairs(object, props) {
-  return arrayMap(props, function(key) {
-    return [key, object[key]];
-  });
-}
-
-module.exports = baseToPairs;
-
-
-/***/ }),
+/* 795 */,
+/* 796 */,
 /* 797 */,
 /* 798 */,
 /* 799 */
@@ -27711,7 +27653,7 @@ module.exports = matchesStrictComparable;
 /* 812 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var baseToPairs = __webpack_require__(796),
+var baseToPairs = __webpack_require__(1757),
     getTag = __webpack_require__(198),
     mapToArray = __webpack_require__(203),
     setToPairs = __webpack_require__(813);
@@ -36616,7 +36558,7 @@ exports.getVariablesInLocalScope = getVariablesInLocalScope;
 exports.getVariablesInScope = getVariablesInScope;
 exports.isExpressionInScope = isExpressionInScope;
 
-var _toPairs = __webpack_require__(795);
+var _toPairs = __webpack_require__(1756);
 
 var _toPairs2 = _interopRequireDefault(_toPairs);
 
@@ -41822,6 +41764,118 @@ function extendsComponent(classes) {
   return result;
 }
 
+/***/ }),
+/* 1704 */,
+/* 1705 */,
+/* 1706 */,
+/* 1707 */,
+/* 1708 */,
+/* 1709 */,
+/* 1710 */,
+/* 1711 */,
+/* 1712 */,
+/* 1713 */,
+/* 1714 */,
+/* 1715 */,
+/* 1716 */,
+/* 1717 */,
+/* 1718 */,
+/* 1719 */,
+/* 1720 */,
+/* 1721 */,
+/* 1722 */,
+/* 1723 */,
+/* 1724 */,
+/* 1725 */,
+/* 1726 */,
+/* 1727 */,
+/* 1728 */,
+/* 1729 */,
+/* 1730 */,
+/* 1731 */,
+/* 1732 */,
+/* 1733 */,
+/* 1734 */,
+/* 1735 */,
+/* 1736 */,
+/* 1737 */,
+/* 1738 */,
+/* 1739 */,
+/* 1740 */,
+/* 1741 */,
+/* 1742 */,
+/* 1743 */,
+/* 1744 */,
+/* 1745 */,
+/* 1746 */,
+/* 1747 */,
+/* 1748 */,
+/* 1749 */,
+/* 1750 */,
+/* 1751 */,
+/* 1752 */,
+/* 1753 */,
+/* 1754 */,
+/* 1755 */,
+/* 1756 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var createToPairs = __webpack_require__(812),
+    keys = __webpack_require__(205);
+
+/**
+ * Creates an array of own enumerable string keyed-value pairs for `object`
+ * which can be consumed by `_.fromPairs`. If `object` is a map or set, its
+ * entries are returned.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @alias entries
+ * @category Object
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the key-value pairs.
+ * @example
+ *
+ * function Foo() {
+ *   this.a = 1;
+ *   this.b = 2;
+ * }
+ *
+ * Foo.prototype.c = 3;
+ *
+ * _.toPairs(new Foo);
+ * // => [['a', 1], ['b', 2]] (iteration order is not guaranteed)
+ */
+var toPairs = createToPairs(keys);
+
+module.exports = toPairs;
+
+
+/***/ }),
+/* 1757 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var arrayMap = __webpack_require__(110);
+
+/**
+ * The base implementation of `_.toPairs` and `_.toPairsIn` which creates an array
+ * of key-value pairs for `object` corresponding to the property names of `props`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {Array} props The property names to get values for.
+ * @returns {Object} Returns the key-value pairs.
+ */
+function baseToPairs(object, props) {
+  return arrayMap(props, function(key) {
+    return [key, object[key]];
+  });
+}
+
+module.exports = baseToPairs;
+
+
 /***/ })
 /******/ ]);
 });
\ No newline at end of file
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-debugger-buttons.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-debugger-buttons.js
index c39d53e959ef..205d3ffc6d96 100644
--- a/devtools/client/debugger/new/test/mochitest/browser_dbg-debugger-buttons.js
+++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-debugger-buttons.js
@@ -43,7 +43,7 @@ add_task(async function() {
   assertPausedLocation(dbg);
 
   // resume
-  await clickResume(dbg)
+  await clickResume(dbg);
   await waitForPaused(dbg);
   assertPausedLocation(dbg);
 
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-editor-select.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-editor-select.js
index c99685d5426e..6e2d1963ef30 100644
--- a/devtools/client/debugger/new/test/mochitest/browser_dbg-editor-select.js
+++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-editor-select.js
@@ -47,5 +47,8 @@ add_task(async function() {
   await waitForLoadedSource(dbg, "long.js");
 
   assertPausedLocation(dbg);
-  ok(isVisibleInEditor(dbg, findElement(dbg, "breakpoint")), "Breakpoint is visible");
+  ok(
+    isVisibleInEditor(dbg, findElement(dbg, "breakpoint")),
+    "Breakpoint is visible"
+  );
 });
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-expressions-error.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-expressions-error.js
index c5dd7c013823..078cd40d37b4 100644
--- a/devtools/client/debugger/new/test/mochitest/browser_dbg-expressions-error.js
+++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-expressions-error.js
@@ -47,7 +47,7 @@ async function editExpression(dbg, input) {
   info("updating the expression");
   dblClickElement(dbg, "expressionNode", 1);
   // Position cursor reliably at the end of the text.
-  const evaluation = waitForDispatch(dbg, "EVALUATE_EXPRESSION")
+  const evaluation = waitForDispatch(dbg, "EVALUATE_EXPRESSION");
   pressKey(dbg, "End");
   type(dbg, input);
   pressKey(dbg, "Enter");
@@ -59,7 +59,7 @@ async function editExpression(dbg, input) {
  * resume, and wait for the expression to finish being evaluated.
  */
 async function addBadExpression(dbg, input) {
-  const evaluation = waitForDispatch(dbg, "EVALUATE_EXPRESSION")
+  const evaluation = waitForDispatch(dbg, "EVALUATE_EXPRESSION");
 
   findElementWithSelector(dbg, expressionSelectors.input).focus();
   type(dbg, input);
@@ -70,7 +70,6 @@ async function addBadExpression(dbg, input) {
   ok(dbg.selectors.isEvaluatingExpression(dbg.getState()));
   await resume(dbg);
   await evaluation;
-
 }
 
 add_task(async function() {
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print.js
index 846aab4870fb..38576cb52be4 100644
--- a/devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print.js
+++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print.js
@@ -32,8 +32,8 @@ add_task(async function() {
 
   // The pretty-print button should go away in the pretty-printed
   // source.
-  ok(!findElement(dbg, "editorFooter"), "Footer is hidden");
+  ok(!findElement(dbg, "prettyPrintButton"), "Pretty Print Button is hidden");
 
   await selectSource(dbg, "math.min.js");
-  ok(findElement(dbg, "editorFooter"), "Footer is hidden");
+  ok(findElement(dbg, "prettyPrintButton"), "Pretty Print Button is visible");
 });
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps2.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps2.js
index a85204e1cfeb..74096615937d 100644
--- a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps2.js
+++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-sourcemaps2.js
@@ -4,7 +4,11 @@
 function assertBpInGutter(dbg, lineNumber) {
   const el = findElement(dbg, "breakpoint");
   const bpLineNumber = +el.querySelector(".CodeMirror-linenumber").innerText;
-  is(bpLineNumber, lineNumber, "Breakpoint is on the correct line in the gutter");
+  is(
+    bpLineNumber,
+    lineNumber,
+    "Breakpoint is on the correct line in the gutter"
+  );
 }
 
 // Tests loading sourcemapped sources, setting breakpoints, and
@@ -38,4 +42,12 @@ add_task(async function() {
 
   await waitForPaused(dbg);
   assertPausedLocation(dbg);
+
+  // Tests the existence of the sourcemap link in the original source.
+  ok(findElement(dbg, "sourceMapLink"), "Sourcemap link in original source");
+  await selectSource(dbg, "main.min.js");
+  ok(
+    !findElement(dbg, "sourceMapLink"),
+    "No Sourcemap link exists in generated source"
+  );
 });
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-wasm-sourcemaps.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-wasm-sourcemaps.js
index aa6da211c3e8..dab3864d560f 100644
--- a/devtools/client/debugger/new/test/mochitest/browser_dbg-wasm-sourcemaps.js
+++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-wasm-sourcemaps.js
@@ -26,6 +26,7 @@ add_task(async function() {
   await waitForPaused(dbg);
   await waitForLoadedSource(dbg, "average.c");
   assertPausedLocation(dbg);
+  toggleCallStack(dbg);
 
   const frames = findAllElements(dbg, "frames");
   const firstFrameTitle = frames[0].querySelector(".title").textContent;
diff --git a/devtools/client/debugger/new/test/mochitest/head.js b/devtools/client/debugger/new/test/mochitest/head.js
index e4f269cbd5a8..d224a1fabb91 100644
--- a/devtools/client/debugger/new/test/mochitest/head.js
+++ b/devtools/client/debugger/new/test/mochitest/head.js
@@ -295,7 +295,9 @@ function assertDebugLine(dbg, line) {
     const url = source.get("url");
     ok(
       false,
-      `Looks like the source ${url} is still loading. Try adding waitForLoadedSource in the test.`
+      `Looks like the source ${
+        url
+      } is still loading. Try adding waitForLoadedSource in the test.`
     );
     return;
   }
@@ -305,8 +307,9 @@ function assertDebugLine(dbg, line) {
     "Line is highlighted as paused"
   );
 
-  const debugLine = findElementWithSelector(dbg, ".new-debug-line")
-                    || findElementWithSelector(dbg, ".new-debug-line-error");
+  const debugLine =
+    findElementWithSelector(dbg, ".new-debug-line") ||
+    findElementWithSelector(dbg, ".new-debug-line-error");
 
   ok(isVisibleInEditor(dbg, debugLine), "debug line is visible");
 
@@ -553,8 +556,11 @@ function waitForLoadedSources(dbg) {
   return waitForState(
     dbg,
     state => {
-      const sources = dbg.selectors.getSources(state).valueSeq().toJS()
-      return !sources.some(source => source.loadedState == "loading")
+      const sources = dbg.selectors
+        .getSources(state)
+        .valueSeq()
+        .toJS();
+      return !sources.some(source => source.loadedState == "loading");
     },
     "loaded source"
   );
@@ -835,7 +841,6 @@ function type(dbg, string) {
   string.split("").forEach(char => EventUtils.synthesizeKey(char, {}, dbg.win));
 }
 
-
 /*
  * Checks to see if the inner element is visible inside the editor.
  *
@@ -874,12 +879,14 @@ function isVisible(outerEl, innerEl) {
   const outerRect = outerEl.getBoundingClientRect();
 
   const verticallyVisible =
-    (innerRect.top >= outerRect.top || innerRect.bottom <= outerRect.bottom)
-    || (innerRect.top < outerRect.top && innerRect.bottom > outerRect.bottom);
+    innerRect.top >= outerRect.top ||
+    innerRect.bottom <= outerRect.bottom ||
+    (innerRect.top < outerRect.top && innerRect.bottom > outerRect.bottom);
 
   const horizontallyVisible =
-    (innerRect.left >= outerRect.left || innerRect.right <= outerRect.right)
-    || (innerRect.left < outerRect.left && innerRect.right > outerRect.right);
+    innerRect.left >= outerRect.left ||
+    innerRect.right <= outerRect.right ||
+    (innerRect.left < outerRect.left && innerRect.right > outerRect.right);
 
   const visible = verticallyVisible && horizontallyVisible;
   return visible;
@@ -891,7 +898,9 @@ const selectors = {
   expressionNode: i =>
     `.expressions-list .expression-container:nth-child(${i}) .object-label`,
   expressionValue: i =>
-    `.expressions-list .expression-container:nth-child(${i}) .object-delimiter + *`,
+    `.expressions-list .expression-container:nth-child(${
+      i
+    }) .object-delimiter + *`,
   expressionClose: i =>
     `.expressions-list .expression-container:nth-child(${i}) .close`,
   expressionNodes: ".expressions-list .tree-node",
@@ -914,7 +923,8 @@ const selectors = {
   stepOut: ".stepOut.active",
   stepIn: ".stepIn.active",
   toggleBreakpoints: ".breakpoints-toggle",
-  prettyPrintButton: ".prettyPrint",
+  prettyPrintButton: ".source-footer .prettyPrint",
+  sourceMapLink: ".source-footer .mapped-source",
   sourcesFooter: ".sources-panel .source-footer",
   editorFooter: ".editor-pane .source-footer",
   sourceNode: i => `.sources-list .tree-node:nth-child(${i})`,
diff --git a/devtools/client/locales/en-US/debugger.properties b/devtools/client/locales/en-US/debugger.properties
index 8a8d31a61b47..9323676a563e 100644
--- a/devtools/client/locales/en-US/debugger.properties
+++ b/devtools/client/locales/en-US/debugger.properties
@@ -470,6 +470,14 @@ sourceFooter.unblackbox.accesskey=b
 # with a blackboxed source
 sourceFooter.blackboxed=Blackboxed source
 
+# LOCALIZATION NOTE (sourceFooter.mappedSource): Text associated
+# with a mapped source. %S is replaced by the source map origin.
+sourceFooter.mappedSource=(From %S)
+
+# LOCALIZATION NOTE (sourceFooter.mappedSourceTooltip): Tooltip text associated
+# with a mapped source. %S is replaced by the source map origin.
+sourceFooter.mappedSourceTooltip=(Source mapped from %S)
+
 # LOCALIZATION NOTE (sourceFooter.codeCoverage): Text associated
 # with a code coverage button
 sourceFooter.codeCoverage=Code coverage

From 38cd380efa3aa7b65174c8edf99856b4a710b53d Mon Sep 17 00:00:00 2001
From: Luke Chang <lchang@mozilla.com>
Date: Wed, 29 Nov 2017 17:02:59 +0800
Subject: [PATCH 017/219] Bug 1421551 - Make FormAutofillParent singleton and
 expose the initialized status. r=MattN

MozReview-Commit-ID: IMd25HcNTMa

--HG--
extra : rebase_source : 1cbb863199fc78074d7ab8a5547c87cb8b3f8c58
---
 .../formautofill/FormAutofillParent.jsm       | 26 ++++++++++++++++++-
 browser/extensions/formautofill/bootstrap.js  |  5 ++--
 .../test/unit/test_activeStatus.js            |  2 +-
 .../formautofill/test/unit/test_getRecords.js |  2 +-
 .../test/unit/test_savedFieldNames.js         |  2 +-
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/browser/extensions/formautofill/FormAutofillParent.jsm b/browser/extensions/formautofill/FormAutofillParent.jsm
index f112f139b067..5944312f5978 100644
--- a/browser/extensions/formautofill/FormAutofillParent.jsm
+++ b/browser/extensions/formautofill/FormAutofillParent.jsm
@@ -27,7 +27,9 @@
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = ["FormAutofillParent"];
+// We expose a singleton from this module. Some tests may import the
+// constructor via a backstage pass.
+this.EXPORTED_SYMBOLS = ["formAutofillParent"];
 
 const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
@@ -78,10 +80,30 @@ FormAutofillParent.prototype = {
    */
   _active: null,
 
+  /**
+   * The status of Form Autofill's initialization.
+   */
+  _initialized: false,
+
+  /**
+   * Exposes the status of Form Autofill's initialization. It can be used to
+   * determine whether Form Autofill is available for current users.
+   *
+   * @returns {boolean} Whether FormAutofillParent is initialized.
+   */
+  get initialized() {
+    return this._initialized;
+  },
+
   /**
    * Initializes ProfileStorage and registers the message handler.
    */
   async init() {
+    if (this._initialized) {
+      return;
+    }
+    this._initialized = true;
+
     Services.obs.addObserver(this, "sync-pane-loaded");
     Services.ppmm.addMessageListener("FormAutofill:InitStorage", this);
     Services.ppmm.addMessageListener("FormAutofill:GetRecords", this);
@@ -552,3 +574,5 @@ FormAutofillParent.prototype = {
     histogram.add(`${formType}-${fillingType}`, Date.now() - startedFillingMS);
   },
 };
+
+this.formAutofillParent = new FormAutofillParent();
diff --git a/browser/extensions/formautofill/bootstrap.js b/browser/extensions/formautofill/bootstrap.js
index 3a21191a5b0b..22c3906b809b 100644
--- a/browser/extensions/formautofill/bootstrap.js
+++ b/browser/extensions/formautofill/bootstrap.js
@@ -16,7 +16,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "AddonManager", "resource://gre/modules/AddonManager.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "AddonManagerPrivate",
                                   "resource://gre/modules/AddonManager.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "FormAutofillParent",
+XPCOMUtils.defineLazyModuleGetter(this, "formAutofillParent",
                                   "resource://formautofill/FormAutofillParent.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "FormAutofillUtils",
                                   "resource://formautofill/FormAutofillUtils.jsm");
@@ -110,8 +110,7 @@ function startup(data) {
   // Listen for the autocomplete popup message to lazily append our stylesheet related to the popup.
   Services.mm.addMessageListener("FormAutoComplete:MaybeOpenPopup", onMaybeOpenPopup);
 
-  let parent = new FormAutofillParent();
-  parent.init().catch(Cu.reportError);
+  formAutofillParent.init().catch(Cu.reportError);
   Services.ppmm.loadProcessScript("data:,new " + function() {
     Components.utils.import("resource://formautofill/FormAutofillContent.jsm");
   }, true);
diff --git a/browser/extensions/formautofill/test/unit/test_activeStatus.js b/browser/extensions/formautofill/test/unit/test_activeStatus.js
index 6c23177c037c..1bee59801df4 100644
--- a/browser/extensions/formautofill/test/unit/test_activeStatus.js
+++ b/browser/extensions/formautofill/test/unit/test_activeStatus.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-Cu.import("resource://formautofill/FormAutofillParent.jsm");
+let {FormAutofillParent} = Cu.import("resource://formautofill/FormAutofillParent.jsm", {});
 Cu.import("resource://formautofill/ProfileStorage.jsm");
 
 add_task(async function test_activeStatus_init() {
diff --git a/browser/extensions/formautofill/test/unit/test_getRecords.js b/browser/extensions/formautofill/test/unit/test_getRecords.js
index 0a751734eec9..d7f9e32c8bcc 100644
--- a/browser/extensions/formautofill/test/unit/test_getRecords.js
+++ b/browser/extensions/formautofill/test/unit/test_getRecords.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-Cu.import("resource://formautofill/FormAutofillParent.jsm");
+let {FormAutofillParent} = Cu.import("resource://formautofill/FormAutofillParent.jsm", {});
 Cu.import("resource://formautofill/MasterPassword.jsm");
 Cu.import("resource://formautofill/ProfileStorage.jsm");
 
diff --git a/browser/extensions/formautofill/test/unit/test_savedFieldNames.js b/browser/extensions/formautofill/test/unit/test_savedFieldNames.js
index b278b6b32474..6aaa3435490b 100644
--- a/browser/extensions/formautofill/test/unit/test_savedFieldNames.js
+++ b/browser/extensions/formautofill/test/unit/test_savedFieldNames.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-Cu.import("resource://formautofill/FormAutofillParent.jsm");
+let {FormAutofillParent} = Cu.import("resource://formautofill/FormAutofillParent.jsm", {});
 Cu.import("resource://formautofill/ProfileStorage.jsm");
 
 add_task(async function test_profileSavedFieldNames_init() {

From 60d7ea01a2a58497e443ed70118e087de7ce8934 Mon Sep 17 00:00:00 2001
From: Ray Lin <ralin@mozilla.com>
Date: Tue, 21 Nov 2017 12:26:10 +0800
Subject: [PATCH 018/219] Bug 1415073 - Refactor records structure of form
 autofill submission to adapt multiple sections. r=seanlee,steveck

MozReview-Commit-ID: Fs2hgA7H5GX

--HG--
extra : rebase_source : 976d4d1175982554d45de7b7364439bf922a963c
---
 .../formautofill/FormAutofillContent.jsm      |   2 +-
 .../formautofill/FormAutofillHandler.jsm      |  25 +++-
 .../formautofill/FormAutofillParent.jsm       | 124 +++++++++++-------
 3 files changed, 97 insertions(+), 54 deletions(-)

diff --git a/browser/extensions/formautofill/FormAutofillContent.jsm b/browser/extensions/formautofill/FormAutofillContent.jsm
index 627e48564b4c..fdab725fd3e0 100644
--- a/browser/extensions/formautofill/FormAutofillContent.jsm
+++ b/browser/extensions/formautofill/FormAutofillContent.jsm
@@ -416,7 +416,7 @@ var FormAutofillContent = {
     }
 
     let records = handler.createRecords();
-    if (!Object.keys(records).length) {
+    if (!Object.values(records).some(typeRecords => typeRecords.length)) {
       return true;
     }
 
diff --git a/browser/extensions/formautofill/FormAutofillHandler.jsm b/browser/extensions/formautofill/FormAutofillHandler.jsm
index 6790e1790565..9787c693475f 100644
--- a/browser/extensions/formautofill/FormAutofillHandler.jsm
+++ b/browser/extensions/formautofill/FormAutofillHandler.jsm
@@ -986,12 +986,27 @@ class FormAutofillHandler {
     }
   }
 
+  /**
+   * Collect the filled sections within submitted form and convert all the valid
+   * field data into multiple records.
+   *
+   * @returns {Object} records
+   *          {Array.<Object>} records.address
+   *          {Array.<Object>} records.creditCard
+   */
   createRecords() {
-    // TODO [Bug 1415073] `FormAutofillHandler.createRecords` should traverse
-    // all sections and aggregate the records into one result.
-    if (this.sections.length > 0) {
-      return this.sections[0].createRecords();
+    const records = {
+      address: [],
+      creditCard: [],
+    };
+
+    for (const section of this.sections) {
+      const secRecords = section.createRecords();
+      for (const [type, record] of Object.entries(secRecords)) {
+        records[type].push(record);
+      }
     }
-    return null;
+    log.debug("Create records:", records);
+    return records;
   }
 }
diff --git a/browser/extensions/formautofill/FormAutofillParent.jsm b/browser/extensions/formautofill/FormAutofillParent.jsm
index 5944312f5978..9843ed8a8974 100644
--- a/browser/extensions/formautofill/FormAutofillParent.jsm
+++ b/browser/extensions/formautofill/FormAutofillParent.jsm
@@ -383,6 +383,7 @@ FormAutofillParent.prototype = {
   },
 
   _onAddressSubmit(address, target, timeStartedFillingMS) {
+    let showDoorhanger = null;
     if (address.guid) {
       // Avoid updating the fields that users don't modify.
       let originalAddress = this.profileStorage.addresses.get(address.guid);
@@ -395,7 +396,8 @@ FormAutofillParent.prototype = {
       if (!this.profileStorage.addresses.mergeIfPossible(address.guid, address.record, true)) {
         this._recordFormFillingTime("address", "autofill-update", timeStartedFillingMS);
 
-        FormAutofillDoorhanger.show(target, "updateAddress").then((state) => {
+        showDoorhanger = async () => {
+          const state = await FormAutofillDoorhanger.show(target, "updateAddress");
           let changedGUIDs = this.profileStorage.addresses.mergeToStorage(address.record, true);
           switch (state) {
             case "create":
@@ -413,15 +415,15 @@ FormAutofillParent.prototype = {
               break;
           }
           changedGUIDs.forEach(guid => this.profileStorage.addresses.notifyUsed(guid));
-        });
+        };
         // Address should be updated
         Services.telemetry.scalarAdd("formautofill.addresses.fill_type_autofill_update", 1);
-        return;
+      } else {
+        this._recordFormFillingTime("address", "autofill", timeStartedFillingMS);
+        this.profileStorage.addresses.notifyUsed(address.guid);
+        // Address is merged successfully
+        Services.telemetry.scalarAdd("formautofill.addresses.fill_type_autofill", 1);
       }
-      this._recordFormFillingTime("address", "autofill", timeStartedFillingMS);
-      this.profileStorage.addresses.notifyUsed(address.guid);
-      // Address is merged successfully
-      Services.telemetry.scalarAdd("formautofill.addresses.fill_type_autofill", 1);
     } else {
       let changedGUIDs = this.profileStorage.addresses.mergeToStorage(address.record);
       if (!changedGUIDs.length) {
@@ -433,22 +435,24 @@ FormAutofillParent.prototype = {
       // Show first time use doorhanger
       if (FormAutofillUtils.isAutofillAddressesFirstTimeUse) {
         Services.prefs.setBoolPref(FormAutofillUtils.ADDRESSES_FIRST_TIME_USE_PREF, false);
-        FormAutofillDoorhanger.show(target, "firstTimeUse").then((state) => {
+        showDoorhanger = async () => {
+          const state = await FormAutofillDoorhanger.show(target, "firstTimeUse");
           if (state !== "open-pref") {
             return;
           }
 
           target.ownerGlobal.openPreferences("panePrivacy",
                                              {origin: "autofillDoorhanger"});
-        });
+        };
       } else {
         // We want to exclude the first time form filling.
         Services.telemetry.scalarAdd("formautofill.addresses.fill_type_manual", 1);
       }
     }
+    return showDoorhanger;
   },
 
-  async _onCreditCardSubmit(creditCard, target, timeStartedFillingMS) {
+  _onCreditCardSubmit(creditCard, target, timeStartedFillingMS) {
     // Updates the used status for shield/heartbeat to recognize users who have
     // used Credit Card Autofill.
     let setUsedStatus = status => {
@@ -485,7 +489,7 @@ FormAutofillParent.prototype = {
         // Add probe to record credit card autofill(without modification).
         Services.telemetry.scalarAdd("formautofill.creditCards.fill_type_autofill", 1);
         this._recordFormFillingTime("creditCard", "autofill", timeStartedFillingMS);
-        return;
+        return false;
       }
       // Add the probe to record credit card autofill with modification.
       Services.telemetry.scalarAdd("formautofill.creditCards.fill_type_autofill_modified", 1);
@@ -505,55 +509,79 @@ FormAutofillParent.prototype = {
     let dupGuid = this.profileStorage.creditCards.getDuplicateGuid(creditCard.record);
     if (dupGuid) {
       this.profileStorage.creditCards.notifyUsed(dupGuid);
-      return;
+      return false;
     }
 
     // Indicate that the user has seen the doorhanger.
     setUsedStatus(2);
 
-    let state = await FormAutofillDoorhanger.show(target, creditCard.guid ? "updateCreditCard" : "addCreditCard");
-    if (state == "cancel") {
-      return;
-    }
-
-    if (state == "disable") {
-      Services.prefs.setBoolPref("extensions.formautofill.creditCards.enabled", false);
-      return;
-    }
-
-    // TODO: "MasterPassword.ensureLoggedIn" can be removed after the storage
-    // APIs are refactored to be async functions (bug 1399367).
-    if (!await MasterPassword.ensureLoggedIn()) {
-      log.warn("User canceled master password entry");
-      return;
-    }
-
-    let changedGUIDs = [];
-    if (creditCard.guid) {
-      if (state == "update") {
-        this.profileStorage.creditCards.update(creditCard.guid, creditCard.record, true);
-        changedGUIDs.push(creditCard.guid);
-      } else if ("create") {
-        changedGUIDs.push(this.profileStorage.creditCards.add(creditCard.record));
+    return async () => {
+      // Suppress the pending doorhanger from showing up if user disabled credit card in previous doorhanger.
+      if (!FormAutofillUtils.isAutofillCreditCardsEnabled) {
+        return;
       }
-    } else {
-      changedGUIDs.push(...this.profileStorage.creditCards.mergeToStorage(creditCard.record));
-      if (!changedGUIDs.length) {
-        changedGUIDs.push(this.profileStorage.creditCards.add(creditCard.record));
+
+      const state = await FormAutofillDoorhanger.show(target, creditCard.guid ? "updateCreditCard" : "addCreditCard");
+      if (state == "cancel") {
+        return;
       }
-    }
-    changedGUIDs.forEach(guid => this.profileStorage.creditCards.notifyUsed(guid));
+
+      if (state == "disable") {
+        Services.prefs.setBoolPref("extensions.formautofill.creditCards.enabled", false);
+        return;
+      }
+
+      // TODO: "MasterPassword.ensureLoggedIn" can be removed after the storage
+      // APIs are refactored to be async functions (bug 1399367).
+      if (!await MasterPassword.ensureLoggedIn()) {
+        log.warn("User canceled master password entry");
+        return;
+      }
+
+      let changedGUIDs = [];
+      if (creditCard.guid) {
+        if (state == "update") {
+          this.profileStorage.creditCards.update(creditCard.guid, creditCard.record, true);
+          changedGUIDs.push(creditCard.guid);
+        } else if ("create") {
+          changedGUIDs.push(this.profileStorage.creditCards.add(creditCard.record));
+        }
+      } else {
+        changedGUIDs.push(...this.profileStorage.creditCards.mergeToStorage(creditCard.record));
+        if (!changedGUIDs.length) {
+          changedGUIDs.push(this.profileStorage.creditCards.add(creditCard.record));
+        }
+      }
+      changedGUIDs.forEach(guid => this.profileStorage.creditCards.notifyUsed(guid));
+    };
   },
 
-  _onFormSubmit(data, target) {
+  async _onFormSubmit(data, target) {
     let {profile: {address, creditCard}, timeStartedFillingMS} = data;
 
-    if (address) {
-      this._onAddressSubmit(address, target, timeStartedFillingMS);
-    }
-    if (creditCard) {
-      this._onCreditCardSubmit(creditCard, target, timeStartedFillingMS);
+    // Don't record filling time if any type of records has more than one section being
+    // populated. We've been recording the filling time, so the other cases that aren't
+    // recorded on the same basis should be out of the data samples. E.g. Filling time of
+    // populating one profile is different from populating two sections, therefore, we
+    // shouldn't record the later to regress the representation of existing statistics.
+    if (address.length > 1 || creditCard.length > 1) {
+      timeStartedFillingMS = null;
     }
+
+    // Transmit the telemetry immediately in the meantime form submitted, and handle these pending
+    // doorhangers at a later.
+    await Promise.all([
+      address.map(addrRecord => this._onAddressSubmit(addrRecord, target, timeStartedFillingMS)),
+      creditCard.map(ccRecord => this._onCreditCardSubmit(ccRecord, target, timeStartedFillingMS)),
+    ].map(pendingDoorhangers => {
+      return pendingDoorhangers.filter(pendingDoorhanger => !!pendingDoorhanger &&
+                                                            typeof pendingDoorhanger == "function");
+    }).map(pendingDoorhangers => new Promise(async resolve => {
+      for (const showDoorhanger of pendingDoorhangers) {
+        await showDoorhanger();
+      }
+      resolve();
+    })));
   },
   /**
    * Set the probes for the filling time with specific filling type and form type.

From 606f156e4aa370ac83a705ea543297df081a3b64 Mon Sep 17 00:00:00 2001
From: Ray Lin <ralin@mozilla.com>
Date: Wed, 29 Nov 2017 15:27:59 +0800
Subject: [PATCH 019/219] Bug 1415073 - Update the unit tests accordingly with
 new submission records. r=seanlee,steveck

MozReview-Commit-ID: 8Rcpx7y2rXT

--HG--
extra : rebase_source : 1b6ca120d2a75d1a330602bda45ae9e84080e8e6
---
 .../test/unit/test_createRecords.js           | 142 ++++++++++++++----
 .../test/unit/test_onFormSubmitted.js         | 109 ++++++++------
 2 files changed, 173 insertions(+), 78 deletions(-)

diff --git a/browser/extensions/formautofill/test/unit/test_createRecords.js b/browser/extensions/formautofill/test/unit/test_createRecords.js
index 7cf24f2f6a6b..260e579a60bb 100644
--- a/browser/extensions/formautofill/test/unit/test_createRecords.js
+++ b/browser/extensions/formautofill/test/unit/test_createRecords.js
@@ -26,16 +26,16 @@ const TESTCASES = [
       "cc-name": "*".repeat(201),
     },
     expectedRecord: {
-      address: {
+      address: [{
         "given-name": "John",
         "organization": "*".repeat(200),
         "address-level1": "",
         "country": "US",
-      },
-      creditCard: {
+      }],
+      creditCard: [{
         "cc-number": "1111222233334444",
         "cc-name": "",
-      },
+      }],
     },
   },
   {
@@ -50,7 +50,8 @@ const TESTCASES = [
       "organization": "Mozilla",
     },
     expectedRecord: {
-      address: undefined,
+      address: [],
+      creditCard: [],
     },
   },
   {
@@ -66,11 +67,12 @@ const TESTCASES = [
       "country": "United States",
     },
     expectedRecord: {
-      address: {
+      address: [{
         "given-name": "John",
         "organization": "Mozilla",
         "country": "United States",
-      },
+      }],
+      creditCard: [],
     },
   },
   {
@@ -86,11 +88,12 @@ const TESTCASES = [
       "country": "United States",
     },
     expectedRecord: {
-      address: {
+      address: [{
         "given-name": "John",
         "organization": "Mozilla",
         "country": "US",
-      },
+      }],
+      creditCard: [],
     },
   },
   {
@@ -108,11 +111,12 @@ const TESTCASES = [
       "tel-national": "1234567890",
     },
     expectedRecord: {
-      address: {
+      address: [{
         "given-name": "John",
         "organization": "Mozilla",
         "tel": "+11234567890",
-      },
+      }],
+      creditCard: [],
     },
   },
   {
@@ -130,12 +134,13 @@ const TESTCASES = [
       "tel": "1234",
     },
     expectedRecord: {
-      address: {
+      address: [{
         "given-name": "John",
         "organization": "Mozilla",
         "country": "United States",
         "tel": "",
-      },
+      }],
+      creditCard: [],
     },
   },
   {
@@ -153,12 +158,13 @@ const TESTCASES = [
       "tel": "1234567890123456",
     },
     expectedRecord: {
-      address: {
+      address: [{
         "given-name": "John",
         "organization": "Mozilla",
         "country": "United States",
         "tel": "",
-      },
+      }],
+      creditCard: [],
     },
   },
   {
@@ -176,12 +182,13 @@ const TESTCASES = [
       "tel": "12345###!!!",
     },
     expectedRecord: {
-      address: {
+      address: [{
         "given-name": "John",
         "organization": "Mozilla",
         "country": "United States",
         "tel": "",
-      },
+      }],
+      creditCard: [],
     },
   },
   {
@@ -197,7 +204,8 @@ const TESTCASES = [
       "organization": "Mozilla",
     },
     expectedRecord: {
-      address: undefined,
+      address: [],
+      creditCard: [],
     },
   },
   {
@@ -215,7 +223,8 @@ const TESTCASES = [
       "organization": "Mozilla",
     },
     expectedRecord: {
-      address: undefined,
+      address: [],
+      creditCard: [],
     },
   },
   {
@@ -231,11 +240,12 @@ const TESTCASES = [
       "cc-exp": "2022-06",
     },
     expectedRecord: {
-      creditCard: {
+      address: [],
+      creditCard: [{
         "cc-number": "4444000022220000",
         "cc-name": "Foo Bar",
         "cc-exp": "2022-06",
-      },
+      }],
     },
   },
   {
@@ -247,9 +257,10 @@ const TESTCASES = [
       "cc-number": "4444000022220000",
     },
     expectedRecord: {
-      creditCard: {
+      address: [],
+      creditCard: [{
         "cc-number": "4444000022220000",
-      },
+      }],
     },
   },
   {
@@ -265,7 +276,8 @@ const TESTCASES = [
       "cc-exp": "2022-06",
     },
     expectedRecord: {
-      creditCard: undefined,
+      address: [],
+      creditCard: [],
     },
   },
   {
@@ -279,9 +291,80 @@ const TESTCASES = [
       "cc-exp": "2022-06",
     },
     expectedRecord: {
-      creditCard: undefined,
+      address: [],
+      creditCard: [],
     },
   },
+  {
+    description: "A form with multiple sections",
+    document: `<form>
+                <input id="given-name" autocomplete="given-name">
+                <input id="organization" autocomplete="organization">
+                <input id="country" autocomplete="country">
+
+                <input id="given-name-shipping" autocomplete="shipping given-name">
+                <input id="family-name-shipping" autocomplete="shipping family-name">
+                <input id="organization-shipping" autocomplete="shipping organization">
+                <input id="country-shipping" autocomplete="shipping country">
+
+                <input id="given-name-billing" autocomplete="billing given-name">
+                <input id="organization-billing" autocomplete="billing organization">
+                <input id="country-billing" autocomplete="billing country">
+
+                <input id="cc-number-section-one" autocomplete="section-one cc-number">
+                <input id="cc-name-section-one" autocomplete="section-one cc-name">
+
+                <input id="cc-number-section-two" autocomplete="section-two cc-number">
+                <input id="cc-name-section-two" autocomplete="section-two cc-name">
+                <input id="cc-exp-section-two" autocomplete="section-two cc-exp">
+               </form>`,
+    formValue: {
+      "given-name": "Bar",
+      "organization": "Foo",
+      "country": "US",
+
+      "given-name-shipping": "John",
+      "family-name-shipping": "Doe",
+      "organization-shipping": "Mozilla",
+      "country-shipping": "US",
+
+      "given-name-billing": "Foo",
+      "organization-billing": "Bar",
+      "country-billing": "US",
+
+      "cc-number-section-one": "4444000022220000",
+      "cc-name-section-one": "John",
+
+      "cc-number-section-two": "4444000022221111",
+      "cc-name-section-two": "Foo Bar",
+      "cc-exp-section-two": "2026-26",
+    },
+    expectedRecord: {
+      address: [{
+        "given-name": "Bar",
+        "organization": "Foo",
+        "country": "US",
+      }, {
+        "given-name": "John",
+        "family-name": "Doe",
+        "organization": "Mozilla",
+        "country": "US",
+      }, {
+        "given-name": "Foo",
+        "organization": "Bar",
+        "country": "US",
+      }],
+      creditCard: [{
+        "cc-number": "4444000022220000",
+        "cc-name": "John",
+      }, {
+        "cc-number": "4444000022221111",
+        "cc-name": "Foo Bar",
+        "cc-exp": "2026-26",
+      }],
+    },
+  },
+
 ];
 
 for (let testcase of TESTCASES) {
@@ -301,12 +384,9 @@ for (let testcase of TESTCASES) {
 
     let record = handler.createRecords();
 
-    for (let type in testcase.expectedRecord) {
-      if (!testcase.expectedRecord[type]) {
-        do_check_eq(record[type], undefined);
-      } else {
-        Assert.deepEqual(record[type].record, testcase.expectedRecord[type]);
-      }
+    let expectedRecord = testcase.expectedRecord;
+    for (let type in record) {
+      Assert.deepEqual(record[type].map(secRecord => secRecord.record), expectedRecord[type]);
     }
   });
 }
diff --git a/browser/extensions/formautofill/test/unit/test_onFormSubmitted.js b/browser/extensions/formautofill/test/unit/test_onFormSubmitted.js
index b1ebae9740fc..15d4608b25e6 100644
--- a/browser/extensions/formautofill/test/unit/test_onFormSubmitted.js
+++ b/browser/extensions/formautofill/test/unit/test_onFormSubmitted.js
@@ -62,7 +62,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "street-address": "331 E. Evelyn Avenue",
@@ -73,7 +73,8 @@ const TESTCASES = [
             "tel": "1-650-903-0800",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -88,7 +89,8 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        creditCard: {
+        address: [],
+        creditCard: [{
           guid: null,
           record: {
             "cc-name": "John Doe",
@@ -97,7 +99,7 @@ const TESTCASES = [
             "cc-exp-year": 2000,
           },
           untouchedFields: [],
-        },
+        }],
       },
     },
   },
@@ -115,7 +117,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "street-address": "331 E. Evelyn Avenue",
@@ -126,8 +128,8 @@ const TESTCASES = [
             "tel": "1-650-903-0800",
           },
           untouchedFields: [],
-        },
-        creditCard: {
+        }],
+        creditCard: [{
           guid: null,
           record: {
             "cc-name": "John Doe",
@@ -136,7 +138,7 @@ const TESTCASES = [
             "cc-exp-year": 2000,
           },
           untouchedFields: [],
-        },
+        }],
       },
     },
   },
@@ -150,7 +152,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "street-address": "331 E. Evelyn Avenue",
@@ -161,7 +163,8 @@ const TESTCASES = [
             "tel": "1-650-903-0800",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -176,7 +179,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "street-address": "331 E. Evelyn Avenue",
@@ -187,7 +190,8 @@ const TESTCASES = [
             "tel": "1-650-903-0800",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -201,7 +205,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "address-level1": "CA",
@@ -212,7 +216,8 @@ const TESTCASES = [
             "tel": "",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -226,7 +231,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "address-level1": "CA",
@@ -237,7 +242,8 @@ const TESTCASES = [
             "tel": "",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -251,7 +257,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "address-level1": "AR",
@@ -262,7 +268,8 @@ const TESTCASES = [
             "tel": "",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -276,7 +283,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "address-level1": "CA",
@@ -287,7 +294,8 @@ const TESTCASES = [
             "tel": "",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -301,7 +309,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "address-level1": "AZ",
@@ -312,7 +320,8 @@ const TESTCASES = [
             "tel": "",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -326,7 +335,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "address-level1": "Arizonac",
@@ -337,7 +346,8 @@ const TESTCASES = [
             "tel": "",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -352,7 +362,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "street-address": "331 E. Evelyn Avenue",
@@ -363,7 +373,8 @@ const TESTCASES = [
             "email": "",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -378,7 +389,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "street-address": "331 E. Evelyn Avenue",
@@ -389,7 +400,8 @@ const TESTCASES = [
             "email": "",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -404,7 +416,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "street-address": "331 E. Evelyn Avenue",
@@ -415,7 +427,8 @@ const TESTCASES = [
             "email": "",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -430,7 +443,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "street-address": "331 E. Evelyn Avenue",
@@ -441,7 +454,8 @@ const TESTCASES = [
             "email": "",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -456,7 +470,7 @@ const TESTCASES = [
     expectedResult: {
       formSubmission: true,
       records: {
-        address: {
+        address: [{
           guid: null,
           record: {
             "street-address": "331 E. Evelyn Avenue",
@@ -467,7 +481,8 @@ const TESTCASES = [
             "email": "",
           },
           untouchedFields: [],
-        },
+        }],
+        creditCard: [],
       },
     },
   },
@@ -478,8 +493,8 @@ add_task(async function handle_earlyformsubmit_event() {
   let fakeForm = MOCK_DOC.createElement("form");
   sinon.spy(FormAutofillContent, "_onFormSubmit");
 
-  do_check_eq(FormAutofillContent.notify(fakeForm), true);
-  do_check_eq(FormAutofillContent._onFormSubmit.called, false);
+  Assert.equal(FormAutofillContent.notify(fakeForm), true);
+  Assert.equal(FormAutofillContent._onFormSubmit.called, false);
   FormAutofillContent._onFormSubmit.restore();
 });
 
@@ -508,33 +523,33 @@ add_task(async function autofill_disabled() {
   Services.prefs.setBoolPref("extensions.formautofill.addresses.enabled", false);
   Services.prefs.setBoolPref("extensions.formautofill.creditCards.enabled", false);
   FormAutofillContent.notify(form);
-  do_check_eq(FormAutofillContent._onFormSubmit.called, false);
+  Assert.equal(FormAutofillContent._onFormSubmit.called, false);
   FormAutofillContent._onFormSubmit.reset();
 
   // "_onFormSubmit" should be called as usual.
   Services.prefs.clearUserPref("extensions.formautofill.addresses.enabled");
   Services.prefs.clearUserPref("extensions.formautofill.creditCards.enabled");
   FormAutofillContent.notify(form);
-  do_check_eq(FormAutofillContent._onFormSubmit.called, true);
-  do_check_neq(FormAutofillContent._onFormSubmit.args[0][0].address, undefined);
-  do_check_neq(FormAutofillContent._onFormSubmit.args[0][0].creditCard, undefined);
+  Assert.equal(FormAutofillContent._onFormSubmit.called, true);
+  Assert.notDeepEqual(FormAutofillContent._onFormSubmit.args[0][0].address, []);
+  Assert.notDeepEqual(FormAutofillContent._onFormSubmit.args[0][0].creditCard, []);
   FormAutofillContent._onFormSubmit.reset();
 
   // "address" should be empty if "addresses" pref is disabled.
   Services.prefs.setBoolPref("extensions.formautofill.addresses.enabled", false);
   FormAutofillContent.notify(form);
-  do_check_eq(FormAutofillContent._onFormSubmit.called, true);
-  do_check_eq(FormAutofillContent._onFormSubmit.args[0][0].address, undefined);
-  do_check_neq(FormAutofillContent._onFormSubmit.args[0][0].creditCard, undefined);
+  Assert.equal(FormAutofillContent._onFormSubmit.called, true);
+  Assert.deepEqual(FormAutofillContent._onFormSubmit.args[0][0].address, []);
+  Assert.notDeepEqual(FormAutofillContent._onFormSubmit.args[0][0].creditCard, []);
   FormAutofillContent._onFormSubmit.reset();
   Services.prefs.clearUserPref("extensions.formautofill.addresses.enabled");
 
   // "creditCard" should be empty if "creditCards" pref is disabled.
   Services.prefs.setBoolPref("extensions.formautofill.creditCards.enabled", false);
   FormAutofillContent.notify(form);
-  do_check_eq(FormAutofillContent._onFormSubmit.called, true);
-  do_check_neq(FormAutofillContent._onFormSubmit.args[0][0].address, undefined);
-  do_check_eq(FormAutofillContent._onFormSubmit.args[0][0].creditCard, undefined);
+  Assert.deepEqual(FormAutofillContent._onFormSubmit.called, true);
+  Assert.notDeepEqual(FormAutofillContent._onFormSubmit.args[0][0].address, []);
+  Assert.deepEqual(FormAutofillContent._onFormSubmit.args[0][0].creditCard, []);
   FormAutofillContent._onFormSubmit.reset();
   Services.prefs.clearUserPref("extensions.formautofill.creditCards.enabled");
 
@@ -566,7 +581,7 @@ TESTCASES.forEach(testcase => {
     FormAutofillContent.identifyAutofillFields(element);
     FormAutofillContent.notify(form);
 
-    do_check_eq(FormAutofillContent._onFormSubmit.called,
+    Assert.equal(FormAutofillContent._onFormSubmit.called,
                 testcase.expectedResult.formSubmission);
     if (FormAutofillContent._onFormSubmit.called) {
       Assert.deepEqual(FormAutofillContent._onFormSubmit.args[0][0],

From 8663ce0fcb2eeed4255df4115d268faadbb0e74a Mon Sep 17 00:00:00 2001
From: Evan Tseng <evan@tseng.io>
Date: Thu, 30 Nov 2017 17:42:40 +0800
Subject: [PATCH 020/219] Bug 1407568 - Add a spotlight indicator to a specific
 section and UI component. r=jaws,lchang

MozReview-Commit-ID: 4AgAFq2r418

--HG--
extra : rebase_source : 055fb2881c1a91aff108fb4a32a7fff842443bc7
---
 .../preferences/in-content/preferences.js     | 117 ++++++++++++++++--
 .../preferences/in-content/privacy.xul        |  34 ++---
 .../preferences/in-content/tests/browser.ini  |   1 +
 ...g1020245_openPreferences_to_paneContent.js |   6 +-
 .../in-content/tests/browser_spotlight.js     |  37 ++++++
 .../uitour/test/browser_openPreferences.js    |   5 +-
 .../formautofill/FormAutofillPreferences.jsm  |   2 +
 .../shared/incontentprefs/preferences.inc.css |  25 +++-
 8 files changed, 195 insertions(+), 32 deletions(-)
 create mode 100644 browser/components/preferences/in-content/tests/browser_spotlight.js

diff --git a/browser/components/preferences/in-content/preferences.js b/browser/components/preferences/in-content/preferences.js
index 57b1f8ad8862..5e1277951bc7 100644
--- a/browser/components/preferences/in-content/preferences.js
+++ b/browser/components/preferences/in-content/preferences.js
@@ -27,6 +27,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "ExtensionSettingsStore",
                                   "resource://gre/modules/ExtensionSettingsStore.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "AddonManager",
                                   "resource://gre/modules/AddonManager.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "formAutofillParent",
+                                  "resource://formautofill/FormAutofillParent.jsm");
 
 var gLastHash = "";
 
@@ -174,17 +176,19 @@ function gotoPref(aCategory) {
     categories.clearSelection();
   }
   window.history.replaceState(category, document.title);
-  search(category, "data-category", subcategory, "data-subcategory");
+  search(category, "data-category");
 
   let mainContent = document.querySelector(".main-content");
   mainContent.scrollTop = 0;
 
+  spotlight(subcategory);
+
   Services.telemetry
           .getHistogramById("FX_PREFERENCES_CATEGORY_OPENED_V2")
           .add(telemetryBucketForCategory(friendlyName));
 }
 
-function search(aQuery, aAttribute, aSubquery, aSubAttribute) {
+function search(aQuery, aAttribute) {
   let mainPrefPane = document.getElementById("mainPrefPane");
   let elements = mainPrefPane.children;
   for (let element of elements) {
@@ -196,14 +200,7 @@ function search(aQuery, aAttribute, aSubquery, aSubAttribute) {
         element.getAttribute("data-subpanel") == "true") {
       let attributeValue = element.getAttribute(aAttribute);
       if (attributeValue == aQuery) {
-        if (!element.classList.contains("header") &&
-            element.localName !== "preferences" &&
-            aSubquery && aSubAttribute) {
-          let subAttributeValue = element.getAttribute(aSubAttribute);
-          element.hidden = subAttributeValue != aSubquery;
-        } else {
-          element.hidden = false;
-        }
+        element.hidden = false;
       } else {
         element.hidden = true;
       }
@@ -221,6 +218,106 @@ function search(aQuery, aAttribute, aSubquery, aSubAttribute) {
   }
 }
 
+async function spotlight(subcategory) {
+  let highlightedElements = document.querySelectorAll(".spotlight");
+  if (highlightedElements.length) {
+    for (let element of highlightedElements) {
+      element.classList.remove("spotlight");
+    }
+  }
+  if (subcategory) {
+    if (!gSearchResultsPane.categoriesInitialized) {
+      await waitForSystemAddonInjectionsFinished([{
+        isGoingToInject: formAutofillParent.initialized,
+        elementId: "formAutofillGroup",
+      }]);
+    }
+    scrollAndHighlight(subcategory);
+  }
+
+  /**
+   * Wait for system addons finished their dom injections.
+   * @param {Array} addons - The system addon information array.
+   * For example, the element is looked like
+   * { isGoingToInject: true, elementId: "formAutofillGroup" }.
+   * The `isGoingToInject` means the system addon will be visible or not,
+   * and the `elementId` means the id of the element will be injected into the dom
+   * if the `isGoingToInject` is true.
+   * @returns {Promise} Will resolve once all injections are finished.
+   */
+  function waitForSystemAddonInjectionsFinished(addons) {
+    return new Promise(resolve => {
+      let elementIdSet = new Set();
+      for (let addon of addons) {
+        if (addon.isGoingToInject) {
+          elementIdSet.add(addon.elementId);
+        }
+      }
+      if (elementIdSet.size) {
+        let observer = new MutationObserver(mutations => {
+          for (let mutation of mutations) {
+            for (let node of mutation.addedNodes) {
+              elementIdSet.delete(node.id);
+              if (elementIdSet.size === 0) {
+                observer.disconnect();
+                resolve();
+              }
+            }
+          }
+        });
+        let mainContent = document.querySelector(".main-content");
+        observer.observe(mainContent, {childList: true, subtree: true});
+        // Disconnect the mutation observer once there is any user input.
+        mainContent.addEventListener("scroll", disconnectMutationObserver);
+        window.addEventListener("mousedown", disconnectMutationObserver);
+        window.addEventListener("keydown", disconnectMutationObserver);
+        function disconnectMutationObserver() {
+          mainContent.removeEventListener("scroll", disconnectMutationObserver);
+          window.removeEventListener("mousedown", disconnectMutationObserver);
+          window.removeEventListener("keydown", disconnectMutationObserver);
+          observer.disconnect();
+        }
+      } else {
+        resolve();
+      }
+    });
+  }
+}
+
+function scrollAndHighlight(subcategory) {
+  let element = document.querySelector(`[data-subcategory="${subcategory}"]`);
+  if (element) {
+    let header = getClosestDisplayedHeader(element);
+    scrollContentTo(header);
+    element.classList.add("spotlight");
+  }
+}
+
+/**
+ * If there is no visible second level header it will return first level header,
+ * otherwise return second level header.
+ * @returns {Element} - The closest displayed header.
+ */
+function getClosestDisplayedHeader(element) {
+  let header = element.closest("groupbox");
+  let searchHeader = header.querySelector("caption.search-header");
+  if (searchHeader && searchHeader.hidden &&
+      header.previousSibling.classList.contains("subcategory")) {
+    header = header.previousSibling;
+  }
+  return header;
+}
+
+function scrollContentTo(element) {
+  const SEARCH_CONTAINER_HEIGHT = document.querySelector(".search-container").clientHeight;
+  let mainContent = document.querySelector(".main-content");
+  let top = element.getBoundingClientRect().top - SEARCH_CONTAINER_HEIGHT;
+  mainContent.scroll({
+    top,
+    behavior: "smooth",
+  });
+}
+
 function helpButtonCommand() {
   let pane = history.state;
   let categories = document.getElementById("categories");
diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul
index ff9bff668870..0392bf03398f 100644
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -707,20 +707,19 @@
 <hbox id="dataCollectionCategory"
       class="subcategory"
       hidden="true"
-      data-category="panePrivacy"
-      data-subcategory="reports">
+      data-category="panePrivacy">
   <label class="header-name" flex="1">&dataCollection.label;</label>
 </hbox>
 
 <!-- Firefox Data Collection and Use -->
 #ifdef MOZ_DATA_REPORTING
-<groupbox id="dataCollectionGroup" data-category="panePrivacy" data-subcategory="reports" hidden="true">
+<groupbox id="dataCollectionGroup" data-category="panePrivacy" hidden="true">
   <caption class="search-header" hidden="true"><label>&dataCollection.label;</label></caption>
 
-  <vbox>
-    <description>
-      <label class="tail-with-learn-more">&dataCollectionDesc.label;</label><label id="dataCollectionPrivacyNotice" class="learnMore text-link">&dataCollectionPrivacyNotice.label;</label>
-    </description>
+  <description>
+    <label class="tail-with-learn-more">&dataCollectionDesc.label;</label><label id="dataCollectionPrivacyNotice" class="learnMore text-link">&dataCollectionPrivacyNotice.label;</label>
+  </description>
+  <vbox data-subcategory="reports">
     <description flex="1">
       <checkbox id="submitHealthReportBox" label="&enableHealthReport2.label;"
                 class="tail-with-learn-more"
@@ -731,18 +730,19 @@
 #ifndef MOZ_TELEMETRY_REPORTING
     <description id="TelemetryDisabledDesc" class="indent tip-caption" control="telemetryGroup">&healthReportingDisabled.label;</description>
 #endif
-  </vbox>
+
 #ifdef MOZ_CRASHREPORTER
-  <hbox align="center">
-    <checkbox id="automaticallySubmitCrashesBox"
-              class="tail-with-learn-more"
-              preference="browser.crashReports.unsubmittedCheck.autoSubmit"
-              label="&alwaysSubmitCrashReports1.label;"
-              accesskey="&alwaysSubmitCrashReports1.accesskey;"/>
-    <label id="crashReporterLearnMore"
-           class="learnMore text-link">&crashReporterLearnMore.label;</label>
-  </hbox>
+    <hbox align="center">
+      <checkbox id="automaticallySubmitCrashesBox"
+                class="tail-with-learn-more"
+                preference="browser.crashReports.unsubmittedCheck.autoSubmit"
+                label="&alwaysSubmitCrashReports1.label;"
+                accesskey="&alwaysSubmitCrashReports1.accesskey;"/>
+      <label id="crashReporterLearnMore"
+             class="learnMore text-link">&crashReporterLearnMore.label;</label>
+    </hbox>
 #endif
+  </vbox>
 </groupbox>
 #endif
 
diff --git a/browser/components/preferences/in-content/tests/browser.ini b/browser/components/preferences/in-content/tests/browser.ini
index 7c7472ec3b40..d3c385ae21d0 100644
--- a/browser/components/preferences/in-content/tests/browser.ini
+++ b/browser/components/preferences/in-content/tests/browser.ini
@@ -73,6 +73,7 @@ skip-if = e10s
 [browser_siteData.js]
 [browser_siteData2.js]
 [browser_siteData3.js]
+[browser_spotlight.js]
 [browser_site_login_exceptions.js]
 [browser_permissions_dialog.js]
 [browser_cookies_dialog.js]
diff --git a/browser/components/preferences/in-content/tests/browser_bug1020245_openPreferences_to_paneContent.js b/browser/components/preferences/in-content/tests/browser_bug1020245_openPreferences_to_paneContent.js
index 01ab9c95d229..5a4d75512491 100644
--- a/browser/components/preferences/in-content/tests/browser_bug1020245_openPreferences_to_paneContent.js
+++ b/browser/components/preferences/in-content/tests/browser_bug1020245_openPreferences_to_paneContent.js
@@ -25,7 +25,8 @@ add_task(async function() {
   is(prefs.selectedPane, "panePrivacy", "Privacy pane is selected by default");
   let doc = gBrowser.contentDocument;
   is(doc.location.hash, "#privacy", "The subcategory should be removed from the URI");
-  ok(doc.querySelector("#locationBarGroup").hidden, "Location Bar prefs should be hidden when only Reports are requested");
+  await TestUtils.waitForCondition(() => doc.querySelector(".spotlight"), "Wait for the reports section is spotlighted.");
+  is(doc.querySelector(".spotlight").getAttribute("data-subcategory"), "reports", "The reports section is spotlighted.");
   await BrowserTestUtils.removeTab(gBrowser.selectedTab);
 });
 
@@ -43,7 +44,8 @@ add_task(async function() {
   let selectedPane = gBrowser.contentWindow.history.state;
   is(selectedPane, "panePrivacy", "Privacy pane should be selected");
   is(doc.location.hash, "#privacy", "The subcategory should be removed from the URI");
-  ok(doc.querySelector("#locationBarGroup").hidden, "Location Bar prefs should be hidden when only Reports are requested");
+  await TestUtils.waitForCondition(() => doc.querySelector(".spotlight"), "Wait for the reports section is spotlighted.");
+  is(doc.querySelector(".spotlight").getAttribute("data-subcategory"), "reports", "The reports section is spotlighted.");
   await BrowserTestUtils.removeTab(gBrowser.selectedTab);
 });
 
diff --git a/browser/components/preferences/in-content/tests/browser_spotlight.js b/browser/components/preferences/in-content/tests/browser_spotlight.js
new file mode 100644
index 000000000000..5b05cf2887b4
--- /dev/null
+++ b/browser/components/preferences/in-content/tests/browser_spotlight.js
@@ -0,0 +1,37 @@
+/* eslint-disable mozilla/no-cpows-in-tests */
+
+add_task(async function test_reports_section() {
+  let prefs = await openPreferencesViaOpenPreferencesAPI("privacy-reports", {leaveOpen: true});
+  is(prefs.selectedPane, "panePrivacy", "Privacy pane is selected by default");
+  let doc = gBrowser.contentDocument;
+  is(doc.location.hash, "#privacy", "The subcategory should be removed from the URI");
+  await TestUtils.waitForCondition(() => doc.querySelector(".spotlight"),
+    "Wait for the reports section is spotlighted.");
+  is(doc.querySelector(".spotlight").getAttribute("data-subcategory"), "reports",
+    "The reports section is spotlighted.");
+  await BrowserTestUtils.removeTab(gBrowser.selectedTab);
+});
+
+add_task(async function test_address_autofill_section() {
+  let prefs = await openPreferencesViaOpenPreferencesAPI("privacy-address-autofill", {leaveOpen: true});
+  is(prefs.selectedPane, "panePrivacy", "Privacy pane is selected by default");
+  let doc = gBrowser.contentDocument;
+  is(doc.location.hash, "#privacy", "The subcategory should be removed from the URI");
+  await TestUtils.waitForCondition(() => doc.querySelector(".spotlight"),
+    "Wait for the ddress-autofill section is spotlighted.");
+  is(doc.querySelector(".spotlight").getAttribute("data-subcategory"), "address-autofill",
+    "The ddress-autofill section is spotlighted.");
+  await BrowserTestUtils.removeTab(gBrowser.selectedTab);
+});
+
+add_task(async function test_credit_card_autofill_section() {
+  let prefs = await openPreferencesViaOpenPreferencesAPI("privacy-credit-card-autofill", {leaveOpen: true});
+  is(prefs.selectedPane, "panePrivacy", "Privacy pane is selected by default");
+  let doc = gBrowser.contentDocument;
+  is(doc.location.hash, "#privacy", "The subcategory should be removed from the URI");
+  await TestUtils.waitForCondition(() => doc.querySelector(".spotlight"),
+    "Wait for the credit-card-autofill section is spotlighted.");
+  is(doc.querySelector(".spotlight").getAttribute("data-subcategory"), "credit-card-autofill",
+    "The credit-card-autofill section is spotlighted.");
+  await BrowserTestUtils.removeTab(gBrowser.selectedTab);
+});
diff --git a/browser/components/uitour/test/browser_openPreferences.js b/browser/components/uitour/test/browser_openPreferences.js
index a6e4130dca10..9c2086ca7e7e 100644
--- a/browser/components/uitour/test/browser_openPreferences.js
+++ b/browser/components/uitour/test/browser_openPreferences.js
@@ -45,8 +45,9 @@ add_UITour_task(async function test_openPrivacyReports() {
   let tab = await promiseTabOpened;
   await BrowserTestUtils.waitForEvent(gBrowser.selectedBrowser, "Initialized");
   let doc = gBrowser.selectedBrowser.contentDocument;
-  let reports = doc.querySelector("groupbox[data-subcategory='reports']");
   is(doc.location.hash, "#privacy", "Should not display the reports subcategory in the location hash.");
-  is(reports.hidden, false, "Should open to the reports subcategory in the privacy pane in the new Preferences.");
+  await TestUtils.waitForCondition(() => doc.querySelector(".spotlight"),
+    "Wait for the reports section is spotlighted.");
+  is(doc.querySelector(".spotlight").getAttribute("data-subcategory"), "reports", "The reports section is spotlighted.");
   await BrowserTestUtils.removeTab(tab);
 });
diff --git a/browser/extensions/formautofill/FormAutofillPreferences.jsm b/browser/extensions/formautofill/FormAutofillPreferences.jsm
index 158eb4bc1798..8e6ebbbe53c2 100644
--- a/browser/extensions/formautofill/FormAutofillPreferences.jsm
+++ b/browser/extensions/formautofill/FormAutofillPreferences.jsm
@@ -87,6 +87,7 @@ FormAutofillPreferences.prototype = {
     addressAutofill.id = "addressAutofill";
     addressAutofillLearnMore.id = "addressAutofillLearnMore";
 
+    addressAutofill.setAttribute("data-subcategory", "address-autofill");
     addressAutofillLearnMore.setAttribute("value", this.bundle.GetStringFromName("learnMoreLabel"));
     addressAutofillCheckbox.setAttribute("label", this.bundle.GetStringFromName("autofillAddressesCheckbox"));
     savedAddressesBtn.setAttribute("label", this.bundle.GetStringFromName("savedAddressesBtnLabel"));
@@ -130,6 +131,7 @@ FormAutofillPreferences.prototype = {
       creditCardAutofill.id = "creditCardAutofill";
       creditCardAutofillLearnMore.id = "creditCardAutofillLearnMore";
 
+      creditCardAutofill.setAttribute("data-subcategory", "credit-card-autofill");
       creditCardAutofillLearnMore.setAttribute("value", this.bundle.GetStringFromName("learnMoreLabel"));
       creditCardAutofillCheckbox.setAttribute("label", this.bundle.GetStringFromName("autofillCreditCardsCheckbox"));
       savedCreditCardsBtn.setAttribute("label", this.bundle.GetStringFromName("savedCreditCardsBtnLabel"));
diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/browser/themes/shared/incontentprefs/preferences.inc.css
index 98796e50e6d4..bde6cd20e080 100644
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -95,6 +95,24 @@ button > hbox > label {
   margin: 4px 0;
 }
 
+.spotlight {
+  background-color: rgba(0,200,215,0.3);
+  /* Show the border to spotlight the components in high-contrast mode. */
+  border: 1px solid transparent;
+  border-radius: 2px;
+}
+
+[data-subcategory] {
+  margin-left: -4px;
+  margin-right: -4px;
+  padding-left: 4px;
+  padding-right: 4px;
+}
+
+[data-subcategory] > .groupbox-title {
+  padding-inline-start: 4px;
+}
+
 #searchInput {
   border-radius: 0;
 }
@@ -725,9 +743,14 @@ button > hbox > label {
 .search-container {
   position: sticky;
   background-color: var(--in-content-page-background);
-  width: 100%;
   top: 0;
   z-index: 1;
+  /* The search-container should have the capability to cover all spotlight area. */
+  width: calc(100% + 8px);
+  margin-left: -4px;
+  margin-right: -4px;
+  padding-left: 4px;
+  padding-right: 4px;
 }
 
 #searchInput {

From 8aea8ade34d31c577b44b54b5168d243f712d31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 1 Dec 2017 10:48:06 +0100
Subject: [PATCH 021/219] Bug 1422257: Make FinderHighlighter not use
 -moz-border-*-colors. r=Gijs

I was going to use box-shadow to make the same effect we have now, but I got
into the intersection logic and I wasn't very excited about rewriting it in
terms of shadow offsets, so came up with this, which IMO looks equally good /
better.

MozReview-Commit-ID: 19xX2zh2tzK

--HG--
extra : rebase_source : 371266623aefd1af27e2c4a21cf792cf3fd3ecf4
---
 toolkit/modules/FinderHighlighter.jsm | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/toolkit/modules/FinderHighlighter.jsm b/toolkit/modules/FinderHighlighter.jsm
index 605bc379d20d..8ddd7e134492 100644
--- a/toolkit/modules/FinderHighlighter.jsm
+++ b/toolkit/modules/FinderHighlighter.jsm
@@ -41,19 +41,15 @@ const kRGBRE = /^rgba?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*/i;
 const kModalIdPrefix = "cedee4d0-74c5-4f2d-ab43-4d37c0f9d463";
 const kModalOutlineId = kModalIdPrefix + "-findbar-modalHighlight-outline";
 const kOutlineBoxColor = "255,197,53";
-const kOutlineBoxBorderSize = 2;
-const kOutlineBoxBorderRadius = 3;
+const kOutlineBoxBorderSize = 1;
+const kOutlineBoxBorderRadius = 2;
 const kModalStyles = {
   outlineNode: [
     ["background-color", `rgb(${kOutlineBoxColor})`],
     ["background-clip", "padding-box"],
-    ["border", `${kOutlineBoxBorderSize}px solid`],
-    ["-moz-border-top-colors", `rgba(${kOutlineBoxColor},.1) rgba(${kOutlineBoxColor},.4) rgba(${kOutlineBoxColor},.7)`],
-    ["-moz-border-right-colors", `rgba(${kOutlineBoxColor},.1) rgba(${kOutlineBoxColor},.4) rgba(${kOutlineBoxColor},.7)`],
-    ["-moz-border-bottom-colors", `rgba(${kOutlineBoxColor},.1) rgba(${kOutlineBoxColor},.4) rgba(${kOutlineBoxColor},.7)`],
-    ["-moz-border-left-colors", `rgba(${kOutlineBoxColor},.1) rgba(${kOutlineBoxColor},.4) rgba(${kOutlineBoxColor},.7)`],
+    ["border", `${kOutlineBoxBorderSize}px solid rgba(${kOutlineBoxColor},.7)`],
     ["border-radius", `${kOutlineBoxBorderRadius}px`],
-    ["box-shadow", `0 ${kOutlineBoxBorderSize}px 0 0 rgba(0,0,0,.1)`],
+    ["box-shadow", `0 2px 0 0 rgba(0,0,0,.1)`],
     ["color", "#000"],
     ["display", "-moz-box"],
     ["margin", `-${kOutlineBoxBorderSize}px 0 0 -${kOutlineBoxBorderSize}px !important`],

From 1265e774bcd5932bdbde49b2f37e2df3d786cfa3 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 29 Nov 2017 18:14:23 +0000
Subject: [PATCH 022/219] Bug 1421711 - remove pluginInstallerWizard.css and
 pluginGeneric*.png, r=daleharvey

MozReview-Commit-ID: 4yuH7IFEOme

--HG--
extra : rebase_source : f47b18b4178588b810df84404b9b618b41451d1a
---
 .../extensions/test/browser/browser_bug523784.js |   6 +++---
 .../linux/mozapps/plugins/pluginGeneric-16.png   | Bin 565 -> 0 bytes
 .../linux/mozapps/plugins/pluginGeneric.png      | Bin 1295 -> 0 bytes
 .../osx/mozapps/plugins/pluginGeneric-16.png     | Bin 759 -> 0 bytes
 .../themes/osx/mozapps/plugins/pluginGeneric.png | Bin 1939 -> 0 bytes
 .../windows/mozapps/plugins/pluginGeneric-16.png | Bin 539 -> 0 bytes
 .../windows/mozapps/plugins/pluginGeneric.png    | Bin 971 -> 0 bytes
 .../mozapps/plugins/pluginInstallerWizard.css    |  12 ------------
 8 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 toolkit/themes/linux/mozapps/plugins/pluginGeneric-16.png
 delete mode 100644 toolkit/themes/linux/mozapps/plugins/pluginGeneric.png
 delete mode 100644 toolkit/themes/osx/mozapps/plugins/pluginGeneric-16.png
 delete mode 100644 toolkit/themes/osx/mozapps/plugins/pluginGeneric.png
 delete mode 100644 toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png
 delete mode 100644 toolkit/themes/windows/mozapps/plugins/pluginGeneric.png
 delete mode 100644 toolkit/themes/windows/mozapps/plugins/pluginInstallerWizard.css

diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug523784.js b/toolkit/mozapps/extensions/test/browser/browser_bug523784.js
index c73125425570..dd6377a5cccc 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug523784.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug523784.js
@@ -11,7 +11,7 @@ var args = {
   list: [{
     name: "Bug 523784 softblocked addon",
     version: "1",
-    icon: "chrome://mozapps/skin/plugins/pluginGeneric.png",
+    icon: "chrome://mozapps/skin/plugins/pluginGeneric.svg",
     disable: false,
     blocked: false,
     url: "http://example.com/bug523784_1",
@@ -96,7 +96,7 @@ function bug523784_test2(win) {
   args.list.push({
     name: "Bug 523784 softblocked addon 2",
     version: "2",
-    icon: "chrome://mozapps/skin/plugins/pluginGeneric.png",
+    icon: "chrome://mozapps/skin/plugins/pluginGeneric.svg",
     disable: false,
     blocked: false,
     url: "http://example.com/bug523784_2"
@@ -104,7 +104,7 @@ function bug523784_test2(win) {
   args.list.push({
     name: "Bug 523784 softblocked addon 3",
     version: "4",
-    icon: "chrome://mozapps/skin/plugins/pluginGeneric.png",
+    icon: "chrome://mozapps/skin/plugins/pluginGeneric.svg",
     disable: false,
     blocked: false,
     url: "http://example.com/bug523784_3"
diff --git a/toolkit/themes/linux/mozapps/plugins/pluginGeneric-16.png b/toolkit/themes/linux/mozapps/plugins/pluginGeneric-16.png
deleted file mode 100644
index 34cabf8553d93fadbec47e294f87842f60358384..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 565
zcmV-50?Pe~P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10kTO%K~y-6rIFui6G0Tle`jVwX4{fNv2EhEq~eVP#S5V*io{fj
zqVJJM@WxATe1yJ-|5|M<La|s1ic&-nin_MFZ7{n*cg73t(rwZb@W8;CZ|3`P<{R<e
z^FL({ns)nfn2K2vr~y9_9^I_pe)w|r`2#%nfl&`z+W&4g8uy|DpDeFDy(=P%9v@z)
zU8FpH8i3bpujus>ibc!yt2Y4H-TT3Zt@j8LdGA}d8h4(^i}thcm*=mAU%zd$vlrn~
zht>*fN0`5Kg}0k;NRlpT>QGuynGUJW&au9+7A@49Gsb%#j*X77vm3EcZ)R^>SzRJY
zV&b^lr`OJ%$2k|~GN_b8K7M+~;k_}2smXFqpPDQW4)IL&EOF8$>BZP$Kww8Ora*Oe
zjwFfc{YoenEY=2t0oGcAAi#T%h-4Q^rEyB7@k~GZ?HS<9_Gd&STT0a59?9t<LZv*@
z4=`FICz!IcL(}B|TAL$AH2@;0V*yGJG^u~E<0?NvW;oe25Ku6Mp$vT)Xr-f0XFr^n
zI5iXipwrn$D;)ut)VbEi=K5ml(r{RSRys<ZYXSTL43Cf`t*`jO00000NkvXXu0mjf
DnuPYy

diff --git a/toolkit/themes/linux/mozapps/plugins/pluginGeneric.png b/toolkit/themes/linux/mozapps/plugins/pluginGeneric.png
deleted file mode 100644
index d9aef96a2bdbbfd9bdbe28171a739ae875afb062..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1295
zcmV+q1@QWbP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11dK^UK~z|U&6itm6Gs?^pP4;)ZRadQNWv*VK}AAv(W+`I)QeWB
zpf{C}dQnxCxamcu{(wmBujt`|%S!zPEu;hk7p>F-s6wb5D}{0<i5-)8W3#iKonCn3
z*v{Ix5|oa#nwf9DnfIOd`(}1m7-M*mMZQq<{{sR0X%6}Gr$4rA>r)fyy-{TPgp_xQ
z%mrmfpB*`TWD#KIr<qNjvAzWHs@8g&5W*LTn_*3V^X@xGzU>NNjOqBCId}4d-!A@A
zQ7SM|6qzWBj8cKQ_u!7spPRY0=6Ck|kGB>V7qr&e7!w(-wOOtB=GWhUuADh{@`G*|
zA}I-H&(6Fr1m6iEGGn9T?0xBFq?D*Ipjxd^S}rm-H&<Uk2ms!A?J${4marBQ1W)iQ
zW&XZB$I9{wmb8{56MZ!G_R$~Ou{IExot@2Eu9<)H^|!L+@(P8*JQEW;NPB7gN||zb
znWa(@-(Tgx{)1#P8E*V_o#CNjHgDR33IkRvK9846EES844Clz@Hu1-$3#(BmN2jKy
zR=ehaw9WBtTX)z}3JQfq%6^$kmoK7}!m%A}$0p@^Om5$W)-`;;%=ngZ?mxK4-TQY?
zL4XPsw(a0L4k`>tdmf{sW7hnmN5_G$x)BfvGre_UTk6j%ml^0E<j}!aux%SDBwE)9
zRKT6Pw|O}KfZdaO0JwE~j=_N;_U+rB=zI106()D?_U7jwP6J;94cS|cVgCH-qa!1^
zVb^gfE)^Ib+lpg5$T-djfs__~{aH$nmm2eyO2w|eOQj-d&tsr}aA@}IsrNc7Aoya}
z&fRIH6xmFcFjP2>jSzxLwL<ktg-UgmO0^!wFbr`VrzhWPwaWJGJ2ER*S3U<C$=FaJ
zpFefLOL>R-vi&F(Fg`Xxp}2_emr*Lf7(=aALn%d2Rcy|UqO}I-$yX^we|7-ZaS!J6
zrw(jXz>?E@_v~}SP+^Q=aA1g<t}jxpR;bl#7!0nR!W&7Gay?wv0qEH`iXtX=?s9M3
zyfzJd*h0V<b1awJEToX6(;1#u$z(F}`i*PHHYxzFQUMEvM|65au3b6;(PV7ui?x<$
zn$t8x2)vXB7&nOkT5HPwO8thbuiU7c7ip;x8$epgw$8C+>-(>TfH4LsBu2Cm=n=Su
zK-&hI*Xc+AKuU>eh}da&y(!Y7L=&;*5GNBbok6<oPPC10+(6xD?f7;l&|!CpfE|b>
zs?>=<-Dr@)O3Z<tcGqD}i*FkN89Pc{(||xqi4?N6Zf_^rtk`C)_eGOEt_2dUH9`p4
ztbnY=tdeseIh!{mY7coMWkUf8M7F5w<gCe3KZb2N&;_Jh4kVq5^>E_|A+#McNolPS
zbUB8-o{E;(CzpD-Ndd}^u^g?n4#UtI=pO<MEthfU&brmCk2km1$Lj4M2+(y296;Fd
zh+bG&JaKa7`%eJNw5{6SPqO`szAlv>p8zyqM67@Z^Z{wWqB&sCwwM^W3i!Yi5r10C
z7}(<Z|1Cu^32lst8lUCjX_@nki-~~~e@y<%^1^>k{{cE9c#3T33sV39002ovPDHLk
FV1nE4UR3}9

diff --git a/toolkit/themes/osx/mozapps/plugins/pluginGeneric-16.png b/toolkit/themes/osx/mozapps/plugins/pluginGeneric-16.png
deleted file mode 100644
index 6956ffef8143d0dac1d898f6d1173bb465cf9641..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 759
zcmV<T0to$yP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O$
zeEU(800009a7bBm000XU000XU0RWnu7ytkQnMp)JR5;6ZlRIb>K^Vt>v%7cUHp#_A
ze8mSCMMV>}P*aGas9<4bVPz#&Hj15MCn(rhDHup&BZ7*8or+>5zKLKAzLFeCE~n=`
zclY)&-&owKLCwHd%rNttkD32Z@&BP7j(J<Xh`j*qX&&!i-~JXbe{Xc=0oZRQyw}D`
zHD_@MkOGqV0M?Dy^~a&4b_0lxE2pl!q}#4RP-8Y1a_K?wvmdgm>L+x$*2Dt7?K^pB
z<7Wk^W5XYhzyBHzb*2J{Jig_926u0v@}r23BNp^5;?rzMP%jaA6`VxS+P?Ve+JSQx
zkSZlIBx#4yuVvnS$P-AKtZPVjW)Zg=%Mk)EW^&qNCSN9uVb8wJXMmIgq{b%-Rb{E{
z`b|r)?LLadh@o3!WaT?}MapH14Lf(RZR=|Kdi%*_(nN_=0mlK9j>A!dGdMF<z*2^u
zo^F;d?VvPSM2W+i{yuhXUxDkk(TIg8F+`1E6i^NzCJu8r&L9TjSTmi=V_S-q>y|S(
zu#2v2hDL1gLIDh7pymZRKrBFX)W~64zbt@J#F3^rQ=q-Q4X+_+F=#PFiJ=w<zTX5m
zfJD{Oh+{fPq8KBB5kZUrF(eui-ONv{4Pnykz^{}>ego?HsqqZmHBg-f!2AiE)`mnI
z8i^rJOtVR?YxQzr91t6z{^dzAsZQO_Ea~sH)9wakS^TQieJiO3LKquFz%S3<dvX2r
z(UCjnKLDZKx=5mO&a1q?`^a$@K23KmUu!vSy-L|E?p;PLG=yID<>a%QC!StDJY1a_
zD*yo?YEG;zpbc<=j%5cg9_n1N<?P0Rex}EsU3h-=$bFy=_(0ftZq(lv0`?q`+gkVM
p9Mp5IRP*WF67834Nvr<R`6q54TvE49^6>xw002ovPDHLkV1oS|Rm%VX

diff --git a/toolkit/themes/osx/mozapps/plugins/pluginGeneric.png b/toolkit/themes/osx/mozapps/plugins/pluginGeneric.png
deleted file mode 100644
index 6ada1616bb125b42529b68bf3bb66298cccfce9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1939
zcmV;E2W<F>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O$
zeEU(800009a7bBm000XU000XU0RWnu7ytkVHAzH4R9M5smr0CVR~3f8`>Lv|x~jUW
zx_WTOmdgXSJI2_Kha?zb6QKkHu_6*Lh?Gbm0>V<11&IY>!^R5+C2WEOECPbaUJw*Z
z2o?rpC1x-ru|qtChImMO=)wJ}yN36w-f-_>QLnnIyW=?R4OeyRJ-s`e|D6BabI(yC
z!vC`=fTe&?N?Ct;xAy2{-E0$M6o9fU8O&O5KeVyusEC-Q0EjPT^0PmFW#Gsu=dJgq
zt&(1VxjGF;PC27WsdXX}eAGRyC1|eBpZ<IL^m|jKO5I&FUa7mBx-eD((sxXOQcAu0
zkI}WH@{hWn>1|I+C#~r#*X%PFZ~9+;`Sr=K-PL30Nebuyw2x@0ls&Fqsq>8kpM1%8
zYd?5w&$@d?#{7FiZIm{Gpk({%%p#iNo!tKN#Px%fSl<sFXTE)BLg-z#oRtX|WRfx4
zV?1!dcTm2I4g~GTfjHeg#ixc>4L$YyGYuS16NCmoGz6jW&x=idbnNClnmT=;>#t|V
zhS#i#lgXq>B<6;KAmsXt%k>F|(olhk2_LT+v@Bo(L<^~G4@0HZ_<`Zyqh*{xQEf60
zK(@;;a=Fo_sWJ;dDWx7ebZo~Pm#r;-Ja?6WtWQjQ&>o_F{HAbyw8pyO)eJ6Q&h~Zv
z<T7!z5yS{FOHpfRuGt=5ApG`3mBCDtY?qH{4+%X)3!@QDd!POFPNmdw5s~=bgNFx7
z+aGw#1gey$!I)j<{b~d8YZ$MJcrH4K5e9LxDT^=MTV%50Q*pycvzCUbgvF;eW^p_N
z0u$wcalejuRm7{J12aq0iY*WR`ROA!Mn8Y>@J{R4^G}4AZcLOKG%5DR$fPWkXha9C
zZUU4A`N2L`l!{y)uQN97QE`HK{n}KMvsY$FSRn)XIEfgu>&3M8N~Tk6-!;stffUR8
zv!!D%JQ>D;#N@a=K2vE7<#Q>vZ0Vs|&EwYfq9gO>Wsl;GDnkQZh?PJa0VBkWkd!8q
zBQ`fK_E0Dekj)GL1G8%jnFO2HWa;ZoQEeK0#~lX}alj}E$FyO{wjIj0LoSzOa9N&a
zBaYWF9cNv5`#&|**%~w}sAdJ#oWW>?QE7}yvwqv%^d}UtD8l43aW<B+6mm)Go-pGY
zM8I#lV}OYRp<kOGNhN!>31GCL4Wy7ukuT&4brKAuTnj`%O!O2$qHq$uTNdfGMKWfw
zVMUgnY!|hrP-zJ5h%X3@dU*s0<A63gsI=EdGcd+r+jYuzokG5wVqY(Py-B8W-MAG8
z-)$X1Oo)g@S2j($e<iEduVCw%Jh@C4GYzvyaP&h5VFl1}K>Ov<lidSrzd5JXoI=_d
zrlxAxc8x+l&G7mH^~T5WytQ-lfMPDejtvF+d%LML3{#O0&4#o{aC`fk?_W4M3&5S4
zwDZH!q>fn~20=o>o~luvs!=GUDdu`<1W7WfI9u1|X9eH<0O#%02@!k^^}1sNS^+U&
z`PT3JWmJs8XoDDoF$OV$7!!4w`z8iUL9Qpw<NNOCX3Y>9LA9=y`NBK@1-wuQG`#d=
zUkSKj0R{+yhBJ;VxTR+8ws=>qg>t!$;|acQ@oYpEbrHb`Xd^hj;D-=+jd36Vj1_Gk
z68dA(!F`JgHQ$V~ke9YlKC}l~sCz=FTcDyN7>bCr^MNpIR7U8`j6N($5;Z$6hKQb)
zwhMbRFu0yz470sin;rqe&f8Fj&1OY8O>_`oLX8fBh=G<QD;7fpl+}s_f&x^_0!Bb7
z)I9t`!w0><sYM_Rg9@NKGa_BTHgeLhyM$f~fKnF9Qmv=55YysCv_^~pqrqrI6h_oM
z4FfII8bY93;95Q~H$Hv!-IHwqvlbBT*&^a7%gW3}HWj_znva%%D5F9V8lf312tFPD
ztaae{o@=)Ow7o0_^d|>~H}~Iv;F)A`%_HpvAMOmW|B=ry9o-j!7MkH=KWaPo%+<5M
zJALHaFWQ$*odu>uM5~TdmjnvHvh14OoBHql`gg5V;S;w@D!;Vv(@eXjB|P|Gu+8e^
zxp!Xq-uJJ*dGtIm0n7lNh{(dEG#;f(y})4Kj;}tDyZhmTRy;Mh_-M4S@B88|?7G46
z77N$DJ9+8#Up#;A=%LquNnjdqMI^jsVWN~$Kmy1BeZb&dpF8xG?xD?3C@Y>>m{jk5
z=svDZ&kw&w2af&Uza2jLlgED*3AO<T2xLJObj!*p0+IxBK!37-{pw|V4nCL2ul#JM
zE%xl*$z)BVA~Kzci^u=<^3yNOjJ|UPm;$P8bKg;Erj)XP?#Mp|^PBhISJ<@wnOM5G
z31HW*ZP;~#SDQG0<+Y!`c=`BG--xuH0UEa})jo1<82Lx0?H>cXzx8lo!-EHQZ2LH8
zPQ3cF3%_~p4;?%^ojl(bz!EE|1dxsVqZoZJM?BY~OGcJdn%zOOfG!}_K52j--K<M$
Z{{yC@yy)~_Gx-1j002ovPDHLkV1k$%o4x=5

diff --git a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png
deleted file mode 100644
index 5d796cc4c57dd3da1669fd4e51ba8d954ed4c866..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005vNkl<ZIE|%~
zzityj7{q_;GyZc#&S8j?bdW$S6hy&WAR&<lNI@MTo`W_B3MeA+3cLXYEiEK+VF{1}
z$l>hx&ga|R@1r=|$O(y%nC7IBW_EVw)~G7~gVI@I@1VE8`|6wBJLtW*jGMvC5<Gc%
zyyLt+?|qNkjioCLN0tX$4FEnK4ViK4t5F^V=Goh)Yp(&yGpA}b*r}>-Z`@kOdRT42
zudxB(&c-sCgBvSQQd1Fvhrk(wT6y#HQOu8@Bceuyemvp!%_aby?g`hUD)BI<wX(#$
zyRG$e9n`Dk&1Mvmrb4GX!dXKzs?&_>IBV#1N2ICHj6$x4<;`;)ym_BqIEQsYnmN*3
z$gGm)p8egHS-8Tx51&v#6+{&;Afkve<rNXIUJwOnv0xy+5HmGF0Rf|+qKGOYicv7~
zC*9n@PNWbS5GhXdQY0z9g@IBeTPSh;{^M=&HS$atC!XZgG8kCmI46#Ch677->KG@U
zEb%y3<68UC_B=t_{}Lu6PcoX|ToHE~=C3G;G8udg=LXJ~f|LFPpW9-Zi{_X@y#va@
z+(0~KmkDD3?O~NfK??1(#K5S8h{$ESIgEs;1_q`-Qczi5t2EkeRUc4najD*zz~{rm
dL!S?he*@oy8Xc6L)Ik6M002ovPDHLkV1h2T_f`M^

diff --git a/toolkit/themes/windows/mozapps/plugins/pluginGeneric.png b/toolkit/themes/windows/mozapps/plugins/pluginGeneric.png
deleted file mode 100644
index d8b270ae522b700e1b84e642df8d386e4628070f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 971
zcmV;+12p`JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000A$Nkl<ZScUDD
z&ud*p6vsbje%vH4c`tb}wT%r@q!rvqNugG)ih@)qxKUhYqaYQE|A5=>g)V}iE{aRH
zg18mhZCu!07nRr)8}qxb$-8&vxVZPd+$1;V#wK**Y-Zk_!+byUJu_#Xs4CC0nP;m0
zKLFtB1YP@XVP?4#u7;p*0p1w7J=QQkfAiT3vjCre`{3G2Cw>s4z5%4x%CGH){b}~o
z$y-MPU^RR_K5W`s8Gw*D{m`mj1!e)f=*{sFW4oCE%7Eh&6T|z!e+QVk`S2s)M}WDz
zi;RtU+N}f;SXob5UhCSKj#Yr)?mnX3N*HT;RAG6o%gRRDo_XSWSM0{E>!-dt6o9jG
z1pyJ|x$y?W!yZ3m*?bZRL{tUm1OQbbV9AVQaLCfK4&zh22aN*4JBN0_IeAwR#u|a)
zmz%70BAsqzqMh*4=|KkUD9ev?fGd|zvK6!<29`SpfeZWT?0XBGGiSXw+?iYA{`>|u
zMox`dY>eEW-{8*N5{Wk?2gNwSJ2Ujf_kXu)JMiTXE9ZUU5R?ZGAM?k2tODf1c?Wtx
z%&Qj3jk*N<Qp*8vdCyzHSwrG&r9+9gcq=6CfSAPKoWXgyToqI4fVJ{A<k+uGPcpx-
z&R>fi);GGeMiNd;G&nuk#MwON;`AhcF0AutvBTO%m*z;q^AioGCYx9*pn&jtZ2)J@
zB_+4#%v6)JXPP(xX9Z`#S+K<zg%?kZ5?*PM1;`>~L5m(jR3d=NbZvm&@7+5|zBT~8
z2UAsvn*UZ+w3v&k#kYzv{rGV{zE}?+#-8GKrwU57kdlL;+mJiP1$=D>Lf8)O?;Zsu
zcc55Mi*bylvG(G$04+9k7=W0Sg3CKEInjqHr6b0Qv;bOsukS#%eW%OkV9!}7CVC*-
zyWg3vaw=*9RG)!-ti*yZsuE&x(xVbJpX-6`KE(9_x}`HvS|mgz3y~}+Au1v4zq7in
z4<I4}3<6VcUccQB$U-CyN|xo~Pa`NI=YV-&Q;Tb{+W`Y4A&YcVCCwt;EdHy7hinPE
z%KvTv0R~oAQ_^hj<8lOTfL@K?2fzTy)@C>kaX7#M=>hDh1IGi9|9PZ31^yTTJO`v8
zFI?f+0E$<l8bE;ntm^RrtQH!50qMO`MIG?KI51W8{)mKAV2Qj2ECFe+4oLZ#EI|xV
tk*}v{T0m@-#rFV|AUHztG6cFy@E_@*CnQ@dzlHz+002ovPDHLkV1jz%#Bu-t

diff --git a/toolkit/themes/windows/mozapps/plugins/pluginInstallerWizard.css b/toolkit/themes/windows/mozapps/plugins/pluginInstallerWizard.css
deleted file mode 100644
index 2337ca1997dd..000000000000
--- a/toolkit/themes/windows/mozapps/plugins/pluginInstallerWizard.css
+++ /dev/null
@@ -1,12 +0,0 @@
-#licenseContainer, #pluginList {
-  -moz-appearance: listbox;
-  margin: 2px 4px;
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-}
-

From 76c4fb2a77b589884eb9e21a987cc2499a63d7fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 29 Nov 2017 16:17:37 +0100
Subject: [PATCH 023/219] Bug 1420601 - Let Accel+W in a pinned tab select the
 first unpinned tab. r=daleharvey

MozReview-Commit-ID: DNhOuW4BL3P

--HG--
rename : browser/base/content/test/general/browser_pinnedTabs.js => browser/base/content/test/tabs/browser_pinnedTabs.js
rename : browser/base/content/test/general/browser_bug580638.js => browser/base/content/test/tabs/browser_pinnedTabs_closeByKeyboard.js
extra : rebase_source : 7bf78150f4d1fda4d501fa06b1855ef628547690
---
 browser/base/content/browser-sets.inc         |  2 +-
 browser/base/content/browser.js               | 15 ++++-
 browser/base/content/tabbrowser.xml           | 44 -------------
 browser/base/content/test/general/browser.ini |  4 --
 .../content/test/general/browser_bug580638.js | 59 ------------------
 browser/base/content/test/tabs/browser.ini    |  2 +
 .../{general => tabs}/browser_pinnedTabs.js   |  0
 .../browser_pinnedTabs_closeByKeyboard.js     | 62 +++++++++++++++++++
 8 files changed, 78 insertions(+), 110 deletions(-)
 delete mode 100644 browser/base/content/test/general/browser_bug580638.js
 rename browser/base/content/test/{general => tabs}/browser_pinnedTabs.js (100%)
 create mode 100644 browser/base/content/test/tabs/browser_pinnedTabs_closeByKeyboard.js

diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index fb5c78ea816f..6ab1eb63a844 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -31,7 +31,7 @@
     <command id="cmd_pageSetup" oncommand="PrintUtils.showPageSetup();"/>
     <command id="cmd_print" oncommand="PrintUtils.printWindow(window.gBrowser.selectedBrowser.outerWindowID, window.gBrowser.selectedBrowser);"/>
     <command id="cmd_printPreview" oncommand="PrintUtils.printPreview(PrintPreviewListener);"/>
-    <command id="cmd_close" oncommand="BrowserCloseTabOrWindow()"/>
+    <command id="cmd_close" oncommand="BrowserCloseTabOrWindow(event);"/>
     <command id="cmd_closeWindow" oncommand="BrowserTryToCloseWindow()"/>
     <command id="cmd_toggleMute" oncommand="gBrowser.selectedTab.toggleMuteAudio()"/>
     <command id="cmd_CustomizeToolbars" oncommand="gCustomizeMode.enter()"/>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 9aba7b31c64e..d718a29395d3 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2372,13 +2372,24 @@ function BrowserOpenFileWindow() {
   }
 }
 
-function BrowserCloseTabOrWindow() {
-  // If we're not a browser window, just close the window
+function BrowserCloseTabOrWindow(event) {
+  // If we're not a browser window, just close the window.
   if (window.location.href != getBrowserURL()) {
     closeWindow(true);
     return;
   }
 
+  // Keyboard shortcuts that would close a tab that is pinned select the first
+  // unpinned tab instead.
+  if (event &&
+      (event.ctrlKey || event.metaKey || event.altKey) &&
+      gBrowser.selectedTab.pinned) {
+    if (gBrowser.visibleTabs.length > gBrowser._numPinnedTabs) {
+      gBrowser.tabContainer.selectedIndex = gBrowser._numPinnedTabs;
+    }
+    return;
+  }
+
   // If the current tab is the last one, this will close the window.
   gBrowser.removeCurrentTab({animate: true});
 }
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 5d8a7cae8c67..b31d70894ba8 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -211,42 +211,6 @@
         ]]></body>
       </method>
 
-      <method name="_setCloseKeyState">
-        <parameter name="aEnabled"/>
-        <body><![CDATA[
-          let keyClose = document.getElementById("key_close");
-          let closeKeyEnabled = keyClose.getAttribute("disabled") != "true";
-          if (closeKeyEnabled == aEnabled)
-            return;
-
-          if (aEnabled)
-            keyClose.removeAttribute("disabled");
-          else
-            keyClose.setAttribute("disabled", "true");
-
-          // We also want to remove the keyboard shortcut from the file menu
-          // when the shortcut is disabled, and bring it back when it's
-          // renabled.
-          //
-          // Fixing bug 630826 could make that happen automatically.
-          // Fixing bug 630830 could avoid the ugly hack below.
-
-          let closeMenuItem = document.getElementById("menu_close");
-          let parentPopup = closeMenuItem.parentNode;
-          let nextItem = closeMenuItem.nextSibling;
-          let clonedItem = closeMenuItem.cloneNode(true);
-
-          parentPopup.removeChild(closeMenuItem);
-
-          if (aEnabled)
-            clonedItem.setAttribute("key", "key_close");
-          else
-            clonedItem.removeAttribute("key");
-
-          parentPopup.insertBefore(clonedItem, nextItem);
-        ]]></body>
-      </method>
-
       <method name="pinTab">
         <parameter name="aTab"/>
         <body><![CDATA[
@@ -264,9 +228,6 @@
 
           this.getBrowserForTab(aTab).messageManager.sendAsyncMessage("Browser:AppTab", { isAppTab: true });
 
-          if (aTab.selected)
-            this._setCloseKeyState(false);
-
           let event = document.createEvent("Events");
           event.initEvent("TabPinned", true, false);
           aTab.dispatchEvent(event);
@@ -288,9 +249,6 @@
 
           this.getBrowserForTab(aTab).messageManager.sendAsyncMessage("Browser:AppTab", { isAppTab: false });
 
-          if (aTab.selected)
-            this._setCloseKeyState(true);
-
           let event = document.createEvent("Events");
           event.initEvent("TabUnpinned", true, false);
           aTab.dispatchEvent(event);
@@ -1371,8 +1329,6 @@
                                           true, false);
             }
 
-            this._setCloseKeyState(!this.mCurrentTab.pinned);
-
             // TabSelect events are suppressed during preview mode to avoid confusing extensions and other bits of code
             // that might rely upon the other changes suppressed.
             // Focus is suppressed in the event that the main browser window is minimized - focusing a tab would restore the window
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index c10cb19902da..ce384a80f929 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -216,8 +216,6 @@ skip-if = toolkit != "cocoa" # Because of tests for supporting pasting from Serv
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug579872.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_bug580638.js]
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug580956.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug581242.js]
@@ -382,8 +380,6 @@ support-files = test_offline_gzip.html gZipOfflineChild.cacheManifest gZipOfflin
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_page_style_menu_update.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_pinnedTabs.js]
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_plainTextLinks.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_printpreview.js]
diff --git a/browser/base/content/test/general/browser_bug580638.js b/browser/base/content/test/general/browser_bug580638.js
deleted file mode 100644
index 1e065b5d1baa..000000000000
--- a/browser/base/content/test/general/browser_bug580638.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-function test() {
-  waitForExplicitFinish();
-
-  function testState(aPinned) {
-    function elemAttr(id, attr) {
-      return document.getElementById(id).getAttribute(attr);
-    }
-
-    if (aPinned) {
-      is(elemAttr("key_close", "disabled"), "true",
-         "key_close should be disabled when a pinned-tab is selected");
-      is(elemAttr("menu_close", "key"), "",
-         "menu_close shouldn't have a key set when a pinned is selected");
-    } else {
-      is(elemAttr("key_close", "disabled"), "",
-         "key_closed shouldn't have disabled state set when a non-pinned tab is selected");
-      is(elemAttr("menu_close", "key"), "key_close",
-         "menu_close should have key_close set as its key when a non-pinned tab is selected");
-    }
-  }
-
-  let lastSelectedTab = gBrowser.selectedTab;
-  ok(!lastSelectedTab.pinned, "We should have started with a regular tab selected");
-
-  testState(false);
-
-  let pinnedTab = BrowserTestUtils.addTab(gBrowser, "about:blank");
-  gBrowser.pinTab(pinnedTab);
-
-  // Just pinning the tab shouldn't change the key state.
-  testState(false);
-
-  // Test updating key state after selecting a tab.
-  gBrowser.selectedTab = pinnedTab;
-  testState(true);
-
-  gBrowser.selectedTab = lastSelectedTab;
-  testState(false);
-
-  gBrowser.selectedTab = pinnedTab;
-  testState(true);
-
-  // Test updating the key state after un/pinning the tab.
-  gBrowser.unpinTab(pinnedTab);
-  testState(false);
-
-  gBrowser.pinTab(pinnedTab);
-  testState(true);
-
-  // Test updating the key state after removing the tab.
-  gBrowser.removeTab(pinnedTab);
-  testState(false);
-
-  finish();
-}
diff --git a/browser/base/content/test/tabs/browser.ini b/browser/base/content/test/tabs/browser.ini
index cd20cb1a725b..4566fb741a8b 100644
--- a/browser/base/content/test/tabs/browser.ini
+++ b/browser/base/content/test/tabs/browser.ini
@@ -20,6 +20,8 @@ skip-if = !e10s # Test only relevant for e10s.
 skip-if = !e10s # Pref and test only relevant for e10s.
 [browser_opened_file_tab_navigated_to_web.js]
 [browser_overflowScroll.js]
+[browser_pinnedTabs.js]
+[browser_pinnedTabs_closeByKeyboard.js]
 [browser_positional_attributes.js]
 [browser_preloadedBrowser_zoom.js]
 [browser_reload_deleted_file.js]
diff --git a/browser/base/content/test/general/browser_pinnedTabs.js b/browser/base/content/test/tabs/browser_pinnedTabs.js
similarity index 100%
rename from browser/base/content/test/general/browser_pinnedTabs.js
rename to browser/base/content/test/tabs/browser_pinnedTabs.js
diff --git a/browser/base/content/test/tabs/browser_pinnedTabs_closeByKeyboard.js b/browser/base/content/test/tabs/browser_pinnedTabs_closeByKeyboard.js
new file mode 100644
index 000000000000..24cabf0e77ba
--- /dev/null
+++ b/browser/base/content/test/tabs/browser_pinnedTabs_closeByKeyboard.js
@@ -0,0 +1,62 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+function test() {
+  waitForExplicitFinish();
+
+  function testState(aPinned) {
+    function elemAttr(id, attr) {
+      return document.getElementById(id).getAttribute(attr);
+    }
+
+    is(elemAttr("key_close", "disabled"), "",
+       "key_closed should always be enabled");
+    is(elemAttr("menu_close", "key"), "key_close",
+       "menu_close should always have key_close set");
+  }
+
+  let unpinnedTab = gBrowser.selectedTab;
+  ok(!unpinnedTab.pinned, "We should have started with a regular tab selected");
+
+  testState(false);
+
+  let pinnedTab = gBrowser.addTab();
+  gBrowser.pinTab(pinnedTab);
+
+  // Just pinning the tab shouldn't change the key state.
+  testState(false);
+
+  // Test key state after selecting a tab.
+  gBrowser.selectedTab = pinnedTab;
+  testState(true);
+
+  gBrowser.selectedTab = unpinnedTab;
+  testState(false);
+
+  gBrowser.selectedTab = pinnedTab;
+  testState(true);
+
+  // Test the key state after un/pinning the tab.
+  gBrowser.unpinTab(pinnedTab);
+  testState(false);
+
+  gBrowser.pinTab(pinnedTab);
+  testState(true);
+
+  // Test that accel+w in a pinned tab selects the next tab.
+  let pinnedTab2 = gBrowser.addTab();
+  gBrowser.pinTab(pinnedTab2);
+  gBrowser.selectedTab = pinnedTab;
+
+  EventUtils.synthesizeKey("w", { accelKey: true });
+  is(gBrowser.tabs.length, 3, "accel+w in a pinned tab didn't close it");
+  is(gBrowser.selectedTab, unpinnedTab, "accel+w in a pinned tab selected the first unpinned tab");
+
+  // Test the key state after removing the tab.
+  gBrowser.removeTab(pinnedTab);
+  gBrowser.removeTab(pinnedTab2);
+  testState(false);
+
+  finish();
+}

From 64e1bd824227a1b20dfee5ce184ceac52ab5dc93 Mon Sep 17 00:00:00 2001
From: "Francesco Lodolo (:flod)" <flod@lodolo.net>
Date: Fri, 1 Dec 2017 10:13:04 +0100
Subject: [PATCH 024/219] Bug 1415906 - Update references to Macedonian in
 PluralForm.jsm r=Pike

Also marked rule #14 as unused.

MozReview-Commit-ID: GbfHY5NKgms

--HG--
extra : rebase_source : a2bb662155302705e7702e4ef3f6108adf244a2f
---
 intl/locale/PluralForm.jsm                | 4 ++--
 intl/locale/tests/unit/test_pluralForm.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/intl/locale/PluralForm.jsm b/intl/locale/PluralForm.jsm
index dddaba2789d3..d9e5a0686b3d 100644
--- a/intl/locale/PluralForm.jsm
+++ b/intl/locale/PluralForm.jsm
@@ -68,9 +68,9 @@ var gFunctions = [
   [6, (n) => n==0?5:n==1?0:n==2?1:n%100>=3&&n%100<=10?2:n%100>=11&&n%100<=99?3:4],
   // 13: Maltese
   [4, (n) => n==1?0:n==0||n%100>0&&n%100<=10?1:n%100>10&&n%100<20?2:3],
-  // 14: Macedonian
+  // 14: Unused
   [3, (n) => n%10==1?0:n%10==2?1:2],
-  // 15: Icelandic
+  // 15: Icelandic, Macedonian
   [2, (n) => n%10==1&&n%100!=11?0:1],
   // 16: Breton
   [5, (n) => n%10==1&&n%100!=11&&n%100!=71&&n%100!=91?0:n%10==2&&n%100!=12&&n%100!=72&&n%100!=92?1:(n%10==3||n%10==4||n%10==9)&&n%100!=13&&n%100!=14&&n%100!=19&&n%100!=73&&n%100!=74&&n%100!=79&&n%100!=93&&n%100!=94&&n%100!=99?2:n%1000000==0&&n!=0?3:4],
diff --git a/intl/locale/tests/unit/test_pluralForm.js b/intl/locale/tests/unit/test_pluralForm.js
index b270655d463c..0e501dda5513 100644
--- a/intl/locale/tests/unit/test_pluralForm.js
+++ b/intl/locale/tests/unit/test_pluralForm.js
@@ -488,7 +488,7 @@ function run_test()
     4,4,4,4,4,4,4,4,4,4,
     4,4,4,4,4,4,4,4,4,4,
   ], [
-    // 14: Macedonian 0-9, 10-19, ..., 90-99
+    // 14: Unused 0-9, 10-19, ..., 90-99
     3,1,2,3,3,3,3,3,3,3,
     3,1,2,3,3,3,3,3,3,3,
     3,1,2,3,3,3,3,3,3,3,
@@ -522,7 +522,7 @@ function run_test()
     3,1,2,3,3,3,3,3,3,3,
     3,1,2,3,3,3,3,3,3,3,
   ], [
-    // 15: Icelandic 0-9, 10-19, ..., 90-99
+    // 15: Icelandic, Macedonian 0-9, 10-19, ..., 90-99
     2,1,2,2,2,2,2,2,2,2,
     2,2,2,2,2,2,2,2,2,2,
     2,1,2,2,2,2,2,2,2,2,

From d093ecbe77848fdfaffdb65c268fd773f53b6efc Mon Sep 17 00:00:00 2001
From: Valentin Gosu <valentin.gosu@gmail.com>
Date: Fri, 1 Dec 2017 13:20:29 +0100
Subject: [PATCH 025/219] Bug 1422277 - Add an observer notification for when
 the captive portal detection is "done" r=bagder

MozReview-Commit-ID: D9Qr0CuUJiQ

--HG--
extra : rebase_source : 74ecc449bee263d27af83fa101e6ef59166fecab
---
 netwerk/base/CaptivePortalService.cpp    | 13 +++++++++++++
 netwerk/base/CaptivePortalService.h      |  1 +
 netwerk/base/nsICaptivePortalService.idl |  9 +++++++++
 3 files changed, 23 insertions(+)

diff --git a/netwerk/base/CaptivePortalService.cpp b/netwerk/base/CaptivePortalService.cpp
index 94cfc52d8e77..37ac9b27a627 100644
--- a/netwerk/base/CaptivePortalService.cpp
+++ b/netwerk/base/CaptivePortalService.cpp
@@ -335,6 +335,17 @@ CaptivePortalService::Observe(nsISupports *aSubject,
   return NS_OK;
 }
 
+void
+CaptivePortalService::NotifyConnectivityAvailable(bool aCaptive)
+{
+  nsCOMPtr<nsIObserverService> observerService = services::GetObserverService();
+  if (observerService) {
+    nsCOMPtr<nsICaptivePortalService> cps(this);
+    observerService->NotifyObservers(cps, NS_CAPTIVE_PORTAL_CONNECTIVITY,
+                                     aCaptive ? u"captive" : u"clear");
+  }
+}
+
 //-----------------------------------------------------------------------------
 // CaptivePortalService::nsICaptivePortalCallback
 //-----------------------------------------------------------------------------
@@ -364,8 +375,10 @@ CaptivePortalService::Complete(bool success)
   if (success) {
     if (mEverBeenCaptive) {
       mState = UNLOCKED_PORTAL;
+      NotifyConnectivityAvailable(true);
     } else {
       mState = NOT_CAPTIVE;
+      NotifyConnectivityAvailable(false);
     }
   }
 
diff --git a/netwerk/base/CaptivePortalService.h b/netwerk/base/CaptivePortalService.h
index af04097e002b..255f13354571 100644
--- a/netwerk/base/CaptivePortalService.h
+++ b/netwerk/base/CaptivePortalService.h
@@ -45,6 +45,7 @@ private:
   virtual ~CaptivePortalService();
   nsresult PerformCheck();
   nsresult RearmTimer();
+  void NotifyConnectivityAvailable(bool aCaptive);
 
   nsCOMPtr<nsICaptivePortalDetector>    mCaptivePortalDetector;
   int32_t                               mState;
diff --git a/netwerk/base/nsICaptivePortalService.idl b/netwerk/base/nsICaptivePortalService.idl
index 94d9d6e9a8cb..9b6d104fa664 100644
--- a/netwerk/base/nsICaptivePortalService.idl
+++ b/netwerk/base/nsICaptivePortalService.idl
@@ -56,4 +56,13 @@ interface nsICaptivePortalService : nsISupports
  */
 #define NS_IPC_CAPTIVE_PORTAL_SET_STATE "ipc:network:captive-portal-set-state"
 
+/**
+ * This notification will be emitted when the captive portal service has
+ * determined that we can connect to the internet.
+ * The service will pass either "captive" if there is an unlocked captive portal
+ * present, or "clear" if no captive portal was detected.
+ * Note: this notification only gets sent in the parent process.
+ */
+#define NS_CAPTIVE_PORTAL_CONNECTIVITY "network:captive-portal-connectivity"
+
 %}

From 0ec0112df165e252ab44fdf923006ddb677b5ca0 Mon Sep 17 00:00:00 2001
From: "Francesco Lodolo (:flod)" <flod@lodolo.net>
Date: Fri, 1 Dec 2017 09:34:17 +0100
Subject: [PATCH 026/219] Bug 1422249 - Update locales in mobile l10n.toml
 r=Pike

Vietnamese (vi) is missing from the list of languages.
List of locales on single-locale builds is out of date.

MozReview-Commit-ID: 3zZ3MYAuBWB

--HG--
extra : rebase_source : f98d9af6d8c6db1b8195eab211576b303a18dc23
---
 mobile/android/locales/l10n.toml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mobile/android/locales/l10n.toml b/mobile/android/locales/l10n.toml
index 08a00f4651d9..41b8630040d3 100644
--- a/mobile/android/locales/l10n.toml
+++ b/mobile/android/locales/l10n.toml
@@ -96,21 +96,22 @@ locales = [
     "uk",
     "ur",
     "uz",
+    "vi",
     "wo",
     "xh",
     "zam",
     "zh-CN",
     "zh-TW",
-    ]
+]
 
 [build]
 exclude-multi-locale = [
-    "be",
-    "bn-BD",
-    "ne-NP",
+    "ach",
+    "bs",
+    "ia",
+    "ltg",
+    "oc",
     "trs",
-    "wo",
-    "zam",
 ]
 
 [env]

From 73e80931eafd3b6a2bddec21295659277d462628 Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Fri, 1 Dec 2017 10:33:44 +0800
Subject: [PATCH 027/219] Bug 1421179. P1 - associate data with playback events
 published by MDSM. r=bechen,gerald

This is required for we want to associate playback offset with the
PlaybackStarted/PlaybackStopped events.

MozReview-Commit-ID: JkRhC2QE7kr

--HG--
extra : rebase_source : c5f637f2e5849565acb5b91364537f1724ce7d5f
---
 dom/media/ChannelMediaDecoder.cpp      | 10 +++---
 dom/media/ChannelMediaDecoder.h        |  2 +-
 dom/media/MediaDecoder.cpp             | 24 +++++++-------
 dom/media/MediaDecoder.h               |  4 +--
 dom/media/MediaDecoderStateMachine.cpp | 27 +++++++--------
 dom/media/MediaDecoderStateMachine.h   | 46 +++++++++++++++++---------
 6 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/dom/media/ChannelMediaDecoder.cpp b/dom/media/ChannelMediaDecoder.cpp
index 31ac09fbc33c..36015fde81ad 100644
--- a/dom/media/ChannelMediaDecoder.cpp
+++ b/dom/media/ChannelMediaDecoder.cpp
@@ -351,21 +351,21 @@ ChannelMediaDecoder::IsLiveStream()
 }
 
 void
-ChannelMediaDecoder::OnPlaybackEvent(MediaEventType aEvent)
+ChannelMediaDecoder::OnPlaybackEvent(MediaPlaybackEvent&& aEvent)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MediaDecoder::OnPlaybackEvent(aEvent);
-  switch (aEvent) {
-    case MediaEventType::PlaybackStarted:
+  switch (aEvent.mType) {
+    case MediaPlaybackEvent::PlaybackStarted:
       mPlaybackStatistics.Start();
       break;
-    case MediaEventType::PlaybackStopped:
+    case MediaPlaybackEvent::PlaybackStopped:
       mPlaybackStatistics.Stop();
       ComputePlaybackRate();
       break;
     default:
       break;
   }
+  MediaDecoder::OnPlaybackEvent(Move(aEvent));
 }
 
 void
diff --git a/dom/media/ChannelMediaDecoder.h b/dom/media/ChannelMediaDecoder.h
index 2457de6302cf..8bca8284ca0c 100644
--- a/dom/media/ChannelMediaDecoder.h
+++ b/dom/media/ChannelMediaDecoder.h
@@ -56,7 +56,7 @@ class ChannelMediaDecoder : public MediaDecoder
   };
 
 protected:
-  void OnPlaybackEvent(MediaEventType aEvent) override;
+  void OnPlaybackEvent(MediaPlaybackEvent&& aEvent) override;
   void DurationChanged() override;
   void MetadataLoaded(UniquePtr<MediaInfo> aInfo,
                       UniquePtr<MetadataTags> aTags,
diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index df63b5b0e739..67b07cfa6d62 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -528,38 +528,38 @@ MediaDecoder::~MediaDecoder()
 }
 
 void
-MediaDecoder::OnPlaybackEvent(MediaEventType aEvent)
+MediaDecoder::OnPlaybackEvent(MediaPlaybackEvent&& aEvent)
 {
-  switch (aEvent) {
-    case MediaEventType::PlaybackEnded:
+  switch (aEvent.mType) {
+    case MediaPlaybackEvent::PlaybackEnded:
       PlaybackEnded();
       break;
-    case MediaEventType::SeekStarted:
+    case MediaPlaybackEvent::SeekStarted:
       SeekingStarted();
       break;
-    case MediaEventType::Loop:
+    case MediaPlaybackEvent::Loop:
       GetOwner()->DispatchAsyncEvent(NS_LITERAL_STRING("seeking"));
       GetOwner()->DispatchAsyncEvent(NS_LITERAL_STRING("seeked"));
       break;
-    case MediaEventType::Invalidate:
+    case MediaPlaybackEvent::Invalidate:
       Invalidate();
       break;
-    case MediaEventType::EnterVideoSuspend:
+    case MediaPlaybackEvent::EnterVideoSuspend:
       GetOwner()->DispatchAsyncEvent(NS_LITERAL_STRING("mozentervideosuspend"));
       break;
-    case MediaEventType::ExitVideoSuspend:
+    case MediaPlaybackEvent::ExitVideoSuspend:
       GetOwner()->DispatchAsyncEvent(NS_LITERAL_STRING("mozexitvideosuspend"));
       break;
-    case MediaEventType::StartVideoSuspendTimer:
+    case MediaPlaybackEvent::StartVideoSuspendTimer:
       GetOwner()->DispatchAsyncEvent(NS_LITERAL_STRING("mozstartvideosuspendtimer"));
       break;
-    case MediaEventType::CancelVideoSuspendTimer:
+    case MediaPlaybackEvent::CancelVideoSuspendTimer:
       GetOwner()->DispatchAsyncEvent(NS_LITERAL_STRING("mozcancelvideosuspendtimer"));
       break;
-    case MediaEventType::VideoOnlySeekBegin:
+    case MediaPlaybackEvent::VideoOnlySeekBegin:
       GetOwner()->DispatchAsyncEvent(NS_LITERAL_STRING("mozvideoonlyseekbegin"));
       break;
-    case MediaEventType::VideoOnlySeekCompleted:
+    case MediaPlaybackEvent::VideoOnlySeekCompleted:
       GetOwner()->DispatchAsyncEvent(NS_LITERAL_STRING("mozvideoonlyseekcompleted"));
       break;
     default:
diff --git a/dom/media/MediaDecoder.h b/dom/media/MediaDecoder.h
index beb7a5c92a62..857c99e1d3c3 100644
--- a/dom/media/MediaDecoder.h
+++ b/dom/media/MediaDecoder.h
@@ -39,8 +39,8 @@ class FrameStatistics;
 class VideoFrameContainer;
 class MediaFormatReader;
 class MediaDecoderStateMachine;
+struct MediaPlaybackEvent;
 
-enum class MediaEventType : int8_t;
 enum class Visibility : uint8_t;
 
 // GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
@@ -424,7 +424,7 @@ protected:
     DurationChanged();
   }
 
-  virtual void OnPlaybackEvent(MediaEventType aEvent);
+  virtual void OnPlaybackEvent(MediaPlaybackEvent&& aEvent);
 
   // Called when the metadata from the media file has been loaded by the
   // state machine. Call on the main thread only.
diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index a02d7896e071..ad39c2058736 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -679,7 +679,7 @@ public:
     }
 
     mMaster->mVideoDecodeSuspended = true;
-    mMaster->mOnPlaybackEvent.Notify(MediaEventType::EnterVideoSuspend);
+    mMaster->mOnPlaybackEvent.Notify(MediaPlaybackEvent::EnterVideoSuspend);
     Reader()->SetVideoBlankDecode(true);
   }
 
@@ -832,7 +832,7 @@ public:
     // when seek is done.
     if (mMaster->mVideoDecodeSuspended) {
       mMaster->mVideoDecodeSuspended = false;
-      mMaster->mOnPlaybackEvent.Notify(MediaEventType::ExitVideoSuspend);
+      mMaster->mOnPlaybackEvent.Notify(MediaPlaybackEvent::ExitVideoSuspend);
       Reader()->SetVideoBlankDecode(false);
     }
 
@@ -846,7 +846,7 @@ public:
       // playback should has been stopped.
       mMaster->StopPlayback();
       mMaster->UpdatePlaybackPositionInternal(mSeekJob.mTarget->GetTime());
-      mMaster->mOnPlaybackEvent.Notify(MediaEventType::SeekStarted);
+      mMaster->mOnPlaybackEvent.Notify(MediaPlaybackEvent::SeekStarted);
       mMaster->mOnNextFrameStatus.Notify(
         MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_SEEKING);
     }
@@ -1642,7 +1642,7 @@ public:
 
     // Dispatch a mozvideoonlyseekbegin event to indicate UI for corresponding
     // changes.
-    mMaster->mOnPlaybackEvent.Notify(MediaEventType::VideoOnlySeekBegin);
+    mMaster->mOnPlaybackEvent.Notify(MediaPlaybackEvent::VideoOnlySeekBegin);
 
     return p.forget();
   }
@@ -1652,7 +1652,8 @@ public:
     // We are completing or discarding this video-only seek operation now,
     // dispatch an event so that the UI can change in response to the end
     // of video-only seek.
-    mMaster->mOnPlaybackEvent.Notify(MediaEventType::VideoOnlySeekCompleted);
+    mMaster->mOnPlaybackEvent.Notify(
+      MediaPlaybackEvent::VideoOnlySeekCompleted);
 
     AccurateSeekingState::Exit();
   }
@@ -1858,7 +1859,7 @@ public:
     }
 
     mMaster->mVideoDecodeSuspended = true;
-    mMaster->mOnPlaybackEvent.Notify(MediaEventType::EnterVideoSuspend);
+    mMaster->mOnPlaybackEvent.Notify(MediaPlaybackEvent::EnterVideoSuspend);
     Reader()->SetVideoBlankDecode(true);
   }
 
@@ -1947,7 +1948,7 @@ public:
       mMaster->mOnNextFrameStatus.Notify(
         MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE);
 
-      mMaster->mOnPlaybackEvent.Notify(MediaEventType::PlaybackEnded);
+      mMaster->mOnPlaybackEvent.Notify(MediaPlaybackEvent::PlaybackEnded);
 
       mSentPlaybackEndedEvent = true;
 
@@ -2329,7 +2330,7 @@ DecodingState::Step()
   // when the media is looped back from the end to the beginning.
   if (before > mMaster->GetMediaTime()) {
     MOZ_ASSERT(mMaster->mLooping);
-    mMaster->mOnPlaybackEvent.Notify(MediaEventType::Loop);
+    mMaster->mOnPlaybackEvent.Notify(MediaPlaybackEvent::Loop);
   // After looping is cancelled, the time won't be corrected, and therefore we
   // can check it to see if the end of the media track is reached. Make sure
   // the media is started before comparing the time, or it's meaningless.
@@ -2509,7 +2510,7 @@ SeekingState::SeekCompleted()
 
   if (mMaster->VideoQueue().PeekFront()) {
     mMaster->mMediaSink->Redraw(Info().mVideo);
-    mMaster->mOnPlaybackEvent.Notify(MediaEventType::Invalidate);
+    mMaster->mOnPlaybackEvent.Notify(MediaPlaybackEvent::Invalidate);
   }
 
   GoToNextState();
@@ -2905,7 +2906,7 @@ MediaDecoderStateMachine::StopPlayback()
   MOZ_ASSERT(OnTaskQueue());
   LOG("StopPlayback()");
 
-  mOnPlaybackEvent.Notify(MediaEventType::PlaybackStopped);
+  mOnPlaybackEvent.Notify(MediaPlaybackEvent::PlaybackStopped);
 
   if (IsPlaying()) {
     mMediaSink->SetPlaying(false);
@@ -2936,7 +2937,7 @@ void MediaDecoderStateMachine::MaybeStartPlayback()
   }
 
   LOG("MaybeStartPlayback() starting playback");
-  mOnPlaybackEvent.Notify(MediaEventType::PlaybackStarted);
+  mOnPlaybackEvent.Notify(MediaPlaybackEvent::PlaybackStarted);
   StartMediaSink();
 
 #ifdef XP_WIN
@@ -3082,7 +3083,7 @@ void MediaDecoderStateMachine::SetVideoDecodeModeInternal(VideoDecodeMode aMode)
     mVideoDecodeSuspendTimer.Ensure(target,
                                     [=]() { self->OnSuspendTimerResolved(); },
                                     [] () { MOZ_DIAGNOSTIC_ASSERT(false); });
-    mOnPlaybackEvent.Notify(MediaEventType::StartVideoSuspendTimer);
+    mOnPlaybackEvent.Notify(MediaPlaybackEvent::StartVideoSuspendTimer);
     return;
   }
 
@@ -3953,7 +3954,7 @@ MediaDecoderStateMachine::CancelSuspendTimer()
       mVideoDecodeSuspendTimer.IsScheduled() ? 'T' : 'F');
   MOZ_ASSERT(OnTaskQueue());
   if (mVideoDecodeSuspendTimer.IsScheduled()) {
-    mOnPlaybackEvent.Notify(MediaEventType::CancelVideoSuspendTimer);
+    mOnPlaybackEvent.Notify(MediaPlaybackEvent::CancelVideoSuspendTimer);
   }
   mVideoDecodeSuspendTimer.Reset();
 }
diff --git a/dom/media/MediaDecoderStateMachine.h b/dom/media/MediaDecoderStateMachine.h
index 2877c2df5e88..f05a9ba5d338 100644
--- a/dom/media/MediaDecoderStateMachine.h
+++ b/dom/media/MediaDecoderStateMachine.h
@@ -114,20 +114,32 @@ class TaskQueue;
 
 extern LazyLogModule gMediaDecoderLog;
 
-enum class MediaEventType : int8_t
+struct MediaPlaybackEvent
 {
-  PlaybackStarted,
-  PlaybackStopped,
-  PlaybackEnded,
-  SeekStarted,
-  Loop,
-  Invalidate,
-  EnterVideoSuspend,
-  ExitVideoSuspend,
-  StartVideoSuspendTimer,
-  CancelVideoSuspendTimer,
-  VideoOnlySeekBegin,
-  VideoOnlySeekCompleted,
+  enum EventType
+  {
+    PlaybackStarted,
+    PlaybackStopped,
+    PlaybackEnded,
+    SeekStarted,
+    Loop,
+    Invalidate,
+    EnterVideoSuspend,
+    ExitVideoSuspend,
+    StartVideoSuspendTimer,
+    CancelVideoSuspendTimer,
+    VideoOnlySeekBegin,
+    VideoOnlySeekCompleted,
+  } mType;
+
+  using DataType = Variant<Nothing, int64_t>;
+  DataType mData;
+
+  MOZ_IMPLICIT MediaPlaybackEvent(EventType aType)
+    : mType(aType)
+    , mData(Nothing{})
+  {
+  }
 };
 
 enum class VideoDecodeMode : uint8_t
@@ -246,8 +258,10 @@ public:
                       MediaDecoderEventVisibility>&
   FirstFrameLoadedEvent() { return mFirstFrameLoadedEvent; }
 
-  MediaEventSource<MediaEventType>&
-  OnPlaybackEvent() { return mOnPlaybackEvent; }
+  MediaEventSource<MediaPlaybackEvent>& OnPlaybackEvent()
+  {
+    return mOnPlaybackEvent;
+  }
   MediaEventSource<MediaResult>&
   OnPlaybackErrorEvent() { return mOnPlaybackErrorEvent; }
 
@@ -659,7 +673,7 @@ private:
   MediaEventProducerExc<nsAutoPtr<MediaInfo>,
                         MediaDecoderEventVisibility> mFirstFrameLoadedEvent;
 
-  MediaEventProducer<MediaEventType> mOnPlaybackEvent;
+  MediaEventProducer<MediaPlaybackEvent> mOnPlaybackEvent;
   MediaEventProducer<MediaResult> mOnPlaybackErrorEvent;
 
   MediaEventProducer<DecoderDoctorEvent> mOnDecoderDoctorEvent;

From d6c20167804ff7f642690b04c7234a8e9c5053e3 Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Fri, 1 Dec 2017 11:26:03 +0800
Subject: [PATCH 028/219] Bug 1421179. P2 - mPlaybackStatistics should
 accumulate bytes as playback position progresses. r=bechen,gerald

The original code accumulates bytes as the underlying decoder moves on which is wrong.

MozReview-Commit-ID: 72hTwOHwKRh

--HG--
extra : rebase_source : 68b62543314c7ecc823473a8dbf14e17d2a6eb7b
---
 dom/media/ChannelMediaDecoder.cpp      | 16 +++++++++----
 dom/media/ChannelMediaDecoder.h        |  6 +++++
 dom/media/MediaDecoder.cpp             |  3 ---
 dom/media/MediaDecoder.h               |  6 -----
 dom/media/MediaDecoderStateMachine.cpp | 32 ++++++++++++++++++--------
 dom/media/MediaDecoderStateMachine.h   | 18 +++++++++------
 6 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/dom/media/ChannelMediaDecoder.cpp b/dom/media/ChannelMediaDecoder.cpp
index 36015fde81ad..07f7d12db9d4 100644
--- a/dom/media/ChannelMediaDecoder.cpp
+++ b/dom/media/ChannelMediaDecoder.cpp
@@ -320,9 +320,6 @@ ChannelMediaDecoder::NotifyBytesConsumed(int64_t aBytes, int64_t aOffset)
   }
 
   MOZ_ASSERT(GetStateMachine());
-  if (aOffset >= mDecoderPosition) {
-    mPlaybackStatistics.AddBytes(aBytes);
-  }
   mDecoderPosition = aOffset + aBytes;
 }
 
@@ -356,12 +353,23 @@ ChannelMediaDecoder::OnPlaybackEvent(MediaPlaybackEvent&& aEvent)
   MOZ_ASSERT(NS_IsMainThread());
   switch (aEvent.mType) {
     case MediaPlaybackEvent::PlaybackStarted:
+      mPlaybackPosition = aEvent.mData.as<int64_t>();
       mPlaybackStatistics.Start();
       break;
-    case MediaPlaybackEvent::PlaybackStopped:
+    case MediaPlaybackEvent::PlaybackProgressed: {
+      int64_t newPos = aEvent.mData.as<int64_t>();
+      mPlaybackStatistics.AddBytes(newPos - mPlaybackPosition);
+      mPlaybackPosition = newPos;
+      break;
+    }
+    case MediaPlaybackEvent::PlaybackStopped: {
+      int64_t newPos = aEvent.mData.as<int64_t>();
+      mPlaybackStatistics.AddBytes(newPos - mPlaybackPosition);
+      mPlaybackPosition = newPos;
       mPlaybackStatistics.Stop();
       ComputePlaybackRate();
       break;
+    }
     default:
       break;
   }
diff --git a/dom/media/ChannelMediaDecoder.h b/dom/media/ChannelMediaDecoder.h
index 8bca8284ca0c..4d43b6051fb0 100644
--- a/dom/media/ChannelMediaDecoder.h
+++ b/dom/media/ChannelMediaDecoder.h
@@ -158,6 +158,12 @@ private:
   // True when our media stream has been pinned. We pin the stream
   // while seeking.
   bool mPinnedForSeek = false;
+
+  // Current playback position in the stream. This is (approximately)
+  // where we're up to playing back the stream. This is not adjusted
+  // during decoder seek operations, but it's updated at the end when we
+  // start playing back again.
+  int64_t mPlaybackPosition = 0;
 };
 
 } // namespace mozilla
diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index 67b07cfa6d62..131dc47b805d 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -403,7 +403,6 @@ MediaDecoder::MediaDecoder(MediaDecoderInit& aInit)
   , INIT_MIRROR(mBuffered, TimeIntervals())
   , INIT_MIRROR(mCurrentPosition, TimeUnit::Zero())
   , INIT_MIRROR(mStateMachineDuration, NullableTimeUnit())
-  , INIT_MIRROR(mPlaybackPosition, 0)
   , INIT_MIRROR(mIsAudioDataAudible, false)
   , INIT_CANONICAL(mVolume, aInit.mVolume)
   , INIT_CANONICAL(mPreservesPitch, aInit.mPreservesPitch)
@@ -1300,7 +1299,6 @@ MediaDecoder::ConnectMirrors(MediaDecoderStateMachine* aObject)
   mStateMachineDuration.Connect(aObject->CanonicalDuration());
   mBuffered.Connect(aObject->CanonicalBuffered());
   mCurrentPosition.Connect(aObject->CanonicalCurrentPosition());
-  mPlaybackPosition.Connect(aObject->CanonicalPlaybackOffset());
   mIsAudioDataAudible.Connect(aObject->CanonicalIsAudioDataAudible());
 }
 
@@ -1311,7 +1309,6 @@ MediaDecoder::DisconnectMirrors()
   mStateMachineDuration.DisconnectIfConnected();
   mBuffered.DisconnectIfConnected();
   mCurrentPosition.DisconnectIfConnected();
-  mPlaybackPosition.DisconnectIfConnected();
   mIsAudioDataAudible.DisconnectIfConnected();
 }
 
diff --git a/dom/media/MediaDecoder.h b/dom/media/MediaDecoder.h
index 857c99e1d3c3..2c10aa734120 100644
--- a/dom/media/MediaDecoder.h
+++ b/dom/media/MediaDecoder.h
@@ -604,12 +604,6 @@ protected:
   // Duration of the media resource according to the state machine.
   Mirror<media::NullableTimeUnit> mStateMachineDuration;
 
-  // Current playback position in the stream. This is (approximately)
-  // where we're up to playing back the stream. This is not adjusted
-  // during decoder seek operations, but it's updated at the end when we
-  // start playing back again.
-  Mirror<int64_t> mPlaybackPosition;
-
   // Used to distinguish whether the audio is producing sound.
   Mirror<bool> mIsAudioDataAudible;
 
diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index ad39c2058736..93eea3e80a34 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -2634,7 +2634,6 @@ ShutdownState::Enter()
 
   master->mDuration.DisconnectAll();
   master->mCurrentPosition.DisconnectAll();
-  master->mPlaybackOffset.DisconnectAll();
   master->mIsAudioDataAudible.DisconnectAll();
 
   // Shut down the watch manager to stop further notifications.
@@ -2687,7 +2686,6 @@ MediaDecoderStateMachine::MediaDecoderStateMachine(MediaDecoder* aDecoder,
   INIT_MIRROR(mMediaPrincipalHandle, PRINCIPAL_HANDLE_NONE),
   INIT_CANONICAL(mDuration, NullableTimeUnit()),
   INIT_CANONICAL(mCurrentPosition, TimeUnit::Zero()),
-  INIT_CANONICAL(mPlaybackOffset, 0),
   INIT_CANONICAL(mIsAudioDataAudible, false)
 #ifdef XP_WIN
   , mShouldUseHiResTimers(Preferences::GetBool("media.hi-res-timers.enabled", true))
@@ -2833,14 +2831,14 @@ void
 MediaDecoderStateMachine::OnAudioPopped(const RefPtr<AudioData>& aSample)
 {
   MOZ_ASSERT(OnTaskQueue());
-  mPlaybackOffset = std::max(mPlaybackOffset.Ref(), aSample->mOffset);
+  mPlaybackOffset = std::max(mPlaybackOffset, aSample->mOffset);
 }
 
 void
 MediaDecoderStateMachine::OnVideoPopped(const RefPtr<VideoData>& aSample)
 {
   MOZ_ASSERT(OnTaskQueue());
-  mPlaybackOffset = std::max(mPlaybackOffset.Ref(), aSample->mOffset);
+  mPlaybackOffset = std::max(mPlaybackOffset, aSample->mOffset);
 }
 
 bool
@@ -2906,9 +2904,9 @@ MediaDecoderStateMachine::StopPlayback()
   MOZ_ASSERT(OnTaskQueue());
   LOG("StopPlayback()");
 
-  mOnPlaybackEvent.Notify(MediaPlaybackEvent::PlaybackStopped);
-
   if (IsPlaying()) {
+    mOnPlaybackEvent.Notify(MediaPlaybackEvent{
+      MediaPlaybackEvent::PlaybackStopped, mPlaybackOffset });
     mMediaSink->SetPlaying(false);
     MOZ_ASSERT(!IsPlaying());
 #ifdef XP_WIN
@@ -2937,7 +2935,6 @@ void MediaDecoderStateMachine::MaybeStartPlayback()
   }
 
   LOG("MaybeStartPlayback() starting playback");
-  mOnPlaybackEvent.Notify(MediaPlaybackEvent::PlaybackStarted);
   StartMediaSink();
 
 #ifdef XP_WIN
@@ -2958,6 +2955,9 @@ void MediaDecoderStateMachine::MaybeStartPlayback()
     mMediaSink->SetPlaying(true);
     MOZ_ASSERT(IsPlaying());
   }
+
+  mOnPlaybackEvent.Notify(
+    MediaPlaybackEvent{ MediaPlaybackEvent::PlaybackStarted, mPlaybackOffset });
 }
 
 void
@@ -3316,6 +3316,14 @@ MediaDecoderStateMachine::StartMediaSink()
         &MediaDecoderStateMachine::OnMediaSinkVideoError)
       ->Track(mMediaSinkVideoPromise);
     }
+    // Remember the initial offset when playback starts. This will be used
+    // to calculate the rate at which bytes are consumed as playback moves on.
+    RefPtr<MediaData> sample = mAudioQueue.PeekFront();
+    mPlaybackOffset = sample ? sample->mOffset : 0;
+    sample = mVideoQueue.PeekFront();
+    if (sample && sample->mOffset > mPlaybackOffset) {
+      mPlaybackOffset = sample->mOffset;
+    }
   }
 }
 
@@ -3494,8 +3502,6 @@ MediaDecoderStateMachine::ResetDecode(TrackSet aTracks)
     mAudioWaitRequest.DisconnectIfExists();
   }
 
-  mPlaybackOffset = 0;
-
   mReader->ResetDecode(aTracks);
 }
 
@@ -3551,6 +3557,14 @@ MediaDecoderStateMachine::UpdatePlaybackPositionPeriodically()
 
   int64_t delay = std::max<int64_t>(1, AUDIO_DURATION_USECS / mPlaybackRate);
   ScheduleStateMachineIn(TimeUnit::FromMicroseconds(delay));
+
+  // Notify the listener as we progress in the playback offset. Note it would
+  // be too intensive to send notifications for each popped audio/video sample.
+  // It is good enough to send 'PlaybackProgressed' events every 40us (defined
+  // by AUDIO_DURATION_USECS), and we ensure 'PlaybackProgressed' events are
+  // always sent after 'PlaybackStarted' and before 'PlaybackStopped'.
+  mOnPlaybackEvent.Notify(MediaPlaybackEvent{
+    MediaPlaybackEvent::PlaybackProgressed, mPlaybackOffset });
 }
 
 void
diff --git a/dom/media/MediaDecoderStateMachine.h b/dom/media/MediaDecoderStateMachine.h
index f05a9ba5d338..27d535c903bf 100644
--- a/dom/media/MediaDecoderStateMachine.h
+++ b/dom/media/MediaDecoderStateMachine.h
@@ -120,6 +120,7 @@ struct MediaPlaybackEvent
   {
     PlaybackStarted,
     PlaybackStopped,
+    PlaybackProgressed,
     PlaybackEnded,
     SeekStarted,
     Loop,
@@ -140,6 +141,13 @@ struct MediaPlaybackEvent
     , mData(Nothing{})
   {
   }
+
+  template<typename T>
+  MediaPlaybackEvent(EventType aType, T&& aArg)
+    : mType(aType)
+    , mData(Forward<T>(aArg))
+  {
+  }
 };
 
 enum class VideoDecodeMode : uint8_t
@@ -684,6 +692,9 @@ private:
 
   bool mSeamlessLoopingAllowed;
 
+  // Current playback position in the stream in bytes.
+  int64_t mPlaybackOffset = 0;
+
 private:
   // The buffered range. Mirrored from the decoder thread.
   Mirror<media::TimeIntervals> mBuffered;
@@ -718,9 +729,6 @@ private:
   // playback position.
   Canonical<media::TimeUnit> mCurrentPosition;
 
-  // Current playback position in the stream in bytes.
-  Canonical<int64_t> mPlaybackOffset;
-
   // Used to distinguish whether the audio is producing sound.
   Canonical<bool> mIsAudioDataAudible;
 
@@ -735,10 +743,6 @@ public:
   {
     return &mCurrentPosition;
   }
-  AbstractCanonical<int64_t>* CanonicalPlaybackOffset()
-  {
-    return &mPlaybackOffset;
-  }
   AbstractCanonical<bool>* CanonicalIsAudioDataAudible()
   {
     return &mIsAudioDataAudible;

From f2f9809386302fd1eba997f2be52dec8fbd31266 Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Fri, 1 Dec 2017 12:25:00 +0800
Subject: [PATCH 029/219] Bug 1421179. P3 - ComputePlaybackRate() should call
 mPlaybackStatistics.GetRate() instead of
 mPlaybackStatistics.GetRateAtLastStop(). r=bechen,gerald

Otherwise mPlaybackBytesPerSecond will always be zero before playback is
stopped for the 1st time. This is important for a live stream where playback
rate can't be calculated from the duration and resource length (-1).

MozReview-Commit-ID: GEojREzHVEz

--HG--
extra : rebase_source : 6f770b54597abb303631da8e41c3199d92ebda6e
---
 dom/media/ChannelMediaDecoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/media/ChannelMediaDecoder.cpp b/dom/media/ChannelMediaDecoder.cpp
index 07f7d12db9d4..e554cf646eef 100644
--- a/dom/media/ChannelMediaDecoder.cpp
+++ b/dom/media/ChannelMediaDecoder.cpp
@@ -411,7 +411,7 @@ ChannelMediaDecoder::ComputePlaybackRate()
   }
 
   bool reliable = false;
-  mPlaybackBytesPerSecond = mPlaybackStatistics.GetRateAtLastStop(&reliable);
+  mPlaybackBytesPerSecond = mPlaybackStatistics.GetRate(&reliable);
   mPlaybackRateReliable = reliable;
 }
 

From 9ee1f72e41d03189d15960199e723c8308f6fe8e Mon Sep 17 00:00:00 2001
From: Alan Jeffrey <ajeffrey@mozilla.com>
Date: Fri, 1 Dec 2017 06:52:26 -0600
Subject: [PATCH 030/219] servo: Merge #19344 - Download the buildbot
 statistics and save them as CSV (from asajeffrey:buldbot-perf-download-json);
 r=jdm

<!-- Please describe your changes on the following line: -->

Download timing data from build.servo.org, and convert it to CSV for feeding to Google Data Studio.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because this is test infrastructure

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 9da7663e29af1a00980c3e7f30f8e0ae4760979d

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 7cf8bcbc2c6636c2346a9357f16564ee66e96653
---
 servo/etc/ci/performance/.gitignore           |   1 +
 .../performance/download_buildbot_timings.py  | 187 ++++++++++++++++++
 2 files changed, 188 insertions(+)
 create mode 100644 servo/etc/ci/performance/download_buildbot_timings.py

diff --git a/servo/etc/ci/performance/.gitignore b/servo/etc/ci/performance/.gitignore
index 01adf45a40da..2f10274f854a 100644
--- a/servo/etc/ci/performance/.gitignore
+++ b/servo/etc/ci/performance/.gitignore
@@ -1,6 +1,7 @@
 servo/*
 output.png
 output/*
+.cache/*
 page_load_test/tp5n/*
 page_load_test/tp5n.zip
 venv/*
diff --git a/servo/etc/ci/performance/download_buildbot_timings.py b/servo/etc/ci/performance/download_buildbot_timings.py
new file mode 100644
index 000000000000..1bc8fd468074
--- /dev/null
+++ b/servo/etc/ci/performance/download_buildbot_timings.py
@@ -0,0 +1,187 @@
+#!/usr/bin/env python3
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import argparse
+import csv
+from datetime import datetime, date
+import httplib2
+import json
+from math import floor
+import os
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Download buildbot metadata"
+    )
+    parser.add_argument("--index-url",
+                        type=str,
+                        default='http://build.servo.org/json',
+                        help="the URL to get the JSON index data index from. "
+                        "Default: http://build.servo.org/json")
+    parser.add_argument("--build-url",
+                        type=str,
+                        default='http://build.servo.org/json/builders/{}/builds/{}',
+                        help="the URL to get the JSON build data from. "
+                        "Default: http://build.servo.org/json/builders/{}/builds/{}")
+    parser.add_argument("--cache-dir",
+                        type=str,
+                        default='.cache',
+                        help="the directory to cache JSON files in. "
+                        "Default: .cache")
+    parser.add_argument("--cache-name",
+                        type=str,
+                        default='build-{}-{}.json',
+                        help="the filename to cache JSON data in. "
+                        "Default: build-{}-{}.json")
+    parser.add_argument("--output-dir",
+                        type=str,
+                        default='output',
+                        help="the directory to save the CSV data to. "
+                        "Default: output")
+    parser.add_argument("--output-name",
+                        type=str,
+                        default='builds-{}-{}.csv',
+                        help="the filename to save the CSV data to. "
+                        "Default: builds-{}-{}.csv")
+    parser.add_argument("--verbose", "-v",
+                        action='store_true',
+                        help="print every HTTP request")
+    args = parser.parse_args()
+
+    http = httplib2.Http()
+
+    os.makedirs(args.cache_dir, exist_ok=True)
+    os.makedirs(args.output_dir, exist_ok=True)
+
+    # Get the index to find out the list of builder names
+    # Note: this isn't cached
+    if args.verbose:
+        print("Downloading index {}.".format(args.index_url))
+    (index_headers, index_data) = http.request(args.index_url, "GET", headers={'cache-control': 'no-cache'})
+    if args.verbose:
+        print("Response {}.".format(index_headers))
+    index = json.loads(index_data.decode('utf-8'))
+
+    builds = []
+
+    for builder in index["builders"]:
+        # The most recent build is at offset -1
+        # Fetch it to find out the build number
+        # Note: this isn't cached
+        recent_build_url = args.build_url.format(builder, -1)
+        if args.verbose:
+            print("Downloading recent build {}.".format(recent_build_url))
+        (recent_build_headers, recent_build_data) = http.request(
+            recent_build_url,
+            "GET",
+            headers={'cache-control': 'no-cache'}
+        )
+        if args.verbose:
+            print("Respose {}.".format(recent_build_headers))
+        recent_build = json.loads(recent_build_data.decode('utf-8'))
+        recent_build_number = recent_build["number"]
+
+        # Download each build, and convert to CSV
+        for build_number in range(0, recent_build_number):
+
+            # Rather annoyingly, we can't just use the Python http cache,
+            # because it doesn't cache 404 responses. So we roll our own.
+            cache_json_name = args.cache_name.format(builder, build_number)
+            cache_json = os.path.join(args.cache_dir, cache_json_name)
+            if os.path.isfile(cache_json):
+                with open(cache_json) as f:
+                    build = json.load(f)
+
+            else:
+                # Get the build data
+                build_url = args.build_url.format(builder, build_number)
+                if args.verbose:
+                    print("Downloading build {}.".format(build_url))
+                (build_headers, build_data) = http.request(
+                    build_url,
+                    "GET",
+                    headers={'cache-control': 'no=cache'}
+                )
+                if args.verbose:
+                    print("Response {}.".format(build_headers))
+
+                # Only parse the JSON if we got back a 200 response.
+                if build_headers.status == 200:
+                    build = json.loads(build_data.decode('utf-8'))
+                    # Don't cache current builds.
+                    if build.get('currentStep'):
+                        continue
+
+                elif build_headers.status == 404:
+                    build = {}
+
+                else:
+                    continue
+
+                with open(cache_json, 'w+') as f:
+                    json.dump(build, f)
+
+            if 'times' in build:
+                builds.append(build)
+
+    years = {}
+    for build in builds:
+        build_date = date.fromtimestamp(build['times'][0])
+        years.setdefault(build_date.year, {}).setdefault(build_date.month, []).append(build)
+
+    for year, months in years.items():
+        for month, builds in months.items():
+
+            output_name = args.output_name.format(year, month)
+            output = os.path.join(args.output_dir, output_name)
+
+            # Create the CSV file.
+            if args.verbose:
+                print('Creating file {}.'.format(output))
+            with open(output, 'w+') as output_file:
+                output_csv = csv.writer(output_file)
+
+                # The CSV column names
+                output_csv.writerow([
+                    'builder',
+                    'buildNumber',
+                    'buildTimestamp',
+                    'stepName',
+                    'stepText',
+                    'stepNumber',
+                    'stepStart',
+                    'stepFinish'
+                ])
+
+                for build in builds:
+
+                    builder = build["builderName"]
+                    build_number = build["number"]
+                    build_timestamp = datetime.fromtimestamp(build["times"][0]).replace(microsecond=0)
+
+                    # Write out the timing data for each step
+                    for step in build["steps"]:
+                        if step["isFinished"]:
+                            step_name = step["name"]
+                            step_text = ' '.join(step["text"])
+                            step_number = step["step_number"]
+                            step_start = floor(step["times"][0])
+                            step_finish = floor(step["times"][1])
+                            output_csv.writerow([
+                                builder,
+                                build_number,
+                                build_timestamp,
+                                step_name,
+                                step_text,
+                                step_number,
+                                step_start,
+                                step_finish
+                            ])
+
+
+if __name__ == "__main__":
+    main()

From a7c09638b3bdc1f3080322d9a6caa633db8193ea Mon Sep 17 00:00:00 2001
From: Sean Lee <selee@mozilla.com>
Date: Wed, 22 Nov 2017 15:57:33 +0800
Subject: [PATCH 031/219] Bug 1416664 - Identify the sections for the fields
 without the section part of autocomplete attr. r=lchang,ralin

MozReview-Commit-ID: 7La8Bn0TF1y

--HG--
extra : rebase_source : 4864178cdfbb644912bcfb9dc1a45806f1cae46d
---
 .../formautofill/FormAutofillHeuristics.jsm   | 91 ++++++++++++++-----
 .../test/fixtures/multiple_section.html       | 75 +++++++++++----
 .../unit/heuristics/test_multiple_section.js  | 31 +++++++
 3 files changed, 153 insertions(+), 44 deletions(-)

diff --git a/browser/extensions/formautofill/FormAutofillHeuristics.jsm b/browser/extensions/formautofill/FormAutofillHeuristics.jsm
index ed93d618764c..b5d4fa76b908 100644
--- a/browser/extensions/formautofill/FormAutofillHeuristics.jsm
+++ b/browser/extensions/formautofill/FormAutofillHeuristics.jsm
@@ -21,6 +21,7 @@ FormAutofillUtils.defineLazyLogGetter(this, this.EXPORTED_SYMBOLS[0]);
 
 const PREF_HEURISTICS_ENABLED = "extensions.formautofill.heuristics.enabled";
 const PREF_SECTION_ENABLED = "extensions.formautofill.section.enabled";
+const DEFAULT_SECTION_NAME = "-moz-section-default";
 
 /**
  * A scanner for traversing all elements in a form and retrieving the field
@@ -35,11 +36,13 @@ class FieldScanner {
    * @param {Array.DOMElement} elements
    *        The elements from a form for each parser.
    */
-  constructor(elements) {
+  constructor(elements, {allowDuplicates = false, sectionEnabled = true}) {
     this._elementsWeakRef = Cu.getWeakReference(elements);
     this.fieldDetails = [];
     this._parsingIndex = 0;
     this._sections = [];
+    this._allowDuplicates = allowDuplicates;
+    this._sectionEnabled = sectionEnabled;
   }
 
   get _elements() {
@@ -112,22 +115,63 @@ class FieldScanner {
     });
   }
 
-  getSectionFieldDetails(allowDuplicates) {
-    // TODO: [Bug 1416664] If there is only one section which is not defined by
-    // `autocomplete` attribute, the sections should be classified by the
-    // heuristics.
-    return this._sections.map(section => {
-      if (allowDuplicates) {
-        return section.fieldDetails;
+  _classifySections() {
+    let fieldDetails = this._sections[0].fieldDetails;
+    this._sections = [];
+    let seenTypes = new Set();
+    let previousType;
+    let sectionCount = 0;
+
+    for (let fieldDetail of fieldDetails) {
+      if (!fieldDetail.fieldName) {
+        continue;
       }
-      return this._trimFieldDetails(section.fieldDetails);
-    });
+      if (seenTypes.has(fieldDetail.fieldName) &&
+          previousType != fieldDetail.fieldName) {
+        seenTypes.clear();
+        sectionCount++;
+      }
+      previousType = fieldDetail.fieldName;
+      seenTypes.add(fieldDetail.fieldName);
+      delete fieldDetail._duplicated;
+      this._pushToSection(DEFAULT_SECTION_NAME + "-" + sectionCount, fieldDetail);
+    }
+  }
+
+  /**
+   * The result is an array contains the sections with its belonging field
+   * details. If `this._sections` contains one section only with the default
+   * section name (DEFAULT_SECTION_NAME), `this._classifySections` should be
+   * able to identify all sections in the heuristic way.
+   *
+   * @returns {Array<Object>}
+   *          The array with the sections, and the belonging fieldDetails are in
+   *          each section.
+   */
+  getSectionFieldDetails() {
+    // When the section feature is disabled, `getSectionFieldDetails` should
+    // provide a single section result.
+    if (!this._sectionEnabled) {
+      return [this._getFinalDetails(this.fieldDetails)];
+    }
+    if (this._sections.length == 0) {
+      return [];
+    }
+    if (this._sections.length == 1 && this._sections[0].name == DEFAULT_SECTION_NAME) {
+      this._classifySections();
+    }
+
+    return this._sections.map(section =>
+      this._getFinalDetails(section.fieldDetails)
+    );
   }
 
   /**
    * This function will prepare an autocomplete info object with getInfo
    * function and push the detail to fieldDetails property. Any duplicated
    * detail will be marked as _duplicated = true for the parser.
+   * Any field will be pushed into `this._sections` based on the section name
+   * in `autocomplete` attribute.
    *
    * Any element without the related detail will be used for adding the detail
    * to the end of field details.
@@ -173,7 +217,7 @@ class FieldScanner {
     if (info.addressType) {
       names.push(info.addressType);
     }
-    return names.length ? names.join(" ") : "-moz-section-default";
+    return names.length ? names.join(" ") : DEFAULT_SECTION_NAME;
   }
 
   /**
@@ -205,7 +249,10 @@ class FieldScanner {
   }
 
   /**
-   * Provide the field details without invalid field name and duplicated fields.
+   * Provide the final field details without invalid field name, and the
+   * duplicated fields will be removed as well. For the debugging purpose,
+   * the final `fieldDetails` will include the duplicated fields if
+   * `_allowDuplicates` is true.
    *
    * @param   {Array<Object>} fieldDetails
    *          The field details for trimming.
@@ -213,14 +260,13 @@ class FieldScanner {
    *          The array with the field details without invalid field name and
    *          duplicated fields.
    */
-  _trimFieldDetails(fieldDetails) {
+  _getFinalDetails(fieldDetails) {
+    if (this._allowDuplicates) {
+      return fieldDetails.filter(f => f.fieldName);
+    }
     return fieldDetails.filter(f => f.fieldName && !f._duplicated);
   }
 
-  getFieldDetails(allowDuplicates) {
-    return allowDuplicates ? this.fieldDetails : this._trimFieldDetails(this.fieldDetails);
-  }
-
   elementExisting(index) {
     return index < this._elements.length;
   }
@@ -651,7 +697,8 @@ this.FormAutofillHeuristics = {
       return [];
     }
 
-    let fieldScanner = new FieldScanner(eligibleFields);
+    let fieldScanner = new FieldScanner(eligibleFields,
+      {allowDuplicates, sectionEnabled: this._sectionEnabled});
     while (!fieldScanner.parsingFinished) {
       let parsedPhoneFields = this._parsePhoneFields(fieldScanner);
       let parsedAddressFields = this._parseAddressFields(fieldScanner);
@@ -666,13 +713,7 @@ this.FormAutofillHeuristics = {
 
     LabelUtils.clearLabelMap();
 
-    if (!this._sectionEnabled) {
-      // When the section feature is disabled, `getFormInfo` should provide a
-      // single section result.
-      return [fieldScanner.getFieldDetails(allowDuplicates)];
-    }
-
-    return fieldScanner.getSectionFieldDetails(allowDuplicates);
+    return fieldScanner.getSectionFieldDetails();
   },
 
   _regExpTableHashValue(...signBits) {
diff --git a/browser/extensions/formautofill/test/fixtures/multiple_section.html b/browser/extensions/formautofill/test/fixtures/multiple_section.html
index fb2ca0378174..c145fa2a77a4 100644
--- a/browser/extensions/formautofill/test/fixtures/multiple_section.html
+++ b/browser/extensions/formautofill/test/fixtures/multiple_section.html
@@ -11,32 +11,69 @@
     <label>Organization: <input id="organization" autocomplete="organization"></label><br/>
 
     <br/>
-    <label>Street Address: <input id="street-address" autocomplete="shipping street-address"></label><br/>
-    <label>Address Level 2: <input id="address-level2" autocomplete="shipping address-level2"></label><br/>
-    <label>Address Level 1: <input id="address-level1" autocomplete="shipping address-level1"></label><br/>
-    <label>Postal Code: <input id="postal-code" autocomplete="shipping postal-code"></label><br/>
-    <label>Country: <input id="country" autocomplete="shipping country"></label><br/>
+    <label>Street Address: <input id="street-address-a" autocomplete="shipping street-address"></label><br/>
+    <label>Address Level 2: <input id="address-level2-a" autocomplete="shipping address-level2"></label><br/>
+    <label>Address Level 1: <input id="address-level1-a" autocomplete="shipping address-level1"></label><br/>
+    <label>Postal Code: <input id="postal-code-a" autocomplete="shipping postal-code"></label><br/>
+    <label>Country: <input id="country-a" autocomplete="shipping country"></label><br/>
 
     <br/>
-    <label>Street Address: <input id="street-address" autocomplete="billing street-address"></label><br/>
-    <label>Address Level 2: <input id="address-level2" autocomplete="billing address-level2"></label><br/>
-    <label>Address Level 1: <input id="address-level1" autocomplete="billing address-level1"></label><br/>
-    <label>Postal Code: <input id="postal-code" autocomplete="billing postal-code"></label><br/>
-    <label>Country: <input id="country" autocomplete="billing country"></label><br/>
+    <label>Street Address: <input id="street-address-b" autocomplete="billing street-address"></label><br/>
+    <label>Address Level 2: <input id="address-level2-b" autocomplete="billing address-level2"></label><br/>
+    <label>Address Level 1: <input id="address-level1-b" autocomplete="billing address-level1"></label><br/>
+    <label>Postal Code: <input id="postal-code-b" autocomplete="billing postal-code"></label><br/>
+    <label>Country: <input id="country-b" autocomplete="billing country"></label><br/>
 
     <br/>
-    <label>Street Address: <input id="street-address" autocomplete="section-my street-address"></label><br/>
-    <label>Address Level 2: <input id="address-level2" autocomplete="section-my address-level2"></label><br/>
-    <label>Address Level 1: <input id="address-level1" autocomplete="section-my address-level1"></label><br/>
-    <label>Postal Code: <input id="postal-code" autocomplete="section-my postal-code"></label><br/>
-    <label>Country: <input id="country" autocomplete="section-my country"></label><br/>
+    <label>Street Address: <input id="street-address-c" autocomplete="section-my street-address"></label><br/>
+    <label>Address Level 2: <input id="address-level2-c" autocomplete="section-my address-level2"></label><br/>
+    <label>Address Level 1: <input id="address-level1-c" autocomplete="section-my address-level1"></label><br/>
+    <label>Postal Code: <input id="postal-code-c" autocomplete="section-my postal-code"></label><br/>
+    <label>Country: <input id="country-c" autocomplete="section-my country"></label><br/>
 
     <br/>
-    <label>Telephone: <input id="tel" autocomplete="work tel"></label><br/>
-    <label>Email: <input id="email" autocomplete="work email"></label><br/>
+    <label>Telephone: <input id="tel-a" autocomplete="work tel"></label><br/>
+    <label>Email: <input id="email-a" autocomplete="work email"></label><br/>
     <br/>
-    <label>Telephone: <input id="tel" autocomplete="home tel"></label><br/>
-    <label>Email: <input id="email" autocomplete="home email"></label><br/>
+    <label>Telephone: <input id="tel-b" autocomplete="home tel"></label><br/>
+    <label>Email: <input id="email-b" autocomplete="home email"></label><br/>
+    <p>
+      <input type="submit" value="Submit">
+      <button type="reset">Reset</button>
+    </p>
+  </form>
+
+  <form>
+    <label>Name: <input autocomplete="name"></label><br/>
+    <label>Organization: <input autocomplete="organization"></label><br/>
+
+    <br/>
+    <label>Street Address: <input autocomplete="street-address"></label><br/>
+    <label>Address Level 2: <input autocomplete="address-level2"></label><br/>
+    <label>Address Level 1: <input autocomplete="address-level1"></label><br/>
+    <label>Postal Code: <input autocomplete="postal-code"></label><br/>
+    <label>Country: <input autocomplete="country"></label><br/>
+
+    <br/>
+    <label>Street Address: <input autocomplete="street-address"></label><br/>
+    <label>Address Level 2: <input autocomplete="address-level2"></label><br/>
+    <label>Address Level 1: <input autocomplete="address-level1"></label><br/>
+    <label>Postal Code: <input autocomplete="postal-code"></label><br/>
+    <label>Country: <input autocomplete="country"></label><br/>
+
+    <br/>
+    <label>Street Address: <input autocomplete="street-address"></label><br/>
+    <label>Address Level 2: <input autocomplete="address-level2"></label><br/>
+    <label>Address Level 1: <input autocomplete="address-level1"></label><br/>
+    <label>Postal Code: <input autocomplete="postal-code"></label><br/>
+    <label>Country: <input autocomplete="country"></label><br/>
+
+    <br/>
+    <label>Telephone: <input autocomplete="work tel"></label><br/>
+    <label>Email: <input autocomplete="work email"></label><br/>
+    <br/>
+    <label>Telephone: <input autocomplete="home tel"></label><br/>
+    <label>Email: <input autocomplete="home email"></label><br/>
     <p>
       <input type="submit" value="Submit">
       <button type="reset">Reset</button>
diff --git a/browser/extensions/formautofill/test/unit/heuristics/test_multiple_section.js b/browser/extensions/formautofill/test/unit/heuristics/test_multiple_section.js
index a314ff56442d..39c9c3502153 100644
--- a/browser/extensions/formautofill/test/unit/heuristics/test_multiple_section.js
+++ b/browser/extensions/formautofill/test/unit/heuristics/test_multiple_section.js
@@ -41,6 +41,37 @@ runHeuristicsTest([
           {"section": "section-my", "addressType": "", "contactType": "", "fieldName": "country"},
         ],
       ],
+      [
+        [
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "name"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "organization"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "street-address"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "address-level2"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "address-level1"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "postal-code"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "country"},
+        ],
+        [
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "street-address"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "address-level2"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "address-level1"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "postal-code"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "country"},
+        ],
+        [
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "street-address"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "address-level2"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "address-level1"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "postal-code"},
+          {"section": "", "addressType": "", "contactType": "", "fieldName": "country"},
+          {"section": "", "addressType": "", "contactType": "work", "fieldName": "tel"},
+          {"section": "", "addressType": "", "contactType": "work", "fieldName": "email"},
+        ],
+        [
+          {"section": "", "addressType": "", "contactType": "home", "fieldName": "tel"},
+          {"section": "", "addressType": "", "contactType": "home", "fieldName": "email"},
+        ],
+      ],
     ],
   },
 ], "../../fixtures/");

From f82090e4d86782a016772ce63154d79e772f80f0 Mon Sep 17 00:00:00 2001
From: Sean Lee <weilonge@gmail.com>
Date: Mon, 27 Nov 2017 16:42:12 +0800
Subject: [PATCH 032/219] Bug 1416664 - Move the duplication logic to
 _trimFieldDetails function. r=lchang,ralin

--HG--
extra : rebase_source : a1ea77e58f2b03e62ac5603a0e62de6c4df5dbde
---
 .../formautofill/FormAutofillHeuristics.jsm   | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/browser/extensions/formautofill/FormAutofillHeuristics.jsm b/browser/extensions/formautofill/FormAutofillHeuristics.jsm
index b5d4fa76b908..cb7a5bf47ca9 100644
--- a/browser/extensions/formautofill/FormAutofillHeuristics.jsm
+++ b/browser/extensions/formautofill/FormAutofillHeuristics.jsm
@@ -133,7 +133,6 @@ class FieldScanner {
       }
       previousType = fieldDetail.fieldName;
       seenTypes.add(fieldDetail.fieldName);
-      delete fieldDetail._duplicated;
       this._pushToSection(DEFAULT_SECTION_NAME + "-" + sectionCount, fieldDetail);
     }
   }
@@ -168,8 +167,7 @@ class FieldScanner {
 
   /**
    * This function will prepare an autocomplete info object with getInfo
-   * function and push the detail to fieldDetails property. Any duplicated
-   * detail will be marked as _duplicated = true for the parser.
+   * function and push the detail to fieldDetails property.
    * Any field will be pushed into `this._sections` based on the section name
    * in `autocomplete` attribute.
    *
@@ -198,13 +196,6 @@ class FieldScanner {
       fieldInfo._reason = info._reason;
     }
 
-    // Store the association between the field metadata and the element.
-    if (this.findSameField(info) != -1) {
-      // A field with the same identifier already exists.
-      log.debug("Not collecting a field matching another with the same info:", info);
-      fieldInfo._duplicated = true;
-    }
-
     this.fieldDetails.push(fieldInfo);
     this._pushToSection(this._getSectionName(fieldInfo), fieldInfo);
   }
@@ -234,18 +225,12 @@ class FieldScanner {
       throw new Error("Try to update the non-existing field detail.");
     }
     this.fieldDetails[index].fieldName = fieldName;
-
-    delete this.fieldDetails[index]._duplicated;
-    let indexSame = this.findSameField(this.fieldDetails[index]);
-    if (indexSame != index && indexSame != -1) {
-      this.fieldDetails[index]._duplicated = true;
-    }
   }
 
-  findSameField(info) {
-    return this.fieldDetails.findIndex(f => f.section == info.section &&
-                                       f.addressType == info.addressType &&
-                                       f.fieldName == info.fieldName);
+  _isSameField(field1, field2) {
+    return field1.section == field2.section &&
+           field1.addressType == field2.addressType &&
+           field1.fieldName == field2.fieldName;
   }
 
   /**
@@ -264,7 +249,16 @@ class FieldScanner {
     if (this._allowDuplicates) {
       return fieldDetails.filter(f => f.fieldName);
     }
-    return fieldDetails.filter(f => f.fieldName && !f._duplicated);
+
+    let dedupedFieldDetails = [];
+    for (let fieldDetail of fieldDetails) {
+      if (fieldDetail.fieldName && !dedupedFieldDetails.find(f => this._isSameField(fieldDetail, f))) {
+        dedupedFieldDetails.push(fieldDetail);
+      } else {
+        log.debug("Not collecting an invalid field or matching another with the same info:", fieldDetail);
+      }
+    }
+    return dedupedFieldDetails;
   }
 
   elementExisting(index) {

From 6eccd27e0ca2b9ea29e1670f2e0d5c8df80594e4 Mon Sep 17 00:00:00 2001
From: Sean Lee <weilonge@gmail.com>
Date: Mon, 27 Nov 2017 17:14:35 +0800
Subject: [PATCH 033/219] Bug 1416664 - Modify the heuristic tests to verify
 the multiple section feature. r=lchang,ralin

MozReview-Commit-ID: HWZarpBVFYp

--HG--
extra : rebase_source : e112c105d0e402529805b15adcc5a9e8ab79d60a
---
 .../heuristics/third_party/test_BestBuy.js    |  4 ++--
 .../unit/heuristics/third_party/test_CDW.js   |  7 ++++--
 .../heuristics/third_party/test_CostCo.js     |  5 ++--
 .../unit/heuristics/third_party/test_Macys.js |  7 ++----
 .../heuristics/third_party/test_NewEgg.js     |  3 +++
 .../third_party/test_OfficeDepot.js           |  4 ++--
 .../unit/heuristics/third_party/test_QVC.js   | 10 ++++----
 .../unit/heuristics/third_party/test_Sears.js | 20 ++++++++--------
 .../heuristics/third_party/test_Staples.js    |  4 ++--
 .../heuristics/third_party/test_Walmart.js    |  6 ++---
 .../test/unit/test_collectFormFields.js       | 23 +++++++++++++------
 11 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_BestBuy.js b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_BestBuy.js
index f0a49f62f9bd..d5331f9fcfe1 100644
--- a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_BestBuy.js
+++ b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_BestBuy.js
@@ -6,7 +6,7 @@ runHeuristicsTest([
   {
     fixturePath: "Checkout_ShippingAddress.html",
     expectedResult: [
-      [[]], // Search form
+      [], // Search form
       [[
         {"section": "", "addressType": "", "contactType": "", "fieldName": "given-name"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "family-name"},
@@ -26,7 +26,7 @@ runHeuristicsTest([
   }, {
     fixturePath: "Checkout_Payment.html",
     expectedResult: [
-      [[]], // Search form
+      [], // Search form
       [[ // Sign up
         {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
       ]],
diff --git a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_CDW.js b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_CDW.js
index 4caf004ce429..193a7f925a19 100644
--- a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_CDW.js
+++ b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_CDW.js
@@ -20,9 +20,10 @@ runHeuristicsTest([
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-extension"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel"},
+      ], [
         // The below "tel-extension" is correct and removed due to the
         // duplicated field above.
-//      {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-extension"},
+        {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-extension"},
       ]],
       [],
     ],
@@ -47,6 +48,8 @@ runHeuristicsTest([
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-exp-year"},
 
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-csc"},
+      ], [
+        {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-extension"},
       ]],
       [],
     ],
@@ -54,7 +57,7 @@ runHeuristicsTest([
     fixturePath: "Checkout_Logon.html",
     expectedResult: [
       [],
-      [[]],
+      [],
       [],
     ],
   },
diff --git a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_CostCo.js b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_CostCo.js
index ca7d752301f5..45d1911e1dc0 100644
--- a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_CostCo.js
+++ b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_CostCo.js
@@ -50,7 +50,6 @@ runHeuristicsTest([
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-number"}, // ac-off
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-exp-month"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-exp-year"},
-
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-csc"}, // ac-off
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-name"}, // ac-off
       ]],
@@ -58,7 +57,7 @@ runHeuristicsTest([
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-number"}, // ac-off
       ]],
       [],
-      [[]],
+      [],
       [[
         {"section": "", "addressType": "", "contactType": "", "fieldName": "given-name"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "additional-name"}, // middle-name initial
@@ -96,7 +95,7 @@ runHeuristicsTest([
   }, {
     fixturePath: "SignIn.html",
     expectedResult: [
-      [[]],
+      [],
       [],
       [[
         {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
diff --git a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Macys.js b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Macys.js
index 5cbc2676dbe2..8d82f83047af 100644
--- a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Macys.js
+++ b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Macys.js
@@ -16,10 +16,7 @@ runHeuristicsTest([
         {"section": "", "addressType": "", "contactType": "", "fieldName": "postal-code"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel"},
       ]],
-      [
-/*
-*/
-      ],
+      [],
     ],
   }, {
     fixturePath: "Checkout_Payment.html",
@@ -56,7 +53,7 @@ runHeuristicsTest([
       [[
         {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
       ]],
-      [[]],
+      [],
       [],
       [],
     ],
diff --git a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_NewEgg.js b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_NewEgg.js
index 20b256a6220a..a118c971b45e 100644
--- a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_NewEgg.js
+++ b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_NewEgg.js
@@ -26,6 +26,9 @@ runHeuristicsTest([
       [[
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-name"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-number"}, // ac-off
+      ], [
+        {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-name"},
+        {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-number"}, // ac-off
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-exp-month"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-exp-year"},
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-csc"},
diff --git a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_OfficeDepot.js b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_OfficeDepot.js
index 0c3993cbd5c0..0fa6dbabb8e8 100644
--- a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_OfficeDepot.js
+++ b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_OfficeDepot.js
@@ -55,9 +55,9 @@ runHeuristicsTest([
   }, {
     fixturePath: "SignIn.html",
     expectedResult: [
-      [[ // ac-off
+      [ // ac-off
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
-      ]],
+      ],
     ],
   },
 ], "../../../fixtures/third_party/OfficeDepot/");
diff --git a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_QVC.js b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_QVC.js
index 092ce48c23db..968a8885c0bc 100644
--- a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_QVC.js
+++ b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_QVC.js
@@ -13,11 +13,11 @@ runHeuristicsTest([
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "bday-day"}, // select
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "bday-year"},
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-type"},
-
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-number"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-exp"},
-
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-csc"},
+      ], [
+        {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-number"},
       ]],
       [[
         {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
@@ -33,11 +33,11 @@ runHeuristicsTest([
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "bday-day"}, // select
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "bday-year"}, // select
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-type"}, // select
-
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-number"}, // ac-off
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-exp"},
-
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-csc"},
+      ], [
+        {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-number"}, // ac-off
       ]],
       [[
         {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
@@ -46,7 +46,7 @@ runHeuristicsTest([
   }, {
     fixturePath: "SignIn.html",
     expectedResult: [
-      [[]],
+      [],
       [[ // Sign in
         {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
       ]],
diff --git a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Sears.js b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Sears.js
index a397c00b991a..790a831e5273 100644
--- a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Sears.js
+++ b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Sears.js
@@ -7,11 +7,11 @@ runHeuristicsTest([
     fixturePath: "ShippingAddress.html",
     expectedResult: [
       [],
-      [[]], // search form, ac-off
-      [[ // ac-off
+      [], // search form, ac-off
+      [ // ac-off
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
-      ]],
-      [[ // check-out, ac-off
+      ],
+      [ // check-out, ac-off
 /*
         {"section": "", "addressType": "", "contactType": "", "fieldName": "given-name"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "family-name"},
@@ -24,7 +24,7 @@ runHeuristicsTest([
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-extension"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
 */
-      ]],
+      ],
       [ // ac-off
 /*
         {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
@@ -40,18 +40,18 @@ runHeuristicsTest([
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "new-password"},
 */
       ],
-      [[ // ac-off
+      [ // ac-off
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
-      ]],
-      [[ // ac-off
+      ],
+      [ // ac-off
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
-      ]],
+      ],
     ],
   }, {
     fixturePath: "PaymentOptions.html",
     expectedResult: [
       [],
-      [[]], // search
+      [], // search
       [[ // credit card
         {"section": "", "addressType": "", "contactType": "", "fieldName": "cc-number"},
         // FIXME: bug 1392958 - Cardholder name field should be detected as cc-name
diff --git a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Staples.js b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Staples.js
index ea7466566a75..0512d15bb15e 100644
--- a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Staples.js
+++ b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Staples.js
@@ -6,7 +6,7 @@ runHeuristicsTest([
   {
     fixturePath: "Basic.html",
     expectedResult: [
-      [[ // ac-off
+      [ // ac-off
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "given-name"},
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "family-name"},
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "address-line1"},
@@ -14,7 +14,7 @@ runHeuristicsTest([
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "tel"},
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-extension"},
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "organization"},
-      ]],
+      ],
     ],
   }, {
     fixturePath: "Basic_ac_on.html",
diff --git a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Walmart.js b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Walmart.js
index e350482be09b..90df86bd0e89 100644
--- a/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Walmart.js
+++ b/browser/extensions/formautofill/test/unit/heuristics/third_party/test_Walmart.js
@@ -9,7 +9,7 @@ runHeuristicsTest([
       [[
         {"section": "", "addressType": "", "contactType": "", "fieldName": "postal-code"},
       ]],
-      [[]],
+      [],
       [[
         {"section": "", "addressType": "", "contactType": "", "fieldName": "email"},
 //      {"section": "", "addressType": "", "contactType": "", "fieldName": "password"}, // ac-off
@@ -25,7 +25,7 @@ runHeuristicsTest([
   }, {
     fixturePath: "Payment.html",
     expectedResult: [
-      [[]],
+      [],
       [
         [
           {"section": "section-payment", "addressType": "", "contactType": "", "fieldName": "given-name"},
@@ -50,7 +50,7 @@ runHeuristicsTest([
       [[
         {"section": "", "addressType": "", "contactType": "", "fieldName": "postal-code"},
       ]],
-      [[]],
+      [],
       [[
         {"section": "", "addressType": "", "contactType": "", "fieldName": "given-name"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "family-name"},
diff --git a/browser/extensions/formautofill/test/unit/test_collectFormFields.js b/browser/extensions/formautofill/test/unit/test_collectFormFields.js
index 84c366368660..b97173171ea8 100644
--- a/browser/extensions/formautofill/test/unit/test_collectFormFields.js
+++ b/browser/extensions/formautofill/test/unit/test_collectFormFields.js
@@ -292,10 +292,22 @@ const TESTCASES = [
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-local-prefix"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-local-suffix"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-extension"},
+      ],
+      creditCardFieldDetails: [],
+    }, {
+      addressFieldDetails: [
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-area-code"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-local-prefix"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-local-suffix"},
+
+        // TODO Bug 1421181 - "tel-country-code" field should belong to the next
+        // section. There should be a way to group the related fields during the
+        // parsing stage.
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-country-code"},
+      ],
+      creditCardFieldDetails: [],
+    }, {
+      addressFieldDetails: [
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-area-code"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-local-prefix"},
         {"section": "", "addressType": "", "contactType": "", "fieldName": "tel-local-suffix"},
@@ -461,13 +473,10 @@ for (let tc of TESTCASES) {
           Assert.equal(detail.elementWeakRef.get(), testCaseDetails[index].elementWeakRef.get(), "DOM reference");
         });
       }
-      for (let i = 0; i < testcase.sections.length; i++) {
-        let section = testcase.sections[i];
-        [
-          section.addressFieldDetails,
-          section.creditCardFieldDetails,
-        ].forEach(details => setElementWeakRef(details));
-      }
+      setElementWeakRef(testcase.sections.reduce((fieldDetails, section) => {
+        fieldDetails.push(...section.addressFieldDetails, ...section.creditCardFieldDetails);
+        return fieldDetails;
+      }, []));
       setElementWeakRef(testcase.validFieldDetails);
 
       let handler = new FormAutofillHandler(formLike);

From f8ea506f33245f1dfea0f4c0d1499e965bac307e Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Fri, 1 Dec 2017 09:50:05 -0500
Subject: [PATCH 034/219] Bug 1421275 - Update webrender to commit
 e3dd85359580074f4ca4a554d9a3c85779f8de64. r=jrmuizel

Includes regenerated FFI header file.

MozReview-Commit-ID: 8yVB4QE87eJ

--HG--
extra : rebase_source : 6d38d002edbcbc77f044d6307c5cf1212af84555
---
 gfx/doc/README.webrender                      |   2 +-
 gfx/webrender/Cargo.toml                      |  10 +-
 gfx/webrender/src/border.rs                   |  25 +-
 gfx/webrender/src/box_shadow.rs               |  43 ++-
 gfx/webrender/src/clip_scroll_tree.rs         |   2 +-
 gfx/webrender/src/debug_server.rs             |  53 +++-
 gfx/webrender/src/device.rs                   |  57 ++--
 gfx/webrender/src/frame.rs                    |  39 ++-
 gfx/webrender/src/frame_builder.rs            |  80 ++++--
 gfx/webrender/src/glyph_rasterizer.rs         |  13 +-
 gfx/webrender/src/gpu_cache.rs                |  37 ++-
 gfx/webrender/src/internal_types.rs           |  15 +
 gfx/webrender/src/lib.rs                      |   5 +
 gfx/webrender/src/picture.rs                  |  16 +-
 gfx/webrender/src/platform/macos/font.rs      |  21 +-
 gfx/webrender/src/platform/unix/font.rs       |  35 +--
 gfx/webrender/src/platform/windows/font.rs    |  73 +++--
 gfx/webrender/src/prim_store.rs               |   4 +-
 gfx/webrender/src/profiler.rs                 | 114 +++++++-
 gfx/webrender/src/query.rs                    |  18 +-
 gfx/webrender/src/render_backend.rs           |   4 +-
 gfx/webrender/src/render_task.rs              |  96 ++++++-
 gfx/webrender/src/renderer.rs                 | 265 ++++++++++++++----
 gfx/webrender/src/resource_cache.rs           |   4 +-
 gfx/webrender/src/tiling.rs                   |   5 -
 gfx/webrender_api/Cargo.toml                  |   6 +-
 gfx/webrender_api/src/api.rs                  |   4 +
 gfx/webrender_api/src/display_item.rs         |  20 +-
 gfx/webrender_api/src/display_list.rs         |   1 -
 gfx/webrender_api/src/font.rs                 |  64 +++--
 gfx/webrender_bindings/Cargo.toml             |   6 +-
 .../webrender_ffi_generated.h                 |  18 +-
 32 files changed, 826 insertions(+), 329 deletions(-)

diff --git a/gfx/doc/README.webrender b/gfx/doc/README.webrender
index 0e9f30104ffa..bbdac84de7f1 100644
--- a/gfx/doc/README.webrender
+++ b/gfx/doc/README.webrender
@@ -175,4 +175,4 @@ Troubleshooting tips:
 -------------------------------------------------------------------------------
 
 The version of WebRender currently in the tree is:
-e30886d78c91bdd433fd978a39c511ef9416608e
+e3dd85359580074f4ca4a554d9a3c85779f8de64
diff --git a/gfx/webrender/Cargo.toml b/gfx/webrender/Cargo.toml
index 3587f09be39d..4ee4b6f38711 100644
--- a/gfx/webrender/Cargo.toml
+++ b/gfx/webrender/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webrender"
-version = "0.54.0"
+version = "0.55.0"
 authors = ["Glenn Watson <gw@intuitionlibrary.com>"]
 license = "MPL-2.0"
 repository = "https://github.com/servo/webrender"
@@ -10,7 +10,7 @@ build = "build.rs"
 default = ["freetype-lib"]
 freetype-lib = ["freetype/servo-freetype-sys"]
 profiler = ["thread_profiler/thread_profiler"]
-debugger = ["ws", "serde_json", "serde", "serde_derive"]
+debugger = ["ws", "serde_json", "serde", "serde_derive", "image", "base64"]
 
 [dependencies]
 app_units = "0.5.6"
@@ -18,7 +18,7 @@ bincode = "0.9"
 byteorder = "1.0"
 euclid = "0.15.5"
 fxhash = "0.2.1"
-gleam = "0.4.14"
+gleam = "0.4.15"
 lazy_static = "0.2"
 log = "0.3"
 num-traits = "0.1.32"
@@ -32,6 +32,8 @@ ws = { optional = true, version = "0.7.3" }
 serde_json = { optional = true, version = "1.0" }
 serde = { optional = true, version = "1.0" }
 serde_derive = { optional = true, version = "1.0" }
+image = { optional = true, version = "0.17" }
+base64 = { optional = true, version = "0.3.0" }
 
 [dev-dependencies]
 angle = {git = "https://github.com/servo/angle", branch = "servo"}
@@ -43,7 +45,7 @@ servo-glutin = "0.13"     # for the example apps
 freetype = { version = "0.3", default-features = false }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.4"
+dwrote = "0.4.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.4"
diff --git a/gfx/webrender/src/border.rs b/gfx/webrender/src/border.rs
index d699b51783ad..ed1ecd50a104 100644
--- a/gfx/webrender/src/border.rs
+++ b/gfx/webrender/src/border.rs
@@ -3,13 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use api::{BorderSide, BorderStyle, BorderWidths, ClipAndScrollInfo, ColorF};
-use api::{EdgeAaSegmentMask, LayerPoint, LayerRect};
+use api::{LayerPoint, LayerRect};
 use api::{LayerPrimitiveInfo, LayerSize, NormalBorder, RepeatMode};
 use clip::ClipSource;
 use ellipse::Ellipse;
 use frame_builder::FrameBuilder;
 use gpu_cache::GpuDataRequest;
-use prim_store::{BorderPrimitiveCpu, RectangleContent, PrimitiveContainer, TexelRect};
+use internal_types::EdgeAaSegmentMask;
+use prim_store::{BorderPrimitiveCpu, PrimitiveContainer, TexelRect};
 use util::{lerp, pack_as_float};
 
 #[repr(u8)]
@@ -382,12 +383,11 @@ impl FrameBuilder {
             // Add a solid rectangle for each visible edge/corner combination.
             if top_edge == BorderEdgeKind::Solid {
                 info.rect = LayerRect::new(p0, LayerSize::new(rect_width, top_len));
-                info.edge_aa_segment_mask = EdgeAaSegmentMask::BOTTOM;
                 self.add_solid_rectangle(
                     clip_and_scroll,
                     &info,
-                    RectangleContent::Fill(border.top.color),
-                    None,
+                    border.top.color,
+                    EdgeAaSegmentMask::BOTTOM,
                 );
             }
             if left_edge == BorderEdgeKind::Solid {
@@ -395,12 +395,11 @@ impl FrameBuilder {
                     LayerPoint::new(p0.x, p0.y + top_len),
                     LayerSize::new(left_len, rect_height - top_len - bottom_len),
                 );
-                info.edge_aa_segment_mask = EdgeAaSegmentMask::RIGHT;
                 self.add_solid_rectangle(
                     clip_and_scroll,
                     &info,
-                    RectangleContent::Fill(border.left.color),
-                    None,
+                    border.left.color,
+                    EdgeAaSegmentMask::RIGHT,
                 );
             }
             if right_edge == BorderEdgeKind::Solid {
@@ -408,12 +407,11 @@ impl FrameBuilder {
                     LayerPoint::new(p1.x - right_len, p0.y + top_len),
                     LayerSize::new(right_len, rect_height - top_len - bottom_len),
                 );
-                info.edge_aa_segment_mask = EdgeAaSegmentMask::LEFT;
                 self.add_solid_rectangle(
                     clip_and_scroll,
                     &info,
-                    RectangleContent::Fill(border.right.color),
-                    None,
+                    border.right.color,
+                    EdgeAaSegmentMask::LEFT,
                 );
             }
             if bottom_edge == BorderEdgeKind::Solid {
@@ -421,12 +419,11 @@ impl FrameBuilder {
                     LayerPoint::new(p0.x, p1.y - bottom_len),
                     LayerSize::new(rect_width, bottom_len),
                 );
-                info.edge_aa_segment_mask = EdgeAaSegmentMask::TOP;
                 self.add_solid_rectangle(
                     clip_and_scroll,
                     &info,
-                    RectangleContent::Fill(border.bottom.color),
-                    None,
+                    border.bottom.color,
+                    EdgeAaSegmentMask::TOP,
                 );
             }
         } else {
diff --git a/gfx/webrender/src/box_shadow.rs b/gfx/webrender/src/box_shadow.rs
index 6027f0cdd691..d0a253b9dc46 100644
--- a/gfx/webrender/src/box_shadow.rs
+++ b/gfx/webrender/src/box_shadow.rs
@@ -4,10 +4,12 @@
 
 use api::{BorderRadiusKind, ColorF, LayerPoint, LayerRect, LayerSize, LayerVector2D};
 use api::{BorderRadius, BoxShadowClipMode, LayoutSize, LayerPrimitiveInfo};
-use api::{ClipMode, ClipAndScrollInfo, ComplexClipRegion, EdgeAaSegmentMask, LocalClip};
+use api::{ClipMode, ClipAndScrollInfo, ComplexClipRegion, LocalClip};
 use api::{PipelineId};
+use app_units::Au;
 use clip::ClipSource;
 use frame_builder::FrameBuilder;
+use internal_types::EdgeAaSegmentMask;
 use prim_store::{PrimitiveContainer, RectangleContent, RectanglePrimitive};
 use prim_store::{BrushMaskKind, BrushKind, BrushPrimitive};
 use picture::PicturePrimitive;
@@ -26,6 +28,25 @@ pub const MAX_BLUR_RADIUS : f32 = 300.;
 // blurred without being affected by the border radius.
 pub const MASK_CORNER_PADDING: f32 = 4.0;
 
+#[derive(Debug, Copy, Clone, Eq, Hash, PartialEq)]
+pub struct BoxShadowCacheKey {
+    pub width: Au,
+    pub height: Au,
+    pub blur_radius: Au,
+    pub spread_radius: Au,
+    pub offset_x: Au,
+    pub offset_y: Au,
+    pub br_top_left_w: Au,
+    pub br_top_left_h: Au,
+    pub br_top_right_w: Au,
+    pub br_top_right_h: Au,
+    pub br_bottom_left_w: Au,
+    pub br_bottom_left_h: Au,
+    pub br_bottom_right_w: Au,
+    pub br_bottom_right_h: Au,
+    pub clip_mode: BoxShadowClipMode,
+}
+
 impl FrameBuilder {
     pub fn add_box_shadow(
         &mut self,
@@ -119,6 +140,24 @@ impl FrameBuilder {
             let blur_offset = BLUR_SAMPLE_SCALE * blur_radius;
             let mut extra_clips = vec![];
 
+            let cache_key = BoxShadowCacheKey {
+                width: Au::from_f32_px(shadow_rect.size.width),
+                height: Au::from_f32_px(shadow_rect.size.height),
+                blur_radius: Au::from_f32_px(blur_radius),
+                spread_radius: Au::from_f32_px(spread_radius),
+                offset_x: Au::from_f32_px(box_offset.x),
+                offset_y: Au::from_f32_px(box_offset.y),
+                br_top_left_w: Au::from_f32_px(border_radius.top_left.width),
+                br_top_left_h: Au::from_f32_px(border_radius.top_left.height),
+                br_top_right_w: Au::from_f32_px(border_radius.top_right.width),
+                br_top_right_h: Au::from_f32_px(border_radius.top_right.height),
+                br_bottom_left_w: Au::from_f32_px(border_radius.bottom_left.width),
+                br_bottom_left_h: Au::from_f32_px(border_radius.bottom_left.height),
+                br_bottom_right_w: Au::from_f32_px(border_radius.bottom_right.width),
+                br_bottom_right_h: Au::from_f32_px(border_radius.bottom_right.height),
+                clip_mode,
+            };
+
             match clip_mode {
                 BoxShadowClipMode::Outset => {
                     let width;
@@ -192,6 +231,7 @@ impl FrameBuilder {
                         Vec::new(),
                         clip_mode,
                         radii_kind,
+                        cache_key,
                         pipeline_id,
                     );
                     pic_prim.add_primitive(
@@ -270,6 +310,7 @@ impl FrameBuilder {
                         BoxShadowClipMode::Inset,
                         // TODO(gw): Make use of optimization for inset.
                         BorderRadiusKind::NonUniform,
+                        cache_key,
                         pipeline_id,
                     );
                     pic_prim.add_primitive(
diff --git a/gfx/webrender/src/clip_scroll_tree.rs b/gfx/webrender/src/clip_scroll_tree.rs
index e52c3013a488..360f85992b45 100644
--- a/gfx/webrender/src/clip_scroll_tree.rs
+++ b/gfx/webrender/src/clip_scroll_tree.rs
@@ -82,7 +82,7 @@ pub struct TransformUpdateState {
 }
 
 impl ClipScrollTree {
-    pub fn new() -> ClipScrollTree {
+    pub fn new() -> Self {
         let dummy_pipeline = PipelineId::dummy();
         ClipScrollTree {
             nodes: FastHashMap::default(),
diff --git a/gfx/webrender/src/debug_server.rs b/gfx/webrender/src/debug_server.rs
index ba454ec4c95d..d75226c31aaa 100644
--- a/gfx/webrender/src/debug_server.rs
+++ b/gfx/webrender/src/debug_server.rs
@@ -9,6 +9,8 @@ use std::sync::mpsc::{channel, Receiver};
 use std::sync::mpsc::Sender;
 use std::thread;
 use ws;
+use base64::encode;
+use image;
 
 // Messages that are sent from the render backend to the renderer
 // debug command queue. These are sent in a separate queue so
@@ -58,8 +60,10 @@ impl ws::Handler for Server {
                     "enable_gpu_sample_queries" => DebugCommand::EnableGpuSampleQueries(true),
                     "disable_gpu_sample_queries" => DebugCommand::EnableGpuSampleQueries(false),
                     "fetch_passes" => DebugCommand::FetchPasses,
+                    "fetch_screenshot" => DebugCommand::FetchScreenshot,
                     "fetch_documents" => DebugCommand::FetchDocuments,
-                    "fetch_clipscrolltree" => DebugCommand::FetchClipScrollTree,
+                    "fetch_clip_scroll_tree" => DebugCommand::FetchClipScrollTree,
+                    "fetch_render_tasks" => DebugCommand::FetchRenderTasks,
                     msg => {
                         println!("unknown msg {}", msg);
                         return Ok(());
@@ -255,7 +259,7 @@ pub struct DocumentList {
 }
 
 impl DocumentList {
-    pub fn new() -> DocumentList {
+    pub fn new() -> Self {
         DocumentList {
             kind: "documents",
             root: TreeNode::new("root"),
@@ -267,6 +271,28 @@ impl DocumentList {
     }
 }
 
+#[derive(Serialize)]
+pub struct Screenshot {
+    kind: &'static str,
+    data: String
+}
+
+impl Screenshot {
+    pub fn new(width: u32, height: u32, data: Vec<u8>) -> Self {
+        let mut output = Vec::with_capacity((width * height) as usize);
+        {
+            let encoder = image::png::PNGEncoder::new(&mut output);
+            encoder.encode(&data, width, height, image::ColorType::RGBA(8)).unwrap();
+        }
+
+        let data = encode(&output);
+        Screenshot {
+            kind: "screenshot",
+            data
+        }
+    }
+}
+
 // A serializable list of debug information about clip-scroll trees
 // that can be sent to the client
 
@@ -277,9 +303,28 @@ pub struct ClipScrollTreeList {
 }
 
 impl ClipScrollTreeList {
-    pub fn new() -> ClipScrollTreeList {
+    pub fn new() -> Self {
         ClipScrollTreeList {
-            kind: "clipscrolltree",
+            kind: "clip_scroll_tree",
+            root: TreeNode::new("root"),
+        }
+    }
+
+    pub fn add(&mut self, item: TreeNode) {
+        self.root.add_child(item);
+    }
+}
+
+#[derive(Serialize)]
+pub struct RenderTaskList {
+    kind: &'static str,
+    root: TreeNode,
+}
+
+impl RenderTaskList {
+    pub fn new() -> Self {
+        RenderTaskList {
+            kind: "render_tasks",
             root: TreeNode::new("root"),
         }
     }
diff --git a/gfx/webrender/src/device.rs b/gfx/webrender/src/device.rs
index 97cba8b9f737..c3066f199b8b 100644
--- a/gfx/webrender/src/device.rs
+++ b/gfx/webrender/src/device.rs
@@ -1424,6 +1424,15 @@ impl Device {
         }
     }
 
+    pub fn read_pixels(&mut self, width: i32, height: i32) -> Vec<u8> {
+        self.gl.read_pixels(
+            0, 0, 
+            width as i32, height as i32,
+            gl::RGBA,
+            gl::UNSIGNED_BYTE
+        )
+    }
+
     pub fn bind_vao(&mut self, vao: &VAO) {
         debug_assert!(self.inside_frame);
 
@@ -1603,29 +1612,11 @@ impl Device {
         self.frame_id.0 += 1;
     }
 
-    pub fn clear_target(&self, color: Option<[f32; 4]>, depth: Option<f32>) {
-        let mut clear_bits = 0;
-
-        if let Some(color) = color {
-            self.gl.clear_color(color[0], color[1], color[2], color[3]);
-            clear_bits |= gl::COLOR_BUFFER_BIT;
-        }
-
-        if let Some(depth) = depth {
-            self.gl.clear_depth(depth as f64);
-            clear_bits |= gl::DEPTH_BUFFER_BIT;
-        }
-
-        if clear_bits != 0 {
-            self.gl.clear(clear_bits);
-        }
-    }
-
-    pub fn clear_target_rect(
+    pub fn clear_target(
         &self,
         color: Option<[f32; 4]>,
         depth: Option<f32>,
-        rect: DeviceIntRect,
+        rect: Option<DeviceIntRect>,
     ) {
         let mut clear_bits = 0;
 
@@ -1635,20 +1626,28 @@ impl Device {
         }
 
         if let Some(depth) = depth {
+            debug_assert_ne!(self.gl.get_boolean_v(gl::DEPTH_WRITEMASK), 0);
             self.gl.clear_depth(depth as f64);
             clear_bits |= gl::DEPTH_BUFFER_BIT;
         }
 
         if clear_bits != 0 {
-            self.gl.enable(gl::SCISSOR_TEST);
-            self.gl.scissor(
-                rect.origin.x,
-                rect.origin.y,
-                rect.size.width,
-                rect.size.height,
-            );
-            self.gl.clear(clear_bits);
-            self.gl.disable(gl::SCISSOR_TEST);
+            match rect {
+                Some(rect) => {
+                    self.gl.enable(gl::SCISSOR_TEST);
+                    self.gl.scissor(
+                        rect.origin.x,
+                        rect.origin.y,
+                        rect.size.width,
+                        rect.size.height,
+                    );
+                    self.gl.clear(clear_bits);
+                    self.gl.disable(gl::SCISSOR_TEST);
+                }
+                None => {
+                    self.gl.clear(clear_bits);
+                }
+            }
         }
     }
 
diff --git a/gfx/webrender/src/frame.rs b/gfx/webrender/src/frame.rs
index 9f0921ff139b..4b476a62dc40 100644
--- a/gfx/webrender/src/frame.rs
+++ b/gfx/webrender/src/frame.rs
@@ -17,8 +17,7 @@ use clip_scroll_tree::{ClipScrollTree, ScrollStates};
 use euclid::rect;
 use frame_builder::{FrameBuilder, FrameBuilderConfig, ScrollbarInfo};
 use gpu_cache::GpuCache;
-use internal_types::{FastHashMap, FastHashSet, RenderedDocument};
-use prim_store::RectangleContent;
+use internal_types::{EdgeAaSegmentMask, FastHashMap, FastHashSet, RenderedDocument};
 use profiler::{GpuCacheProfileCounters, TextureCacheProfileCounters};
 use resource_cache::{FontInstanceMap,ResourceCache, TiledImageMap};
 use scene::{Scene, StackingContextHelpers, ScenePipeline, SceneProperties};
@@ -111,8 +110,8 @@ impl<'a> FlattenContext<'a> {
                     self.builder.add_solid_rectangle(
                         ClipAndScrollInfo::simple(root_reference_frame_id),
                         &info,
-                        RectangleContent::Fill(bg_color),
-                        None,
+                        bg_color,
+                        EdgeAaSegmentMask::empty(),
                     );
                 }
             }
@@ -128,11 +127,11 @@ impl<'a> FlattenContext<'a> {
         if self.builder.config.enable_scrollbars {
             let scrollbar_rect = LayerRect::new(LayerPoint::zero(), LayerSize::new(10.0, 70.0));
             let container_rect = LayerRect::new(LayerPoint::zero(), *frame_size);
-            self.builder.add_solid_rectangle(
+            self.builder.add_scroll_bar(
                 ClipAndScrollInfo::simple(root_reference_frame_id),
                 &LayerPrimitiveInfo::new(scrollbar_rect),
-                RectangleContent::Fill(DEFAULT_SCROLLBAR_COLOR),
-                Some(ScrollbarInfo(root_scroll_frame_id, container_rect)),
+                DEFAULT_SCROLLBAR_COLOR,
+                ScrollbarInfo(root_scroll_frame_id, container_rect),
             );
         }
 
@@ -451,23 +450,21 @@ impl<'a> FlattenContext<'a> {
             SpecificDisplayItem::Rectangle(ref info) => {
                 if !self.try_to_add_rectangle_splitting_on_clip(
                     &prim_info,
-                    RectangleContent::Fill(info.color),
+                    info.color,
                     &clip_and_scroll,
                 ) {
                     self.builder.add_solid_rectangle(
                         clip_and_scroll,
                         &prim_info,
-                        RectangleContent::Fill(info.color),
-                        None,
+                        info.color,
+                        EdgeAaSegmentMask::empty(),
                     );
                 }
             }
             SpecificDisplayItem::ClearRectangle => {
-                self.builder.add_solid_rectangle(
+                self.builder.add_clear_rectangle(
                     clip_and_scroll,
                     &prim_info,
-                    RectangleContent::Clear,
-                    None,
                 );
             }
             SpecificDisplayItem::Line(ref info) => {
@@ -641,7 +638,7 @@ impl<'a> FlattenContext<'a> {
     fn try_to_add_rectangle_splitting_on_clip(
         &mut self,
         info: &LayerPrimitiveInfo,
-        content: RectangleContent,
+        color: ColorF,
         clip_and_scroll: &ClipAndScrollInfo,
     ) -> bool {
         if info.rect.size.area() < 200.0 { // arbitrary threshold
@@ -651,10 +648,8 @@ impl<'a> FlattenContext<'a> {
         // If this rectangle is not opaque, splitting the rectangle up
         // into an inner opaque region just ends up hurting batching and
         // doing more work than necessary.
-        if let RectangleContent::Fill(ColorF{a, ..}) = content {
-            if a != 1.0 {
-                return false;
-            }
+        if color.a != 1.0 {
+            return false;
         }
 
         self.opaque_parts.clear();
@@ -688,8 +683,8 @@ impl<'a> FlattenContext<'a> {
             self.builder.add_solid_rectangle(
                 *clip_and_scroll,
                 &prim_info,
-                content,
-                None,
+                color,
+                EdgeAaSegmentMask::empty(),
             );
             has_opaque = true;
         }
@@ -709,8 +704,8 @@ impl<'a> FlattenContext<'a> {
             self.builder.add_solid_rectangle(
                 *clip_and_scroll,
                 &prim_info,
-                content,
-                None,
+                color,
+                EdgeAaSegmentMask::empty(),
             );
         }
         true
diff --git a/gfx/webrender/src/frame_builder.rs b/gfx/webrender/src/frame_builder.rs
index 3dddd044c1a6..9c75b1507d7a 100644
--- a/gfx/webrender/src/frame_builder.rs
+++ b/gfx/webrender/src/frame_builder.rs
@@ -21,7 +21,7 @@ use euclid::{SideOffsets2D, vec2};
 use frame::FrameId;
 use glyph_rasterizer::FontInstance;
 use gpu_cache::GpuCache;
-use internal_types::{FastHashMap, FastHashSet};
+use internal_types::{EdgeAaSegmentMask, FastHashMap, FastHashSet};
 use picture::{PictureCompositeMode, PictureKind, PicturePrimitive, RasterizationSpace};
 use prim_store::{TexelRect, YuvImagePrimitiveCpu};
 use prim_store::{GradientPrimitiveCpu, ImagePrimitiveCpu, LinePrimitive, PrimitiveKind};
@@ -755,20 +755,61 @@ impl FrameBuilder {
         &mut self,
         clip_and_scroll: ClipAndScrollInfo,
         info: &LayerPrimitiveInfo,
-        content: RectangleContent,
-        scrollbar_info: Option<ScrollbarInfo>,
+        color: ColorF,
+        edge_aa_segment_mask: EdgeAaSegmentMask,
     ) {
-        if let RectangleContent::Fill(ColorF{a, ..}) = content {
-            if a == 0.0 {
-                // Don't add transparent rectangles to the draw list, but do consider them for hit
-                // testing. This allows specifying invisible hit testing areas.
-                self.add_primitive_to_hit_testing_list(info, clip_and_scroll);
-                return;
-            }
+        if color.a == 0.0 {
+            // Don't add transparent rectangles to the draw list, but do consider them for hit
+            // testing. This allows specifying invisible hit testing areas.
+            self.add_primitive_to_hit_testing_list(info, clip_and_scroll);
+            return;
         }
+
         let prim = RectanglePrimitive {
-            content,
-            edge_aa_segment_mask: info.edge_aa_segment_mask,
+            content: RectangleContent::Fill(color),
+            edge_aa_segment_mask,
+        };
+
+        self.add_primitive(
+            clip_and_scroll,
+            info,
+            Vec::new(),
+            PrimitiveContainer::Rectangle(prim),
+        );
+    }
+
+    pub fn add_clear_rectangle(
+        &mut self,
+        clip_and_scroll: ClipAndScrollInfo,
+        info: &LayerPrimitiveInfo,
+    ) {
+        let prim = RectanglePrimitive {
+            content: RectangleContent::Clear,
+            edge_aa_segment_mask: EdgeAaSegmentMask::empty(),
+        };
+
+        self.add_primitive(
+            clip_and_scroll,
+            info,
+            Vec::new(),
+            PrimitiveContainer::Rectangle(prim),
+        );
+    }
+
+    pub fn add_scroll_bar(
+        &mut self,
+        clip_and_scroll: ClipAndScrollInfo,
+        info: &LayerPrimitiveInfo,
+        color: ColorF,
+        scrollbar_info: ScrollbarInfo,
+    ) {
+        if color.a == 0.0 {
+            return;
+        }
+
+        let prim = RectanglePrimitive {
+            content: RectangleContent::Fill(color),
+            edge_aa_segment_mask: EdgeAaSegmentMask::empty(),
         };
 
         let prim_index = self.add_primitive(
@@ -778,13 +819,11 @@ impl FrameBuilder {
             PrimitiveContainer::Rectangle(prim),
         );
 
-        if let Some(ScrollbarInfo(clip_id, frame_rect)) = scrollbar_info {
-            self.scrollbar_prims.push(ScrollbarPrimitive {
-                prim_index,
-                clip_id,
-                frame_rect,
-            });
-        }
+        self.scrollbar_prims.push(ScrollbarPrimitive {
+            prim_index,
+            clip_id: scrollbar_info.0,
+            frame_rect: scrollbar_info.1,
+        });
     }
 
     pub fn add_line(
@@ -1286,9 +1325,9 @@ impl FrameBuilder {
             font.bg_color,
             render_mode,
             font.subpx_dir,
+            font.flags,
             font.platform_options,
             font.variations.clone(),
-            font.synthetic_italics,
         );
         let prim = TextRunPrimitiveCpu {
             font: prim_font,
@@ -1594,6 +1633,7 @@ impl FrameBuilder {
             ClearMode::Transparent,
             RasterizationSpace::Screen,
             child_tasks,
+            None,
         );
 
         pic.render_task_id = Some(render_tasks.add(root_render_task));
diff --git a/gfx/webrender/src/glyph_rasterizer.rs b/gfx/webrender/src/glyph_rasterizer.rs
index f18ea886ac60..8a458fc112a7 100644
--- a/gfx/webrender/src/glyph_rasterizer.rs
+++ b/gfx/webrender/src/glyph_rasterizer.rs
@@ -5,8 +5,9 @@
 #[cfg(test)]
 use api::{IdNamespace, LayoutPoint};
 use api::{ColorF, ColorU, DevicePoint, DeviceUintSize};
-use api::{FontInstancePlatformOptions, FontRenderMode, FontVariation};
-use api::{FontKey, FontTemplate, GlyphDimensions, GlyphKey, SubpixelDirection};
+use api::{FontInstanceFlags, FontInstancePlatformOptions};
+use api::{FontKey, FontRenderMode, FontTemplate, FontVariation};
+use api::{GlyphDimensions, GlyphKey, SubpixelDirection};
 use api::{ImageData, ImageDescriptor, ImageFormat, LayerToWorldTransform};
 use app_units::Au;
 use device::TextureFilter;
@@ -139,9 +140,9 @@ pub struct FontInstance {
     pub bg_color: ColorU,
     pub render_mode: FontRenderMode,
     pub subpx_dir: SubpixelDirection,
+    pub flags: FontInstanceFlags,
     pub platform_options: Option<FontInstancePlatformOptions>,
     pub variations: Vec<FontVariation>,
-    pub synthetic_italics: bool,
     pub transform: FontTransform,
 }
 
@@ -153,9 +154,9 @@ impl FontInstance {
         bg_color: ColorU,
         render_mode: FontRenderMode,
         subpx_dir: SubpixelDirection,
+        flags: FontInstanceFlags,
         platform_options: Option<FontInstancePlatformOptions>,
         variations: Vec<FontVariation>,
-        synthetic_italics: bool,
     ) -> Self {
         FontInstance {
             font_key,
@@ -164,9 +165,9 @@ impl FontInstance {
             bg_color,
             render_mode,
             subpx_dir,
+            flags,
             platform_options,
             variations,
-            synthetic_italics,
             transform: FontTransform::identity(),
         }
     }
@@ -611,9 +612,9 @@ fn raterize_200_glyphs() {
         ColorU::new(0, 0, 0, 0),
         FontRenderMode::Subpixel,
         SubpixelDirection::Horizontal,
+        Default::default(),
         None,
         Vec::new(),
-        false,
     );
 
     let mut glyph_keys = Vec::with_capacity(200);
diff --git a/gfx/webrender/src/gpu_cache.rs b/gfx/webrender/src/gpu_cache.rs
index 9ab4f8297721..75dbef723de5 100644
--- a/gfx/webrender/src/gpu_cache.rs
+++ b/gfx/webrender/src/gpu_cache.rs
@@ -113,7 +113,7 @@ pub struct GpuCacheHandle {
 }
 
 impl GpuCacheHandle {
-    pub fn new() -> GpuCacheHandle {
+    pub fn new() -> Self {
         GpuCacheHandle { location: None }
     }
 }
@@ -170,7 +170,7 @@ struct Block {
 }
 
 impl Block {
-    fn new(address: GpuCacheAddress, next: Option<BlockIndex>, frame_id: FrameId) -> Block {
+    fn new(address: GpuCacheAddress, next: Option<BlockIndex>, frame_id: FrameId) -> Self {
         Block {
             address,
             next,
@@ -193,7 +193,7 @@ struct Row {
 }
 
 impl Row {
-    fn new(block_count_per_item: usize) -> Row {
+    fn new(block_count_per_item: usize) -> Self {
         Row {
             block_count_per_item,
         }
@@ -300,7 +300,7 @@ struct Texture {
 }
 
 impl Texture {
-    fn new() -> Texture {
+    fn new() -> Self {
         Texture {
             height: GPU_CACHE_INITIAL_HEIGHT,
             blocks: Vec::new(),
@@ -449,6 +449,7 @@ pub struct GpuDataRequest<'a> {
     handle: &'a mut GpuCacheHandle,
     frame_id: FrameId,
     start_index: usize,
+    max_block_count: usize,
     texture: &'a mut Texture,
 }
 
@@ -477,7 +478,9 @@ impl<'a> GpuDataRequest<'a> {
 impl<'a> Drop for GpuDataRequest<'a> {
     fn drop(&mut self) {
         // Push the data to the texture pending updates list.
-        let block_count = self.texture.pending_blocks.len() - self.start_index;
+        let block_count = self.current_used_block_num();
+        debug_assert!(block_count <= self.max_block_count);
+
         let location = self.texture
             .push_data(Some(self.start_index), block_count, self.frame_id);
         self.handle.location = Some(location);
@@ -491,13 +494,17 @@ pub struct GpuCache {
     frame_id: FrameId,
     /// CPU-side texture allocator.
     texture: Texture,
+    /// Number of blocks requested this frame that don't
+    /// need to be re-uploaded.
+    saved_block_count: usize,
 }
 
 impl GpuCache {
-    pub fn new() -> GpuCache {
+    pub fn new() -> Self {
         GpuCache {
             frame_id: FrameId::new(0),
             texture: Texture::new(),
+            saved_block_count: 0,
         }
     }
 
@@ -506,6 +513,7 @@ impl GpuCache {
         debug_assert!(self.texture.pending_blocks.is_empty());
         self.frame_id = self.frame_id + 1;
         self.texture.evict_old_blocks(self.frame_id);
+        self.saved_block_count = 0;
     }
 
     // Invalidate a (possibly) existing block in the cache.
@@ -521,12 +529,17 @@ impl GpuCache {
     // Request a resource be added to the cache. If the resource
     /// is already in the cache, `None` will be returned.
     pub fn request<'a>(&'a mut self, handle: &'a mut GpuCacheHandle) -> Option<GpuDataRequest<'a>> {
+        let mut max_block_count = MAX_VERTEX_TEXTURE_WIDTH;
         // Check if the allocation for this handle is still valid.
         if let Some(ref location) = handle.location {
             let block = &mut self.texture.blocks[location.block_index.0];
+            max_block_count = self.texture.rows[block.address.v as usize].block_count_per_item;
             if block.epoch == location.epoch {
-                // Mark last access time to avoid evicting this block.
-                block.last_access_time = self.frame_id;
+                if block.last_access_time != self.frame_id {
+                    // Mark last access time to avoid evicting this block.
+                    block.last_access_time = self.frame_id;
+                    self.saved_block_count += max_block_count;
+                }
                 return None;
             }
         }
@@ -536,6 +549,7 @@ impl GpuCache {
             frame_id: self.frame_id,
             start_index: self.texture.pending_blocks.len(),
             texture: &mut self.texture,
+            max_block_count,
         })
     }
 
@@ -571,10 +585,15 @@ impl GpuCache {
         &mut self,
         profile_counters: &mut GpuCacheProfileCounters,
     ) -> GpuCacheUpdateList {
-        profile_counters.allocated_rows.set(self.texture.rows.len());
+        profile_counters
+            .allocated_rows
+            .set(self.texture.rows.len());
         profile_counters
             .allocated_blocks
             .set(self.texture.allocated_block_count);
+        profile_counters
+            .saved_blocks
+            .set(self.saved_block_count);
 
         GpuCacheUpdateList {
             height: self.texture.height,
diff --git a/gfx/webrender/src/internal_types.rs b/gfx/webrender/src/internal_types.rs
index f80bde776509..a5c3a92410fc 100644
--- a/gfx/webrender/src/internal_types.rs
+++ b/gfx/webrender/src/internal_types.rs
@@ -190,3 +190,18 @@ pub struct UvRect {
     pub uv0: DevicePoint,
     pub uv1: DevicePoint,
 }
+
+bitflags! {
+    /// Each bit of the edge AA mask is:
+    /// 0, when the edge of the primitive needs to be considered for AA
+    /// 1, when the edge of the segment needs to be considered for AA
+    ///
+    /// *Note*: the bit values have to match the shader logic in
+    /// `write_transform_vertex()` function.
+    pub struct EdgeAaSegmentMask: u8 {
+        const LEFT = 0x1;
+        const TOP = 0x2;
+        const RIGHT = 0x4;
+        const BOTTOM = 0x8;
+    }
+}
diff --git a/gfx/webrender/src/lib.rs b/gfx/webrender/src/lib.rs
index 9c164da6fa6a..8047f847776d 100644
--- a/gfx/webrender/src/lib.rs
+++ b/gfx/webrender/src/lib.rs
@@ -147,6 +147,11 @@ extern crate serde_json;
 extern crate time;
 #[cfg(feature = "debugger")]
 extern crate ws;
+#[cfg(feature = "debugger")]
+extern crate image;
+#[cfg(feature = "debugger")]
+extern crate base64;
+
 pub extern crate webrender_api;
 
 #[doc(hidden)]
diff --git a/gfx/webrender/src/picture.rs b/gfx/webrender/src/picture.rs
index 6e75150a7381..0bd529e4beac 100644
--- a/gfx/webrender/src/picture.rs
+++ b/gfx/webrender/src/picture.rs
@@ -6,7 +6,7 @@ use api::{BorderRadiusKind, ColorF, ClipAndScrollInfo, FilterOp, MixBlendMode};
 use api::{device_length, DeviceIntRect, DeviceIntSize, PipelineId};
 use api::{BoxShadowClipMode, LayerPoint, LayerRect, LayerSize, LayerVector2D, Shadow};
 use api::{ClipId, PremultipliedColorF};
-use box_shadow::BLUR_SAMPLE_SCALE;
+use box_shadow::{BLUR_SAMPLE_SCALE, BoxShadowCacheKey};
 use frame_builder::PrimitiveContext;
 use gpu_cache::GpuDataRequest;
 use prim_store::{PrimitiveIndex, PrimitiveRun, PrimitiveRunLocalRect};
@@ -61,6 +61,7 @@ pub enum PictureKind {
         clip_mode: BoxShadowClipMode,
         radii_kind: BorderRadiusKind,
         content_rect: LayerRect,
+        cache_key: BoxShadowCacheKey,
     },
     Image {
         // If a mix-blend-mode, contains the render task for
@@ -153,6 +154,7 @@ impl PicturePrimitive {
         blur_regions: Vec<LayerRect>,
         clip_mode: BoxShadowClipMode,
         radii_kind: BorderRadiusKind,
+        cache_key: BoxShadowCacheKey,
         pipeline_id: PipelineId,
     ) -> Self {
         PicturePrimitive {
@@ -165,6 +167,7 @@ impl PicturePrimitive {
                 clip_mode,
                 radii_kind,
                 content_rect: LayerRect::zero(),
+                cache_key,
             },
             pipeline_id,
             cull_children: false,
@@ -317,6 +320,7 @@ impl PicturePrimitive {
                             ClearMode::Transparent,
                             self.rasterization_kind,
                             child_tasks,
+                            None,
                         );
 
                         let blur_radius = device_length(blur_radius, prim_context.device_pixel_ratio);
@@ -331,6 +335,7 @@ impl PicturePrimitive {
                             &[],
                             ClearMode::Transparent,
                             PremultipliedColorF::TRANSPARENT,
+                            None,
                         );
 
                         let blur_render_task_id = render_tasks.add(blur_render_task);
@@ -347,6 +352,7 @@ impl PicturePrimitive {
                             ClearMode::Transparent,
                             self.rasterization_kind,
                             child_tasks,
+                            None,
                         );
 
                         let readback_task_id = render_tasks.add(RenderTask::new_readback(*prim_screen_rect));
@@ -376,6 +382,7 @@ impl PicturePrimitive {
                                 ClearMode::Transparent,
                                 self.rasterization_kind,
                                 child_tasks,
+                                None,
                             );
 
                             self.render_task_id = Some(render_tasks.add(picture_task));
@@ -392,6 +399,7 @@ impl PicturePrimitive {
                             ClearMode::Transparent,
                             self.rasterization_kind,
                             child_tasks,
+                            None,
                         );
 
                         self.render_task_id = Some(render_tasks.add(picture_task));
@@ -436,6 +444,7 @@ impl PicturePrimitive {
                     ClearMode::Transparent,
                     self.rasterization_kind,
                     Vec::new(),
+                    None,
                 );
 
                 let picture_task_id = render_tasks.add(picture_task);
@@ -448,11 +457,12 @@ impl PicturePrimitive {
                     &[],
                     ClearMode::Transparent,
                     color.premultiplied(),
+                    None,
                 );
 
                 self.render_task_id = Some(render_tasks.add(render_task));
             }
-            PictureKind::BoxShadow { blur_radius, clip_mode, ref blur_regions, color, content_rect, .. } => {
+            PictureKind::BoxShadow { blur_radius, clip_mode, ref blur_regions, color, content_rect, cache_key, .. } => {
                 let blur_radius = device_length(blur_radius, prim_context.device_pixel_ratio);
 
                 // TODO(gw): Rounding the content rect here to device pixels is not
@@ -490,6 +500,7 @@ impl PicturePrimitive {
                     ClearMode::Zero,
                     self.rasterization_kind,
                     Vec::new(),
+                    Some(cache_key),
                 );
 
                 let picture_task_id = render_tasks.add(picture_task);
@@ -502,6 +513,7 @@ impl PicturePrimitive {
                     blur_regions,
                     blur_clear_mode,
                     color.premultiplied(),
+                    Some(cache_key),
                 );
 
                 self.render_task_id = Some(render_tasks.add(render_task));
diff --git a/gfx/webrender/src/platform/macos/font.rs b/gfx/webrender/src/platform/macos/font.rs
index 24718bbece0c..e896a9beea9a 100644
--- a/gfx/webrender/src/platform/macos/font.rs
+++ b/gfx/webrender/src/platform/macos/font.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use api::{ColorU, FontKey, FontRenderMode, GlyphDimensions};
-use api::{FontVariation, NativeFontHandle};
+use api::{FontInstanceFlags, FontVariation, NativeFontHandle};
 use api::{GlyphKey, SubpixelDirection};
 use app_units::Au;
 use core_foundation::array::{CFArray, CFArrayRef};
@@ -282,7 +282,7 @@ impl FontContext {
             Err(_) => return,
             Ok(cg_font) => cg_font,
         };
-        self.cg_fonts.insert((*font_key).clone(), cg_font);
+        self.cg_fonts.insert(*font_key, cg_font);
     }
 
     pub fn add_native_font(&mut self, font_key: &FontKey, native_font_handle: NativeFontHandle) {
@@ -291,21 +291,12 @@ impl FontContext {
         }
 
         self.cg_fonts
-            .insert((*font_key).clone(), native_font_handle.0);
+            .insert(*font_key, native_font_handle.0);
     }
 
     pub fn delete_font(&mut self, font_key: &FontKey) {
         if let Some(_) = self.cg_fonts.remove(font_key) {
-            // Unstable Rust has a retain() method on HashMap that will
-            // let us do this in-place. https://github.com/rust-lang/rust/issues/36648
-            let ct_font_keys = self.ct_fonts
-                .keys()
-                .filter(|k| k.0 == *font_key)
-                .cloned()
-                .collect::<Vec<_>>();
-            for ct_font_key in ct_font_keys {
-                self.ct_fonts.remove(&ct_font_key);
-            }
+            self.ct_fonts.retain(|k, _| k.0 != *font_key);
         }
     }
 
@@ -425,7 +416,7 @@ impl FontContext {
                 font.subpx_dir = SubpixelDirection::None;
             }
             FontRenderMode::Alpha => {
-                font.color = if font.platform_options.unwrap_or_default().font_smoothing {
+                font.color = if font.flags.contains(FontInstanceFlags::FONT_SMOOTHING) {
                     // Only the G channel is used to index grayscale tables,
                     // so use R and B to preserve light/dark determination.
                     let ColorU { g, a, .. } = font.color.luminance_color().quantized_ceil();
@@ -545,7 +536,7 @@ impl FontContext {
         // to both the Subpixel and the "Alpha + smoothing" modes, but not to
         // the "Alpha without smoothing" and Mono modes.
         let use_white_on_black = should_use_white_on_black(font.color);
-        let use_font_smoothing = font.platform_options.unwrap_or_default().font_smoothing;
+        let use_font_smoothing = font.flags.contains(FontInstanceFlags::FONT_SMOOTHING);
         let (antialias, smooth, text_color, bg_color, bg_alpha, invert) =
             match (font.render_mode, use_font_smoothing) {
                 (FontRenderMode::Subpixel, _) |
diff --git a/gfx/webrender/src/platform/unix/font.rs b/gfx/webrender/src/platform/unix/font.rs
index 8dd2886ceeef..c000aba8bb01 100644
--- a/gfx/webrender/src/platform/unix/font.rs
+++ b/gfx/webrender/src/platform/unix/font.rs
@@ -4,9 +4,7 @@
 
 use api::{ColorU, GlyphDimensions, GlyphKey, FontKey, FontRenderMode};
 use api::{FontInstancePlatformOptions, FontLCDFilter, FontHinting};
-use api::{NativeFontHandle, SubpixelDirection};
-use api::{FONT_FORCE_AUTOHINT, FONT_NO_AUTOHINT, FONT_EMBEDDED_BITMAP};
-use api::{FONT_EMBOLDEN, FONT_VERTICAL_LAYOUT, FONT_SUBPIXEL_BGR};
+use api::{FontInstanceFlags, NativeFontHandle, SubpixelDirection};
 use freetype::freetype::{FT_BBox, FT_Outline_Translate, FT_Pixel_Mode, FT_Render_Mode};
 use freetype::freetype::{FT_Done_Face, FT_Error, FT_Get_Char_Index, FT_Int32};
 use freetype::freetype::{FT_Done_FreeType, FT_Library_SetLcdFilter, FT_Pos};
@@ -153,7 +151,7 @@ impl FontContext {
         let face = self.faces.get(&font.font_key).unwrap();
 
         let mut load_flags = FT_LOAD_DEFAULT;
-        let FontInstancePlatformOptions { flags, hinting, .. } = font.platform_options.unwrap_or_default();
+        let FontInstancePlatformOptions { hinting, .. } = font.platform_options.unwrap_or_default();
         match (hinting, font.render_mode) {
             (FontHinting::None, _) => load_flags |= FT_LOAD_NO_HINTING,
             (FontHinting::Mono, _) => load_flags = FT_LOAD_TARGET_MONO,
@@ -163,24 +161,24 @@ impl FontContext {
                     SubpixelDirection::Vertical => FT_LOAD_TARGET_LCD_V,
                     _ => FT_LOAD_TARGET_LCD,
                 };
-                if (flags & FONT_FORCE_AUTOHINT) != 0 {
+                if font.flags.contains(FontInstanceFlags::FORCE_AUTOHINT) {
                     load_flags |= FT_LOAD_FORCE_AUTOHINT;
                 }
             }
             _ => {
-                if (flags & FONT_FORCE_AUTOHINT) != 0 {
+                if font.flags.contains(FontInstanceFlags::FORCE_AUTOHINT) {
                     load_flags |= FT_LOAD_FORCE_AUTOHINT;
                 }
             }
         }
 
-        if (flags & FONT_NO_AUTOHINT) != 0 {
+        if font.flags.contains(FontInstanceFlags::NO_AUTOHINT) {
             load_flags |= FT_LOAD_NO_AUTOHINT;
         }
-        if (flags & FONT_EMBEDDED_BITMAP) == 0 {
+        if font.flags.contains(FontInstanceFlags::EMBEDDED_BITMAPS) {
             load_flags |= FT_LOAD_NO_BITMAP;
         }
-        if (flags & FONT_VERTICAL_LAYOUT) != 0 {
+        if font.flags.contains(FontInstanceFlags::VERTICAL_LAYOUT) {
             load_flags |= FT_LOAD_VERTICAL_LAYOUT;
         }
 
@@ -224,7 +222,7 @@ impl FontContext {
             let slot = unsafe { (*face.face).glyph };
             assert!(slot != ptr::null_mut());
 
-            if (flags & FONT_EMBOLDEN) != 0 {
+            if font.flags.contains(FontInstanceFlags::SYNTHETIC_BOLD) {
                 unsafe { FT_GlyphSlot_Embolden(slot) };
             }
 
@@ -385,15 +383,9 @@ impl FontContext {
         let face_flags = unsafe { (*face.face).face_flags };
         // If the face has embedded bitmaps, they should only be used if either
         // embedded bitmaps are explicitly requested or if the face has no outline.
-        if (face_flags & (FT_FACE_FLAG_FIXED_SIZES as FT_Long)) != 0 {
-            let FontInstancePlatformOptions { flags, .. } = font.platform_options.unwrap_or_default();
-            if (flags & FONT_EMBEDDED_BITMAP) != 0 {
-                return true;
-            }
-            (face_flags & (FT_FACE_FLAG_SCALABLE as FT_Long)) == 0
-        } else {
-            false
-        }
+        (face_flags & (FT_FACE_FLAG_FIXED_SIZES as FT_Long)) != 0 &&
+            (font.flags.contains(FontInstanceFlags::EMBEDDED_BITMAPS) ||
+                (face_flags & (FT_FACE_FLAG_SCALABLE as FT_Long)) == 0)
     }
 
     fn choose_bitmap_size(&self, face: FT_Face, requested_size: f64) -> FT_Error {
@@ -451,7 +443,7 @@ impl FontContext {
                 dy - ((cbox.yMin + dy) & !63),
             );
 
-            if font.synthetic_italics {
+            if font.flags.contains(FontInstanceFlags::SYNTHETIC_ITALICS) {
                 FT_GlyphSlot_Oblique(slot);
             }
         }
@@ -555,8 +547,7 @@ impl FontContext {
 
         // Extract the final glyph from FT format into RGBA8 format, which is
         // what WR expects.
-        let FontInstancePlatformOptions { flags, .. } = font.platform_options.unwrap_or_default();
-        let subpixel_bgr = (flags & FONT_SUBPIXEL_BGR) != 0;
+        let subpixel_bgr = font.flags.contains(FontInstanceFlags::SUBPIXEL_BGR);
         let mut src_row = bitmap.buffer;
         let mut dest: usize = 0;
         while dest < final_buffer.len() {
diff --git a/gfx/webrender/src/platform/windows/font.rs b/gfx/webrender/src/platform/windows/font.rs
index 7df7eb8ce981..dbce8962a55e 100644
--- a/gfx/webrender/src/platform/windows/font.rs
+++ b/gfx/webrender/src/platform/windows/font.rs
@@ -2,12 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use api::{FontInstancePlatformOptions, FontKey, FontRenderMode};
+use api::{FontInstanceFlags, FontKey, FontRenderMode};
 use api::{ColorU, GlyphDimensions, GlyphKey, SubpixelDirection};
 use dwrote;
 use gamma_lut::{ColorLut, GammaLut};
 use glyph_rasterizer::{FontInstance, RasterizedGlyph};
 use internal_types::FastHashMap;
+use std::collections::hash_map::Entry;
 use std::sync::Arc;
 
 lazy_static! {
@@ -21,6 +22,7 @@ lazy_static! {
 
 pub struct FontContext {
     fonts: FastHashMap<FontKey, dwrote::FontFace>,
+    simulations: FastHashMap<(FontKey, dwrote::DWRITE_FONT_SIMULATIONS), dwrote::FontFace>,
     gamma_lut: GammaLut,
     gdi_gamma_lut: GammaLut,
 }
@@ -39,15 +41,12 @@ fn dwrite_texture_type(render_mode: FontRenderMode) -> dwrote::DWRITE_TEXTURE_TY
 }
 
 fn dwrite_measure_mode(
-    render_mode: FontRenderMode,
-    options: Option<FontInstancePlatformOptions>,
+    font: &FontInstance,
 ) -> dwrote::DWRITE_MEASURING_MODE {
-    let FontInstancePlatformOptions { force_gdi_rendering, .. } =
-        options.unwrap_or_default();
-    if force_gdi_rendering {
+    if font.flags.contains(FontInstanceFlags::FORCE_GDI) {
         dwrote::DWRITE_MEASURING_MODE_GDI_CLASSIC
     } else {
-      match render_mode {
+      match font.render_mode {
           FontRenderMode::Mono | FontRenderMode::Bitmap => dwrote::DWRITE_MEASURING_MODE_GDI_CLASSIC,
           FontRenderMode::Alpha | FontRenderMode::Subpixel => dwrote::DWRITE_MEASURING_MODE_NATURAL,
       }
@@ -56,18 +55,15 @@ fn dwrite_measure_mode(
 
 fn dwrite_render_mode(
     font_face: &dwrote::FontFace,
-    render_mode: FontRenderMode,
+    font: &FontInstance,
     em_size: f32,
     measure_mode: dwrote::DWRITE_MEASURING_MODE,
-    options: Option<FontInstancePlatformOptions>,
 ) -> dwrote::DWRITE_RENDERING_MODE {
-    let dwrite_render_mode = match render_mode {
+    let dwrite_render_mode = match font.render_mode {
         FontRenderMode::Bitmap => dwrote::DWRITE_RENDERING_MODE_GDI_CLASSIC,
         FontRenderMode::Mono => dwrote::DWRITE_RENDERING_MODE_ALIASED,
         FontRenderMode::Alpha | FontRenderMode::Subpixel => {
-            let FontInstancePlatformOptions { force_gdi_rendering, .. } =
-                options.unwrap_or_default();
-            if force_gdi_rendering {
+            if font.flags.contains(FontInstanceFlags::FORCE_GDI) {
                 dwrote::DWRITE_RENDERING_MODE_GDI_CLASSIC
             } else {
                 font_face.get_recommended_rendering_mode_default_params(em_size, 1.0, measure_mode)
@@ -93,6 +89,7 @@ impl FontContext {
         let gdi_gamma = 2.3;
         FontContext {
             fonts: FastHashMap::default(),
+            simulations: FastHashMap::default(),
             gamma_lut: GammaLut::new(contrast, gamma, gamma),
             gdi_gamma_lut: GammaLut::new(contrast, gdi_gamma, gdi_gamma),
         }
@@ -109,7 +106,7 @@ impl FontContext {
 
         if let Some(font_file) = dwrote::FontFile::new_from_data(&**data) {
             let face = font_file.create_face(index, dwrote::DWRITE_FONT_SIMULATIONS_NONE);
-            self.fonts.insert((*font_key).clone(), face);
+            self.fonts.insert(*font_key, face);
         } else {
             // XXX add_raw_font needs to have a way to return an error
             debug!("DWrite WR failed to load font from data, using Arial instead");
@@ -125,11 +122,13 @@ impl FontContext {
         let system_fc = dwrote::FontCollection::system();
         let font = system_fc.get_font_from_descriptor(&font_handle).unwrap();
         let face = font.create_font_face();
-        self.fonts.insert((*font_key).clone(), face);
+        self.fonts.insert(*font_key, face);
     }
 
     pub fn delete_font(&mut self, font_key: &FontKey) {
-        self.fonts.remove(font_key);
+        if let Some(_) = self.fonts.remove(font_key) {
+            self.simulations.retain(|k, _| k.0 != *font_key);
+        }
     }
 
     // Assumes RGB format from dwrite, which is 3 bytes per pixel as dwrite
@@ -150,12 +149,35 @@ impl FontContext {
         }
     }
 
+    fn get_font_face(
+        &mut self,
+        font: &FontInstance,
+    ) -> &dwrote::FontFace {
+        if !font.flags.intersects(FontInstanceFlags::SYNTHETIC_BOLD | FontInstanceFlags::SYNTHETIC_ITALICS) {
+            return self.fonts.get(&font.font_key).unwrap();
+        }
+        let mut sims = dwrote::DWRITE_FONT_SIMULATIONS_NONE;
+        if font.flags.contains(FontInstanceFlags::SYNTHETIC_BOLD) {
+            sims = sims | dwrote::DWRITE_FONT_SIMULATIONS_BOLD;
+        }
+        if font.flags.contains(FontInstanceFlags::SYNTHETIC_ITALICS) {
+            sims = sims | dwrote::DWRITE_FONT_SIMULATIONS_OBLIQUE;
+        }
+        match self.simulations.entry((font.font_key, sims)) {
+            Entry::Occupied(entry) => entry.into_mut(),
+            Entry::Vacant(entry) => {
+                let normal_face = self.fonts.get(&font.font_key).unwrap();
+                entry.insert(normal_face.create_font_face_with_simulations(sims))
+            }
+        }
+    }
+
     fn create_glyph_analysis(
-        &self,
+        &mut self,
         font: &FontInstance,
         key: &GlyphKey,
     ) -> dwrote::GlyphRunAnalysis {
-        let face = self.fonts.get(&font.font_key).unwrap();
+        let face = self.get_font_face(font);
         let glyph = key.index as u16;
         let advance = 0.0f32;
         let offset = dwrote::GlyphOffset {
@@ -177,13 +199,12 @@ impl FontContext {
             bidiLevel: 0,
         };
 
-        let dwrite_measure_mode = dwrite_measure_mode(font.render_mode, font.platform_options);
+        let dwrite_measure_mode = dwrite_measure_mode(font);
         let dwrite_render_mode = dwrite_render_mode(
             face,
-            font.render_mode,
+            font,
             size,
             dwrite_measure_mode,
-            font.platform_options,
         );
 
         let (x_offset, y_offset) = font.get_subpx_offset(key);
@@ -216,7 +237,7 @@ impl FontContext {
 
     // TODO: Pipe GlyphOptions into glyph_dimensions too
     pub fn get_glyph_dimensions(
-        &self,
+        &mut self,
         font: &FontInstance,
         key: &GlyphKey,
     ) -> Option<GlyphDimensions> {
@@ -237,7 +258,7 @@ impl FontContext {
             return None;
         }
 
-        let face = self.fonts.get(&font.font_key).unwrap();
+        let face = self.get_font_face(font);
         face.get_design_glyph_metrics(&[key.index as u16], false)
             .first()
             .map(|metrics| {
@@ -301,7 +322,7 @@ impl FontContext {
         // If bitmaps are requested, then treat as a bitmap font to disable transforms.
         // If mono AA is requested, let that take priority over using bitmaps.
         font.render_mode != FontRenderMode::Mono &&
-            font.platform_options.unwrap_or_default().use_embedded_bitmap
+            font.flags.contains(FontInstanceFlags::EMBEDDED_BITMAPS)
     }
 
     pub fn prepare_font(font: &mut FontInstance) {
@@ -345,9 +366,7 @@ impl FontContext {
         let lut_correction = match font.render_mode {
             FontRenderMode::Mono | FontRenderMode::Bitmap => &self.gdi_gamma_lut,
             FontRenderMode::Alpha | FontRenderMode::Subpixel => {
-                let FontInstancePlatformOptions { force_gdi_rendering, .. } =
-                    font.platform_options.unwrap_or_default();
-                if force_gdi_rendering {
+                if font.flags.contains(FontInstanceFlags::FORCE_GDI) {
                     &self.gdi_gamma_lut
                 } else {
                     &self.gamma_lut
diff --git a/gfx/webrender/src/prim_store.rs b/gfx/webrender/src/prim_store.rs
index 0be4a00f3050..79e0afcfd0d3 100644
--- a/gfx/webrender/src/prim_store.rs
+++ b/gfx/webrender/src/prim_store.rs
@@ -6,14 +6,14 @@ use api::{BorderRadius, BuiltDisplayList, ColorF, ComplexClipRegion, DeviceIntRe
 use api::{DevicePoint, ExtendMode, FontRenderMode, GlyphInstance, GlyphKey};
 use api::{GradientStop, ImageKey, ImageRendering, ItemRange, ItemTag, LayerPoint, LayerRect};
 use api::{ClipMode, LayerSize, LayerVector2D, LayerToWorldTransform, LineOrientation, LineStyle};
-use api::{ClipAndScrollInfo, EdgeAaSegmentMask, PremultipliedColorF, TileOffset};
+use api::{ClipAndScrollInfo, PremultipliedColorF, TileOffset};
 use api::{ClipId, LayerTransform, PipelineId, YuvColorSpace, YuvFormat};
 use border::BorderCornerInstance;
 use clip_scroll_tree::{CoordinateSystemId, ClipScrollTree};
 use clip::{ClipSourcesHandle, ClipStore};
 use frame_builder::PrimitiveContext;
 use glyph_rasterizer::{FontInstance, FontTransform};
-use internal_types::FastHashMap;
+use internal_types::{EdgeAaSegmentMask, FastHashMap};
 use gpu_cache::{GpuBlockData, GpuCache, GpuCacheAddress, GpuCacheHandle, GpuDataRequest,
                 ToGpuBlocks};
 use picture::{PictureKind, PicturePrimitive, RasterizationSpace};
diff --git a/gfx/webrender/src/profiler.rs b/gfx/webrender/src/profiler.rs
index 737e088617fd..1cd9b3d364bd 100644
--- a/gfx/webrender/src/profiler.rs
+++ b/gfx/webrender/src/profiler.rs
@@ -8,6 +8,7 @@ use euclid::{Point2D, Rect, Size2D, vec2};
 use query::{GpuSampler, GpuTimer, NamedTag};
 use std::collections::vec_deque::VecDeque;
 use internal_types::FastHashMap;
+use renderer::MAX_VERTEX_TEXTURE_WIDTH;
 use std::{f32, mem};
 use time::precise_time_ns;
 
@@ -350,13 +351,19 @@ impl TextureCacheProfileCounters {
 pub struct GpuCacheProfileCounters {
     pub allocated_rows: IntProfileCounter,
     pub allocated_blocks: IntProfileCounter,
+    pub updated_rows: IntProfileCounter,
+    pub updated_blocks: IntProfileCounter,
+    pub saved_blocks: IntProfileCounter,
 }
 
 impl GpuCacheProfileCounters {
     pub fn new() -> Self {
         GpuCacheProfileCounters {
-            allocated_rows: IntProfileCounter::new("GPU cache rows"),
-            allocated_blocks: IntProfileCounter::new("GPU cache blocks"),
+            allocated_rows: IntProfileCounter::new("GPU cache rows: total"),
+            updated_rows: IntProfileCounter::new("GPU cache rows: updated"),
+            allocated_blocks: IntProfileCounter::new("GPU cache blocks: total"),
+            updated_blocks: IntProfileCounter::new("GPU cache blocks: updated"),
+            saved_blocks: IntProfileCounter::new("GPU cache blocks: saved"),
         }
     }
 }
@@ -825,6 +832,99 @@ impl Profiler {
         }
     }
 
+    fn draw_gpu_cache_bar(
+        &mut self,
+        label: &str,
+        label_color: ColorU,
+        counters: &[(ColorU, &IntProfileCounter)],
+        debug_renderer: &mut DebugRenderer,
+    ) -> Rect<f32> {
+        let mut rect = debug_renderer.add_text(
+            self.x_left,
+            self.y_left,
+            label,
+            label_color,
+        );
+
+        let x_base = rect.origin.x + rect.size.width + 10.0;
+        let height = debug_renderer.line_height();
+        let width = (self.x_right - 30.0 - x_base).max(0.0);
+        let total_value = counters.last().unwrap().1.value;
+        let scale = width / total_value as f32;
+        let mut x_current = x_base;
+
+        for &(color, counter) in counters {
+            let x_stop = x_base + counter.value as f32 * scale;
+            debug_renderer.add_quad(
+                x_current,
+                rect.origin.y,
+                x_stop,
+                rect.origin.y + height,
+                color,
+                color,
+            );
+            x_current = x_stop;
+        }
+
+        self.y_left += height;
+
+        rect.size.width += width + 10.0;
+        rect
+    }
+
+    fn draw_gpu_cache_bars(
+        &mut self,
+        counters: &GpuCacheProfileCounters,
+        debug_renderer: &mut DebugRenderer,
+    ) {
+        let color_updated = ColorU::new(0xFF, 0, 0, 0xFF);
+        let color_free = ColorU::new(0, 0, 0xFF, 0xFF);
+        let color_saved = ColorU::new(0, 0xFF, 0, 0xFF);
+
+        let requested_blocks = IntProfileCounter {
+            description: "",
+            value: counters.updated_blocks.value + counters.saved_blocks.value,
+        };
+        let total_blocks = IntProfileCounter {
+            description: "",
+            value: counters.allocated_rows.value * MAX_VERTEX_TEXTURE_WIDTH,
+        };
+
+        let rect0 = self.draw_gpu_cache_bar(
+            &format!("GPU cache rows ({}):", counters.allocated_rows.value),
+            ColorU::new(255, 255, 255, 255),
+            &[
+                (color_updated, &counters.updated_rows),
+                (color_free, &counters.allocated_rows),
+            ],
+            debug_renderer,
+        );
+
+        let rect1 = self.draw_gpu_cache_bar(
+            "GPU cache blocks",
+            ColorU::new(255, 255, 0, 255),
+            &[
+                (color_updated, &counters.updated_blocks),
+                (color_saved, &requested_blocks),
+                (color_free, &counters.allocated_blocks),
+                (ColorU::new(0, 0, 0, 255), &total_blocks),
+            ],
+            debug_renderer,
+        );
+
+        let total_rect = rect0.union(&rect1).inflate(10.0, 10.0);
+        debug_renderer.add_quad(
+            total_rect.origin.x,
+            total_rect.origin.y,
+            total_rect.origin.x + total_rect.size.width,
+            total_rect.origin.y + total_rect.size.height,
+            ColorF::new(0.1, 0.1, 0.1, 0.8).into(),
+            ColorF::new(0.2, 0.2, 0.2, 0.8).into(),
+        );
+
+        self.y_left = total_rect.origin.y + total_rect.size.height + 30.0;
+    }
+
     pub fn draw_profile(
         &mut self,
         frame_profiles: &[FrameProfileCounters],
@@ -848,15 +948,11 @@ impl Profiler {
         renderer_timers.gpu_time.set(gpu_time);
 
         self.draw_counters(&[&renderer_profile.frame_time], debug_renderer, true);
+        self.draw_counters(&[&renderer_profile.frame_counter], debug_renderer, true);
 
-        self.draw_counters(
-            &[
-                &renderer_profile.frame_counter,
-                &backend_profile.resources.gpu_cache.allocated_rows,
-                &backend_profile.resources.gpu_cache.allocated_blocks,
-            ],
+        self.draw_gpu_cache_bars(
+            &backend_profile.resources.gpu_cache,
             debug_renderer,
-            true,
         );
 
         self.draw_counters(
diff --git a/gfx/webrender/src/query.rs b/gfx/webrender/src/query.rs
index 2fb6af33cc8c..999abc749115 100644
--- a/gfx/webrender/src/query.rs
+++ b/gfx/webrender/src/query.rs
@@ -269,31 +269,23 @@ impl<T: NamedTag> GpuProfiler<T> {
 
 #[must_use]
 pub struct GpuMarker {
-    gl: Option<Rc<gl::Gl>>,
+    gl: Rc<gl::Gl>,
 }
 
 impl GpuMarker {
     fn new(gl: &Rc<gl::Gl>, message: &str) -> Self {
-        if gl.get_type() == gl::GlType::Gl {
-            gl.push_group_marker_ext(message);
-            GpuMarker { gl: Some(Rc::clone(gl)) }
-        } else {
-            GpuMarker { gl: None }
-        }
+        gl.push_group_marker_ext(message);
+        GpuMarker { gl: Rc::clone(gl) }
     }
 
     fn fire(gl: &Rc<gl::Gl>, message: &str) {
-        if gl.get_type() == gl::GlType::Gl {
-            gl.insert_event_marker_ext(message);
-        }
+        gl.insert_event_marker_ext(message);
     }
 }
 
 impl Drop for GpuMarker {
     fn drop(&mut self) {
-        if let Some(ref gl) = self.gl {
-            gl.pop_group_marker_ext();
-        }
+        self.gl.pop_group_marker_ext();
     }
 }
 
diff --git a/gfx/webrender/src/render_backend.rs b/gfx/webrender/src/render_backend.rs
index 721b411bbfab..b4b8ec358429 100644
--- a/gfx/webrender/src/render_backend.rs
+++ b/gfx/webrender/src/render_backend.rs
@@ -648,7 +648,7 @@ impl RenderBackend {
             let mut debug_doc = debug_server::TreeNode::new("document");
 
             for (_, pipeline) in &doc.scene.pipelines {
-                let mut debug_dl = debug_server::TreeNode::new("display_list");
+                let mut debug_dl = debug_server::TreeNode::new("display-list");
                 self.traverse_items(&mut pipeline.display_list.iter(), &mut debug_dl);
                 debug_doc.add_child(debug_dl);
             }
@@ -669,7 +669,7 @@ impl RenderBackend {
         let mut debug_root = debug_server::ClipScrollTreeList::new();
 
         for (_, doc) in &self.documents {
-            let debug_node = debug_server::TreeNode::new("document clip_scroll tree");
+            let debug_node = debug_server::TreeNode::new("document clip-scroll tree");
             let mut builder = debug_server::TreeNodeBuilder::new(debug_node);
 
             // TODO(gw): Restructure the storage of clip-scroll tree, clip store
diff --git a/gfx/webrender/src/render_task.rs b/gfx/webrender/src/render_task.rs
index 1a31d9b4ad74..760c2df3aeb4 100644
--- a/gfx/webrender/src/render_task.rs
+++ b/gfx/webrender/src/render_task.rs
@@ -2,13 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use api::{ClipId, DeviceIntPoint, DeviceIntRect, DeviceIntSize};
+use api::{ClipId, DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePixel};
 use api::{LayerPoint, LayerRect, PremultipliedColorF};
+use box_shadow::BoxShadowCacheKey;
 use clip::{ClipSource, ClipSourcesWeakHandle, ClipStore};
 use clip_scroll_tree::CoordinateSystemId;
+use euclid::TypedSize2D;
 use gpu_types::{ClipScrollNodeIndex};
 use picture::RasterizationSpace;
 use prim_store::{PrimitiveIndex};
+#[cfg(feature = "debugger")]
+use print_tree::{PrintTreePrinter};
 use std::{cmp, ops, usize, f32, i32};
 use std::rc::Rc;
 use tiling::{RenderPass, RenderTargetIndex};
@@ -149,6 +153,9 @@ impl ops::IndexMut<RenderTaskId> for RenderTaskTree {
 pub enum RenderTaskKey {
     /// Draw the alpha mask for a shared clip.
     CacheMask(ClipId),
+    CacheScaling(BoxShadowCacheKey, TypedSize2D<i32, DevicePixel>),
+    CacheBlur(BoxShadowCacheKey, i32),
+    CachePicture(BoxShadowCacheKey),
 }
 
 #[derive(Debug)]
@@ -250,6 +257,18 @@ pub struct BlurTask {
     pub scale_factor: f32,
 }
 
+impl BlurTask {
+    #[cfg(feature = "debugger")]
+    fn print_with<T: PrintTreePrinter>(&self, pt: &mut T) {
+        pt.add_item(format!("std deviation: {}", self.blur_std_deviation));
+        pt.add_item(format!("target: {:?}", self.target_kind));
+        pt.add_item(format!("scale: {}", self.scale_factor));
+        for region in &self.regions {
+            pt.add_item(format!("region {:?}", region));
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct RenderTaskData {
     pub data: [f32; FLOATS_PER_RENDER_TASK_INFO],
@@ -266,7 +285,7 @@ pub enum RenderTaskKind {
     Scaling(RenderTargetKind),
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub enum ClearMode {
     // Applicable to color and alpha targets.
     Zero,
@@ -296,6 +315,7 @@ impl RenderTask {
         clear_mode: ClearMode,
         rasterization_kind: RasterizationSpace,
         children: Vec<RenderTaskId>,
+        box_shadow_cache_key: Option<BoxShadowCacheKey>,
     ) -> Self {
         let location = match size {
             Some(size) => RenderTaskLocation::Dynamic(None, size),
@@ -303,7 +323,10 @@ impl RenderTask {
         };
 
         RenderTask {
-            cache_key: None,
+            cache_key: match box_shadow_cache_key {
+                Some(key) => Some(RenderTaskKey::CachePicture(key)),
+                None => None,
+            },
             children,
             location,
             kind: RenderTaskKind::Picture(PictureTask {
@@ -390,6 +413,7 @@ impl RenderTask {
         regions: &[LayerRect],
         clear_mode: ClearMode,
         color: PremultipliedColorF,
+        box_shadow_cache_key: Option<BoxShadowCacheKey>,
     ) -> Self {
         // Adjust large std deviation value.
         let mut adjusted_blur_std_deviation = blur_std_deviation;
@@ -408,14 +432,18 @@ impl RenderTask {
             let downscaling_task = RenderTask::new_scaling(
                 target_kind,
                 downscaling_src_task_id,
-                adjusted_blur_target_size
+                adjusted_blur_target_size,
+                box_shadow_cache_key,
             );
             downscaling_src_task_id = render_tasks.add(downscaling_task);
         }
         scale_factor = blur_target_size.width as f32 / adjusted_blur_target_size.width as f32;
 
         let blur_task_v = RenderTask {
-            cache_key: None,
+            cache_key: match box_shadow_cache_key {
+                Some(key) => Some(RenderTaskKey::CacheBlur(key, 0)),
+                None => None,
+            },
             children: vec![downscaling_src_task_id],
             location: RenderTaskLocation::Dynamic(None, adjusted_blur_target_size),
             kind: RenderTaskKind::VerticalBlur(BlurTask {
@@ -431,7 +459,10 @@ impl RenderTask {
         let blur_task_v_id = render_tasks.add(blur_task_v);
 
         let blur_task_h = RenderTask {
-            cache_key: None,
+            cache_key: match box_shadow_cache_key {
+                Some(key) => Some(RenderTaskKey::CacheBlur(key, 1)),
+                None => None,
+            },
             children: vec![blur_task_v_id],
             location: RenderTaskLocation::Dynamic(None, adjusted_blur_target_size),
             kind: RenderTaskKind::HorizontalBlur(BlurTask {
@@ -451,9 +482,13 @@ impl RenderTask {
         target_kind: RenderTargetKind,
         src_task_id: RenderTaskId,
         target_size: DeviceIntSize,
+        box_shadow_cache_key: Option<BoxShadowCacheKey>,
     ) -> Self {
         RenderTask {
-            cache_key: None,
+            cache_key: match box_shadow_cache_key {
+                Some(key) => Some(RenderTaskKey::CacheScaling(key, target_size)),
+                None => None,
+            },
             children: vec![src_task_id],
             location: RenderTaskLocation::Dynamic(None, target_size),
             kind: RenderTaskKind::Scaling(target_kind),
@@ -626,4 +661,51 @@ impl RenderTask {
             }
         }
     }
+
+    #[cfg(feature = "debugger")]
+    pub fn print_with<T: PrintTreePrinter>(&self, pt: &mut T, tree: &RenderTaskTree) -> bool {
+        match self.kind {
+            RenderTaskKind::Picture(ref task) => {
+                pt.new_level(format!("Picture of {:?}", task.prim_index));
+                pt.add_item(format!("kind: {:?}", task.target_kind));
+                pt.add_item(format!("space: {:?}", task.rasterization_kind));
+            }
+            RenderTaskKind::CacheMask(ref task) => {
+                pt.new_level(format!("CacheMask with {} clips", task.clips.len()));
+                pt.add_item(format!("rect: {:?}", task.actual_rect));
+                pt.add_item(format!("geometry: {:?}", task.geometry_kind));
+            }
+            RenderTaskKind::VerticalBlur(ref task) => {
+                pt.new_level("VerticalBlur".to_owned());
+                task.print_with(pt);
+            }
+            RenderTaskKind::HorizontalBlur(ref task) => {
+                pt.new_level("HorizontalBlur".to_owned());
+                task.print_with(pt);
+            }
+            RenderTaskKind::Readback(ref rect) => {
+                pt.new_level("Readback".to_owned());
+                pt.add_item(format!("rect: {:?}", rect));
+            }
+            RenderTaskKind::Scaling(ref kind) => {
+                pt.new_level("Scaling".to_owned());
+                pt.add_item(format!("kind: {:?}", kind));
+            }
+            RenderTaskKind::Alias(ref alias_id) => {
+                pt.add_item(format!("Alias of {:?}", alias_id));
+                return false
+            }
+        }
+
+        pt.add_item(format!("clear to: {:?}", self.clear_mode));
+
+        for &child_id in &self.children {
+            if tree[child_id].print_with(pt, tree) {
+                pt.add_item(format!("self: {:?}", child_id))
+            }
+        }
+
+        pt.end_level();
+        true
+    }
 }
diff --git a/gfx/webrender/src/renderer.rs b/gfx/webrender/src/renderer.rs
index 8f74206bf33d..27f24d5fc02d 100644
--- a/gfx/webrender/src/renderer.rs
+++ b/gfx/webrender/src/renderer.rs
@@ -12,7 +12,7 @@
 use api::{channel, BlobImageRenderer, FontRenderMode};
 use api::{ColorF, DocumentId, Epoch, PipelineId, RenderApiSender, RenderNotifier};
 use api::{DevicePixel, DeviceIntPoint, DeviceIntRect, DeviceIntSize};
-use api::{DeviceUintPoint, DeviceUintRect, DeviceUintSize};
+use api::{DeviceUintPoint, DeviceUintRect, DeviceUintSize, ColorU};
 use api::{ExternalImageId, ExternalImageType, ImageFormat};
 use api::{YUV_COLOR_SPACES, YUV_FORMATS};
 use api::{YuvColorSpace, YuvFormat};
@@ -64,7 +64,8 @@ use std::sync::mpsc::{channel, Receiver, Sender};
 use std::thread;
 use texture_cache::TextureCache;
 use thread_profiler::{register_thread_with_profiler, write_profile};
-use tiling::{AlphaRenderTarget, ColorRenderTarget, RenderPassKind, RenderTargetKind, RenderTargetList};
+use tiling::{AlphaRenderTarget, ColorRenderTarget};
+use tiling::{RenderPass, RenderPassKind, RenderTargetKind, RenderTargetList};
 use tiling::{BatchKey, BatchKind, BrushBatchKind, Frame, RenderTarget, ScalingInfo, TransformBatchKind};
 use time::precise_time_ns;
 use util::TransformedRectKind;
@@ -246,6 +247,7 @@ bitflags! {
         const GPU_TIME_QUERIES  = 1 << 4;
         const GPU_SAMPLE_QUERIES= 1 << 5;
         const DISABLE_BATCHING  = 1 << 6;
+        const EPOCHS            = 1 << 7;
     }
 }
 
@@ -706,7 +708,7 @@ struct CacheTexture {
 }
 
 impl CacheTexture {
-    fn new(device: &mut Device) -> CacheTexture {
+    fn new(device: &mut Device) -> Self {
         let texture = device.create_texture(TextureTarget::Default);
         let pbo = device.create_pbo();
 
@@ -723,7 +725,7 @@ impl CacheTexture {
         device.delete_texture(self.texture);
     }
 
-    fn apply_patch(&mut self, update: &GpuCacheUpdate, blocks: &[GpuBlockData]) {
+    fn apply_patch(&mut self, update: &GpuCacheUpdate, blocks: &[GpuBlockData]) -> usize {
         match update {
             &GpuCacheUpdate::Copy {
                 block_index,
@@ -751,11 +753,13 @@ impl CacheTexture {
                 for i in 0 .. block_count {
                     data[i] = blocks[block_index + i];
                 }
+
+                block_count
             }
         }
     }
 
-    fn update(&mut self, device: &mut Device, updates: &GpuCacheUpdateList) {
+    fn update(&mut self, device: &mut Device, updates: &GpuCacheUpdateList) -> usize {
         // See if we need to create or resize the texture.
         let current_dimensions = self.texture.get_dimensions();
         if updates.height > current_dimensions.height {
@@ -783,49 +787,58 @@ impl CacheTexture {
             }
         }
 
+        let mut updated_blocks = 0;
         for update in &updates.updates {
-            self.apply_patch(update, &updates.blocks);
+            updated_blocks += self.apply_patch(update, &updates.blocks);
         }
+        updated_blocks
     }
 
-    fn flush(&mut self, device: &mut Device) {
+    fn flush(&mut self, device: &mut Device) -> usize {
         // Bind a PBO to do the texture upload.
         // Updating the texture via PBO avoids CPU-side driver stalls.
         device.bind_pbo(Some(&self.pbo));
 
+        let mut rows_dirty = 0;
+
         for (row_index, row) in self.rows.iter_mut().enumerate() {
-            if row.is_dirty {
-                // Get the data for this row and push to the PBO.
-                let block_index = row_index * MAX_VERTEX_TEXTURE_WIDTH;
-                let cpu_blocks =
-                    &self.cpu_blocks[block_index .. (block_index + MAX_VERTEX_TEXTURE_WIDTH)];
-                device.update_pbo_data(cpu_blocks);
-
-                // Insert a command to copy the PBO data to the right place in
-                // the GPU-side cache texture.
-                device.update_texture_from_pbo(
-                    &self.texture,
-                    0,
-                    row_index as u32,
-                    MAX_VERTEX_TEXTURE_WIDTH as u32,
-                    1,
-                    0,
-                    None,
-                    0,
-                );
-
-                // Orphan the PBO. This is the recommended way to hint to the
-                // driver to detach the underlying storage from this PBO id.
-                // Keeping the size the same gives the driver a hint for future
-                // use of this PBO.
-                device.orphan_pbo(mem::size_of::<GpuBlockData>() * MAX_VERTEX_TEXTURE_WIDTH);
-
-                row.is_dirty = false;
+            if !row.is_dirty {
+                continue;
             }
+
+            // Get the data for this row and push to the PBO.
+            let block_index = row_index * MAX_VERTEX_TEXTURE_WIDTH;
+            let cpu_blocks =
+                &self.cpu_blocks[block_index .. (block_index + MAX_VERTEX_TEXTURE_WIDTH)];
+            device.update_pbo_data(cpu_blocks);
+
+            // Insert a command to copy the PBO data to the right place in
+            // the GPU-side cache texture.
+            device.update_texture_from_pbo(
+                &self.texture,
+                0,
+                row_index as u32,
+                MAX_VERTEX_TEXTURE_WIDTH as u32,
+                1,
+                0,
+                None,
+                0,
+            );
+
+            // Orphan the PBO. This is the recommended way to hint to the
+            // driver to detach the underlying storage from this PBO id.
+            // Keeping the size the same gives the driver a hint for future
+            // use of this PBO.
+            device.orphan_pbo(mem::size_of::<GpuBlockData>() * MAX_VERTEX_TEXTURE_WIDTH);
+
+            rows_dirty += 1;
+            row.is_dirty = false;
         }
 
         // Ensure that other texture updates won't read from this PBO.
         device.bind_pbo(None);
+
+        rows_dirty
     }
 }
 
@@ -2154,6 +2167,22 @@ impl Renderer {
         }
     }
 
+    #[cfg(not(feature = "debugger"))]
+    fn get_screenshot_for_debugger(&mut self) -> String {
+        // Avoid unused param warning.
+        let _ = &self.debug_server;
+        String::new()
+    }
+
+
+    #[cfg(feature = "debugger")]
+    fn get_screenshot_for_debugger(&mut self) -> String {
+        let data = self.device.read_pixels(1024, 768);
+        let screenshot = debug_server::Screenshot::new(1024, 768, data);
+
+        serde_json::to_string(&screenshot).unwrap()
+    }
+
     #[cfg(not(feature = "debugger"))]
     fn get_passes_for_debugger(&self) -> String {
         // Avoid unused param warning.
@@ -2284,6 +2313,31 @@ impl Renderer {
         serde_json::to_string(&debug_passes).unwrap()
     }
 
+    #[cfg(not(feature = "debugger"))]
+    fn get_render_tasks_for_debugger(&self) -> String {
+        String::new()
+    }
+
+    #[cfg(feature = "debugger")]
+    fn get_render_tasks_for_debugger(&self) -> String {
+        let mut debug_root = debug_server::RenderTaskList::new();
+
+        for &(_, ref render_doc) in &self.active_documents {
+            let debug_node = debug_server::TreeNode::new("document render tasks");
+            let mut builder = debug_server::TreeNodeBuilder::new(debug_node);
+
+            let render_tasks = &render_doc.frame.render_tasks;
+            match render_tasks.tasks.last() {
+                Some(main_task) => main_task.print_with(&mut builder, render_tasks),
+                None => continue,
+            };
+
+            debug_root.add(builder.build());
+        }
+
+        serde_json::to_string(&debug_root).unwrap()
+    }
+
     fn handle_debug_command(&mut self, command: DebugCommand) {
         match command {
             DebugCommand::EnableProfiler(enable) => {
@@ -2304,12 +2358,20 @@ impl Renderer {
             DebugCommand::EnableGpuSampleQueries(enable) => {
                 self.set_debug_flag(DebugFlags::GPU_SAMPLE_QUERIES, enable);
             }
-            DebugCommand::FetchDocuments => {}
+            DebugCommand::FetchDocuments |
             DebugCommand::FetchClipScrollTree => {}
+            DebugCommand::FetchRenderTasks => {
+                let json = self.get_render_tasks_for_debugger();
+                self.debug_server.send(json);
+            }
             DebugCommand::FetchPasses => {
                 let json = self.get_passes_for_debugger();
                 self.debug_server.send(json);
             }
+            DebugCommand::FetchScreenshot => {
+                let json = self.get_screenshot_for_debugger();
+                self.debug_server.send(json);
+            }
         }
     }
 
@@ -2330,6 +2392,32 @@ impl Renderer {
         (cpu_profiles, gpu_profiles)
     }
 
+    /// Returns `true` if the active rendered documents (that need depth buffer)
+    /// intersect on the main framebuffer, in which case we don't clear
+    /// the whole depth and instead clear each document area separately.
+    fn are_documents_intersecting_depth(&self) -> bool {
+        let document_rects = self.active_documents
+            .iter()
+            .filter_map(|&(_, ref render_doc)| {
+                match render_doc.frame.passes.last() {
+                    Some(&RenderPass { kind: RenderPassKind::MainFramebuffer(ref target), .. })
+                        if target.needs_depth() => Some(render_doc.frame.inner_rect),
+                    _ => None,
+                }
+            })
+            .collect::<Vec<_>>();
+
+        for (i, rect) in document_rects.iter().enumerate() {
+            for other in &document_rects[i+1 ..] {
+                if rect.intersects(other) {
+                    return true
+                }
+            }
+        }
+
+        false
+    }
+
     /// Renders the current frame.
     ///
     /// A Frame is supplied by calling [`generate_frame()`][genframe].
@@ -2388,23 +2476,36 @@ impl Renderer {
         });
 
         profile_timers.cpu_time.profile(|| {
+            let clear_depth_value = if self.are_documents_intersecting_depth() {
+                None
+            } else {
+                Some(1.0)
+            };
+
             //Note: another borrowck dance
             let mut active_documents = mem::replace(&mut self.active_documents, Vec::default());
             // sort by the document layer id
             active_documents.sort_by_key(|&(_, ref render_doc)| render_doc.frame.layer);
 
-            let needs_clear = !active_documents
+            // don't clear the framebuffer if one of the rendered documents will overwrite it
+            let needs_color_clear = !active_documents
                 .iter()
                 .any(|&(_, RenderedDocument { ref frame, .. })| {
                     frame.background_color.is_some() &&
                     frame.inner_rect.origin == DeviceUintPoint::zero() &&
                     frame.inner_rect.size == framebuffer_size
                 });
-            // don't clear the framebuffer if one of the rendered documents will overwrite it
-            if needs_clear {
-                let clear_color = self.clear_color.map(|color| color.to_array());
+
+            if needs_color_clear || clear_depth_value.is_some() {
+                let clear_color = if needs_color_clear {
+                    self.clear_color.map(|color| color.to_array())
+                } else {
+                    None
+                };
                 self.device.bind_draw_target(None, None);
-                self.device.clear_target(clear_color, None);
+                self.device.enable_depth_write();
+                self.device.clear_target(clear_color, clear_depth_value, None);
+                self.device.disable_depth_write();
             }
 
             // Re-use whatever targets possible from the pool, before
@@ -2419,6 +2520,7 @@ impl Renderer {
                 self.draw_tile_frame(
                     frame,
                     framebuffer_size,
+                    clear_depth_value.is_some(),
                     cpu_frame_id,
                     &mut stats
                 );
@@ -2489,12 +2591,18 @@ impl Renderer {
 
     fn update_gpu_cache(&mut self, frame: &Frame) {
         let _gm = self.gpu_profile.start_marker("gpu cache update");
+        let mut updated_blocks = 0;
         for update_list in self.pending_gpu_cache_updates.drain(..) {
-            self.gpu_cache_texture
+            updated_blocks += self.gpu_cache_texture
                 .update(&mut self.device, &update_list);
         }
         self.update_deferred_resolves(frame);
-        self.gpu_cache_texture.flush(&mut self.device);
+
+        let updated_rows = self.gpu_cache_texture.flush(&mut self.device);
+
+        let counters = &mut self.backend_profile_counters.resources.gpu_cache;
+        counters.updated_rows.set(updated_rows);
+        counters.updated_blocks.set(updated_blocks);
     }
 
     fn update_texture_cache(&mut self) {
@@ -2913,6 +3021,7 @@ impl Renderer {
         target: &ColorRenderTarget,
         framebuffer_target_rect: DeviceUintRect,
         target_size: DeviceUintSize,
+        depth_is_ready: bool,
         clear_color: Option<[f32; 4]>,
         render_tasks: &RenderTaskTree,
         projection: &Transform3D<f32>,
@@ -2933,38 +3042,37 @@ impl Renderer {
             self.device.disable_depth();
             self.device.set_blend(false);
 
-            let depth_clear = if target.needs_depth() {
+            let depth_clear = if !depth_is_ready && target.needs_depth() {
                 self.device.enable_depth_write();
                 Some(1.0)
             } else {
                 None
             };
 
-            if render_target.is_some() {
+            let clear_rect = if render_target.is_some() {
                 if self.enable_clear_scissor {
                     // TODO(gw): Applying a scissor rect and minimal clear here
                     // is a very large performance win on the Intel and nVidia
                     // GPUs that I have tested with. It's possible it may be a
                     // performance penalty on other GPU types - we should test this
                     // and consider different code paths.
-                    self.device.clear_target_rect(clear_color, depth_clear, target.used_rect());
+                    Some(target.used_rect())
                 } else {
-                    self.device.clear_target(clear_color, depth_clear);
+                    None
                 }
             } else if framebuffer_target_rect == DeviceUintRect::new(DeviceUintPoint::zero(), target_size) {
                 // whole screen is covered, no need for scissor
-                self.device.clear_target(clear_color, depth_clear);
+                None
             } else {
-                // Note: for non-intersecting document rectangles,
-                // we can omit clearing the depth here, and instead
-                // just clear it for the whole framebuffer at start of the frame.
-                let mut clear_rect = framebuffer_target_rect.to_i32();
+                let mut rect = framebuffer_target_rect.to_i32();
                 // Note: `framebuffer_target_rect` needs a Y-flip before going to GL
                 // Note: at this point, the target rectangle is not guaranteed to be within the main framebuffer bounds
                 // but `clear_target_rect` is totally fine with negative origin, as long as width & height are positive
-                clear_rect.origin.y = target_size.height as i32 - clear_rect.origin.y - clear_rect.size.height;
-                self.device.clear_target_rect(clear_color, depth_clear, clear_rect);
-            }
+                rect.origin.y = target_size.height as i32 - rect.origin.y - rect.size.height;
+                Some(rect)
+            };
+
+            self.device.clear_target(clear_color, depth_clear, clear_rect);
 
             if depth_clear.is_some() {
                 self.device.disable_depth_write();
@@ -3357,14 +3465,20 @@ impl Renderer {
             // performance penalty on other GPU types - we should test this
             // and consider different code paths.
             let clear_color = [1.0, 1.0, 1.0, 0.0];
-            self.device
-                .clear_target_rect(Some(clear_color), None, target.used_rect());
+            self.device.clear_target(
+                Some(clear_color),
+                None,
+                Some(target.used_rect()),
+            );
 
             let zero_color = [0.0, 0.0, 0.0, 0.0];
             for &task_id in &target.zero_clears {
                 let (rect, _) = render_tasks[task_id].get_target_rect();
-                self.device
-                    .clear_target_rect(Some(zero_color), None, rect);
+                self.device.clear_target(
+                    Some(zero_color),
+                    None,
+                    Some(rect),
+                );
             }
         }
 
@@ -3693,6 +3807,7 @@ impl Renderer {
         &mut self,
         frame: &mut Frame,
         framebuffer_size: DeviceUintSize,
+        framebuffer_depth_is_ready: bool,
         frame_id: FrameId,
         stats: &mut RendererStats,
     ) {
@@ -3742,6 +3857,7 @@ impl Renderer {
                         target,
                         frame.inner_rect,
                         framebuffer_size,
+                        framebuffer_depth_is_ready,
                         clear_color,
                         &frame.render_tasks,
                         &projection,
@@ -3794,6 +3910,7 @@ impl Renderer {
                             target,
                             frame.inner_rect,
                             color.max_size,
+                            false,
                             Some([0.0, 0.0, 0.0, 0.0]),
                             &frame.render_tasks,
                             &projection,
@@ -3827,6 +3944,7 @@ impl Renderer {
         self.texture_resolver.end_frame(&mut self.render_target_pool);
         self.draw_render_target_debug(framebuffer_size);
         self.draw_texture_cache_debug(framebuffer_size);
+        self.draw_epoch_debug();
 
         // Garbage collect any frame outputs that weren't used this frame.
         let device = &mut self.device;
@@ -3971,6 +4089,37 @@ impl Renderer {
         }
     }
 
+    fn draw_epoch_debug(&mut self) {
+        if !self.debug_flags.contains(DebugFlags::EPOCHS) {
+            return;
+        }
+
+        let dy = self.debug.line_height();
+        let x0: f32 = 30.0;
+        let y0: f32 = 30.0;
+        let mut y = y0;
+        let mut text_width = 0.0;
+        for (pipeline, epoch) in  &self.pipeline_epoch_map {
+            y += dy;
+            let w = self.debug.add_text(
+                x0, y,
+                &format!("{:?}: {:?}", pipeline, epoch),
+                ColorU::new(255, 255, 0, 255),
+            ).size.width;
+            text_width = f32::max(text_width, w);
+        }
+
+        let margin = 10.0;
+        self.debug.add_quad(
+            &x0 - margin,
+            y0 - margin,
+            x0 + text_width + margin,
+            y + margin,
+            ColorU::new(25, 25, 25, 200),
+            ColorU::new(51, 51, 51, 200),
+        );
+    }
+
     pub fn read_pixels_rgba8(&self, rect: DeviceUintRect) -> Vec<u8> {
         let mut pixels = vec![0u8; (4 * rect.size.width * rect.size.height) as usize];
         self.read_pixels_into(rect, ReadPixelsFormat::Rgba8, &mut pixels);
diff --git a/gfx/webrender/src/resource_cache.rs b/gfx/webrender/src/resource_cache.rs
index d0ccfda1c86c..36d0a8cc8300 100644
--- a/gfx/webrender/src/resource_cache.rs
+++ b/gfx/webrender/src/resource_cache.rs
@@ -350,7 +350,7 @@ impl ResourceCache {
         let FontInstanceOptions {
             render_mode,
             subpx_dir,
-            synthetic_italics,
+            flags,
             bg_color,
             ..
         } = options.unwrap_or_default();
@@ -362,9 +362,9 @@ impl ResourceCache {
             bg_color,
             render_mode,
             subpx_dir,
+            flags,
             platform_options,
             variations,
-            synthetic_italics,
         );
         if self.glyph_rasterizer.is_bitmap_font(&instance) {
             instance.render_mode = instance.render_mode.limit_by(FontRenderMode::Bitmap);
diff --git a/gfx/webrender/src/tiling.rs b/gfx/webrender/src/tiling.rs
index df552b03c5a5..9670af66183e 100644
--- a/gfx/webrender/src/tiling.rs
+++ b/gfx/webrender/src/tiling.rs
@@ -1818,11 +1818,6 @@ impl RenderPass {
                                     // If so, just skip adding it!
                                     Some(cache_key) => match self.dynamic_tasks.entry(cache_key) {
                                         Entry::Occupied(entry) => {
-                                            // TODO(gw): We can easily handle invalidation of tasks that
-                                            // contain children in the future. Since we don't
-                                            // have any cases of that yet, just assert to simplify
-                                            // the current implementation.
-                                            debug_assert!(task.children.is_empty());
                                             debug_assert_eq!(entry.get().rect.size, size);
                                             task.kind = RenderTaskKind::Alias(entry.get().task_id);
                                             continue;
diff --git a/gfx/webrender_api/Cargo.toml b/gfx/webrender_api/Cargo.toml
index accb88f3a8a8..cb29a2de96a4 100644
--- a/gfx/webrender_api/Cargo.toml
+++ b/gfx/webrender_api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webrender_api"
-version = "0.54.0"
+version = "0.55.0"
 authors = ["Glenn Watson <gw@intuitionlibrary.com>"]
 license = "MPL-2.0"
 repository = "https://github.com/servo/webrender"
@@ -13,7 +13,7 @@ ipc = ["ipc-channel"]
 app_units = "0.5.6"
 bitflags = "1.0"
 bincode = "0.9"
-byteorder = "1.0"
+byteorder = "1.2.1"
 euclid = "0.15"
 ipc-channel = {version = "0.9", optional = true}
 serde = { version = "1.0", features = ["rc", "derive"] }
@@ -24,4 +24,4 @@ core-foundation = "0.4"
 core-graphics = "0.12.3"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.4"
+dwrote = "0.4.1"
diff --git a/gfx/webrender_api/src/api.rs b/gfx/webrender_api/src/api.rs
index e83ab297198d..a70d102050de 100644
--- a/gfx/webrender_api/src/api.rs
+++ b/gfx/webrender_api/src/api.rs
@@ -263,6 +263,10 @@ pub enum DebugCommand {
     FetchPasses,
     /// Fetch clip-scroll tree.
     FetchClipScrollTree,
+    /// Fetch render tasks.
+    FetchRenderTasks,
+    /// Fetch screenshot.
+    FetchScreenshot,
 }
 
 #[derive(Clone, Deserialize, Serialize)]
diff --git a/gfx/webrender_api/src/display_item.rs b/gfx/webrender_api/src/display_item.rs
index 0b7db74a5074..cb94876a8129 100644
--- a/gfx/webrender_api/src/display_item.rs
+++ b/gfx/webrender_api/src/display_item.rs
@@ -39,22 +39,6 @@ impl ClipAndScrollInfo {
     }
 }
 
-bitflags! {
-    /// Each bit of the edge AA mask is:
-    /// 0, when the edge of the primitive needs to be considered for AA
-    /// 1, when the edge of the segment needs to be considered for AA
-    ///
-    /// *Note*: the bit values have to match the shader logic in
-    /// `write_transform_vertex()` function.
-    #[derive(Deserialize, Serialize)]
-    pub struct EdgeAaSegmentMask: u8 {
-        const LEFT = 0x1;
-        const TOP = 0x2;
-        const RIGHT = 0x4;
-        const BOTTOM = 0x8;
-    }
-}
-
 /// A tag that can be used to identify items during hit testing. If the tag
 /// is missing then the item doesn't take part in hit testing at all. This
 /// is composed of two numbers. In Servo, the first is an identifier while the
@@ -75,7 +59,6 @@ pub struct DisplayItem {
 pub struct PrimitiveInfo<T> {
     pub rect: TypedRect<f32, T>,
     pub local_clip: LocalClip,
-    pub edge_aa_segment_mask: EdgeAaSegmentMask,
     pub is_backface_visible: bool,
     pub tag: Option<ItemTag>,
 }
@@ -96,7 +79,6 @@ impl LayerPrimitiveInfo {
         PrimitiveInfo {
             rect: rect,
             local_clip: clip,
-            edge_aa_segment_mask: EdgeAaSegmentMask::empty(),
             is_backface_visible: true,
             tag: None,
         }
@@ -346,7 +328,7 @@ pub enum BorderStyle {
 }
 
 #[repr(u32)]
-#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub enum BoxShadowClipMode {
     Outset = 0,
     Inset = 1,
diff --git a/gfx/webrender_api/src/display_list.rs b/gfx/webrender_api/src/display_list.rs
index 55df385846f3..f8ab4fb3a192 100644
--- a/gfx/webrender_api/src/display_list.rs
+++ b/gfx/webrender_api/src/display_list.rs
@@ -315,7 +315,6 @@ impl<'a, 'b> DisplayItemRef<'a, 'b> {
         LayerPrimitiveInfo {
             rect: info.rect.translate(&offset),
             local_clip: info.local_clip.create_with_offset(offset),
-            edge_aa_segment_mask: info.edge_aa_segment_mask,
             is_backface_visible: info.is_backface_visible,
             tag: info.tag,
         }
diff --git a/gfx/webrender_api/src/font.rs b/gfx/webrender_api/src/font.rs
index 5dfbd4c2f339..0b87109f4e99 100644
--- a/gfx/webrender_api/src/font.rs
+++ b/gfx/webrender_api/src/font.rs
@@ -203,12 +203,53 @@ pub struct GlyphOptions {
     pub render_mode: FontRenderMode,
 }
 
+bitflags! {
+    #[repr(C)]
+    #[derive(Deserialize, Serialize)]
+    pub struct FontInstanceFlags: u32 {
+        // Common flags
+        const SYNTHETIC_ITALICS = 1 << 0;
+        const SYNTHETIC_BOLD    = 1 << 1;
+        const EMBEDDED_BITMAPS  = 1 << 2;
+        const SUBPIXEL_BGR      = 1 << 3;
+
+        // Windows flags
+        const FORCE_GDI         = 1 << 16;
+
+        // Mac flags
+        const FONT_SMOOTHING    = 1 << 16;
+
+        // FreeType flags
+        const FORCE_AUTOHINT    = 1 << 16;
+        const NO_AUTOHINT       = 1 << 17;
+        const VERTICAL_LAYOUT   = 1 << 18;
+    }
+}
+
+impl Default for FontInstanceFlags {
+    #[cfg(target_os = "windows")]
+    fn default() -> FontInstanceFlags {
+        FontInstanceFlags::empty()
+    }
+
+    #[cfg(target_os = "macos")]
+    fn default() -> FontInstanceFlags {
+        FontInstanceFlags::FONT_SMOOTHING
+    }
+
+    #[cfg(not(any(target_os = "macos", target_os = "windows")))]
+    fn default() -> FontInstanceFlags {
+        FontInstanceFlags::empty()
+    }
+}
+
+
 #[repr(C)]
 #[derive(Clone, Copy, Debug, Deserialize, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize)]
 pub struct FontInstanceOptions {
     pub render_mode: FontRenderMode,
     pub subpx_dir: SubpixelDirection,
-    pub synthetic_italics: bool,
+    pub flags: FontInstanceFlags,
     /// When bg_color.a is != 0 and render_mode is FontRenderMode::Subpixel,
     /// the text will be rendered with bg_color.r/g/b as an opaque estimated
     /// background color.
@@ -220,7 +261,7 @@ impl Default for FontInstanceOptions {
         FontInstanceOptions {
             render_mode: FontRenderMode::Subpixel,
             subpx_dir: SubpixelDirection::Horizontal,
-            synthetic_italics: false,
+            flags: Default::default(),
             bg_color: ColorU::new(0, 0, 0, 0),
         }
     }
@@ -230,16 +271,14 @@ impl Default for FontInstanceOptions {
 #[repr(C)]
 #[derive(Clone, Copy, Debug, Deserialize, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize)]
 pub struct FontInstancePlatformOptions {
-    pub use_embedded_bitmap: bool,
-    pub force_gdi_rendering: bool,
+    pub unused: u32,
 }
 
 #[cfg(target_os = "windows")]
 impl Default for FontInstancePlatformOptions {
     fn default() -> FontInstancePlatformOptions {
         FontInstancePlatformOptions {
-            use_embedded_bitmap: false,
-            force_gdi_rendering: false,
+            unused: 0,
         }
     }
 }
@@ -248,25 +287,18 @@ impl Default for FontInstancePlatformOptions {
 #[repr(C)]
 #[derive(Clone, Copy, Debug, Deserialize, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize)]
 pub struct FontInstancePlatformOptions {
-    pub font_smoothing: bool,
+    pub unused: u32,
 }
 
 #[cfg(target_os = "macos")]
 impl Default for FontInstancePlatformOptions {
     fn default() -> FontInstancePlatformOptions {
         FontInstancePlatformOptions {
-            font_smoothing: true,
+            unused: 0,
         }
     }
 }
 
-pub const FONT_FORCE_AUTOHINT: u16  = 0b1;
-pub const FONT_NO_AUTOHINT: u16     = 0b10;
-pub const FONT_EMBEDDED_BITMAP: u16 = 0b100;
-pub const FONT_EMBOLDEN: u16        = 0b1000;
-pub const FONT_VERTICAL_LAYOUT: u16 = 0b10000;
-pub const FONT_SUBPIXEL_BGR: u16    = 0b100000;
-
 #[cfg(not(any(target_os = "macos", target_os = "windows")))]
 #[repr(u8)]
 #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, PartialOrd, Ord, Serialize)]
@@ -292,7 +324,6 @@ pub enum FontHinting {
 #[repr(C)]
 #[derive(Clone, Copy, Debug, Deserialize, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize)]
 pub struct FontInstancePlatformOptions {
-    pub flags: u16,
     pub lcd_filter: FontLCDFilter,
     pub hinting: FontHinting,
 }
@@ -301,7 +332,6 @@ pub struct FontInstancePlatformOptions {
 impl Default for FontInstancePlatformOptions {
     fn default() -> FontInstancePlatformOptions {
         FontInstancePlatformOptions {
-            flags: 0,
             lcd_filter: FontLCDFilter::Default,
             hinting: FontHinting::LCD,
         }
diff --git a/gfx/webrender_bindings/Cargo.toml b/gfx/webrender_bindings/Cargo.toml
index c80a89d4ed32..d72ab1a56251 100644
--- a/gfx/webrender_bindings/Cargo.toml
+++ b/gfx/webrender_bindings/Cargo.toml
@@ -9,16 +9,16 @@ rayon = "0.8"
 thread_profiler = "0.1.1"
 euclid = "0.15"
 app_units = "0.5.6"
-gleam = "0.4.14"
+gleam = "0.4.15"
 log = "0.3"
 
 [dependencies.webrender]
 path = "../webrender"
-version = "0.54.0"
+version = "0.55.0"
 default-features = false
 
 [target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.4"
+dwrote = "0.4.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.4"
diff --git a/gfx/webrender_bindings/webrender_ffi_generated.h b/gfx/webrender_bindings/webrender_ffi_generated.h
index beb2a8735f2e..f1c8e9158717 100644
--- a/gfx/webrender_bindings/webrender_ffi_generated.h
+++ b/gfx/webrender_bindings/webrender_ffi_generated.h
@@ -874,7 +874,7 @@ struct ColorU {
 struct FontInstanceOptions {
   FontRenderMode render_mode;
   SubpixelDirection subpx_dir;
-  bool synthetic_italics;
+  FontInstanceFlags flags;
   // When bg_color.a is != 0 and render_mode is FontRenderMode::Subpixel,
   // the text will be rendered with bg_color.r/g/b as an opaque estimated
   // background color.
@@ -883,42 +883,38 @@ struct FontInstanceOptions {
   bool operator==(const FontInstanceOptions& aOther) const {
     return render_mode == aOther.render_mode &&
            subpx_dir == aOther.subpx_dir &&
-           synthetic_italics == aOther.synthetic_italics &&
+           flags == aOther.flags &&
            bg_color == aOther.bg_color;
   }
 };
 
 #if defined(XP_WIN)
 struct FontInstancePlatformOptions {
-  bool use_embedded_bitmap;
-  bool force_gdi_rendering;
+  uint32_t unused;
 
   bool operator==(const FontInstancePlatformOptions& aOther) const {
-    return use_embedded_bitmap == aOther.use_embedded_bitmap &&
-           force_gdi_rendering == aOther.force_gdi_rendering;
+    return unused == aOther.unused;
   }
 };
 #endif
 
 #if defined(XP_MACOSX)
 struct FontInstancePlatformOptions {
-  bool font_smoothing;
+  uint32_t unused;
 
   bool operator==(const FontInstancePlatformOptions& aOther) const {
-    return font_smoothing == aOther.font_smoothing;
+    return unused == aOther.unused;
   }
 };
 #endif
 
 #if !(defined(XP_MACOSX) || defined(XP_WIN))
 struct FontInstancePlatformOptions {
-  uint16_t flags;
   FontLCDFilter lcd_filter;
   FontHinting hinting;
 
   bool operator==(const FontInstancePlatformOptions& aOther) const {
-    return flags == aOther.flags &&
-           lcd_filter == aOther.lcd_filter &&
+    return lcd_filter == aOther.lcd_filter &&
            hinting == aOther.hinting;
   }
 };

From fee87ce9f1b69f7874c95c41afb4d79373c62ea0 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Fri, 1 Dec 2017 09:50:52 -0500
Subject: [PATCH 035/219] Bug 1421275 - Update Cargo lockfiles and re-vendor
 rust dependencies. r=jrmuizel

MozReview-Commit-ID: Jaty3RGfffU

--HG--
rename : third_party/rust/byteorder-1.0.0/COPYING => third_party/rust/byteorder-1.1.0/COPYING
rename : third_party/rust/byteorder-1.0.0/LICENSE-MIT => third_party/rust/byteorder-1.1.0/LICENSE-MIT
rename : third_party/rust/byteorder-1.0.0/README.md => third_party/rust/byteorder-1.1.0/README.md
rename : third_party/rust/byteorder-1.0.0/UNLICENSE => third_party/rust/byteorder-1.1.0/UNLICENSE
extra : rebase_source : 0668fbfe5d8ba288a0e530de3650bd013924b4ce
---
 .../rust/byteorder-1.0.0/.cargo-checksum.json |    1 -
 third_party/rust/byteorder-1.0.0/.travis.yml  |   15 -
 third_party/rust/byteorder-1.0.0/Cargo.toml   |   26 -
 .../rust/byteorder-1.0.0/benches/bench.rs     |  148 -
 third_party/rust/byteorder-1.0.0/src/lib.rs   |  820 -----
 third_party/rust/byteorder-1.0.0/src/new.rs   |  269 --
 .../rust/byteorder-1.1.0/.cargo-checksum.json |    1 +
 third_party/rust/byteorder-1.1.0/.travis.yml  |   22 +
 third_party/rust/byteorder-1.1.0/CHANGELOG.md |   36 +
 .../COPYING                                   |    0
 third_party/rust/byteorder-1.1.0/Cargo.toml   |   44 +
 .../LICENSE-MIT                               |    0
 .../README.md                                 |    0
 .../UNLICENSE                                 |    0
 .../rust/byteorder-1.1.0/benches/bench.rs     |  320 ++
 third_party/rust/byteorder-1.1.0/src/io.rs    | 1189 ++++++
 third_party/rust/byteorder-1.1.0/src/lib.rs   | 3191 +++++++++++++++++
 .../rust/byteorder/.cargo-checksum.json       |    2 +-
 third_party/rust/byteorder/CHANGELOG.md       |   22 +
 third_party/rust/byteorder/Cargo.toml         |   11 +-
 third_party/rust/byteorder/README.md          |    2 +-
 third_party/rust/byteorder/src/io.rs          |  129 +-
 third_party/rust/byteorder/src/lib.rs         |  135 +-
 third_party/rust/dwrote/.cargo-checksum.json  |    2 +-
 third_party/rust/dwrote/Cargo.toml            |   14 +-
 third_party/rust/dwrote/src/font_face.rs      |   46 +-
 third_party/rust/dwrote/src/lib.rs            |    1 +
 third_party/rust/gleam/.cargo-checksum.json   |    2 +-
 third_party/rust/gleam/Cargo.toml             |    2 +-
 third_party/rust/gleam/build.rs               |    2 +
 third_party/rust/gleam/src/gl_fns.rs          |   20 +-
 third_party/rust/gleam/src/gles_fns.rs        |  100 +-
 toolkit/library/gtest/rust/Cargo.lock         |   48 +-
 toolkit/library/rust/Cargo.lock               |   48 +-
 34 files changed, 5141 insertions(+), 1527 deletions(-)
 delete mode 100644 third_party/rust/byteorder-1.0.0/.cargo-checksum.json
 delete mode 100644 third_party/rust/byteorder-1.0.0/.travis.yml
 delete mode 100644 third_party/rust/byteorder-1.0.0/Cargo.toml
 delete mode 100644 third_party/rust/byteorder-1.0.0/benches/bench.rs
 delete mode 100644 third_party/rust/byteorder-1.0.0/src/lib.rs
 delete mode 100644 third_party/rust/byteorder-1.0.0/src/new.rs
 create mode 100644 third_party/rust/byteorder-1.1.0/.cargo-checksum.json
 create mode 100644 third_party/rust/byteorder-1.1.0/.travis.yml
 create mode 100644 third_party/rust/byteorder-1.1.0/CHANGELOG.md
 rename third_party/rust/{byteorder-1.0.0 => byteorder-1.1.0}/COPYING (100%)
 create mode 100644 third_party/rust/byteorder-1.1.0/Cargo.toml
 rename third_party/rust/{byteorder-1.0.0 => byteorder-1.1.0}/LICENSE-MIT (100%)
 rename third_party/rust/{byteorder-1.0.0 => byteorder-1.1.0}/README.md (100%)
 rename third_party/rust/{byteorder-1.0.0 => byteorder-1.1.0}/UNLICENSE (100%)
 create mode 100644 third_party/rust/byteorder-1.1.0/benches/bench.rs
 create mode 100644 third_party/rust/byteorder-1.1.0/src/io.rs
 create mode 100644 third_party/rust/byteorder-1.1.0/src/lib.rs

diff --git a/third_party/rust/byteorder-1.0.0/.cargo-checksum.json b/third_party/rust/byteorder-1.0.0/.cargo-checksum.json
deleted file mode 100644
index 86c8ac247ab7..000000000000
--- a/third_party/rust/byteorder-1.0.0/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{".travis.yml":"c8243fb884ca390f5a7b8cc45e1c0d5bbbdd7e4e82ada2dc1880b3a904c9ce12","COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"b6cd79e1f2a93cd8a5c6e6dd7985c46fc26e442ae5b8ed4a0ff37a4ad4708023","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"0559514b9d7488e96fb7a2f3c043a62fadf3495a1e10602d109ce79ee67da998","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","benches/bench.rs":"f583692d829c8dfe19b1d5b9e968ccf5c74d6733367ca183edff74041a6afedd","src/lib.rs":"b038b8a84b2b7b2143b2835185b3cbbacaf056fa8a2f03bec84bfd79c913c726","src/new.rs":"161c21b7ebb5668c7cc70b46b0eb37709e06bb9c854f2fdfc6ce3d3babcbf3de"},"package":"c40977b0ee6b9885c9013cd41d9feffdd22deb3bb4dc3a71d901cc7a77de18c8"}
\ No newline at end of file
diff --git a/third_party/rust/byteorder-1.0.0/.travis.yml b/third_party/rust/byteorder-1.0.0/.travis.yml
deleted file mode 100644
index 0ebea27693b2..000000000000
--- a/third_party/rust/byteorder-1.0.0/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-language: rust
-rust:
-  - 1.12.0
-  - stable
-  - beta
-  - nightly
-script:
-  - cargo build --verbose
-  - cargo doc
-  - cargo test --verbose
-  - cargo test --verbose --no-default-features --lib
-  - if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then
-      cargo bench --verbose;
-      cargo bench --verbose --no-default-features;
-    fi
diff --git a/third_party/rust/byteorder-1.0.0/Cargo.toml b/third_party/rust/byteorder-1.0.0/Cargo.toml
deleted file mode 100644
index d207d47babef..000000000000
--- a/third_party/rust/byteorder-1.0.0/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-name = "byteorder"
-version = "1.0.0"  #:version
-authors = ["Andrew Gallant <jamslam@gmail.com>"]
-description = "Library for reading/writing numbers in big-endian and little-endian."
-documentation = "https://docs.rs/byteorder"
-homepage = "https://github.com/BurntSushi/byteorder"
-repository = "https://github.com/BurntSushi/byteorder"
-readme = "README.md"
-keywords = ["byte", "endian", "big-endian", "little-endian", "binary"]
-license = "Unlicense/MIT"
-
-[lib]
-name = "byteorder"
-bench = false
-
-[dev-dependencies]
-quickcheck = "0.4"
-rand = "0.3"
-
-[features]
-default = ["std"]
-std = []
-
-[profile.bench]
-opt-level = 3
diff --git a/third_party/rust/byteorder-1.0.0/benches/bench.rs b/third_party/rust/byteorder-1.0.0/benches/bench.rs
deleted file mode 100644
index 51d57b3da7b1..000000000000
--- a/third_party/rust/byteorder-1.0.0/benches/bench.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-#![feature(test)]
-
-extern crate byteorder;
-extern crate test;
-
-macro_rules! bench_num {
-    ($name:ident, $read:ident, $bytes:expr, $data:expr) => (
-        mod $name {
-            use byteorder::{ByteOrder, BigEndian, NativeEndian, LittleEndian};
-            use super::test::Bencher;
-            use super::test::black_box as bb;
-
-            const NITER: usize = 100_000;
-
-            #[bench]
-            fn read_big_endian(b: &mut Bencher) {
-                let buf = $data;
-                b.iter(|| {
-                    for _ in 0..NITER {
-                        bb(BigEndian::$read(&buf, $bytes));
-                    }
-                });
-            }
-
-            #[bench]
-            fn read_little_endian(b: &mut Bencher) {
-                let buf = $data;
-                b.iter(|| {
-                    for _ in 0..NITER {
-                        bb(LittleEndian::$read(&buf, $bytes));
-                    }
-                });
-            }
-
-            #[bench]
-            fn read_native_endian(b: &mut Bencher) {
-                let buf = $data;
-                b.iter(|| {
-                    for _ in 0..NITER {
-                        bb(NativeEndian::$read(&buf, $bytes));
-                    }
-                });
-            }
-        }
-    );
-    ($ty:ident, $max:ident,
-     $read:ident, $write:ident, $size:expr, $data:expr) => (
-        mod $ty {
-            use std::$ty;
-            use byteorder::{ByteOrder, BigEndian, NativeEndian, LittleEndian};
-            use super::test::Bencher;
-            use super::test::black_box as bb;
-
-            const NITER: usize = 100_000;
-
-            #[bench]
-            fn read_big_endian(b: &mut Bencher) {
-                let buf = $data;
-                b.iter(|| {
-                    for _ in 0..NITER {
-                        bb(BigEndian::$read(&buf));
-                    }
-                });
-            }
-
-            #[bench]
-            fn read_little_endian(b: &mut Bencher) {
-                let buf = $data;
-                b.iter(|| {
-                    for _ in 0..NITER {
-                        bb(LittleEndian::$read(&buf));
-                    }
-                });
-            }
-
-            #[bench]
-            fn read_native_endian(b: &mut Bencher) {
-                let buf = $data;
-                b.iter(|| {
-                    for _ in 0..NITER {
-                        bb(NativeEndian::$read(&buf));
-                    }
-                });
-            }
-
-            #[bench]
-            fn write_big_endian(b: &mut Bencher) {
-                let mut buf = $data;
-                let n = $ty::$max;
-                b.iter(|| {
-                    for _ in 0..NITER {
-                        bb(BigEndian::$write(&mut buf, n));
-                    }
-                });
-            }
-
-            #[bench]
-            fn write_little_endian(b: &mut Bencher) {
-                let mut buf = $data;
-                let n = $ty::$max;
-                b.iter(|| {
-                    for _ in 0..NITER {
-                        bb(LittleEndian::$write(&mut buf, n));
-                    }
-                });
-            }
-
-            #[bench]
-            fn write_native_endian(b: &mut Bencher) {
-                let mut buf = $data;
-                let n = $ty::$max;
-                b.iter(|| {
-                    for _ in 0..NITER {
-                        bb(NativeEndian::$write(&mut buf, n));
-                    }
-                });
-            }
-        }
-    );
-}
-
-bench_num!(u16, MAX, read_u16, write_u16, 2, [1, 2]);
-bench_num!(i16, MAX, read_i16, write_i16, 2, [1, 2]);
-bench_num!(u32, MAX, read_u32, write_u32, 4, [1, 2, 3, 4]);
-bench_num!(i32, MAX, read_i32, write_i32, 4, [1, 2, 3, 4]);
-bench_num!(u64, MAX, read_u64, write_u64, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
-bench_num!(i64, MAX, read_i64, write_i64, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
-bench_num!(f32, MAX, read_f32, write_f32, 4, [1, 2, 3, 4]);
-bench_num!(f64, MAX, read_f64, write_f64, 8,
-           [1, 2, 3, 4, 5, 6, 7, 8]);
-
-bench_num!(uint_1, read_uint, 1, [1]);
-bench_num!(uint_2, read_uint, 2, [1, 2]);
-bench_num!(uint_3, read_uint, 3, [1, 2, 3]);
-bench_num!(uint_4, read_uint, 4, [1, 2, 3, 4]);
-bench_num!(uint_5, read_uint, 5, [1, 2, 3, 4, 5]);
-bench_num!(uint_6, read_uint, 6, [1, 2, 3, 4, 5, 6]);
-bench_num!(uint_7, read_uint, 7, [1, 2, 3, 4, 5, 6, 7]);
-bench_num!(uint_8, read_uint, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
-
-bench_num!(int_1, read_int, 1, [1]);
-bench_num!(int_2, read_int, 2, [1, 2]);
-bench_num!(int_3, read_int, 3, [1, 2, 3]);
-bench_num!(int_4, read_int, 4, [1, 2, 3, 4]);
-bench_num!(int_5, read_int, 5, [1, 2, 3, 4, 5]);
-bench_num!(int_6, read_int, 6, [1, 2, 3, 4, 5, 6]);
-bench_num!(int_7, read_int, 7, [1, 2, 3, 4, 5, 6, 7]);
-bench_num!(int_8, read_int, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
diff --git a/third_party/rust/byteorder-1.0.0/src/lib.rs b/third_party/rust/byteorder-1.0.0/src/lib.rs
deleted file mode 100644
index e524560505f6..000000000000
--- a/third_party/rust/byteorder-1.0.0/src/lib.rs
+++ /dev/null
@@ -1,820 +0,0 @@
-/*!
-This crate provides convenience methods for encoding and decoding numbers
-in either big-endian or little-endian order.
-
-The organization of the crate is pretty simple. A trait, `ByteOrder`, specifies
-byte conversion methods for each type of number in Rust (sans numbers that have
-a platform dependent size like `usize` and `isize`). Two types, `BigEndian`
-and `LittleEndian` implement these methods. Finally, `ReadBytesExt` and
-`WriteBytesExt` provide convenience methods available to all types that
-implement `Read` and `Write`.
-
-# Examples
-
-Read unsigned 16 bit big-endian integers from a `Read` type:
-
-```rust
-use std::io::Cursor;
-use byteorder::{BigEndian, ReadBytesExt};
-
-let mut rdr = Cursor::new(vec![2, 5, 3, 0]);
-// Note that we use type parameters to indicate which kind of byte order
-// we want!
-assert_eq!(517, rdr.read_u16::<BigEndian>().unwrap());
-assert_eq!(768, rdr.read_u16::<BigEndian>().unwrap());
-```
-
-Write unsigned 16 bit little-endian integers to a `Write` type:
-
-```rust
-use byteorder::{LittleEndian, WriteBytesExt};
-
-let mut wtr = vec![];
-wtr.write_u16::<LittleEndian>(517).unwrap();
-wtr.write_u16::<LittleEndian>(768).unwrap();
-assert_eq!(wtr, vec![5, 2, 0, 3]);
-```
-*/
-
-#![deny(missing_docs)]
-#![cfg_attr(not(feature = "std"), no_std)]
-
-#[cfg(feature = "std")]
-extern crate core;
-
-use core::fmt::Debug;
-use core::hash::Hash;
-use core::mem::transmute;
-use core::ptr::copy_nonoverlapping;
-
-#[cfg(feature = "std")]
-pub use new::{ReadBytesExt, WriteBytesExt};
-
-#[cfg(feature = "std")]
-mod new;
-
-#[inline]
-fn extend_sign(val: u64, nbytes: usize) -> i64 {
-    let shift = (8 - nbytes) * 8;
-    (val << shift) as i64 >> shift
-}
-
-#[inline]
-fn unextend_sign(val: i64, nbytes: usize) -> u64 {
-    let shift = (8 - nbytes) * 8;
-    (val << shift) as u64 >> shift
-}
-
-#[inline]
-fn pack_size(n: u64) -> usize {
-    if n < 1 << 8 {
-        1
-    } else if n < 1 << 16 {
-        2
-    } else if n < 1 << 24 {
-        3
-    } else if n < 1 << 32 {
-        4
-    } else if n < 1 << 40 {
-        5
-    } else if n < 1 << 48 {
-        6
-    } else if n < 1 << 56 {
-        7
-    } else {
-        8
-    }
-}
-
-/// ByteOrder describes types that can serialize integers as bytes.
-///
-/// Note that `Self` does not appear anywhere in this trait's definition!
-/// Therefore, in order to use it, you'll need to use syntax like
-/// `T::read_u16(&[0, 1])` where `T` implements `ByteOrder`.
-///
-/// This crate provides two types that implement `ByteOrder`: `BigEndian`
-/// and `LittleEndian`.
-///
-/// # Examples
-///
-/// Write and read `u32` numbers in little endian order:
-///
-/// ```rust
-/// use byteorder::{ByteOrder, LittleEndian};
-///
-/// let mut buf = [0; 4];
-/// LittleEndian::write_u32(&mut buf, 1_000_000);
-/// assert_eq!(1_000_000, LittleEndian::read_u32(&buf));
-/// ```
-///
-/// Write and read `i16` numbers in big endian order:
-///
-/// ```rust
-/// use byteorder::{ByteOrder, BigEndian};
-///
-/// let mut buf = [0; 2];
-/// BigEndian::write_i16(&mut buf, -50_000);
-/// assert_eq!(-50_000, BigEndian::read_i16(&buf));
-/// ```
-pub trait ByteOrder
-    : Clone + Copy + Debug + Default + Eq + Hash + Ord + PartialEq + PartialOrd {
-    /// Reads an unsigned 16 bit integer from `buf`.
-    ///
-    /// Panics when `buf.len() < 2`.
-    fn read_u16(buf: &[u8]) -> u16;
-
-    /// Reads an unsigned 32 bit integer from `buf`.
-    ///
-    /// Panics when `buf.len() < 4`.
-    fn read_u32(buf: &[u8]) -> u32;
-
-    /// Reads an unsigned 64 bit integer from `buf`.
-    ///
-    /// Panics when `buf.len() < 8`.
-    fn read_u64(buf: &[u8]) -> u64;
-
-    /// Reads an unsigned n-bytes integer from `buf`.
-    ///
-    /// Panics when `nbytes < 1` or `nbytes > 8` or
-    /// `buf.len() < nbytes`
-    fn read_uint(buf: &[u8], nbytes: usize) -> u64;
-
-    /// Writes an unsigned 16 bit integer `n` to `buf`.
-    ///
-    /// Panics when `buf.len() < 2`.
-    fn write_u16(buf: &mut [u8], n: u16);
-
-    /// Writes an unsigned 32 bit integer `n` to `buf`.
-    ///
-    /// Panics when `buf.len() < 4`.
-    fn write_u32(buf: &mut [u8], n: u32);
-
-    /// Writes an unsigned 64 bit integer `n` to `buf`.
-    ///
-    /// Panics when `buf.len() < 8`.
-    fn write_u64(buf: &mut [u8], n: u64);
-
-    /// Writes an unsigned integer `n` to `buf` using only `nbytes`.
-    ///
-    /// If `n` is not representable in `nbytes`, or if `nbytes` is `> 8`, then
-    /// this method panics.
-    fn write_uint(buf: &mut [u8], n: u64, nbytes: usize);
-
-    /// Reads a signed 16 bit integer from `buf`.
-    ///
-    /// Panics when `buf.len() < 2`.
-    #[inline]
-    fn read_i16(buf: &[u8]) -> i16 {
-        Self::read_u16(buf) as i16
-    }
-
-    /// Reads a signed 32 bit integer from `buf`.
-    ///
-    /// Panics when `buf.len() < 4`.
-    #[inline]
-    fn read_i32(buf: &[u8]) -> i32 {
-        Self::read_u32(buf) as i32
-    }
-
-    /// Reads a signed 64 bit integer from `buf`.
-    ///
-    /// Panics when `buf.len() < 8`.
-    #[inline]
-    fn read_i64(buf: &[u8]) -> i64 {
-        Self::read_u64(buf) as i64
-    }
-
-    /// Reads a signed n-bytes integer from `buf`.
-    ///
-    /// Panics when `nbytes < 1` or `nbytes > 8` or
-    /// `buf.len() < nbytes`
-    #[inline]
-    fn read_int(buf: &[u8], nbytes: usize) -> i64 {
-        extend_sign(Self::read_uint(buf, nbytes), nbytes)
-    }
-
-    /// Reads a IEEE754 single-precision (4 bytes) floating point number.
-    ///
-    /// Panics when `buf.len() < 4`.
-    #[inline]
-    fn read_f32(buf: &[u8]) -> f32 {
-        unsafe { transmute(Self::read_u32(buf)) }
-    }
-
-    /// Reads a IEEE754 double-precision (8 bytes) floating point number.
-    ///
-    /// Panics when `buf.len() < 8`.
-    #[inline]
-    fn read_f64(buf: &[u8]) -> f64 {
-        unsafe { transmute(Self::read_u64(buf)) }
-    }
-
-    /// Writes a signed 16 bit integer `n` to `buf`.
-    ///
-    /// Panics when `buf.len() < 2`.
-    #[inline]
-    fn write_i16(buf: &mut [u8], n: i16) {
-        Self::write_u16(buf, n as u16)
-    }
-
-    /// Writes a signed 32 bit integer `n` to `buf`.
-    ///
-    /// Panics when `buf.len() < 4`.
-    #[inline]
-    fn write_i32(buf: &mut [u8], n: i32) {
-        Self::write_u32(buf, n as u32)
-    }
-
-    /// Writes a signed 64 bit integer `n` to `buf`.
-    ///
-    /// Panics when `buf.len() < 8`.
-    #[inline]
-    fn write_i64(buf: &mut [u8], n: i64) {
-        Self::write_u64(buf, n as u64)
-    }
-
-    /// Writes a signed integer `n` to `buf` using only `nbytes`.
-    ///
-    /// If `n` is not representable in `nbytes`, or if `nbytes` is `> 8`, then
-    /// this method panics.
-    #[inline]
-    fn write_int(buf: &mut [u8], n: i64, nbytes: usize) {
-        Self::write_uint(buf, unextend_sign(n, nbytes), nbytes)
-    }
-
-    /// Writes a IEEE754 single-precision (4 bytes) floating point number.
-    ///
-    /// Panics when `buf.len() < 4`.
-    #[inline]
-    fn write_f32(buf: &mut [u8], n: f32) {
-        Self::write_u32(buf, unsafe { transmute(n) })
-    }
-
-    /// Writes a IEEE754 double-precision (8 bytes) floating point number.
-    ///
-    /// Panics when `buf.len() < 8`.
-    #[inline]
-    fn write_f64(buf: &mut [u8], n: f64) {
-        Self::write_u64(buf, unsafe { transmute(n) })
-    }
-}
-
-/// Defines big-endian serialization.
-///
-/// Note that this type has no value constructor. It is used purely at the
-/// type level.
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub enum BigEndian {}
-
-impl Default for BigEndian {
-    fn default() -> BigEndian {
-        unreachable!()
-    }
-}
-
-/// Defines little-endian serialization.
-///
-/// Note that this type has no value constructor. It is used purely at the
-/// type level.
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub enum LittleEndian {}
-
-impl Default for LittleEndian {
-    fn default() -> LittleEndian {
-        unreachable!()
-    }
-}
-
-/// Defines network byte order serialization.
-///
-/// Network byte order is defined by [RFC 1700][1] to be big-endian, and is
-/// referred to in several protocol specifications.  This type is an alias of
-/// BigEndian.
-///
-/// [1]: https://tools.ietf.org/html/rfc1700
-///
-/// Note that this type has no value constructor. It is used purely at the
-/// type level.
-pub type NetworkEndian = BigEndian;
-
-/// Defines system native-endian serialization.
-///
-/// Note that this type has no value constructor. It is used purely at the
-/// type level.
-#[cfg(target_endian = "little")]
-pub type NativeEndian = LittleEndian;
-
-/// Defines system native-endian serialization.
-///
-/// Note that this type has no value constructor. It is used purely at the
-/// type level.
-#[cfg(target_endian = "big")]
-pub type NativeEndian = BigEndian;
-
-macro_rules! read_num_bytes {
-    ($ty:ty, $size:expr, $src:expr, $which:ident) => ({
-        assert!($size == ::core::mem::size_of::<$ty>());
-        assert!($size <= $src.len());
-        let mut data: $ty = 0;
-        unsafe {
-            copy_nonoverlapping(
-                $src.as_ptr(),
-                &mut data as *mut $ty as *mut u8,
-                $size);
-        }
-        data.$which()
-    });
-}
-
-macro_rules! write_num_bytes {
-    ($ty:ty, $size:expr, $n:expr, $dst:expr, $which:ident) => ({
-        assert!($size <= $dst.len());
-        unsafe {
-            // N.B. https://github.com/rust-lang/rust/issues/22776
-            let bytes = transmute::<_, [u8; $size]>($n.$which());
-            copy_nonoverlapping((&bytes).as_ptr(), $dst.as_mut_ptr(), $size);
-        }
-    });
-}
-
-impl ByteOrder for BigEndian {
-    #[inline]
-    fn read_u16(buf: &[u8]) -> u16 {
-        read_num_bytes!(u16, 2, buf, to_be)
-    }
-
-    #[inline]
-    fn read_u32(buf: &[u8]) -> u32 {
-        read_num_bytes!(u32, 4, buf, to_be)
-    }
-
-    #[inline]
-    fn read_u64(buf: &[u8]) -> u64 {
-        read_num_bytes!(u64, 8, buf, to_be)
-    }
-
-    #[inline]
-    fn read_uint(buf: &[u8], nbytes: usize) -> u64 {
-        assert!(1 <= nbytes && nbytes <= 8 && nbytes <= buf.len());
-        let mut out = [0u8; 8];
-        let ptr_out = out.as_mut_ptr();
-        unsafe {
-            copy_nonoverlapping(
-                buf.as_ptr(), ptr_out.offset((8 - nbytes) as isize), nbytes);
-            (*(ptr_out as *const u64)).to_be()
-        }
-    }
-
-    #[inline]
-    fn write_u16(buf: &mut [u8], n: u16) {
-        write_num_bytes!(u16, 2, n, buf, to_be);
-    }
-
-    #[inline]
-    fn write_u32(buf: &mut [u8], n: u32) {
-        write_num_bytes!(u32, 4, n, buf, to_be);
-    }
-
-    #[inline]
-    fn write_u64(buf: &mut [u8], n: u64) {
-        write_num_bytes!(u64, 8, n, buf, to_be);
-    }
-
-    #[inline]
-    fn write_uint(buf: &mut [u8], n: u64, nbytes: usize) {
-        assert!(pack_size(n) <= nbytes && nbytes <= 8);
-        assert!(nbytes <= buf.len());
-        unsafe {
-            let bytes: [u8; 8] = transmute(n.to_be());
-            copy_nonoverlapping(
-                bytes.as_ptr().offset((8 - nbytes) as isize),
-                buf.as_mut_ptr(),
-                nbytes);
-        }
-    }
-}
-
-impl ByteOrder for LittleEndian {
-    #[inline]
-    fn read_u16(buf: &[u8]) -> u16 {
-        read_num_bytes!(u16, 2, buf, to_le)
-    }
-
-    #[inline]
-    fn read_u32(buf: &[u8]) -> u32 {
-        read_num_bytes!(u32, 4, buf, to_le)
-    }
-
-    #[inline]
-    fn read_u64(buf: &[u8]) -> u64 {
-        read_num_bytes!(u64, 8, buf, to_le)
-    }
-
-    #[inline]
-    fn read_uint(buf: &[u8], nbytes: usize) -> u64 {
-        assert!(1 <= nbytes && nbytes <= 8 && nbytes <= buf.len());
-        let mut out = [0u8; 8];
-        let ptr_out = out.as_mut_ptr();
-        unsafe {
-            copy_nonoverlapping(buf.as_ptr(), ptr_out, nbytes);
-            (*(ptr_out as *const u64)).to_le()
-        }
-    }
-
-    #[inline]
-    fn write_u16(buf: &mut [u8], n: u16) {
-        write_num_bytes!(u16, 2, n, buf, to_le);
-    }
-
-    #[inline]
-    fn write_u32(buf: &mut [u8], n: u32) {
-        write_num_bytes!(u32, 4, n, buf, to_le);
-    }
-
-    #[inline]
-    fn write_u64(buf: &mut [u8], n: u64) {
-        write_num_bytes!(u64, 8, n, buf, to_le);
-    }
-
-    #[inline]
-    fn write_uint(buf: &mut [u8], n: u64, nbytes: usize) {
-        assert!(pack_size(n as u64) <= nbytes && nbytes <= 8);
-        assert!(nbytes <= buf.len());
-        unsafe {
-            let bytes: [u8; 8] = transmute(n.to_le());
-            copy_nonoverlapping(bytes.as_ptr(), buf.as_mut_ptr(), nbytes);
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    extern crate quickcheck;
-    extern crate rand;
-
-    use self::rand::thread_rng;
-    use self::quickcheck::{QuickCheck, StdGen, Testable};
-
-    pub const U64_MAX: u64 = ::core::u64::MAX;
-    pub const I64_MAX: u64 = ::core::i64::MAX as u64;
-
-    pub fn qc_sized<A: Testable>(f: A, size: u64) {
-        QuickCheck::new()
-            .gen(StdGen::new(thread_rng(), size as usize))
-            .tests(1_00)
-            .max_tests(10_000)
-            .quickcheck(f);
-    }
-
-    macro_rules! qc_byte_order {
-        ($name:ident, $ty_int:ident, $max:expr,
-         $bytes:expr, $read:ident, $write:ident) => (
-            mod $name {
-                use {BigEndian, ByteOrder, NativeEndian, LittleEndian};
-                use super::qc_sized;
-
-                #[test]
-                fn big_endian() {
-                    let max = ($max - 1) >> (8 * (8 - $bytes));
-                    fn prop(n: $ty_int) -> bool {
-                        let mut buf = [0; 8];
-                        BigEndian::$write(&mut buf, n, $bytes);
-                        n == BigEndian::$read(&mut buf[..$bytes], $bytes)
-                    }
-                    qc_sized(prop as fn($ty_int) -> bool, max);
-                }
-
-                #[test]
-                fn little_endian() {
-                    let max = ($max - 1) >> (8 * (8 - $bytes));
-                    fn prop(n: $ty_int) -> bool {
-                        let mut buf = [0; 8];
-                        LittleEndian::$write(&mut buf, n, $bytes);
-                        n == LittleEndian::$read(&mut buf[..$bytes], $bytes)
-                    }
-                    qc_sized(prop as fn($ty_int) -> bool, max);
-                }
-
-                #[test]
-                fn native_endian() {
-                    let max = ($max - 1) >> (8 * (8 - $bytes));
-                    fn prop(n: $ty_int) -> bool {
-                        let mut buf = [0; 8];
-                        NativeEndian::$write(&mut buf, n, $bytes);
-                        n == NativeEndian::$read(&mut buf[..$bytes], $bytes)
-                    }
-                    qc_sized(prop as fn($ty_int) -> bool, max);
-                }
-            }
-        );
-        ($name:ident, $ty_int:ident, $max:expr,
-         $read:ident, $write:ident) => (
-            mod $name {
-                use core::mem::size_of;
-                use {BigEndian, ByteOrder, NativeEndian, LittleEndian};
-                use super::qc_sized;
-
-                #[test]
-                fn big_endian() {
-                    fn prop(n: $ty_int) -> bool {
-                        let bytes = size_of::<$ty_int>();
-                        let mut buf = [0; 8];
-                        BigEndian::$write(&mut buf[8 - bytes..], n);
-                        n == BigEndian::$read(&mut buf[8 - bytes..])
-                    }
-                    qc_sized(prop as fn($ty_int) -> bool, $max - 1);
-                }
-
-                #[test]
-                fn little_endian() {
-                    fn prop(n: $ty_int) -> bool {
-                        let bytes = size_of::<$ty_int>();
-                        let mut buf = [0; 8];
-                        LittleEndian::$write(&mut buf[..bytes], n);
-                        n == LittleEndian::$read(&mut buf[..bytes])
-                    }
-                    qc_sized(prop as fn($ty_int) -> bool, $max - 1);
-                }
-
-                #[test]
-                fn native_endian() {
-                    fn prop(n: $ty_int) -> bool {
-                        let bytes = size_of::<$ty_int>();
-                        let mut buf = [0; 8];
-                        NativeEndian::$write(&mut buf[..bytes], n);
-                        n == NativeEndian::$read(&mut buf[..bytes])
-                    }
-                    qc_sized(prop as fn($ty_int) -> bool, $max - 1);
-                }
-            }
-        );
-    }
-
-    qc_byte_order!(prop_u16, u16, ::core::u16::MAX as u64, read_u16, write_u16);
-    qc_byte_order!(prop_i16, i16, ::core::i16::MAX as u64, read_i16, write_i16);
-    qc_byte_order!(prop_u32, u32, ::core::u32::MAX as u64, read_u32, write_u32);
-    qc_byte_order!(prop_i32, i32, ::core::i32::MAX as u64, read_i32, write_i32);
-    qc_byte_order!(prop_u64, u64, ::core::u64::MAX as u64, read_u64, write_u64);
-    qc_byte_order!(prop_i64, i64, ::core::i64::MAX as u64, read_i64, write_i64);
-    qc_byte_order!(prop_f32, f32, ::core::u64::MAX as u64, read_f32, write_f32);
-    qc_byte_order!(prop_f64, f64, ::core::i64::MAX as u64, read_f64, write_f64);
-
-    qc_byte_order!(prop_uint_1, u64, super::U64_MAX, 1, read_uint, write_uint);
-    qc_byte_order!(prop_uint_2, u64, super::U64_MAX, 2, read_uint, write_uint);
-    qc_byte_order!(prop_uint_3, u64, super::U64_MAX, 3, read_uint, write_uint);
-    qc_byte_order!(prop_uint_4, u64, super::U64_MAX, 4, read_uint, write_uint);
-    qc_byte_order!(prop_uint_5, u64, super::U64_MAX, 5, read_uint, write_uint);
-    qc_byte_order!(prop_uint_6, u64, super::U64_MAX, 6, read_uint, write_uint);
-    qc_byte_order!(prop_uint_7, u64, super::U64_MAX, 7, read_uint, write_uint);
-    qc_byte_order!(prop_uint_8, u64, super::U64_MAX, 8, read_uint, write_uint);
-
-    qc_byte_order!(prop_int_1, i64, super::I64_MAX, 1, read_int, write_int);
-    qc_byte_order!(prop_int_2, i64, super::I64_MAX, 2, read_int, write_int);
-    qc_byte_order!(prop_int_3, i64, super::I64_MAX, 3, read_int, write_int);
-    qc_byte_order!(prop_int_4, i64, super::I64_MAX, 4, read_int, write_int);
-    qc_byte_order!(prop_int_5, i64, super::I64_MAX, 5, read_int, write_int);
-    qc_byte_order!(prop_int_6, i64, super::I64_MAX, 6, read_int, write_int);
-    qc_byte_order!(prop_int_7, i64, super::I64_MAX, 7, read_int, write_int);
-    qc_byte_order!(prop_int_8, i64, super::I64_MAX, 8, read_int, write_int);
-
-    // Test that all of the byte conversion functions panic when given a
-    // buffer that is too small.
-    //
-    // These tests are critical to ensure safety, otherwise we might end up
-    // with a buffer overflow.
-    macro_rules! too_small {
-        ($name:ident, $maximally_small:expr, $zero:expr,
-         $read:ident, $write:ident) => (
-            mod $name {
-                use {BigEndian, ByteOrder, NativeEndian, LittleEndian};
-
-                #[test]
-                #[should_panic]
-                fn read_big_endian() {
-                    let buf = [0; $maximally_small];
-                    BigEndian::$read(&buf);
-                }
-
-                #[test]
-                #[should_panic]
-                fn read_little_endian() {
-                    let buf = [0; $maximally_small];
-                    LittleEndian::$read(&buf);
-                }
-
-                #[test]
-                #[should_panic]
-                fn read_native_endian() {
-                    let buf = [0; $maximally_small];
-                    NativeEndian::$read(&buf);
-                }
-
-                #[test]
-                #[should_panic]
-                fn write_big_endian() {
-                    let mut buf = [0; $maximally_small];
-                    BigEndian::$write(&mut buf, $zero);
-                }
-
-                #[test]
-                #[should_panic]
-                fn write_little_endian() {
-                    let mut buf = [0; $maximally_small];
-                    LittleEndian::$write(&mut buf, $zero);
-                }
-
-                #[test]
-                #[should_panic]
-                fn write_native_endian() {
-                    let mut buf = [0; $maximally_small];
-                    NativeEndian::$write(&mut buf, $zero);
-                }
-            }
-        );
-        ($name:ident, $maximally_small:expr, $read:ident) => (
-            mod $name {
-                use {BigEndian, ByteOrder, NativeEndian, LittleEndian};
-
-                #[test]
-                #[should_panic]
-                fn read_big_endian() {
-                    let buf = [0; $maximally_small];
-                    BigEndian::$read(&buf, $maximally_small + 1);
-                }
-
-                #[test]
-                #[should_panic]
-                fn read_little_endian() {
-                    let buf = [0; $maximally_small];
-                    LittleEndian::$read(&buf, $maximally_small + 1);
-                }
-
-                #[test]
-                #[should_panic]
-                fn read_native_endian() {
-                    let buf = [0; $maximally_small];
-                    NativeEndian::$read(&buf, $maximally_small + 1);
-                }
-            }
-        );
-    }
-
-    too_small!(small_u16, 1, 0, read_u16, write_u16);
-    too_small!(small_i16, 1, 0, read_i16, write_i16);
-    too_small!(small_u32, 3, 0, read_u32, write_u32);
-    too_small!(small_i32, 3, 0, read_i32, write_i32);
-    too_small!(small_u64, 7, 0, read_u64, write_u64);
-    too_small!(small_i64, 7, 0, read_i64, write_i64);
-    too_small!(small_f32, 3, 0.0, read_f32, write_f32);
-    too_small!(small_f64, 7, 0.0, read_f64, write_f64);
-
-    too_small!(small_uint_1, 1, read_uint);
-    too_small!(small_uint_2, 2, read_uint);
-    too_small!(small_uint_3, 3, read_uint);
-    too_small!(small_uint_4, 4, read_uint);
-    too_small!(small_uint_5, 5, read_uint);
-    too_small!(small_uint_6, 6, read_uint);
-    too_small!(small_uint_7, 7, read_uint);
-
-    too_small!(small_int_1, 1, read_int);
-    too_small!(small_int_2, 2, read_int);
-    too_small!(small_int_3, 3, read_int);
-    too_small!(small_int_4, 4, read_int);
-    too_small!(small_int_5, 5, read_int);
-    too_small!(small_int_6, 6, read_int);
-    too_small!(small_int_7, 7, read_int);
-
-    #[test]
-    fn uint_bigger_buffer() {
-        use {ByteOrder, LittleEndian};
-        let n = LittleEndian::read_uint(&[1, 2, 3, 4, 5, 6, 7, 8], 5);
-        assert_eq!(n, 0x0504030201);
-    }
-}
-
-#[cfg(test)]
-#[cfg(feature = "std")]
-mod stdtests {
-    macro_rules! qc_bytes_ext {
-        ($name:ident, $ty_int:ident, $max:expr,
-         $bytes:expr, $read:ident, $write:ident) => (
-            mod $name {
-                use std::io::Cursor;
-                use {
-                    ReadBytesExt, WriteBytesExt,
-                    BigEndian, NativeEndian, LittleEndian,
-                };
-                use test::qc_sized;
-
-                #[test]
-                fn big_endian() {
-                    let max = ($max - 1) >> (8 * (8 - $bytes));
-                    fn prop(n: $ty_int) -> bool {
-                        let mut wtr = vec![];
-                        wtr.$write::<BigEndian>(n).unwrap();
-                        let mut rdr = Vec::new();
-                        rdr.extend(wtr[8 - $bytes..].iter().map(|&x|x));
-                        let mut rdr = Cursor::new(rdr);
-                        n == rdr.$read::<BigEndian>($bytes).unwrap()
-                    }
-                    qc_sized(prop as fn($ty_int) -> bool, max);
-                }
-
-                #[test]
-                fn little_endian() {
-                    let max = ($max - 1) >> (8 * (8 - $bytes));
-                    fn prop(n: $ty_int) -> bool {
-                        let mut wtr = vec![];
-                        wtr.$write::<LittleEndian>(n).unwrap();
-                        let mut rdr = Cursor::new(wtr);
-                        n == rdr.$read::<LittleEndian>($bytes).unwrap()
-                    }
-                    qc_sized(prop as fn($ty_int) -> bool, max);
-                }
-
-                #[test]
-                fn native_endian() {
-                    let max = ($max - 1) >> (8 * (8 - $bytes));
-                    fn prop(n: $ty_int) -> bool {
-                        let mut wtr = vec![];
-                        wtr.$write::<NativeEndian>(n).unwrap();
-                        let mut rdr = Cursor::new(wtr);
-                        n == rdr.$read::<NativeEndian>($bytes).unwrap()
-                    }
-                    qc_sized(prop as fn($ty_int) -> bool, max);
-                }
-            }
-        );
-        ($name:ident, $ty_int:ident, $max:expr, $read:ident, $write:ident) => (
-            mod $name {
-                use std::io::Cursor;
-                use {
-                    ReadBytesExt, WriteBytesExt,
-                    BigEndian, NativeEndian, LittleEndian,
-                };
-                use test::qc_sized;
-
-                #[test]
-                fn big_endian() {
-                    fn prop(n: $ty_int) -> bool {
-                        let mut wtr = vec![];
-                        wtr.$write::<BigEndian>(n).unwrap();
-                        let mut rdr = Cursor::new(wtr);
-                        n == rdr.$read::<BigEndian>().unwrap()
-                    }
-                    qc_sized(prop as fn($ty_int) -> bool, $max - 1);
-                }
-
-                #[test]
-                fn little_endian() {
-                    fn prop(n: $ty_int) -> bool {
-                        let mut wtr = vec![];
-                        wtr.$write::<LittleEndian>(n).unwrap();
-                        let mut rdr = Cursor::new(wtr);
-                        n == rdr.$read::<LittleEndian>().unwrap()
-                    }
-                    qc_sized(prop as fn($ty_int) -> bool, $max - 1);
-                }
-
-                #[test]
-                fn native_endian() {
-                    fn prop(n: $ty_int) -> bool {
-                        let mut wtr = vec![];
-                        wtr.$write::<NativeEndian>(n).unwrap();
-                        let mut rdr = Cursor::new(wtr);
-                        n == rdr.$read::<NativeEndian>().unwrap()
-                    }
-                    qc_sized(prop as fn($ty_int) -> bool, $max - 1);
-                }
-            }
-        );
-    }
-
-    qc_bytes_ext!(prop_ext_u16, u16, ::std::u16::MAX as u64, read_u16, write_u16);
-    qc_bytes_ext!(prop_ext_i16, i16, ::std::i16::MAX as u64, read_i16, write_i16);
-    qc_bytes_ext!(prop_ext_u32, u32, ::std::u32::MAX as u64, read_u32, write_u32);
-    qc_bytes_ext!(prop_ext_i32, i32, ::std::i32::MAX as u64, read_i32, write_i32);
-    qc_bytes_ext!(prop_ext_u64, u64, ::std::u64::MAX as u64, read_u64, write_u64);
-    qc_bytes_ext!(prop_ext_i64, i64, ::std::i64::MAX as u64, read_i64, write_i64);
-    qc_bytes_ext!(prop_ext_f32, f32, ::std::u64::MAX as u64, read_f32, write_f32);
-    qc_bytes_ext!(prop_ext_f64, f64, ::std::i64::MAX as u64, read_f64, write_f64);
-
-    qc_bytes_ext!(prop_ext_uint_1, u64, ::test::U64_MAX, 1, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_2, u64, ::test::U64_MAX, 2, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_3, u64, ::test::U64_MAX, 3, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_4, u64, ::test::U64_MAX, 4, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_5, u64, ::test::U64_MAX, 5, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_6, u64, ::test::U64_MAX, 6, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_7, u64, ::test::U64_MAX, 7, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_8, u64, ::test::U64_MAX, 8, read_uint, write_u64);
-
-    qc_bytes_ext!(prop_ext_int_1, i64, ::test::I64_MAX, 1, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_2, i64, ::test::I64_MAX, 2, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_3, i64, ::test::I64_MAX, 3, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_4, i64, ::test::I64_MAX, 4, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_5, i64, ::test::I64_MAX, 5, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_6, i64, ::test::I64_MAX, 6, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_7, i64, ::test::I64_MAX, 7, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_8, i64, ::test::I64_MAX, 8, read_int, write_i64);
-}
-
diff --git a/third_party/rust/byteorder-1.0.0/src/new.rs b/third_party/rust/byteorder-1.0.0/src/new.rs
deleted file mode 100644
index b5f37700f960..000000000000
--- a/third_party/rust/byteorder-1.0.0/src/new.rs
+++ /dev/null
@@ -1,269 +0,0 @@
-use std::io::{self, Result};
-
-use ByteOrder;
-
-/// Extends `Read` with methods for reading numbers. (For `std::io`.)
-///
-/// Most of the methods defined here have an unconstrained type parameter that
-/// must be explicitly instantiated. Typically, it is instantiated with either
-/// the `BigEndian` or `LittleEndian` types defined in this crate.
-///
-/// # Examples
-///
-/// Read unsigned 16 bit big-endian integers from a `Read`:
-///
-/// ```rust
-/// use std::io::Cursor;
-/// use byteorder::{BigEndian, ReadBytesExt};
-///
-/// let mut rdr = Cursor::new(vec![2, 5, 3, 0]);
-/// assert_eq!(517, rdr.read_u16::<BigEndian>().unwrap());
-/// assert_eq!(768, rdr.read_u16::<BigEndian>().unwrap());
-/// ```
-pub trait ReadBytesExt: io::Read {
-    /// Reads an unsigned 8 bit integer from the underlying reader.
-    ///
-    /// Note that since this reads a single byte, no byte order conversions
-    /// are used. It is included for completeness.
-    #[inline]
-    fn read_u8(&mut self) -> Result<u8> {
-        let mut buf = [0; 1];
-        try!(self.read_exact(&mut buf));
-        Ok(buf[0])
-    }
-
-    /// Reads a signed 8 bit integer from the underlying reader.
-    ///
-    /// Note that since this reads a single byte, no byte order conversions
-    /// are used. It is included for completeness.
-    #[inline]
-    fn read_i8(&mut self) -> Result<i8> {
-        let mut buf = [0; 1];
-        try!(self.read_exact(&mut buf));
-        Ok(buf[0] as i8)
-    }
-
-    /// Reads an unsigned 16 bit integer from the underlying reader.
-    #[inline]
-    fn read_u16<T: ByteOrder>(&mut self) -> Result<u16> {
-        let mut buf = [0; 2];
-        try!(self.read_exact(&mut buf));
-        Ok(T::read_u16(&buf))
-    }
-
-    /// Reads a signed 16 bit integer from the underlying reader.
-    #[inline]
-    fn read_i16<T: ByteOrder>(&mut self) -> Result<i16> {
-        let mut buf = [0; 2];
-        try!(self.read_exact(&mut buf));
-        Ok(T::read_i16(&buf))
-    }
-
-    /// Reads an unsigned 32 bit integer from the underlying reader.
-    #[inline]
-    fn read_u32<T: ByteOrder>(&mut self) -> Result<u32> {
-        let mut buf = [0; 4];
-        try!(self.read_exact(&mut buf));
-        Ok(T::read_u32(&buf))
-    }
-
-    /// Reads a signed 32 bit integer from the underlying reader.
-    #[inline]
-    fn read_i32<T: ByteOrder>(&mut self) -> Result<i32> {
-        let mut buf = [0; 4];
-        try!(self.read_exact(&mut buf));
-        Ok(T::read_i32(&buf))
-    }
-
-    /// Reads an unsigned 64 bit integer from the underlying reader.
-    #[inline]
-    fn read_u64<T: ByteOrder>(&mut self) -> Result<u64> {
-        let mut buf = [0; 8];
-        try!(self.read_exact(&mut buf));
-        Ok(T::read_u64(&buf))
-    }
-
-    /// Reads a signed 64 bit integer from the underlying reader.
-    #[inline]
-    fn read_i64<T: ByteOrder>(&mut self) -> Result<i64> {
-        let mut buf = [0; 8];
-        try!(self.read_exact(&mut buf));
-        Ok(T::read_i64(&buf))
-    }
-
-    /// Reads an unsigned n-bytes integer from the underlying reader.
-    #[inline]
-    fn read_uint<T: ByteOrder>(&mut self, nbytes: usize) -> Result<u64> {
-        let mut buf = [0; 8];
-        try!(self.read_exact(&mut buf[..nbytes]));
-        Ok(T::read_uint(&buf[..nbytes], nbytes))
-    }
-
-    /// Reads a signed n-bytes integer from the underlying reader.
-    #[inline]
-    fn read_int<T: ByteOrder>(&mut self, nbytes: usize) -> Result<i64> {
-        let mut buf = [0; 8];
-        try!(self.read_exact(&mut buf[..nbytes]));
-        Ok(T::read_int(&buf[..nbytes], nbytes))
-    }
-
-    /// Reads a IEEE754 single-precision (4 bytes) floating point number from
-    /// the underlying reader.
-    #[inline]
-    fn read_f32<T: ByteOrder>(&mut self) -> Result<f32> {
-        let mut buf = [0; 4];
-        try!(self.read_exact(&mut buf));
-        Ok(T::read_f32(&buf))
-    }
-
-    /// Reads a IEEE754 double-precision (8 bytes) floating point number from
-    /// the underlying reader.
-    #[inline]
-    fn read_f64<T: ByteOrder>(&mut self) -> Result<f64> {
-        let mut buf = [0; 8];
-        try!(self.read_exact(&mut buf));
-        Ok(T::read_f64(&buf))
-    }
-}
-
-/// All types that implement `Read` get methods defined in `ReadBytesExt`
-/// for free.
-impl<R: io::Read + ?Sized> ReadBytesExt for R {}
-
-/// Extends `Write` with methods for writing numbers. (For `std::io`.)
-///
-/// Most of the methods defined here have an unconstrained type parameter that
-/// must be explicitly instantiated. Typically, it is instantiated with either
-/// the `BigEndian` or `LittleEndian` types defined in this crate.
-///
-/// # Examples
-///
-/// Write unsigned 16 bit big-endian integers to a `Write`:
-///
-/// ```rust
-/// use byteorder::{BigEndian, WriteBytesExt};
-///
-/// let mut wtr = vec![];
-/// wtr.write_u16::<BigEndian>(517).unwrap();
-/// wtr.write_u16::<BigEndian>(768).unwrap();
-/// assert_eq!(wtr, vec![2, 5, 3, 0]);
-/// ```
-pub trait WriteBytesExt: io::Write {
-    /// Writes an unsigned 8 bit integer to the underlying writer.
-    ///
-    /// Note that since this writes a single byte, no byte order conversions
-    /// are used. It is included for completeness.
-    #[inline]
-    fn write_u8(&mut self, n: u8) -> Result<()> {
-        self.write_all(&[n])
-    }
-
-    /// Writes a signed 8 bit integer to the underlying writer.
-    ///
-    /// Note that since this writes a single byte, no byte order conversions
-    /// are used. It is included for completeness.
-    #[inline]
-    fn write_i8(&mut self, n: i8) -> Result<()> {
-        self.write_all(&[n as u8])
-    }
-
-    /// Writes an unsigned 16 bit integer to the underlying writer.
-    #[inline]
-    fn write_u16<T: ByteOrder>(&mut self, n: u16) -> Result<()> {
-        let mut buf = [0; 2];
-        T::write_u16(&mut buf, n);
-        self.write_all(&buf)
-    }
-
-    /// Writes a signed 16 bit integer to the underlying writer.
-    #[inline]
-    fn write_i16<T: ByteOrder>(&mut self, n: i16) -> Result<()> {
-        let mut buf = [0; 2];
-        T::write_i16(&mut buf, n);
-        self.write_all(&buf)
-    }
-
-    /// Writes an unsigned 32 bit integer to the underlying writer.
-    #[inline]
-    fn write_u32<T: ByteOrder>(&mut self, n: u32) -> Result<()> {
-        let mut buf = [0; 4];
-        T::write_u32(&mut buf, n);
-        self.write_all(&buf)
-    }
-
-    /// Writes a signed 32 bit integer to the underlying writer.
-    #[inline]
-    fn write_i32<T: ByteOrder>(&mut self, n: i32) -> Result<()> {
-        let mut buf = [0; 4];
-        T::write_i32(&mut buf, n);
-        self.write_all(&buf)
-    }
-
-    /// Writes an unsigned 64 bit integer to the underlying writer.
-    #[inline]
-    fn write_u64<T: ByteOrder>(&mut self, n: u64) -> Result<()> {
-        let mut buf = [0; 8];
-        T::write_u64(&mut buf, n);
-        self.write_all(&buf)
-    }
-
-    /// Writes a signed 64 bit integer to the underlying writer.
-    #[inline]
-    fn write_i64<T: ByteOrder>(&mut self, n: i64) -> Result<()> {
-        let mut buf = [0; 8];
-        T::write_i64(&mut buf, n);
-        self.write_all(&buf)
-    }
-
-    /// Writes an unsigned n-bytes integer to the underlying writer.
-    ///
-    /// If the given integer is not representable in the given number of bytes,
-    /// this method panics. If `nbytes > 8`, this method panics.
-    #[inline]
-    fn write_uint<T: ByteOrder>(
-        &mut self,
-        n: u64,
-        nbytes: usize,
-    ) -> Result<()> {
-        let mut buf = [0; 8];
-        T::write_uint(&mut buf, n, nbytes);
-        self.write_all(&buf[0..nbytes])
-    }
-
-    /// Writes a signed n-bytes integer to the underlying writer.
-    ///
-    /// If the given integer is not representable in the given number of bytes,
-    /// this method panics. If `nbytes > 8`, this method panics.
-    #[inline]
-    fn write_int<T: ByteOrder>(
-        &mut self,
-        n: i64,
-        nbytes: usize,
-    ) -> Result<()> {
-        let mut buf = [0; 8];
-        T::write_int(&mut buf, n, nbytes);
-        self.write_all(&buf[0..nbytes])
-    }
-
-    /// Writes a IEEE754 single-precision (4 bytes) floating point number to
-    /// the underlying writer.
-    #[inline]
-    fn write_f32<T: ByteOrder>(&mut self, n: f32) -> Result<()> {
-        let mut buf = [0; 4];
-        T::write_f32(&mut buf, n);
-        self.write_all(&buf)
-    }
-
-    /// Writes a IEEE754 double-precision (8 bytes) floating point number to
-    /// the underlying writer.
-    #[inline]
-    fn write_f64<T: ByteOrder>(&mut self, n: f64) -> Result<()> {
-        let mut buf = [0; 8];
-        T::write_f64(&mut buf, n);
-        self.write_all(&buf)
-    }
-}
-
-/// All types that implement `Write` get methods defined in `WriteBytesExt`
-/// for free.
-impl<W: io::Write + ?Sized> WriteBytesExt for W {}
diff --git a/third_party/rust/byteorder-1.1.0/.cargo-checksum.json b/third_party/rust/byteorder-1.1.0/.cargo-checksum.json
new file mode 100644
index 000000000000..666d7025c22e
--- /dev/null
+++ b/third_party/rust/byteorder-1.1.0/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{".travis.yml":"a798200a7a2a7b499b4c44f0e516cd8975dc5f4b933144d1e2b1523087330b95","CHANGELOG.md":"caa17ca58eafcd282ed7b8bd47ef0670ce30a20aad339bf2758469f09fa4559d","COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"0e636678a02b111d1ebdfdc8ac5a835a2a41370028eeadf6d5fbfd3239f531f8","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"0559514b9d7488e96fb7a2f3c043a62fadf3495a1e10602d109ce79ee67da998","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","benches/bench.rs":"250d46461a0529a856d76a6421fd45c499bccba2c532e05dbf438c94582a8eac","src/io.rs":"5429f522221b3cce8a5c90fba7ad98b0ddad4fab44acc39763e6adabd511c021","src/lib.rs":"d31f218ca1892bea2812dd575ceb700779de704dc8bf1b9a778315ab75343c5d"},"package":"ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d"}
\ No newline at end of file
diff --git a/third_party/rust/byteorder-1.1.0/.travis.yml b/third_party/rust/byteorder-1.1.0/.travis.yml
new file mode 100644
index 000000000000..b8bb203a42f8
--- /dev/null
+++ b/third_party/rust/byteorder-1.1.0/.travis.yml
@@ -0,0 +1,22 @@
+language: rust
+rust:
+  - 1.12.0
+  - stable
+  - beta
+  - nightly
+script:
+  - cargo build --verbose
+  - cargo doc
+  - cargo test --verbose
+  - cargo test --verbose --no-default-features --lib
+  - if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then
+      cargo test --verbose --features i128;
+      cargo test --verbose --no-default-features --features i128 --lib;
+      cargo bench --verbose --no-run;
+      cargo bench --verbose --no-run --no-default-features;
+      cargo bench --verbose --no-run --features i128;
+      cargo bench --verbose --no-run --no-default-features --features i128;
+    fi
+branches:
+  only:
+    - master
diff --git a/third_party/rust/byteorder-1.1.0/CHANGELOG.md b/third_party/rust/byteorder-1.1.0/CHANGELOG.md
new file mode 100644
index 000000000000..0909791e782b
--- /dev/null
+++ b/third_party/rust/byteorder-1.1.0/CHANGELOG.md
@@ -0,0 +1,36 @@
+1.1.0
+=====
+This release of `byteorder` features a number of fixes and improvements, mostly
+as a result of the
+[Litz Blitz evaluation](https://public.etherpad-mozilla.org/p/rust-crate-eval-byteorder).
+
+Feature enhancements:
+
+* [FEATURE #63](https://github.com/BurntSushi/byteorder/issues/63):
+  Add methods for reading/writing slices of numbers for a specific
+  endianness.
+* [FEATURE #65](https://github.com/BurntSushi/byteorder/issues/65):
+  Add support for `u128`/`i128` types. (Behind the nightly only `i128`
+  feature.)
+* [FEATURE #72](https://github.com/BurntSushi/byteorder/issues/72):
+  Add "panics" and "errors" sections for each relevant public API item.
+* [FEATURE #74](https://github.com/BurntSushi/byteorder/issues/74):
+  Add CI badges to Cargo.toml.
+* [FEATURE #75](https://github.com/BurntSushi/byteorder/issues/75):
+  Add more examples to public API items.
+* Add 24-bit read/write methods.
+* Add `BE` and `LE` type aliases for `BigEndian` and `LittleEndian`,
+  respectively.
+
+Bug fixes:
+
+* [BUG #68](https://github.com/BurntSushi/byteorder/issues/68):
+  Panic in {BigEndian,LittleEndian}::default.
+* [BUG #69](https://github.com/BurntSushi/byteorder/issues/69):
+  Seal the `ByteOrder` trait to prevent out-of-crate implementations.
+* [BUG #71](https://github.com/BurntSushi/byteorder/issues/71):
+  Guarantee that the results of `read_f32`/`read_f64` are always defined.
+* [BUG #73](https://github.com/BurntSushi/byteorder/issues/73):
+  Add crates.io categories.
+* [BUG #77](https://github.com/BurntSushi/byteorder/issues/77):
+  Add `html_root` doc attribute.
diff --git a/third_party/rust/byteorder-1.0.0/COPYING b/third_party/rust/byteorder-1.1.0/COPYING
similarity index 100%
rename from third_party/rust/byteorder-1.0.0/COPYING
rename to third_party/rust/byteorder-1.1.0/COPYING
diff --git a/third_party/rust/byteorder-1.1.0/Cargo.toml b/third_party/rust/byteorder-1.1.0/Cargo.toml
new file mode 100644
index 000000000000..424fad8bff62
--- /dev/null
+++ b/third_party/rust/byteorder-1.1.0/Cargo.toml
@@ -0,0 +1,44 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "byteorder"
+version = "1.1.0"
+authors = ["Andrew Gallant <jamslam@gmail.com>"]
+description = "Library for reading/writing numbers in big-endian and little-endian."
+homepage = "https://github.com/BurntSushi/byteorder"
+documentation = "https://docs.rs/byteorder"
+readme = "README.md"
+keywords = ["byte", "endian", "big-endian", "little-endian", "binary"]
+categories = ["encoding", "parsing"]
+license = "Unlicense/MIT"
+repository = "https://github.com/BurntSushi/byteorder"
+[profile.bench]
+opt-level = 3
+
+[lib]
+name = "byteorder"
+bench = false
+[dev-dependencies.rand]
+version = "0.3"
+
+[dev-dependencies.quickcheck]
+version = "0.4"
+default-features = false
+
+[features]
+default = ["std"]
+i128 = []
+std = []
+[badges.travis-ci]
+branch = "master"
+repository = "https://github.com/BurntSushi/byteorder"
diff --git a/third_party/rust/byteorder-1.0.0/LICENSE-MIT b/third_party/rust/byteorder-1.1.0/LICENSE-MIT
similarity index 100%
rename from third_party/rust/byteorder-1.0.0/LICENSE-MIT
rename to third_party/rust/byteorder-1.1.0/LICENSE-MIT
diff --git a/third_party/rust/byteorder-1.0.0/README.md b/third_party/rust/byteorder-1.1.0/README.md
similarity index 100%
rename from third_party/rust/byteorder-1.0.0/README.md
rename to third_party/rust/byteorder-1.1.0/README.md
diff --git a/third_party/rust/byteorder-1.0.0/UNLICENSE b/third_party/rust/byteorder-1.1.0/UNLICENSE
similarity index 100%
rename from third_party/rust/byteorder-1.0.0/UNLICENSE
rename to third_party/rust/byteorder-1.1.0/UNLICENSE
diff --git a/third_party/rust/byteorder-1.1.0/benches/bench.rs b/third_party/rust/byteorder-1.1.0/benches/bench.rs
new file mode 100644
index 000000000000..845e489f8869
--- /dev/null
+++ b/third_party/rust/byteorder-1.1.0/benches/bench.rs
@@ -0,0 +1,320 @@
+#![cfg_attr(feature = "i128", feature(i128))]
+#![feature(test)]
+
+extern crate byteorder;
+extern crate rand;
+extern crate test;
+
+macro_rules! bench_num {
+    ($name:ident, $read:ident, $bytes:expr, $data:expr) => (
+        mod $name {
+            use byteorder::{ByteOrder, BigEndian, NativeEndian, LittleEndian};
+            use super::test::Bencher;
+            use super::test::black_box as bb;
+
+            const NITER: usize = 100_000;
+
+            #[bench]
+            fn read_big_endian(b: &mut Bencher) {
+                let buf = $data;
+                b.iter(|| {
+                    for _ in 0..NITER {
+                        bb(BigEndian::$read(&buf, $bytes));
+                    }
+                });
+            }
+
+            #[bench]
+            fn read_little_endian(b: &mut Bencher) {
+                let buf = $data;
+                b.iter(|| {
+                    for _ in 0..NITER {
+                        bb(LittleEndian::$read(&buf, $bytes));
+                    }
+                });
+            }
+
+            #[bench]
+            fn read_native_endian(b: &mut Bencher) {
+                let buf = $data;
+                b.iter(|| {
+                    for _ in 0..NITER {
+                        bb(NativeEndian::$read(&buf, $bytes));
+                    }
+                });
+            }
+        }
+    );
+    ($ty:ident, $max:ident,
+     $read:ident, $write:ident, $size:expr, $data:expr) => (
+        mod $ty {
+            use std::$ty;
+            use byteorder::{ByteOrder, BigEndian, NativeEndian, LittleEndian};
+            use super::test::Bencher;
+            use super::test::black_box as bb;
+
+            const NITER: usize = 100_000;
+
+            #[bench]
+            fn read_big_endian(b: &mut Bencher) {
+                let buf = $data;
+                b.iter(|| {
+                    for _ in 0..NITER {
+                        bb(BigEndian::$read(&buf));
+                    }
+                });
+            }
+
+            #[bench]
+            fn read_little_endian(b: &mut Bencher) {
+                let buf = $data;
+                b.iter(|| {
+                    for _ in 0..NITER {
+                        bb(LittleEndian::$read(&buf));
+                    }
+                });
+            }
+
+            #[bench]
+            fn read_native_endian(b: &mut Bencher) {
+                let buf = $data;
+                b.iter(|| {
+                    for _ in 0..NITER {
+                        bb(NativeEndian::$read(&buf));
+                    }
+                });
+            }
+
+            #[bench]
+            fn write_big_endian(b: &mut Bencher) {
+                let mut buf = $data;
+                let n = $ty::$max;
+                b.iter(|| {
+                    for _ in 0..NITER {
+                        bb(BigEndian::$write(&mut buf, n));
+                    }
+                });
+            }
+
+            #[bench]
+            fn write_little_endian(b: &mut Bencher) {
+                let mut buf = $data;
+                let n = $ty::$max;
+                b.iter(|| {
+                    for _ in 0..NITER {
+                        bb(LittleEndian::$write(&mut buf, n));
+                    }
+                });
+            }
+
+            #[bench]
+            fn write_native_endian(b: &mut Bencher) {
+                let mut buf = $data;
+                let n = $ty::$max;
+                b.iter(|| {
+                    for _ in 0..NITER {
+                        bb(NativeEndian::$write(&mut buf, n));
+                    }
+                });
+            }
+        }
+    );
+}
+
+bench_num!(u16, MAX, read_u16, write_u16, 2, [1, 2]);
+bench_num!(i16, MAX, read_i16, write_i16, 2, [1, 2]);
+bench_num!(u32, MAX, read_u32, write_u32, 4, [1, 2, 3, 4]);
+bench_num!(i32, MAX, read_i32, write_i32, 4, [1, 2, 3, 4]);
+bench_num!(u64, MAX, read_u64, write_u64, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
+bench_num!(i64, MAX, read_i64, write_i64, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
+bench_num!(f32, MAX, read_f32, write_f32, 4, [1, 2, 3, 4]);
+bench_num!(f64, MAX, read_f64, write_f64, 8,
+           [1, 2, 3, 4, 5, 6, 7, 8]);
+
+bench_num!(uint_1, read_uint, 1, [1]);
+bench_num!(uint_2, read_uint, 2, [1, 2]);
+bench_num!(uint_3, read_uint, 3, [1, 2, 3]);
+bench_num!(uint_4, read_uint, 4, [1, 2, 3, 4]);
+bench_num!(uint_5, read_uint, 5, [1, 2, 3, 4, 5]);
+bench_num!(uint_6, read_uint, 6, [1, 2, 3, 4, 5, 6]);
+bench_num!(uint_7, read_uint, 7, [1, 2, 3, 4, 5, 6, 7]);
+bench_num!(uint_8, read_uint, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
+
+bench_num!(int_1, read_int, 1, [1]);
+bench_num!(int_2, read_int, 2, [1, 2]);
+bench_num!(int_3, read_int, 3, [1, 2, 3]);
+bench_num!(int_4, read_int, 4, [1, 2, 3, 4]);
+bench_num!(int_5, read_int, 5, [1, 2, 3, 4, 5]);
+bench_num!(int_6, read_int, 6, [1, 2, 3, 4, 5, 6]);
+bench_num!(int_7, read_int, 7, [1, 2, 3, 4, 5, 6, 7]);
+bench_num!(int_8, read_int, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
+
+#[cfg(feature = "i128")]
+bench_num!(u128, MAX, read_u128, write_u128,
+    16, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
+#[cfg(feature = "i128")]
+bench_num!(i128, MAX, read_i128, write_i128,
+    16, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
+
+#[cfg(feature = "i128")]
+bench_num!(uint128_1, read_uint128,
+    1, [1]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_2, read_uint128,
+    2, [1, 2]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_3, read_uint128,
+    3, [1, 2, 3]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_4, read_uint128,
+    4, [1, 2, 3, 4]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_5, read_uint128,
+    5, [1, 2, 3, 4, 5]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_6, read_uint128,
+    6, [1, 2, 3, 4, 5, 6]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_7, read_uint128,
+    7, [1, 2, 3, 4, 5, 6, 7]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_8, read_uint128,
+    8, [1, 2, 3, 4, 5, 6, 7, 8]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_9, read_uint128,
+    9, [1, 2, 3, 4, 5, 6, 7, 8, 9]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_10, read_uint128,
+    10, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_11, read_uint128,
+    11, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_12, read_uint128,
+    12, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_13, read_uint128,
+    13, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_14, read_uint128,
+    14, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_15, read_uint128,
+    15, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]);
+#[cfg(feature = "i128")]
+bench_num!(uint128_16, read_uint128,
+    16, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
+
+#[cfg(feature = "i128")]
+bench_num!(int128_1, read_int128,
+    1, [1]);
+#[cfg(feature = "i128")]
+bench_num!(int128_2, read_int128,
+    2, [1, 2]);
+#[cfg(feature = "i128")]
+bench_num!(int128_3, read_int128,
+    3, [1, 2, 3]);
+#[cfg(feature = "i128")]
+bench_num!(int128_4, read_int128,
+    4, [1, 2, 3, 4]);
+#[cfg(feature = "i128")]
+bench_num!(int128_5, read_int128,
+    5, [1, 2, 3, 4, 5]);
+#[cfg(feature = "i128")]
+bench_num!(int128_6, read_int128,
+    6, [1, 2, 3, 4, 5, 6]);
+#[cfg(feature = "i128")]
+bench_num!(int128_7, read_int128,
+    7, [1, 2, 3, 4, 5, 6, 7]);
+#[cfg(feature = "i128")]
+bench_num!(int128_8, read_int128,
+    8, [1, 2, 3, 4, 5, 6, 7, 8]);
+#[cfg(feature = "i128")]
+bench_num!(int128_9, read_int128,
+    9, [1, 2, 3, 4, 5, 6, 7, 8, 9]);
+#[cfg(feature = "i128")]
+bench_num!(int128_10, read_int128,
+    10, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+#[cfg(feature = "i128")]
+bench_num!(int128_11, read_int128,
+    11, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
+#[cfg(feature = "i128")]
+bench_num!(int128_12, read_int128,
+    12, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
+#[cfg(feature = "i128")]
+bench_num!(int128_13, read_int128,
+    13, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
+#[cfg(feature = "i128")]
+bench_num!(int128_14, read_int128,
+    14, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]);
+#[cfg(feature = "i128")]
+bench_num!(int128_15, read_int128,
+    15, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]);
+#[cfg(feature = "i128")]
+bench_num!(int128_16, read_int128,
+    16, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
+
+
+macro_rules! bench_slice {
+    ($name:ident, $numty:ty, $read:ident, $write:ident) => {
+        mod $name {
+            use std::mem::size_of;
+
+            use byteorder::{ByteOrder, BigEndian, LittleEndian};
+            use rand::{self, Rng};
+            use test::Bencher;
+
+            #[bench]
+            fn read_big_endian(b: &mut Bencher) {
+                let mut numbers: Vec<$numty> =
+                    rand::thread_rng().gen_iter().take(100000).collect();
+                let mut bytes = vec![0; numbers.len() * size_of::<$numty>()];
+                BigEndian::$write(&numbers, &mut bytes);
+
+                b.bytes = bytes.len() as u64;
+                b.iter(|| {
+                    BigEndian::$read(&bytes, &mut numbers);
+                });
+            }
+
+            #[bench]
+            fn read_little_endian(b: &mut Bencher) {
+                let mut numbers: Vec<$numty> =
+                    rand::thread_rng().gen_iter().take(100000).collect();
+                let mut bytes = vec![0; numbers.len() * size_of::<$numty>()];
+                LittleEndian::$write(&numbers, &mut bytes);
+
+                b.bytes = bytes.len() as u64;
+                b.iter(|| {
+                    LittleEndian::$read(&bytes, &mut numbers);
+                });
+            }
+
+            #[bench]
+            fn write_big_endian(b: &mut Bencher) {
+                let numbers: Vec<$numty> =
+                    rand::thread_rng().gen_iter().take(100000).collect();
+                let mut bytes = vec![0; numbers.len() * size_of::<$numty>()];
+
+                b.bytes = bytes.len() as u64;
+                b.iter(|| {
+                    BigEndian::$write(&numbers, &mut bytes);
+                });
+            }
+
+            #[bench]
+            fn write_little_endian(b: &mut Bencher) {
+                let numbers: Vec<$numty> =
+                    rand::thread_rng().gen_iter().take(100000).collect();
+                let mut bytes = vec![0; numbers.len() * size_of::<$numty>()];
+
+                b.bytes = bytes.len() as u64;
+                b.iter(|| {
+                    LittleEndian::$write(&numbers, &mut bytes);
+                });
+            }
+        }
+    }
+}
+
+bench_slice!(slice_u64, u64, read_u64_into, write_u64_into);
diff --git a/third_party/rust/byteorder-1.1.0/src/io.rs b/third_party/rust/byteorder-1.1.0/src/io.rs
new file mode 100644
index 000000000000..208596ab18dd
--- /dev/null
+++ b/third_party/rust/byteorder-1.1.0/src/io.rs
@@ -0,0 +1,1189 @@
+use std::io::{self, Result};
+use std::slice;
+// use std::mem::transmute;
+
+use ByteOrder;
+
+/// Extends `Read` with methods for reading numbers. (For `std::io`.)
+///
+/// Most of the methods defined here have an unconstrained type parameter that
+/// must be explicitly instantiated. Typically, it is instantiated with either
+/// the `BigEndian` or `LittleEndian` types defined in this crate.
+///
+/// # Examples
+///
+/// Read unsigned 16 bit big-endian integers from a `Read`:
+///
+/// ```rust
+/// use std::io::Cursor;
+/// use byteorder::{BigEndian, ReadBytesExt};
+///
+/// let mut rdr = Cursor::new(vec![2, 5, 3, 0]);
+/// assert_eq!(517, rdr.read_u16::<BigEndian>().unwrap());
+/// assert_eq!(768, rdr.read_u16::<BigEndian>().unwrap());
+/// ```
+pub trait ReadBytesExt: io::Read {
+    /// Reads an unsigned 8 bit integer from the underlying reader.
+    ///
+    /// Note that since this reads a single byte, no byte order conversions
+    /// are used. It is included for completeness.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read unsigned 8 bit integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![2, 5]);
+    /// assert_eq!(2, rdr.read_u8().unwrap());
+    /// assert_eq!(5, rdr.read_u8().unwrap());
+    /// ```
+    #[inline]
+    fn read_u8(&mut self) -> Result<u8> {
+        let mut buf = [0; 1];
+        try!(self.read_exact(&mut buf));
+        Ok(buf[0])
+    }
+
+    /// Reads a signed 8 bit integer from the underlying reader.
+    ///
+    /// Note that since this reads a single byte, no byte order conversions
+    /// are used. It is included for completeness.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read unsigned 8 bit integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0x02, 0xfb]);
+    /// assert_eq!(2, rdr.read_i8().unwrap());
+    /// assert_eq!(-5, rdr.read_i8().unwrap());
+    /// ```
+    #[inline]
+    fn read_i8(&mut self) -> Result<i8> {
+        let mut buf = [0; 1];
+        try!(self.read_exact(&mut buf));
+        Ok(buf[0] as i8)
+    }
+
+    /// Reads an unsigned 16 bit integer from the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read unsigned 16 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![2, 5, 3, 0]);
+    /// assert_eq!(517, rdr.read_u16::<BigEndian>().unwrap());
+    /// assert_eq!(768, rdr.read_u16::<BigEndian>().unwrap());
+    /// ```
+    #[inline]
+    fn read_u16<T: ByteOrder>(&mut self) -> Result<u16> {
+        let mut buf = [0; 2];
+        try!(self.read_exact(&mut buf));
+        Ok(T::read_u16(&buf))
+    }
+
+    /// Reads a signed 16 bit integer from the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read signed 16 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0x00, 0xc1, 0xff, 0x7c]);
+    /// assert_eq!(193, rdr.read_i16::<BigEndian>().unwrap());
+    /// assert_eq!(-132, rdr.read_i16::<BigEndian>().unwrap());
+    /// ```
+    #[inline]
+    fn read_i16<T: ByteOrder>(&mut self) -> Result<i16> {
+        let mut buf = [0; 2];
+        try!(self.read_exact(&mut buf));
+        Ok(T::read_i16(&buf))
+    }
+
+    /// Reads an unsigned 24 bit integer from the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read unsigned 24 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0x00, 0x01, 0x0b]);
+    /// assert_eq!(267, rdr.read_u24::<BigEndian>().unwrap());
+    /// ```
+    #[inline]
+    fn read_u24<T: ByteOrder>(&mut self) -> Result<u32> {
+        let mut buf = [0; 3];
+        try!(self.read_exact(&mut buf));
+        Ok(T::read_u24(&buf))
+    }
+
+    /// Reads a signed 24 bit integer from the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read signed 24 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0xff, 0x7a, 0x33]);
+    /// assert_eq!(-34253, rdr.read_i24::<BigEndian>().unwrap());
+    /// ```
+    #[inline]
+    fn read_i24<T: ByteOrder>(&mut self) -> Result<i32> {
+        let mut buf = [0; 3];
+        try!(self.read_exact(&mut buf));
+        Ok(T::read_i24(&buf))
+    }
+
+    /// Reads an unsigned 32 bit integer from the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read unsigned 32 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0x00, 0x00, 0x01, 0x0b]);
+    /// assert_eq!(267, rdr.read_u32::<BigEndian>().unwrap());
+    /// ```
+    #[inline]
+    fn read_u32<T: ByteOrder>(&mut self) -> Result<u32> {
+        let mut buf = [0; 4];
+        try!(self.read_exact(&mut buf));
+        Ok(T::read_u32(&buf))
+    }
+
+    /// Reads a signed 32 bit integer from the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read signed 32 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0xff, 0xff, 0x7a, 0x33]);
+    /// assert_eq!(-34253, rdr.read_i32::<BigEndian>().unwrap());
+    /// ```
+    #[inline]
+    fn read_i32<T: ByteOrder>(&mut self) -> Result<i32> {
+        let mut buf = [0; 4];
+        try!(self.read_exact(&mut buf));
+        Ok(T::read_i32(&buf))
+    }
+
+    /// Reads an unsigned 64 bit integer from the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read an unsigned 64 bit big-endian integer from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0x00, 0x03, 0x43, 0x95, 0x4d, 0x60, 0x86, 0x83]);
+    /// assert_eq!(918733457491587, rdr.read_u64::<BigEndian>().unwrap());
+    /// ```
+    #[inline]
+    fn read_u64<T: ByteOrder>(&mut self) -> Result<u64> {
+        let mut buf = [0; 8];
+        try!(self.read_exact(&mut buf));
+        Ok(T::read_u64(&buf))
+    }
+
+    /// Reads a signed 64 bit integer from the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a signed 64 bit big-endian integer from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0x80, 0, 0, 0, 0, 0, 0, 0]);
+    /// assert_eq!(i64::min_value(), rdr.read_i64::<BigEndian>().unwrap());
+    /// ```
+    #[inline]
+    fn read_i64<T: ByteOrder>(&mut self) -> Result<i64> {
+        let mut buf = [0; 8];
+        try!(self.read_exact(&mut buf));
+        Ok(T::read_i64(&buf))
+    }
+
+    /// Reads an unsigned 128 bit integer from the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read an unsigned 128 bit big-endian integer from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![
+    ///     0x00, 0x03, 0x43, 0x95, 0x4d, 0x60, 0x86, 0x83,
+    ///     0x00, 0x03, 0x43, 0x95, 0x4d, 0x60, 0x86, 0x83
+    /// ]);
+    /// assert_eq!(16947640962301618749969007319746179, rdr.read_u128::<BigEndian>().unwrap());
+    /// ```
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_u128<T: ByteOrder>(&mut self) -> Result<u128> {
+        let mut buf = [0; 16];
+        try!(self.read_exact(&mut buf));
+        Ok(T::read_u128(&buf))
+    }
+
+    /// Reads a signed 128 bit integer from the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a signed 128 bit big-endian integer from a `Read`:
+    ///
+    /// ```rust
+    /// #![feature(i128_type)]
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    /// assert_eq!(i128::min_value(), rdr.read_i128::<BigEndian>().unwrap());
+    /// ```
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_i128<T: ByteOrder>(&mut self) -> Result<i128> {
+        let mut buf = [0; 16];
+        try!(self.read_exact(&mut buf));
+        Ok(T::read_i128(&buf))
+    }
+
+    /// Reads an unsigned n-bytes integer from the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read an unsigned n-byte big-endian integer from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0x80, 0x74, 0xfa]);
+    /// assert_eq!(8418554, rdr.read_uint::<BigEndian>(3).unwrap());
+    #[inline]
+    fn read_uint<T: ByteOrder>(&mut self, nbytes: usize) -> Result<u64> {
+        let mut buf = [0; 8];
+        try!(self.read_exact(&mut buf[..nbytes]));
+        Ok(T::read_uint(&buf[..nbytes], nbytes))
+    }
+
+    /// Reads a signed n-bytes integer from the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read an unsigned n-byte big-endian integer from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0xc1, 0xff, 0x7c]);
+    /// assert_eq!(-4063364, rdr.read_int::<BigEndian>(3).unwrap());
+    #[inline]
+    fn read_int<T: ByteOrder>(&mut self, nbytes: usize) -> Result<i64> {
+        let mut buf = [0; 8];
+        try!(self.read_exact(&mut buf[..nbytes]));
+        Ok(T::read_int(&buf[..nbytes], nbytes))
+    }
+
+    /// Reads an unsigned n-bytes integer from the underlying reader.
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_uint128<T: ByteOrder>(&mut self, nbytes: usize) -> Result<u128> {
+        let mut buf = [0; 16];
+        try!(self.read_exact(&mut buf[..nbytes]));
+        Ok(T::read_uint128(&buf[..nbytes], nbytes))
+    }
+
+    /// Reads a signed n-bytes integer from the underlying reader.
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_int128<T: ByteOrder>(&mut self, nbytes: usize) -> Result<i128> {
+        let mut buf = [0; 16];
+        try!(self.read_exact(&mut buf[..nbytes]));
+        Ok(T::read_int128(&buf[..nbytes], nbytes))
+    }
+
+    /// Reads a IEEE754 single-precision (4 bytes) floating point number from
+    /// the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a big-endian single-precision floating point number from a `Read`:
+    ///
+    /// ```rust
+    /// use std::f32;
+    /// use std::io::Cursor;
+    ///
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![
+    ///     0x40, 0x49, 0x0f, 0xdb,
+    /// ]);
+    /// assert_eq!(f32::consts::PI, rdr.read_f32::<BigEndian>().unwrap());
+    /// ```
+    #[inline]
+    fn read_f32<T: ByteOrder>(&mut self) -> Result<f32> {
+        let mut buf = [0; 4];
+        try!(self.read_exact(&mut buf));
+        Ok(T::read_f32(&buf))
+    }
+
+    /// Reads a IEEE754 double-precision (8 bytes) floating point number from
+    /// the underlying reader.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a big-endian double-precision floating point number from a `Read`:
+    ///
+    /// ```rust
+    /// use std::f64;
+    /// use std::io::Cursor;
+    ///
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![
+    ///     0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18,
+    /// ]);
+    /// assert_eq!(f64::consts::PI, rdr.read_f64::<BigEndian>().unwrap());
+    /// ```
+    #[inline]
+    fn read_f64<T: ByteOrder>(&mut self) -> Result<f64> {
+        let mut buf = [0; 8];
+        try!(self.read_exact(&mut buf));
+        Ok(T::read_f64(&buf))
+    }
+
+    /// Reads a sequence of unsigned 16 bit integers from the underlying
+    /// reader.
+    ///
+    /// The given buffer is either filled completely or an error is returned.
+    /// If an error is returned, the contents of `dst` are unspecified.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a sequence of unsigned 16 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![2, 5, 3, 0]);
+    /// let mut dst = [0; 2];
+    /// rdr.read_u16_into::<BigEndian>(&mut dst).unwrap();
+    /// assert_eq!([517, 768], dst);
+    /// ```
+    #[inline]
+    fn read_u16_into<T: ByteOrder>(&mut self, dst: &mut [u16]) -> Result<()> {
+        {
+            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            try!(self.read_exact(buf));
+        }
+        T::from_slice_u16(dst);
+        Ok(())
+    }
+
+    /// Reads a sequence of unsigned 32 bit integers from the underlying
+    /// reader.
+    ///
+    /// The given buffer is either filled completely or an error is returned.
+    /// If an error is returned, the contents of `dst` are unspecified.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a sequence of unsigned 32 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0, 0, 2, 5, 0, 0, 3, 0]);
+    /// let mut dst = [0; 2];
+    /// rdr.read_u32_into::<BigEndian>(&mut dst).unwrap();
+    /// assert_eq!([517, 768], dst);
+    /// ```
+    #[inline]
+    fn read_u32_into<T: ByteOrder>(&mut self, dst: &mut [u32]) -> Result<()> {
+        {
+            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            try!(self.read_exact(buf));
+        }
+        T::from_slice_u32(dst);
+        Ok(())
+    }
+
+    /// Reads a sequence of unsigned 64 bit integers from the underlying
+    /// reader.
+    ///
+    /// The given buffer is either filled completely or an error is returned.
+    /// If an error is returned, the contents of `dst` are unspecified.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a sequence of unsigned 64 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![
+    ///     0, 0, 0, 0, 0, 0, 2, 5,
+    ///     0, 0, 0, 0, 0, 0, 3, 0,
+    /// ]);
+    /// let mut dst = [0; 2];
+    /// rdr.read_u64_into::<BigEndian>(&mut dst).unwrap();
+    /// assert_eq!([517, 768], dst);
+    /// ```
+    #[inline]
+    fn read_u64_into<T: ByteOrder>(&mut self, dst: &mut [u64]) -> Result<()> {
+        {
+            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            try!(self.read_exact(buf));
+        }
+        T::from_slice_u64(dst);
+        Ok(())
+    }
+
+    /// Reads a sequence of unsigned 128 bit integers from the underlying
+    /// reader.
+    ///
+    /// The given buffer is either filled completely or an error is returned.
+    /// If an error is returned, the contents of `dst` are unspecified.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a sequence of unsigned 128 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![
+    ///     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 5,
+    ///     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0,
+    /// ]);
+    /// let mut dst = [0; 2];
+    /// rdr.read_u128_into::<BigEndian>(&mut dst).unwrap();
+    /// assert_eq!([517, 768], dst);
+    /// ```
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_u128_into<T: ByteOrder>(
+        &mut self,
+        dst: &mut [u128],
+    ) -> Result<()> {
+        {
+            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            try!(self.read_exact(buf));
+        }
+        T::from_slice_u128(dst);
+        Ok(())
+    }
+
+    /// Reads a sequence of signed 16 bit integers from the underlying
+    /// reader.
+    ///
+    /// The given buffer is either filled completely or an error is returned.
+    /// If an error is returned, the contents of `dst` are unspecified.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a sequence of signed 16 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![2, 5, 3, 0]);
+    /// let mut dst = [0; 2];
+    /// rdr.read_i16_into::<BigEndian>(&mut dst).unwrap();
+    /// assert_eq!([517, 768], dst);
+    /// ```
+    #[inline]
+    fn read_i16_into<T: ByteOrder>(&mut self, dst: &mut [i16]) -> Result<()> {
+        {
+            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            try!(self.read_exact(buf));
+        }
+        T::from_slice_i16(dst);
+        Ok(())
+    }
+
+    /// Reads a sequence of signed 32 bit integers from the underlying
+    /// reader.
+    ///
+    /// The given buffer is either filled completely or an error is returned.
+    /// If an error is returned, the contents of `dst` are unspecified.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a sequence of signed 32 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![0, 0, 2, 5, 0, 0, 3, 0]);
+    /// let mut dst = [0; 2];
+    /// rdr.read_i32_into::<BigEndian>(&mut dst).unwrap();
+    /// assert_eq!([517, 768], dst);
+    /// ```
+    #[inline]
+    fn read_i32_into<T: ByteOrder>(&mut self, dst: &mut [i32]) -> Result<()> {
+        {
+            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            try!(self.read_exact(buf));
+        }
+        T::from_slice_i32(dst);
+        Ok(())
+    }
+
+    /// Reads a sequence of signed 64 bit integers from the underlying
+    /// reader.
+    ///
+    /// The given buffer is either filled completely or an error is returned.
+    /// If an error is returned, the contents of `dst` are unspecified.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a sequence of signed 64 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![
+    ///     0, 0, 0, 0, 0, 0, 2, 5,
+    ///     0, 0, 0, 0, 0, 0, 3, 0,
+    /// ]);
+    /// let mut dst = [0; 2];
+    /// rdr.read_i64_into::<BigEndian>(&mut dst).unwrap();
+    /// assert_eq!([517, 768], dst);
+    /// ```
+    #[inline]
+    fn read_i64_into<T: ByteOrder>(&mut self, dst: &mut [i64]) -> Result<()> {
+        {
+            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            try!(self.read_exact(buf));
+        }
+        T::from_slice_i64(dst);
+        Ok(())
+    }
+
+    /// Reads a sequence of signed 128 bit integers from the underlying
+    /// reader.
+    ///
+    /// The given buffer is either filled completely or an error is returned.
+    /// If an error is returned, the contents of `dst` are unspecified.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a sequence of signed 128 bit big-endian integers from a `Read`:
+    ///
+    /// ```rust
+    /// use std::io::Cursor;
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![
+    ///     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 5,
+    ///     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0,
+    /// ]);
+    /// let mut dst = [0; 2];
+    /// rdr.read_i128_into::<BigEndian>(&mut dst).unwrap();
+    /// assert_eq!([517, 768], dst);
+    /// ```
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_i128_into<T: ByteOrder>(
+        &mut self,
+        dst: &mut [i128],
+    ) -> Result<()> {
+        {
+            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            try!(self.read_exact(buf));
+        }
+        T::from_slice_i128(dst);
+        Ok(())
+    }
+
+    /// Reads a sequence of IEEE754 single-precision (4 bytes) floating
+    /// point numbers from the underlying reader.
+    ///
+    /// The given buffer is either filled completely or an error is returned.
+    /// If an error is returned, the contents of `dst` are unspecified.
+    ///
+    /// # Safety
+    ///
+    /// This method is unsafe because there are no guarantees made about the
+    /// floating point values. In particular, this method does not check for
+    /// signaling NaNs, which may result in undefined behavior.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a sequence of big-endian single-precision floating point number
+    /// from a `Read`:
+    ///
+    /// ```rust
+    /// use std::f32;
+    /// use std::io::Cursor;
+    ///
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![
+    ///     0x40, 0x49, 0x0f, 0xdb,
+    ///     0x3f, 0x80, 0x00, 0x00,
+    /// ]);
+    /// let mut dst = [0.0; 2];
+    /// unsafe {
+    ///     rdr.read_f32_into_unchecked::<BigEndian>(&mut dst).unwrap();
+    /// }
+    /// assert_eq!([f32::consts::PI, 1.0], dst);
+    /// ```
+    #[inline]
+    unsafe fn read_f32_into_unchecked<T: ByteOrder>(
+        &mut self,
+        dst: &mut [f32],
+    ) -> Result<()> {
+        {
+            let mut buf = slice_to_u8_mut(dst);
+            try!(self.read_exact(buf));
+        }
+        T::from_slice_f32(dst);
+        Ok(())
+    }
+
+    /// Reads a sequence of IEEE754 double-precision (8 bytes) floating
+    /// point numbers from the underlying reader.
+    ///
+    /// The given buffer is either filled completely or an error is returned.
+    /// If an error is returned, the contents of `dst` are unspecified.
+    ///
+    /// # Safety
+    ///
+    /// This method is unsafe because there are no guarantees made about the
+    /// floating point values. In particular, this method does not check for
+    /// signaling NaNs, which may result in undefined behavior.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a sequence of big-endian single-precision floating point number
+    /// from a `Read`:
+    ///
+    /// ```rust
+    /// use std::f64;
+    /// use std::io::Cursor;
+    ///
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![
+    ///     0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18,
+    ///     0x3f, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    /// ]);
+    /// let mut dst = [0.0; 2];
+    /// unsafe {
+    ///     rdr.read_f64_into_unchecked::<BigEndian>(&mut dst).unwrap();
+    /// }
+    /// assert_eq!([f64::consts::PI, 1.0], dst);
+    /// ```
+    #[inline]
+    unsafe fn read_f64_into_unchecked<T: ByteOrder>(
+        &mut self,
+        dst: &mut [f64],
+    ) -> Result<()> {
+        {
+            let mut buf = slice_to_u8_mut(dst);
+            try!(self.read_exact(buf));
+        }
+        T::from_slice_f64(dst);
+        Ok(())
+    }
+}
+
+/// All types that implement `Read` get methods defined in `ReadBytesExt`
+/// for free.
+impl<R: io::Read + ?Sized> ReadBytesExt for R {}
+
+/// Extends `Write` with methods for writing numbers. (For `std::io`.)
+///
+/// Most of the methods defined here have an unconstrained type parameter that
+/// must be explicitly instantiated. Typically, it is instantiated with either
+/// the `BigEndian` or `LittleEndian` types defined in this crate.
+///
+/// # Examples
+///
+/// Write unsigned 16 bit big-endian integers to a `Write`:
+///
+/// ```rust
+/// use byteorder::{BigEndian, WriteBytesExt};
+///
+/// let mut wtr = vec![];
+/// wtr.write_u16::<BigEndian>(517).unwrap();
+/// wtr.write_u16::<BigEndian>(768).unwrap();
+/// assert_eq!(wtr, vec![2, 5, 3, 0]);
+/// ```
+pub trait WriteBytesExt: io::Write {
+    /// Writes an unsigned 8 bit integer to the underlying writer.
+    ///
+    /// Note that since this writes a single byte, no byte order conversions
+    /// are used. It is included for completeness.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    #[inline]
+    fn write_u8(&mut self, n: u8) -> Result<()> {
+        self.write_all(&[n])
+    }
+
+    /// Writes a signed 8 bit integer to the underlying writer.
+    ///
+    /// Note that since this writes a single byte, no byte order conversions
+    /// are used. It is included for completeness.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    #[inline]
+    fn write_i8(&mut self, n: i8) -> Result<()> {
+        self.write_all(&[n as u8])
+    }
+
+    /// Writes an unsigned 16 bit integer to the underlying writer.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    #[inline]
+    fn write_u16<T: ByteOrder>(&mut self, n: u16) -> Result<()> {
+        let mut buf = [0; 2];
+        T::write_u16(&mut buf, n);
+        self.write_all(&buf)
+    }
+
+    /// Writes a signed 16 bit integer to the underlying writer.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    #[inline]
+    fn write_i16<T: ByteOrder>(&mut self, n: i16) -> Result<()> {
+        let mut buf = [0; 2];
+        T::write_i16(&mut buf, n);
+        self.write_all(&buf)
+    }
+
+    /// Writes an unsigned 24 bit integer to the underlying writer.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    #[inline]
+    fn write_u24<T: ByteOrder>(&mut self, n: u32) -> Result<()> {
+        let mut buf = [0; 3];
+        T::write_u24(&mut buf, n);
+        self.write_all(&buf)
+    }
+
+    /// Writes a signed 24 bit integer to the underlying writer.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    #[inline]
+    fn write_i24<T: ByteOrder>(&mut self, n: i32) -> Result<()> {
+        let mut buf = [0; 3];
+        T::write_i24(&mut buf, n);
+        self.write_all(&buf)
+    }
+
+    /// Writes an unsigned 32 bit integer to the underlying writer.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    #[inline]
+    fn write_u32<T: ByteOrder>(&mut self, n: u32) -> Result<()> {
+        let mut buf = [0; 4];
+        T::write_u32(&mut buf, n);
+        self.write_all(&buf)
+    }
+
+    /// Writes a signed 32 bit integer to the underlying writer.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    #[inline]
+    fn write_i32<T: ByteOrder>(&mut self, n: i32) -> Result<()> {
+        let mut buf = [0; 4];
+        T::write_i32(&mut buf, n);
+        self.write_all(&buf)
+    }
+
+    /// Writes an unsigned 64 bit integer to the underlying writer.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    #[inline]
+    fn write_u64<T: ByteOrder>(&mut self, n: u64) -> Result<()> {
+        let mut buf = [0; 8];
+        T::write_u64(&mut buf, n);
+        self.write_all(&buf)
+    }
+
+    /// Writes a signed 64 bit integer to the underlying writer.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    #[inline]
+    fn write_i64<T: ByteOrder>(&mut self, n: i64) -> Result<()> {
+        let mut buf = [0; 8];
+        T::write_i64(&mut buf, n);
+        self.write_all(&buf)
+    }
+
+    /// Writes an unsigned 128 bit integer to the underlying writer.
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn write_u128<T: ByteOrder>(&mut self, n: u128) -> Result<()> {
+        let mut buf = [0; 16];
+        T::write_u128(&mut buf, n);
+        self.write_all(&buf)
+    }
+
+    /// Writes a signed 128 bit integer to the underlying writer.
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn write_i128<T: ByteOrder>(&mut self, n: i128) -> Result<()> {
+        let mut buf = [0; 16];
+        T::write_i128(&mut buf, n);
+        self.write_all(&buf)
+    }
+
+    /// Writes an unsigned n-bytes integer to the underlying writer.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    ///
+    /// # Panics
+    ///
+    /// If the given integer is not representable in the given number of bytes,
+    /// this method panics. If `nbytes > 8`, this method panics.
+    #[inline]
+    fn write_uint<T: ByteOrder>(
+        &mut self,
+        n: u64,
+        nbytes: usize,
+    ) -> Result<()> {
+        let mut buf = [0; 8];
+        T::write_uint(&mut buf, n, nbytes);
+        self.write_all(&buf[0..nbytes])
+    }
+
+    /// Writes a signed n-bytes integer to the underlying writer.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    ///
+    /// # Panics
+    ///
+    /// If the given integer is not representable in the given number of bytes,
+    /// this method panics. If `nbytes > 8`, this method panics.
+    #[inline]
+    fn write_int<T: ByteOrder>(
+        &mut self,
+        n: i64,
+        nbytes: usize,
+    ) -> Result<()> {
+        let mut buf = [0; 8];
+        T::write_int(&mut buf, n, nbytes);
+        self.write_all(&buf[0..nbytes])
+    }
+
+    /// Writes an unsigned n-bytes integer to the underlying writer.
+    ///
+    /// If the given integer is not representable in the given number of bytes,
+    /// this method panics. If `nbytes > 16`, this method panics.
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn write_uint128<T: ByteOrder>(
+        &mut self,
+        n: u128,
+        nbytes: usize,
+    ) -> Result<()> {
+        let mut buf = [0; 16];
+        T::write_uint128(&mut buf, n, nbytes);
+        self.write_all(&buf[0..nbytes])
+    }
+
+    /// Writes a signed n-bytes integer to the underlying writer.
+    ///
+    /// If the given integer is not representable in the given number of bytes,
+    /// this method panics. If `nbytes > 16`, this method panics.
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn write_int128<T: ByteOrder>(
+        &mut self,
+        n: i128,
+        nbytes: usize,
+    ) -> Result<()> {
+        let mut buf = [0; 16];
+        T::write_int128(&mut buf, n, nbytes);
+        self.write_all(&buf[0..nbytes])
+    }
+
+    /// Writes a IEEE754 single-precision (4 bytes) floating point number to
+    /// the underlying writer.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Write::write_all`].
+    ///
+    /// [`Write::write_all`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_all
+    #[inline]
+    fn write_f32<T: ByteOrder>(&mut self, n: f32) -> Result<()> {
+        let mut buf = [0; 4];
+        T::write_f32(&mut buf, n);
+        self.write_all(&buf)
+    }
+
+    /// Writes a IEEE754 double-precision (8 bytes) floating point number to
+    /// the underlying writer.
+    #[inline]
+    fn write_f64<T: ByteOrder>(&mut self, n: f64) -> Result<()> {
+        let mut buf = [0; 8];
+        T::write_f64(&mut buf, n);
+        self.write_all(&buf)
+    }
+}
+
+/// All types that implement `Write` get methods defined in `WriteBytesExt`
+/// for free.
+impl<W: io::Write + ?Sized> WriteBytesExt for W {}
+
+/// Convert a slice of T (where T is plain old data) to its mutable binary
+/// representation.
+///
+/// This function is wildly unsafe because it permits arbitrary modification of
+/// the binary representation of any `Copy` type. Use with care.
+unsafe fn slice_to_u8_mut<T: Copy>(slice: &mut [T]) -> &mut [u8] {
+    use std::mem::size_of;
+
+    let len = size_of::<T>() * slice.len();
+    slice::from_raw_parts_mut(slice.as_mut_ptr() as *mut u8, len)
+}
diff --git a/third_party/rust/byteorder-1.1.0/src/lib.rs b/third_party/rust/byteorder-1.1.0/src/lib.rs
new file mode 100644
index 000000000000..b60fe7ca4c0f
--- /dev/null
+++ b/third_party/rust/byteorder-1.1.0/src/lib.rs
@@ -0,0 +1,3191 @@
+/*!
+This crate provides convenience methods for encoding and decoding numbers
+in either big-endian or little-endian order.
+
+The organization of the crate is pretty simple. A trait, `ByteOrder`, specifies
+byte conversion methods for each type of number in Rust (sans numbers that have
+a platform dependent size like `usize` and `isize`). Two types, `BigEndian`
+and `LittleEndian` implement these methods. Finally, `ReadBytesExt` and
+`WriteBytesExt` provide convenience methods available to all types that
+implement `Read` and `Write`.
+
+# Examples
+
+Read unsigned 16 bit big-endian integers from a `Read` type:
+
+```rust
+use std::io::Cursor;
+use byteorder::{BigEndian, ReadBytesExt};
+
+let mut rdr = Cursor::new(vec![2, 5, 3, 0]);
+// Note that we use type parameters to indicate which kind of byte order
+// we want!
+assert_eq!(517, rdr.read_u16::<BigEndian>().unwrap());
+assert_eq!(768, rdr.read_u16::<BigEndian>().unwrap());
+```
+
+Write unsigned 16 bit little-endian integers to a `Write` type:
+
+```rust
+use byteorder::{LittleEndian, WriteBytesExt};
+
+let mut wtr = vec![];
+wtr.write_u16::<LittleEndian>(517).unwrap();
+wtr.write_u16::<LittleEndian>(768).unwrap();
+assert_eq!(wtr, vec![5, 2, 0, 3]);
+```
+*/
+
+#![deny(missing_docs)]
+#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(feature = "i128", feature(i128_type))]
+#![cfg_attr(all(feature = "i128", test), feature(i128))]
+#![doc(html_root_url = "https://docs.rs/byteorder/1.0.0")]
+
+#[cfg(feature = "std")]
+extern crate core;
+
+use core::fmt::Debug;
+use core::hash::Hash;
+use core::mem::transmute;
+use core::ptr::copy_nonoverlapping;
+
+#[cfg(feature = "std")]
+pub use io::{ReadBytesExt, WriteBytesExt};
+
+#[cfg(feature = "std")]
+mod io;
+
+#[inline]
+fn extend_sign(val: u64, nbytes: usize) -> i64 {
+    let shift = (8 - nbytes) * 8;
+    (val << shift) as i64 >> shift
+}
+
+#[cfg(feature = "i128")]
+#[inline]
+fn extend_sign128(val: u128, nbytes: usize) -> i128 {
+    let shift = (16 - nbytes) * 8;
+    (val << shift) as i128 >> shift
+}
+
+#[inline]
+fn unextend_sign(val: i64, nbytes: usize) -> u64 {
+    let shift = (8 - nbytes) * 8;
+    (val << shift) as u64 >> shift
+}
+
+#[cfg(feature = "i128")]
+#[inline]
+fn unextend_sign128(val: i128, nbytes: usize) -> u128 {
+    let shift = (16 - nbytes) * 8;
+    (val << shift) as u128 >> shift
+}
+
+#[inline]
+fn pack_size(n: u64) -> usize {
+    if n < 1 << 8 {
+        1
+    } else if n < 1 << 16 {
+        2
+    } else if n < 1 << 24 {
+        3
+    } else if n < 1 << 32 {
+        4
+    } else if n < 1 << 40 {
+        5
+    } else if n < 1 << 48 {
+        6
+    } else if n < 1 << 56 {
+        7
+    } else {
+        8
+    }
+}
+
+#[cfg(feature = "i128")]
+#[inline]
+fn pack_size128(n: u128) -> usize {
+    if n < 1 << 8 {
+        1
+    } else if n < 1 << 16 {
+        2
+    } else if n < 1 << 24 {
+        3
+    } else if n < 1 << 32 {
+        4
+    } else if n < 1 << 40 {
+        5
+    } else if n < 1 << 48 {
+        6
+    } else if n < 1 << 56 {
+        7
+    } else if n < 1 << 64 {
+        8
+    } else if n < 1 << 72 {
+        9
+    } else if n < 1 << 80 {
+        10
+    } else if n < 1 << 88 {
+        11
+    } else if n < 1 << 96 {
+        12
+    } else if n < 1 << 104 {
+        13
+    } else if n < 1 << 112 {
+        14
+    } else if n < 1 << 120 {
+        15
+    } else {
+        16
+    }
+}
+
+mod private {
+    /// Sealed stops crates other than byteorder from implementing any traits
+    /// that use it.
+    pub trait Sealed{}
+    impl Sealed for super::LittleEndian {}
+    impl Sealed for super::BigEndian {}
+}
+
+/// ByteOrder describes types that can serialize integers as bytes.
+///
+/// Note that `Self` does not appear anywhere in this trait's definition!
+/// Therefore, in order to use it, you'll need to use syntax like
+/// `T::read_u16(&[0, 1])` where `T` implements `ByteOrder`.
+///
+/// This crate provides two types that implement `ByteOrder`: `BigEndian`
+/// and `LittleEndian`.
+/// This trait is sealed and cannot be implemented for callers to avoid
+/// breaking backwards compatibility when adding new derived traits.
+///
+/// # Examples
+///
+/// Write and read `u32` numbers in little endian order:
+///
+/// ```rust
+/// use byteorder::{ByteOrder, LittleEndian};
+///
+/// let mut buf = [0; 4];
+/// LittleEndian::write_u32(&mut buf, 1_000_000);
+/// assert_eq!(1_000_000, LittleEndian::read_u32(&buf));
+/// ```
+///
+/// Write and read `i16` numbers in big endian order:
+///
+/// ```rust
+/// use byteorder::{ByteOrder, BigEndian};
+///
+/// let mut buf = [0; 2];
+/// BigEndian::write_i16(&mut buf, -50_000);
+/// assert_eq!(-50_000, BigEndian::read_i16(&buf));
+/// ```
+pub trait ByteOrder
+    : Clone + Copy + Debug + Default + Eq + Hash + Ord + PartialEq + PartialOrd
+    + private::Sealed
+{
+    /// Reads an unsigned 16 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 2`.
+    fn read_u16(buf: &[u8]) -> u16;
+
+    /// Reads an unsigned 24 bit integer from `buf`, stored in u32.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 3`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read 24 bit `u32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 3];
+    /// LittleEndian::write_u24(&mut buf, 1_000_000);
+    /// assert_eq!(1_000_000, LittleEndian::read_u24(&buf));
+    /// ```
+    fn read_u24(buf: &[u8]) -> u32 {
+        Self::read_uint(buf, 3) as u32
+    }
+
+    /// Reads an unsigned 32 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 4`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 4];
+    /// LittleEndian::write_u32(&mut buf, 1_000_000);
+    /// assert_eq!(1_000_000, LittleEndian::read_u32(&buf));
+    /// ```
+    fn read_u32(buf: &[u8]) -> u32;
+
+    /// Reads an unsigned 64 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 8`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 8];
+    /// LittleEndian::write_u64(&mut buf, 1_000_000);
+    /// assert_eq!(1_000_000, LittleEndian::read_u64(&buf));
+    /// ```
+    fn read_u64(buf: &[u8]) -> u64;
+
+    /// Reads an unsigned 128 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 16`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u128` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 16];
+    /// LittleEndian::write_u128(&mut buf, 1_000_000);
+    /// assert_eq!(1_000_000, LittleEndian::read_u128(&buf));
+    /// ```
+    #[cfg(feature = "i128")]
+    fn read_u128(buf: &[u8]) -> u128;
+
+    /// Reads an unsigned n-bytes integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `nbytes < 1` or `nbytes > 8` or
+    /// `buf.len() < nbytes`
+    ///
+    /// # Examples
+    ///
+    /// Write and read an n-byte number in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 3];
+    /// LittleEndian::write_uint(&mut buf, 1_000_000, 3);
+    /// assert_eq!(1_000_000, LittleEndian::read_uint(&buf, 3));
+    /// ```
+    fn read_uint(buf: &[u8], nbytes: usize) -> u64;
+
+    /// Reads an unsigned n-bytes integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `nbytes < 1` or `nbytes > 16` or
+    /// `buf.len() < nbytes`
+    ///
+    /// # Examples
+    ///
+    /// Write and read an n-byte number in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 3];
+    /// LittleEndian::write_uint128(&mut buf, 1_000_000, 3);
+    /// assert_eq!(1_000_000, LittleEndian::read_uint128(&buf, 3));
+    /// ```
+    #[cfg(feature = "i128")]
+    fn read_uint128(buf: &[u8], nbytes: usize) -> u128;
+
+    /// Writes an unsigned 16 bit integer `n` to `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 2`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u16` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 2];
+    /// LittleEndian::write_u16(&mut buf, 1_000_000);
+    /// assert_eq!(1_000_000, LittleEndian::read_u16(&buf));
+    /// ```
+    fn write_u16(buf: &mut [u8], n: u16);
+
+    /// Writes an unsigned 24 bit integer `n` to `buf`, stored in u32.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 3`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read 24 bit `u32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 3];
+    /// LittleEndian::write_u24(&mut buf, 1_000_000);
+    /// assert_eq!(1_000_000, LittleEndian::read_u24(&buf));
+    /// ```
+    fn write_u24(buf: &mut [u8], n: u32) {
+        Self::write_uint(buf, n as u64, 3)
+    }
+
+    /// Writes an unsigned 32 bit integer `n` to `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 4`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 4];
+    /// LittleEndian::write_u32(&mut buf, 1_000_000);
+    /// assert_eq!(1_000_000, LittleEndian::read_u32(&buf));
+    /// ```
+    fn write_u32(buf: &mut [u8], n: u32);
+
+    /// Writes an unsigned 64 bit integer `n` to `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 8`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 8];
+    /// LittleEndian::write_u64(&mut buf, 1_000_000);
+    /// assert_eq!(1_000_000, LittleEndian::read_u64(&buf));
+    /// ```
+    fn write_u64(buf: &mut [u8], n: u64);
+
+    /// Writes an unsigned 128 bit integer `n` to `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 16`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u128` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 16];
+    /// LittleEndian::write_u128(&mut buf, 1_000_000);
+    /// assert_eq!(1_000_000, LittleEndian::read_u128(&buf));
+    /// ```
+    #[cfg(feature = "i128")]
+    fn write_u128(buf: &mut [u8], n: u128);
+
+    /// Writes an unsigned integer `n` to `buf` using only `nbytes`.
+    ///
+    /// # Panics
+    ///
+    /// If `n` is not representable in `nbytes`, or if `nbytes` is `> 8`, then
+    /// this method panics.
+    ///
+    /// # Examples
+    ///
+    /// Write and read an n-byte number in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 3];
+    /// LittleEndian::write_uint(&mut buf, 1_000_000, 3);
+    /// assert_eq!(1_000_000, LittleEndian::read_uint(&buf, 3));
+    /// ```
+    fn write_uint(buf: &mut [u8], n: u64, nbytes: usize);
+
+    /// Writes an unsigned integer `n` to `buf` using only `nbytes`.
+    ///
+    /// # Panics
+    ///
+    /// If `n` is not representable in `nbytes`, or if `nbytes` is `> 16`, then
+    /// this method panics.
+    ///
+    /// # Examples
+    ///
+    /// Write and read an n-byte number in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 3];
+    /// LittleEndian::write_uint128(&mut buf, 1_000_000, 3);
+    /// assert_eq!(1_000_000, LittleEndian::read_uint128(&buf, 3));
+    /// ```
+    #[cfg(feature = "i128")]
+    fn write_uint128(buf: &mut [u8], n: u128, nbytes: usize);
+
+    /// Reads a signed 16 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 2`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i16` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 2];
+    /// LittleEndian::write_i16(&mut buf, -1_000);
+    /// assert_eq!(-1_000, LittleEndian::read_i16(&buf));
+    /// ```
+    #[inline]
+    fn read_i16(buf: &[u8]) -> i16 {
+        Self::read_u16(buf) as i16
+    }
+
+    /// Reads a signed 24 bit integer from `buf`, stored in i32.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 3`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read 24 bit `i32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 3];
+    /// LittleEndian::write_i24(&mut buf, -1_000_000);
+    /// assert_eq!(-1_000_000, LittleEndian::read_i24(&buf));
+    /// ```
+    #[inline]
+    fn read_i24(buf: &[u8]) -> i32 {
+        Self::read_int(buf, 3) as i32
+    }
+
+    /// Reads a signed 32 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 4`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 4];
+    /// LittleEndian::write_i32(&mut buf, -1_000_000);
+    /// assert_eq!(-1_000_000, LittleEndian::read_i32(&buf));
+    /// ```
+    #[inline]
+    fn read_i32(buf: &[u8]) -> i32 {
+        Self::read_u32(buf) as i32
+    }
+
+    /// Reads a signed 64 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 8`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 8];
+    /// LittleEndian::write_i64(&mut buf, -1_000_000_000);
+    /// assert_eq!(-1_000_000_000, LittleEndian::read_i64(&buf));
+    /// ```
+    #[inline]
+    fn read_i64(buf: &[u8]) -> i64 {
+        Self::read_u64(buf) as i64
+    }
+
+    /// Reads a signed 128 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 16`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i128` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 16];
+    /// LittleEndian::write_i128(&mut buf, -1_000_000_000);
+    /// assert_eq!(-1_000_000_000, LittleEndian::read_i128(&buf));
+    /// ```
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_i128(buf: &[u8]) -> i128 {
+        Self::read_u128(buf) as i128
+    }
+
+    /// Reads a signed n-bytes integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `nbytes < 1` or `nbytes > 8` or
+    /// `buf.len() < nbytes`
+    ///
+    /// # Examples
+    ///
+    /// Write and read n-length signed numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 3];
+    /// LittleEndian::write_int(&mut buf, -1_000, 3);
+    /// assert_eq!(-1_000, LittleEndian::read_int(&buf, 3));
+    /// ```
+    #[inline]
+    fn read_int(buf: &[u8], nbytes: usize) -> i64 {
+        extend_sign(Self::read_uint(buf, nbytes), nbytes)
+    }
+
+    /// Reads a signed n-bytes integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `nbytes < 1` or `nbytes > 16` or
+    /// `buf.len() < nbytes`
+    ///
+    /// # Examples
+    ///
+    /// Write and read n-length signed numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 3];
+    /// LittleEndian::write_int128(&mut buf, -1_000, 3);
+    /// assert_eq!(-1_000, LittleEndian::read_int128(&buf, 3));
+    /// ```
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_int128(buf: &[u8], nbytes: usize) -> i128 {
+        extend_sign128(Self::read_uint128(buf, nbytes), nbytes)
+    }
+
+    /// Reads a IEEE754 single-precision (4 bytes) floating point number.
+    ///
+    /// The return value is always defined; signaling NaN's may be turned into
+    /// quiet NaN's.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 4`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `f32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let e = 2.71828;
+    /// let mut buf = [0; 4];
+    /// LittleEndian::write_f32(&mut buf, e);
+    /// assert_eq!(e, LittleEndian::read_f32(&buf));
+    /// ```
+    #[inline]
+    fn read_f32(buf: &[u8]) -> f32 {
+        safe_u32_bits_to_f32(Self::read_u32(buf))
+    }
+
+    /// Reads a IEEE754 double-precision (8 bytes) floating point number.
+    ///
+    /// The return value is always defined; signaling NaN's may be turned into
+    /// quiet NaN's.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 8`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `f64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let phi = 1.6180339887;
+    /// let mut buf = [0; 8];
+    /// LittleEndian::write_f64(&mut buf, phi);
+    /// assert_eq!(phi, LittleEndian::read_f64(&buf));
+    /// ```
+    #[inline]
+    fn read_f64(buf: &[u8]) -> f64 {
+        safe_u64_bits_to_f64(Self::read_u64(buf))
+    }
+
+    /// Writes a signed 16 bit integer `n` to `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 2`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i16` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 2];
+    /// LittleEndian::write_i16(&mut buf, -1_000);
+    /// assert_eq!(-1_000, LittleEndian::read_i16(&buf));
+    /// ```
+    #[inline]
+    fn write_i16(buf: &mut [u8], n: i16) {
+        Self::write_u16(buf, n as u16)
+    }
+
+    /// Writes a signed 24 bit integer `n` to `buf`, stored in i32.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 3`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read 24 bit `i32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 3];
+    /// LittleEndian::write_i24(&mut buf, -1_000_000);
+    /// assert_eq!(-1_000_000, LittleEndian::read_i24(&buf));
+    /// ```
+    #[inline]
+    fn write_i24(buf: &mut [u8], n: i32) {
+        Self::write_int(buf, n as i64, 3)
+    }
+
+    /// Writes a signed 32 bit integer `n` to `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 4`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 4];
+    /// LittleEndian::write_i32(&mut buf, -1_000_000);
+    /// assert_eq!(-1_000_000, LittleEndian::read_i32(&buf));
+    /// ```
+    #[inline]
+    fn write_i32(buf: &mut [u8], n: i32) {
+        Self::write_u32(buf, n as u32)
+    }
+
+    /// Writes a signed 64 bit integer `n` to `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 8`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 8];
+    /// LittleEndian::write_i64(&mut buf, -1_000_000_000);
+    /// assert_eq!(-1_000_000_000, LittleEndian::read_i64(&buf));
+    /// ```
+    #[inline]
+    fn write_i64(buf: &mut [u8], n: i64) {
+        Self::write_u64(buf, n as u64)
+    }
+
+    /// Writes a signed 128 bit integer `n` to `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 16`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read n-byte `i128` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 16];
+    /// LittleEndian::write_i128(&mut buf, -1_000_000_000);
+    /// assert_eq!(-1_000_000_000, LittleEndian::read_i128(&buf));
+    /// ```
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn write_i128(buf: &mut [u8], n: i128) {
+        Self::write_u128(buf, n as u128)
+    }
+
+    /// Writes a signed integer `n` to `buf` using only `nbytes`.
+    ///
+    /// # Panics
+    ///
+    /// If `n` is not representable in `nbytes`, or if `nbytes` is `> 8`, then
+    /// this method panics.
+    ///
+    /// # Examples
+    ///
+    /// Write and read an n-byte number in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 3];
+    /// LittleEndian::write_int(&mut buf, -1_000, 3);
+    /// assert_eq!(-1_000, LittleEndian::read_int(&buf, 3));
+    /// ```
+    #[inline]
+    fn write_int(buf: &mut [u8], n: i64, nbytes: usize) {
+        Self::write_uint(buf, unextend_sign(n, nbytes), nbytes)
+    }
+
+    /// Writes a signed integer `n` to `buf` using only `nbytes`.
+    ///
+    /// # Panics
+    ///
+    /// If `n` is not representable in `nbytes`, or if `nbytes` is `> 16`, then
+    /// this method panics.
+    ///
+    /// # Examples
+    ///
+    /// Write and read n-length signed numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut buf = [0; 3];
+    /// LittleEndian::write_int128(&mut buf, -1_000, 3);
+    /// assert_eq!(-1_000, LittleEndian::read_int128(&buf, 3));
+    /// ```
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn write_int128(buf: &mut [u8], n: i128, nbytes: usize) {
+        Self::write_uint128(buf, unextend_sign128(n, nbytes), nbytes)
+    }
+
+    /// Writes a IEEE754 single-precision (4 bytes) floating point number.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 4`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `f32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let e = 2.71828;
+    /// let mut buf = [0; 4];
+    /// LittleEndian::write_f32(&mut buf, e);
+    /// assert_eq!(e, LittleEndian::read_f32(&buf));
+    /// ```
+    #[inline]
+    fn write_f32(buf: &mut [u8], n: f32) {
+        Self::write_u32(buf, unsafe { transmute(n) })
+    }
+
+    /// Writes a IEEE754 double-precision (8 bytes) floating point number.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 8`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `f64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let phi = 1.6180339887;
+    /// let mut buf = [0; 8];
+    /// LittleEndian::write_f64(&mut buf, phi);
+    /// assert_eq!(phi, LittleEndian::read_f64(&buf));
+    /// ```
+    #[inline]
+    fn write_f64(buf: &mut [u8], n: f64) {
+        Self::write_u64(buf, unsafe { transmute(n) })
+    }
+
+    /// Reads unsigned 16 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 2*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u16` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 8];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_u16_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_u16_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    fn read_u16_into(src: &[u8], dst: &mut [u16]);
+
+    /// Reads unsigned 32 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 4*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 16];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_u32_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_u32_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    fn read_u32_into(src: &[u8], dst: &mut [u32]);
+
+    /// Reads unsigned 64 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 8*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 32];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_u64_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_u64_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    fn read_u64_into(src: &[u8], dst: &mut [u64]);
+
+    /// Reads unsigned 128 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 16*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u128` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 64];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_u128_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_u128_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    #[cfg(feature = "i128")]
+    fn read_u128_into(src: &[u8], dst: &mut [u128]);
+
+    /// Reads signed 16 bit integers from `src` to `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() != 2*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i16` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 8];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_i16_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_i16_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    #[inline]
+    fn read_i16_into(src: &[u8], dst: &mut [i16]) {
+        Self::read_u16_into(src, unsafe { transmute(dst) });
+    }
+
+    /// Reads signed 32 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 4*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 16];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_i32_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_i32_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    #[inline]
+    fn read_i32_into(src: &[u8], dst: &mut [i32]) {
+        Self::read_u32_into(src, unsafe { transmute(dst) });
+    }
+
+    /// Reads signed 64 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 8*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 32];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_i64_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_i64_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    #[inline]
+    fn read_i64_into(src: &[u8], dst: &mut [i64]) {
+        Self::read_u64_into(src, unsafe { transmute(dst) });
+    }
+
+    /// Reads signed 128 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 16*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i128` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 64];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_i128_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_i128_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_i128_into(src: &[u8], dst: &mut [i128]) {
+        Self::read_u128_into(src, unsafe { transmute(dst) });
+    }
+
+    /// Reads IEEE754 single-precision (4 bytes) floating point numbers from
+    /// `src` into `dst`.
+    ///
+    /// Note that this does not perform any checks on the floating point
+    /// conversion. In particular, if the `src` data encodes an undefined
+    /// floating point value for your environment, then the result may be
+    /// undefined behavior. For example, this function may produce signaling
+    /// NaN floating point values.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 4*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `f32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 16];
+    /// let numbers_given = [1.0, 2.0, 31.312e311, -11.32e91];
+    /// LittleEndian::write_f32_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0.0; 4];
+    /// unsafe {
+    ///     LittleEndian::read_f32_into_unchecked(&bytes, &mut numbers_got);
+    /// }
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    #[inline]
+    unsafe fn read_f32_into_unchecked(src: &[u8], dst: &mut [f32]) {
+        Self::read_u32_into(src, transmute(dst));
+    }
+
+    /// Reads IEEE754 single-precision (4 bytes) floating point numbers from
+    /// `src` into `dst`.
+    ///
+    /// Note that this does not perform any checks on the floating point
+    /// conversion. In particular, if the `src` data encodes an undefined
+    /// floating point value for your environment, then the result may be
+    /// undefined behavior. For example, this function may produce signaling
+    /// NaN floating point values.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 8*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `f64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 32];
+    /// let numbers_given = [1.0, 2.0, 31.312e311, -11.32e91];
+    /// LittleEndian::write_f64_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0.0; 4];
+    /// unsafe {
+    ///     LittleEndian::read_f64_into_unchecked(&bytes, &mut numbers_got);
+    /// }
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    #[inline]
+    unsafe fn read_f64_into_unchecked(src: &[u8], dst: &mut [f64]) {
+        Self::read_u64_into(src, transmute(dst));
+    }
+
+    /// Writes unsigned 16 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `dst.len() != 2*src.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u16` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 8];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_u16_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_u16_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    fn write_u16_into(src: &[u16], dst: &mut [u8]);
+
+    /// Writes unsigned 32 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `dst.len() != 4*src.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 16];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_u32_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_u32_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    fn write_u32_into(src: &[u32], dst: &mut [u8]);
+
+    /// Writes unsigned 64 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `dst.len() != 8*src.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 32];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_u64_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_u64_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    fn write_u64_into(src: &[u64], dst: &mut [u8]);
+
+    /// Writes unsigned 128 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `dst.len() != 16*src.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `u128` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 64];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_u128_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_u128_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    #[cfg(feature = "i128")]
+    fn write_u128_into(src: &[u128], dst: &mut [u8]);
+
+    /// Writes signed 16 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() != 2*src.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i16` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 8];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_i16_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_i16_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    fn write_i16_into(src: &[i16], dst: &mut [u8]) {
+        Self::write_u16_into(unsafe { transmute(src) }, dst);
+    }
+
+    /// Writes signed 32 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `dst.len() != 4*src.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 16];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_i32_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_i32_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    fn write_i32_into(src: &[i32], dst: &mut [u8]) {
+        Self::write_u32_into(unsafe { transmute(src) }, dst);
+    }
+
+    /// Writes signed 64 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `dst.len() != 8*src.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 32];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_i64_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_i64_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    fn write_i64_into(src: &[i64], dst: &mut [u8]) {
+        Self::write_u64_into(unsafe { transmute(src) }, dst);
+    }
+
+    /// Writes signed 128 bit integers from `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `dst.len() != 16*src.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `i128` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 64];
+    /// let numbers_given = [1, 2, 0xf00f, 0xffee];
+    /// LittleEndian::write_i128_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0; 4];
+    /// LittleEndian::read_i128_into(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    #[cfg(feature = "i128")]
+    fn write_i128_into(src: &[i128], dst: &mut [u8]) {
+        Self::write_u128_into(unsafe { transmute(src) }, dst);
+    }
+
+    /// Writes IEEE754 single-precision (4 bytes) floating point numbers from
+    /// `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 4*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `f32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 16];
+    /// let numbers_given = [1.0, 2.0, 31.312e311, -11.32e91];
+    /// LittleEndian::write_f32_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0.0; 4];
+    /// unsafe {
+    ///     LittleEndian::read_f32_into_unchecked(&bytes, &mut numbers_got);
+    /// }
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    fn write_f32_into(src: &[f32], dst: &mut [u8]) {
+        Self::write_u32_into(unsafe { transmute(src) }, dst);
+    }
+
+    /// Writes IEEE754 double-precision (8 bytes) floating point numbers from
+    /// `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 8*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `f64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 32];
+    /// let numbers_given = [1.0, 2.0, 31.312e311, -11.32e91];
+    /// LittleEndian::write_f64_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0.0; 4];
+    /// unsafe {
+    ///     LittleEndian::read_f64_into_unchecked(&bytes, &mut numbers_got);
+    /// }
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    fn write_f64_into(src: &[f64], dst: &mut [u8]) {
+        Self::write_u64_into(unsafe { transmute(src) }, dst);
+    }
+
+    /// Converts the given slice of unsigned 16 bit integers to a particular
+    /// endianness.
+    ///
+    /// If the endianness matches the endianness of the host platform, then
+    /// this is a no-op.
+    ///
+    /// # Examples
+    ///
+    /// Convert the host platform's endianness to big-endian:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, BigEndian};
+    ///
+    /// let mut numbers = [5, 65000];
+    /// BigEndian::from_slice_u16(&mut numbers);
+    /// if cfg!(target_endian = "little") {
+    ///     assert_eq!(numbers, [5u16.swap_bytes(), 65000u16.swap_bytes()]);
+    /// } else {
+    ///     assert_eq!(numbers, [5, 65000]);
+    /// }
+    /// ```
+    fn from_slice_u16(numbers: &mut [u16]);
+
+    /// Converts the given slice of unsigned 32 bit integers to a particular
+    /// endianness.
+    ///
+    /// If the endianness matches the endianness of the host platform, then
+    /// this is a no-op.
+    ///
+    /// # Examples
+    ///
+    /// Convert the host platform's endianness to big-endian:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, BigEndian};
+    ///
+    /// let mut numbers = [5, 65000];
+    /// BigEndian::from_slice_u32(&mut numbers);
+    /// if cfg!(target_endian = "little") {
+    ///     assert_eq!(numbers, [5u32.swap_bytes(), 65000u32.swap_bytes()]);
+    /// } else {
+    ///     assert_eq!(numbers, [5, 65000]);
+    /// }
+    /// ```
+    fn from_slice_u32(numbers: &mut [u32]);
+
+    /// Converts the given slice of unsigned 64 bit integers to a particular
+    /// endianness.
+    ///
+    /// If the endianness matches the endianness of the host platform, then
+    /// this is a no-op.
+    ///
+    /// # Examples
+    ///
+    /// Convert the host platform's endianness to big-endian:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, BigEndian};
+    ///
+    /// let mut numbers = [5, 65000];
+    /// BigEndian::from_slice_u64(&mut numbers);
+    /// if cfg!(target_endian = "little") {
+    ///     assert_eq!(numbers, [5u64.swap_bytes(), 65000u64.swap_bytes()]);
+    /// } else {
+    ///     assert_eq!(numbers, [5, 65000]);
+    /// }
+    /// ```
+    fn from_slice_u64(numbers: &mut [u64]);
+
+    /// Converts the given slice of unsigned 128 bit integers to a particular
+    /// endianness.
+    ///
+    /// If the endianness matches the endianness of the host platform, then
+    /// this is a no-op.
+    ///
+    /// # Examples
+    ///
+    /// Convert the host platform's endianness to big-endian:
+    ///
+    /// ```rust
+    /// #![feature(i128_type)]
+    ///
+    /// use byteorder::{ByteOrder, BigEndian};
+    ///
+    /// let mut numbers = [5, 65000];
+    /// BigEndian::from_slice_u128(&mut numbers);
+    /// if cfg!(target_endian = "little") {
+    ///     assert_eq!(numbers, [5u128.swap_bytes(), 65000u128.swap_bytes()]);
+    /// } else {
+    ///     assert_eq!(numbers, [5, 65000]);
+    /// }
+    /// ```
+    #[cfg(feature = "i128")]
+    fn from_slice_u128(numbers: &mut [u128]);
+
+    /// Converts the given slice of signed 16 bit integers to a particular
+    /// endianness.
+    ///
+    /// If the endianness matches the endianness of the host platform, then
+    /// this is a no-op.
+    ///
+    /// # Examples
+    ///
+    /// Convert the host platform's endianness to big-endian:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, BigEndian};
+    ///
+    /// let mut numbers = [5, 65000];
+    /// BigEndian::from_slice_i16(&mut numbers);
+    /// if cfg!(target_endian = "little") {
+    ///     assert_eq!(numbers, [5i16.swap_bytes(), 65000i16.swap_bytes()]);
+    /// } else {
+    ///     assert_eq!(numbers, [5, 65000]);
+    /// }
+    /// ```
+    #[inline]
+    fn from_slice_i16(numbers: &mut [i16]) {
+        Self::from_slice_u16(unsafe { transmute(numbers) });
+    }
+
+    /// Converts the given slice of signed 32 bit integers to a particular
+    /// endianness.
+    ///
+    /// If the endianness matches the endianness of the host platform, then
+    /// this is a no-op.
+    ///
+    /// # Examples
+    ///
+    /// Convert the host platform's endianness to big-endian:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, BigEndian};
+    ///
+    /// let mut numbers = [5, 65000];
+    /// BigEndian::from_slice_i32(&mut numbers);
+    /// if cfg!(target_endian = "little") {
+    ///     assert_eq!(numbers, [5i32.swap_bytes(), 65000i32.swap_bytes()]);
+    /// } else {
+    ///     assert_eq!(numbers, [5, 65000]);
+    /// }
+    /// ```
+    #[inline]
+    fn from_slice_i32(numbers: &mut [i32]) {
+        Self::from_slice_u32(unsafe { transmute(numbers) });
+    }
+
+    /// Converts the given slice of signed 64 bit integers to a particular
+    /// endianness.
+    ///
+    /// If the endianness matches the endianness of the host platform, then
+    /// this is a no-op.
+    ///
+    /// # Examples
+    ///
+    /// Convert the host platform's endianness to big-endian:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, BigEndian};
+    ///
+    /// let mut numbers = [5, 65000];
+    /// BigEndian::from_slice_i64(&mut numbers);
+    /// if cfg!(target_endian = "little") {
+    ///     assert_eq!(numbers, [5i64.swap_bytes(), 65000i64.swap_bytes()]);
+    /// } else {
+    ///     assert_eq!(numbers, [5, 65000]);
+    /// }
+    /// ```
+    #[inline]
+    fn from_slice_i64(numbers: &mut [i64]) {
+        Self::from_slice_u64(unsafe { transmute(numbers) });
+    }
+
+    /// Converts the given slice of signed 128 bit integers to a particular
+    /// endianness.
+    ///
+    /// If the endianness matches the endianness of the host platform, then
+    /// this is a no-op.
+    ///
+    /// # Examples
+    ///
+    /// Convert the host platform's endianness to big-endian:
+    ///
+    /// ```rust
+    /// #![feature(i128_type)]
+    ///
+    /// use byteorder::{ByteOrder, BigEndian};
+    ///
+    /// let mut numbers = [5, 65000];
+    /// BigEndian::from_slice_i128(&mut numbers);
+    /// if cfg!(target_endian = "little") {
+    ///     assert_eq!(numbers, [5i128.swap_bytes(), 65000i128.swap_bytes()]);
+    /// } else {
+    ///     assert_eq!(numbers, [5, 65000]);
+    /// }
+    /// ```
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn from_slice_i128(numbers: &mut [i128]) {
+        Self::from_slice_u128(unsafe { transmute(numbers) });
+    }
+
+    /// Converts the given slice of IEEE754 single-precision (4 bytes) floating
+    /// point numbers to a particular endianness.
+    ///
+    /// If the endianness matches the endianness of the host platform, then
+    /// this is a no-op.
+    ///
+    /// Note that the results of this operation are guaranteed to be defined.
+    /// In particular, this method may replace signaling NaN values with
+    /// quiet NaN values.
+    fn from_slice_f32(numbers: &mut [f32]);
+
+    /// Converts the given slice of IEEE754 double-precision (8 bytes) floating
+    /// point numbers to a particular endianness.
+    ///
+    /// If the endianness matches the endianness of the host platform, then
+    /// this is a no-op.
+    ///
+    /// Note that the results of this operation are guaranteed to be defined.
+    /// In particular, this method may replace signaling NaN values with
+    /// quiet NaN values.
+    fn from_slice_f64(numbers: &mut [f64]);
+}
+
+/// Defines big-endian serialization.
+///
+/// Note that this type has no value constructor. It is used purely at the
+/// type level.
+///
+/// # Examples
+///
+/// Write and read `u32` numbers in big endian order:
+///
+/// ```rust
+/// use byteorder::{ByteOrder, BigEndian};
+///
+/// let mut buf = [0; 4];
+/// BigEndian::write_u32(&mut buf, 1_000_000);
+/// assert_eq!(1_000_000, BigEndian::read_u32(&buf));
+/// ```
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub enum BigEndian {}
+
+impl Default for BigEndian {
+    fn default() -> BigEndian {
+        panic!("BigEndian default")
+    }
+}
+
+/// A type alias for `BigEndian`.
+pub type BE = BigEndian;
+
+/// Defines little-endian serialization.
+///
+/// Note that this type has no value constructor. It is used purely at the
+/// type level.
+///
+/// # Examples
+///
+/// Write and read `u32` numbers in little endian order:
+///
+/// ```rust
+/// use byteorder::{ByteOrder, LittleEndian};
+///
+/// let mut buf = [0; 4];
+/// LittleEndian::write_u32(&mut buf, 1_000_000);
+/// assert_eq!(1_000_000, LittleEndian::read_u32(&buf));
+/// ```
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub enum LittleEndian {}
+
+impl Default for LittleEndian {
+    fn default() -> LittleEndian {
+        panic!("LittleEndian default")
+    }
+}
+
+/// A type alias for `LittleEndian`.
+pub type LE = LittleEndian;
+
+/// Defines network byte order serialization.
+///
+/// Network byte order is defined by [RFC 1700][1] to be big-endian, and is
+/// referred to in several protocol specifications.  This type is an alias of
+/// BigEndian.
+///
+/// [1]: https://tools.ietf.org/html/rfc1700
+///
+/// Note that this type has no value constructor. It is used purely at the
+/// type level.
+///
+/// # Examples
+///
+/// Write and read `i16` numbers in big endian order:
+///
+/// ```rust
+/// use byteorder::{ByteOrder, NetworkEndian, BigEndian};
+///
+/// let mut buf = [0; 2];
+/// BigEndian::write_i16(&mut buf, -50_000);
+/// assert_eq!(-50_000, NetworkEndian::read_i16(&buf));
+/// ```
+pub type NetworkEndian = BigEndian;
+
+/// Defines system native-endian serialization.
+///
+/// Note that this type has no value constructor. It is used purely at the
+/// type level.
+#[cfg(target_endian = "little")]
+pub type NativeEndian = LittleEndian;
+
+/// Defines system native-endian serialization.
+///
+/// Note that this type has no value constructor. It is used purely at the
+/// type level.
+#[cfg(target_endian = "big")]
+pub type NativeEndian = BigEndian;
+
+macro_rules! read_num_bytes {
+    ($ty:ty, $size:expr, $src:expr, $which:ident) => ({
+        assert!($size == ::core::mem::size_of::<$ty>());
+        assert!($size <= $src.len());
+        let mut data: $ty = 0;
+        unsafe {
+            copy_nonoverlapping(
+                $src.as_ptr(),
+                &mut data as *mut $ty as *mut u8,
+                $size);
+        }
+        data.$which()
+    });
+}
+
+macro_rules! write_num_bytes {
+    ($ty:ty, $size:expr, $n:expr, $dst:expr, $which:ident) => ({
+        assert!($size <= $dst.len());
+        unsafe {
+            // N.B. https://github.com/rust-lang/rust/issues/22776
+            let bytes = transmute::<_, [u8; $size]>($n.$which());
+            copy_nonoverlapping((&bytes).as_ptr(), $dst.as_mut_ptr(), $size);
+        }
+    });
+}
+
+macro_rules! read_slice {
+    ($src:expr, $dst:expr, $size:expr, $which:ident) => {{
+        assert_eq!($src.len(), $size * $dst.len());
+
+        unsafe {
+            copy_nonoverlapping(
+                $src.as_ptr(),
+                $dst.as_mut_ptr() as *mut u8,
+                $src.len());
+        }
+        for v in $dst.iter_mut() {
+            *v = v.$which();
+        }
+    }};
+}
+
+macro_rules! write_slice_native {
+    ($src:expr, $dst:expr, $ty:ty, $size:expr) => {{
+        assert!($size == ::core::mem::size_of::<$ty>());
+        assert_eq!($size * $src.len(), $dst.len());
+
+        unsafe {
+            copy_nonoverlapping(
+                $src.as_ptr() as *const u8,
+                $dst.as_mut_ptr(),
+                $dst.len());
+        }
+    }};
+}
+
+macro_rules! write_slice {
+    ($src:expr, $dst:expr, $ty:ty, $size:expr, $write:expr) => ({
+        assert!($size == ::core::mem::size_of::<$ty>());
+        assert_eq!($size * $src.len(), $dst.len());
+
+        for (&n, chunk) in $src.iter().zip($dst.chunks_mut($size)) {
+            $write(chunk, n);
+        }
+    });
+}
+
+impl ByteOrder for BigEndian {
+    #[inline]
+    fn read_u16(buf: &[u8]) -> u16 {
+        read_num_bytes!(u16, 2, buf, to_be)
+    }
+
+    #[inline]
+    fn read_u32(buf: &[u8]) -> u32 {
+        read_num_bytes!(u32, 4, buf, to_be)
+    }
+
+    #[inline]
+    fn read_u64(buf: &[u8]) -> u64 {
+        read_num_bytes!(u64, 8, buf, to_be)
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_u128(buf: &[u8]) -> u128 {
+        read_num_bytes!(u128, 16, buf, to_be)
+    }
+
+    #[inline]
+    fn read_uint(buf: &[u8], nbytes: usize) -> u64 {
+        assert!(1 <= nbytes && nbytes <= 8 && nbytes <= buf.len());
+        let mut out = [0u8; 8];
+        let ptr_out = out.as_mut_ptr();
+        unsafe {
+            copy_nonoverlapping(
+                buf.as_ptr(), ptr_out.offset((8 - nbytes) as isize), nbytes);
+            (*(ptr_out as *const u64)).to_be()
+        }
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_uint128(buf: &[u8], nbytes: usize) -> u128 {
+        assert!(1 <= nbytes && nbytes <= 16 && nbytes <= buf.len());
+        let mut out = [0u8; 16];
+        let ptr_out = out.as_mut_ptr();
+        unsafe {
+            copy_nonoverlapping(
+                buf.as_ptr(), ptr_out.offset((16 - nbytes) as isize), nbytes);
+            (*(ptr_out as *const u128)).to_be()
+        }
+    }
+
+    #[inline]
+    fn write_u16(buf: &mut [u8], n: u16) {
+        write_num_bytes!(u16, 2, n, buf, to_be);
+    }
+
+    #[inline]
+    fn write_u32(buf: &mut [u8], n: u32) {
+        write_num_bytes!(u32, 4, n, buf, to_be);
+    }
+
+    #[inline]
+    fn write_u64(buf: &mut [u8], n: u64) {
+        write_num_bytes!(u64, 8, n, buf, to_be);
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn write_u128(buf: &mut [u8], n: u128) {
+        write_num_bytes!(u128, 16, n, buf, to_be);
+    }
+
+    #[inline]
+    fn write_uint(buf: &mut [u8], n: u64, nbytes: usize) {
+        assert!(pack_size(n) <= nbytes && nbytes <= 8);
+        assert!(nbytes <= buf.len());
+        unsafe {
+            let bytes: [u8; 8] = transmute(n.to_be());
+            copy_nonoverlapping(
+                bytes.as_ptr().offset((8 - nbytes) as isize),
+                buf.as_mut_ptr(),
+                nbytes);
+        }
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn write_uint128(buf: &mut [u8], n: u128, nbytes: usize) {
+        assert!(pack_size128(n) <= nbytes && nbytes <= 16);
+        assert!(nbytes <= buf.len());
+        unsafe {
+            let bytes: [u8; 16] = transmute(n.to_be());
+            copy_nonoverlapping(
+                bytes.as_ptr().offset((16 - nbytes) as isize),
+                buf.as_mut_ptr(),
+                nbytes);
+        }
+    }
+
+    #[inline]
+    fn read_u16_into(src: &[u8], dst: &mut [u16]) {
+        read_slice!(src, dst, 2, to_be);
+    }
+
+    #[inline]
+    fn read_u32_into(src: &[u8], dst: &mut [u32]) {
+        read_slice!(src, dst, 4, to_be);
+    }
+
+    #[inline]
+    fn read_u64_into(src: &[u8], dst: &mut [u64]) {
+        read_slice!(src, dst, 8, to_be);
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_u128_into(src: &[u8], dst: &mut [u128]) {
+        read_slice!(src, dst, 16, to_be);
+    }
+
+    #[inline]
+    fn write_u16_into(src: &[u16], dst: &mut [u8]) {
+        if cfg!(target_endian = "big") {
+            write_slice_native!(src, dst, u16, 2);
+        } else {
+            write_slice!(src, dst, u16, 2, Self::write_u16);
+        }
+    }
+
+    #[inline]
+    fn write_u32_into(src: &[u32], dst: &mut [u8]) {
+        if cfg!(target_endian = "big") {
+            write_slice_native!(src, dst, u32, 4);
+        } else {
+            write_slice!(src, dst, u32, 4, Self::write_u32);
+        }
+    }
+
+    #[inline]
+    fn write_u64_into(src: &[u64], dst: &mut [u8]) {
+        if cfg!(target_endian = "big") {
+            write_slice_native!(src, dst, u64, 8);
+        } else {
+            write_slice!(src, dst, u64, 8, Self::write_u64);
+        }
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn write_u128_into(src: &[u128], dst: &mut [u8]) {
+        if cfg!(target_endian = "big") {
+            write_slice_native!(src, dst, u128, 16);
+        } else {
+            write_slice!(src, dst, u128, 16, Self::write_u128);
+        }
+    }
+
+    #[inline]
+    fn from_slice_u16(numbers: &mut [u16]) {
+        if cfg!(target_endian = "little") {
+            for n in numbers {
+                *n = n.to_be();
+            }
+        }
+    }
+
+    #[inline]
+    fn from_slice_u32(numbers: &mut [u32]) {
+        if cfg!(target_endian = "little") {
+            for n in numbers {
+                *n = n.to_be();
+            }
+        }
+    }
+
+    #[inline]
+    fn from_slice_u64(numbers: &mut [u64]) {
+        if cfg!(target_endian = "little") {
+            for n in numbers {
+                *n = n.to_be();
+            }
+        }
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn from_slice_u128(numbers: &mut [u128]) {
+        if cfg!(target_endian = "little") {
+            for n in numbers {
+                *n = n.to_be();
+            }
+        }
+    }
+
+    #[inline]
+    fn from_slice_f32(numbers: &mut [f32]) {
+        if cfg!(target_endian = "little") {
+            for n in numbers {
+                let int: u32 = unsafe { transmute(*n) };
+                *n = safe_u32_bits_to_f32(int.to_be());
+            }
+        }
+    }
+
+    #[inline]
+    fn from_slice_f64(numbers: &mut [f64]) {
+        if cfg!(target_endian = "little") {
+            for n in numbers {
+                let int: u64 = unsafe { transmute(*n) };
+                *n = safe_u64_bits_to_f64(int.to_be());
+            }
+        }
+    }
+}
+
+impl ByteOrder for LittleEndian {
+    #[inline]
+    fn read_u16(buf: &[u8]) -> u16 {
+        read_num_bytes!(u16, 2, buf, to_le)
+    }
+
+    #[inline]
+    fn read_u32(buf: &[u8]) -> u32 {
+        read_num_bytes!(u32, 4, buf, to_le)
+    }
+
+    #[inline]
+    fn read_u64(buf: &[u8]) -> u64 {
+        read_num_bytes!(u64, 8, buf, to_le)
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_u128(buf: &[u8]) -> u128 {
+        read_num_bytes!(u128, 16, buf, to_le)
+    }
+
+    #[inline]
+    fn read_uint(buf: &[u8], nbytes: usize) -> u64 {
+        assert!(1 <= nbytes && nbytes <= 8 && nbytes <= buf.len());
+        let mut out = [0u8; 8];
+        let ptr_out = out.as_mut_ptr();
+        unsafe {
+            copy_nonoverlapping(buf.as_ptr(), ptr_out, nbytes);
+            (*(ptr_out as *const u64)).to_le()
+        }
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_uint128(buf: &[u8], nbytes: usize) -> u128 {
+        assert!(1 <= nbytes && nbytes <= 16 && nbytes <= buf.len());
+        let mut out = [0u8; 16];
+        let ptr_out = out.as_mut_ptr();
+        unsafe {
+            copy_nonoverlapping(buf.as_ptr(), ptr_out, nbytes);
+            (*(ptr_out as *const u128)).to_le()
+        }
+    }
+
+    #[inline]
+    fn write_u16(buf: &mut [u8], n: u16) {
+        write_num_bytes!(u16, 2, n, buf, to_le);
+    }
+
+    #[inline]
+    fn write_u32(buf: &mut [u8], n: u32) {
+        write_num_bytes!(u32, 4, n, buf, to_le);
+    }
+
+    #[inline]
+    fn write_u64(buf: &mut [u8], n: u64) {
+        write_num_bytes!(u64, 8, n, buf, to_le);
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn write_u128(buf: &mut [u8], n: u128) {
+        write_num_bytes!(u128, 16, n, buf, to_le);
+    }
+
+    #[inline]
+    fn write_uint(buf: &mut [u8], n: u64, nbytes: usize) {
+        assert!(pack_size(n as u64) <= nbytes && nbytes <= 8);
+        assert!(nbytes <= buf.len());
+        unsafe {
+            let bytes: [u8; 8] = transmute(n.to_le());
+            copy_nonoverlapping(bytes.as_ptr(), buf.as_mut_ptr(), nbytes);
+        }
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn write_uint128(buf: &mut [u8], n: u128, nbytes: usize) {
+        assert!(pack_size128(n as u128) <= nbytes && nbytes <= 16);
+        assert!(nbytes <= buf.len());
+        unsafe {
+            let bytes: [u8; 16] = transmute(n.to_le());
+            copy_nonoverlapping(bytes.as_ptr(), buf.as_mut_ptr(), nbytes);
+        }
+    }
+
+    #[inline]
+    fn read_u16_into(src: &[u8], dst: &mut [u16]) {
+        read_slice!(src, dst, 2, to_le);
+    }
+
+    #[inline]
+    fn read_u32_into(src: &[u8], dst: &mut [u32]) {
+        read_slice!(src, dst, 4, to_le);
+    }
+
+    #[inline]
+    fn read_u64_into(src: &[u8], dst: &mut [u64]) {
+        read_slice!(src, dst, 8, to_le);
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn read_u128_into(src: &[u8], dst: &mut [u128]) {
+        read_slice!(src, dst, 16, to_le);
+    }
+
+    #[inline]
+    fn write_u16_into(src: &[u16], dst: &mut [u8]) {
+        if cfg!(target_endian = "little") {
+            write_slice_native!(src, dst, u16, 2);
+        } else {
+            write_slice!(src, dst, u16, 2, Self::write_u16);
+        }
+    }
+
+    #[inline]
+    fn write_u32_into(src: &[u32], dst: &mut [u8]) {
+        if cfg!(target_endian = "little") {
+            write_slice_native!(src, dst, u32, 4);
+        } else {
+            write_slice!(src, dst, u32, 4, Self::write_u32);
+        }
+    }
+
+    #[inline]
+    fn write_u64_into(src: &[u64], dst: &mut [u8]) {
+        if cfg!(target_endian = "little") {
+            write_slice_native!(src, dst, u64, 8);
+        } else {
+            write_slice!(src, dst, u64, 8, Self::write_u64);
+        }
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn write_u128_into(src: &[u128], dst: &mut [u8]) {
+        if cfg!(target_endian = "little") {
+            write_slice_native!(src, dst, u128, 16);
+        } else {
+            write_slice!(src, dst, u128, 16, Self::write_u128);
+        }
+    }
+
+    #[inline]
+    fn from_slice_u16(numbers: &mut [u16]) {
+        if cfg!(target_endian = "big") {
+            for n in numbers {
+                *n = n.to_le();
+            }
+        }
+    }
+
+    #[inline]
+    fn from_slice_u32(numbers: &mut [u32]) {
+        if cfg!(target_endian = "big") {
+            for n in numbers {
+                *n = n.to_le();
+            }
+        }
+    }
+
+    #[inline]
+    fn from_slice_u64(numbers: &mut [u64]) {
+        if cfg!(target_endian = "big") {
+            for n in numbers {
+                *n = n.to_le();
+            }
+        }
+    }
+
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn from_slice_u128(numbers: &mut [u128]) {
+        if cfg!(target_endian = "big") {
+            for n in numbers {
+                *n = n.to_le();
+            }
+        }
+    }
+
+    #[inline]
+    fn from_slice_f32(numbers: &mut [f32]) {
+        if cfg!(target_endian = "big") {
+            for n in numbers {
+                let int: u32 = unsafe { transmute(*n) };
+                *n = safe_u32_bits_to_f32(int.to_le());
+            }
+        }
+    }
+
+    #[inline]
+    fn from_slice_f64(numbers: &mut [f64]) {
+        if cfg!(target_endian = "big") {
+            for n in numbers {
+                let int: u64 = unsafe { transmute(*n) };
+                *n = safe_u64_bits_to_f64(int.to_le());
+            }
+        }
+    }
+}
+
+#[inline]
+fn safe_u32_bits_to_f32(u: u32) -> f32 {
+    use core::f32::NAN;
+
+    const EXP_MASK: u32 = 0x7F800000;
+    const FRACT_MASK: u32 = 0x007FFFFF;
+
+    if u & EXP_MASK == EXP_MASK && u & FRACT_MASK != 0 {
+        // While IEEE 754-2008 specifies encodings for quiet NaNs and
+        // signaling ones, certains MIPS and PA-RISC CPUs treat signaling
+        // NaNs differently. Therefore, to be safe, we pass a known quiet
+        // NaN if u is any kind of NaN. The check above only assumes
+        // IEEE 754-1985 to be valid.
+        NAN
+    } else {
+        unsafe { transmute(u) }
+    }
+}
+
+#[inline]
+fn safe_u64_bits_to_f64(u: u64) -> f64 {
+    use core::f64::NAN;
+
+    const EXP_MASK: u64 = 0x7FF0000000000000;
+    const FRACT_MASK: u64 = 0x000FFFFFFFFFFFFF;
+
+    if u & EXP_MASK == EXP_MASK && u & FRACT_MASK != 0 {
+        // While IEEE 754-2008 specifies encodings for quiet NaNs and
+        // signaling ones, certains MIPS and PA-RISC CPUs treat signaling
+        // NaNs differently. Therefore, to be safe, we pass a known quiet
+        // NaN if u is any kind of NaN. The check above only assumes
+        // IEEE 754-1985 to be valid.
+        NAN
+    } else {
+        unsafe { transmute(u) }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    extern crate quickcheck;
+    extern crate rand;
+
+    use self::quickcheck::{QuickCheck, StdGen, Testable};
+    use self::rand::thread_rng;
+    #[cfg(feature = "i128")] use self::quickcheck::{Arbitrary, Gen};
+
+    pub const U24_MAX: u32 = 16_777_215;
+    pub const I24_MAX: i32 = 8_388_607;
+
+    pub const U64_MAX: u64 = ::core::u64::MAX;
+    pub const I64_MAX: u64 = ::core::i64::MAX as u64;
+
+    macro_rules! calc_max {
+        ($max:expr, $bytes:expr) => { calc_max!($max, $bytes, 8) };
+        ($max:expr, $bytes:expr, $maxbytes:expr) => {
+            ($max - 1) >> (8 * ($maxbytes - $bytes))
+        };
+    }
+
+    #[derive(Clone, Debug)]
+    pub struct Wi128<T>(pub T);
+
+    #[cfg(feature = "i128")]
+    impl<T: Clone> Wi128<T> {
+        pub fn clone(&self) -> T {
+            self.0.clone()
+        }
+    }
+
+    impl<T: PartialEq> PartialEq<T> for Wi128<T> {
+        fn eq(&self, other: &T) -> bool {
+            self.0.eq(other)
+        }
+    }
+
+    #[cfg(feature = "i128")]
+    impl Arbitrary for Wi128<u128> {
+        fn arbitrary<G: Gen>(gen: &mut G) -> Wi128<u128> {
+            let max = calc_max!(::core::u128::MAX, gen.size(), 16);
+            let output =
+                (gen.gen::<u64>() as u128) |
+                ((gen.gen::<u64>() as u128) << 64);
+            Wi128(output & (max - 1))
+        }
+    }
+
+    #[cfg(feature = "i128")]
+    impl Arbitrary for Wi128<i128> {
+        fn arbitrary<G: Gen>(gen: &mut G) -> Wi128<i128> {
+            let max = calc_max!(::core::i128::MAX, gen.size(), 16);
+            let output =
+                (gen.gen::<i64>() as i128) |
+                ((gen.gen::<i64>() as i128) << 64);
+            Wi128(output & (max - 1))
+        }
+    }
+
+    pub fn qc_sized<A: Testable>(f: A, size: u64) {
+        QuickCheck::new()
+            .gen(StdGen::new(thread_rng(), size as usize))
+            .tests(1_00)
+            .max_tests(10_000)
+            .quickcheck(f);
+    }
+
+    macro_rules! qc_byte_order {
+        ($name:ident, $ty_int:ty, $max:expr,
+         $bytes:expr, $read:ident, $write:ident) => (
+            mod $name {
+                use {BigEndian, ByteOrder, NativeEndian, LittleEndian};
+                #[allow(unused_imports)] use super::{ qc_sized, Wi128 };
+
+                #[test]
+                fn big_endian() {
+                    fn prop(n: $ty_int) -> bool {
+                        let mut buf = [0; 16];
+                        BigEndian::$write(&mut buf, n.clone(), $bytes);
+                        n == BigEndian::$read(&mut buf[..$bytes], $bytes)
+                    }
+                    qc_sized(prop as fn($ty_int) -> bool, $max);
+                }
+
+                #[test]
+                fn little_endian() {
+                    fn prop(n: $ty_int) -> bool {
+                        let mut buf = [0; 16];
+                        LittleEndian::$write(&mut buf, n.clone(), $bytes);
+                        n == LittleEndian::$read(&mut buf[..$bytes], $bytes)
+                    }
+                    qc_sized(prop as fn($ty_int) -> bool, $max);
+                }
+
+                #[test]
+                fn native_endian() {
+                    fn prop(n: $ty_int) -> bool {
+                        let mut buf = [0; 16];
+                        NativeEndian::$write(&mut buf, n.clone(), $bytes);
+                        n == NativeEndian::$read(&mut buf[..$bytes], $bytes)
+                    }
+                    qc_sized(prop as fn($ty_int) -> bool, $max);
+                }
+            }
+        );
+        ($name:ident, $ty_int:ty, $max:expr,
+         $read:ident, $write:ident) => (
+            mod $name {
+                use core::mem::size_of;
+                use {BigEndian, ByteOrder, NativeEndian, LittleEndian};
+                #[allow(unused_imports)] use super::{ qc_sized, Wi128 };
+
+                #[test]
+                fn big_endian() {
+                    fn prop(n: $ty_int) -> bool {
+                        let bytes = size_of::<$ty_int>();
+                        let mut buf = [0; 16];
+                        BigEndian::$write(&mut buf[16 - bytes..], n.clone());
+                        n == BigEndian::$read(&mut buf[16 - bytes..])
+                    }
+                    qc_sized(prop as fn($ty_int) -> bool, $max - 1);
+                }
+
+                #[test]
+                fn little_endian() {
+                    fn prop(n: $ty_int) -> bool {
+                        let bytes = size_of::<$ty_int>();
+                        let mut buf = [0; 16];
+                        LittleEndian::$write(&mut buf[..bytes], n.clone());
+                        n == LittleEndian::$read(&mut buf[..bytes])
+                    }
+                    qc_sized(prop as fn($ty_int) -> bool, $max - 1);
+                }
+
+                #[test]
+                fn native_endian() {
+                    fn prop(n: $ty_int) -> bool {
+                        let bytes = size_of::<$ty_int>();
+                        let mut buf = [0; 16];
+                        NativeEndian::$write(&mut buf[..bytes], n.clone());
+                        n == NativeEndian::$read(&mut buf[..bytes])
+                    }
+                    qc_sized(prop as fn($ty_int) -> bool, $max - 1);
+                }
+            }
+        );
+    }
+
+    qc_byte_order!(prop_u16, u16, ::core::u16::MAX as u64, read_u16, write_u16);
+    qc_byte_order!(prop_i16, i16, ::core::i16::MAX as u64, read_i16, write_i16);
+    qc_byte_order!(prop_u24, u32, ::test::U24_MAX as u64, read_u24, write_u24);
+    qc_byte_order!(prop_i24, i32, ::test::I24_MAX as u64, read_i24, write_i24);
+    qc_byte_order!(prop_u32, u32, ::core::u32::MAX as u64, read_u32, write_u32);
+    qc_byte_order!(prop_i32, i32, ::core::i32::MAX as u64, read_i32, write_i32);
+    qc_byte_order!(prop_u64, u64, ::core::u64::MAX as u64, read_u64, write_u64);
+    qc_byte_order!(prop_i64, i64, ::core::i64::MAX as u64, read_i64, write_i64);
+    qc_byte_order!(prop_f32, f32, ::core::u64::MAX as u64, read_f32, write_f32);
+    qc_byte_order!(prop_f64, f64, ::core::i64::MAX as u64, read_f64, write_f64);
+
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_u128, Wi128<u128>, 16 + 1, read_u128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_i128, Wi128<i128>, 16 + 1, read_i128, write_i128);
+
+    qc_byte_order!(prop_uint_1,
+        u64, calc_max!(super::U64_MAX, 1), 1, read_uint, write_uint);
+    qc_byte_order!(prop_uint_2,
+        u64, calc_max!(super::U64_MAX, 2), 2, read_uint, write_uint);
+    qc_byte_order!(prop_uint_3,
+        u64, calc_max!(super::U64_MAX, 3), 3, read_uint, write_uint);
+    qc_byte_order!(prop_uint_4,
+        u64, calc_max!(super::U64_MAX, 4), 4, read_uint, write_uint);
+    qc_byte_order!(prop_uint_5,
+        u64, calc_max!(super::U64_MAX, 5), 5, read_uint, write_uint);
+    qc_byte_order!(prop_uint_6,
+        u64, calc_max!(super::U64_MAX, 6), 6, read_uint, write_uint);
+    qc_byte_order!(prop_uint_7,
+        u64, calc_max!(super::U64_MAX, 7), 7, read_uint, write_uint);
+    qc_byte_order!(prop_uint_8,
+        u64, calc_max!(super::U64_MAX, 8), 8, read_uint, write_uint);
+
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_1,
+        Wi128<u128>, 1, 1, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_2,
+        Wi128<u128>, 2, 2, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_3,
+        Wi128<u128>, 3, 3, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_4,
+        Wi128<u128>, 4, 4, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_5,
+        Wi128<u128>, 5, 5, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_6,
+        Wi128<u128>, 6, 6, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_7,
+        Wi128<u128>, 7, 7, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_8,
+        Wi128<u128>, 8, 8, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_9,
+        Wi128<u128>, 9, 9, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_10,
+        Wi128<u128>, 10, 10, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_11,
+        Wi128<u128>, 11, 11, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_12,
+        Wi128<u128>, 12, 12, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_13,
+        Wi128<u128>, 13, 13, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_14,
+        Wi128<u128>, 14, 14, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_15,
+        Wi128<u128>, 15, 15, read_uint128, write_uint128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_uint128_16,
+        Wi128<u128>, 16, 16, read_uint128, write_uint128);
+
+    qc_byte_order!(prop_int_1,
+        i64, calc_max!(super::I64_MAX, 1), 1, read_int, write_int);
+    qc_byte_order!(prop_int_2,
+        i64, calc_max!(super::I64_MAX, 2), 2, read_int, write_int);
+    qc_byte_order!(prop_int_3,
+        i64, calc_max!(super::I64_MAX, 3), 3, read_int, write_int);
+    qc_byte_order!(prop_int_4,
+        i64, calc_max!(super::I64_MAX, 4), 4, read_int, write_int);
+    qc_byte_order!(prop_int_5,
+        i64, calc_max!(super::I64_MAX, 5), 5, read_int, write_int);
+    qc_byte_order!(prop_int_6,
+        i64, calc_max!(super::I64_MAX, 6), 6, read_int, write_int);
+    qc_byte_order!(prop_int_7,
+        i64, calc_max!(super::I64_MAX, 7), 7, read_int, write_int);
+    qc_byte_order!(prop_int_8,
+        i64, calc_max!(super::I64_MAX, 8), 8, read_int, write_int);
+
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_1,
+        Wi128<i128>, 1, 1, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_2,
+        Wi128<i128>, 2, 2, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_3,
+        Wi128<i128>, 3, 3, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_4,
+        Wi128<i128>, 4, 4, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_5,
+        Wi128<i128>, 5, 5, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_6,
+        Wi128<i128>, 6, 6, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_7,
+        Wi128<i128>, 7, 7, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_8,
+        Wi128<i128>, 8, 8, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_9,
+        Wi128<i128>, 9, 9, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_10,
+        Wi128<i128>, 10, 10, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_11,
+        Wi128<i128>, 11, 11, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_12,
+        Wi128<i128>, 12, 12, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_13,
+        Wi128<i128>, 13, 13, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_14,
+        Wi128<i128>, 14, 14, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_15,
+        Wi128<i128>, 15, 15, read_int128, write_int128);
+    #[cfg(feature = "i128")]
+    qc_byte_order!(prop_int128_16,
+        Wi128<i128>, 16, 16, read_int128, write_int128);
+
+
+    // Test that all of the byte conversion functions panic when given a
+    // buffer that is too small.
+    //
+    // These tests are critical to ensure safety, otherwise we might end up
+    // with a buffer overflow.
+    macro_rules! too_small {
+        ($name:ident, $maximally_small:expr, $zero:expr,
+         $read:ident, $write:ident) => (
+            mod $name {
+                use {BigEndian, ByteOrder, NativeEndian, LittleEndian};
+
+                #[test]
+                #[should_panic]
+                fn read_big_endian() {
+                    let buf = [0; $maximally_small];
+                    BigEndian::$read(&buf);
+                }
+
+                #[test]
+                #[should_panic]
+                fn read_little_endian() {
+                    let buf = [0; $maximally_small];
+                    LittleEndian::$read(&buf);
+                }
+
+                #[test]
+                #[should_panic]
+                fn read_native_endian() {
+                    let buf = [0; $maximally_small];
+                    NativeEndian::$read(&buf);
+                }
+
+                #[test]
+                #[should_panic]
+                fn write_big_endian() {
+                    let mut buf = [0; $maximally_small];
+                    BigEndian::$write(&mut buf, $zero);
+                }
+
+                #[test]
+                #[should_panic]
+                fn write_little_endian() {
+                    let mut buf = [0; $maximally_small];
+                    LittleEndian::$write(&mut buf, $zero);
+                }
+
+                #[test]
+                #[should_panic]
+                fn write_native_endian() {
+                    let mut buf = [0; $maximally_small];
+                    NativeEndian::$write(&mut buf, $zero);
+                }
+            }
+        );
+        ($name:ident, $maximally_small:expr, $read:ident) => (
+            mod $name {
+                use {BigEndian, ByteOrder, NativeEndian, LittleEndian};
+
+                #[test]
+                #[should_panic]
+                fn read_big_endian() {
+                    let buf = [0; $maximally_small];
+                    BigEndian::$read(&buf, $maximally_small + 1);
+                }
+
+                #[test]
+                #[should_panic]
+                fn read_little_endian() {
+                    let buf = [0; $maximally_small];
+                    LittleEndian::$read(&buf, $maximally_small + 1);
+                }
+
+                #[test]
+                #[should_panic]
+                fn read_native_endian() {
+                    let buf = [0; $maximally_small];
+                    NativeEndian::$read(&buf, $maximally_small + 1);
+                }
+            }
+        );
+    }
+
+    too_small!(small_u16, 1, 0, read_u16, write_u16);
+    too_small!(small_i16, 1, 0, read_i16, write_i16);
+    too_small!(small_u32, 3, 0, read_u32, write_u32);
+    too_small!(small_i32, 3, 0, read_i32, write_i32);
+    too_small!(small_u64, 7, 0, read_u64, write_u64);
+    too_small!(small_i64, 7, 0, read_i64, write_i64);
+    too_small!(small_f32, 3, 0.0, read_f32, write_f32);
+    too_small!(small_f64, 7, 0.0, read_f64, write_f64);
+    #[cfg(feature = "i128")]
+    too_small!(small_u128, 15, 0, read_u128, write_u128);
+    #[cfg(feature = "i128")]
+    too_small!(small_i128, 15, 0, read_i128, write_i128);
+
+    too_small!(small_uint_1, 1, read_uint);
+    too_small!(small_uint_2, 2, read_uint);
+    too_small!(small_uint_3, 3, read_uint);
+    too_small!(small_uint_4, 4, read_uint);
+    too_small!(small_uint_5, 5, read_uint);
+    too_small!(small_uint_6, 6, read_uint);
+    too_small!(small_uint_7, 7, read_uint);
+
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_1, 1, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_2, 2, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_3, 3, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_4, 4, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_5, 5, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_6, 6, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_7, 7, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_8, 8, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_9, 9, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_10, 10, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_11, 11, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_12, 12, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_13, 13, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_14, 14, read_uint128);
+    #[cfg(feature = "i128")]
+    too_small!(small_uint128_15, 15, read_uint128);
+
+    too_small!(small_int_1, 1, read_int);
+    too_small!(small_int_2, 2, read_int);
+    too_small!(small_int_3, 3, read_int);
+    too_small!(small_int_4, 4, read_int);
+    too_small!(small_int_5, 5, read_int);
+    too_small!(small_int_6, 6, read_int);
+    too_small!(small_int_7, 7, read_int);
+
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_1, 1, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_2, 2, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_3, 3, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_4, 4, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_5, 5, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_6, 6, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_7, 7, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_8, 8, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_9, 9, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_10, 10, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_11, 11, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_12, 12, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_13, 13, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_14, 14, read_int128);
+    #[cfg(feature = "i128")]
+    too_small!(small_int128_15, 15, read_int128);
+
+    // Test that reading/writing slices enforces the correct lengths.
+    macro_rules! slice_lengths {
+        ($name:ident, $read:ident, $write:ident,
+         $num_bytes:expr, $numbers:expr) => {
+            mod $name {
+                use {ByteOrder, BigEndian, NativeEndian, LittleEndian};
+
+                #[test]
+                #[should_panic]
+                fn read_big_endian() {
+                    let bytes = [0; $num_bytes];
+                    let mut numbers = $numbers;
+                    BigEndian::$read(&bytes, &mut numbers);
+                }
+
+                #[test]
+                #[should_panic]
+                fn read_little_endian() {
+                    let bytes = [0; $num_bytes];
+                    let mut numbers = $numbers;
+                    LittleEndian::$read(&bytes, &mut numbers);
+                }
+
+                #[test]
+                #[should_panic]
+                fn read_native_endian() {
+                    let bytes = [0; $num_bytes];
+                    let mut numbers = $numbers;
+                    NativeEndian::$read(&bytes, &mut numbers);
+                }
+
+                #[test]
+                #[should_panic]
+                fn write_big_endian() {
+                    let mut bytes = [0; $num_bytes];
+                    let numbers = $numbers;
+                    BigEndian::$write(&numbers, &mut bytes);
+                }
+
+                #[test]
+                #[should_panic]
+                fn write_little_endian() {
+                    let mut bytes = [0; $num_bytes];
+                    let numbers = $numbers;
+                    LittleEndian::$write(&numbers, &mut bytes);
+                }
+
+                #[test]
+                #[should_panic]
+                fn write_native_endian() {
+                    let mut bytes = [0; $num_bytes];
+                    let numbers = $numbers;
+                    NativeEndian::$write(&numbers, &mut bytes);
+                }
+            }
+        }
+    }
+
+    slice_lengths!(
+        slice_len_too_small_u16, read_u16_into, write_u16_into, 3, [0, 0]);
+    slice_lengths!(
+        slice_len_too_big_u16, read_u16_into, write_u16_into, 5, [0, 0]);
+    slice_lengths!(
+        slice_len_too_small_i16, read_i16_into, write_i16_into, 3, [0, 0]);
+    slice_lengths!(
+        slice_len_too_big_i16, read_i16_into, write_i16_into, 5, [0, 0]);
+
+    slice_lengths!(
+        slice_len_too_small_u32, read_u32_into, write_u32_into, 7, [0, 0]);
+    slice_lengths!(
+        slice_len_too_big_u32, read_u32_into, write_u32_into, 9, [0, 0]);
+    slice_lengths!(
+        slice_len_too_small_i32, read_i32_into, write_i32_into, 7, [0, 0]);
+    slice_lengths!(
+        slice_len_too_big_i32, read_i32_into, write_i32_into, 9, [0, 0]);
+
+    slice_lengths!(
+        slice_len_too_small_u64, read_u64_into, write_u64_into, 15, [0, 0]);
+    slice_lengths!(
+        slice_len_too_big_u64, read_u64_into, write_u64_into, 17, [0, 0]);
+    slice_lengths!(
+        slice_len_too_small_i64, read_i64_into, write_i64_into, 15, [0, 0]);
+    slice_lengths!(
+        slice_len_too_big_i64, read_i64_into, write_i64_into, 17, [0, 0]);
+
+    #[cfg(feature = "i128")]
+    slice_lengths!(
+        slice_len_too_small_u128, read_u128_into, write_u128_into, 31, [0, 0]);
+    #[cfg(feature = "i128")]
+    slice_lengths!(
+        slice_len_too_big_u128, read_u128_into, write_u128_into, 33, [0, 0]);
+    #[cfg(feature = "i128")]
+    slice_lengths!(
+        slice_len_too_small_i128, read_i128_into, write_i128_into, 31, [0, 0]);
+    #[cfg(feature = "i128")]
+    slice_lengths!(
+        slice_len_too_big_i128, read_i128_into, write_i128_into, 33, [0, 0]);
+
+    #[test]
+    fn uint_bigger_buffer() {
+        use {ByteOrder, LittleEndian};
+        let n = LittleEndian::read_uint(&[1, 2, 3, 4, 5, 6, 7, 8], 5);
+        assert_eq!(n, 0x0504030201);
+    }
+
+    #[test]
+    fn read_snan() {
+        use core::f32;
+        use core::f64;
+        use core::mem::transmute;
+
+        use {ByteOrder, BigEndian, LittleEndian};
+
+        let sf = BigEndian::read_f32(&[0xFF, 0x80, 0x00, 0x01]);
+        let sbits: u32 = unsafe { transmute(sf) };
+        assert_eq!(sbits, unsafe { transmute(f32::NAN) });
+        assert_eq!(sf.classify(), ::core::num::FpCategory::Nan);
+
+        let df = BigEndian::read_f64(&[0x7F, 0xF0, 0, 0, 0, 0, 0, 0x01]);
+        let dbits: u64 = unsafe { ::core::mem::transmute(df) };
+        assert_eq!(dbits, unsafe { transmute(f64::NAN) });
+        assert_eq!(df.classify(), ::core::num::FpCategory::Nan);
+
+        let sf = LittleEndian::read_f32(&[0x01, 0x00, 0x80, 0xFF]);
+        let sbits: u32 = unsafe { transmute(sf) };
+        assert_eq!(sbits, unsafe { transmute(f32::NAN) });
+        assert_eq!(sf.classify(), ::core::num::FpCategory::Nan);
+
+        let df = LittleEndian::read_f64(&[0x01, 0, 0, 0, 0, 0, 0xF0, 0x7F]);
+        let dbits: u64 = unsafe { ::core::mem::transmute(df) };
+        assert_eq!(dbits, unsafe { transmute(f64::NAN) });
+        assert_eq!(df.classify(), ::core::num::FpCategory::Nan);
+    }
+}
+
+#[cfg(test)]
+#[cfg(feature = "std")]
+mod stdtests {
+    extern crate quickcheck;
+    extern crate rand;
+
+    use self::quickcheck::{QuickCheck, StdGen, Testable};
+    use self::rand::thread_rng;
+
+    fn qc_unsized<A: Testable>(f: A) {
+
+        QuickCheck::new()
+            .gen(StdGen::new(thread_rng(), 16))
+            .tests(1_00)
+            .max_tests(10_000)
+            .quickcheck(f);
+    }
+
+    macro_rules! calc_max {
+        ($max:expr, $bytes:expr) => { ($max - 1) >> (8 * (8 - $bytes)) };
+    }
+
+    macro_rules! qc_bytes_ext {
+        ($name:ident, $ty_int:ty, $max:expr,
+         $bytes:expr, $read:ident, $write:ident) => (
+            mod $name {
+                use std::io::Cursor;
+                use {
+                    ReadBytesExt, WriteBytesExt,
+                    BigEndian, NativeEndian, LittleEndian,
+                };
+                #[allow(unused_imports)] use test::{qc_sized, Wi128};
+
+                #[test]
+                fn big_endian() {
+                    fn prop(n: $ty_int) -> bool {
+                        let mut wtr = vec![];
+                        wtr.$write::<BigEndian>(n.clone()).unwrap();
+                        let mut rdr = Vec::new();
+                        rdr.extend(wtr[wtr.len()-$bytes..].iter().map(|&x| x));
+                        let mut rdr = Cursor::new(rdr);
+                        n == rdr.$read::<BigEndian>($bytes).unwrap()
+                    }
+                    qc_sized(prop as fn($ty_int) -> bool, $max);
+                }
+
+                #[test]
+                fn little_endian() {
+                    fn prop(n: $ty_int) -> bool {
+                        let mut wtr = vec![];
+                        wtr.$write::<LittleEndian>(n.clone()).unwrap();
+                        let mut rdr = Cursor::new(wtr);
+                        n == rdr.$read::<LittleEndian>($bytes).unwrap()
+                    }
+                    qc_sized(prop as fn($ty_int) -> bool, $max);
+                }
+
+                #[test]
+                fn native_endian() {
+                    fn prop(n: $ty_int) -> bool {
+                        let mut wtr = vec![];
+                        wtr.$write::<NativeEndian>(n.clone()).unwrap();
+                        let mut rdr = Cursor::new(wtr);
+                        n == rdr.$read::<NativeEndian>($bytes).unwrap()
+                    }
+                    qc_sized(prop as fn($ty_int) -> bool, $max);
+                }
+            }
+        );
+        ($name:ident, $ty_int:ty, $max:expr, $read:ident, $write:ident) => (
+            mod $name {
+                use std::io::Cursor;
+                use {
+                    ReadBytesExt, WriteBytesExt,
+                    BigEndian, NativeEndian, LittleEndian,
+                };
+                #[allow(unused_imports)] use test::{qc_sized, Wi128};
+
+                #[test]
+                fn big_endian() {
+                    fn prop(n: $ty_int) -> bool {
+                        let mut wtr = vec![];
+                        wtr.$write::<BigEndian>(n.clone()).unwrap();
+                        let mut rdr = Cursor::new(wtr);
+                        n == rdr.$read::<BigEndian>().unwrap()
+                    }
+                    qc_sized(prop as fn($ty_int) -> bool, $max - 1);
+                }
+
+                #[test]
+                fn little_endian() {
+                    fn prop(n: $ty_int) -> bool {
+                        let mut wtr = vec![];
+                        wtr.$write::<LittleEndian>(n.clone()).unwrap();
+                        let mut rdr = Cursor::new(wtr);
+                        n == rdr.$read::<LittleEndian>().unwrap()
+                    }
+                    qc_sized(prop as fn($ty_int) -> bool, $max - 1);
+                }
+
+                #[test]
+                fn native_endian() {
+                    fn prop(n: $ty_int) -> bool {
+                        let mut wtr = vec![];
+                        wtr.$write::<NativeEndian>(n.clone()).unwrap();
+                        let mut rdr = Cursor::new(wtr);
+                        n == rdr.$read::<NativeEndian>().unwrap()
+                    }
+                    qc_sized(prop as fn($ty_int) -> bool, $max - 1);
+                }
+            }
+        );
+    }
+
+    qc_bytes_ext!(prop_ext_u16,
+        u16, ::std::u16::MAX as u64, read_u16, write_u16);
+    qc_bytes_ext!(prop_ext_i16,
+        i16, ::std::i16::MAX as u64, read_i16, write_i16);
+    qc_bytes_ext!(prop_ext_u32,
+        u32, ::std::u32::MAX as u64, read_u32, write_u32);
+    qc_bytes_ext!(prop_ext_i32,
+        i32, ::std::i32::MAX as u64, read_i32, write_i32);
+    qc_bytes_ext!(prop_ext_u64,
+        u64, ::std::u64::MAX as u64, read_u64, write_u64);
+    qc_bytes_ext!(prop_ext_i64,
+        i64, ::std::i64::MAX as u64, read_i64, write_i64);
+    qc_bytes_ext!(prop_ext_f32,
+        f32, ::std::u64::MAX as u64, read_f32, write_f32);
+    qc_bytes_ext!(prop_ext_f64,
+        f64, ::std::i64::MAX as u64, read_f64, write_f64);
+
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_u128, Wi128<u128>, 16 + 1, read_u128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_i128, Wi128<i128>, 16 + 1, read_i128, write_i128);
+
+    qc_bytes_ext!(prop_ext_uint_1,
+        u64, calc_max!(::test::U64_MAX, 1), 1, read_uint, write_u64);
+    qc_bytes_ext!(prop_ext_uint_2,
+        u64, calc_max!(::test::U64_MAX, 2), 2, read_uint, write_u64);
+    qc_bytes_ext!(prop_ext_uint_3,
+        u64, calc_max!(::test::U64_MAX, 3), 3, read_uint, write_u64);
+    qc_bytes_ext!(prop_ext_uint_4,
+        u64, calc_max!(::test::U64_MAX, 4), 4, read_uint, write_u64);
+    qc_bytes_ext!(prop_ext_uint_5,
+        u64, calc_max!(::test::U64_MAX, 5), 5, read_uint, write_u64);
+    qc_bytes_ext!(prop_ext_uint_6,
+        u64, calc_max!(::test::U64_MAX, 6), 6, read_uint, write_u64);
+    qc_bytes_ext!(prop_ext_uint_7,
+        u64, calc_max!(::test::U64_MAX, 7), 7, read_uint, write_u64);
+    qc_bytes_ext!(prop_ext_uint_8,
+        u64, calc_max!(::test::U64_MAX, 8), 8, read_uint, write_u64);
+
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_1,
+        Wi128<u128>, 1, 1, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_2,
+        Wi128<u128>, 2, 2, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_3,
+        Wi128<u128>, 3, 3, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_4,
+        Wi128<u128>, 4, 4, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_5,
+        Wi128<u128>, 5, 5, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_6,
+        Wi128<u128>, 6, 6, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_7,
+        Wi128<u128>, 7, 7, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_8,
+        Wi128<u128>, 8, 8, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_9,
+        Wi128<u128>, 9, 9, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_10,
+        Wi128<u128>, 10, 10, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_11,
+        Wi128<u128>, 11, 11, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_12,
+        Wi128<u128>, 12, 12, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_13,
+        Wi128<u128>, 13, 13, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_14,
+        Wi128<u128>, 14, 14, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_15,
+        Wi128<u128>, 15, 15, read_uint128, write_u128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_uint128_16,
+        Wi128<u128>, 16, 16, read_uint128, write_u128);
+
+    qc_bytes_ext!(prop_ext_int_1,
+        i64, calc_max!(::test::I64_MAX, 1), 1, read_int, write_i64);
+    qc_bytes_ext!(prop_ext_int_2,
+        i64, calc_max!(::test::I64_MAX, 2), 2, read_int, write_i64);
+    qc_bytes_ext!(prop_ext_int_3,
+        i64, calc_max!(::test::I64_MAX, 3), 3, read_int, write_i64);
+    qc_bytes_ext!(prop_ext_int_4,
+        i64, calc_max!(::test::I64_MAX, 4), 4, read_int, write_i64);
+    qc_bytes_ext!(prop_ext_int_5,
+        i64, calc_max!(::test::I64_MAX, 5), 5, read_int, write_i64);
+    qc_bytes_ext!(prop_ext_int_6,
+        i64, calc_max!(::test::I64_MAX, 6), 6, read_int, write_i64);
+    qc_bytes_ext!(prop_ext_int_7,
+        i64, calc_max!(::test::I64_MAX, 1), 7, read_int, write_i64);
+    qc_bytes_ext!(prop_ext_int_8,
+        i64, calc_max!(::test::I64_MAX, 8), 8, read_int, write_i64);
+
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_1,
+        Wi128<i128>, 1, 1, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_2,
+        Wi128<i128>, 2, 2, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_3,
+        Wi128<i128>, 3, 3, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_4,
+        Wi128<i128>, 4, 4, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_5,
+        Wi128<i128>, 5, 5, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_6,
+        Wi128<i128>, 6, 6, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_7,
+        Wi128<i128>, 7, 7, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_8,
+        Wi128<i128>, 8, 8, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_9,
+        Wi128<i128>, 9, 9, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_10,
+        Wi128<i128>, 10, 10, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_11,
+        Wi128<i128>, 11, 11, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_12,
+        Wi128<i128>, 12, 12, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_13,
+        Wi128<i128>, 13, 13, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_14,
+        Wi128<i128>, 14, 14, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_15,
+        Wi128<i128>, 15, 15, read_int128, write_i128);
+    #[cfg(feature = "i128")]
+    qc_bytes_ext!(prop_ext_int128_16,
+        Wi128<i128>, 16, 16, read_int128, write_i128);
+
+    // Test slice serialization/deserialization.
+    macro_rules! qc_slice {
+        ($name:ident, $ty_int:ty, $read:ident, $write:ident, $zero:expr) => {
+            mod $name {
+                use core::mem::size_of;
+                use {ByteOrder, BigEndian, NativeEndian, LittleEndian};
+                use super::qc_unsized;
+                #[allow(unused_imports)]
+                use test::Wi128;
+
+                #[test]
+                fn big_endian() {
+                    #[allow(unused_unsafe)]
+                    fn prop(numbers: Vec<$ty_int>) -> bool {
+                        let numbers: Vec<_> = numbers
+                            .into_iter()
+                            .map(|x| x.clone())
+                            .collect();
+                        let num_bytes = size_of::<$ty_int>() * numbers.len();
+                        let mut bytes = vec![0; num_bytes];
+
+                        BigEndian::$write(&numbers, &mut bytes);
+
+                        let mut got = vec![$zero; numbers.len()];
+                        unsafe { BigEndian::$read(&bytes, &mut got); }
+
+                        numbers == got
+                    }
+                    qc_unsized(prop as fn(_) -> bool);
+                }
+
+                #[test]
+                fn little_endian() {
+                    #[allow(unused_unsafe)]
+                    fn prop(numbers: Vec<$ty_int>) -> bool {
+                        let numbers: Vec<_> = numbers
+                            .into_iter()
+                            .map(|x| x.clone())
+                            .collect();
+                        let num_bytes = size_of::<$ty_int>() * numbers.len();
+                        let mut bytes = vec![0; num_bytes];
+
+                        LittleEndian::$write(&numbers, &mut bytes);
+
+                        let mut got = vec![$zero; numbers.len()];
+                        unsafe { LittleEndian::$read(&bytes, &mut got); }
+
+                        numbers == got
+                    }
+                    qc_unsized(prop as fn(_) -> bool);
+                }
+
+                #[test]
+                fn native_endian() {
+                    #[allow(unused_unsafe)]
+                    fn prop(numbers: Vec<$ty_int>) -> bool {
+                        let numbers: Vec<_> = numbers
+                            .into_iter()
+                            .map(|x| x.clone())
+                            .collect();
+                        let num_bytes = size_of::<$ty_int>() * numbers.len();
+                        let mut bytes = vec![0; num_bytes];
+
+                        NativeEndian::$write(&numbers, &mut bytes);
+
+                        let mut got = vec![$zero; numbers.len()];
+                        unsafe { NativeEndian::$read(&bytes, &mut got); }
+
+                        numbers == got
+                    }
+                    qc_unsized(prop as fn(_) -> bool);
+                }
+            }
+        }
+    }
+
+    qc_slice!(prop_slice_u16, u16, read_u16_into, write_u16_into, 0);
+    qc_slice!(prop_slice_i16, i16, read_i16_into, write_i16_into, 0);
+    qc_slice!(prop_slice_u32, u32, read_u32_into, write_u32_into, 0);
+    qc_slice!(prop_slice_i32, i32, read_i32_into, write_i32_into, 0);
+    qc_slice!(prop_slice_u64, u64, read_u64_into, write_u64_into, 0);
+    qc_slice!(prop_slice_i64, i64, read_i64_into, write_i64_into, 0);
+    #[cfg(feature = "i128")]
+    qc_slice!(
+        prop_slice_u128, Wi128<u128>, read_u128_into, write_u128_into, 0);
+    #[cfg(feature = "i128")]
+    qc_slice!(
+        prop_slice_i128, Wi128<i128>, read_i128_into, write_i128_into, 0);
+
+    qc_slice!(
+        prop_slice_f32, f32, read_f32_into_unchecked, write_f32_into, 0.0);
+    qc_slice!(
+        prop_slice_f64, f64, read_f64_into_unchecked, write_f64_into, 0.0);
+}
diff --git a/third_party/rust/byteorder/.cargo-checksum.json b/third_party/rust/byteorder/.cargo-checksum.json
index 666d7025c22e..08bdcd8821dd 100644
--- a/third_party/rust/byteorder/.cargo-checksum.json
+++ b/third_party/rust/byteorder/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".travis.yml":"a798200a7a2a7b499b4c44f0e516cd8975dc5f4b933144d1e2b1523087330b95","CHANGELOG.md":"caa17ca58eafcd282ed7b8bd47ef0670ce30a20aad339bf2758469f09fa4559d","COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"0e636678a02b111d1ebdfdc8ac5a835a2a41370028eeadf6d5fbfd3239f531f8","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"0559514b9d7488e96fb7a2f3c043a62fadf3495a1e10602d109ce79ee67da998","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","benches/bench.rs":"250d46461a0529a856d76a6421fd45c499bccba2c532e05dbf438c94582a8eac","src/io.rs":"5429f522221b3cce8a5c90fba7ad98b0ddad4fab44acc39763e6adabd511c021","src/lib.rs":"d31f218ca1892bea2812dd575ceb700779de704dc8bf1b9a778315ab75343c5d"},"package":"ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d"}
\ No newline at end of file
+{"files":{".travis.yml":"a798200a7a2a7b499b4c44f0e516cd8975dc5f4b933144d1e2b1523087330b95","CHANGELOG.md":"750ff16a714caad77a272a62b4baed5ea113ead2846f8c3968342e592a99ecd5","COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"cd633b2d76dd5d57191388e7cc31340eb2d6b89e2f98f587999dc685d977c673","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"97c01a66dbff4615acd49a8c3a85d137bf29cc113fa514910195bb11aef445bc","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","benches/bench.rs":"250d46461a0529a856d76a6421fd45c499bccba2c532e05dbf438c94582a8eac","src/io.rs":"4221711399f9723ef21c5b07700b8e9319f6f665b1eaaceb49528f6e976a25a9","src/lib.rs":"07e5f53bf3b9e30f1da9f4cf37797b77ce3d16c9f2a3a3e56669dd323debd1b9"},"package":"652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23"}
\ No newline at end of file
diff --git a/third_party/rust/byteorder/CHANGELOG.md b/third_party/rust/byteorder/CHANGELOG.md
index 0909791e782b..d59eaa7c5a81 100644
--- a/third_party/rust/byteorder/CHANGELOG.md
+++ b/third_party/rust/byteorder/CHANGELOG.md
@@ -1,3 +1,25 @@
+1.2.1
+=====
+This patch release removes more unnecessary uses of `unsafe` that
+were overlooked in the prior `1.2.0` release. In particular, the
+`ReadBytesExt::read_{f32,f64}_into_checked` methods have been deprecated and
+replaced by more appropriately named `read_{f32,f64}_into` methods.
+
+
+1.2.0
+=====
+The most prominent change in this release of `byteorder` is the removal of
+unnecessary signaling NaN masking, and in turn, the `unsafe` annotations
+associated with methods that didn't do masking. See
+[#103](https://github.com/BurntSushi/byteorder/issues/103)
+for more details.
+
+* [BUG #102](https://github.com/BurntSushi/byteorder/issues/102):
+  Fix big endian tests.
+* [BUG #103](https://github.com/BurntSushi/byteorder/issues/103):
+  Remove sNaN masking.
+
+
 1.1.0
 =====
 This release of `byteorder` features a number of fixes and improvements, mostly
diff --git a/third_party/rust/byteorder/Cargo.toml b/third_party/rust/byteorder/Cargo.toml
index 424fad8bff62..06a18e205621 100644
--- a/third_party/rust/byteorder/Cargo.toml
+++ b/third_party/rust/byteorder/Cargo.toml
@@ -12,7 +12,7 @@
 
 [package]
 name = "byteorder"
-version = "1.1.0"
+version = "1.2.1"
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = "Library for reading/writing numbers in big-endian and little-endian."
 homepage = "https://github.com/BurntSushi/byteorder"
@@ -28,17 +28,16 @@ opt-level = 3
 [lib]
 name = "byteorder"
 bench = false
-[dev-dependencies.rand]
-version = "0.3"
-
 [dev-dependencies.quickcheck]
 version = "0.4"
 default-features = false
 
+[dev-dependencies.rand]
+version = "0.3"
+
 [features]
 default = ["std"]
 i128 = []
 std = []
 [badges.travis-ci]
-branch = "master"
-repository = "https://github.com/BurntSushi/byteorder"
+repository = "BurntSushi/byteorder"
diff --git a/third_party/rust/byteorder/README.md b/third_party/rust/byteorder/README.md
index 298a99d3468a..f282ab72e0b3 100644
--- a/third_party/rust/byteorder/README.md
+++ b/third_party/rust/byteorder/README.md
@@ -1,7 +1,7 @@
 This crate provides convenience methods for encoding and decoding numbers in
 either big-endian or little-endian order.
 
-[![Build status](https://api.travis-ci.org/BurntSushi/byteorder.png)](https://travis-ci.org/BurntSushi/byteorder)
+[![Build status](https://api.travis-ci.org/BurntSushi/byteorder.svg)](https://travis-ci.org/BurntSushi/byteorder)
 [![](http://meritbadge.herokuapp.com/byteorder)](https://crates.io/crates/byteorder)
 
 Dual-licensed under MIT or the [UNLICENSE](http://unlicense.org).
diff --git a/third_party/rust/byteorder/src/io.rs b/third_party/rust/byteorder/src/io.rs
index 208596ab18dd..c5645fa17f27 100644
--- a/third_party/rust/byteorder/src/io.rs
+++ b/third_party/rust/byteorder/src/io.rs
@@ -1,6 +1,5 @@
 use std::io::{self, Result};
 use std::slice;
-// use std::mem::transmute;
 
 use ByteOrder;
 
@@ -509,7 +508,7 @@ pub trait ReadBytesExt: io::Read {
     #[inline]
     fn read_u16_into<T: ByteOrder>(&mut self, dst: &mut [u16]) -> Result<()> {
         {
-            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            let buf = unsafe { slice_to_u8_mut(dst) };
             try!(self.read_exact(buf));
         }
         T::from_slice_u16(dst);
@@ -544,7 +543,7 @@ pub trait ReadBytesExt: io::Read {
     #[inline]
     fn read_u32_into<T: ByteOrder>(&mut self, dst: &mut [u32]) -> Result<()> {
         {
-            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            let buf = unsafe { slice_to_u8_mut(dst) };
             try!(self.read_exact(buf));
         }
         T::from_slice_u32(dst);
@@ -582,7 +581,7 @@ pub trait ReadBytesExt: io::Read {
     #[inline]
     fn read_u64_into<T: ByteOrder>(&mut self, dst: &mut [u64]) -> Result<()> {
         {
-            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            let buf = unsafe { slice_to_u8_mut(dst) };
             try!(self.read_exact(buf));
         }
         T::from_slice_u64(dst);
@@ -659,7 +658,7 @@ pub trait ReadBytesExt: io::Read {
     #[inline]
     fn read_i16_into<T: ByteOrder>(&mut self, dst: &mut [i16]) -> Result<()> {
         {
-            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            let buf = unsafe { slice_to_u8_mut(dst) };
             try!(self.read_exact(buf));
         }
         T::from_slice_i16(dst);
@@ -694,7 +693,7 @@ pub trait ReadBytesExt: io::Read {
     #[inline]
     fn read_i32_into<T: ByteOrder>(&mut self, dst: &mut [i32]) -> Result<()> {
         {
-            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            let buf = unsafe { slice_to_u8_mut(dst) };
             try!(self.read_exact(buf));
         }
         T::from_slice_i32(dst);
@@ -732,7 +731,7 @@ pub trait ReadBytesExt: io::Read {
     #[inline]
     fn read_i64_into<T: ByteOrder>(&mut self, dst: &mut [i64]) -> Result<()> {
         {
-            let mut buf = unsafe { slice_to_u8_mut(dst) };
+            let buf = unsafe { slice_to_u8_mut(dst) };
             try!(self.read_exact(buf));
         }
         T::from_slice_i64(dst);
@@ -787,11 +786,53 @@ pub trait ReadBytesExt: io::Read {
     /// The given buffer is either filled completely or an error is returned.
     /// If an error is returned, the contents of `dst` are unspecified.
     ///
-    /// # Safety
+    /// # Errors
     ///
-    /// This method is unsafe because there are no guarantees made about the
-    /// floating point values. In particular, this method does not check for
-    /// signaling NaNs, which may result in undefined behavior.
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a sequence of big-endian single-precision floating point number
+    /// from a `Read`:
+    ///
+    /// ```rust
+    /// use std::f32;
+    /// use std::io::Cursor;
+    ///
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![
+    ///     0x40, 0x49, 0x0f, 0xdb,
+    ///     0x3f, 0x80, 0x00, 0x00,
+    /// ]);
+    /// let mut dst = [0.0; 2];
+    /// rdr.read_f32_into::<BigEndian>(&mut dst).unwrap();
+    /// assert_eq!([f32::consts::PI, 1.0], dst);
+    /// ```
+    #[inline]
+    fn read_f32_into<T: ByteOrder>(
+        &mut self,
+        dst: &mut [f32],
+    ) -> Result<()> {
+        {
+            let buf = unsafe { slice_to_u8_mut(dst) };
+            try!(self.read_exact(buf));
+        }
+        T::from_slice_f32(dst);
+        Ok(())
+    }
+
+    /// **DEPRECATED**.
+    ///
+    /// This method is deprecated. Use `read_f32_into` instead.
+    ///
+    /// Reads a sequence of IEEE754 single-precision (4 bytes) floating
+    /// point numbers from the underlying reader.
+    ///
+    /// The given buffer is either filled completely or an error is returned.
+    /// If an error is returned, the contents of `dst` are unspecified.
     ///
     /// # Errors
     ///
@@ -815,24 +856,65 @@ pub trait ReadBytesExt: io::Read {
     ///     0x3f, 0x80, 0x00, 0x00,
     /// ]);
     /// let mut dst = [0.0; 2];
-    /// unsafe {
-    ///     rdr.read_f32_into_unchecked::<BigEndian>(&mut dst).unwrap();
-    /// }
+    /// rdr.read_f32_into_unchecked::<BigEndian>(&mut dst).unwrap();
     /// assert_eq!([f32::consts::PI, 1.0], dst);
     /// ```
     #[inline]
-    unsafe fn read_f32_into_unchecked<T: ByteOrder>(
+    fn read_f32_into_unchecked<T: ByteOrder>(
         &mut self,
         dst: &mut [f32],
+    ) -> Result<()> {
+        self.read_f32_into::<T>(dst)
+    }
+
+    /// Reads a sequence of IEEE754 double-precision (8 bytes) floating
+    /// point numbers from the underlying reader.
+    ///
+    /// The given buffer is either filled completely or an error is returned.
+    /// If an error is returned, the contents of `dst` are unspecified.
+    ///
+    /// # Errors
+    ///
+    /// This method returns the same errors as [`Read::read_exact`].
+    ///
+    /// [`Read::read_exact`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_exact
+    ///
+    /// # Examples
+    ///
+    /// Read a sequence of big-endian single-precision floating point number
+    /// from a `Read`:
+    ///
+    /// ```rust
+    /// use std::f64;
+    /// use std::io::Cursor;
+    ///
+    /// use byteorder::{BigEndian, ReadBytesExt};
+    ///
+    /// let mut rdr = Cursor::new(vec![
+    ///     0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18,
+    ///     0x3f, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    /// ]);
+    /// let mut dst = [0.0; 2];
+    /// rdr.read_f64_into::<BigEndian>(&mut dst).unwrap();
+    /// assert_eq!([f64::consts::PI, 1.0], dst);
+    /// ```
+    #[inline]
+    fn read_f64_into<T: ByteOrder>(
+        &mut self,
+        dst: &mut [f64],
     ) -> Result<()> {
         {
-            let mut buf = slice_to_u8_mut(dst);
+            let buf = unsafe { slice_to_u8_mut(dst) };
             try!(self.read_exact(buf));
         }
-        T::from_slice_f32(dst);
+        T::from_slice_f64(dst);
         Ok(())
     }
 
+    /// **DEPRECATED**.
+    ///
+    /// This method is deprecated. Use `read_f64_into` instead.
+    ///
     /// Reads a sequence of IEEE754 double-precision (8 bytes) floating
     /// point numbers from the underlying reader.
     ///
@@ -867,22 +949,15 @@ pub trait ReadBytesExt: io::Read {
     ///     0x3f, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     /// ]);
     /// let mut dst = [0.0; 2];
-    /// unsafe {
-    ///     rdr.read_f64_into_unchecked::<BigEndian>(&mut dst).unwrap();
-    /// }
+    /// rdr.read_f64_into_unchecked::<BigEndian>(&mut dst).unwrap();
     /// assert_eq!([f64::consts::PI, 1.0], dst);
     /// ```
     #[inline]
-    unsafe fn read_f64_into_unchecked<T: ByteOrder>(
+    fn read_f64_into_unchecked<T: ByteOrder>(
         &mut self,
         dst: &mut [f64],
     ) -> Result<()> {
-        {
-            let mut buf = slice_to_u8_mut(dst);
-            try!(self.read_exact(buf));
-        }
-        T::from_slice_f64(dst);
-        Ok(())
+        self.read_f64_into::<T>(dst)
     }
 }
 
diff --git a/third_party/rust/byteorder/src/lib.rs b/third_party/rust/byteorder/src/lib.rs
index b60fe7ca4c0f..0654e88d0c3d 100644
--- a/third_party/rust/byteorder/src/lib.rs
+++ b/third_party/rust/byteorder/src/lib.rs
@@ -40,7 +40,7 @@ assert_eq!(wtr, vec![5, 2, 0, 3]);
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "i128", feature(i128_type))]
 #![cfg_attr(all(feature = "i128", test), feature(i128))]
-#![doc(html_root_url = "https://docs.rs/byteorder/1.0.0")]
+#![doc(html_root_url = "https://docs.rs/byteorder/1.2.1")]
 
 #[cfg(feature = "std")]
 extern crate core;
@@ -611,9 +611,6 @@ pub trait ByteOrder
 
     /// Reads a IEEE754 single-precision (4 bytes) floating point number.
     ///
-    /// The return value is always defined; signaling NaN's may be turned into
-    /// quiet NaN's.
-    ///
     /// # Panics
     ///
     /// Panics when `buf.len() < 4`.
@@ -632,14 +629,11 @@ pub trait ByteOrder
     /// ```
     #[inline]
     fn read_f32(buf: &[u8]) -> f32 {
-        safe_u32_bits_to_f32(Self::read_u32(buf))
+        unsafe { transmute(Self::read_u32(buf)) }
     }
 
     /// Reads a IEEE754 double-precision (8 bytes) floating point number.
     ///
-    /// The return value is always defined; signaling NaN's may be turned into
-    /// quiet NaN's.
-    ///
     /// # Panics
     ///
     /// Panics when `buf.len() < 8`.
@@ -658,7 +652,7 @@ pub trait ByteOrder
     /// ```
     #[inline]
     fn read_f64(buf: &[u8]) -> f64 {
-        safe_u64_bits_to_f64(Self::read_u64(buf))
+        unsafe { transmute(Self::read_u64(buf)) }
     }
 
     /// Writes a signed 16 bit integer `n` to `buf`.
@@ -1066,12 +1060,6 @@ pub trait ByteOrder
     /// Reads IEEE754 single-precision (4 bytes) floating point numbers from
     /// `src` into `dst`.
     ///
-    /// Note that this does not perform any checks on the floating point
-    /// conversion. In particular, if the `src` data encodes an undefined
-    /// floating point value for your environment, then the result may be
-    /// undefined behavior. For example, this function may produce signaling
-    /// NaN floating point values.
-    ///
     /// # Panics
     ///
     /// Panics when `src.len() != 4*dst.len()`.
@@ -1088,25 +1076,17 @@ pub trait ByteOrder
     /// LittleEndian::write_f32_into(&numbers_given, &mut bytes);
     ///
     /// let mut numbers_got = [0.0; 4];
-    /// unsafe {
-    ///     LittleEndian::read_f32_into_unchecked(&bytes, &mut numbers_got);
-    /// }
+    /// LittleEndian::read_f32_into_unchecked(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
     #[inline]
-    unsafe fn read_f32_into_unchecked(src: &[u8], dst: &mut [f32]) {
-        Self::read_u32_into(src, transmute(dst));
+    fn read_f32_into_unchecked(src: &[u8], dst: &mut [f32]) {
+        Self::read_u32_into(src, unsafe { transmute(dst) });
     }
 
     /// Reads IEEE754 single-precision (4 bytes) floating point numbers from
     /// `src` into `dst`.
     ///
-    /// Note that this does not perform any checks on the floating point
-    /// conversion. In particular, if the `src` data encodes an undefined
-    /// floating point value for your environment, then the result may be
-    /// undefined behavior. For example, this function may produce signaling
-    /// NaN floating point values.
-    ///
     /// # Panics
     ///
     /// Panics when `src.len() != 8*dst.len()`.
@@ -1123,14 +1103,12 @@ pub trait ByteOrder
     /// LittleEndian::write_f64_into(&numbers_given, &mut bytes);
     ///
     /// let mut numbers_got = [0.0; 4];
-    /// unsafe {
-    ///     LittleEndian::read_f64_into_unchecked(&bytes, &mut numbers_got);
-    /// }
+    /// LittleEndian::read_f64_into_unchecked(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
     #[inline]
-    unsafe fn read_f64_into_unchecked(src: &[u8], dst: &mut [f64]) {
-        Self::read_u64_into(src, transmute(dst));
+    fn read_f64_into_unchecked(src: &[u8], dst: &mut [f64]) {
+        Self::read_u64_into(src, unsafe { transmute(dst) });
     }
 
     /// Writes unsigned 16 bit integers from `src` into `dst`.
@@ -1590,10 +1568,6 @@ pub trait ByteOrder
     ///
     /// If the endianness matches the endianness of the host platform, then
     /// this is a no-op.
-    ///
-    /// Note that the results of this operation are guaranteed to be defined.
-    /// In particular, this method may replace signaling NaN values with
-    /// quiet NaN values.
     fn from_slice_f32(numbers: &mut [f32]);
 
     /// Converts the given slice of IEEE754 double-precision (8 bytes) floating
@@ -1601,10 +1575,6 @@ pub trait ByteOrder
     ///
     /// If the endianness matches the endianness of the host platform, then
     /// this is a no-op.
-    ///
-    /// Note that the results of this operation are guaranteed to be defined.
-    /// In particular, this method may replace signaling NaN values with
-    /// quiet NaN values.
     fn from_slice_f64(numbers: &mut [f64]);
 }
 
@@ -1964,7 +1934,7 @@ impl ByteOrder for BigEndian {
         if cfg!(target_endian = "little") {
             for n in numbers {
                 let int: u32 = unsafe { transmute(*n) };
-                *n = safe_u32_bits_to_f32(int.to_be());
+                *n = unsafe { transmute(int.to_be()) };
             }
         }
     }
@@ -1974,7 +1944,7 @@ impl ByteOrder for BigEndian {
         if cfg!(target_endian = "little") {
             for n in numbers {
                 let int: u64 = unsafe { transmute(*n) };
-                *n = safe_u64_bits_to_f64(int.to_be());
+                *n = unsafe { transmute(int.to_be()) };
             }
         }
     }
@@ -2167,7 +2137,7 @@ impl ByteOrder for LittleEndian {
         if cfg!(target_endian = "big") {
             for n in numbers {
                 let int: u32 = unsafe { transmute(*n) };
-                *n = safe_u32_bits_to_f32(int.to_le());
+                *n = unsafe { transmute(int.to_le()) };
             }
         }
     }
@@ -2177,50 +2147,12 @@ impl ByteOrder for LittleEndian {
         if cfg!(target_endian = "big") {
             for n in numbers {
                 let int: u64 = unsafe { transmute(*n) };
-                *n = safe_u64_bits_to_f64(int.to_le());
+                *n = unsafe { transmute(int.to_le()) };
             }
         }
     }
 }
 
-#[inline]
-fn safe_u32_bits_to_f32(u: u32) -> f32 {
-    use core::f32::NAN;
-
-    const EXP_MASK: u32 = 0x7F800000;
-    const FRACT_MASK: u32 = 0x007FFFFF;
-
-    if u & EXP_MASK == EXP_MASK && u & FRACT_MASK != 0 {
-        // While IEEE 754-2008 specifies encodings for quiet NaNs and
-        // signaling ones, certains MIPS and PA-RISC CPUs treat signaling
-        // NaNs differently. Therefore, to be safe, we pass a known quiet
-        // NaN if u is any kind of NaN. The check above only assumes
-        // IEEE 754-1985 to be valid.
-        NAN
-    } else {
-        unsafe { transmute(u) }
-    }
-}
-
-#[inline]
-fn safe_u64_bits_to_f64(u: u64) -> f64 {
-    use core::f64::NAN;
-
-    const EXP_MASK: u64 = 0x7FF0000000000000;
-    const FRACT_MASK: u64 = 0x000FFFFFFFFFFFFF;
-
-    if u & EXP_MASK == EXP_MASK && u & FRACT_MASK != 0 {
-        // While IEEE 754-2008 specifies encodings for quiet NaNs and
-        // signaling ones, certains MIPS and PA-RISC CPUs treat signaling
-        // NaNs differently. Therefore, to be safe, we pass a known quiet
-        // NaN if u is any kind of NaN. The check above only assumes
-        // IEEE 754-1985 to be valid.
-        NAN
-    } else {
-        unsafe { transmute(u) }
-    }
-}
-
 #[cfg(test)]
 mod test {
     extern crate quickcheck;
@@ -2796,35 +2728,6 @@ mod test {
         let n = LittleEndian::read_uint(&[1, 2, 3, 4, 5, 6, 7, 8], 5);
         assert_eq!(n, 0x0504030201);
     }
-
-    #[test]
-    fn read_snan() {
-        use core::f32;
-        use core::f64;
-        use core::mem::transmute;
-
-        use {ByteOrder, BigEndian, LittleEndian};
-
-        let sf = BigEndian::read_f32(&[0xFF, 0x80, 0x00, 0x01]);
-        let sbits: u32 = unsafe { transmute(sf) };
-        assert_eq!(sbits, unsafe { transmute(f32::NAN) });
-        assert_eq!(sf.classify(), ::core::num::FpCategory::Nan);
-
-        let df = BigEndian::read_f64(&[0x7F, 0xF0, 0, 0, 0, 0, 0, 0x01]);
-        let dbits: u64 = unsafe { ::core::mem::transmute(df) };
-        assert_eq!(dbits, unsafe { transmute(f64::NAN) });
-        assert_eq!(df.classify(), ::core::num::FpCategory::Nan);
-
-        let sf = LittleEndian::read_f32(&[0x01, 0x00, 0x80, 0xFF]);
-        let sbits: u32 = unsafe { transmute(sf) };
-        assert_eq!(sbits, unsafe { transmute(f32::NAN) });
-        assert_eq!(sf.classify(), ::core::num::FpCategory::Nan);
-
-        let df = LittleEndian::read_f64(&[0x01, 0, 0, 0, 0, 0, 0xF0, 0x7F]);
-        let dbits: u64 = unsafe { ::core::mem::transmute(df) };
-        assert_eq!(dbits, unsafe { transmute(f64::NAN) });
-        assert_eq!(df.classify(), ::core::num::FpCategory::Nan);
-    }
 }
 
 #[cfg(test)]
@@ -2865,9 +2768,8 @@ mod stdtests {
                     fn prop(n: $ty_int) -> bool {
                         let mut wtr = vec![];
                         wtr.$write::<BigEndian>(n.clone()).unwrap();
-                        let mut rdr = Vec::new();
-                        rdr.extend(wtr[wtr.len()-$bytes..].iter().map(|&x| x));
-                        let mut rdr = Cursor::new(rdr);
+                        let offset = wtr.len() - $bytes;
+                        let mut rdr = Cursor::new(&mut wtr[offset..]);
                         n == rdr.$read::<BigEndian>($bytes).unwrap()
                     }
                     qc_sized(prop as fn($ty_int) -> bool, $max);
@@ -2889,7 +2791,12 @@ mod stdtests {
                     fn prop(n: $ty_int) -> bool {
                         let mut wtr = vec![];
                         wtr.$write::<NativeEndian>(n.clone()).unwrap();
-                        let mut rdr = Cursor::new(wtr);
+                        let offset = if cfg!(target_endian = "big") {
+                            wtr.len() - $bytes
+                        } else {
+                            0
+                        };
+                        let mut rdr = Cursor::new(&mut wtr[offset..]);
                         n == rdr.$read::<NativeEndian>($bytes).unwrap()
                     }
                     qc_sized(prop as fn($ty_int) -> bool, $max);
diff --git a/third_party/rust/dwrote/.cargo-checksum.json b/third_party/rust/dwrote/.cargo-checksum.json
index c96d7485093d..fb8cfe8b9745 100644
--- a/third_party/rust/dwrote/.cargo-checksum.json
+++ b/third_party/rust/dwrote/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"48059bb4b7efd1a6c2d659fa909888f2c8b5d34f0bd8027b4aefaae9b8d0586e","README.md":"d69d75705e2582721cbfb2d3b4b2af052c71679057a0b2ac53a22c03f1755bba","appveyor.yml":"2c7b2468dc69bef84860b8900024cb6e1a1c52f6fe1232e8ccd83caaf7c231ca","src/bitmap_render_target.rs":"d3b229f85a9804ac52976431657727b410e7d5253283df046e46d98c196f0a3a","src/com_helpers.rs":"fccb4b36379ae3454a88aa32a8e5c09e46ef5f5626266dde1fe5f40a992de39c","src/comptr.rs":"218435689f505769686e07cfc5428852dda90b849a0d48e670f632307f5edc7c","src/font.rs":"9bdf3134c6ad3639eab3da4419c9b43aad2673797f6fdc65841da2c82e1f3af4","src/font_collection.rs":"969fa3abf141dc3504774886f4783fda4a74cd5a198c643f8a77fc1af4e75258","src/font_face.rs":"9506ca579345ab2b6b5615fc75f8f431e2bb0dbd93123d1d2a21a73c851a5427","src/font_family.rs":"403da9f8f9903cbe7f9f79636497b273f9885e200f53af99f9d4e483f11d6889","src/font_file.rs":"60ad02fc25765a2c113175ea372e98a2be0d84aa65fef9246b6a0192e63ff708","src/font_file_loader_impl.rs":"0d304ad99ff1e6874510a1498223329d798ff75b417e3db7e823a695003dfe92","src/gdi_interop.rs":"98922996afc5b8c8304cb65e7c965419003825dfa172a3e11fe69bf3d768551c","src/glyph_run_analysis.rs":"d30d8b41b047815ab5770c730b7a6d09939f2347b4a4257b87bebec08a5794fe","src/helpers.rs":"5d6f164468234ca8806dc1cea117b42dbfae80cc4c9ae965cb0556efdb364682","src/lib.rs":"07dae7e9a6b8e2970917eade968490e2af90110047a0e16f539647269b12f439","src/rendering_params.rs":"be1d1c433f76926c285d8ecdb747c5d9cc6a6c10c1a1890c0760cd99755ed471","src/test.rs":"d77e45f8866abeea070cbbafd4cbde62d875292e8d191310a04c70091978547c","src/types.rs":"784235c15d61fb0d001373575169aa473c92af18dcbc1709a5b2bbaa3a7ceb22"},"package":"36e3b27cd0b8a68e00f07e8d8e1e4f4d8a6b8b873290a734f63bd56d792d23e1"}
\ No newline at end of file
+{"files":{"Cargo.toml":"0b4c8dcf0a46bb7a21d3872485dce2bd0a91fa3003b1a87ecee8e418a95b5f94","README.md":"d69d75705e2582721cbfb2d3b4b2af052c71679057a0b2ac53a22c03f1755bba","appveyor.yml":"2c7b2468dc69bef84860b8900024cb6e1a1c52f6fe1232e8ccd83caaf7c231ca","src/bitmap_render_target.rs":"d3b229f85a9804ac52976431657727b410e7d5253283df046e46d98c196f0a3a","src/com_helpers.rs":"fccb4b36379ae3454a88aa32a8e5c09e46ef5f5626266dde1fe5f40a992de39c","src/comptr.rs":"218435689f505769686e07cfc5428852dda90b849a0d48e670f632307f5edc7c","src/font.rs":"9bdf3134c6ad3639eab3da4419c9b43aad2673797f6fdc65841da2c82e1f3af4","src/font_collection.rs":"969fa3abf141dc3504774886f4783fda4a74cd5a198c643f8a77fc1af4e75258","src/font_face.rs":"97bb3f67516b766fb3522f6fb07836cd55020adecc814353d2da35f885c66a85","src/font_family.rs":"403da9f8f9903cbe7f9f79636497b273f9885e200f53af99f9d4e483f11d6889","src/font_file.rs":"60ad02fc25765a2c113175ea372e98a2be0d84aa65fef9246b6a0192e63ff708","src/font_file_loader_impl.rs":"0d304ad99ff1e6874510a1498223329d798ff75b417e3db7e823a695003dfe92","src/gdi_interop.rs":"98922996afc5b8c8304cb65e7c965419003825dfa172a3e11fe69bf3d768551c","src/glyph_run_analysis.rs":"d30d8b41b047815ab5770c730b7a6d09939f2347b4a4257b87bebec08a5794fe","src/helpers.rs":"5d6f164468234ca8806dc1cea117b42dbfae80cc4c9ae965cb0556efdb364682","src/lib.rs":"af8bae7d775a9ddeb956353e572b553aa2819f7183bb3aed8dde98016f6b4c97","src/rendering_params.rs":"be1d1c433f76926c285d8ecdb747c5d9cc6a6c10c1a1890c0760cd99755ed471","src/test.rs":"d77e45f8866abeea070cbbafd4cbde62d875292e8d191310a04c70091978547c","src/types.rs":"784235c15d61fb0d001373575169aa473c92af18dcbc1709a5b2bbaa3a7ceb22"},"package":"a207eb7b40e25d1d28dc679f451d321fb6954b73ceaa47986702575865469461"}
\ No newline at end of file
diff --git a/third_party/rust/dwrote/Cargo.toml b/third_party/rust/dwrote/Cargo.toml
index b0b9eaf1c04c..4b2abe8eb906 100644
--- a/third_party/rust/dwrote/Cargo.toml
+++ b/third_party/rust/dwrote/Cargo.toml
@@ -12,7 +12,7 @@
 
 [package]
 name = "dwrote"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Vladimir Vukicevic <vladimir@pobox.com>"]
 description = "Lightweight binding to DirectWrite."
 license = "MPL-2.0"
@@ -20,13 +20,13 @@ repository = "https://github.com/servo/dwrote-rs"
 
 [lib]
 name = "dwrote"
-[dependencies.serde_derive]
-version = "1.0"
-
 [dependencies.kernel32-sys]
 version = "0.2"
 
-[dependencies.serde]
+[dependencies.lazy_static]
+version = "0.2"
+
+[dependencies.serde_derive]
 version = "1.0"
 
 [dependencies.winapi]
@@ -35,8 +35,8 @@ version = "0.2"
 [dependencies.gdi32-sys]
 version = "0.2"
 
-[dependencies.lazy_static]
-version = "0.2"
+[dependencies.serde]
+version = "1.0"
 
 [dependencies.libc]
 version = "0.2"
diff --git a/third_party/rust/dwrote/src/font_face.rs b/third_party/rust/dwrote/src/font_face.rs
index 8d1d02669721..7e5a1230d70a 100644
--- a/third_party/rust/dwrote/src/font_face.rs
+++ b/third_party/rust/dwrote/src/font_face.rs
@@ -8,7 +8,7 @@ use std::cell::UnsafeCell;
 use std::mem::zeroed;
 
 use comptr::ComPtr;
-use super::{FontMetrics, FontFile, DefaultDWriteRenderParams};
+use super::{FontMetrics, FontFile, DefaultDWriteRenderParams, DWriteFactory};
 
 use winapi;
 
@@ -35,21 +35,47 @@ impl FontFace {
         (*self.native.get()).as_ptr()
     }
 
+    unsafe fn get_raw_files(&self) -> Vec<*mut winapi::IDWriteFontFile> {
+        let mut number_of_files: u32 = 0;
+        let hr = (*self.native.get()).GetFiles(&mut number_of_files, ptr::null_mut());
+        assert!(hr == 0);
+
+        let mut file_ptrs: Vec<*mut winapi::IDWriteFontFile> =
+            vec![ptr::null_mut(); number_of_files as usize];
+        let hr = (*self.native.get()).GetFiles(&mut number_of_files, file_ptrs.as_mut_ptr());
+        assert!(hr == 0);
+        file_ptrs
+    }
+
     pub fn get_files(&self) -> Vec<FontFile> {
         unsafe {
-            let mut number_of_files: u32 = 0;
-            let hr = (*self.native.get()).GetFiles(&mut number_of_files, ptr::null_mut());
-            assert!(hr == 0);
-
-            let mut file_ptrs: Vec<*mut winapi::IDWriteFontFile> =
-                vec![ptr::null_mut(); number_of_files as usize];
-            let hr = (*self.native.get()).GetFiles(&mut number_of_files, file_ptrs.as_mut_ptr());
-            assert!(hr == 0);
-
+            let file_ptrs = self.get_raw_files();
             file_ptrs.iter().map(|p| FontFile::take(ComPtr::already_addrefed(*p))).collect()
         }
     }
 
+    pub fn create_font_face_with_simulations(&self, simulations: winapi::DWRITE_FONT_SIMULATIONS) -> FontFace {
+        unsafe {
+            let file_ptrs = self.get_raw_files();
+            let face_type = (*self.native.get()).GetType();
+            let face_index = (*self.native.get()).GetIndex();
+            let mut face: ComPtr<winapi::IDWriteFontFace> = ComPtr::new();
+            let hr = (*DWriteFactory()).CreateFontFace(
+                face_type,
+                file_ptrs.len() as u32,
+                file_ptrs.as_ptr(),
+                face_index,
+                simulations,
+                face.getter_addrefs()
+            );
+            for p in file_ptrs {
+                let _ = ComPtr::<winapi::IDWriteFontFile>::already_addrefed(p);
+            }
+            assert!(hr == 0);
+            FontFace::take(face)
+        }
+    }
+
     pub fn get_glyph_count(&self) -> u16 {
         unsafe {
             (*self.native.get()).GetGlyphCount()
diff --git a/third_party/rust/dwrote/src/lib.rs b/third_party/rust/dwrote/src/lib.rs
index dd028ae2f4d5..60a2fffa36f1 100644
--- a/third_party/rust/dwrote/src/lib.rs
+++ b/third_party/rust/dwrote/src/lib.rs
@@ -57,6 +57,7 @@ pub use winapi::{DWRITE_FONT_SIMULATIONS_NONE,
                  DWRITE_FONT_SIMULATIONS_BOLD,
                  DWRITE_FONT_SIMULATIONS_OBLIQUE};
 pub use winapi::{DWRITE_TEXTURE_ALIASED_1x1, DWRITE_TEXTURE_CLEARTYPE_3x1};
+pub use winapi::{DWRITE_FONT_SIMULATIONS};
 pub use winapi::{DWRITE_RENDERING_MODE};
 pub use winapi::{DWRITE_MEASURING_MODE};
 pub use winapi::{DWRITE_TEXTURE_TYPE};
diff --git a/third_party/rust/gleam/.cargo-checksum.json b/third_party/rust/gleam/.cargo-checksum.json
index 32a34b83a118..5461ff99cc12 100644
--- a/third_party/rust/gleam/.cargo-checksum.json
+++ b/third_party/rust/gleam/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".travis.yml":"29b74b95210896ce634c11a9037638668473b5a1b3b1716c505cb04dbb6341fa","COPYING":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"0417239a0f167b2c99eead895cdf7a46c39a84bbd9c172e31e99157e41f5a5d2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"2de24b7458d6b88f20324303a48acf64a4f2bbfb83d2ec4d6ff2b4f4a1fd2275","build.rs":"d2a1c4b40ecbc29ddf005ec32f5b68f9242c8d54b703027bf3a1b605a0882d6a","src/gl.rs":"dea0447dd130a46d648f9526b927e0ba6d52b7ef5d1ec92471ac013119cbdee3","src/gl_fns.rs":"b9460d03ea3178672184bcb11e2075dffa8ce18b842be954d996bce9e701d62e","src/gles_fns.rs":"4344505df0aae7bded0048a2e4761920ddbd61acd0370d830d69c23a1f946fb1","src/lib.rs":"16610c19b45a3f26d56b379a3591aa2e4fc9477e7bd88f86b31c6ea32e834861"},"package":"8bd6aa276bc0bf40348728e916a82f8f9cc10b1922cabf9f2fe9cd5e8b98d55b"}
\ No newline at end of file
+{"files":{".travis.yml":"29b74b95210896ce634c11a9037638668473b5a1b3b1716c505cb04dbb6341fa","COPYING":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"0b1402356bfafe5636331294d4d6e65a9bdb953f8497d41f757f1c7b70e047ad","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"2de24b7458d6b88f20324303a48acf64a4f2bbfb83d2ec4d6ff2b4f4a1fd2275","build.rs":"6c391c6f2dd99a7d1c233a3c4b78a2c8355d5e59c74c15ad9d2ec4c5448ea67a","src/gl.rs":"dea0447dd130a46d648f9526b927e0ba6d52b7ef5d1ec92471ac013119cbdee3","src/gl_fns.rs":"b964929cc066751272cd79036683f525a67ee96fe021f8fdb99af4024fa799b6","src/gles_fns.rs":"45dd524107d20175fd1c4a420c91cc88820312d0a65b5b02dcb6082ca9b8a39a","src/lib.rs":"16610c19b45a3f26d56b379a3591aa2e4fc9477e7bd88f86b31c6ea32e834861"},"package":"dff613336334932baaa2759d001f14e06ea1a08a247c05962d1423aa0e89ee99"}
\ No newline at end of file
diff --git a/third_party/rust/gleam/Cargo.toml b/third_party/rust/gleam/Cargo.toml
index 6c5896f46b58..919dff3fddc3 100644
--- a/third_party/rust/gleam/Cargo.toml
+++ b/third_party/rust/gleam/Cargo.toml
@@ -12,7 +12,7 @@
 
 [package]
 name = "gleam"
-version = "0.4.14"
+version = "0.4.15"
 authors = ["The Servo Project Developers"]
 build = "build.rs"
 description = "Generated OpenGL bindings and wrapper for Servo."
diff --git a/third_party/rust/gleam/build.rs b/third_party/rust/gleam/build.rs
index 6f62bd403845..c45a6a645eca 100644
--- a/third_party/rust/gleam/build.rs
+++ b/third_party/rust/gleam/build.rs
@@ -28,6 +28,8 @@ fn main() {
         "GL_EXT_texture_format_BGRA8888",
         "GL_OES_EGL_image",
         "GL_OES_EGL_image_external",
+        "GL_EXT_disjoint_timer_query",
+        "GL_EXT_debug_marker",
     ];
     let gles_reg = Registry::new(Api::Gles2, (3, 0), Profile::Core, Fallbacks::All, gles_extensions);
     gles_reg.write_bindings(gl_generator::StructGenerator, &mut file_gles)
diff --git a/third_party/rust/gleam/src/gl_fns.rs b/third_party/rust/gleam/src/gl_fns.rs
index a3f7a18dbe41..b48df44bf3a3 100644
--- a/third_party/rust/gleam/src/gl_fns.rs
+++ b/third_party/rust/gleam/src/gl_fns.rs
@@ -149,11 +149,11 @@ impl Gl for GlFns {
     }
 
     fn gen_queries(&self, n: GLsizei) -> Vec<GLuint> {
+        let mut result = vec![0; n as usize];
         unsafe {
-            let mut result = vec![0; n as usize];
             self.ffi_gl_.GenQueries(n, result.as_mut_ptr());
-            return result;
         }
+        result
     }
 
     fn begin_query(&self, target: GLenum, id: GLuint) {
@@ -175,35 +175,35 @@ impl Gl for GlFns {
     }
 
     fn get_query_object_iv(&self, id: GLuint, pname: GLenum) -> i32 {
+        let mut result = 0;
         unsafe {
-            let mut result = 0;
             self.ffi_gl_.GetQueryObjectiv(id, pname, &mut result);
-            result
         }
+        result
     }
 
     fn get_query_object_uiv(&self, id: GLuint, pname: GLenum) -> u32 {
+        let mut result = 0;
         unsafe {
-            let mut result = 0;
             self.ffi_gl_.GetQueryObjectuiv(id, pname, &mut result);
-            result
         }
+        result
     }
 
     fn get_query_object_i64v(&self, id: GLuint, pname: GLenum) -> i64 {
+        let mut result = 0;
         unsafe {
-            let mut result = 0;
             self.ffi_gl_.GetQueryObjecti64v(id, pname, &mut result);
-            result
         }
+        result
     }
 
     fn get_query_object_ui64v(&self, id: GLuint, pname: GLenum) -> u64 {
+        let mut result = 0;
         unsafe {
-            let mut result = 0;
             self.ffi_gl_.GetQueryObjectui64v(id, pname, &mut result);
-            result
         }
+        result
     }
 
     fn delete_queries(&self, queries: &[GLuint]) {
diff --git a/third_party/rust/gleam/src/gles_fns.rs b/third_party/rust/gleam/src/gles_fns.rs
index 48f7a8021948..0e53d6aded30 100644
--- a/third_party/rust/gleam/src/gles_fns.rs
+++ b/third_party/rust/gleam/src/gles_fns.rs
@@ -145,49 +145,95 @@ impl Gl for GlesFns {
         }
     }
 
-    #[allow(unused_variables)]
     fn gen_queries(&self, n: GLsizei) -> Vec<GLuint> {
-        panic!("not supported")
+        if !self.ffi_gl_.GenQueriesEXT.is_loaded() {
+            return Vec::new();
+        }
+        let mut result = vec![0; n as usize];
+        unsafe {
+            self.ffi_gl_.GenQueriesEXT(n, result.as_mut_ptr());
+        }
+        result
     }
 
-    #[allow(unused_variables)]
     fn begin_query(&self, target: GLenum, id: GLuint) {
-        panic!("not supported")
+        if !self.ffi_gl_.BeginQueryEXT.is_loaded() {
+            return;
+        }
+        unsafe {
+            self.ffi_gl_.BeginQueryEXT(target, id);
+        }
     }
 
-    #[allow(unused_variables)]
     fn end_query(&self, target: GLenum) {
-        panic!("not supported")
+        if !self.ffi_gl_.EndQueryEXT.is_loaded() {
+            return;
+        }
+        unsafe {
+            self.ffi_gl_.EndQueryEXT(target);
+        }
     }
 
-    #[allow(unused_variables)]
     fn query_counter(&self, id: GLuint, target: GLenum) {
-        panic!("not supported")
+        if !self.ffi_gl_.QueryCounterEXT.is_loaded() {
+            return;
+        }
+        unsafe {
+            self.ffi_gl_.QueryCounterEXT(id, target);
+        }
     }
 
-    #[allow(unused_variables)]
     fn get_query_object_iv(&self, id: GLuint, pname: GLenum) -> i32 {
-        panic!("not supported")
+        if !self.ffi_gl_.GetQueryObjectivEXT.is_loaded() {
+            return 0;
+        }
+        let mut result = 0;
+        unsafe {
+            self.ffi_gl_.GetQueryObjectivEXT(id, pname, &mut result);
+        }
+        result
     }
 
-    #[allow(unused_variables)]
     fn get_query_object_uiv(&self, id: GLuint, pname: GLenum) -> u32 {
-        panic!("not supported")
+        if !self.ffi_gl_.GetQueryObjectuivEXT.is_loaded() {
+            return 0;
+        }
+        let mut result = 0;
+        unsafe {
+            self.ffi_gl_.GetQueryObjectuivEXT(id, pname, &mut result);
+        }
+        result
     }
 
-    #[allow(unused_variables)]
     fn get_query_object_i64v(&self, id: GLuint, pname: GLenum) -> i64 {
-        panic!("not supported")
+        if !self.ffi_gl_.GetQueryObjecti64vEXT.is_loaded() {
+            return 0;
+        }
+        let mut result = 0;
+        unsafe {
+            self.ffi_gl_.GetQueryObjecti64vEXT(id, pname, &mut result);
+        }
+        result
     }
 
-    #[allow(unused_variables)]
     fn get_query_object_ui64v(&self, id: GLuint, pname: GLenum) -> u64 {
-        panic!("not supported")
+        if !self.ffi_gl_.GetQueryObjectui64vEXT.is_loaded() {
+            return 0;
+        }
+        let mut result = 0;
+        unsafe {
+            self.ffi_gl_.GetQueryObjectui64vEXT(id, pname, &mut result);
+        }
+        result
     }
 
-    #[allow(unused_variables)]
     fn delete_queries(&self, queries: &[GLuint]) {
-        panic!("not supported")
+        if !self.ffi_gl_.DeleteQueriesEXT.is_loaded() {
+            return;
+        }
+        unsafe {
+            self.ffi_gl_.DeleteQueriesEXT(queries.len() as GLsizei, queries.as_ptr());
+        }
     }
 
     fn delete_vertex_arrays(&self, vertex_arrays: &[GLuint]) {
@@ -1486,16 +1532,28 @@ impl Gl for GlesFns {
         }
     }
 
-    #[allow(unused_variables)]
     fn insert_event_marker_ext(&self, message: &str) {
+        if self.ffi_gl_.InsertEventMarkerEXT.is_loaded() {
+            unsafe {
+                self.ffi_gl_.InsertEventMarkerEXT(message.len() as GLsizei, message.as_ptr() as *const _);
+            }
+        }
     }
 
-    #[allow(unused_variables)]
     fn push_group_marker_ext(&self, message: &str) {
+        if self.ffi_gl_.PushGroupMarkerEXT.is_loaded() {
+            unsafe {
+                self.ffi_gl_.PushGroupMarkerEXT(message.len() as GLsizei, message.as_ptr() as *const _);
+            }
+        }
     }
 
-    #[allow(unused_variables)]
     fn pop_group_marker_ext(&self) {
+        if self.ffi_gl_.PopGroupMarkerEXT.is_loaded() {
+            unsafe {
+                self.ffi_gl_.PopGroupMarkerEXT();
+            }
+        }
     }
 
     fn fence_sync(&self, condition: GLenum, flags: GLbitfield) -> GLsync {
diff --git a/toolkit/library/gtest/rust/Cargo.lock b/toolkit/library/gtest/rust/Cargo.lock
index 16e79f6382da..cdd25a252b35 100644
--- a/toolkit/library/gtest/rust/Cargo.lock
+++ b/toolkit/library/gtest/rust/Cargo.lock
@@ -101,7 +101,7 @@ name = "bincode"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -111,7 +111,7 @@ name = "bincode"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -160,7 +160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "byteorder"
-version = "1.0.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -168,7 +168,7 @@ name = "bytes"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -391,7 +391,7 @@ dependencies = [
 
 [[package]]
 name = "dwrote"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -521,7 +521,7 @@ name = "fxhash"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -598,7 +598,7 @@ dependencies = [
 
 [[package]]
 name = "gleam"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gl_generator 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -823,7 +823,7 @@ name = "mp4parse"
 version = "0.9.0"
 dependencies = [
  "bitreader 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "mp4parse_fallible 0.0.1",
  "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -836,7 +836,7 @@ version = "0.1.0"
 name = "mp4parse_capi"
 version = "0.9.0"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "mp4parse 0.9.0",
  "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1250,7 +1250,7 @@ dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bindgen 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1495,20 +1495,20 @@ dependencies = [
 
 [[package]]
 name = "webrender"
-version = "0.54.0"
+version = "0.55.0"
 dependencies = [
  "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "freetype 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1516,20 +1516,20 @@ dependencies = [
  "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.54.0",
+ "webrender_api 0.55.0",
 ]
 
 [[package]]
 name = "webrender_api"
-version = "0.54.0"
+version = "0.55.0"
 dependencies = [
  "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1542,14 +1542,14 @@ dependencies = [
  "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "foreign-types 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.54.0",
+ "webrender 0.55.0",
 ]
 
 [[package]]
@@ -1603,7 +1603,7 @@ dependencies = [
 "checksum bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5cde24d1b2e2216a726368b2363a273739c91f4e3eb4e0dd12d672d396ad989"
 "checksum bitreader 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80b13e2ab064ff3aa0bdbf1eff533f9822dc37899821f5f98c67f263eab51707"
 "checksum boxfnonce 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8380105befe91099e6f69206164072c05bc92427ff6aa8a5171388317346dd75"
-"checksum byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c40977b0ee6b9885c9013cd41d9feffdd22deb3bb4dc3a71d901cc7a77de18c8"
+"checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23"
 "checksum bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d828f97b58cc5de3e40c421d0cf2132d6b2da4ee0e11b8632fa838f0f9333ad6"
 "checksum cexpr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393a5f0088efbe41f9d1fcd062f24e83c278608420e62109feb2c8abee07de7d"
 "checksum cfg-if 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c47d456a36ebf0536a6705c83c1cbbcb9255fbc1d905a6ded104f479268a29"
@@ -1624,7 +1624,7 @@ dependencies = [
 "checksum darling_macro 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a86ec160aa0c3dd492dd4a14ec8104ad8f1a9400a820624db857998cc1f80f9"
 "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
 "checksum dtoa-short 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "068d4026697c1a18f0b0bb8cfcad1b0c151b90d8edb9bf4c235ad68128920d1d"
-"checksum dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "36e3b27cd0b8a68e00f07e8d8e1e4f4d8a6b8b873290a734f63bd56d792d23e1"
+"checksum dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a207eb7b40e25d1d28dc679f451d321fb6954b73ceaa47986702575865469461"
 "checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a"
 "checksum encoding_c 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "93ec52324ca72f423237a413ca0e1c60654c8b3d0934fcd5fd888508dfcc4ba7"
 "checksum encoding_rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5215aabf22b83153be3ee44dfe3f940214541b2ce13d419c55e7a115c8c51a9"
@@ -1641,7 +1641,7 @@ dependencies = [
 "checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
 "checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
 "checksum gl_generator 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "75d69f914b49d9ff32fdf394cbd798f8c716d74fd19f9cc29da3e99797b2a78d"
-"checksum gleam 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)" = "8bd6aa276bc0bf40348728e916a82f8f9cc10b1922cabf9f2fe9cd5e8b98d55b"
+"checksum gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "dff613336334932baaa2759d001f14e06ea1a08a247c05962d1423aa0e89ee99"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c7593b1522161003928c959c20a2ca421c68e940d63d75573316a009e48a6d4"
 "checksum ident_case 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9826188e666f2ed92071d2dadef6edc430b11b158b5b2b3f4babbcc891eaaa"
diff --git a/toolkit/library/rust/Cargo.lock b/toolkit/library/rust/Cargo.lock
index 8b2a3aae3218..c388c6f99ee0 100644
--- a/toolkit/library/rust/Cargo.lock
+++ b/toolkit/library/rust/Cargo.lock
@@ -101,7 +101,7 @@ name = "bincode"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -111,7 +111,7 @@ name = "bincode"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -160,7 +160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "byteorder"
-version = "1.0.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -168,7 +168,7 @@ name = "bytes"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -391,7 +391,7 @@ dependencies = [
 
 [[package]]
 name = "dwrote"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -521,7 +521,7 @@ name = "fxhash"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -597,7 +597,7 @@ dependencies = [
 
 [[package]]
 name = "gleam"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gl_generator 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -822,7 +822,7 @@ name = "mp4parse"
 version = "0.9.0"
 dependencies = [
  "bitreader 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "mp4parse_fallible 0.0.1",
  "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -831,7 +831,7 @@ dependencies = [
 name = "mp4parse_capi"
 version = "0.9.0"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "mp4parse 0.9.0",
  "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1242,7 +1242,7 @@ dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bindgen 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1507,20 +1507,20 @@ dependencies = [
 
 [[package]]
 name = "webrender"
-version = "0.54.0"
+version = "0.55.0"
 dependencies = [
  "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "freetype 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1528,20 +1528,20 @@ dependencies = [
  "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.54.0",
+ "webrender_api 0.55.0",
 ]
 
 [[package]]
 name = "webrender_api"
-version = "0.54.0"
+version = "0.55.0"
 dependencies = [
  "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1554,14 +1554,14 @@ dependencies = [
  "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "foreign-types 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.54.0",
+ "webrender 0.55.0",
 ]
 
 [[package]]
@@ -1615,7 +1615,7 @@ dependencies = [
 "checksum bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5cde24d1b2e2216a726368b2363a273739c91f4e3eb4e0dd12d672d396ad989"
 "checksum bitreader 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80b13e2ab064ff3aa0bdbf1eff533f9822dc37899821f5f98c67f263eab51707"
 "checksum boxfnonce 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8380105befe91099e6f69206164072c05bc92427ff6aa8a5171388317346dd75"
-"checksum byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c40977b0ee6b9885c9013cd41d9feffdd22deb3bb4dc3a71d901cc7a77de18c8"
+"checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23"
 "checksum bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d828f97b58cc5de3e40c421d0cf2132d6b2da4ee0e11b8632fa838f0f9333ad6"
 "checksum cexpr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393a5f0088efbe41f9d1fcd062f24e83c278608420e62109feb2c8abee07de7d"
 "checksum cfg-if 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c47d456a36ebf0536a6705c83c1cbbcb9255fbc1d905a6ded104f479268a29"
@@ -1636,7 +1636,7 @@ dependencies = [
 "checksum darling_macro 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a86ec160aa0c3dd492dd4a14ec8104ad8f1a9400a820624db857998cc1f80f9"
 "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
 "checksum dtoa-short 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "068d4026697c1a18f0b0bb8cfcad1b0c151b90d8edb9bf4c235ad68128920d1d"
-"checksum dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "36e3b27cd0b8a68e00f07e8d8e1e4f4d8a6b8b873290a734f63bd56d792d23e1"
+"checksum dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a207eb7b40e25d1d28dc679f451d321fb6954b73ceaa47986702575865469461"
 "checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a"
 "checksum encoding_c 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "93ec52324ca72f423237a413ca0e1c60654c8b3d0934fcd5fd888508dfcc4ba7"
 "checksum encoding_rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5215aabf22b83153be3ee44dfe3f940214541b2ce13d419c55e7a115c8c51a9"
@@ -1653,7 +1653,7 @@ dependencies = [
 "checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
 "checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
 "checksum gl_generator 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "75d69f914b49d9ff32fdf394cbd798f8c716d74fd19f9cc29da3e99797b2a78d"
-"checksum gleam 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)" = "8bd6aa276bc0bf40348728e916a82f8f9cc10b1922cabf9f2fe9cd5e8b98d55b"
+"checksum gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "dff613336334932baaa2759d001f14e06ea1a08a247c05962d1423aa0e89ee99"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c7593b1522161003928c959c20a2ca421c68e940d63d75573316a009e48a6d4"
 "checksum ident_case 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9826188e666f2ed92071d2dadef6edc430b11b158b5b2b3f4babbcc891eaaa"

From 03a6e9d255423651ba652d5463f7367107587923 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Tue, 28 Nov 2017 10:25:27 -0500
Subject: [PATCH 036/219] Bug 1421275 - Pass FontInstanceFlags to WebRender.
 r=jrmuizel

This patch was originally developed on bug 1418564.

MozReview-Commit-ID: 53oydIqjhvF

--HG--
extra : rebase_source : 8980cc947b3b8c46a75d032e7e557f39bae08b97
---
 gfx/2d/ScaledFontDWrite.cpp            | 28 +++++++++---------
 gfx/2d/ScaledFontFontconfig.cpp        | 26 +++++------------
 gfx/2d/ScaledFontMac.cpp               | 37 ++++++++++++------------
 gfx/webrender_bindings/webrender_ffi.h | 40 ++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 52 deletions(-)

diff --git a/gfx/2d/ScaledFontDWrite.cpp b/gfx/2d/ScaledFontDWrite.cpp
index cbab18181ba8..b71e10404e1a 100644
--- a/gfx/2d/ScaledFontDWrite.cpp
+++ b/gfx/2d/ScaledFontDWrite.cpp
@@ -391,21 +391,21 @@ ScaledFontDWrite::GetWRFontInstanceOptions(Maybe<wr::FontInstanceOptions>* aOutO
                                            Maybe<wr::FontInstancePlatformOptions>* aOutPlatformOptions,
                                            std::vector<FontVariation>* aOutVariations)
 {
-  AntialiasMode aaMode = GetDefaultAAMode();
-  if (aaMode != AntialiasMode::SUBPIXEL) {
-    wr::FontInstanceOptions options;
-    options.render_mode =
-      aaMode == AntialiasMode::NONE ? wr::FontRenderMode::Mono : wr::FontRenderMode::Alpha;
-    options.subpx_dir = wr::SubpixelDirection::Horizontal;
-    options.synthetic_italics = false;
-    options.bg_color = wr::ToColorU(Color());
-    *aOutOptions = Some(options);
+  wr::FontInstanceOptions options;
+  options.render_mode = wr::ToFontRenderMode(GetDefaultAAMode());
+  options.subpx_dir = wr::SubpixelDirection::Horizontal;
+  options.flags = 0;
+  if (mFontFace->GetSimulations() & DWRITE_FONT_SIMULATIONS_BOLD) {
+    options.flags |= wr::FontInstanceFlags::SYNTHETIC_BOLD;
   }
-
-  wr::FontInstancePlatformOptions platformOptions;
-  platformOptions.use_embedded_bitmap = UseEmbeddedBitmaps();
-  platformOptions.force_gdi_rendering = ForceGDIMode();
-  *aOutPlatformOptions = Some(platformOptions);
+  if (UseEmbeddedBitmaps()) {
+    options.flags |= wr::FontInstanceFlags::EMBEDDED_BITMAPS;
+  }
+  if (ForceGDIMode()) {
+    options.flags |= wr::FontInstanceFlags::FORCE_GDI;
+  }
+  options.bg_color = wr::ToColorU(Color());
+  *aOutOptions = Some(options);
   return true;
 }
 
diff --git a/gfx/2d/ScaledFontFontconfig.cpp b/gfx/2d/ScaledFontFontconfig.cpp
index 039ca2fc54d7..df22211cfd89 100644
--- a/gfx/2d/ScaledFontFontconfig.cpp
+++ b/gfx/2d/ScaledFontFontconfig.cpp
@@ -16,17 +16,6 @@
 #include <fontconfig/fcfreetype.h>
 
 namespace mozilla {
-namespace wr {
-  enum {
-    FONT_FORCE_AUTOHINT  = 1 << 0,
-    FONT_NO_AUTOHINT     = 1 << 1,
-    FONT_EMBEDDED_BITMAP = 1 << 2,
-    FONT_EMBOLDEN        = 1 << 3,
-    FONT_VERTICAL_LAYOUT = 1 << 4,
-    FONT_SUBPIXEL_BGR    = 1 << 5
-  };
-}
-
 namespace gfx {
 
 // On Linux and Android our "platform" font is a cairo_scaled_font_t and we use
@@ -252,25 +241,24 @@ ScaledFontFontconfig::GetWRFontInstanceOptions(Maybe<wr::FontInstanceOptions>* a
   wr::FontInstanceOptions options;
   options.render_mode = wr::FontRenderMode::Alpha;
   options.subpx_dir = wr::SubpixelDirection::Horizontal;
-  options.synthetic_italics = false;
+  options.flags = 0;
   options.bg_color = wr::ToColorU(Color());
 
   wr::FontInstancePlatformOptions platformOptions;
-  platformOptions.flags = 0;
   platformOptions.lcd_filter = wr::FontLCDFilter::Legacy;
   platformOptions.hinting = wr::FontHinting::Normal;
 
   FcBool autohint;
   if (FcPatternGetBool(mPattern, FC_AUTOHINT, 0, &autohint) == FcResultMatch && autohint) {
-    platformOptions.flags |= wr::FONT_FORCE_AUTOHINT;
+    options.flags |= wr::FontInstanceFlags::FORCE_AUTOHINT;
   }
   FcBool embolden;
   if (FcPatternGetBool(mPattern, FC_EMBOLDEN, 0, &embolden) == FcResultMatch && embolden) {
-    platformOptions.flags |= wr::FONT_EMBOLDEN;
+    options.flags |= wr::FontInstanceFlags::SYNTHETIC_BOLD;
   }
   FcBool vertical;
   if (FcPatternGetBool(mPattern, FC_VERTICAL_LAYOUT, 0, &vertical) == FcResultMatch && vertical) {
-    platformOptions.flags |= wr::FONT_VERTICAL_LAYOUT;
+    options.flags |= wr::FontInstanceFlags::VERTICAL_LAYOUT;
   }
 
   FcBool antialias;
@@ -288,7 +276,7 @@ ScaledFontFontconfig::GetWRFontInstanceOptions(Maybe<wr::FontInstanceOptions>* a
             }
             platformOptions.hinting = wr::FontHinting::LCD;
             if (rgba == FC_RGBA_BGR || rgba == FC_RGBA_VBGR) {
-                platformOptions.flags |= wr::FONT_SUBPIXEL_BGR;
+                options.flags |= wr::FontInstanceFlags::SUBPIXEL_BGR;
             }
             break;
         case FC_RGBA_NONE:
@@ -323,13 +311,13 @@ ScaledFontFontconfig::GetWRFontInstanceOptions(Maybe<wr::FontInstanceOptions>* a
     // Otherwise, disable embedded bitmaps unless explicitly enabled.
     FcBool bitmap;
     if (FcPatternGetBool(mPattern, FC_EMBEDDED_BITMAP, 0, &bitmap) == FcResultMatch && bitmap) {
-      platformOptions.flags |= wr::FONT_EMBEDDED_BITMAP;
+      options.flags |= wr::FontInstanceFlags::EMBEDDED_BITMAPS;
     }
   } else {
     options.render_mode = wr::FontRenderMode::Mono;
     options.subpx_dir = wr::SubpixelDirection::None;
     platformOptions.hinting = wr::FontHinting::Mono;
-    platformOptions.flags |= wr::FONT_EMBEDDED_BITMAP;
+    options.flags |= wr::FontInstanceFlags::EMBEDDED_BITMAPS;
   }
 
   FcBool hinting;
diff --git a/gfx/2d/ScaledFontMac.cpp b/gfx/2d/ScaledFontMac.cpp
index f83d4fc94e03..5061d4d6ddff 100644
--- a/gfx/2d/ScaledFontMac.cpp
+++ b/gfx/2d/ScaledFontMac.cpp
@@ -390,13 +390,13 @@ GetVariationsForCTFont(CTFontRef aCTFont, std::vector<FontVariation>* aOutVariat
 bool
 ScaledFontMac::GetFontInstanceData(FontInstanceDataOutput aCb, void* aBaton)
 {
-    // Collect any variation settings that were incorporated into the CTFont.
-    std::vector<FontVariation> variations;
-    if (!GetVariationsForCTFont(mCTFont, &variations)) {
-      return false;
-    }
-    aCb(nullptr, 0, variations.data(), variations.size(), aBaton);
-    return true;
+  // Collect any variation settings that were incorporated into the CTFont.
+  std::vector<FontVariation> variations;
+  if (!GetVariationsForCTFont(mCTFont, &variations)) {
+    return false;
+  }
+  aCb(nullptr, 0, variations.data(), variations.size(), aBaton);
+  return true;
 }
 
 bool
@@ -404,19 +404,18 @@ ScaledFontMac::GetWRFontInstanceOptions(Maybe<wr::FontInstanceOptions>* aOutOpti
                                         Maybe<wr::FontInstancePlatformOptions>* aOutPlatformOptions,
                                         std::vector<FontVariation>* aOutVariations)
 {
-    GetVariationsForCTFont(mCTFont, aOutVariations);
+  GetVariationsForCTFont(mCTFont, aOutVariations);
 
-    wr::FontInstanceOptions options;
-    options.render_mode = wr::FontRenderMode::Subpixel;
-    options.subpx_dir = wr::SubpixelDirection::Horizontal;
-    options.synthetic_italics = false;
-    options.bg_color = wr::ToColorU(mFontSmoothingBackgroundColor);
-    *aOutOptions = Some(options);
-
-    wr::FontInstancePlatformOptions platformOptions;
-    platformOptions.font_smoothing = mUseFontSmoothing;
-    *aOutPlatformOptions = Some(platformOptions);
-    return true;
+  wr::FontInstanceOptions options;
+  options.render_mode = wr::FontRenderMode::Subpixel;
+  options.subpx_dir = wr::SubpixelDirection::Horizontal;
+  options.flags = 0;
+  if (mUseFontSmoothing) {
+    options.flags |= wr::FontInstanceFlags::FONT_SMOOTHING;
+  }
+  options.bg_color = wr::ToColorU(mFontSmoothingBackgroundColor);
+  *aOutOptions = Some(options);
+  return true;
 }
 
 static CFDictionaryRef
diff --git a/gfx/webrender_bindings/webrender_ffi.h b/gfx/webrender_bindings/webrender_ffi.h
index a4336b7df10e..eecc13509313 100644
--- a/gfx/webrender_bindings/webrender_ffi.h
+++ b/gfx/webrender_bindings/webrender_ffi.h
@@ -29,6 +29,46 @@ void* get_proc_address_from_glcontext(void* glcontext_ptr, const char* procname)
 void gecko_profiler_register_thread(const char* threadname);
 void gecko_profiler_unregister_thread();
 
+// Prelude of types necessary before including webrender_ffi_generated.h
+namespace mozilla {
+namespace wr {
+
+struct FontInstanceFlags {
+  uint32_t bits;
+
+  bool operator==(const FontInstanceFlags& aOther) const {
+    return bits == aOther.bits;
+  }
+
+  FontInstanceFlags& operator=(uint32_t aBits) {
+    bits = aBits;
+    return *this;
+  }
+
+  FontInstanceFlags& operator|=(uint32_t aBits) {
+    bits |= aBits;
+    return *this;
+  }
+
+  enum : uint32_t {
+    SYNTHETIC_ITALICS = 1 << 0,
+    SYNTHETIC_BOLD    = 1 << 1,
+    EMBEDDED_BITMAPS  = 1 << 2,
+    SUBPIXEL_BGR      = 1 << 3,
+
+    FORCE_GDI         = 1 << 16,
+
+    FONT_SMOOTHING    = 1 << 16,
+
+    FORCE_AUTOHINT    = 1 << 16,
+    NO_AUTOHINT       = 1 << 17,
+    VERTICAL_LAYOUT   = 1 << 18
+  };
+};
+
+} // namespace wr
+} // namespace mozilla
+
 } // extern "C"
 
 // Some useful defines to stub out webrender binding functions for when we

From e782a0379ff73cd93ebf7f9810c59f8f099979a1 Mon Sep 17 00:00:00 2001
From: Munro Mengjue Chiang <mchiang@mozilla.com>
Date: Thu, 30 Nov 2017 15:44:20 +0800
Subject: [PATCH 037/219] Bug 1388219 - add a nsTArray mTargetCapability to
 record each track target capability. r=jib

MozReview-Commit-ID: E8ZCmXEDxKs

--HG--
extra : rebase_source : 5cab9cdb5cc1a67d6cf4c0b5c5c7caef5cfe7ea0
---
 dom/media/webrtc/MediaEngine.h                | 14 ++-
 .../webrtc/MediaEngineCameraVideoSource.cpp   | 48 ++++++++--
 .../webrtc/MediaEngineCameraVideoSource.h     | 34 +++++++-
 .../webrtc/MediaEngineRemoteVideoSource.cpp   | 87 ++++++++++++++-----
 .../webrtc/MediaEngineRemoteVideoSource.h     | 10 ++-
 dom/media/webrtc/MediaEngineWebRTC.h          |  1 +
 dom/media/webrtc/MediaEngineWebRTCAudio.cpp   |  1 +
 dom/media/webrtc/MediaTrackConstraints.cpp    | 22 +++++
 dom/media/webrtc/MediaTrackConstraints.h      | 15 +++-
 9 files changed, 195 insertions(+), 37 deletions(-)

diff --git a/dom/media/webrtc/MediaEngine.h b/dom/media/webrtc/MediaEngine.h
index 000d6d838121..0c57c361a1fd 100644
--- a/dom/media/webrtc/MediaEngine.h
+++ b/dom/media/webrtc/MediaEngine.h
@@ -217,6 +217,7 @@ public:
     NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AllocationHandle);
   protected:
     ~AllocationHandle() {}
+    static uint64_t sId;
   public:
     AllocationHandle(const dom::MediaTrackConstraints& aConstraints,
                      const mozilla::ipc::PrincipalInfo& aPrincipalInfo,
@@ -226,11 +227,15 @@ public:
     : mConstraints(aConstraints),
       mPrincipalInfo(aPrincipalInfo),
       mPrefs(aPrefs),
+#ifdef MOZ_WEBRTC
+      mId(sId++),
+#endif
       mDeviceId(aDeviceId) {}
   public:
     NormalizedConstraints mConstraints;
     mozilla::ipc::PrincipalInfo mPrincipalInfo;
     MediaEnginePrefs mPrefs;
+    uint64_t mId;
     nsString mDeviceId;
   };
 
@@ -366,6 +371,7 @@ protected:
   virtual nsresult
   UpdateSingleSource(const AllocationHandle* aHandle,
                      const NormalizedConstraints& aNetConstraints,
+                     const NormalizedConstraints& aNewConstraint,
                      const MediaEnginePrefs& aPrefs,
                      const nsString& aDeviceId,
                      const char** aOutBadConstraint) {
@@ -394,6 +400,7 @@ protected:
     // aHandle and/or aConstraintsUpdate may be nullptr (see below)
 
     AutoTArray<const NormalizedConstraints*, 10> allConstraints;
+    AutoTArray<const NormalizedConstraints*, 1> updatedConstraint;
     for (auto& registered : mRegisteredHandles) {
       if (aConstraintsUpdate && registered.get() == aHandle) {
         continue; // Don't count old constraints
@@ -402,9 +409,13 @@ protected:
     }
     if (aConstraintsUpdate) {
       allConstraints.AppendElement(aConstraintsUpdate);
+      updatedConstraint.AppendElement(aConstraintsUpdate);
     } else if (aHandle) {
       // In the case of AddShareOfSingleSource, the handle isn't registered yet.
       allConstraints.AppendElement(&aHandle->mConstraints);
+      updatedConstraint.AppendElement(&aHandle->mConstraints);
+    } else {
+      updatedConstraint.AppendElements(allConstraints);
     }
 
     NormalizedConstraints netConstraints(allConstraints);
@@ -413,7 +424,8 @@ protected:
       return NS_ERROR_FAILURE;
     }
 
-    nsresult rv = UpdateSingleSource(aHandle, netConstraints, aPrefs, aDeviceId,
+    NormalizedConstraints newConstraint(updatedConstraint);
+    nsresult rv = UpdateSingleSource(aHandle, netConstraints, newConstraint, aPrefs, aDeviceId,
                                      aOutBadConstraint);
     if (NS_FAILED(rv)) {
       return rv;
diff --git a/dom/media/webrtc/MediaEngineCameraVideoSource.cpp b/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
index 8d182a7d4cbb..25aedad88d04 100644
--- a/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
@@ -54,6 +54,19 @@ MediaEngineCameraVideoSource::GetCapability(size_t aIndex,
   aOut = mHardcodedCapabilities.SafeElementAt(aIndex, webrtc::CaptureCapability());
 }
 
+uint32_t
+MediaEngineCameraVideoSource::GetDistance(
+    const webrtc::CaptureCapability& aCandidate,
+    const NormalizedConstraintSet &aConstraints,
+    const nsString& aDeviceId,
+    const DistanceCalculation aCalculate) const
+{
+  if (aCalculate == kFeasibility) {
+    return GetFeasibilityDistance(aCandidate, aConstraints, aDeviceId);
+  }
+  return GetFitnessDistance(aCandidate, aConstraints, aDeviceId);
+}
+
 uint32_t
 MediaEngineCameraVideoSource::GetFitnessDistance(
     const webrtc::CaptureCapability& aCandidate,
@@ -75,6 +88,27 @@ MediaEngineCameraVideoSource::GetFitnessDistance(
   return uint32_t(std::min(distance, uint64_t(UINT32_MAX)));
 }
 
+uint32_t
+MediaEngineCameraVideoSource::GetFeasibilityDistance(
+    const webrtc::CaptureCapability& aCandidate,
+    const NormalizedConstraintSet &aConstraints,
+    const nsString& aDeviceId) const
+{
+  // Treat width|height|frameRate == 0 on capability as "can do any".
+  // This allows for orthogonal capabilities that are not in discrete steps.
+
+  uint64_t distance =
+    uint64_t(FitnessDistance(aDeviceId, aConstraints.mDeviceId)) +
+    uint64_t(FitnessDistance(mFacingMode, aConstraints.mFacingMode)) +
+    uint64_t(aCandidate.width? FeasibilityDistance(int32_t(aCandidate.width),
+                                               aConstraints.mWidth) : 0) +
+    uint64_t(aCandidate.height? FeasibilityDistance(int32_t(aCandidate.height),
+                                                aConstraints.mHeight) : 0) +
+    uint64_t(aCandidate.maxFPS? FeasibilityDistance(double(aCandidate.maxFPS),
+                                                aConstraints.mFrameRate) : 0);
+  return uint32_t(std::min(distance, uint64_t(UINT32_MAX)));
+}
+
 // Find best capability by removing inferiors. May leave >1 of equal distance
 
 /* static */ void
@@ -218,7 +252,9 @@ bool
 MediaEngineCameraVideoSource::ChooseCapability(
     const NormalizedConstraints &aConstraints,
     const MediaEnginePrefs &aPrefs,
-    const nsString& aDeviceId)
+    const nsString& aDeviceId,
+    webrtc::CaptureCapability& aCapability,
+    const DistanceCalculation aCalculate)
 {
   if (MOZ_LOG_TEST(GetMediaManagerLog(), LogLevel::Debug)) {
     LOG(("ChooseCapability: prefs: %dx%d @%dfps",
@@ -246,7 +282,7 @@ MediaEngineCameraVideoSource::ChooseCapability(
     auto& candidate = candidateSet[i];
     webrtc::CaptureCapability cap;
     GetCapability(candidate.mIndex, cap);
-    candidate.mDistance = GetFitnessDistance(cap, aConstraints, aDeviceId);
+    candidate.mDistance = GetDistance(cap, aConstraints, aDeviceId, aCalculate);
     LogCapability("Capability", cap, candidate.mDistance);
     if (candidate.mDistance == UINT32_MAX) {
       candidateSet.RemoveElementAt(i);
@@ -268,7 +304,7 @@ MediaEngineCameraVideoSource::ChooseCapability(
       auto& candidate = candidateSet[i];
       webrtc::CaptureCapability cap;
       GetCapability(candidate.mIndex, cap);
-      if (GetFitnessDistance(cap, cs, aDeviceId) == UINT32_MAX) {
+      if (GetDistance(cap, cs, aDeviceId, aCalculate) == UINT32_MAX) {
         rejects.AppendElement(candidate);
         candidateSet.RemoveElementAt(i);
       } else {
@@ -299,7 +335,7 @@ MediaEngineCameraVideoSource::ChooseCapability(
     for (auto& candidate : candidateSet) {
       webrtc::CaptureCapability cap;
       GetCapability(candidate.mIndex, cap);
-      candidate.mDistance = GetFitnessDistance(cap, normPrefs, aDeviceId);
+      candidate.mDistance = GetDistance(cap, normPrefs, aDeviceId, aCalculate);
     }
     TrimLessFitCandidates(candidateSet);
   }
@@ -315,13 +351,13 @@ MediaEngineCameraVideoSource::ChooseCapability(
     if (cap.rawType == webrtc::RawVideoType::kVideoI420 ||
         cap.rawType == webrtc::RawVideoType::kVideoYUY2 ||
         cap.rawType == webrtc::RawVideoType::kVideoYV12) {
-      mCapability = cap;
+      aCapability = cap;
       found = true;
       break;
     }
   }
   if (!found) {
-    GetCapability(candidateSet[0].mIndex, mCapability);
+    GetCapability(candidateSet[0].mIndex, aCapability);
   }
 
   LogCapability("Chosen capability", mCapability, sameDistance);
diff --git a/dom/media/webrtc/MediaEngineCameraVideoSource.h b/dom/media/webrtc/MediaEngineCameraVideoSource.h
index 284f22be9ec1..d78bcaeed8ff 100644
--- a/dom/media/webrtc/MediaEngineCameraVideoSource.h
+++ b/dom/media/webrtc/MediaEngineCameraVideoSource.h
@@ -24,6 +24,19 @@ namespace webrtc {
 
 namespace mozilla {
 
+// Fitness distance is defined in
+// https://www.w3.org/TR/2017/CR-mediacapture-streams-20171003/#dfn-selectsettings
+// The main difference of feasibility and fitness distance is that if the
+// constraint is required ('max', or 'exact'), and the settings dictionary's value
+// for the constraint does not satisfy the constraint, the fitness distance is
+// positive infinity. Given a continuous space of settings dictionaries comprising
+// all discrete combinations of dimension and frame-rate related properties,
+// the feasibility distance is still in keeping with the constraints algorithm.
+enum DistanceCalculation {
+  kFitness,
+  kFeasibility
+};
+
 class MediaEngineCameraVideoSource : public MediaEngineVideoSource
 {
 public:
@@ -86,9 +99,16 @@ protected:
                              TrackID aID,
                              StreamTime delta,
                              const PrincipalHandle& aPrincipalHandle);
+  uint32_t GetDistance(const webrtc::CaptureCapability& aCandidate,
+                       const NormalizedConstraintSet &aConstraints,
+                       const nsString& aDeviceId,
+                       const DistanceCalculation aCalculate) const;
   uint32_t GetFitnessDistance(const webrtc::CaptureCapability& aCandidate,
                               const NormalizedConstraintSet &aConstraints,
                               const nsString& aDeviceId) const;
+  uint32_t GetFeasibilityDistance(const webrtc::CaptureCapability& aCandidate,
+                              const NormalizedConstraintSet &aConstraints,
+                              const nsString& aDeviceId) const;
   static void TrimLessFitCandidates(CapabilitySet& set);
   static void LogConstraints(const NormalizedConstraintSet& aConstraints);
   static void LogCapability(const char* aHeader,
@@ -96,9 +116,13 @@ protected:
                             uint32_t aDistance);
   virtual size_t NumCapabilities() const;
   virtual void GetCapability(size_t aIndex, webrtc::CaptureCapability& aOut) const;
-  virtual bool ChooseCapability(const NormalizedConstraints &aConstraints,
-                                const MediaEnginePrefs &aPrefs,
-                                const nsString& aDeviceId);
+  virtual bool ChooseCapability(
+    const NormalizedConstraints &aConstraints,
+    const MediaEnginePrefs &aPrefs,
+    const nsString& aDeviceId,
+    webrtc::CaptureCapability& aCapability,
+    const DistanceCalculation aCalculate
+  );
   void SetName(nsString aName);
   void SetUUID(const char* aUUID);
   const nsCString& GetUUID() const; // protected access
@@ -116,6 +140,8 @@ protected:
   nsTArray<RefPtr<SourceMediaStream>> mSources; // When this goes empty, we shut down HW
   nsTArray<PrincipalHandle> mPrincipalHandles; // Directly mapped to mSources.
   RefPtr<layers::Image> mImage;
+  nsTArray<webrtc::CaptureCapability> mTargetCapabilities;
+  nsTArray<uint64_t> mHandleIds;
   RefPtr<layers::ImageContainer> mImageContainer;
   // end of data protected by mMonitor
 
@@ -125,6 +151,8 @@ protected:
   TrackID mTrackID;
 
   webrtc::CaptureCapability mCapability;
+  webrtc::CaptureCapability mTargetCapability;
+  uint64_t mHandleId;
 
   mutable nsTArray<webrtc::CaptureCapability> mHardcodedCapabilities;
 private:
diff --git a/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp b/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
index f50b98a60d0b..e7024513cf77 100644
--- a/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
@@ -17,6 +17,8 @@ extern mozilla::LogModule* GetMediaManagerLog();
 
 namespace mozilla {
 
+uint64_t MediaEngineCameraVideoSource::AllocationHandle::sId = 0;
+
 // These need a definition somewhere because template
 // code is allowed to take their address, and they aren't
 // guaranteed to have one without this.
@@ -80,6 +82,8 @@ MediaEngineRemoteVideoSource::Shutdown()
         empty = mSources.IsEmpty();
         if (empty) {
           MOZ_ASSERT(mPrincipalHandles.IsEmpty());
+          MOZ_ASSERT(mTargetCapabilities.IsEmpty());
+          MOZ_ASSERT(mHandleIds.IsEmpty());
           break;
         }
         source = mSources[0];
@@ -126,6 +130,8 @@ MediaEngineRemoteVideoSource::Allocate(
     MonitorAutoLock lock(mMonitor);
     if (mSources.IsEmpty()) {
       MOZ_ASSERT(mPrincipalHandles.IsEmpty());
+      MOZ_ASSERT(mTargetCapabilities.IsEmpty());
+      MOZ_ASSERT(mHandleIds.IsEmpty());
       LOG(("Video device %d reallocated", mCaptureIndex));
     } else {
       LOG(("Video device %d allocated shared", mCaptureIndex));
@@ -172,7 +178,12 @@ MediaEngineRemoteVideoSource::Start(SourceMediaStream* aStream, TrackID aID,
     MonitorAutoLock lock(mMonitor);
     mSources.AppendElement(aStream);
     mPrincipalHandles.AppendElement(aPrincipalHandle);
+    mTargetCapabilities.AppendElement(mTargetCapability);
+    mHandleIds.AppendElement(mHandleId);
+
     MOZ_ASSERT(mSources.Length() == mPrincipalHandles.Length());
+    MOZ_ASSERT(mSources.Length() == mTargetCapabilities.Length());
+    MOZ_ASSERT(mSources.Length() == mHandleIds.Length());
   }
 
   aStream->AddTrack(aID, 0, new VideoSegment(), SourceMediaStream::ADDTRACK_QUEUED);
@@ -218,8 +229,12 @@ MediaEngineRemoteVideoSource::Stop(mozilla::SourceMediaStream* aSource,
     }
 
     MOZ_ASSERT(mSources.Length() == mPrincipalHandles.Length());
+    MOZ_ASSERT(mSources.Length() == mTargetCapabilities.Length());
+    MOZ_ASSERT(mSources.Length() == mHandleIds.Length());
     mSources.RemoveElementAt(i);
     mPrincipalHandles.RemoveElementAt(i);
+    mTargetCapabilities.RemoveElementAt(i);
+    mHandleIds.RemoveElementAt(i);
 
     aSource->EndTrack(aID);
 
@@ -262,18 +277,21 @@ nsresult
 MediaEngineRemoteVideoSource::UpdateSingleSource(
     const AllocationHandle* aHandle,
     const NormalizedConstraints& aNetConstraints,
+    const NormalizedConstraints& aNewConstraint,
     const MediaEnginePrefs& aPrefs,
     const nsString& aDeviceId,
     const char** aOutBadConstraint)
 {
-  if (!ChooseCapability(aNetConstraints, aPrefs, aDeviceId)) {
-    *aOutBadConstraint = FindBadConstraint(aNetConstraints, *this, aDeviceId);
-    return NS_ERROR_FAILURE;
-  }
-
   switch (mState) {
     case kReleased:
       MOZ_ASSERT(aHandle);
+      mHandleId = aHandle->mId;
+      if (!ChooseCapability(aNetConstraints, aPrefs, aDeviceId, mCapability, kFitness)) {
+        *aOutBadConstraint = FindBadConstraint(aNetConstraints, *this, aDeviceId);
+        return NS_ERROR_FAILURE;
+      }
+      mTargetCapability = mCapability;
+
       if (camera::GetChildAndCall(&camera::CamerasChild::AllocateCaptureDevice,
                                   mCapEngine, GetUUID().get(),
                                   kMaxUniqueIdLength, mCaptureIndex,
@@ -286,18 +304,42 @@ MediaEngineRemoteVideoSource::UpdateSingleSource(
       break;
 
     case kStarted:
-      if (mCapability != mLastCapability) {
-        camera::GetChildAndCall(&camera::CamerasChild::StopCapture,
-                                mCapEngine, mCaptureIndex);
-        if (camera::GetChildAndCall(&camera::CamerasChild::StartCapture,
-                                    mCapEngine, mCaptureIndex, mCapability,
-                                    this)) {
-          LOG(("StartCapture failed"));
+      {
+        size_t index = mHandleIds.NoIndex;
+        if (aHandle) {
+          mHandleId = aHandle->mId;
+          index = mHandleIds.IndexOf(mHandleId);
+        }
+
+        if (!ChooseCapability(aNewConstraint, aPrefs, aDeviceId, mTargetCapability,
+                              kFitness)) {
+          *aOutBadConstraint = FindBadConstraint(aNewConstraint, *this, aDeviceId);
           return NS_ERROR_FAILURE;
         }
-        SetLastCapability(mCapability);
+
+        if (index != mHandleIds.NoIndex) {
+          mTargetCapabilities[index] = mTargetCapability;
+        }
+
+        if (!ChooseCapability(aNetConstraints, aPrefs, aDeviceId, mCapability,
+                              kFeasibility)) {
+          *aOutBadConstraint = FindBadConstraint(aNetConstraints, *this, aDeviceId);
+          return NS_ERROR_FAILURE;
+        }
+
+        if (mCapability != mLastCapability) {
+          camera::GetChildAndCall(&camera::CamerasChild::StopCapture,
+                                  mCapEngine, mCaptureIndex);
+          if (camera::GetChildAndCall(&camera::CamerasChild::StartCapture,
+                                      mCapEngine, mCaptureIndex, mCapability,
+                                      this)) {
+            LOG(("StartCapture failed"));
+            return NS_ERROR_FAILURE;
+          }
+          SetLastCapability(mCapability);
+        }
+        break;
       }
-      break;
 
     default:
       LOG(("Video device %d in ignored state %d", mCaptureIndex, mState));
@@ -464,7 +506,9 @@ bool
 MediaEngineRemoteVideoSource::ChooseCapability(
     const NormalizedConstraints &aConstraints,
     const MediaEnginePrefs &aPrefs,
-    const nsString& aDeviceId)
+    const nsString& aDeviceId,
+    webrtc::CaptureCapability& aCapability,
+    const DistanceCalculation aCalculate)
 {
   AssertIsOnOwningThread();
 
@@ -477,15 +521,16 @@ MediaEngineRemoteVideoSource::ChooseCapability(
       // time (and may in fact change over time), so as a hack, we push ideal
       // and max constraints down to desktop_capture_impl.cc and finish the
       // algorithm there.
-      mCapability.width = (c.mWidth.mIdeal.valueOr(0) & 0xffff) << 16 |
-                          (c.mWidth.mMax & 0xffff);
-      mCapability.height = (c.mHeight.mIdeal.valueOr(0) & 0xffff) << 16 |
-                           (c.mHeight.mMax & 0xffff);
-      mCapability.maxFPS = c.mFrameRate.Clamp(c.mFrameRate.mIdeal.valueOr(aPrefs.mFPS));
+      aCapability.width =
+        (c.mWidth.mIdeal.valueOr(0) & 0xffff) << 16 | (c.mWidth.mMax & 0xffff);
+      aCapability.height =
+        (c.mHeight.mIdeal.valueOr(0) & 0xffff) << 16 | (c.mHeight.mMax & 0xffff);
+      aCapability.maxFPS =
+        c.mFrameRate.Clamp(c.mFrameRate.mIdeal.valueOr(aPrefs.mFPS));
       return true;
     }
     default:
-      return MediaEngineCameraVideoSource::ChooseCapability(aConstraints, aPrefs, aDeviceId);
+      return MediaEngineCameraVideoSource::ChooseCapability(aConstraints, aPrefs, aDeviceId, aCapability, aCalculate);
   }
 
 }
diff --git a/dom/media/webrtc/MediaEngineRemoteVideoSource.h b/dom/media/webrtc/MediaEngineRemoteVideoSource.h
index a8921f7b0b1b..738aeb244b76 100644
--- a/dom/media/webrtc/MediaEngineRemoteVideoSource.h
+++ b/dom/media/webrtc/MediaEngineRemoteVideoSource.h
@@ -84,9 +84,12 @@ public:
     return mMediaSource;
   }
 
-  bool ChooseCapability(const NormalizedConstraints &aConstraints,
-                        const MediaEnginePrefs &aPrefs,
-                        const nsString& aDeviceId) override;
+  bool ChooseCapability(
+    const NormalizedConstraints &aConstraints,
+    const MediaEnginePrefs &aPrefs,
+    const nsString& aDeviceId,
+    webrtc::CaptureCapability& aCapability,
+    const DistanceCalculation aCalculate) override;
 
   void Refresh(int aIndex);
 
@@ -107,6 +110,7 @@ private:
   nsresult
   UpdateSingleSource(const AllocationHandle* aHandle,
                      const NormalizedConstraints& aNetConstraints,
+                     const NormalizedConstraints& aNewConstraint,
                      const MediaEnginePrefs& aPrefs,
                      const nsString& aDeviceId,
                      const char** aOutBadConstraint) override;
diff --git a/dom/media/webrtc/MediaEngineWebRTC.h b/dom/media/webrtc/MediaEngineWebRTC.h
index 177413b5eba5..3958255158e5 100644
--- a/dom/media/webrtc/MediaEngineWebRTC.h
+++ b/dom/media/webrtc/MediaEngineWebRTC.h
@@ -566,6 +566,7 @@ private:
   nsresult
   UpdateSingleSource(const AllocationHandle* aHandle,
                      const NormalizedConstraints& aNetConstraints,
+                     const NormalizedConstraints& aNewConstraint,
                      const MediaEnginePrefs& aPrefs,
                      const nsString& aDeviceId,
                      const char** aOutBadConstraint) override;
diff --git a/dom/media/webrtc/MediaEngineWebRTCAudio.cpp b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
index 9854a2482bd7..21349dc3e7d6 100644
--- a/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
+++ b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
@@ -279,6 +279,7 @@ nsresult
 MediaEngineWebRTCMicrophoneSource::UpdateSingleSource(
     const AllocationHandle* aHandle,
     const NormalizedConstraints& aNetConstraints,
+    const NormalizedConstraints& aNewConstraint, /* Ignored */
     const MediaEnginePrefs& aPrefs,
     const nsString& aDeviceId,
     const char** aOutBadConstraint)
diff --git a/dom/media/webrtc/MediaTrackConstraints.cpp b/dom/media/webrtc/MediaTrackConstraints.cpp
index d3764d38cb46..509b44518978 100644
--- a/dom/media/webrtc/MediaTrackConstraints.cpp
+++ b/dom/media/webrtc/MediaTrackConstraints.cpp
@@ -417,6 +417,28 @@ MediaConstraintsHelper::FitnessDistance(ValueType aN,
                             std::max(std::abs(aN), std::abs(aRange.mIdeal.value()))));
 }
 
+template<class ValueType, class NormalizedRange>
+/* static */ uint32_t
+MediaConstraintsHelper::FeasibilityDistance(ValueType aN,
+                                            const NormalizedRange& aRange)
+{
+  if (aRange.mMin > aN) {
+    return UINT32_MAX;
+  }
+  // We prefer larger resolution because now we support downscaling
+  if (aN == aRange.mIdeal.valueOr(aN)) {
+    return 0;
+  }
+
+  if (aN > aRange.mIdeal.value()) {
+    return uint32_t(ValueType((std::abs(aN - aRange.mIdeal.value()) * 1000) /
+      std::max(std::abs(aN), std::abs(aRange.mIdeal.value()))));
+  }
+
+  return 10000 + uint32_t(ValueType((std::abs(aN - aRange.mIdeal.value()) * 1000) /
+    std::max(std::abs(aN), std::abs(aRange.mIdeal.value()))));
+}
+
 // Fitness distance returned as integer math * 1000. Infinity = UINT32_MAX
 
 /* static */ uint32_t
diff --git a/dom/media/webrtc/MediaTrackConstraints.h b/dom/media/webrtc/MediaTrackConstraints.h
index d589be0acc9d..228b67f6de16 100644
--- a/dom/media/webrtc/MediaTrackConstraints.h
+++ b/dom/media/webrtc/MediaTrackConstraints.h
@@ -85,12 +85,19 @@ public:
       return mMax >= aOther.mMin && mMin <= aOther.mMax;
     }
     void Intersect(const Range& aOther) {
-      MOZ_ASSERT(Intersects(aOther));
       mMin = std::max(mMin, aOther.mMin);
-      mMax = std::min(mMax, aOther.mMax);
+      if (Intersects(aOther)) {
+        mMax = std::min(mMax, aOther.mMax);
+      } else {
+        // If there is no intersection, we will down-scale or drop frame
+        mMax = std::max(mMax, aOther.mMax);
+      }
     }
     bool Merge(const Range& aOther) {
-      if (!Intersects(aOther)) {
+      if (strcmp(mName, "width") != 0 &&
+          strcmp(mName, "height") != 0 &&
+          strcmp(mName, "frameRate") != 0 &&
+          !Intersects(aOther)) {
         return false;
       }
       Intersect(aOther);
@@ -297,6 +304,8 @@ class MediaConstraintsHelper
 protected:
   template<class ValueType, class NormalizedRange>
   static uint32_t FitnessDistance(ValueType aN, const NormalizedRange& aRange);
+  template<class ValueType, class NormalizedRange>
+  static uint32_t FeasibilityDistance(ValueType aN, const NormalizedRange& aRange);
   static uint32_t FitnessDistance(nsString aN,
       const NormalizedConstraintSet::StringRange& aConstraint);
 

From 14192dcba4f439b8acfed5ee91674b7dc289b239 Mon Sep 17 00:00:00 2001
From: Munro Mengjue Chiang <mchiang@mozilla.com>
Date: Fri, 1 Dec 2017 10:12:51 +0800
Subject: [PATCH 038/219] Bug 1388219 - down scale camera output frame to the
 target capability. r=jib

MozReview-Commit-ID: 7dlbWXndbgf

--HG--
extra : rebase_source : d29809c0b898648b535afdd2c9e3e97a297d99e0
---
 dom/media/systemservices/CamerasParent.cpp    |  30 ++--
 .../webrtc/MediaEngineCameraVideoSource.cpp   |   3 +-
 .../webrtc/MediaEngineCameraVideoSource.h     |   1 +
 .../webrtc/MediaEngineRemoteVideoSource.cpp   | 163 +++++++++++++-----
 .../video_engine/desktop_capture_impl.cc      |  40 +----
 5 files changed, 146 insertions(+), 91 deletions(-)

diff --git a/dom/media/systemservices/CamerasParent.cpp b/dom/media/systemservices/CamerasParent.cpp
index 398bd20761ec..0340ab5eb395 100644
--- a/dom/media/systemservices/CamerasParent.cpp
+++ b/dom/media/systemservices/CamerasParent.cpp
@@ -52,7 +52,7 @@ ResolutionFeasibilityDistance(int32_t candidate, int32_t requested)
   if (candidate >= requested) {
     distance = (candidate - requested) * 1000 / std::max(candidate, requested);
   } else {
-    distance = (UINT32_MAX / 2) + (requested - candidate) *
+    distance = 10000 + (requested - candidate) *
       1000 / std::max(candidate, requested);
   }
   return distance;
@@ -862,14 +862,14 @@ CamerasParent::RecvStartCapture(const CaptureEngine& aCapEngine,
           capability.codecType = static_cast<webrtc::VideoCodecType>(ipcCaps.codecType());
           capability.interlaced = ipcCaps.interlaced();
 
-          if (aCapEngine == CameraEngine) {
 #ifdef DEBUG
-            auto deviceUniqueID = sDeviceUniqueIDs.find(capnum);
-            MOZ_ASSERT(deviceUniqueID == sDeviceUniqueIDs.end());
+          auto deviceUniqueID = sDeviceUniqueIDs.find(capnum);
+          MOZ_ASSERT(deviceUniqueID == sDeviceUniqueIDs.end());
 #endif
-            sDeviceUniqueIDs.emplace(capnum, cap.VideoCapture()->CurrentDeviceName());
-            sAllRequestedCapabilities.emplace(capnum, capability);
+          sDeviceUniqueIDs.emplace(capnum, cap.VideoCapture()->CurrentDeviceName());
+          sAllRequestedCapabilities.emplace(capnum, capability);
 
+          if (aCapEngine == CameraEngine) {
             for (const auto &it : sDeviceUniqueIDs) {
               if (strcmp(it.second, cap.VideoCapture()->CurrentDeviceName()) == 0) {
                 capability.width = std::max(
@@ -908,6 +908,16 @@ CamerasParent::RecvStartCapture(const CaptureEngine& aCapEngine,
             }
             MOZ_ASSERT(minIdx != -1);
             capability = candidateCapabilities->second[minIdx];
+          } else if (aCapEngine == ScreenEngine ||
+                     aCapEngine == BrowserEngine ||
+                     aCapEngine == WinEngine ||
+                     aCapEngine == AppEngine) {
+            for (const auto &it : sDeviceUniqueIDs) {
+              if (strcmp(it.second, cap.VideoCapture()->CurrentDeviceName()) == 0) {
+                capability.maxFPS = std::max(
+                  capability.maxFPS, sAllRequestedCapabilities[it.first].maxFPS);
+              }
+            }
           }
 
           error = cap.VideoCapture()->StartCapture(capability);
@@ -949,16 +959,14 @@ CamerasParent::StopCapture(const CaptureEngine& aCapEngine,
           mCallbacks[i - 1]->mStreamId == (uint32_t)capnum) {
 
         CallbackHelper* cbh = mCallbacks[i-1];
-        engine->WithEntry(capnum,[cbh, &capnum, &aCapEngine](VideoEngine::CaptureEntry& cap){
+        engine->WithEntry(capnum,[cbh, &capnum](VideoEngine::CaptureEntry& cap){
           if (cap.VideoCapture()) {
             cap.VideoCapture()->DeRegisterCaptureDataCallback(
               static_cast<rtc::VideoSinkInterface<webrtc::VideoFrame>*>(cbh));
             cap.VideoCapture()->StopCaptureIfAllClientsClose();
 
-            if (aCapEngine == CameraEngine) {
-              sDeviceUniqueIDs.erase(capnum);
-              sAllRequestedCapabilities.erase(capnum);
-            }
+            sDeviceUniqueIDs.erase(capnum);
+            sAllRequestedCapabilities.erase(capnum);
           }
         });
 
diff --git a/dom/media/webrtc/MediaEngineCameraVideoSource.cpp b/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
index 25aedad88d04..6720628a7981 100644
--- a/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
@@ -28,7 +28,8 @@ bool MediaEngineCameraVideoSource::AppendToTrack(SourceMediaStream* aSource,
 
   VideoSegment segment;
   RefPtr<layers::Image> image = aImage;
-  IntSize size(image ? mWidth : 0, image ? mHeight : 0);
+  IntSize size = image ? image->GetSize() : IntSize(0, 0);
+
   segment.AppendFrame(image.forget(), delta, size, aPrincipalHandle);
 
   // This is safe from any thread, and is safe if the track is Finished
diff --git a/dom/media/webrtc/MediaEngineCameraVideoSource.h b/dom/media/webrtc/MediaEngineCameraVideoSource.h
index d78bcaeed8ff..17e9c91753ae 100644
--- a/dom/media/webrtc/MediaEngineCameraVideoSource.h
+++ b/dom/media/webrtc/MediaEngineCameraVideoSource.h
@@ -140,6 +140,7 @@ protected:
   nsTArray<RefPtr<SourceMediaStream>> mSources; // When this goes empty, we shut down HW
   nsTArray<PrincipalHandle> mPrincipalHandles; // Directly mapped to mSources.
   RefPtr<layers::Image> mImage;
+  nsTArray<RefPtr<layers::Image>> mImages;
   nsTArray<webrtc::CaptureCapability> mTargetCapabilities;
   nsTArray<uint64_t> mHandleIds;
   RefPtr<layers::ImageContainer> mImageContainer;
diff --git a/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp b/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
index e7024513cf77..1016a6ec9858 100644
--- a/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
@@ -10,6 +10,9 @@
 #include "nsIPrefService.h"
 #include "MediaTrackConstraints.h"
 #include "CamerasChild.h"
+#include "VideoFrameUtils.h"
+#include "webrtc/api/video/i420_buffer.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 
 extern mozilla::LogModule* GetMediaManagerLog();
 #define LOG(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Debug, msg)
@@ -84,6 +87,7 @@ MediaEngineRemoteVideoSource::Shutdown()
           MOZ_ASSERT(mPrincipalHandles.IsEmpty());
           MOZ_ASSERT(mTargetCapabilities.IsEmpty());
           MOZ_ASSERT(mHandleIds.IsEmpty());
+          MOZ_ASSERT(mImages.IsEmpty());
           break;
         }
         source = mSources[0];
@@ -132,6 +136,7 @@ MediaEngineRemoteVideoSource::Allocate(
       MOZ_ASSERT(mPrincipalHandles.IsEmpty());
       MOZ_ASSERT(mTargetCapabilities.IsEmpty());
       MOZ_ASSERT(mHandleIds.IsEmpty());
+      MOZ_ASSERT(mImages.IsEmpty());
       LOG(("Video device %d reallocated", mCaptureIndex));
     } else {
       LOG(("Video device %d allocated shared", mCaptureIndex));
@@ -174,16 +179,21 @@ MediaEngineRemoteVideoSource::Start(SourceMediaStream* aStream, TrackID aID,
     return NS_ERROR_FAILURE;
   }
 
+  mImageContainer =
+    layers::LayerManager::CreateImageContainer(layers::ImageContainer::ASYNCHRONOUS);
+
   {
     MonitorAutoLock lock(mMonitor);
     mSources.AppendElement(aStream);
     mPrincipalHandles.AppendElement(aPrincipalHandle);
     mTargetCapabilities.AppendElement(mTargetCapability);
     mHandleIds.AppendElement(mHandleId);
+    mImages.AppendElement(mImageContainer->CreatePlanarYCbCrImage());
 
     MOZ_ASSERT(mSources.Length() == mPrincipalHandles.Length());
     MOZ_ASSERT(mSources.Length() == mTargetCapabilities.Length());
     MOZ_ASSERT(mSources.Length() == mHandleIds.Length());
+    MOZ_ASSERT(mSources.Length() == mImages.Length());
   }
 
   aStream->AddTrack(aID, 0, new VideoSegment(), SourceMediaStream::ADDTRACK_QUEUED);
@@ -191,8 +201,6 @@ MediaEngineRemoteVideoSource::Start(SourceMediaStream* aStream, TrackID aID,
   if (mState == kStarted) {
     return NS_OK;
   }
-  mImageContainer =
-    layers::LayerManager::CreateImageContainer(layers::ImageContainer::ASYNCHRONOUS);
 
   mState = kStarted;
   mTrackID = aID;
@@ -231,10 +239,12 @@ MediaEngineRemoteVideoSource::Stop(mozilla::SourceMediaStream* aSource,
     MOZ_ASSERT(mSources.Length() == mPrincipalHandles.Length());
     MOZ_ASSERT(mSources.Length() == mTargetCapabilities.Length());
     MOZ_ASSERT(mSources.Length() == mHandleIds.Length());
+    MOZ_ASSERT(mSources.Length() == mImages.Length());
     mSources.RemoveElementAt(i);
     mPrincipalHandles.RemoveElementAt(i);
     mTargetCapabilities.RemoveElementAt(i);
     mHandleIds.RemoveElementAt(i);
+    mImages.RemoveElementAt(i);
 
     aSource->EndTrack(aID);
 
@@ -318,7 +328,12 @@ MediaEngineRemoteVideoSource::UpdateSingleSource(
         }
 
         if (index != mHandleIds.NoIndex) {
+          MonitorAutoLock lock(mMonitor);
           mTargetCapabilities[index] = mTargetCapability;
+          MOZ_ASSERT(mSources.Length() == mPrincipalHandles.Length());
+          MOZ_ASSERT(mSources.Length() == mTargetCapabilities.Length());
+          MOZ_ASSERT(mSources.Length() == mHandleIds.Length());
+          MOZ_ASSERT(mSources.Length() == mImages.Length());
         }
 
         if (!ChooseCapability(aNetConstraints, aPrefs, aDeviceId, mCapability,
@@ -385,18 +400,22 @@ MediaEngineRemoteVideoSource::NotifyPull(MediaStreamGraph* aGraph,
                                          TrackID aID, StreamTime aDesiredTime,
                                          const PrincipalHandle& aPrincipalHandle)
 {
-  VideoSegment segment;
-
+  StreamTime delta = 0;
+  size_t i;
   MonitorAutoLock lock(mMonitor);
   if (mState != kStarted) {
     return;
   }
 
-  StreamTime delta = aDesiredTime - aSource->GetEndOfAppendedData(aID);
+  i = mSources.IndexOf(aSource);
+  if (i == mSources.NoIndex) {
+    return;
+  }
+
+  delta = aDesiredTime - aSource->GetEndOfAppendedData(aID);
 
   if (delta > 0) {
-    // nullptr images are allowed
-    AppendToTrack(aSource, mImage, aID, delta, aPrincipalHandle);
+    AppendToTrack(aSource, mImages[i], aID, delta, aPrincipalHandle);
   }
 }
 
@@ -419,11 +438,12 @@ MediaEngineRemoteVideoSource::FrameSizeChange(unsigned int w, unsigned int h)
 }
 
 int
-MediaEngineRemoteVideoSource::DeliverFrame(uint8_t* aBuffer ,
+MediaEngineRemoteVideoSource::DeliverFrame(uint8_t* aBuffer,
                                     const camera::VideoFrameProperties& aProps)
 {
+  MonitorAutoLock lock(mMonitor);
   // Check for proper state.
-  if (mState != kStarted) {
+  if (mState != kStarted || !mImageContainer) {
     LOG(("DeliverFrame: video not started"));
     return 0;
   }
@@ -431,51 +451,114 @@ MediaEngineRemoteVideoSource::DeliverFrame(uint8_t* aBuffer ,
   // Update the dimensions
   FrameSizeChange(aProps.width(), aProps.height());
 
-  layers::PlanarYCbCrData data;
-  RefPtr<layers::PlanarYCbCrImage> image;
-  {
-    // We grab the lock twice, but don't hold it across the (long) CopyData
-    MonitorAutoLock lock(mMonitor);
-    if (!mImageContainer) {
-      LOG(("DeliverFrame() called after Stop()!"));
-      return 0;
-    }
-    // Create a video frame and append it to the track.
-    image = mImageContainer->CreatePlanarYCbCrImage();
+  MOZ_ASSERT(mSources.Length() == mPrincipalHandles.Length());
+  MOZ_ASSERT(mSources.Length() == mTargetCapabilities.Length());
+  MOZ_ASSERT(mSources.Length() == mHandleIds.Length());
+  MOZ_ASSERT(mSources.Length() == mImages.Length());
+
+  for (uint32_t i = 0; i < mTargetCapabilities.Length(); i++ ) {
+    int32_t req_max_width = mTargetCapabilities[i].width & 0xffff;
+    int32_t req_max_height = mTargetCapabilities[i].height & 0xffff;
+    int32_t req_ideal_width = (mTargetCapabilities[i].width >> 16) & 0xffff;
+    int32_t req_ideal_height = (mTargetCapabilities[i].height >> 16) & 0xffff;
+
+    int32_t dest_max_width = std::min(req_max_width, mWidth);
+    int32_t dest_max_height = std::min(req_max_height, mHeight);
+    // This logic works for both camera and screen sharing case.
+    // for camera case, req_ideal_width and req_ideal_height is 0.
+    // The following snippet will set dst_width to dest_max_width and dst_height to dest_max_height
+    int32_t dst_width = std::min(req_ideal_width > 0 ? req_ideal_width : mWidth, dest_max_width);
+    int32_t dst_height = std::min(req_ideal_height > 0 ? req_ideal_height : mHeight, dest_max_height);
+
+    int dst_stride_y = dst_width;
+    int dst_stride_uv = (dst_width + 1) / 2;
+
+    camera::VideoFrameProperties properties;
+    uint8_t* frame;
+    bool needReScale = !((dst_width == mWidth && dst_height == mHeight) ||
+                         (dst_width > mWidth || dst_height > mHeight));
+
+    if (!needReScale) {
+      dst_width = mWidth;
+      dst_height = mHeight;
+      frame = aBuffer;
+    } else {
+      rtc::scoped_refptr<webrtc::I420Buffer> i420Buffer;
+      i420Buffer = webrtc::I420Buffer::Create(mWidth, mHeight, mWidth,
+                                              (mWidth + 1) / 2, (mWidth + 1) / 2);
+
+      const int conversionResult = webrtc::ConvertToI420(webrtc::kI420,
+                                                         aBuffer,
+                                                         0, 0,  // No cropping
+                                                         mWidth, mHeight,
+                                                         mWidth * mHeight * 3 / 2,
+                                                         webrtc::kVideoRotation_0,
+                                                         i420Buffer.get());
+
+      webrtc::VideoFrame captureFrame(i420Buffer, 0, 0, webrtc::kVideoRotation_0);
+      if (conversionResult < 0) {
+        return 0;
+      }
+
+      rtc::scoped_refptr<webrtc::I420Buffer> scaledBuffer;
+      scaledBuffer = webrtc::I420Buffer::Create(dst_width, dst_height, dst_stride_y,
+                                                dst_stride_uv, dst_stride_uv);
+
+      scaledBuffer->CropAndScaleFrom(*captureFrame.video_frame_buffer().get());
+      webrtc::VideoFrame scaledFrame(scaledBuffer, 0, 0, webrtc::kVideoRotation_0);
+
+      VideoFrameUtils::InitFrameBufferProperties(scaledFrame, properties);
+      frame = new unsigned char[properties.bufferSize()];
+
+      if (!frame) {
+        return 0;
+      }
+
+      VideoFrameUtils::CopyVideoFrameBuffers(frame,
+                                             properties.bufferSize(), scaledFrame);
+    }
+
+    // Create a video frame and append it to the track.
+    RefPtr<layers::PlanarYCbCrImage> image = mImageContainer->CreatePlanarYCbCrImage();
 
-    uint8_t* frame = static_cast<uint8_t*> (aBuffer);
     const uint8_t lumaBpp = 8;
     const uint8_t chromaBpp = 4;
 
+    layers::PlanarYCbCrData data;
+
     // Take lots of care to round up!
     data.mYChannel = frame;
-    data.mYSize = IntSize(mWidth, mHeight);
-    data.mYStride = (mWidth * lumaBpp + 7)/ 8;
-    data.mCbCrStride = (mWidth * chromaBpp + 7) / 8;
-    data.mCbChannel = frame + mHeight * data.mYStride;
-    data.mCrChannel = data.mCbChannel + ((mHeight+1)/2) * data.mCbCrStride;
-    data.mCbCrSize = IntSize((mWidth+1)/ 2, (mHeight+1)/ 2);
+    data.mYSize = IntSize(dst_width, dst_height);
+    data.mYStride = (dst_width * lumaBpp + 7) / 8;
+    data.mCbCrStride = (dst_width * chromaBpp + 7) / 8;
+    data.mCbChannel = frame + dst_height * data.mYStride;
+    data.mCrChannel = data.mCbChannel + ((dst_height + 1) / 2) * data.mCbCrStride;
+    data.mCbCrSize = IntSize((dst_width + 1) / 2, (dst_height + 1) / 2);
     data.mPicX = 0;
     data.mPicY = 0;
-    data.mPicSize = IntSize(mWidth, mHeight);
+    data.mPicSize = IntSize(dst_width, dst_height);
     data.mStereoMode = StereoMode::MONO;
-  }
 
-  if (!image->CopyData(data)) {
-    MOZ_ASSERT(false);
-    return 0;
-  }
+    if (!image->CopyData(data)) {
+      MOZ_ASSERT(false);
+      return 0;
+    }
+
+    if (needReScale && frame) {
+      delete frame;
+      frame = nullptr;
+    }
 
-  MonitorAutoLock lock(mMonitor);
 #ifdef DEBUG
-  static uint32_t frame_num = 0;
-  LOGFRAME(("frame %d (%dx%d); timeStamp %u, ntpTimeMs %" PRIu64 ", renderTimeMs %" PRIu64,
-            frame_num++, mWidth, mHeight,
-            aProps.timeStamp(), aProps.ntpTimeMs(), aProps.renderTimeMs()));
+    static uint32_t frame_num = 0;
+    LOGFRAME(("frame %d (%dx%d); timeStamp %u, ntpTimeMs %" PRIu64 ", renderTimeMs %" PRIu64,
+              frame_num++, mWidth, mHeight,
+              aProps.timeStamp(), aProps.ntpTimeMs(), aProps.renderTimeMs()));
 #endif
 
-  // implicitly releases last image
-  mImage = image.forget();
+    // implicitly releases last image
+    mImages[i] = image.forget();
+  }
 
   // We'll push the frame into the MSG on the next NotifyPull. This will avoid
   // swamping the MSG with frames should it be taking longer than normal to run
diff --git a/media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.cc b/media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.cc
index b464893d56ee..e53175f63a21 100644
--- a/media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.cc
+++ b/media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.cc
@@ -582,45 +582,7 @@ int32_t DesktopCaptureImpl::IncomingFrame(uint8_t* videoFrame,
       return -1;
     }
 
-    int32_t req_max_width = _requestedCapability.width & 0xffff;
-    int32_t req_max_height = _requestedCapability.height & 0xffff;
-    int32_t req_ideal_width = (_requestedCapability.width >> 16) & 0xffff;
-    int32_t req_ideal_height = (_requestedCapability.height >> 16) & 0xffff;
-
-    int32_t dest_max_width = std::min(req_max_width, target_width);
-    int32_t dest_max_height = std::min(req_max_height, target_height);
-    int32_t dst_width = std::min(req_ideal_width > 0 ? req_ideal_width : target_width, dest_max_width);
-    int32_t dst_height = std::min(req_ideal_height > 0 ? req_ideal_height : target_height, dest_max_height);
-
-    // scale to average of portrait and landscape
-    float scale_width = (float)dst_width / (float)target_width;
-    float scale_height = (float)dst_height / (float)target_height;
-    float scale = (scale_width + scale_height) / 2;
-    dst_width = (int)(scale * target_width);
-    dst_height = (int)(scale * target_height);
-
-    // if scaled rectangle exceeds max rectangle, scale to minimum of portrait and landscape
-    if (dst_width > dest_max_width || dst_height > dest_max_height) {
-      scale_width = (float)dest_max_width / (float)dst_width;
-      scale_height = (float)dest_max_height / (float)dst_height;
-      scale = std::min(scale_width, scale_height);
-      dst_width = (int)(scale * dst_width);
-      dst_height = (int)(scale * dst_height);
-    }
-
-    int dst_stride_y = dst_width;
-    int dst_stride_uv = (dst_width + 1) / 2;
-    if (dst_width == target_width && dst_height == target_height) {
-      DeliverCapturedFrame(captureFrame, captureTime);
-    } else {
-      rtc::scoped_refptr<webrtc::I420Buffer> buffer;
-      buffer = I420Buffer::Create(dst_width, dst_height, dst_stride_y,
-                                  dst_stride_uv, dst_stride_uv);
-
-      buffer->ScaleFrom(*captureFrame.video_frame_buffer().get());
-      webrtc::VideoFrame scaledFrame(buffer, 0, 0, kVideoRotation_0);
-      DeliverCapturedFrame(scaledFrame, captureTime);
-    }
+    DeliverCapturedFrame(captureFrame, captureTime);
   } else {
     assert(false);
     return -1;

From 6e506d37ba5960644e7e0fcaced8ba3dbcfd8d65 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Tue, 28 Nov 2017 09:43:27 -0800
Subject: [PATCH 039/219] Bug 1421355, part 1 - Remove
 nsIXPConnect::GetPrincipal(). r=mrbkap

This method is unused. It is the only caller of
XPCWrappedNative::GetObjectPrincipal() so remove that, too.

MozReview-Commit-ID: 8s5toK85YUS

--HG--
extra : rebase_source : 551ec90d893ac9f47ef5166ec1dbd2ac8b5c6988
---
 js/xpconnect/idl/nsIXPConnect.idl     | 11 -----------
 js/xpconnect/src/XPCWrappedNative.cpp | 21 --------------------
 js/xpconnect/src/nsXPConnect.cpp      | 28 ---------------------------
 js/xpconnect/src/xpcprivate.h         |  5 -----
 4 files changed, 65 deletions(-)

diff --git a/js/xpconnect/idl/nsIXPConnect.idl b/js/xpconnect/idl/nsIXPConnect.idl
index bf6f75f6f83f..5bc6484f0d16 100644
--- a/js/xpconnect/idl/nsIXPConnect.idl
+++ b/js/xpconnect/idl/nsIXPConnect.idl
@@ -467,17 +467,6 @@ interface nsIXPConnect : nsISupports
      */
     void NotifyDidPaint();
 
-%{C++
-    /**
-     * Get the object principal for this wrapper.  Note that this may well end
-     * up being null; in that case one should seek principals elsewhere.  Null
-     * here does NOT indicate system principal or no principals at all, just
-     * that this wrapper doesn't have an intrinsic one.
-     */
-    virtual nsIPrincipal* GetPrincipal(JSObject* obj,
-                                       bool allowShortCircuit) const = 0;
-%}
-
     [noscript] void writeScript(in nsIObjectOutputStream aStream,
                                 in JSContextPtr aJSContext,
                                 in JSScriptPtr aJSScript);
diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
index 85024a84af0d..b1470db762ce 100644
--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -2021,27 +2021,6 @@ NS_IMETHODIMP XPCWrappedNative::GetJSObjectPrototype(JSObject * *aJSObjectProtot
     return NS_OK;
 }
 
-nsIPrincipal*
-XPCWrappedNative::GetObjectPrincipal() const
-{
-    nsIPrincipal* principal = GetScope()->GetPrincipal();
-#ifdef DEBUG
-    // Because of inner window reuse, we can have objects with one principal
-    // living in a scope with a different (but same-origin) principal. So
-    // just check same-origin here.
-    nsCOMPtr<nsIScriptObjectPrincipal> objPrin(do_QueryInterface(mIdentity));
-    if (objPrin) {
-        bool equal;
-        if (!principal)
-            equal = !objPrin->GetPrincipal();
-        else
-            principal->Equals(objPrin->GetPrincipal(), &equal);
-        MOZ_ASSERT(equal, "Principal mismatch.  Expect bad things to happen");
-    }
-#endif
-    return principal;
-}
-
 NS_IMETHODIMP XPCWrappedNative::FindInterfaceWithMember(HandleId name,
                                                         nsIInterfaceInfo * *_retval)
 {
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index c0605549c909..e3c1b5681033 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -979,34 +979,6 @@ nsXPConnect::JSToVariant(JSContext* ctx, HandleValue value, nsIVariant** _retval
     return NS_OK;
 }
 
-nsIPrincipal*
-nsXPConnect::GetPrincipal(JSObject* obj, bool allowShortCircuit) const
-{
-    MOZ_ASSERT(IS_WN_REFLECTOR(obj), "What kind of wrapper is this?");
-
-    XPCWrappedNative* xpcWrapper = XPCWrappedNative::Get(obj);
-    if (xpcWrapper) {
-        if (allowShortCircuit) {
-            nsIPrincipal* result = xpcWrapper->GetObjectPrincipal();
-            if (result) {
-                return result;
-            }
-        }
-
-        // If not, check if it points to an nsIScriptObjectPrincipal
-        nsCOMPtr<nsIScriptObjectPrincipal> objPrin =
-            do_QueryInterface(xpcWrapper->Native());
-        if (objPrin) {
-            nsIPrincipal* result = objPrin->GetPrincipal();
-            if (result) {
-                return result;
-            }
-        }
-    }
-
-    return nullptr;
-}
-
 namespace xpc {
 
 bool
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index a245cb0f8814..5f09f23e1a6e 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -269,9 +269,6 @@ public:
     nsresult GetInfoForIID(const nsIID * aIID, nsIInterfaceInfo** info);
     nsresult GetInfoForName(const char * name, nsIInterfaceInfo** info);
 
-    virtual nsIPrincipal* GetPrincipal(JSObject* obj,
-                                       bool allowShortCircuit) const override;
-
     void RecordTraversal(void* p, nsISupports* s);
 
 protected:
@@ -1545,8 +1542,6 @@ public:
 
     NS_DECL_CYCLE_COLLECTION_CLASS(XPCWrappedNative)
 
-    nsIPrincipal* GetObjectPrincipal() const;
-
     bool
     IsValid() const { return mFlatJSObject.hasFlag(FLAT_JS_OBJECT_VALID); }
 

From 03b06b90f7ded2b5e0116655c2b4977cec8b3aed Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Tue, 28 Nov 2017 09:47:44 -0800
Subject: [PATCH 040/219] Bug 1421355, part 2 - Remove
 nsIXPConnect::getWrappedNativeOfNativeObject. r=mrbkap

This method is unused. It is the only caller of
XPCWrappedNative::GetUsedOnly(), so remove that, too.

MozReview-Commit-ID: LRMB2bAwgoS

--HG--
extra : rebase_source : 8203aae8d0263ca467fff8e63f187caca8aaf733
---
 js/xpconnect/idl/nsIXPConnect.idl     | 10 ------
 js/xpconnect/src/XPCWrappedNative.cpp | 48 ---------------------------
 js/xpconnect/src/nsXPConnect.cpp      | 34 -------------------
 js/xpconnect/src/xpcprivate.h         |  6 ----
 4 files changed, 98 deletions(-)

diff --git a/js/xpconnect/idl/nsIXPConnect.idl b/js/xpconnect/idl/nsIXPConnect.idl
index 5bc6484f0d16..53ac36f699b4 100644
--- a/js/xpconnect/idl/nsIXPConnect.idl
+++ b/js/xpconnect/idl/nsIXPConnect.idl
@@ -404,16 +404,6 @@ interface nsIXPConnect : nsISupports
 
     // Methods added since mozilla 0.6....
 
-    /**
-    * This only succeeds if the native object is already wrapped by xpconnect.
-    * A new wrapper is *never* constructed.
-    */
-    nsIXPConnectWrappedNative
-    getWrappedNativeOfNativeObject(in JSContextPtr aJSContext,
-                                   in JSObjectPtr  aScope,
-                                   in nsISupports  aCOMObj,
-                                   in nsIIDRef     aIID);
-
     void
     setFunctionThisTranslator(in nsIIDRef aIID,
                               in nsIXPCFunctionThisTranslator aTranslator);
diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
index b1470db762ce..b04e32e4bc7f 100644
--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -479,54 +479,6 @@ FinishCreate(XPCWrappedNativeScope* Scope,
     return NS_OK;
 }
 
-// static
-nsresult
-XPCWrappedNative::GetUsedOnly(nsISupports* Object,
-                              XPCWrappedNativeScope* Scope,
-                              XPCNativeInterface* Interface,
-                              XPCWrappedNative** resultWrapper)
-{
-    AutoJSContext cx;
-    MOZ_ASSERT(Object, "XPCWrappedNative::GetUsedOnly was called with a null Object");
-    MOZ_ASSERT(Interface);
-
-    RefPtr<XPCWrappedNative> wrapper;
-    nsWrapperCache* cache = nullptr;
-    CallQueryInterface(Object, &cache);
-    if (cache) {
-        RootedObject flat(cx, cache->GetWrapper());
-        if (!flat) {
-            *resultWrapper = nullptr;
-            return NS_OK;
-        }
-        wrapper = XPCWrappedNative::Get(flat);
-    } else {
-        nsCOMPtr<nsISupports> identity = do_QueryInterface(Object);
-
-        if (!identity) {
-            NS_ERROR("This XPCOM object fails in QueryInterface to nsISupports!");
-            return NS_ERROR_FAILURE;
-        }
-
-        Native2WrappedNativeMap* map = Scope->GetWrappedNativeMap();
-
-        wrapper = map->Find(identity);
-        if (!wrapper) {
-            *resultWrapper = nullptr;
-            return NS_OK;
-        }
-    }
-
-    nsresult rv;
-    if (!wrapper->FindTearOff(Interface, false, &rv)) {
-        MOZ_ASSERT(NS_FAILED(rv), "returning NS_OK on failure");
-        return rv;
-    }
-
-    wrapper.forget(resultWrapper);
-    return NS_OK;
-}
-
 // This ctor is used if this object will have a proto.
 XPCWrappedNative::XPCWrappedNative(already_AddRefed<nsISupports>&& aIdentity,
                                    XPCWrappedNativeProto* aProto)
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index e3c1b5681033..362306d82b0b 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -768,40 +768,6 @@ xpc::UnwrapReflectorToISupports(JSObject* reflector)
     return canonical.forget();
 }
 
-NS_IMETHODIMP
-nsXPConnect::GetWrappedNativeOfNativeObject(JSContext * aJSContext,
-                                            JSObject * aScopeArg,
-                                            nsISupports* aCOMObj,
-                                            const nsIID & aIID,
-                                            nsIXPConnectWrappedNative** _retval)
-{
-    MOZ_ASSERT(aJSContext, "bad param");
-    MOZ_ASSERT(aScopeArg, "bad param");
-    MOZ_ASSERT(aCOMObj, "bad param");
-    MOZ_ASSERT(_retval, "bad param");
-
-    *_retval = nullptr;
-
-    RootedObject aScope(aJSContext, aScopeArg);
-
-    XPCWrappedNativeScope* scope = ObjectScope(aScope);
-    if (!scope)
-        return UnexpectedFailure(NS_ERROR_FAILURE);
-
-    RefPtr<XPCNativeInterface> iface =
-        XPCNativeInterface::GetNewOrUsed(&aIID);
-    if (!iface)
-        return NS_ERROR_FAILURE;
-
-    XPCWrappedNative* wrapper;
-
-    nsresult rv = XPCWrappedNative::GetUsedOnly(aCOMObj, scope, iface, &wrapper);
-    if (NS_FAILED(rv))
-        return NS_ERROR_FAILURE;
-    *_retval = static_cast<nsIXPConnectWrappedNative*>(wrapper);
-    return NS_OK;
-}
-
 NS_IMETHODIMP
 nsXPConnect::SetFunctionThisTranslator(const nsIID & aIID,
                                        nsIXPCFunctionThisTranslator* aTranslator)
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 5f09f23e1a6e..3c71954728b8 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -1651,12 +1651,6 @@ public:
                  XPCNativeInterface* Interface,
                  XPCWrappedNative** wrapper);
 
-    static nsresult
-    GetUsedOnly(nsISupports* Object,
-                XPCWrappedNativeScope* Scope,
-                XPCNativeInterface* Interface,
-                XPCWrappedNative** wrapper);
-
     void FlatJSObjectFinalized();
     void FlatJSObjectMoved(JSObject* obj, const JSObject* old);
 

From c4a35a74f9054c9a6517e61abd2ae85aaadf8ff1 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Tue, 28 Nov 2017 09:51:53 -0800
Subject: [PATCH 041/219] Bug 1421355, part 3 - Remove
 nsIXPConnect::GarbageCollect(). r=mrbkap

MozReview-Commit-ID: JGG15HPxpda

--HG--
extra : rebase_source : 60369ff0c61d1dec06aa98e37bf2d00dc11dd5e0
---
 js/xpconnect/idl/nsIXPConnect.idl | 6 ------
 js/xpconnect/src/nsXPConnect.cpp  | 7 -------
 2 files changed, 13 deletions(-)

diff --git a/js/xpconnect/idl/nsIXPConnect.idl b/js/xpconnect/idl/nsIXPConnect.idl
index 53ac36f699b4..0eb1d7af85b4 100644
--- a/js/xpconnect/idl/nsIXPConnect.idl
+++ b/js/xpconnect/idl/nsIXPConnect.idl
@@ -445,12 +445,6 @@ interface nsIXPConnect : nsISupports
                                          in JSContextPtr cx,
                                          in JSObjectPtr sandbox);
 
-    /**
-     * Trigger a JS garbage collection.
-     * Use a js::gcreason::Reason from jsfriendapi.h for the kind.
-     */
-    void GarbageCollect(in uint32_t reason);
-
     /**
      * Signals a good place to do an incremental GC slice, because the
      * browser is drawing a frame.
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 362306d82b0b..9466df90ce3e 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -399,13 +399,6 @@ nsXPConnect::GetInfoForName(const char * name, nsIInterfaceInfo** info)
   return NS_FAILED(rv) ? NS_OK : NS_ERROR_NO_INTERFACE;
 }
 
-NS_IMETHODIMP
-nsXPConnect::GarbageCollect(uint32_t reason)
-{
-    mRuntime->GarbageCollect(reason);
-    return NS_OK;
-}
-
 void
 xpc_MarkInCCGeneration(nsISupports* aVariant, uint32_t aGeneration)
 {

From 34d939862e1260d13a9947c72bf39a7cfd5832cd Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Tue, 28 Nov 2017 09:53:04 -0800
Subject: [PATCH 042/219] Bug 1421355, part 4 - Remove
 nsXPConnect::GetInfoForName. r=mrbkap

MozReview-Commit-ID: 6Y0ujiF0RBw

--HG--
extra : rebase_source : 2eca5f54fef5fde7281e9c7bbff860c8451329cc
---
 js/xpconnect/src/nsXPConnect.cpp | 7 -------
 js/xpconnect/src/xpcprivate.h    | 1 -
 2 files changed, 8 deletions(-)

diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 9466df90ce3e..56f4f19c15b7 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -392,13 +392,6 @@ nsXPConnect::GetInfoForIID(const nsIID * aIID, nsIInterfaceInfo** info)
   return XPTInterfaceInfoManager::GetSingleton()->GetInfoForIID(aIID, info);
 }
 
-nsresult
-nsXPConnect::GetInfoForName(const char * name, nsIInterfaceInfo** info)
-{
-  nsresult rv = XPTInterfaceInfoManager::GetSingleton()->GetInfoForName(name, info);
-  return NS_FAILED(rv) ? NS_OK : NS_ERROR_NO_INTERFACE;
-}
-
 void
 xpc_MarkInCCGeneration(nsISupports* aVariant, uint32_t aGeneration)
 {
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 3c71954728b8..f652fbc1512e 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -267,7 +267,6 @@ public:
     bool IsShuttingDown() const {return mShuttingDown;}
 
     nsresult GetInfoForIID(const nsIID * aIID, nsIInterfaceInfo** info);
-    nsresult GetInfoForName(const char * name, nsIInterfaceInfo** info);
 
     void RecordTraversal(void* p, nsISupports* s);
 

From 71dbca0a82493282b81163e1ee3a02d2455e59c5 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Tue, 28 Nov 2017 10:00:38 -0800
Subject: [PATCH 043/219] Bug 1421355, part 5 - Remove
 nsXPConnect::NotifyDidPaint(). r=mrbkap

Presshell still does something along these lines, but it works completely differently.

MozReview-Commit-ID: JRenEDNlo6p

--HG--
extra : rebase_source : d90924fcbbf81b1b23311b8589ea86403f0fd630
---
 js/xpconnect/idl/nsIXPConnect.idl | 6 ------
 js/xpconnect/src/nsXPConnect.cpp  | 7 -------
 2 files changed, 13 deletions(-)

diff --git a/js/xpconnect/idl/nsIXPConnect.idl b/js/xpconnect/idl/nsIXPConnect.idl
index 0eb1d7af85b4..a70c69b96988 100644
--- a/js/xpconnect/idl/nsIXPConnect.idl
+++ b/js/xpconnect/idl/nsIXPConnect.idl
@@ -445,12 +445,6 @@ interface nsIXPConnect : nsISupports
                                          in JSContextPtr cx,
                                          in JSObjectPtr sandbox);
 
-    /**
-     * Signals a good place to do an incremental GC slice, because the
-     * browser is drawing a frame.
-     */
-    void NotifyDidPaint();
-
     [noscript] void writeScript(in nsIObjectOutputStream aStream,
                                 in JSContextPtr aJSContext,
                                 in JSScriptPtr aJSScript);
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 56f4f19c15b7..93a7dcefc1fb 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -997,13 +997,6 @@ SetLocationForGlobal(JSObject* global, nsIURI* locationURI)
 
 } // namespace xpc
 
-NS_IMETHODIMP
-nsXPConnect::NotifyDidPaint()
-{
-    JS::NotifyDidPaint(XPCJSContext::Get()->Context());
-    return NS_OK;
-}
-
 static nsresult
 WriteScriptOrFunction(nsIObjectOutputStream* stream, JSContext* cx,
                       JSScript* scriptArg, HandleObject functionObj)

From 6d088f4ffe73d6a2966af1da4cb0a4254591f0f2 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Tue, 28 Nov 2017 10:04:23 -0800
Subject: [PATCH 044/219] Bug 1421355, part 6 - Remove JS::NotifyDidPaint.
 r=jonco

MozReview-Commit-ID: 6rdvr6QfAD1

--HG--
extra : rebase_source : e3e1fb7de9cc30d10cd17d00f4290e27a46b4c0e
---
 js/public/GCAPI.h      | 6 ------
 js/src/jsfriendapi.cpp | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/js/public/GCAPI.h b/js/public/GCAPI.h
index 43686aa86eae..ee18d49f88ad 100644
--- a/js/public/GCAPI.h
+++ b/js/public/GCAPI.h
@@ -881,12 +881,6 @@ class JS_PUBLIC_API(AutoCheckCannotGC) : public AutoRequireNoGC
 extern JS_FRIEND_API(void)
 NotifyGCRootsRemoved(JSContext* cx);
 
-/*
- * Internal to Firefox.
- */
-extern JS_FRIEND_API(void)
-NotifyDidPaint(JSContext* cx);
-
 } /* namespace JS */
 
 /**
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index c977162218a7..c1a1460b56e8 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -1248,12 +1248,6 @@ js::SetActivityCallback(JSContext* cx, ActivityCallback cb, void* arg)
     cx->activityCallbackArg = arg;
 }
 
-JS_FRIEND_API(void)
-JS::NotifyDidPaint(JSContext* cx)
-{
-    cx->runtime()->gc.notifyDidPaint();
-}
-
 JS_FRIEND_API(void)
 JS::NotifyGCRootsRemoved(JSContext* cx)
 {

From e901a26540c7b876feb7b54aa454b923d4c3e64d Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Tue, 28 Nov 2017 10:31:30 -0800
Subject: [PATCH 045/219] Bug 1421355, part 7 - Remove unused defines and
 forward decls from nsIXPConnect.idl. r=mrbkap

MozReview-Commit-ID: EI05aS33n2R

--HG--
extra : rebase_source : 3a52b327c9d34e0c3d4c987ce4877d1981b7be34
---
 js/xpconnect/idl/nsIXPConnect.idl | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/js/xpconnect/idl/nsIXPConnect.idl b/js/xpconnect/idl/nsIXPConnect.idl
index a70c69b96988..e75694a7a8cd 100644
--- a/js/xpconnect/idl/nsIXPConnect.idl
+++ b/js/xpconnect/idl/nsIXPConnect.idl
@@ -14,8 +14,6 @@
 #include "mozilla/Attributes.h"
 #include "nsCOMPtr.h"
 
-struct JSFreeOp;
-
 class nsWrapperCache;
 %}
 
@@ -24,30 +22,18 @@ class nsWrapperCache;
 // NB: jsval and jsid are declared in nsrootidl.idl
 
 [ptr] native JSContextPtr(JSContext);
-[ptr] native JSClassPtr(JSClass);
-[ptr] native JSFreeOpPtr(JSFreeOp);
 [ptr] native JSObjectPtr(JSObject);
-[ptr] native JSValConstPtr(const JS::Value);
-      native JSEqualityOp(JSEqualityOp);
 [ptr] native JSScriptPtr(JSScript);
-[ptr] native voidPtrPtr(void*);
 [ptr] native nsWrapperCachePtr(nsWrapperCache);
-[ref] native JSCompartmentOptions(JS::CompartmentOptions);
-[ref] native JSCallArgsRef(const JS::CallArgs);
       native JSHandleId(JS::Handle<jsid>);
 
 /***************************************************************************/
 
 // forward declarations...
-interface nsIXPCScriptable;
-interface nsIXPConnect;
-interface nsIXPConnectWrappedNative;
 interface nsIInterfaceInfo;
-interface nsIXPCSecurityManager;
 interface nsIPrincipal;
 interface nsIClassInfo;
 interface nsIVariant;
-interface nsIStackFrame;
 interface nsIObjectInputStream;
 interface nsIObjectOutputStream;
 

From 7e0973c356b1139ef63fa2011129de0e00f955fb Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Tue, 28 Nov 2017 10:48:12 -0800
Subject: [PATCH 046/219] Bug 1421355, part 8 - Remove unused attributes and
 methods from nsIXPConnectWrappedNative. r=mrbkap

Also remove some out of date comments. GetObjectPrincipal() was removed a while ago.

MozReview-Commit-ID: IQFoVyaEMlY

--HG--
extra : rebase_source : 935ecc1094d46ac8cab11e236b6ffb1a95aa9a06
---
 js/xpconnect/idl/nsIXPConnect.idl     | 16 ---------
 js/xpconnect/src/XPCInlines.h         | 14 --------
 js/xpconnect/src/XPCWrappedNative.cpp | 50 ---------------------------
 js/xpconnect/src/xpcprivate.h         |  2 --
 4 files changed, 82 deletions(-)

diff --git a/js/xpconnect/idl/nsIXPConnect.idl b/js/xpconnect/idl/nsIXPConnect.idl
index e75694a7a8cd..b6e9c913c994 100644
--- a/js/xpconnect/idl/nsIXPConnect.idl
+++ b/js/xpconnect/idl/nsIXPConnect.idl
@@ -48,25 +48,9 @@ interface nsIXPConnectJSObjectHolder : nsISupports
 interface nsIXPConnectWrappedNative : nsIXPConnectJSObjectHolder
 {
     /* attribute 'JSObject' inherited from nsIXPConnectJSObjectHolder */
-    readonly attribute nsISupports      Native;
-    readonly attribute JSObjectPtr      JSObjectPrototype;
-
-    /**
-     * These are here as an aid to nsIXPCScriptable implementors
-     */
-
-    nsIInterfaceInfo FindInterfaceWithMember(in JSHandleId nameID);
-    nsIInterfaceInfo FindInterfaceWithName(in JSHandleId nameID);
-    [notxpcom] bool HasNativeMember(in JSHandleId name);
 
     void debugDump(in short depth);
 
-    /*
-     * NOTE: Add new IDL methods _before_ the C++ block below if you
-     * add them.  Otherwise the vtable won't be what xpidl thinks it
-     * is, since GetObjectPrincipal() is virtual.
-     */
-
 %{C++
     /**
      * Faster access to the native object from C++.  Will never return null.
diff --git a/js/xpconnect/src/XPCInlines.h b/js/xpconnect/src/XPCInlines.h
index d054ff864ad8..128df083f1a6 100644
--- a/js/xpconnect/src/XPCInlines.h
+++ b/js/xpconnect/src/XPCInlines.h
@@ -359,20 +359,6 @@ XPCNativeSet::FindMember(JS::HandleId name,
     return true;
 }
 
-inline XPCNativeInterface*
-XPCNativeSet::FindNamedInterface(jsid name) const
-{
-    XPCNativeInterface* const * pp = mInterfaces;
-
-    for (int i = (int) mInterfaceCount; i > 0; i--, pp++) {
-        XPCNativeInterface* iface = *pp;
-
-        if (name == iface->GetName())
-            return iface;
-    }
-    return nullptr;
-}
-
 inline XPCNativeInterface*
 XPCNativeSet::FindInterfaceWithIID(const nsIID& iid) const
 {
diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
index b04e32e4bc7f..f45d742100da 100644
--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -1957,56 +1957,6 @@ XPCWrappedNative::GetJSObject()
     return GetFlatJSObject();
 }
 
-NS_IMETHODIMP XPCWrappedNative::GetNative(nsISupports * *aNative)
-{
-    // No need to QI here, we already have the correct nsISupports
-    // vtable.
-    nsCOMPtr<nsISupports> rval = mIdentity;
-    rval.forget(aNative);
-    return NS_OK;
-}
-
-NS_IMETHODIMP XPCWrappedNative::GetJSObjectPrototype(JSObject * *aJSObjectPrototype)
-{
-    *aJSObjectPrototype = HasProto() ?
-                GetProto()->GetJSProtoObject() : GetFlatJSObject();
-    return NS_OK;
-}
-
-NS_IMETHODIMP XPCWrappedNative::FindInterfaceWithMember(HandleId name,
-                                                        nsIInterfaceInfo * *_retval)
-{
-    RefPtr<XPCNativeInterface> iface;
-    XPCNativeMember*  member;
-
-    if (GetSet()->FindMember(name, &member, &iface) && iface) {
-        nsCOMPtr<nsIInterfaceInfo> temp = iface->GetInterfaceInfo();
-        temp.forget(_retval);
-    } else
-        *_retval = nullptr;
-    return NS_OK;
-}
-
-NS_IMETHODIMP XPCWrappedNative::FindInterfaceWithName(HandleId name,
-                                                      nsIInterfaceInfo * *_retval)
-{
-    XPCNativeInterface* iface = GetSet()->FindNamedInterface(name);
-    if (iface) {
-        nsCOMPtr<nsIInterfaceInfo> temp = iface->GetInterfaceInfo();
-        temp.forget(_retval);
-    } else
-        *_retval = nullptr;
-    return NS_OK;
-}
-
-NS_IMETHODIMP_(bool)
-XPCWrappedNative::HasNativeMember(HandleId name)
-{
-    XPCNativeMember* member = nullptr;
-    uint16_t ignored;
-    return GetSet()->FindMember(name, &member, &ignored) && !!member;
-}
-
 NS_IMETHODIMP XPCWrappedNative::DebugDump(int16_t depth)
 {
 #ifdef DEBUG
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index f652fbc1512e..bddb262047fe 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -1331,8 +1331,6 @@ class XPCNativeSet final
 
     inline XPCNativeInterface* FindInterfaceWithIID(const nsIID& iid) const;
 
-    inline XPCNativeInterface* FindNamedInterface(jsid name) const;
-
     uint16_t GetMemberCount() const {
         return mMemberCount;
     }

From dce6b5fececb568e6c8f59aa18113a1780a6f542 Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Thu, 30 Nov 2017 13:23:56 -0500
Subject: [PATCH 047/219] Bug 1422321. Eliminate double promotion in Round().
 r=kats

This uses std::floor(T) instead of floor(double) so that we end up calling
floorf(float) for floats instead floor(double). It also changes the literals to
be floats. 0.5f is exactly representable in float and so will transparently
promote to double as needed.

--HG--
extra : rebase_source : ea193026b3c7d1f97f5abbc3f9220eca5ac5523c
---
 gfx/2d/BasePoint.h |  4 ++--
 gfx/2d/BaseRect.h  | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gfx/2d/BasePoint.h b/gfx/2d/BasePoint.h
index 755f25e303e2..3901e5c639e1 100644
--- a/gfx/2d/BasePoint.h
+++ b/gfx/2d/BasePoint.h
@@ -91,8 +91,8 @@ struct BasePoint {
   // They are always rounding as floor(n + 0.5).
   // See https://bugzilla.mozilla.org/show_bug.cgi?id=410748#c14
   Sub& Round() {
-    x = Coord(floor(T(x) + T(0.5)));
-    y = Coord(floor(T(y) + T(0.5)));
+    x = Coord(std::floor(T(x) + T(0.5f)));
+    y = Coord(std::floor(T(y) + T(0.5f)));
     return *static_cast<Sub*>(this);
   }
 
diff --git a/gfx/2d/BaseRect.h b/gfx/2d/BaseRect.h
index e8993f29d1c7..4b86987f3734 100644
--- a/gfx/2d/BaseRect.h
+++ b/gfx/2d/BaseRect.h
@@ -418,10 +418,10 @@ struct BaseRect {
   // new |RoundAwayFromZero()| method.
   void Round()
   {
-    T x0 = static_cast<T>(floor(T(X()) + 0.5));
-    T y0 = static_cast<T>(floor(T(Y()) + 0.5));
-    T x1 = static_cast<T>(floor(T(XMost()) + 0.5));
-    T y1 = static_cast<T>(floor(T(YMost()) + 0.5));
+    T x0 = static_cast<T>(std::floor(T(X()) + 0.5f));
+    T y0 = static_cast<T>(std::floor(T(Y()) + 0.5f));
+    T x1 = static_cast<T>(std::floor(T(XMost()) + 0.5f));
+    T y1 = static_cast<T>(std::floor(T(YMost()) + 0.5f));
 
     x = x0;
     y = y0;
@@ -434,10 +434,10 @@ struct BaseRect {
   // original rectangle contains the resulting rectangle.
   void RoundIn()
   {
-    T x0 = static_cast<T>(ceil(T(X())));
-    T y0 = static_cast<T>(ceil(T(Y())));
-    T x1 = static_cast<T>(floor(T(XMost())));
-    T y1 = static_cast<T>(floor(T(YMost())));
+    T x0 = static_cast<T>(std::ceil(T(X())));
+    T y0 = static_cast<T>(std::ceil(T(Y())));
+    T x1 = static_cast<T>(std::floor(T(XMost())));
+    T y1 = static_cast<T>(std::floor(T(YMost())));
 
     x = x0;
     y = y0;
@@ -450,10 +450,10 @@ struct BaseRect {
   // resulting rectangle contains the original rectangle.
   void RoundOut()
   {
-    T x0 = static_cast<T>(floor(T(X())));
-    T y0 = static_cast<T>(floor(T(Y())));
-    T x1 = static_cast<T>(ceil(T(XMost())));
-    T y1 = static_cast<T>(ceil(T(YMost())));
+    T x0 = static_cast<T>(std::floor(T(X())));
+    T y0 = static_cast<T>(std::floor(T(Y())));
+    T x1 = static_cast<T>(std::ceil(T(XMost())));
+    T y1 = static_cast<T>(std::ceil(T(YMost())));
 
     x = x0;
     y = y0;

From 6806c911a3b9e5d878af4f99cddebadc0ba12808 Mon Sep 17 00:00:00 2001
From: Chung-Sheng Fu <cfu@mozilla.com>
Date: Tue, 12 Sep 2017 17:32:07 +0800
Subject: [PATCH 048/219] Bug 1039069 - Provide a popup about English for
 international users. r=arthuredelstein,mconley

MozReview-Commit-ID: IL8i4vzjWQd

--HG--
extra : rebase_source : 7524445d3508b6de6a347034efb4a28e8d5738c5
---
 browser/app/profile/firefox.js                |   6 +
 browser/base/content/browser.js               |   3 +
 browser/components/nsBrowserGlue.js           |   5 +
 .../en-US/chrome/browser/browser.properties   |   3 +
 .../resistfingerprinting/LanguagePrompt.jsm   | 205 ++++++++++++++++++
 .../components/resistfingerprinting/moz.build |   4 +
 6 files changed, 226 insertions(+)
 create mode 100644 toolkit/components/resistfingerprinting/LanguagePrompt.jsm

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 2be842557bd3..10704fd0b0a4 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -582,6 +582,12 @@ pref("privacy.panicButton.enabled",         true);
 // Time until temporary permissions expire, in ms
 pref("privacy.temporary_permission_expire_time_ms",  3600000);
 
+// If Accept-Language should be spoofed by en-US
+// 0 - will prompt
+// 1 - don't spoof
+// 2 - spoof
+pref("privacy.spoof_english", 0);
+
 pref("network.proxy.share_proxy_settings",  false); // use the same proxy settings for all protocols
 
 // simple gestures support
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index d718a29395d3..27d6ba76ee07 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -34,6 +34,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   E10SUtils: "resource:///modules/E10SUtils.jsm",
   ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
   FormValidationHandler: "resource:///modules/FormValidationHandler.jsm",
+  LanguagePrompt: "resource://gre/modules/LanguagePrompt.jsm",
   LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm",
   Log: "resource://gre/modules/Log.jsm",
   LoginManagerParent: "resource://gre/modules/LoginManagerParent.jsm",
@@ -1821,6 +1822,8 @@ var gBrowserInit = {
 
     gAccessibilityServiceIndicator.uninit();
 
+    LanguagePrompt.uninit();
+
     // Now either cancel delayedStartup, or clean up the services initialized from
     // it.
     if (this._boundDelayedStartup) {
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index ee8a6e03f4c1..e707dd0ab246 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -41,6 +41,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   FormValidationHandler: "resource:///modules/FormValidationHandler.jsm",
   Integration: "resource://gre/modules/Integration.jsm",
   L10nRegistry: "resource://gre/modules/L10nRegistry.jsm",
+  LanguagePrompt: "resource://gre/modules/LanguagePrompt.jsm",
   LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm",
   LoginHelper: "resource://gre/modules/LoginHelper.jsm",
   LoginManagerParent: "resource://gre/modules/LoginManagerParent.jsm",
@@ -1166,6 +1167,10 @@ BrowserGlue.prototype = {
         JawsScreenReaderVersionCheck.onWindowsRestored();
       });
     }
+
+    Services.tm.idleDispatchToMainThread(() => {
+      LanguagePrompt.init();
+    });
   },
 
   /**
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index f251cf605195..f58ef5b2bb64 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -497,6 +497,9 @@ canvas.allow=Allow Data Access
 canvas.allow.accesskey=A
 canvas.remember=Always remember my decision
 
+# Spoof Accept-Language prompt
+privacy.spoof_english=Changing your language setting to English will make you more difficult to identify and enhance your privacy. Do you want to request English language versions of web pages?
+
 identity.identified.verifier=Verified by: %S
 identity.identified.verified_by_you=You have added a security exception for this site.
 identity.identified.state_and_country=%S, %S
diff --git a/toolkit/components/resistfingerprinting/LanguagePrompt.jsm b/toolkit/components/resistfingerprinting/LanguagePrompt.jsm
new file mode 100644
index 000000000000..cc4d37e4a639
--- /dev/null
+++ b/toolkit/components/resistfingerprinting/LanguagePrompt.jsm
@@ -0,0 +1,205 @@
+// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+this.EXPORTED_SYMBOLS = ["LanguagePrompt"];
+
+const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+const kPrefResistFingerprinting = "privacy.resistFingerprinting";
+const kPrefSpoofEnglish = "privacy.spoof_english";
+const kTopicHttpOnModifyRequest = "http-on-modify-request";
+
+class _LanguagePrompt {
+  constructor() {
+    this._initialized = false;
+  }
+
+  init() {
+    if (this._initialized) {
+      return;
+    }
+    this._initialized = true;
+
+    Services.prefs.addObserver(kPrefResistFingerprinting, this);
+    this._handleResistFingerprintingChanged();
+  }
+
+  uninit() {
+    if (!this._initialized) {
+      return;
+    }
+    this._initialized = false;
+
+    Services.prefs.removeObserver(kPrefResistFingerprinting, this);
+    this._removeObservers();
+  }
+
+  observe(subject, topic, data) {
+    switch (topic) {
+      case "nsPref:changed":
+        this._handlePrefChanged(data);
+        break;
+      case kTopicHttpOnModifyRequest:
+        this._handleHttpOnModifyRequest(subject, data);
+        break;
+      default:
+        break;
+    }
+  }
+
+  _removeObservers() {
+    try {
+      Services.pref.removeObserver(kPrefSpoofEnglish, this);
+    } catch (e) {
+      // do nothing
+    }
+    try {
+      Services.obs.removeObserver(this, kTopicHttpOnModifyRequest);
+    } catch (e) {
+      // do nothing
+    }
+  }
+
+  _shouldPromptForLanguagePref() {
+    return (Services.locale.getAppLocaleAsLangTag().substr(0, 2) !== "en")
+      && (Services.prefs.getIntPref(kPrefSpoofEnglish) === 0);
+  }
+
+  _handlePrefChanged(data) {
+    switch (data) {
+      case kPrefResistFingerprinting:
+        this._handleResistFingerprintingChanged();
+        break;
+      case kPrefSpoofEnglish:
+        this._handleSpoofEnglishChanged();
+        break;
+      default:
+        break;
+    }
+  }
+
+  _handleResistFingerprintingChanged() {
+    if (Services.prefs.getBoolPref(kPrefResistFingerprinting)) {
+      Services.prefs.addObserver(kPrefSpoofEnglish, this);
+      if (this._shouldPromptForLanguagePref()) {
+        Services.obs.addObserver(this, kTopicHttpOnModifyRequest);
+      }
+    } else {
+      this._removeObservers();
+      Services.prefs.setIntPref(kPrefSpoofEnglish, 0);
+    }
+  }
+
+  _handleSpoofEnglishChanged() {
+    switch (Services.prefs.getIntPref(kPrefSpoofEnglish)) {
+      case 0: // will prompt
+        // This should only happen when turning privacy.resistFingerprinting off.
+        // Works like disabling accept-language spoofing.
+      case 1: // don't spoof
+        if (Services.prefs.prefHasUserValue("javascript.use_us_english_locale")) {
+          Services.prefs.clearUserPref("javascript.use_us_english_locale");
+        }
+        // We don't reset intl.accept_languages. Instead, setting
+        // privacy.spoof_english to 1 allows user to change preferred language
+        // settings through Preferences UI.
+        break;
+      case 2: // spoof
+        Services.prefs.setCharPref("intl.accept_languages", "en-US, en");
+        Services.prefs.setBoolPref("javascript.use_us_english_locale", true);
+        break;
+      default:
+        break;
+    }
+  }
+
+  _handleHttpOnModifyRequest(subject, data) {
+    // If we are loading an HTTP page from content, show the
+    // "request English language web pages?" prompt.
+    let httpChannel;
+    try {
+      httpChannel = subject.QueryInterface(Ci.nsIHttpChannel);
+    } catch (e) {
+      return;
+    }
+
+    if (!httpChannel) {
+      return;
+    }
+
+    let notificationCallbacks = httpChannel.notificationCallbacks;
+    if (!notificationCallbacks) {
+      return;
+    }
+
+    let loadContext = notificationCallbacks.getInterface(Ci.nsILoadContext);
+    if (!loadContext || !loadContext.isContent) {
+      return;
+    }
+
+    if (!subject.URI.schemeIs("http") && !subject.URI.schemeIs("https")) {
+      return;
+    }
+    // The above QI did not throw, the scheme is http[s], and we know the
+    // load context is content, so we must have a true HTTP request from content.
+    // Stop the observer and display the prompt if another window has
+    // not already done so.
+    Services.obs.removeObserver(this, kTopicHttpOnModifyRequest);
+
+    if (!this._shouldPromptForLanguagePref()) {
+      return;
+    }
+
+    this._promptForLanguagePreference();
+
+    // The Accept-Language header for this request was set when the
+    // channel was created. Reset it to match the value that will be
+    // used for future requests.
+    let val = this._getCurrentAcceptLanguageValue(subject.URI);
+    if (val) {
+      httpChannel.setRequestHeader("Accept-Language", val, false);
+    }
+  }
+
+  _promptForLanguagePreference() {
+    // Display two buttons, both with string titles.
+    let flags = Services.prompt.STD_YES_NO_BUTTONS;
+    let brandBundle = Services.strings.createBundle(
+      "chrome://branding/locale/brand.properties");
+    let brandShortName = brandBundle.GetStringFromName("brandShortName");
+    let navigatorBundle = Services.strings.createBundle(
+      "chrome://browser/locale/browser.properties");
+    let message = navigatorBundle.formatStringFromName(
+      "privacy.spoof_english", [brandShortName], 1);
+    let response = Services.prompt.confirmEx(
+      null, "", message, flags, null, null, null, null, {value: false});
+
+    // Update preferences to reflect their response and to prevent the prompt
+    // from being displayed again.
+    Services.prefs.setIntPref(kPrefSpoofEnglish, (response == 0) ? 2 : 1);
+  }
+
+  _getCurrentAcceptLanguageValue(uri) {
+    let channel = Services.io.newChannelFromURI2(
+        uri,
+        null, // aLoadingNode
+        Services.scriptSecurityManager.getSystemPrincipal(),
+        null, // aTriggeringPrincipal
+        Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
+        Ci.nsIContentPolicy.TYPE_OTHER);
+    let httpChannel;
+    try {
+      httpChannel = channel.QueryInterface(Ci.nsIHttpChannel);
+    } catch (e) {
+      return null;
+    }
+    return httpChannel.getRequestHeader("Accept-Language");
+  }
+}
+
+let LanguagePrompt = new _LanguagePrompt();
diff --git a/toolkit/components/resistfingerprinting/moz.build b/toolkit/components/resistfingerprinting/moz.build
index 514688973393..2fc3104dc2b9 100644
--- a/toolkit/components/resistfingerprinting/moz.build
+++ b/toolkit/components/resistfingerprinting/moz.build
@@ -13,3 +13,7 @@ FINAL_LIBRARY = 'xul'
 EXPORTS += [
     'nsRFPService.h',
 ]
+
+EXTRA_JS_MODULES += [
+    'LanguagePrompt.jsm',
+]

From 9fdde28a64162f8ea219e09cdc3317a4ce6c9a5d Mon Sep 17 00:00:00 2001
From: Chung-Sheng Fu <cfu@mozilla.com>
Date: Tue, 24 Oct 2017 16:28:53 +0800
Subject: [PATCH 049/219] Bug 1039069 - Show a hint of the change of the
 preferred language list. r=mconley

MozReview-Commit-ID: LHyXmdnyf3N

--HG--
extra : rebase_source : 671f99ad432245b7dfe925e4867c76849a3bc2a7
---
 browser/components/preferences/languages.js   | 44 ++++++++++++++++++-
 browser/components/preferences/languages.xul  |  8 ++++
 .../chrome/browser/preferences/languages.dtd  |  2 +-
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/browser/components/preferences/languages.js b/browser/components/preferences/languages.js
index 3f80f89eb308..814cc061376d 100644
--- a/browser/components/preferences/languages.js
+++ b/browser/components/preferences/languages.js
@@ -3,6 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+Components.utils.import("resource://gre/modules/Services.jsm");
+
 var gLanguagesDialog = {
 
   _availableLanguagesList: [],
@@ -149,6 +151,10 @@ var gLanguagesDialog = {
       this._activeLanguages.selectedIndex = selectedIndex;
     }
 
+    // Update states of accept-language list and buttons according to
+    // privacy.resistFingerprinting and privacy.spoof_english.
+    this.readSpoofEnglish();
+
     return undefined;
   },
 
@@ -157,8 +163,10 @@ var gLanguagesDialog = {
   },
 
   onAvailableLanguageSelect() {
+    var availableLanguages = this._availableLanguages;
     var addButton = document.getElementById("addButton");
-    addButton.disabled = false;
+    addButton.disabled = availableLanguages.disabled ||
+                         availableLanguages.selectedIndex < 0;
 
     this._availableLanguages.removeAttribute("accesskey");
   },
@@ -291,6 +299,40 @@ var gLanguagesDialog = {
       downButton.disabled = true;
       removeButton.disabled = false;
     }
+  },
+
+  readSpoofEnglish() {
+    var checkbox = document.getElementById("spoofEnglish");
+    var resistFingerprinting = Services.prefs.getBoolPref("privacy.resistFingerprinting");
+    if (!resistFingerprinting) {
+      checkbox.hidden = true;
+      return false;
+    }
+
+    var spoofEnglish = document.getElementById("privacy.spoof_english").value;
+    var activeLanguages = this._activeLanguages;
+    var availableLanguages = this._availableLanguages;
+    checkbox.hidden = false;
+    switch (spoofEnglish) {
+    case 1: // don't spoof intl.accept_lanauges
+      activeLanguages.disabled = false;
+      activeLanguages.selectItem(activeLanguages.firstChild);
+      availableLanguages.disabled = false;
+      this.onAvailableLanguageSelect();
+      return false;
+    case 2: // spoof intl.accept_lanauges
+      activeLanguages.clearSelection();
+      activeLanguages.disabled = true;
+      availableLanguages.disabled = true;
+      this.onAvailableLanguageSelect();
+      return true;
+    default: // will prompt for spoofing intl.accept_lanauges if resisting fingerprinting
+      return false;
+    }
+  },
+
+  writeSpoofEnglish() {
+    return document.getElementById("spoofEnglish").checked ? 2 : 1;
   }
 };
 
diff --git a/browser/components/preferences/languages.xul b/browser/components/preferences/languages.xul
index 45f7a1ce758a..ce1073a2b430 100644
--- a/browser/components/preferences/languages.xul
+++ b/browser/components/preferences/languages.xul
@@ -40,6 +40,9 @@
       <preference id="pref.browser.language.disable_button.remove"
                   name="pref.browser.language.disable_button.remove"
                   type="bool"/>
+      <preference id="privacy.spoof_english"
+                  name="privacy.spoof_english"
+                  type="int"/>
     </preferences>
 
     <script type="application/javascript" src="chrome://browser/content/preferences/languages.js"/>
@@ -52,6 +55,11 @@
     </stringbundleset>
 
     <description>&languages.customize2.description;</description>
+    <checkbox id="spoofEnglish"
+              label="&languages.customize.spoofEnglish;"
+              preference="privacy.spoof_english"
+              onsyncfrompreference="return gLanguagesDialog.readSpoofEnglish();"
+              onsynctopreference="return gLanguagesDialog.writeSpoofEnglish();"/>
     <grid flex="1">
       <columns>
         <column flex="1"/>
diff --git a/browser/locales/en-US/chrome/browser/preferences/languages.dtd b/browser/locales/en-US/chrome/browser/preferences/languages.dtd
index 70beaf26b100..964340cfac5f 100644
--- a/browser/locales/en-US/chrome/browser/preferences/languages.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/languages.dtd
@@ -15,4 +15,4 @@
 <!ENTITY languages.customize.selectLanguage.label       "Select a language to add…">
 <!ENTITY languages.customize.addButton.label            "Add">
 <!ENTITY languages.customize.addButton.accesskey        "A">
-
+<!ENTITY languages.customize.spoofEnglish               "Request English versions of web pages for enhanced privacy">

From 5503bf6a6cece3751de6df08c9c1e7387a7f66e0 Mon Sep 17 00:00:00 2001
From: Chung-Sheng Fu <cfu@mozilla.com>
Date: Tue, 21 Nov 2017 15:40:05 +0800
Subject: [PATCH 050/219] Bug 1039069 - Gray-out style for disabled listbox.
 r=jaws

MozReview-Commit-ID: KSWX63C35lh

--HG--
extra : rebase_source : ab02e1cf95f059d5eb4f8371927d6b0aec3a2831
---
 toolkit/themes/shared/in-content/common.inc.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index 8fdc37354437..dc439bea1af7 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -239,10 +239,15 @@ html|button:disabled,
 html|select:disabled,
 xul|button[disabled="true"],
 xul|colorpicker[type="button"][disabled="true"],
-xul|menulist[disabled="true"] {
+xul|menulist[disabled="true"],
+xul|listbox[disabled="true"] {
   opacity: 0.5;
 }
 
+xul|listbox[disabled="true"] xul|listitem:hover {
+  background-color: transparent;
+}
+
 *|button.primary {
   background-color: var(--in-content-primary-button-background);
   border-color: transparent;

From 52773cd64bf2c2626b7def47bc7c15038b66409c Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Thu, 19 Oct 2017 11:36:25 +0200
Subject: [PATCH 051/219] Bug 406738 - No longer show the kind of updates in
 'Show Update History' as they are all marked as "security updates" r=florian

MozReview-Commit-ID: 1TTK5vPRnfT

--HG--
extra : rebase_source : 7d7dd108e8cab840c4029f995b6802b6cae23d1b
---
 .../locales/en-US/chrome/mozapps/update/updates.properties    | 3 ---
 toolkit/mozapps/update/content/history.js                     | 1 -
 toolkit/mozapps/update/content/updates.xml                    | 4 ----
 3 files changed, 8 deletions(-)

diff --git a/toolkit/locales/en-US/chrome/mozapps/update/updates.properties b/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
index dadf03c47ec8..90a891d83492 100644
--- a/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
@@ -20,9 +20,6 @@ updateNightlyName=%1$S %2$S %3$S nightly
 intro_major=Do you want to upgrade to %1$S %2$S now?
 intro_minor=A security and stability update for %1$S is available:
 
-updateType_major=New Version
-updateType_minor=Security Update
-
 # LOCALIZATION NOTE: When present %S is brandShortName
 verificationError=%S could not confirm the integrity of the update package.
 resumePausedAfterCloseTitle=Software Update
diff --git a/toolkit/mozapps/update/content/history.js b/toolkit/mozapps/update/content/history.js
index 7a02eadd7e27..6cefc079129d 100644
--- a/toolkit/mozapps/update/content/history.js
+++ b/toolkit/mozapps/update/content/history.js
@@ -38,7 +38,6 @@ var gUpdateHistory = {
         this._view.appendChild(element);
         element.name = bundle.getFormattedString("updateFullName",
           [update.name, update.buildID]);
-        element.type = bundle.getString("updateType_" + update.type);
         element.installDate = this._formatDate(update.installDate);
         if (update.detailsURL)
           element.detailsURL = update.detailsURL;
diff --git a/toolkit/mozapps/update/content/updates.xml b/toolkit/mozapps/update/content/updates.xml
index 9218f433fd11..bbdce6923c82 100644
--- a/toolkit/mozapps/update/content/updates.xml
+++ b/toolkit/mozapps/update/content/updates.xml
@@ -33,7 +33,6 @@
         <xul:label xbl:inherits="href=detailsURL,hidden=hideDetailsURL" class="text-link"
                    value="&update.details.label;"/>
       </xul:hbox>
-      <xul:label class="update-type" xbl:inherits="value=type"/>
       <xul:grid>
         <xul:columns>
           <xul:column class="update-label-column"/>
@@ -61,9 +60,6 @@
       <property name="installDate"
                 onget="return this.getAttribute('installDate');"
                 onset="this.setAttribute('installDate', val); return val;"/>
-      <property name="type"
-                onget="return this.getAttribute('type');"
-                onset="this.setAttribute('type', val); return val;"/>
       <property name="hideDetailsURL"
                 onget="return this.getAttribute('hideDetailsURL');"
                 onset="this.setAttribute('hideDetailsURL', val); return val;"/>

From 07cc41c4be9633185ae43ec944e1e59b8dc44bb4 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <agaynor@mozilla.com>
Date: Thu, 30 Nov 2017 14:41:00 -0500
Subject: [PATCH 052/219] Bug 1342564 - Don't crash the process when we fail to
 open the bloat log r=dmajor

NoteIntentionalCrash is supposed to leave a marker that a process has crashed
intentionally, but if it can't open the target file it will crash the process
itself. This can cause difficulty debugging and false-positive results for
tests expecting crashes.

MozReview-Commit-ID: CgLauJIEAKD

--HG--
extra : rebase_source : 689bfaa0e93b96f8ebbbaf31e17e80547004506f
---
 xpcom/base/IntentionalCrash.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xpcom/base/IntentionalCrash.h b/xpcom/base/IntentionalCrash.h
index d01006dff19b..52b7c918e7d8 100644
--- a/xpcom/base/IntentionalCrash.h
+++ b/xpcom/base/IntentionalCrash.h
@@ -49,8 +49,10 @@ NoteIntentionalCrash(const char* aProcessType)
   fprintf(stderr, "Writing to log: %s\n", bloatName.str().c_str());
 
   FILE* processfd = fopen(bloatName.str().c_str(), "a");
-  fprintf(processfd, "==> process %d will purposefully crash\n", getpid());
-  fclose(processfd);
+  if (processfd) {
+    fprintf(processfd, "==> process %d will purposefully crash\n", getpid());
+    fclose(processfd);
+  }
 }
 
 } // namespace mozilla

From 0194a97476fa2fa41a94cdf5b319e693d8f3d2e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 1 Dec 2017 15:57:01 +0100
Subject: [PATCH 053/219] Bug 1422319: Upstream :any-link reftest to WPT.
 r=xidorn

MozReview-Commit-ID: KOYqClzV8eo

--HG--
extra : rebase_source : 36b2d0f5d36e7b06e492316fac3a754247c859fb
---
 layout/reftests/bugs/1364335-ref.html         |  7 ------
 layout/reftests/bugs/1364335.html             |  9 -------
 layout/reftests/bugs/reftest.list             |  1 -
 testing/web-platform/meta/MANIFEST.json       | 25 +++++++++++++++++++
 .../selectors/any-link-dynamic-001-ref.html   | 10 ++++++++
 .../css/selectors/any-link-dynamic-001.html   | 14 +++++++++++
 6 files changed, 49 insertions(+), 17 deletions(-)
 delete mode 100644 layout/reftests/bugs/1364335-ref.html
 delete mode 100644 layout/reftests/bugs/1364335.html
 create mode 100644 testing/web-platform/tests/css/selectors/any-link-dynamic-001-ref.html
 create mode 100644 testing/web-platform/tests/css/selectors/any-link-dynamic-001.html

diff --git a/layout/reftests/bugs/1364335-ref.html b/layout/reftests/bugs/1364335-ref.html
deleted file mode 100644
index 933458ae7c66..000000000000
--- a/layout/reftests/bugs/1364335-ref.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<style>
-  span { color: green; }
-</style>
-<body>
-  <a></a><span>This should be green</span>
-</body>
diff --git a/layout/reftests/bugs/1364335.html b/layout/reftests/bugs/1364335.html
deleted file mode 100644
index 41289703af08..000000000000
--- a/layout/reftests/bugs/1364335.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<style>
-  span { color: green; }
-  :any-link + span { color: red; }
-</style>
-<body onload="window.oldColor = getComputedStyle(document.querySelector('span')).color;
-              document.querySelector('a').removeAttribute('href');">
-  <a href=""></a><span>This should be green</span>
-</body>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index e946f665a597..1f8e551776c2 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -2002,7 +2002,6 @@ skip-if((stylo||styloVsGecko)&&isDebugBuild&&winWidget) == 1330051.svg 1330051-r
 == 1364280-2a.html 1364280-2-ref.html
 == 1364280-2b.html 1364280-2-ref.html
 == 1364280-2c.html 1364280-2-ref.html
-== 1364335.html 1364335-ref.html
 == 1364360-1.html 1364360-1-ref.html
 == 1365159-1.html 1365159-1-ref.html
 fails-if(!stylo||styloVsGecko) == 1365162-1.html 1365162-1-ref.html
diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 637f0558ac81..05a52518db37 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -155881,6 +155881,18 @@
      {}
     ]
    ],
+   "css/selectors/any-link-dynamic-001.html": [
+    [
+     "/css/selectors/any-link-dynamic-001.html",
+     [
+      [
+       "/css/selectors/any-link-dynamic-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/selectors/focus-within-001.html": [
     [
      "/css/selectors/focus-within-001.html",
@@ -254434,6 +254446,11 @@
      {}
     ]
    ],
+   "css/selectors/any-link-dynamic-001-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/selectors/attribute-selectors/attribute-case/resources/semantics-quirks.html": [
     [
      {}
@@ -513418,6 +513435,14 @@
    "b45da5560d0eb821b5552f1b67fab5cead4508b1",
    "support"
   ],
+  "css/selectors/any-link-dynamic-001-ref.html": [
+   "342d89969da0ca3782efacee0ecbf882c718d6c6",
+   "support"
+  ],
+  "css/selectors/any-link-dynamic-001.html": [
+   "c33602e863151182d29afd88a8878374bb118b69",
+   "reftest"
+  ],
   "css/selectors/attribute-selectors/attribute-case/cssom.html": [
    "d5e05750213fbf7959125d64e9ea1a26948ba91d",
    "testharness"
diff --git a/testing/web-platform/tests/css/selectors/any-link-dynamic-001-ref.html b/testing/web-platform/tests/css/selectors/any-link-dynamic-001-ref.html
new file mode 100644
index 000000000000..b5407429be80
--- /dev/null
+++ b/testing/web-platform/tests/css/selectors/any-link-dynamic-001-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<style>
+  span { color: green; }
+</style>
+<body>
+  <a></a><span>This should be green</span>
+</body>
diff --git a/testing/web-platform/tests/css/selectors/any-link-dynamic-001.html b/testing/web-platform/tests/css/selectors/any-link-dynamic-001.html
new file mode 100644
index 000000000000..e84989fd0c27
--- /dev/null
+++ b/testing/web-platform/tests/css/selectors/any-link-dynamic-001.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test: Handling of dynamic changes to :any-link selectors</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="match" href="any-link-dynamic-001-ref.html">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#the-any-link-pseudo">
+<style>
+  span { color: green; }
+  :any-link + span { color: red; }
+</style>
+<body onload="window.oldColor = getComputedStyle(document.querySelector('span')).color;
+              document.querySelector('a').removeAttribute('href');">
+  <a href=""></a><span>This should be green</span>
+</body>

From 31c313504ec989b368df2e86a5fd9a604d45ae57 Mon Sep 17 00:00:00 2001
From: Csoregi Natalia <ncsoregi@mozilla.com>
Date: Fri, 1 Dec 2017 19:39:50 +0200
Subject: [PATCH 054/219] Backed out changeset 313e0c5a2081 (bug 406738) for
 failing browser-chrome's
 browser/components/preferences/in-content/tests/browser_advanced_update.js
 r=backout on a CLOSED TREE

---
 .../locales/en-US/chrome/mozapps/update/updates.properties    | 3 +++
 toolkit/mozapps/update/content/history.js                     | 1 +
 toolkit/mozapps/update/content/updates.xml                    | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/toolkit/locales/en-US/chrome/mozapps/update/updates.properties b/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
index 90a891d83492..dadf03c47ec8 100644
--- a/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
@@ -20,6 +20,9 @@ updateNightlyName=%1$S %2$S %3$S nightly
 intro_major=Do you want to upgrade to %1$S %2$S now?
 intro_minor=A security and stability update for %1$S is available:
 
+updateType_major=New Version
+updateType_minor=Security Update
+
 # LOCALIZATION NOTE: When present %S is brandShortName
 verificationError=%S could not confirm the integrity of the update package.
 resumePausedAfterCloseTitle=Software Update
diff --git a/toolkit/mozapps/update/content/history.js b/toolkit/mozapps/update/content/history.js
index 6cefc079129d..7a02eadd7e27 100644
--- a/toolkit/mozapps/update/content/history.js
+++ b/toolkit/mozapps/update/content/history.js
@@ -38,6 +38,7 @@ var gUpdateHistory = {
         this._view.appendChild(element);
         element.name = bundle.getFormattedString("updateFullName",
           [update.name, update.buildID]);
+        element.type = bundle.getString("updateType_" + update.type);
         element.installDate = this._formatDate(update.installDate);
         if (update.detailsURL)
           element.detailsURL = update.detailsURL;
diff --git a/toolkit/mozapps/update/content/updates.xml b/toolkit/mozapps/update/content/updates.xml
index bbdce6923c82..9218f433fd11 100644
--- a/toolkit/mozapps/update/content/updates.xml
+++ b/toolkit/mozapps/update/content/updates.xml
@@ -33,6 +33,7 @@
         <xul:label xbl:inherits="href=detailsURL,hidden=hideDetailsURL" class="text-link"
                    value="&update.details.label;"/>
       </xul:hbox>
+      <xul:label class="update-type" xbl:inherits="value=type"/>
       <xul:grid>
         <xul:columns>
           <xul:column class="update-label-column"/>
@@ -60,6 +61,9 @@
       <property name="installDate"
                 onget="return this.getAttribute('installDate');"
                 onset="this.setAttribute('installDate', val); return val;"/>
+      <property name="type"
+                onget="return this.getAttribute('type');"
+                onset="this.setAttribute('type', val); return val;"/>
       <property name="hideDetailsURL"
                 onget="return this.getAttribute('hideDetailsURL');"
                 onset="this.setAttribute('hideDetailsURL', val); return val;"/>

From 2a41681065fa0efff5adc098091a47ad07ba9ebc Mon Sep 17 00:00:00 2001
From: Edouard Oger <eoger@fastmail.com>
Date: Thu, 30 Nov 2017 16:01:40 -0500
Subject: [PATCH 055/219] Bug 1422106 - Show broken heart when unverified in
 synced tabs sidebar/panel. r=markh

MozReview-Commit-ID: BDTdmcIOHmn

--HG--
extra : rebase_source : b1471e1ef0163b2d3b137852d285146f5a23f1fa
---
 browser/base/content/browser-menubar.inc              |  7 ++++++-
 browser/base/content/browser-sets.inc                 |  1 +
 browser/base/content/browser-sync.js                  |  6 ++++--
 browser/base/content/test/sync/browser_sync.js        |  9 +++++----
 .../components/customizableui/content/panelUI.inc.xul | 11 +++++++++++
 .../customizableui/test/browser_synced_tabs_menu.js   |  7 +++++++
 .../components/syncedtabs/SyncedTabsDeckComponent.js  |  6 +++++-
 browser/components/syncedtabs/sidebar.xhtml           |  5 +++++
 .../test/browser/browser_sidebar_syncedtabslist.js    |  6 ++++++
 browser/locales/en-US/chrome/browser/browser.dtd      |  2 ++
 .../browser/browser_BrowserUITelemetry_syncedtabs.js  |  2 ++
 browser/themes/shared/customizableui/panelUI.inc.css  |  1 +
 12 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index e818cdfafcbe..dab38488c671 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -477,12 +477,17 @@
                         key="key_openAddons"
                         command="Tools:Addons"/>
 
-              <!-- only one of sync-setup, sync-syncnowitem or sync-reauthitem will be showing at once -->
+              <!-- only one of sync-setup, sync-unverifieditem, sync-syncnowitem or sync-reauthitem will be showing at once -->
               <menuitem id="sync-setup"
                         label="&syncSignIn.label;"
                         accesskey="&syncSignIn.accesskey;"
                         observes="sync-setup-state"
                         oncommand="gSync.openPrefs('menubar')"/>
+              <menuitem id="sync-unverifieditem"
+                        label="&syncSignIn.label;"
+                        accesskey="&syncSignIn.accesskey;"
+                        observes="sync-unverified-state"
+                        oncommand="gSync.openPrefs('menubar')"/>
               <menuitem id="sync-syncnowitem"
                         label="&syncSyncNowItem.label;"
                         accesskey="&syncSyncNowItem.accesskey;"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 6ab1eb63a844..113121b92182 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -166,6 +166,7 @@
     <!-- broadcasters of the "hidden" attribute to reflect setup state for
          menus -->
     <broadcaster id="sync-setup-state"/>
+    <broadcaster id="sync-unverified-state" hidden="true"/>
     <broadcaster id="sync-syncnow-state" hidden="true"/>
     <broadcaster id="sync-reauth-state" hidden="true"/>
     <broadcaster id="viewTabsSidebar" autoCheck="false" sidebartitle="&syncedTabs.sidebar.label;"
diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js
index f1e3a2793c92..e5bbd01565d2 100644
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -218,13 +218,15 @@ var gSync = {
     document.getElementById("sync-reauth-state").hidden = true;
     document.getElementById("sync-setup-state").hidden = true;
     document.getElementById("sync-syncnow-state").hidden = true;
+    document.getElementById("sync-unverified-state").hidden = true;
 
     if (status == UIState.STATUS_LOGIN_FAILED) {
       // unhiding this element makes the menubar show the login failure state.
       document.getElementById("sync-reauth-state").hidden = false;
-    } else if (status == UIState.STATUS_NOT_CONFIGURED ||
-               status == UIState.STATUS_NOT_VERIFIED) {
+    } else if (status == UIState.STATUS_NOT_CONFIGURED) {
       document.getElementById("sync-setup-state").hidden = false;
+    } else if (status == UIState.STATUS_NOT_VERIFIED) {
+      document.getElementById("sync-unverified-state").hidden = false;
     } else {
       document.getElementById("sync-syncnow-state").hidden = false;
     }
diff --git a/browser/base/content/test/sync/browser_sync.js b/browser/base/content/test/sync/browser_sync.js
index 7cb870fa91b2..bb58a6e8eba0 100644
--- a/browser/base/content/test/sync/browser_sync.js
+++ b/browser/base/content/test/sync/browser_sync.js
@@ -108,8 +108,8 @@ add_task(async function test_ui_state_unverified() {
     syncing: false,
     syncNowTooltip: tooltipText
   });
-  checkRemoteTabsPanel("PanelUI-remotetabs-setupsync", false);
-  checkMenuBarItem("sync-setup");
+  checkRemoteTabsPanel("PanelUI-remotetabs-unverified", false);
+  checkMenuBarItem("sync-unverifieditem");
 });
 
 add_task(async function test_ui_state_loginFailed() {
@@ -176,7 +176,8 @@ function checkPanelUIStatusBar({label, tooltip, fxastatus, avatarURL, syncing, s
 function checkRemoteTabsPanel(expectedShownItemId, syncing, syncNowTooltip) {
   checkItemsVisiblities(["PanelUI-remotetabs-main",
                          "PanelUI-remotetabs-setupsync",
-                         "PanelUI-remotetabs-reauthsync"],
+                         "PanelUI-remotetabs-reauthsync",
+                         "PanelUI-remotetabs-unverified"],
                         expectedShownItemId);
 
   if (syncing != undefined && syncNowTooltip != undefined) {
@@ -185,7 +186,7 @@ function checkRemoteTabsPanel(expectedShownItemId, syncing, syncNowTooltip) {
 }
 
 function checkMenuBarItem(expectedShownItemId) {
-  checkItemsVisiblities(["sync-setup", "sync-syncnowitem", "sync-reauthitem"],
+  checkItemsVisiblities(["sync-setup", "sync-syncnowitem", "sync-reauthitem", "sync-unverifieditem"],
                         expectedShownItemId);
 }
 
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 54d2587b1586..c2c7141ddcff 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -491,6 +491,17 @@
                            label="&appMenuRemoteTabs.signin.label;"
                            oncommand="gSync.openPrefs('synced-tabs');"/>
           </vbox>
+          <vbox id="PanelUI-remotetabs-unverified"
+                flex="1"
+                align="center"
+                class="PanelUI-remotetabs-instruction-box"
+                observes="sync-unverified-state">
+            <image class="fxaSyncIllustrationIssue"/>
+            <label class="PanelUI-remotetabs-instruction-label">&appMenuRemoteTabs.unverified.label;</label>
+            <toolbarbutton class="PanelUI-remotetabs-prefs-button"
+                           label="&appMenuRemoteTabs.signin.label;"
+                           oncommand="gSync.openPrefs('synced-tabs');"/>
+          </vbox>
         </hbox>
       </vbox>
     </panelview>
diff --git a/browser/components/customizableui/test/browser_synced_tabs_menu.js b/browser/components/customizableui/test/browser_synced_tabs_menu.js
index be4be0f87d86..132e14381f63 100644
--- a/browser/components/customizableui/test/browser_synced_tabs_menu.js
+++ b/browser/components/customizableui/test/browser_synced_tabs_menu.js
@@ -139,6 +139,13 @@ add_task(async function() {
 });
 add_task(asyncCleanup);
 
+// When Sync is configured in an unverified state.
+add_task(async function() {
+  gSync.updateAllUI({ status: UIState.STATUS_NOT_VERIFIED, email: "foo@bar.com" });
+  await openPrefsFromMenuPanel("PanelUI-remotetabs-unverified", "synced-tabs");
+});
+add_task(asyncCleanup);
+
 // When Sync is configured in a "needs reauthentication" state.
 add_task(async function() {
   gSync.updateAllUI({ status: UIState.STATUS_LOGIN_FAILED, email: "foo@bar.com" });
diff --git a/browser/components/syncedtabs/SyncedTabsDeckComponent.js b/browser/components/syncedtabs/SyncedTabsDeckComponent.js
index 7701a40e957f..5115c54124fa 100644
--- a/browser/components/syncedtabs/SyncedTabsDeckComponent.js
+++ b/browser/components/syncedtabs/SyncedTabsDeckComponent.js
@@ -63,6 +63,7 @@ SyncedTabsDeckComponent.prototype = {
     NOT_AUTHED_INFO: "notAuthedInfo",
     SINGLE_DEVICE_INFO: "singleDeviceInfo",
     TABS_DISABLED: "tabs-disabled",
+    UNVERIFIED: "unverified"
   },
 
   get container() {
@@ -121,9 +122,12 @@ SyncedTabsDeckComponent.prototype = {
 
   getPanelStatus() {
     return this._getSignedInUser().then(user => {
-      if (!user || !user.verified || this._SyncedTabs.loginFailed) {
+      if (!user || this._SyncedTabs.loginFailed) {
         return this.PANELS.NOT_AUTHED_INFO;
       }
+      if (!user.verified) {
+        return this.PANELS.UNVERIFIED;
+      }
       if (!this._SyncedTabs.isConfiguredToSyncTabs) {
         return this.PANELS.TABS_DISABLED;
       }
diff --git a/browser/components/syncedtabs/sidebar.xhtml b/browser/components/syncedtabs/sidebar.xhtml
index bea7875121fd..debd1ef0d32d 100644
--- a/browser/components/syncedtabs/sidebar.xhtml
+++ b/browser/components/syncedtabs/sidebar.xhtml
@@ -80,6 +80,11 @@
           <p class="instructions">&syncedTabs.sidebar.notsignedin.label;</p>
           <button class="button sync-prefs">&fxaSignIn.label;</button>
         </div>
+        <div class="unverified sync-state">
+          <div class="syncIllustration"></div>
+          <p class="instructions">&syncedTabs.sidebar.unverified.label;</p>
+          <button class="button sync-prefs">&syncedTabs.sidebar.openprefs.label;</button>
+        </div>
         <div class="singleDeviceInfo sync-state">
           <div class="syncIllustrationIssue"></div>
           <p class="instructions">&syncedTabs.sidebar.noclients.subtitle;</p>
diff --git a/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js b/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
index fc492893d5ed..fcd278f89f74 100644
--- a/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
+++ b/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
@@ -228,6 +228,12 @@ add_task(async function testSyncedTabsSidebarStatus() {
   Assert.ok(selectedPanel.classList.contains("notAuthedInfo"),
     "not-authed panel is selected");
 
+  account = {verified: false};
+  await syncedTabsDeckComponent.updatePanel();
+  selectedPanel = syncedTabsDeckComponent.container.querySelector(".sync-state.selected");
+  Assert.ok(selectedPanel.classList.contains("unverified"),
+    "unverified panel is selected");
+
   account = {verified: true};
   await syncedTabsDeckComponent.updatePanel();
   selectedPanel = syncedTabsDeckComponent.container.querySelector(".sync-state.selected");
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 7f677278158a..ca57bfe3e478 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -381,6 +381,7 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY appMenuRemoteTabs.noclients.subtitle "Want to see your tabs from other devices here?">
 <!ENTITY appMenuRemoteTabs.openprefs.label "Sync Preferences">
 <!ENTITY appMenuRemoteTabs.notsignedin.label "Sign in to view a list of tabs from your other devices.">
+<!ENTITY appMenuRemoteTabs.unverified.label "Your account needs to be verified.">
 <!ENTITY appMenuRemoteTabs.signin.label "Sign in to Sync">
 <!ENTITY appMenuRemoteTabs.managedevices.label "Manage Devices…">
 <!ENTITY appMenuRemoteTabs.sidebar.label "View Synced Tabs Sidebar">
@@ -794,6 +795,7 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY syncedTabs.sidebar.noclients.label    "Sign in to Firefox from your other devices to view their tabs here.">
 <!ENTITY syncedTabs.sidebar.noclients.subtitle "Want to see your tabs from other devices here?">
 <!ENTITY syncedTabs.sidebar.notsignedin.label  "Sign in to view a list of tabs from your other devices.">
+<!ENTITY syncedTabs.sidebar.unverified.label   "Your account needs to be verified.">
 <!ENTITY syncedTabs.sidebar.notabs.label       "No open tabs">
 <!ENTITY syncedTabs.sidebar.openprefs.label    "Open &syncBrand.shortName.label; Preferences">
 <!-- LOCALIZATION NOTE (syncedTabs.sidebar.tabsnotsyncing.label): This is shown
diff --git a/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js b/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
index f90eb3e88dcb..7003089c0340 100644
--- a/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
+++ b/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
@@ -36,6 +36,7 @@ function mockSyncedTabs() {
   // configure our broadcasters so we are in the right state.
   document.getElementById("sync-reauth-state").hidden = true;
   document.getElementById("sync-setup-state").hidden = true;
+  document.getElementById("sync-unverified-state").hidden = true;
   document.getElementById("sync-syncnow-state").hidden = false;
 
   registerCleanupFunction(() => {
@@ -43,6 +44,7 @@ function mockSyncedTabs() {
 
     document.getElementById("sync-reauth-state").hidden = true;
     document.getElementById("sync-setup-state").hidden = false;
+    document.getElementById("sync-unverified-state").hidden = true;
     document.getElementById("sync-syncnow-state").hidden = true;
   });
 }
diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css
index 1505ccd73383..a97eef9b80c3 100644
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -718,6 +718,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton
 */
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-reauthsync,
+#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-unverified,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-nodevicespane,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-tabsdisabledpane {
   min-height: calc(var(--panel-ui-sync-illustration-height) +

From 677975fab5d870ae1a73f602de9cce5e83323b6c Mon Sep 17 00:00:00 2001
From: Mike Shal <mshal@mozilla.com>
Date: Wed, 22 Nov 2017 14:14:30 -0500
Subject: [PATCH 056/219] Bug 1417658 - Move export_suffixes into
 GeneratedFile; r=nalexander

I believe all backends will need to know which GeneratedFiles are needed
before compilation can start, so we should make that an attribute of the
object. Each backend can then make its own decision about what to do
with the different types of GeneratedFiles.

MozReview-Commit-ID: ByburRx540b

--HG--
extra : rebase_source : ccfee5b569da432cb61882f2f6ea518f1ccbfa07
---
 python/mozbuild/mozbuild/backend/recursivemake.py | 11 +----------
 python/mozbuild/mozbuild/backend/tup.py           |  7 +------
 python/mozbuild/mozbuild/frontend/data.py         | 12 ++++++++++++
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index ab834272a358..b622e820efaa 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -520,16 +520,7 @@ class RecursiveMakeBackend(CommonBackend):
             self._process_defines(obj, backend_file)
 
         elif isinstance(obj, GeneratedFile):
-            export_suffixes = (
-                '.c',
-                '.cpp',
-                '.h',
-                '.inc',
-                '.py',
-                '.rs',
-                'new', # 'new' is an output from make-stl-wrappers.py
-            )
-            tier = 'export' if any(f.endswith(export_suffixes) for f in obj.outputs) else 'misc'
+            tier = 'export' if obj.required_for_compile else 'misc'
             self._no_skip[tier].add(backend_file.relobjdir)
             first_output = obj.outputs[0]
             dep_file = "%s.pp" % first_output
diff --git a/python/mozbuild/mozbuild/backend/tup.py b/python/mozbuild/mozbuild/backend/tup.py
index 644550171396..52e8503b9b7e 100644
--- a/python/mozbuild/mozbuild/backend/tup.py
+++ b/python/mozbuild/mozbuild/backend/tup.py
@@ -333,11 +333,6 @@ class TupOnly(CommonBackend, PartialBackend):
             'layout/style/test', # HostSimplePrograms
             'toolkit/library', # libxul.so
         )
-        install_exts = (
-            '.h',
-            '.inc',
-            'new', # 'new' is an output from make-stl-wrappers.py
-        )
         if obj.script and obj.method and obj.relobjdir not in skip_directories:
             backend_file.export_shell()
             cmd = self._py_action('file_generate')
@@ -355,7 +350,7 @@ class TupOnly(CommonBackend, PartialBackend):
             outputs.extend(obj.outputs)
             outputs.append('%s.pp' % obj.outputs[0])
 
-            extra_outputs = [self._installed_files] if any(f.endswith(install_exts) for f in obj.outputs) else None
+            extra_outputs = [self._installed_files] if obj.required_for_compile else None
 
             backend_file.rule(
                 display='python {script}:{method} -> [%o]'.format(script=obj.script, method=obj.method),
diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py
index db229d3a1d16..dca8b72f9136 100644
--- a/python/mozbuild/mozbuild/frontend/data.py
+++ b/python/mozbuild/mozbuild/frontend/data.py
@@ -1056,6 +1056,7 @@ class GeneratedFile(ContextDerived):
         'outputs',
         'inputs',
         'flags',
+        'required_for_compile',
     )
 
     def __init__(self, context, script, method, outputs, inputs, flags=()):
@@ -1066,6 +1067,17 @@ class GeneratedFile(ContextDerived):
         self.inputs = inputs
         self.flags = flags
 
+        suffixes = (
+            '.c',
+            '.cpp',
+            '.h',
+            '.inc',
+            '.py',
+            '.rs',
+            'new', # 'new' is an output from make-stl-wrappers.py
+        )
+        self.required_for_compile = any(f.endswith(suffixes) for f in self.outputs)
+
 
 class AndroidResDirs(ContextDerived):
     """Represents Android resource directories."""

From 38001b4ff6702c0e92f5b77360c8c9b310f0a51d Mon Sep 17 00:00:00 2001
From: Michael Ratcliffe <mratcliffe@mozilla.com>
Date: Fri, 1 Dec 2017 09:57:19 +0000
Subject: [PATCH 057/219] Bug 1422258 - Remove React Virtualized r=Honza

MozReview-Commit-ID: GBsptIUroI

--HG--
extra : rebase_source : 6b9be4513fa5bc59e9f06f675a8a7a75a19575b3
---
 .../shared/vendor/REACT_VIRTUALIZED_UPGRADING |   19 -
 devtools/client/shared/vendor/moz.build       |    1 -
 .../client/shared/vendor/react-virtualized.js | 4296 -----------------
 toolkit/content/license.html                  |   29 -
 4 files changed, 4345 deletions(-)
 delete mode 100644 devtools/client/shared/vendor/REACT_VIRTUALIZED_UPGRADING
 delete mode 100644 devtools/client/shared/vendor/react-virtualized.js

diff --git a/devtools/client/shared/vendor/REACT_VIRTUALIZED_UPGRADING b/devtools/client/shared/vendor/REACT_VIRTUALIZED_UPGRADING
deleted file mode 100644
index e5294c38eaba..000000000000
--- a/devtools/client/shared/vendor/REACT_VIRTUALIZED_UPGRADING
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-"react-virtualized" uses UMD style loading to work in many different environments.
-It assumes that "react", "react-addons-shallow-compare", and "react-dom" are all included
-separately via require statements. The paths to our installations are different.
-
-If upgrading:
-
-- Define the correct paths for React, etc and replace the require statements for the
-  module.exports case with the correct paths.
-- Replace any references to React.addons.shallowCompare with the webpack module id.
-- To support use in XUL documents, replace calls to createElement with
-  createElementNS("http://www.w3.org/1999/xhtml", but make sure that you aren't replacing
-  any calls to React.createElement.
-- Also required for XUL, replace document.head and document.body with
-  document.firstElementChild
diff --git a/devtools/client/shared/vendor/moz.build b/devtools/client/shared/vendor/moz.build
index 58ea6e5f1147..de40ab4b6518 100644
--- a/devtools/client/shared/vendor/moz.build
+++ b/devtools/client/shared/vendor/moz.build
@@ -19,7 +19,6 @@ DevToolsModules(
     'react-dom.js',
     'react-prop-types.js',
     'react-redux.js',
-    'react-virtualized.js',
     'react.js',
     'redux.js',
     'reselect.js',
diff --git a/devtools/client/shared/vendor/react-virtualized.js b/devtools/client/shared/vendor/react-virtualized.js
deleted file mode 100644
index dab201ac624f..000000000000
--- a/devtools/client/shared/vendor/react-virtualized.js
+++ /dev/null
@@ -1,4296 +0,0 @@
-var REACT_PATH = "devtools/client/shared/vendor/react";
-var REACT_DOM_PATH = "devtools/client/shared/vendor/react-dom";
-var REACT_SHALLOW_COMPARE = "devtools/client/shared/vendor/react-addons-shallow-compare";
-
-!function(root, factory) {
-    let React = require(REACT_PATH);
-    let shallowCompare = require(REACT_SHALLOW_COMPARE);
-    let ReactDOM = require(REACT_DOM_PATH);
-    module.exports = factory(React, shallowCompare, ReactDOM);
-}(this, function(__WEBPACK_EXTERNAL_MODULE_89__, __WEBPACK_EXTERNAL_MODULE_90__, __WEBPACK_EXTERNAL_MODULE_96__) {
-    /******/
-    return function(modules) {
-        /******/
-        /******/
-        // The require function
-        /******/
-        function __webpack_require__(moduleId) {
-            /******/
-            /******/
-            // Check if module is in cache
-            /******/
-            if (installedModules[moduleId]) /******/
-            return installedModules[moduleId].exports;
-            /******/
-            /******/
-            // Create a new module (and put it into the cache)
-            /******/
-            var module = installedModules[moduleId] = {
-                /******/
-                exports: {},
-                /******/
-                id: moduleId,
-                /******/
-                loaded: !1
-            };
-            /******/
-            /******/
-            // Return the exports of the module
-            /******/
-            /******/
-            /******/
-            // Execute the module function
-            /******/
-            /******/
-            /******/
-            // Flag the module as loaded
-            /******/
-            return modules[moduleId].call(module.exports, module, module.exports, __webpack_require__),
-            module.loaded = !0, module.exports;
-        }
-        // webpackBootstrap
-        /******/
-        // The module cache
-        /******/
-        var installedModules = {};
-        /******/
-        /******/
-        // Load entry module and return exports
-        /******/
-        /******/
-        /******/
-        /******/
-        // expose the modules object (__webpack_modules__)
-        /******/
-        /******/
-        /******/
-        // expose the module cache
-        /******/
-        /******/
-        /******/
-        // __webpack_public_path__
-        /******/
-        return __webpack_require__.m = modules, __webpack_require__.c = installedModules,
-        __webpack_require__.p = "", __webpack_require__(0);
-    }([ /* 0 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _ArrowKeyStepper = __webpack_require__(1);
-        Object.defineProperty(exports, "ArrowKeyStepper", {
-            enumerable: !0,
-            get: function() {
-                return _ArrowKeyStepper.ArrowKeyStepper;
-            }
-        });
-        var _AutoSizer = __webpack_require__(91);
-        Object.defineProperty(exports, "AutoSizer", {
-            enumerable: !0,
-            get: function() {
-                return _AutoSizer.AutoSizer;
-            }
-        });
-        var _CellMeasurer = __webpack_require__(94);
-        Object.defineProperty(exports, "CellMeasurer", {
-            enumerable: !0,
-            get: function() {
-                return _CellMeasurer.CellMeasurer;
-            }
-        }), Object.defineProperty(exports, "defaultCellMeasurerCellSizeCache", {
-            enumerable: !0,
-            get: function() {
-                return _CellMeasurer.defaultCellSizeCache;
-            }
-        }), Object.defineProperty(exports, "uniformSizeCellMeasurerCellSizeCache", {
-            enumerable: !0,
-            get: function() {
-                return _CellMeasurer.defaultCellSizeCache;
-            }
-        });
-        var _Collection = __webpack_require__(98);
-        Object.defineProperty(exports, "Collection", {
-            enumerable: !0,
-            get: function() {
-                return _Collection.Collection;
-            }
-        });
-        var _ColumnSizer = __webpack_require__(118);
-        Object.defineProperty(exports, "ColumnSizer", {
-            enumerable: !0,
-            get: function() {
-                return _ColumnSizer.ColumnSizer;
-            }
-        });
-        var _Table = __webpack_require__(128);
-        Object.defineProperty(exports, "defaultTableCellDataGetter", {
-            enumerable: !0,
-            get: function() {
-                return _Table.defaultCellDataGetter;
-            }
-        }), Object.defineProperty(exports, "defaultTableCellRenderer", {
-            enumerable: !0,
-            get: function() {
-                return _Table.defaultCellRenderer;
-            }
-        }), Object.defineProperty(exports, "defaultTableHeaderRenderer", {
-            enumerable: !0,
-            get: function() {
-                return _Table.defaultHeaderRenderer;
-            }
-        }), Object.defineProperty(exports, "defaultTableRowRenderer", {
-            enumerable: !0,
-            get: function() {
-                return _Table.defaultRowRenderer;
-            }
-        }), Object.defineProperty(exports, "Table", {
-            enumerable: !0,
-            get: function() {
-                return _Table.Table;
-            }
-        }), Object.defineProperty(exports, "Column", {
-            enumerable: !0,
-            get: function() {
-                return _Table.Column;
-            }
-        }), Object.defineProperty(exports, "SortDirection", {
-            enumerable: !0,
-            get: function() {
-                return _Table.SortDirection;
-            }
-        }), Object.defineProperty(exports, "SortIndicator", {
-            enumerable: !0,
-            get: function() {
-                return _Table.SortIndicator;
-            }
-        });
-        var _Grid = __webpack_require__(120);
-        Object.defineProperty(exports, "defaultCellRangeRenderer", {
-            enumerable: !0,
-            get: function() {
-                return _Grid.defaultCellRangeRenderer;
-            }
-        }), Object.defineProperty(exports, "Grid", {
-            enumerable: !0,
-            get: function() {
-                return _Grid.Grid;
-            }
-        });
-        var _InfiniteLoader = __webpack_require__(137);
-        Object.defineProperty(exports, "InfiniteLoader", {
-            enumerable: !0,
-            get: function() {
-                return _InfiniteLoader.InfiniteLoader;
-            }
-        });
-        var _ScrollSync = __webpack_require__(139);
-        Object.defineProperty(exports, "ScrollSync", {
-            enumerable: !0,
-            get: function() {
-                return _ScrollSync.ScrollSync;
-            }
-        });
-        var _List = __webpack_require__(141);
-        Object.defineProperty(exports, "List", {
-            enumerable: !0,
-            get: function() {
-                return _List.List;
-            }
-        });
-        var _WindowScroller = __webpack_require__(143);
-        Object.defineProperty(exports, "WindowScroller", {
-            enumerable: !0,
-            get: function() {
-                return _WindowScroller.WindowScroller;
-            }
-        });
-    }, /* 1 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.ArrowKeyStepper = exports.default = void 0;
-        var _ArrowKeyStepper2 = __webpack_require__(2), _ArrowKeyStepper3 = _interopRequireDefault(_ArrowKeyStepper2);
-        exports.default = _ArrowKeyStepper3.default, exports.ArrowKeyStepper = _ArrowKeyStepper3.default;
-    }, /* 2 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2), _react = __webpack_require__(89), _react2 = _interopRequireDefault(_react), _reactAddonsShallowCompare = __webpack_require__(90), _reactAddonsShallowCompare2 = _interopRequireDefault(_reactAddonsShallowCompare), ArrowKeyStepper = function(_Component) {
-            function ArrowKeyStepper(props, context) {
-                (0, _classCallCheck3.default)(this, ArrowKeyStepper);
-                var _this = (0, _possibleConstructorReturn3.default)(this, (ArrowKeyStepper.__proto__ || (0,
-                _getPrototypeOf2.default)(ArrowKeyStepper)).call(this, props, context));
-                return _this.state = {
-                    scrollToColumn: 0,
-                    scrollToRow: 0
-                }, _this._columnStartIndex = 0, _this._columnStopIndex = 0, _this._rowStartIndex = 0,
-                _this._rowStopIndex = 0, _this._onKeyDown = _this._onKeyDown.bind(_this), _this._onSectionRendered = _this._onSectionRendered.bind(_this),
-                _this;
-            }
-            return (0, _inherits3.default)(ArrowKeyStepper, _Component), (0, _createClass3.default)(ArrowKeyStepper, [ {
-                key: "render",
-                value: function() {
-                    var _props = this.props, className = _props.className, children = _props.children, _state = this.state, scrollToColumn = _state.scrollToColumn, scrollToRow = _state.scrollToRow;
-                    return _react2.default.createElement("div", {
-                        className: className,
-                        onKeyDown: this._onKeyDown
-                    }, children({
-                        onSectionRendered: this._onSectionRendered,
-                        scrollToColumn: scrollToColumn,
-                        scrollToRow: scrollToRow
-                    }));
-                }
-            }, {
-                key: "shouldComponentUpdate",
-                value: function(nextProps, nextState) {
-                    return (0, _reactAddonsShallowCompare2.default)(this, nextProps, nextState);
-                }
-            }, {
-                key: "_onKeyDown",
-                value: function(event) {
-                    var _props2 = this.props, columnCount = _props2.columnCount, rowCount = _props2.rowCount;
-                    switch (event.key) {
-                      case "ArrowDown":
-                        event.preventDefault(), this.setState({
-                            scrollToRow: Math.min(this._rowStopIndex + 1, rowCount - 1)
-                        });
-                        break;
-
-                      case "ArrowLeft":
-                        event.preventDefault(), this.setState({
-                            scrollToColumn: Math.max(this._columnStartIndex - 1, 0)
-                        });
-                        break;
-
-                      case "ArrowRight":
-                        event.preventDefault(), this.setState({
-                            scrollToColumn: Math.min(this._columnStopIndex + 1, columnCount - 1)
-                        });
-                        break;
-
-                      case "ArrowUp":
-                        event.preventDefault(), this.setState({
-                            scrollToRow: Math.max(this._rowStartIndex - 1, 0)
-                        });
-                    }
-                }
-            }, {
-                key: "_onSectionRendered",
-                value: function(_ref) {
-                    var columnStartIndex = _ref.columnStartIndex, columnStopIndex = _ref.columnStopIndex, rowStartIndex = _ref.rowStartIndex, rowStopIndex = _ref.rowStopIndex;
-                    this._columnStartIndex = columnStartIndex, this._columnStopIndex = columnStopIndex,
-                    this._rowStartIndex = rowStartIndex, this._rowStopIndex = rowStopIndex;
-                }
-            } ]), ArrowKeyStepper;
-        }(_react.Component);
-        exports.default = ArrowKeyStepper;
-    }, /* 3 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        module.exports = {
-            default: __webpack_require__(4),
-            __esModule: !0
-        };
-    }, /* 4 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        __webpack_require__(5), module.exports = __webpack_require__(16).Object.getPrototypeOf;
-    }, /* 5 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // 19.1.2.9 Object.getPrototypeOf(O)
-        var toObject = __webpack_require__(6), $getPrototypeOf = __webpack_require__(8);
-        __webpack_require__(14)("getPrototypeOf", function() {
-            return function(it) {
-                return $getPrototypeOf(toObject(it));
-            };
-        });
-    }, /* 6 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // 7.1.13 ToObject(argument)
-        var defined = __webpack_require__(7);
-        module.exports = function(it) {
-            return Object(defined(it));
-        };
-    }, /* 7 */
-    /***/
-    function(module, exports) {
-        // 7.2.1 RequireObjectCoercible(argument)
-        module.exports = function(it) {
-            if (void 0 == it) throw TypeError("Can't call method on  " + it);
-            return it;
-        };
-    }, /* 8 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O)
-        var has = __webpack_require__(9), toObject = __webpack_require__(6), IE_PROTO = __webpack_require__(10)("IE_PROTO"), ObjectProto = Object.prototype;
-        module.exports = Object.getPrototypeOf || function(O) {
-            return O = toObject(O), has(O, IE_PROTO) ? O[IE_PROTO] : "function" == typeof O.constructor && O instanceof O.constructor ? O.constructor.prototype : O instanceof Object ? ObjectProto : null;
-        };
-    }, /* 9 */
-    /***/
-    function(module, exports) {
-        var hasOwnProperty = {}.hasOwnProperty;
-        module.exports = function(it, key) {
-            return hasOwnProperty.call(it, key);
-        };
-    }, /* 10 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var shared = __webpack_require__(11)("keys"), uid = __webpack_require__(13);
-        module.exports = function(key) {
-            return shared[key] || (shared[key] = uid(key));
-        };
-    }, /* 11 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var global = __webpack_require__(12), SHARED = "__core-js_shared__", store = global[SHARED] || (global[SHARED] = {});
-        module.exports = function(key) {
-            return store[key] || (store[key] = {});
-        };
-    }, /* 12 */
-    /***/
-    function(module, exports) {
-        // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-        var global = module.exports = "undefined" != typeof window && window.Math == Math ? window : "undefined" != typeof self && self.Math == Math ? self : Function("return this")();
-        "number" == typeof __g && (__g = global);
-    }, /* 13 */
-    /***/
-    function(module, exports) {
-        var id = 0, px = Math.random();
-        module.exports = function(key) {
-            return "Symbol(".concat(void 0 === key ? "" : key, ")_", (++id + px).toString(36));
-        };
-    }, /* 14 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // most Object methods by ES6 should accept primitives
-        var $export = __webpack_require__(15), core = __webpack_require__(16), fails = __webpack_require__(25);
-        module.exports = function(KEY, exec) {
-            var fn = (core.Object || {})[KEY] || Object[KEY], exp = {};
-            exp[KEY] = exec(fn), $export($export.S + $export.F * fails(function() {
-                fn(1);
-            }), "Object", exp);
-        };
-    }, /* 15 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var global = __webpack_require__(12), core = __webpack_require__(16), ctx = __webpack_require__(17), hide = __webpack_require__(19), PROTOTYPE = "prototype", $export = function(type, name, source) {
-            var key, own, out, IS_FORCED = type & $export.F, IS_GLOBAL = type & $export.G, IS_STATIC = type & $export.S, IS_PROTO = type & $export.P, IS_BIND = type & $export.B, IS_WRAP = type & $export.W, exports = IS_GLOBAL ? core : core[name] || (core[name] = {}), expProto = exports[PROTOTYPE], target = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE];
-            IS_GLOBAL && (source = name);
-            for (key in source) // contains in native
-            own = !IS_FORCED && target && void 0 !== target[key], own && key in exports || (// export native or passed
-            out = own ? target[key] : source[key], // prevent global pollution for namespaces
-            exports[key] = IS_GLOBAL && "function" != typeof target[key] ? source[key] : IS_BIND && own ? ctx(out, global) : IS_WRAP && target[key] == out ? function(C) {
-                var F = function(a, b, c) {
-                    if (this instanceof C) {
-                        switch (arguments.length) {
-                          case 0:
-                            return new C();
-
-                          case 1:
-                            return new C(a);
-
-                          case 2:
-                            return new C(a, b);
-                        }
-                        return new C(a, b, c);
-                    }
-                    return C.apply(this, arguments);
-                };
-                return F[PROTOTYPE] = C[PROTOTYPE], F;
-            }(out) : IS_PROTO && "function" == typeof out ? ctx(Function.call, out) : out, // export proto methods to core.%CONSTRUCTOR%.methods.%NAME%
-            IS_PROTO && ((exports.virtual || (exports.virtual = {}))[key] = out, // export proto methods to core.%CONSTRUCTOR%.prototype.%NAME%
-            type & $export.R && expProto && !expProto[key] && hide(expProto, key, out)));
-        };
-        // type bitmap
-        $export.F = 1, // forced
-        $export.G = 2, // global
-        $export.S = 4, // static
-        $export.P = 8, // proto
-        $export.B = 16, // bind
-        $export.W = 32, // wrap
-        $export.U = 64, // safe
-        $export.R = 128, // real proto method for `library`
-        module.exports = $export;
-    }, /* 16 */
-    /***/
-    function(module, exports) {
-        var core = module.exports = {
-            version: "2.4.0"
-        };
-        "number" == typeof __e && (__e = core);
-    }, /* 17 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // optional / simple context binding
-        var aFunction = __webpack_require__(18);
-        module.exports = function(fn, that, length) {
-            if (aFunction(fn), void 0 === that) return fn;
-            switch (length) {
-              case 1:
-                return function(a) {
-                    return fn.call(that, a);
-                };
-
-              case 2:
-                return function(a, b) {
-                    return fn.call(that, a, b);
-                };
-
-              case 3:
-                return function(a, b, c) {
-                    return fn.call(that, a, b, c);
-                };
-            }
-            return function() {
-                return fn.apply(that, arguments);
-            };
-        };
-    }, /* 18 */
-    /***/
-    function(module, exports) {
-        module.exports = function(it) {
-            if ("function" != typeof it) throw TypeError(it + " is not a function!");
-            return it;
-        };
-    }, /* 19 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var dP = __webpack_require__(20), createDesc = __webpack_require__(28);
-        module.exports = __webpack_require__(24) ? function(object, key, value) {
-            return dP.f(object, key, createDesc(1, value));
-        } : function(object, key, value) {
-            return object[key] = value, object;
-        };
-    }, /* 20 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var anObject = __webpack_require__(21), IE8_DOM_DEFINE = __webpack_require__(23), toPrimitive = __webpack_require__(27), dP = Object.defineProperty;
-        exports.f = __webpack_require__(24) ? Object.defineProperty : function(O, P, Attributes) {
-            if (anObject(O), P = toPrimitive(P, !0), anObject(Attributes), IE8_DOM_DEFINE) try {
-                return dP(O, P, Attributes);
-            } catch (e) {}
-            if ("get" in Attributes || "set" in Attributes) throw TypeError("Accessors not supported!");
-            return "value" in Attributes && (O[P] = Attributes.value), O;
-        };
-    }, /* 21 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var isObject = __webpack_require__(22);
-        module.exports = function(it) {
-            if (!isObject(it)) throw TypeError(it + " is not an object!");
-            return it;
-        };
-    }, /* 22 */
-    /***/
-    function(module, exports) {
-        module.exports = function(it) {
-            return "object" == typeof it ? null !== it : "function" == typeof it;
-        };
-    }, /* 23 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        module.exports = !__webpack_require__(24) && !__webpack_require__(25)(function() {
-            return 7 != Object.defineProperty(__webpack_require__(26)("div"), "a", {
-                get: function() {
-                    return 7;
-                }
-            }).a;
-        });
-    }, /* 24 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // Thank's IE8 for his funny defineProperty
-        module.exports = !__webpack_require__(25)(function() {
-            return 7 != Object.defineProperty({}, "a", {
-                get: function() {
-                    return 7;
-                }
-            }).a;
-        });
-    }, /* 25 */
-    /***/
-    function(module, exports) {
-        module.exports = function(exec) {
-            try {
-                return !!exec();
-            } catch (e) {
-                return !0;
-            }
-        };
-    }, /* 26 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var isObject = __webpack_require__(22), document = __webpack_require__(12).document, is = isObject(document) && isObject(document.createElement);
-        module.exports = function(it) {
-            return is ? document.createElementNS("http://www.w3.org/1999/xhtml",it) : {};
-        };
-    }, /* 27 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // 7.1.1 ToPrimitive(input [, PreferredType])
-        var isObject = __webpack_require__(22);
-        // instead of the ES6 spec version, we didn't implement @@toPrimitive case
-        // and the second argument - flag - preferred type is a string
-        module.exports = function(it, S) {
-            if (!isObject(it)) return it;
-            var fn, val;
-            if (S && "function" == typeof (fn = it.toString) && !isObject(val = fn.call(it))) return val;
-            if ("function" == typeof (fn = it.valueOf) && !isObject(val = fn.call(it))) return val;
-            if (!S && "function" == typeof (fn = it.toString) && !isObject(val = fn.call(it))) return val;
-            throw TypeError("Can't convert object to primitive value");
-        };
-    }, /* 28 */
-    /***/
-    function(module, exports) {
-        module.exports = function(bitmap, value) {
-            return {
-                enumerable: !(1 & bitmap),
-                configurable: !(2 & bitmap),
-                writable: !(4 & bitmap),
-                value: value
-            };
-        };
-    }, /* 29 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        exports.__esModule = !0, exports.default = function(instance, Constructor) {
-            if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
-        };
-    }, /* 30 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        exports.__esModule = !0;
-        var _defineProperty = __webpack_require__(31), _defineProperty2 = _interopRequireDefault(_defineProperty);
-        exports.default = function() {
-            function defineProperties(target, props) {
-                for (var i = 0; i < props.length; i++) {
-                    var descriptor = props[i];
-                    descriptor.enumerable = descriptor.enumerable || !1, descriptor.configurable = !0,
-                    "value" in descriptor && (descriptor.writable = !0), (0, _defineProperty2.default)(target, descriptor.key, descriptor);
-                }
-            }
-            return function(Constructor, protoProps, staticProps) {
-                return protoProps && defineProperties(Constructor.prototype, protoProps), staticProps && defineProperties(Constructor, staticProps),
-                Constructor;
-            };
-        }();
-    }, /* 31 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        module.exports = {
-            default: __webpack_require__(32),
-            __esModule: !0
-        };
-    }, /* 32 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        __webpack_require__(33);
-        var $Object = __webpack_require__(16).Object;
-        module.exports = function(it, key, desc) {
-            return $Object.defineProperty(it, key, desc);
-        };
-    }, /* 33 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var $export = __webpack_require__(15);
-        // 19.1.2.4 / 15.2.3.6 Object.defineProperty(O, P, Attributes)
-        $export($export.S + $export.F * !__webpack_require__(24), "Object", {
-            defineProperty: __webpack_require__(20).f
-        });
-    }, /* 34 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        exports.__esModule = !0;
-        var _typeof2 = __webpack_require__(35), _typeof3 = _interopRequireDefault(_typeof2);
-        exports.default = function(self, call) {
-            if (!self) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-            return !call || "object" !== ("undefined" == typeof call ? "undefined" : (0, _typeof3.default)(call)) && "function" != typeof call ? self : call;
-        };
-    }, /* 35 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        exports.__esModule = !0;
-        var _iterator = __webpack_require__(36), _iterator2 = _interopRequireDefault(_iterator), _symbol = __webpack_require__(65), _symbol2 = _interopRequireDefault(_symbol), _typeof = "function" == typeof _symbol2.default && "symbol" == typeof _iterator2.default ? function(obj) {
-            return typeof obj;
-        } : function(obj) {
-            return obj && "function" == typeof _symbol2.default && obj.constructor === _symbol2.default && obj !== _symbol2.default.prototype ? "symbol" : typeof obj;
-        };
-        exports.default = "function" == typeof _symbol2.default && "symbol" === _typeof(_iterator2.default) ? function(obj) {
-            return "undefined" == typeof obj ? "undefined" : _typeof(obj);
-        } : function(obj) {
-            return obj && "function" == typeof _symbol2.default && obj.constructor === _symbol2.default && obj !== _symbol2.default.prototype ? "symbol" : "undefined" == typeof obj ? "undefined" : _typeof(obj);
-        };
-    }, /* 36 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        module.exports = {
-            default: __webpack_require__(37),
-            __esModule: !0
-        };
-    }, /* 37 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        __webpack_require__(38), __webpack_require__(60), module.exports = __webpack_require__(64).f("iterator");
-    }, /* 38 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        var $at = __webpack_require__(39)(!0);
-        // 21.1.3.27 String.prototype[@@iterator]()
-        __webpack_require__(41)(String, "String", function(iterated) {
-            this._t = String(iterated), // target
-            this._i = 0;
-        }, function() {
-            var point, O = this._t, index = this._i;
-            return index >= O.length ? {
-                value: void 0,
-                done: !0
-            } : (point = $at(O, index), this._i += point.length, {
-                value: point,
-                done: !1
-            });
-        });
-    }, /* 39 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var toInteger = __webpack_require__(40), defined = __webpack_require__(7);
-        // true  -> String#at
-        // false -> String#codePointAt
-        module.exports = function(TO_STRING) {
-            return function(that, pos) {
-                var a, b, s = String(defined(that)), i = toInteger(pos), l = s.length;
-                return i < 0 || i >= l ? TO_STRING ? "" : void 0 : (a = s.charCodeAt(i), a < 55296 || a > 56319 || i + 1 === l || (b = s.charCodeAt(i + 1)) < 56320 || b > 57343 ? TO_STRING ? s.charAt(i) : a : TO_STRING ? s.slice(i, i + 2) : (a - 55296 << 10) + (b - 56320) + 65536);
-            };
-        };
-    }, /* 40 */
-    /***/
-    function(module, exports) {
-        // 7.1.4 ToInteger
-        var ceil = Math.ceil, floor = Math.floor;
-        module.exports = function(it) {
-            return isNaN(it = +it) ? 0 : (it > 0 ? floor : ceil)(it);
-        };
-    }, /* 41 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        var LIBRARY = __webpack_require__(42), $export = __webpack_require__(15), redefine = __webpack_require__(43), hide = __webpack_require__(19), has = __webpack_require__(9), Iterators = __webpack_require__(44), $iterCreate = __webpack_require__(45), setToStringTag = __webpack_require__(58), getPrototypeOf = __webpack_require__(8), ITERATOR = __webpack_require__(59)("iterator"), BUGGY = !([].keys && "next" in [].keys()), FF_ITERATOR = "@@iterator", KEYS = "keys", VALUES = "values", returnThis = function() {
-            return this;
-        };
-        module.exports = function(Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED) {
-            $iterCreate(Constructor, NAME, next);
-            var methods, key, IteratorPrototype, getMethod = function(kind) {
-                if (!BUGGY && kind in proto) return proto[kind];
-                switch (kind) {
-                  case KEYS:
-                    return function() {
-                        return new Constructor(this, kind);
-                    };
-
-                  case VALUES:
-                    return function() {
-                        return new Constructor(this, kind);
-                    };
-                }
-                return function() {
-                    return new Constructor(this, kind);
-                };
-            }, TAG = NAME + " Iterator", DEF_VALUES = DEFAULT == VALUES, VALUES_BUG = !1, proto = Base.prototype, $native = proto[ITERATOR] || proto[FF_ITERATOR] || DEFAULT && proto[DEFAULT], $default = $native || getMethod(DEFAULT), $entries = DEFAULT ? DEF_VALUES ? getMethod("entries") : $default : void 0, $anyNative = "Array" == NAME ? proto.entries || $native : $native;
-            if (// Fix native
-            $anyNative && (IteratorPrototype = getPrototypeOf($anyNative.call(new Base())),
-            IteratorPrototype !== Object.prototype && (// Set @@toStringTag to native iterators
-            setToStringTag(IteratorPrototype, TAG, !0), // fix for some old engines
-            LIBRARY || has(IteratorPrototype, ITERATOR) || hide(IteratorPrototype, ITERATOR, returnThis))),
-            // fix Array#{values, @@iterator}.name in V8 / FF
-            DEF_VALUES && $native && $native.name !== VALUES && (VALUES_BUG = !0, $default = function() {
-                return $native.call(this);
-            }), // Define iterator
-            LIBRARY && !FORCED || !BUGGY && !VALUES_BUG && proto[ITERATOR] || hide(proto, ITERATOR, $default),
-            // Plug for library
-            Iterators[NAME] = $default, Iterators[TAG] = returnThis, DEFAULT) if (methods = {
-                values: DEF_VALUES ? $default : getMethod(VALUES),
-                keys: IS_SET ? $default : getMethod(KEYS),
-                entries: $entries
-            }, FORCED) for (key in methods) key in proto || redefine(proto, key, methods[key]); else $export($export.P + $export.F * (BUGGY || VALUES_BUG), NAME, methods);
-            return methods;
-        };
-    }, /* 42 */
-    /***/
-    function(module, exports) {
-        module.exports = !0;
-    }, /* 43 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        module.exports = __webpack_require__(19);
-    }, /* 44 */
-    /***/
-    function(module, exports) {
-        module.exports = {};
-    }, /* 45 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        var create = __webpack_require__(46), descriptor = __webpack_require__(28), setToStringTag = __webpack_require__(58), IteratorPrototype = {};
-        // 25.1.2.1.1 %IteratorPrototype%[@@iterator]()
-        __webpack_require__(19)(IteratorPrototype, __webpack_require__(59)("iterator"), function() {
-            return this;
-        }), module.exports = function(Constructor, NAME, next) {
-            Constructor.prototype = create(IteratorPrototype, {
-                next: descriptor(1, next)
-            }), setToStringTag(Constructor, NAME + " Iterator");
-        };
-    }, /* 46 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
-        var anObject = __webpack_require__(21), dPs = __webpack_require__(47), enumBugKeys = __webpack_require__(56), IE_PROTO = __webpack_require__(10)("IE_PROTO"), Empty = function() {}, PROTOTYPE = "prototype", createDict = function() {
-            // Thrash, waste and sodomy: IE GC bug
-            var iframeDocument, iframe = __webpack_require__(26)("iframe"), i = enumBugKeys.length, lt = "<", gt = ">";
-            for (iframe.style.display = "none", __webpack_require__(57).appendChild(iframe),
-            iframe.src = "javascript:", // eslint-disable-line no-script-url
-            // createDict = iframe.contentWindow.Object;
-            // html.removeChild(iframe);
-            iframeDocument = iframe.contentWindow.document, iframeDocument.open(), iframeDocument.write(lt + "script" + gt + "document.F=Object" + lt + "/script" + gt),
-            iframeDocument.close(), createDict = iframeDocument.F; i--; ) delete createDict[PROTOTYPE][enumBugKeys[i]];
-            return createDict();
-        };
-        module.exports = Object.create || function(O, Properties) {
-            var result;
-            // add "__proto__" for Object.getPrototypeOf polyfill
-            return null !== O ? (Empty[PROTOTYPE] = anObject(O), result = new Empty(), Empty[PROTOTYPE] = null,
-            result[IE_PROTO] = O) : result = createDict(), void 0 === Properties ? result : dPs(result, Properties);
-        };
-    }, /* 47 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var dP = __webpack_require__(20), anObject = __webpack_require__(21), getKeys = __webpack_require__(48);
-        module.exports = __webpack_require__(24) ? Object.defineProperties : function(O, Properties) {
-            anObject(O);
-            for (var P, keys = getKeys(Properties), length = keys.length, i = 0; length > i; ) dP.f(O, P = keys[i++], Properties[P]);
-            return O;
-        };
-    }, /* 48 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // 19.1.2.14 / 15.2.3.14 Object.keys(O)
-        var $keys = __webpack_require__(49), enumBugKeys = __webpack_require__(56);
-        module.exports = Object.keys || function(O) {
-            return $keys(O, enumBugKeys);
-        };
-    }, /* 49 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var has = __webpack_require__(9), toIObject = __webpack_require__(50), arrayIndexOf = __webpack_require__(53)(!1), IE_PROTO = __webpack_require__(10)("IE_PROTO");
-        module.exports = function(object, names) {
-            var key, O = toIObject(object), i = 0, result = [];
-            for (key in O) key != IE_PROTO && has(O, key) && result.push(key);
-            // Don't enum bug & hidden keys
-            for (;names.length > i; ) has(O, key = names[i++]) && (~arrayIndexOf(result, key) || result.push(key));
-            return result;
-        };
-    }, /* 50 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // to indexed object, toObject with fallback for non-array-like ES3 strings
-        var IObject = __webpack_require__(51), defined = __webpack_require__(7);
-        module.exports = function(it) {
-            return IObject(defined(it));
-        };
-    }, /* 51 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // fallback for non-array-like ES3 and non-enumerable old V8 strings
-        var cof = __webpack_require__(52);
-        module.exports = Object("z").propertyIsEnumerable(0) ? Object : function(it) {
-            return "String" == cof(it) ? it.split("") : Object(it);
-        };
-    }, /* 52 */
-    /***/
-    function(module, exports) {
-        var toString = {}.toString;
-        module.exports = function(it) {
-            return toString.call(it).slice(8, -1);
-        };
-    }, /* 53 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // false -> Array#indexOf
-        // true  -> Array#includes
-        var toIObject = __webpack_require__(50), toLength = __webpack_require__(54), toIndex = __webpack_require__(55);
-        module.exports = function(IS_INCLUDES) {
-            return function($this, el, fromIndex) {
-                var value, O = toIObject($this), length = toLength(O.length), index = toIndex(fromIndex, length);
-                // Array#includes uses SameValueZero equality algorithm
-                if (IS_INCLUDES && el != el) {
-                    for (;length > index; ) if (value = O[index++], value != value) return !0;
-                } else for (;length > index; index++) if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
-                return !IS_INCLUDES && -1;
-            };
-        };
-    }, /* 54 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // 7.1.15 ToLength
-        var toInteger = __webpack_require__(40), min = Math.min;
-        module.exports = function(it) {
-            return it > 0 ? min(toInteger(it), 9007199254740991) : 0;
-        };
-    }, /* 55 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var toInteger = __webpack_require__(40), max = Math.max, min = Math.min;
-        module.exports = function(index, length) {
-            return index = toInteger(index), index < 0 ? max(index + length, 0) : min(index, length);
-        };
-    }, /* 56 */
-    /***/
-    function(module, exports) {
-        // IE 8- don't enum bug keys
-        module.exports = "constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",");
-    }, /* 57 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        module.exports = __webpack_require__(12).document && document.documentElement;
-    }, /* 58 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var def = __webpack_require__(20).f, has = __webpack_require__(9), TAG = __webpack_require__(59)("toStringTag");
-        module.exports = function(it, tag, stat) {
-            it && !has(it = stat ? it : it.prototype, TAG) && def(it, TAG, {
-                configurable: !0,
-                value: tag
-            });
-        };
-    }, /* 59 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var store = __webpack_require__(11)("wks"), uid = __webpack_require__(13), Symbol = __webpack_require__(12).Symbol, USE_SYMBOL = "function" == typeof Symbol, $exports = module.exports = function(name) {
-            return store[name] || (store[name] = USE_SYMBOL && Symbol[name] || (USE_SYMBOL ? Symbol : uid)("Symbol." + name));
-        };
-        $exports.store = store;
-    }, /* 60 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        __webpack_require__(61);
-        for (var global = __webpack_require__(12), hide = __webpack_require__(19), Iterators = __webpack_require__(44), TO_STRING_TAG = __webpack_require__(59)("toStringTag"), collections = [ "NodeList", "DOMTokenList", "MediaList", "StyleSheetList", "CSSRuleList" ], i = 0; i < 5; i++) {
-            var NAME = collections[i], Collection = global[NAME], proto = Collection && Collection.prototype;
-            proto && !proto[TO_STRING_TAG] && hide(proto, TO_STRING_TAG, NAME), Iterators[NAME] = Iterators.Array;
-        }
-    }, /* 61 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        var addToUnscopables = __webpack_require__(62), step = __webpack_require__(63), Iterators = __webpack_require__(44), toIObject = __webpack_require__(50);
-        // 22.1.3.4 Array.prototype.entries()
-        // 22.1.3.13 Array.prototype.keys()
-        // 22.1.3.29 Array.prototype.values()
-        // 22.1.3.30 Array.prototype[@@iterator]()
-        module.exports = __webpack_require__(41)(Array, "Array", function(iterated, kind) {
-            this._t = toIObject(iterated), // target
-            this._i = 0, // next index
-            this._k = kind;
-        }, function() {
-            var O = this._t, kind = this._k, index = this._i++;
-            return !O || index >= O.length ? (this._t = void 0, step(1)) : "keys" == kind ? step(0, index) : "values" == kind ? step(0, O[index]) : step(0, [ index, O[index] ]);
-        }, "values"), // argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7)
-        Iterators.Arguments = Iterators.Array, addToUnscopables("keys"), addToUnscopables("values"),
-        addToUnscopables("entries");
-    }, /* 62 */
-    /***/
-    function(module, exports) {
-        module.exports = function() {};
-    }, /* 63 */
-    /***/
-    function(module, exports) {
-        module.exports = function(done, value) {
-            return {
-                value: value,
-                done: !!done
-            };
-        };
-    }, /* 64 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        exports.f = __webpack_require__(59);
-    }, /* 65 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        module.exports = {
-            default: __webpack_require__(66),
-            __esModule: !0
-        };
-    }, /* 66 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        __webpack_require__(67), __webpack_require__(78), __webpack_require__(79), __webpack_require__(80),
-        module.exports = __webpack_require__(16).Symbol;
-    }, /* 67 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        // ECMAScript 6 symbols shim
-        var global = __webpack_require__(12), has = __webpack_require__(9), DESCRIPTORS = __webpack_require__(24), $export = __webpack_require__(15), redefine = __webpack_require__(43), META = __webpack_require__(68).KEY, $fails = __webpack_require__(25), shared = __webpack_require__(11), setToStringTag = __webpack_require__(58), uid = __webpack_require__(13), wks = __webpack_require__(59), wksExt = __webpack_require__(64), wksDefine = __webpack_require__(69), keyOf = __webpack_require__(70), enumKeys = __webpack_require__(71), isArray = __webpack_require__(74), anObject = __webpack_require__(21), toIObject = __webpack_require__(50), toPrimitive = __webpack_require__(27), createDesc = __webpack_require__(28), _create = __webpack_require__(46), gOPNExt = __webpack_require__(75), $GOPD = __webpack_require__(77), $DP = __webpack_require__(20), $keys = __webpack_require__(48), gOPD = $GOPD.f, dP = $DP.f, gOPN = gOPNExt.f, $Symbol = global.Symbol, $JSON = global.JSON, _stringify = $JSON && $JSON.stringify, PROTOTYPE = "prototype", HIDDEN = wks("_hidden"), TO_PRIMITIVE = wks("toPrimitive"), isEnum = {}.propertyIsEnumerable, SymbolRegistry = shared("symbol-registry"), AllSymbols = shared("symbols"), OPSymbols = shared("op-symbols"), ObjectProto = Object[PROTOTYPE], USE_NATIVE = "function" == typeof $Symbol, QObject = global.QObject, setter = !QObject || !QObject[PROTOTYPE] || !QObject[PROTOTYPE].findChild, setSymbolDesc = DESCRIPTORS && $fails(function() {
-            return 7 != _create(dP({}, "a", {
-                get: function() {
-                    return dP(this, "a", {
-                        value: 7
-                    }).a;
-                }
-            })).a;
-        }) ? function(it, key, D) {
-            var protoDesc = gOPD(ObjectProto, key);
-            protoDesc && delete ObjectProto[key], dP(it, key, D), protoDesc && it !== ObjectProto && dP(ObjectProto, key, protoDesc);
-        } : dP, wrap = function(tag) {
-            var sym = AllSymbols[tag] = _create($Symbol[PROTOTYPE]);
-            return sym._k = tag, sym;
-        }, isSymbol = USE_NATIVE && "symbol" == typeof $Symbol.iterator ? function(it) {
-            return "symbol" == typeof it;
-        } : function(it) {
-            return it instanceof $Symbol;
-        }, $defineProperty = function(it, key, D) {
-            return it === ObjectProto && $defineProperty(OPSymbols, key, D), anObject(it), key = toPrimitive(key, !0),
-            anObject(D), has(AllSymbols, key) ? (D.enumerable ? (has(it, HIDDEN) && it[HIDDEN][key] && (it[HIDDEN][key] = !1),
-            D = _create(D, {
-                enumerable: createDesc(0, !1)
-            })) : (has(it, HIDDEN) || dP(it, HIDDEN, createDesc(1, {})), it[HIDDEN][key] = !0),
-            setSymbolDesc(it, key, D)) : dP(it, key, D);
-        }, $defineProperties = function(it, P) {
-            anObject(it);
-            for (var key, keys = enumKeys(P = toIObject(P)), i = 0, l = keys.length; l > i; ) $defineProperty(it, key = keys[i++], P[key]);
-            return it;
-        }, $create = function(it, P) {
-            return void 0 === P ? _create(it) : $defineProperties(_create(it), P);
-        }, $propertyIsEnumerable = function(key) {
-            var E = isEnum.call(this, key = toPrimitive(key, !0));
-            return !(this === ObjectProto && has(AllSymbols, key) && !has(OPSymbols, key)) && (!(E || !has(this, key) || !has(AllSymbols, key) || has(this, HIDDEN) && this[HIDDEN][key]) || E);
-        }, $getOwnPropertyDescriptor = function(it, key) {
-            if (it = toIObject(it), key = toPrimitive(key, !0), it !== ObjectProto || !has(AllSymbols, key) || has(OPSymbols, key)) {
-                var D = gOPD(it, key);
-                return !D || !has(AllSymbols, key) || has(it, HIDDEN) && it[HIDDEN][key] || (D.enumerable = !0),
-                D;
-            }
-        }, $getOwnPropertyNames = function(it) {
-            for (var key, names = gOPN(toIObject(it)), result = [], i = 0; names.length > i; ) has(AllSymbols, key = names[i++]) || key == HIDDEN || key == META || result.push(key);
-            return result;
-        }, $getOwnPropertySymbols = function(it) {
-            for (var key, IS_OP = it === ObjectProto, names = gOPN(IS_OP ? OPSymbols : toIObject(it)), result = [], i = 0; names.length > i; ) !has(AllSymbols, key = names[i++]) || IS_OP && !has(ObjectProto, key) || result.push(AllSymbols[key]);
-            return result;
-        };
-        // 19.4.1.1 Symbol([description])
-        USE_NATIVE || ($Symbol = function() {
-            if (this instanceof $Symbol) throw TypeError("Symbol is not a constructor!");
-            var tag = uid(arguments.length > 0 ? arguments[0] : void 0), $set = function(value) {
-                this === ObjectProto && $set.call(OPSymbols, value), has(this, HIDDEN) && has(this[HIDDEN], tag) && (this[HIDDEN][tag] = !1),
-                setSymbolDesc(this, tag, createDesc(1, value));
-            };
-            return DESCRIPTORS && setter && setSymbolDesc(ObjectProto, tag, {
-                configurable: !0,
-                set: $set
-            }), wrap(tag);
-        }, redefine($Symbol[PROTOTYPE], "toString", function() {
-            return this._k;
-        }), $GOPD.f = $getOwnPropertyDescriptor, $DP.f = $defineProperty, __webpack_require__(76).f = gOPNExt.f = $getOwnPropertyNames,
-        __webpack_require__(73).f = $propertyIsEnumerable, __webpack_require__(72).f = $getOwnPropertySymbols,
-        DESCRIPTORS && !__webpack_require__(42) && redefine(ObjectProto, "propertyIsEnumerable", $propertyIsEnumerable, !0),
-        wksExt.f = function(name) {
-            return wrap(wks(name));
-        }), $export($export.G + $export.W + $export.F * !USE_NATIVE, {
-            Symbol: $Symbol
-        });
-        for (var symbols = "hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","), i = 0; symbols.length > i; ) wks(symbols[i++]);
-        for (var symbols = $keys(wks.store), i = 0; symbols.length > i; ) wksDefine(symbols[i++]);
-        $export($export.S + $export.F * !USE_NATIVE, "Symbol", {
-            // 19.4.2.1 Symbol.for(key)
-            for: function(key) {
-                return has(SymbolRegistry, key += "") ? SymbolRegistry[key] : SymbolRegistry[key] = $Symbol(key);
-            },
-            // 19.4.2.5 Symbol.keyFor(sym)
-            keyFor: function(key) {
-                if (isSymbol(key)) return keyOf(SymbolRegistry, key);
-                throw TypeError(key + " is not a symbol!");
-            },
-            useSetter: function() {
-                setter = !0;
-            },
-            useSimple: function() {
-                setter = !1;
-            }
-        }), $export($export.S + $export.F * !USE_NATIVE, "Object", {
-            // 19.1.2.2 Object.create(O [, Properties])
-            create: $create,
-            // 19.1.2.4 Object.defineProperty(O, P, Attributes)
-            defineProperty: $defineProperty,
-            // 19.1.2.3 Object.defineProperties(O, Properties)
-            defineProperties: $defineProperties,
-            // 19.1.2.6 Object.getOwnPropertyDescriptor(O, P)
-            getOwnPropertyDescriptor: $getOwnPropertyDescriptor,
-            // 19.1.2.7 Object.getOwnPropertyNames(O)
-            getOwnPropertyNames: $getOwnPropertyNames,
-            // 19.1.2.8 Object.getOwnPropertySymbols(O)
-            getOwnPropertySymbols: $getOwnPropertySymbols
-        }), // 24.3.2 JSON.stringify(value [, replacer [, space]])
-        $JSON && $export($export.S + $export.F * (!USE_NATIVE || $fails(function() {
-            var S = $Symbol();
-            // MS Edge converts symbol values to JSON as {}
-            // WebKit converts symbol values to JSON as null
-            // V8 throws on boxed symbols
-            return "[null]" != _stringify([ S ]) || "{}" != _stringify({
-                a: S
-            }) || "{}" != _stringify(Object(S));
-        })), "JSON", {
-            stringify: function(it) {
-                if (void 0 !== it && !isSymbol(it)) {
-                    for (// IE8 returns string on undefined
-                    var replacer, $replacer, args = [ it ], i = 1; arguments.length > i; ) args.push(arguments[i++]);
-                    return replacer = args[1], "function" == typeof replacer && ($replacer = replacer),
-                    !$replacer && isArray(replacer) || (replacer = function(key, value) {
-                        if ($replacer && (value = $replacer.call(this, key, value)), !isSymbol(value)) return value;
-                    }), args[1] = replacer, _stringify.apply($JSON, args);
-                }
-            }
-        }), // 19.4.3.4 Symbol.prototype[@@toPrimitive](hint)
-        $Symbol[PROTOTYPE][TO_PRIMITIVE] || __webpack_require__(19)($Symbol[PROTOTYPE], TO_PRIMITIVE, $Symbol[PROTOTYPE].valueOf),
-        // 19.4.3.5 Symbol.prototype[@@toStringTag]
-        setToStringTag($Symbol, "Symbol"), // 20.2.1.9 Math[@@toStringTag]
-        setToStringTag(Math, "Math", !0), // 24.3.3 JSON[@@toStringTag]
-        setToStringTag(global.JSON, "JSON", !0);
-    }, /* 68 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var META = __webpack_require__(13)("meta"), isObject = __webpack_require__(22), has = __webpack_require__(9), setDesc = __webpack_require__(20).f, id = 0, isExtensible = Object.isExtensible || function() {
-            return !0;
-        }, FREEZE = !__webpack_require__(25)(function() {
-            return isExtensible(Object.preventExtensions({}));
-        }), setMeta = function(it) {
-            setDesc(it, META, {
-                value: {
-                    i: "O" + ++id,
-                    // object ID
-                    w: {}
-                }
-            });
-        }, fastKey = function(it, create) {
-            // return primitive with prefix
-            if (!isObject(it)) return "symbol" == typeof it ? it : ("string" == typeof it ? "S" : "P") + it;
-            if (!has(it, META)) {
-                // can't set metadata to uncaught frozen object
-                if (!isExtensible(it)) return "F";
-                // not necessary to add metadata
-                if (!create) return "E";
-                // add missing metadata
-                setMeta(it);
-            }
-            return it[META].i;
-        }, getWeak = function(it, create) {
-            if (!has(it, META)) {
-                // can't set metadata to uncaught frozen object
-                if (!isExtensible(it)) return !0;
-                // not necessary to add metadata
-                if (!create) return !1;
-                // add missing metadata
-                setMeta(it);
-            }
-            return it[META].w;
-        }, onFreeze = function(it) {
-            return FREEZE && meta.NEED && isExtensible(it) && !has(it, META) && setMeta(it),
-            it;
-        }, meta = module.exports = {
-            KEY: META,
-            NEED: !1,
-            fastKey: fastKey,
-            getWeak: getWeak,
-            onFreeze: onFreeze
-        };
-    }, /* 69 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var global = __webpack_require__(12), core = __webpack_require__(16), LIBRARY = __webpack_require__(42), wksExt = __webpack_require__(64), defineProperty = __webpack_require__(20).f;
-        module.exports = function(name) {
-            var $Symbol = core.Symbol || (core.Symbol = LIBRARY ? {} : global.Symbol || {});
-            "_" == name.charAt(0) || name in $Symbol || defineProperty($Symbol, name, {
-                value: wksExt.f(name)
-            });
-        };
-    }, /* 70 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var getKeys = __webpack_require__(48), toIObject = __webpack_require__(50);
-        module.exports = function(object, el) {
-            for (var key, O = toIObject(object), keys = getKeys(O), length = keys.length, index = 0; length > index; ) if (O[key = keys[index++]] === el) return key;
-        };
-    }, /* 71 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // all enumerable object keys, includes symbols
-        var getKeys = __webpack_require__(48), gOPS = __webpack_require__(72), pIE = __webpack_require__(73);
-        module.exports = function(it) {
-            var result = getKeys(it), getSymbols = gOPS.f;
-            if (getSymbols) for (var key, symbols = getSymbols(it), isEnum = pIE.f, i = 0; symbols.length > i; ) isEnum.call(it, key = symbols[i++]) && result.push(key);
-            return result;
-        };
-    }, /* 72 */
-    /***/
-    function(module, exports) {
-        exports.f = Object.getOwnPropertySymbols;
-    }, /* 73 */
-    /***/
-    function(module, exports) {
-        exports.f = {}.propertyIsEnumerable;
-    }, /* 74 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // 7.2.2 IsArray(argument)
-        var cof = __webpack_require__(52);
-        module.exports = Array.isArray || function(arg) {
-            return "Array" == cof(arg);
-        };
-    }, /* 75 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // fallback for IE11 buggy Object.getOwnPropertyNames with iframe and window
-        var toIObject = __webpack_require__(50), gOPN = __webpack_require__(76).f, toString = {}.toString, windowNames = "object" == typeof window && window && Object.getOwnPropertyNames ? Object.getOwnPropertyNames(window) : [], getWindowNames = function(it) {
-            try {
-                return gOPN(it);
-            } catch (e) {
-                return windowNames.slice();
-            }
-        };
-        module.exports.f = function(it) {
-            return windowNames && "[object Window]" == toString.call(it) ? getWindowNames(it) : gOPN(toIObject(it));
-        };
-    }, /* 76 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // 19.1.2.7 / 15.2.3.4 Object.getOwnPropertyNames(O)
-        var $keys = __webpack_require__(49), hiddenKeys = __webpack_require__(56).concat("length", "prototype");
-        exports.f = Object.getOwnPropertyNames || function(O) {
-            return $keys(O, hiddenKeys);
-        };
-    }, /* 77 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var pIE = __webpack_require__(73), createDesc = __webpack_require__(28), toIObject = __webpack_require__(50), toPrimitive = __webpack_require__(27), has = __webpack_require__(9), IE8_DOM_DEFINE = __webpack_require__(23), gOPD = Object.getOwnPropertyDescriptor;
-        exports.f = __webpack_require__(24) ? gOPD : function(O, P) {
-            if (O = toIObject(O), P = toPrimitive(P, !0), IE8_DOM_DEFINE) try {
-                return gOPD(O, P);
-            } catch (e) {}
-            if (has(O, P)) return createDesc(!pIE.f.call(O, P), O[P]);
-        };
-    }, /* 78 */
-    /***/
-    function(module, exports) {}, /* 79 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        __webpack_require__(69)("asyncIterator");
-    }, /* 80 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        __webpack_require__(69)("observable");
-    }, /* 81 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        exports.__esModule = !0;
-        var _setPrototypeOf = __webpack_require__(82), _setPrototypeOf2 = _interopRequireDefault(_setPrototypeOf), _create = __webpack_require__(86), _create2 = _interopRequireDefault(_create), _typeof2 = __webpack_require__(35), _typeof3 = _interopRequireDefault(_typeof2);
-        exports.default = function(subClass, superClass) {
-            if ("function" != typeof superClass && null !== superClass) throw new TypeError("Super expression must either be null or a function, not " + ("undefined" == typeof superClass ? "undefined" : (0,
-            _typeof3.default)(superClass)));
-            subClass.prototype = (0, _create2.default)(superClass && superClass.prototype, {
-                constructor: {
-                    value: subClass,
-                    enumerable: !1,
-                    writable: !0,
-                    configurable: !0
-                }
-            }), superClass && (_setPrototypeOf2.default ? (0, _setPrototypeOf2.default)(subClass, superClass) : subClass.__proto__ = superClass);
-        };
-    }, /* 82 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        module.exports = {
-            default: __webpack_require__(83),
-            __esModule: !0
-        };
-    }, /* 83 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        __webpack_require__(84), module.exports = __webpack_require__(16).Object.setPrototypeOf;
-    }, /* 84 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // 19.1.3.19 Object.setPrototypeOf(O, proto)
-        var $export = __webpack_require__(15);
-        $export($export.S, "Object", {
-            setPrototypeOf: __webpack_require__(85).set
-        });
-    }, /* 85 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // Works with __proto__ only. Old v8 can't work with null proto objects.
-        /* eslint-disable no-proto */
-        var isObject = __webpack_require__(22), anObject = __webpack_require__(21), check = function(O, proto) {
-            if (anObject(O), !isObject(proto) && null !== proto) throw TypeError(proto + ": can't set as prototype!");
-        };
-        module.exports = {
-            set: Object.setPrototypeOf || ("__proto__" in {} ? // eslint-disable-line
-            function(test, buggy, set) {
-                try {
-                    set = __webpack_require__(17)(Function.call, __webpack_require__(77).f(Object.prototype, "__proto__").set, 2),
-                    set(test, []), buggy = !(test instanceof Array);
-                } catch (e) {
-                    buggy = !0;
-                }
-                return function(O, proto) {
-                    return check(O, proto), buggy ? O.__proto__ = proto : set(O, proto), O;
-                };
-            }({}, !1) : void 0),
-            check: check
-        };
-    }, /* 86 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        module.exports = {
-            default: __webpack_require__(87),
-            __esModule: !0
-        };
-    }, /* 87 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        __webpack_require__(88);
-        var $Object = __webpack_require__(16).Object;
-        module.exports = function(P, D) {
-            return $Object.create(P, D);
-        };
-    }, /* 88 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var $export = __webpack_require__(15);
-        // 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
-        $export($export.S, "Object", {
-            create: __webpack_require__(46)
-        });
-    }, /* 89 */
-    /***/
-    function(module, exports) {
-        module.exports = __WEBPACK_EXTERNAL_MODULE_89__;
-    }, /* 90 */
-    /***/
-    function(module, exports) {
-        module.exports = __WEBPACK_EXTERNAL_MODULE_90__;
-    }, /* 91 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.AutoSizer = exports.default = void 0;
-        var _AutoSizer2 = __webpack_require__(92), _AutoSizer3 = _interopRequireDefault(_AutoSizer2);
-        exports.default = _AutoSizer3.default, exports.AutoSizer = _AutoSizer3.default;
-    }, /* 92 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2), _react = __webpack_require__(89), _react2 = _interopRequireDefault(_react), _reactAddonsShallowCompare = __webpack_require__(90), _reactAddonsShallowCompare2 = _interopRequireDefault(_reactAddonsShallowCompare), _detectElementResize = __webpack_require__(93), _detectElementResize2 = _interopRequireDefault(_detectElementResize), AutoSizer = function(_Component) {
-            function AutoSizer(props) {
-                (0, _classCallCheck3.default)(this, AutoSizer);
-                var _this = (0, _possibleConstructorReturn3.default)(this, (AutoSizer.__proto__ || (0,
-                _getPrototypeOf2.default)(AutoSizer)).call(this, props));
-                return _this.state = {
-                    height: 0,
-                    width: 0
-                }, _this._onResize = _this._onResize.bind(_this), _this._setRef = _this._setRef.bind(_this),
-                _this;
-            }
-            return (0, _inherits3.default)(AutoSizer, _Component), (0, _createClass3.default)(AutoSizer, [ {
-                key: "componentDidMount",
-                value: function() {
-                    this._parentNode = this._autoSizer.parentNode, this._detectElementResize = (0, _detectElementResize2.default)(),
-                    this._detectElementResize.addResizeListener(this._parentNode, this._onResize), this._onResize();
-                }
-            }, {
-                key: "componentWillUnmount",
-                value: function() {
-                    this._detectElementResize && this._detectElementResize.removeResizeListener(this._parentNode, this._onResize);
-                }
-            }, {
-                key: "render",
-                value: function() {
-                    var _props = this.props, children = _props.children, disableHeight = _props.disableHeight, disableWidth = _props.disableWidth, _state = this.state, height = _state.height, width = _state.width, outerStyle = {
-                        overflow: "visible"
-                    };
-                    return disableHeight || (outerStyle.height = 0), disableWidth || (outerStyle.width = 0),
-                    _react2.default.createElement("div", {
-                        ref: this._setRef,
-                        style: outerStyle
-                    }, children({
-                        height: height,
-                        width: width
-                    }));
-                }
-            }, {
-                key: "shouldComponentUpdate",
-                value: function(nextProps, nextState) {
-                    return (0, _reactAddonsShallowCompare2.default)(this, nextProps, nextState);
-                }
-            }, {
-                key: "_onResize",
-                value: function() {
-                    var onResize = this.props.onResize, boundingRect = this._parentNode.getBoundingClientRect(), height = boundingRect.height || 0, width = boundingRect.width || 0, style = window.getComputedStyle(this._parentNode), paddingLeft = parseInt(style.paddingLeft, 10) || 0, paddingRight = parseInt(style.paddingRight, 10) || 0, paddingTop = parseInt(style.paddingTop, 10) || 0, paddingBottom = parseInt(style.paddingBottom, 10) || 0;
-                    this.setState({
-                        height: height - paddingTop - paddingBottom,
-                        width: width - paddingLeft - paddingRight
-                    }), onResize({
-                        height: height,
-                        width: width
-                    });
-                }
-            }, {
-                key: "_setRef",
-                value: function(autoSizer) {
-                    this._autoSizer = autoSizer;
-                }
-            } ]), AutoSizer;
-        }(_react.Component);
-        AutoSizer.defaultProps = {
-            onResize: function() {}
-        }, exports.default = AutoSizer;
-    }, /* 93 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        function createDetectElementResize() {
-            var _window;
-            _window = "undefined" != typeof window ? window : "undefined" != typeof self ? self : this;
-            var attachEvent = "undefined" != typeof document && document.attachEvent, stylesCreated = !1;
-            if (!attachEvent) {
-                var requestFrame = function() {
-                    var raf = _window.requestAnimationFrame || _window.mozRequestAnimationFrame || _window.webkitRequestAnimationFrame || function(fn) {
-                        return _window.setTimeout(fn, 20);
-                    };
-                    return function(fn) {
-                        return raf(fn);
-                    };
-                }(), cancelFrame = function() {
-                    var cancel = _window.cancelAnimationFrame || _window.mozCancelAnimationFrame || _window.webkitCancelAnimationFrame || _window.clearTimeout;
-                    return function(id) {
-                        return cancel(id);
-                    };
-                }(), resetTriggers = function(element) {
-                    var triggers = element.__resizeTriggers__, expand = triggers.firstElementChild, contract = triggers.lastElementChild, expandChild = expand.firstElementChild;
-                    contract.scrollLeft = contract.scrollWidth, contract.scrollTop = contract.scrollHeight,
-                    expandChild.style.width = expand.offsetWidth + 1 + "px", expandChild.style.height = expand.offsetHeight + 1 + "px",
-                    expand.scrollLeft = expand.scrollWidth, expand.scrollTop = expand.scrollHeight;
-                }, checkTriggers = function(element) {
-                    return element.offsetWidth != element.__resizeLast__.width || element.offsetHeight != element.__resizeLast__.height;
-                }, scrollListener = function(e) {
-                    if (!(e.target.className.indexOf("contract-trigger") < 0 && e.target.className.indexOf("expand-trigger") < 0)) {
-                        var element = this;
-                        resetTriggers(this), this.__resizeRAF__ && cancelFrame(this.__resizeRAF__), this.__resizeRAF__ = requestFrame(function() {
-                            checkTriggers(element) && (element.__resizeLast__.width = element.offsetWidth, element.__resizeLast__.height = element.offsetHeight,
-                            element.__resizeListeners__.forEach(function(fn) {
-                                fn.call(element, e);
-                            }));
-                        });
-                    }
-                }, animation = !1, animationstring = "animation", keyframeprefix = "", animationstartevent = "animationstart", domPrefixes = "Webkit Moz O ms".split(" "), startEvents = "webkitAnimationStart animationstart oAnimationStart MSAnimationStart".split(" "), pfx = "", elm = document.createElementNS("http://www.w3.org/1999/xhtml","fakeelement");
-                if (void 0 !== elm.style.animationName && (animation = !0), animation === !1) for (var i = 0; i < domPrefixes.length; i++) if (void 0 !== elm.style[domPrefixes[i] + "AnimationName"]) {
-                    pfx = domPrefixes[i], animationstring = pfx + "Animation", keyframeprefix = "-" + pfx.toLowerCase() + "-",
-                    animationstartevent = startEvents[i], animation = !0;
-                    break;
-                }
-                var animationName = "resizeanim", animationKeyframes = "@" + keyframeprefix + "keyframes " + animationName + " { from { opacity: 0; } to { opacity: 0; } } ", animationStyle = keyframeprefix + "animation: 1ms " + animationName + "; ";
-            }
-            var createStyles = function() {
-                if (!stylesCreated) {
-                    var css = (animationKeyframes ? animationKeyframes : "") + ".resize-triggers { " + (animationStyle ? animationStyle : "") + 'visibility: hidden; opacity: 0; } .resize-triggers, .resize-triggers > div, .contract-trigger:before { content: " "; display: block; position: absolute; top: 0; left: 0; height: 100%; width: 100%; overflow: hidden; z-index: -1; } .resize-triggers > div { background: #eee; overflow: auto; } .contract-trigger:before { width: 200%; height: 200%; }', head = document.firstElementChild || document.getElementsByTagName("head")[0], style = document.createElementNS("http://www.w3.org/1999/xhtml","style");
-                    style.type = "text/css", style.styleSheet ? style.styleSheet.cssText = css : style.appendChild(document.createTextNode(css)),
-                    head.appendChild(style), stylesCreated = !0;
-                }
-            }, addResizeListener = function(element, fn) {
-                attachEvent ? element.attachEvent("onresize", fn) : (element.__resizeTriggers__ || ("static" == _window.getComputedStyle(element).position && (element.style.position = "relative"),
-                createStyles(), element.__resizeLast__ = {}, element.__resizeListeners__ = [], (element.__resizeTriggers__ = document.createElementNS("http://www.w3.org/1999/xhtml","div")).className = "resize-triggers",
-                element.__resizeTriggers__.innerHTML = '<div class="expand-trigger"><div></div></div><div class="contract-trigger"></div>',
-                element.appendChild(element.__resizeTriggers__), resetTriggers(element), element.addEventListener("scroll", scrollListener, !0),
-                animationstartevent && (element.__resizeTriggers__.__animationListener__ = function(e) {
-                    e.animationName == animationName && resetTriggers(element);
-                }, element.__resizeTriggers__.addEventListener(animationstartevent, element.__resizeTriggers__.__animationListener__))),
-                element.__resizeListeners__.push(fn));
-            }, removeResizeListener = function(element, fn) {
-                attachEvent ? element.detachEvent("onresize", fn) : (element.__resizeListeners__.splice(element.__resizeListeners__.indexOf(fn), 1),
-                element.__resizeListeners__.length || (element.removeEventListener("scroll", scrollListener, !0),
-                element.__resizeTriggers__.__animationListener__ && (element.__resizeTriggers__.removeEventListener(animationstartevent, element.__resizeTriggers__.__animationListener__),
-                element.__resizeTriggers__.__animationListener__ = null), element.__resizeTriggers__ = !element.removeChild(element.__resizeTriggers__)));
-            };
-            return {
-                addResizeListener: addResizeListener,
-                removeResizeListener: removeResizeListener
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.default = createDetectElementResize;
-    }, /* 94 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.defaultCellSizeCache = exports.CellMeasurer = exports.default = void 0;
-        var _CellMeasurer2 = __webpack_require__(95), _CellMeasurer3 = _interopRequireDefault(_CellMeasurer2), _defaultCellSizeCache2 = __webpack_require__(97), _defaultCellSizeCache3 = _interopRequireDefault(_defaultCellSizeCache2);
-        exports.default = _CellMeasurer3.default, exports.CellMeasurer = _CellMeasurer3.default,
-        exports.defaultCellSizeCache = _defaultCellSizeCache3.default;
-    }, /* 95 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2), _react = __webpack_require__(89), _reactAddonsShallowCompare = (_interopRequireDefault(_react),
-        __webpack_require__(90)), _reactAddonsShallowCompare2 = _interopRequireDefault(_reactAddonsShallowCompare), _reactDom = __webpack_require__(96), _reactDom2 = _interopRequireDefault(_reactDom), _defaultCellSizeCache = __webpack_require__(97), _defaultCellSizeCache2 = _interopRequireDefault(_defaultCellSizeCache), CellMeasurer = function(_Component) {
-            function CellMeasurer(props, state) {
-                (0, _classCallCheck3.default)(this, CellMeasurer);
-                var _this = (0, _possibleConstructorReturn3.default)(this, (CellMeasurer.__proto__ || (0,
-                _getPrototypeOf2.default)(CellMeasurer)).call(this, props, state));
-                return _this._cellSizeCache = props.cellSizeCache || new _defaultCellSizeCache2.default(),
-                _this.getColumnWidth = _this.getColumnWidth.bind(_this), _this.getRowHeight = _this.getRowHeight.bind(_this),
-                _this.resetMeasurements = _this.resetMeasurements.bind(_this), _this.resetMeasurementForColumn = _this.resetMeasurementForColumn.bind(_this),
-                _this.resetMeasurementForRow = _this.resetMeasurementForRow.bind(_this), _this;
-            }
-            return (0, _inherits3.default)(CellMeasurer, _Component), (0, _createClass3.default)(CellMeasurer, [ {
-                key: "getColumnWidth",
-                value: function(_ref) {
-                    var index = _ref.index;
-                    if (this._cellSizeCache.hasColumnWidth(index)) return this._cellSizeCache.getColumnWidth(index);
-                    for (var rowCount = this.props.rowCount, maxWidth = 0, rowIndex = 0; rowIndex < rowCount; rowIndex++) {
-                        var _measureCell2 = this._measureCell({
-                            clientWidth: !0,
-                            columnIndex: index,
-                            rowIndex: rowIndex
-                        }), width = _measureCell2.width;
-                        maxWidth = Math.max(maxWidth, width);
-                    }
-                    return this._cellSizeCache.setColumnWidth(index, maxWidth), maxWidth;
-                }
-            }, {
-                key: "getRowHeight",
-                value: function(_ref2) {
-                    var index = _ref2.index;
-                    if (this._cellSizeCache.hasRowHeight(index)) return this._cellSizeCache.getRowHeight(index);
-                    for (var columnCount = this.props.columnCount, maxHeight = 0, columnIndex = 0; columnIndex < columnCount; columnIndex++) {
-                        var _measureCell3 = this._measureCell({
-                            clientHeight: !0,
-                            columnIndex: columnIndex,
-                            rowIndex: index
-                        }), height = _measureCell3.height;
-                        maxHeight = Math.max(maxHeight, height);
-                    }
-                    return this._cellSizeCache.setRowHeight(index, maxHeight), maxHeight;
-                }
-            }, {
-                key: "resetMeasurementForColumn",
-                value: function(columnIndex) {
-                    this._cellSizeCache.clearColumnWidth(columnIndex);
-                }
-            }, {
-                key: "resetMeasurementForRow",
-                value: function(rowIndex) {
-                    this._cellSizeCache.clearRowHeight(rowIndex);
-                }
-            }, {
-                key: "resetMeasurements",
-                value: function() {
-                    this._cellSizeCache.clearAllColumnWidths(), this._cellSizeCache.clearAllRowHeights();
-                }
-            }, {
-                key: "componentDidMount",
-                value: function() {
-                    this._renderAndMount();
-                }
-            }, {
-                key: "componentWillReceiveProps",
-                value: function(nextProps) {
-                    var cellSizeCache = this.props.cellSizeCache;
-                    cellSizeCache !== nextProps.cellSizeCache && (this._cellSizeCache = nextProps.cellSizeCache),
-                    this._updateDivDimensions(nextProps);
-                }
-            }, {
-                key: "componentWillUnmount",
-                value: function() {
-                    this._unmountContainer();
-                }
-            }, {
-                key: "render",
-                value: function() {
-                    var children = this.props.children;
-                    return children({
-                        getColumnWidth: this.getColumnWidth,
-                        getRowHeight: this.getRowHeight,
-                        resetMeasurements: this.resetMeasurements,
-                        resetMeasurementForColumn: this.resetMeasurementForColumn,
-                        resetMeasurementForRow: this.resetMeasurementForRow
-                    });
-                }
-            }, {
-                key: "shouldComponentUpdate",
-                value: function(nextProps, nextState) {
-                    return (0, _reactAddonsShallowCompare2.default)(this, nextProps, nextState);
-                }
-            }, {
-                key: "_getContainerNode",
-                value: function(props) {
-                    var container = props.container;
-                    return container ? _reactDom2.default.findDOMNode("function" == typeof container ? container() : container) : document.firstElementChild;
-                }
-            }, {
-                key: "_measureCell",
-                value: function(_ref3) {
-                    var _ref3$clientHeight = _ref3.clientHeight, clientHeight = void 0 !== _ref3$clientHeight && _ref3$clientHeight, _ref3$clientWidth = _ref3.clientWidth, clientWidth = void 0 === _ref3$clientWidth || _ref3$clientWidth, columnIndex = _ref3.columnIndex, rowIndex = _ref3.rowIndex, cellRenderer = this.props.cellRenderer, rendered = cellRenderer({
-                        columnIndex: columnIndex,
-                        rowIndex: rowIndex
-                    });
-                    this._renderAndMount(), _reactDom2.default.unstable_renderSubtreeIntoContainer(this, rendered, this._div);
-                    var measurements = {
-                        height: clientHeight && this._div.clientHeight,
-                        width: clientWidth && this._div.clientWidth
-                    };
-                    return _reactDom2.default.unmountComponentAtNode(this._div), measurements;
-                }
-            }, {
-                key: "_renderAndMount",
-                value: function() {
-                    this._div || (this._div = document.createElementNS("http://www.w3.org/1999/xhtml","div"), this._div.style.display = "inline-block",
-                    this._div.style.position = "absolute", this._div.style.visibility = "hidden", this._div.style.zIndex = -1,
-                    this._updateDivDimensions(this.props), this._containerNode = this._getContainerNode(this.props),
-                    this._containerNode.appendChild(this._div));
-                }
-            }, {
-                key: "_unmountContainer",
-                value: function() {
-                    this._div && (this._containerNode.removeChild(this._div), this._div = null), this._containerNode = null;
-                }
-            }, {
-                key: "_updateDivDimensions",
-                value: function(props) {
-                    var height = props.height, width = props.width;
-                    height && height !== this._divHeight && (this._divHeight = height, this._div.style.height = height + "px"),
-                    width && width !== this._divWidth && (this._divWidth = width, this._div.style.width = width + "px");
-                }
-            } ]), CellMeasurer;
-        }(_react.Component);
-        exports.default = CellMeasurer;
-    }, /* 96 */
-    /***/
-    function(module, exports) {
-        module.exports = __WEBPACK_EXTERNAL_MODULE_96__;
-    }, /* 97 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), CellSizeCache = function() {
-            function CellSizeCache() {
-                var _ref = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {}, _ref$uniformRowHeight = _ref.uniformRowHeight, uniformRowHeight = void 0 !== _ref$uniformRowHeight && _ref$uniformRowHeight, _ref$uniformColumnWid = _ref.uniformColumnWidth, uniformColumnWidth = void 0 !== _ref$uniformColumnWid && _ref$uniformColumnWid;
-                (0, _classCallCheck3.default)(this, CellSizeCache), this._uniformRowHeight = uniformRowHeight,
-                this._uniformColumnWidth = uniformColumnWidth, this._cachedColumnWidths = {}, this._cachedRowHeights = {};
-            }
-            return (0, _createClass3.default)(CellSizeCache, [ {
-                key: "clearAllColumnWidths",
-                value: function() {
-                    this._cachedColumnWidth = void 0, this._cachedColumnWidths = {};
-                }
-            }, {
-                key: "clearAllRowHeights",
-                value: function() {
-                    this._cachedRowHeight = void 0, this._cachedRowHeights = {};
-                }
-            }, {
-                key: "clearColumnWidth",
-                value: function(index) {
-                    this._cachedColumnWidth = void 0, delete this._cachedColumnWidths[index];
-                }
-            }, {
-                key: "clearRowHeight",
-                value: function(index) {
-                    this._cachedRowHeight = void 0, delete this._cachedRowHeights[index];
-                }
-            }, {
-                key: "getColumnWidth",
-                value: function(index) {
-                    return this._uniformColumnWidth ? this._cachedColumnWidth : this._cachedColumnWidths[index];
-                }
-            }, {
-                key: "getRowHeight",
-                value: function(index) {
-                    return this._uniformRowHeight ? this._cachedRowHeight : this._cachedRowHeights[index];
-                }
-            }, {
-                key: "hasColumnWidth",
-                value: function(index) {
-                    return this._uniformColumnWidth ? !!this._cachedColumnWidth : !!this._cachedColumnWidths[index];
-                }
-            }, {
-                key: "hasRowHeight",
-                value: function(index) {
-                    return this._uniformRowHeight ? !!this._cachedRowHeight : !!this._cachedRowHeights[index];
-                }
-            }, {
-                key: "setColumnWidth",
-                value: function(index, width) {
-                    this._cachedColumnWidth = width, this._cachedColumnWidths[index] = width;
-                }
-            }, {
-                key: "setRowHeight",
-                value: function(index, height) {
-                    this._cachedRowHeight = height, this._cachedRowHeights[index] = height;
-                }
-            } ]), CellSizeCache;
-        }();
-        exports.default = CellSizeCache;
-    }, /* 98 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.Collection = exports.default = void 0;
-        var _Collection2 = __webpack_require__(99), _Collection3 = _interopRequireDefault(_Collection2);
-        exports.default = _Collection3.default, exports.Collection = _Collection3.default;
-    }, /* 99 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        function defaultCellGroupRenderer(_ref5) {
-            var cellCache = _ref5.cellCache, cellRenderer = _ref5.cellRenderer, cellSizeAndPositionGetter = _ref5.cellSizeAndPositionGetter, indices = _ref5.indices, isScrolling = _ref5.isScrolling;
-            return indices.map(function(index) {
-                var cellMetadata = cellSizeAndPositionGetter({
-                    index: index
-                }), cellRendererProps = {
-                    index: index,
-                    isScrolling: isScrolling,
-                    key: index,
-                    style: {
-                        height: cellMetadata.height,
-                        left: cellMetadata.x,
-                        position: "absolute",
-                        top: cellMetadata.y,
-                        width: cellMetadata.width
-                    }
-                };
-                return isScrolling ? (index in cellCache || (cellCache[index] = cellRenderer(cellRendererProps)),
-                cellCache[index]) : cellRenderer(cellRendererProps);
-            }).filter(function(renderedCell) {
-                return !!renderedCell;
-            });
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _extends2 = __webpack_require__(100), _extends3 = _interopRequireDefault(_extends2), _objectWithoutProperties2 = __webpack_require__(105), _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2), _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2), _react = __webpack_require__(89), _react2 = _interopRequireDefault(_react), _CollectionView = __webpack_require__(106), _CollectionView2 = _interopRequireDefault(_CollectionView), _calculateSizeAndPositionData2 = __webpack_require__(114), _calculateSizeAndPositionData3 = _interopRequireDefault(_calculateSizeAndPositionData2), _getUpdatedOffsetForIndex = __webpack_require__(117), _getUpdatedOffsetForIndex2 = _interopRequireDefault(_getUpdatedOffsetForIndex), _reactAddonsShallowCompare = __webpack_require__(90), _reactAddonsShallowCompare2 = _interopRequireDefault(_reactAddonsShallowCompare), Collection = function(_Component) {
-            function Collection(props, context) {
-                (0, _classCallCheck3.default)(this, Collection);
-                var _this = (0, _possibleConstructorReturn3.default)(this, (Collection.__proto__ || (0,
-                _getPrototypeOf2.default)(Collection)).call(this, props, context));
-                return _this._cellMetadata = [], _this._lastRenderedCellIndices = [], _this._cellCache = [],
-                _this._isScrollingChange = _this._isScrollingChange.bind(_this), _this;
-            }
-            return (0, _inherits3.default)(Collection, _Component), (0, _createClass3.default)(Collection, [ {
-                key: "recomputeCellSizesAndPositions",
-                value: function() {
-                    this._cellCache = [], this._collectionView.recomputeCellSizesAndPositions();
-                }
-            }, {
-                key: "render",
-                value: function() {
-                    var _this2 = this, props = (0, _objectWithoutProperties3.default)(this.props, []);
-                    return _react2.default.createElement(_CollectionView2.default, (0, _extends3.default)({
-                        cellLayoutManager: this,
-                        isScrollingChange: this._isScrollingChange,
-                        ref: function(_ref) {
-                            _this2._collectionView = _ref;
-                        }
-                    }, props));
-                }
-            }, {
-                key: "shouldComponentUpdate",
-                value: function(nextProps, nextState) {
-                    return (0, _reactAddonsShallowCompare2.default)(this, nextProps, nextState);
-                }
-            }, {
-                key: "calculateSizeAndPositionData",
-                value: function() {
-                    var _props = this.props, cellCount = _props.cellCount, cellSizeAndPositionGetter = _props.cellSizeAndPositionGetter, sectionSize = _props.sectionSize, data = (0,
-                    _calculateSizeAndPositionData3.default)({
-                        cellCount: cellCount,
-                        cellSizeAndPositionGetter: cellSizeAndPositionGetter,
-                        sectionSize: sectionSize
-                    });
-                    this._cellMetadata = data.cellMetadata, this._sectionManager = data.sectionManager,
-                    this._height = data.height, this._width = data.width;
-                }
-            }, {
-                key: "getLastRenderedIndices",
-                value: function() {
-                    return this._lastRenderedCellIndices;
-                }
-            }, {
-                key: "getScrollPositionForCell",
-                value: function(_ref2) {
-                    var align = _ref2.align, cellIndex = _ref2.cellIndex, height = _ref2.height, scrollLeft = _ref2.scrollLeft, scrollTop = _ref2.scrollTop, width = _ref2.width, cellCount = this.props.cellCount;
-                    if (cellIndex >= 0 && cellIndex < cellCount) {
-                        var cellMetadata = this._cellMetadata[cellIndex];
-                        scrollLeft = (0, _getUpdatedOffsetForIndex2.default)({
-                            align: align,
-                            cellOffset: cellMetadata.x,
-                            cellSize: cellMetadata.width,
-                            containerSize: width,
-                            currentOffset: scrollLeft,
-                            targetIndex: cellIndex
-                        }), scrollTop = (0, _getUpdatedOffsetForIndex2.default)({
-                            align: align,
-                            cellOffset: cellMetadata.y,
-                            cellSize: cellMetadata.height,
-                            containerSize: height,
-                            currentOffset: scrollTop,
-                            targetIndex: cellIndex
-                        });
-                    }
-                    return {
-                        scrollLeft: scrollLeft,
-                        scrollTop: scrollTop
-                    };
-                }
-            }, {
-                key: "getTotalSize",
-                value: function() {
-                    return {
-                        height: this._height,
-                        width: this._width
-                    };
-                }
-            }, {
-                key: "cellRenderers",
-                value: function(_ref3) {
-                    var _this3 = this, height = _ref3.height, isScrolling = _ref3.isScrolling, width = _ref3.width, x = _ref3.x, y = _ref3.y, _props2 = this.props, cellGroupRenderer = _props2.cellGroupRenderer, cellRenderer = _props2.cellRenderer;
-                    return this._lastRenderedCellIndices = this._sectionManager.getCellIndices({
-                        height: height,
-                        width: width,
-                        x: x,
-                        y: y
-                    }), cellGroupRenderer({
-                        cellCache: this._cellCache,
-                        cellRenderer: cellRenderer,
-                        cellSizeAndPositionGetter: function(_ref4) {
-                            var index = _ref4.index;
-                            return _this3._sectionManager.getCellMetadata({
-                                index: index
-                            });
-                        },
-                        indices: this._lastRenderedCellIndices,
-                        isScrolling: isScrolling
-                    });
-                }
-            }, {
-                key: "_isScrollingChange",
-                value: function(isScrolling) {
-                    isScrolling || (this._cellCache = []);
-                }
-            } ]), Collection;
-        }(_react.Component);
-        Collection.defaultProps = {
-            "aria-label": "grid",
-            cellGroupRenderer: defaultCellGroupRenderer
-        }, exports.default = Collection;
-    }, /* 100 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        exports.__esModule = !0;
-        var _assign = __webpack_require__(101), _assign2 = _interopRequireDefault(_assign);
-        exports.default = _assign2.default || function(target) {
-            for (var i = 1; i < arguments.length; i++) {
-                var source = arguments[i];
-                for (var key in source) Object.prototype.hasOwnProperty.call(source, key) && (target[key] = source[key]);
-            }
-            return target;
-        };
-    }, /* 101 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        module.exports = {
-            default: __webpack_require__(102),
-            __esModule: !0
-        };
-    }, /* 102 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        __webpack_require__(103), module.exports = __webpack_require__(16).Object.assign;
-    }, /* 103 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // 19.1.3.1 Object.assign(target, source)
-        var $export = __webpack_require__(15);
-        $export($export.S + $export.F, "Object", {
-            assign: __webpack_require__(104)
-        });
-    }, /* 104 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        // 19.1.2.1 Object.assign(target, source, ...)
-        var getKeys = __webpack_require__(48), gOPS = __webpack_require__(72), pIE = __webpack_require__(73), toObject = __webpack_require__(6), IObject = __webpack_require__(51), $assign = Object.assign;
-        // should work with symbols and should have deterministic property order (V8 bug)
-        module.exports = !$assign || __webpack_require__(25)(function() {
-            var A = {}, B = {}, S = Symbol(), K = "abcdefghijklmnopqrst";
-            return A[S] = 7, K.split("").forEach(function(k) {
-                B[k] = k;
-            }), 7 != $assign({}, A)[S] || Object.keys($assign({}, B)).join("") != K;
-        }) ? function(target, source) {
-            for (// eslint-disable-line no-unused-vars
-            var T = toObject(target), aLen = arguments.length, index = 1, getSymbols = gOPS.f, isEnum = pIE.f; aLen > index; ) for (var key, S = IObject(arguments[index++]), keys = getSymbols ? getKeys(S).concat(getSymbols(S)) : getKeys(S), length = keys.length, j = 0; length > j; ) isEnum.call(S, key = keys[j++]) && (T[key] = S[key]);
-            return T;
-        } : $assign;
-    }, /* 105 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        exports.__esModule = !0, exports.default = function(obj, keys) {
-            var target = {};
-            for (var i in obj) keys.indexOf(i) >= 0 || Object.prototype.hasOwnProperty.call(obj, i) && (target[i] = obj[i]);
-            return target;
-        };
-    }, /* 106 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _extends2 = __webpack_require__(100), _extends3 = _interopRequireDefault(_extends2), _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2), _react = __webpack_require__(89), _react2 = _interopRequireDefault(_react), _classnames = __webpack_require__(107), _classnames2 = _interopRequireDefault(_classnames), _createCallbackMemoizer = __webpack_require__(108), _createCallbackMemoizer2 = _interopRequireDefault(_createCallbackMemoizer), _scrollbarSize = __webpack_require__(112), _scrollbarSize2 = _interopRequireDefault(_scrollbarSize), _reactAddonsShallowCompare = __webpack_require__(90), _reactAddonsShallowCompare2 = _interopRequireDefault(_reactAddonsShallowCompare), IS_SCROLLING_TIMEOUT = 150, SCROLL_POSITION_CHANGE_REASONS = {
-            OBSERVED: "observed",
-            REQUESTED: "requested"
-        }, CollectionView = function(_Component) {
-            function CollectionView(props, context) {
-                (0, _classCallCheck3.default)(this, CollectionView);
-                var _this = (0, _possibleConstructorReturn3.default)(this, (CollectionView.__proto__ || (0,
-                _getPrototypeOf2.default)(CollectionView)).call(this, props, context));
-                return _this.state = {
-                    calculateSizeAndPositionDataOnNextUpdate: !1,
-                    isScrolling: !1,
-                    scrollLeft: 0,
-                    scrollTop: 0
-                }, _this._onSectionRenderedMemoizer = (0, _createCallbackMemoizer2.default)(), _this._onScrollMemoizer = (0,
-                _createCallbackMemoizer2.default)(!1), _this._invokeOnSectionRenderedHelper = _this._invokeOnSectionRenderedHelper.bind(_this),
-                _this._onScroll = _this._onScroll.bind(_this), _this._updateScrollPositionForScrollToCell = _this._updateScrollPositionForScrollToCell.bind(_this),
-                _this;
-            }
-            return (0, _inherits3.default)(CollectionView, _Component), (0, _createClass3.default)(CollectionView, [ {
-                key: "recomputeCellSizesAndPositions",
-                value: function() {
-                    this.setState({
-                        calculateSizeAndPositionDataOnNextUpdate: !0
-                    });
-                }
-            }, {
-                key: "componentDidMount",
-                value: function() {
-                    var _props = this.props, cellLayoutManager = _props.cellLayoutManager, scrollLeft = _props.scrollLeft, scrollToCell = _props.scrollToCell, scrollTop = _props.scrollTop;
-                    this._scrollbarSizeMeasured || (this._scrollbarSize = (0, _scrollbarSize2.default)(),
-                    this._scrollbarSizeMeasured = !0, this.setState({})), scrollToCell >= 0 ? this._updateScrollPositionForScrollToCell() : (scrollLeft >= 0 || scrollTop >= 0) && this._setScrollPosition({
-                        scrollLeft: scrollLeft,
-                        scrollTop: scrollTop
-                    }), this._invokeOnSectionRenderedHelper();
-                    var _cellLayoutManager$ge = cellLayoutManager.getTotalSize(), totalHeight = _cellLayoutManager$ge.height, totalWidth = _cellLayoutManager$ge.width;
-                    this._invokeOnScrollMemoizer({
-                        scrollLeft: scrollLeft || 0,
-                        scrollTop: scrollTop || 0,
-                        totalHeight: totalHeight,
-                        totalWidth: totalWidth
-                    });
-                }
-            }, {
-                key: "componentDidUpdate",
-                value: function(prevProps, prevState) {
-                    var _props2 = this.props, height = _props2.height, scrollToAlignment = _props2.scrollToAlignment, scrollToCell = _props2.scrollToCell, width = _props2.width, _state = this.state, scrollLeft = _state.scrollLeft, scrollPositionChangeReason = _state.scrollPositionChangeReason, scrollTop = _state.scrollTop;
-                    scrollPositionChangeReason === SCROLL_POSITION_CHANGE_REASONS.REQUESTED && (scrollLeft >= 0 && scrollLeft !== prevState.scrollLeft && scrollLeft !== this._scrollingContainer.scrollLeft && (this._scrollingContainer.scrollLeft = scrollLeft),
-                    scrollTop >= 0 && scrollTop !== prevState.scrollTop && scrollTop !== this._scrollingContainer.scrollTop && (this._scrollingContainer.scrollTop = scrollTop)),
-                    height === prevProps.height && scrollToAlignment === prevProps.scrollToAlignment && scrollToCell === prevProps.scrollToCell && width === prevProps.width || this._updateScrollPositionForScrollToCell(),
-                    this._invokeOnSectionRenderedHelper();
-                }
-            }, {
-                key: "componentWillMount",
-                value: function() {
-                    var cellLayoutManager = this.props.cellLayoutManager;
-                    cellLayoutManager.calculateSizeAndPositionData(), this._scrollbarSize = (0, _scrollbarSize2.default)(),
-                    void 0 === this._scrollbarSize ? (this._scrollbarSizeMeasured = !1, this._scrollbarSize = 0) : this._scrollbarSizeMeasured = !0;
-                }
-            }, {
-                key: "componentWillUnmount",
-                value: function() {
-                    this._disablePointerEventsTimeoutId && clearTimeout(this._disablePointerEventsTimeoutId);
-                }
-            }, {
-                key: "componentWillUpdate",
-                value: function(nextProps, nextState) {
-                    0 !== nextProps.cellCount || 0 === nextState.scrollLeft && 0 === nextState.scrollTop ? nextProps.scrollLeft === this.props.scrollLeft && nextProps.scrollTop === this.props.scrollTop || this._setScrollPosition({
-                        scrollLeft: nextProps.scrollLeft,
-                        scrollTop: nextProps.scrollTop
-                    }) : this._setScrollPosition({
-                        scrollLeft: 0,
-                        scrollTop: 0
-                    }), (nextProps.cellCount !== this.props.cellCount || nextProps.cellLayoutManager !== this.props.cellLayoutManager || nextState.calculateSizeAndPositionDataOnNextUpdate) && nextProps.cellLayoutManager.calculateSizeAndPositionData(),
-                    nextState.calculateSizeAndPositionDataOnNextUpdate && this.setState({
-                        calculateSizeAndPositionDataOnNextUpdate: !1
-                    });
-                }
-            }, {
-                key: "render",
-                value: function() {
-                    var _this2 = this, _props3 = this.props, autoHeight = _props3.autoHeight, cellCount = _props3.cellCount, cellLayoutManager = _props3.cellLayoutManager, className = _props3.className, height = _props3.height, horizontalOverscanSize = _props3.horizontalOverscanSize, id = _props3.id, noContentRenderer = _props3.noContentRenderer, style = _props3.style, verticalOverscanSize = _props3.verticalOverscanSize, width = _props3.width, _state2 = this.state, isScrolling = _state2.isScrolling, scrollLeft = _state2.scrollLeft, scrollTop = _state2.scrollTop, _cellLayoutManager$ge2 = cellLayoutManager.getTotalSize(), totalHeight = _cellLayoutManager$ge2.height, totalWidth = _cellLayoutManager$ge2.width, left = Math.max(0, scrollLeft - horizontalOverscanSize), top = Math.max(0, scrollTop - verticalOverscanSize), right = Math.min(totalWidth, scrollLeft + width + horizontalOverscanSize), bottom = Math.min(totalHeight, scrollTop + height + verticalOverscanSize), childrenToDisplay = height > 0 && width > 0 ? cellLayoutManager.cellRenderers({
-                        height: bottom - top,
-                        isScrolling: isScrolling,
-                        width: right - left,
-                        x: left,
-                        y: top
-                    }) : [], collectionStyle = {
-                        boxSizing: "border-box",
-                        height: autoHeight ? "auto" : height,
-                        overflow: "auto",
-                        position: "relative",
-                        WebkitOverflowScrolling: "touch",
-                        width: width,
-                        willChange: "transform"
-                    }, verticalScrollBarSize = totalHeight > height ? this._scrollbarSize : 0, horizontalScrollBarSize = totalWidth > width ? this._scrollbarSize : 0;
-                    return totalWidth + verticalScrollBarSize <= width && (collectionStyle.overflowX = "hidden"),
-                    totalHeight + horizontalScrollBarSize <= height && (collectionStyle.overflowY = "hidden"),
-                    _react2.default.createElement("div", {
-                        ref: function(_ref) {
-                            _this2._scrollingContainer = _ref;
-                        },
-                        "aria-label": this.props["aria-label"],
-                        className: (0, _classnames2.default)("ReactVirtualized__Collection", className),
-                        id: id,
-                        onScroll: this._onScroll,
-                        role: "grid",
-                        style: (0, _extends3.default)({}, collectionStyle, style),
-                        tabIndex: 0
-                    }, cellCount > 0 && _react2.default.createElement("div", {
-                        className: "ReactVirtualized__Collection__innerScrollContainer",
-                        style: {
-                            height: totalHeight,
-                            maxHeight: totalHeight,
-                            maxWidth: totalWidth,
-                            overflow: "hidden",
-                            pointerEvents: isScrolling ? "none" : "",
-                            width: totalWidth
-                        }
-                    }, childrenToDisplay), 0 === cellCount && noContentRenderer());
-                }
-            }, {
-                key: "shouldComponentUpdate",
-                value: function(nextProps, nextState) {
-                    return (0, _reactAddonsShallowCompare2.default)(this, nextProps, nextState);
-                }
-            }, {
-                key: "_enablePointerEventsAfterDelay",
-                value: function() {
-                    var _this3 = this;
-                    this._disablePointerEventsTimeoutId && clearTimeout(this._disablePointerEventsTimeoutId),
-                    this._disablePointerEventsTimeoutId = setTimeout(function() {
-                        var isScrollingChange = _this3.props.isScrollingChange;
-                        isScrollingChange(!1), _this3._disablePointerEventsTimeoutId = null, _this3.setState({
-                            isScrolling: !1
-                        });
-                    }, IS_SCROLLING_TIMEOUT);
-                }
-            }, {
-                key: "_invokeOnSectionRenderedHelper",
-                value: function() {
-                    var _props4 = this.props, cellLayoutManager = _props4.cellLayoutManager, onSectionRendered = _props4.onSectionRendered;
-                    this._onSectionRenderedMemoizer({
-                        callback: onSectionRendered,
-                        indices: {
-                            indices: cellLayoutManager.getLastRenderedIndices()
-                        }
-                    });
-                }
-            }, {
-                key: "_invokeOnScrollMemoizer",
-                value: function(_ref2) {
-                    var _this4 = this, scrollLeft = _ref2.scrollLeft, scrollTop = _ref2.scrollTop, totalHeight = _ref2.totalHeight, totalWidth = _ref2.totalWidth;
-                    this._onScrollMemoizer({
-                        callback: function(_ref3) {
-                            var scrollLeft = _ref3.scrollLeft, scrollTop = _ref3.scrollTop, _props5 = _this4.props, height = _props5.height, onScroll = _props5.onScroll, width = _props5.width;
-                            onScroll({
-                                clientHeight: height,
-                                clientWidth: width,
-                                scrollHeight: totalHeight,
-                                scrollLeft: scrollLeft,
-                                scrollTop: scrollTop,
-                                scrollWidth: totalWidth
-                            });
-                        },
-                        indices: {
-                            scrollLeft: scrollLeft,
-                            scrollTop: scrollTop
-                        }
-                    });
-                }
-            }, {
-                key: "_setScrollPosition",
-                value: function(_ref4) {
-                    var scrollLeft = _ref4.scrollLeft, scrollTop = _ref4.scrollTop, newState = {
-                        scrollPositionChangeReason: SCROLL_POSITION_CHANGE_REASONS.REQUESTED
-                    };
-                    scrollLeft >= 0 && (newState.scrollLeft = scrollLeft), scrollTop >= 0 && (newState.scrollTop = scrollTop),
-                    (scrollLeft >= 0 && scrollLeft !== this.state.scrollLeft || scrollTop >= 0 && scrollTop !== this.state.scrollTop) && this.setState(newState);
-                }
-            }, {
-                key: "_updateScrollPositionForScrollToCell",
-                value: function() {
-                    var _props6 = this.props, cellLayoutManager = _props6.cellLayoutManager, height = _props6.height, scrollToAlignment = _props6.scrollToAlignment, scrollToCell = _props6.scrollToCell, width = _props6.width, _state3 = this.state, scrollLeft = _state3.scrollLeft, scrollTop = _state3.scrollTop;
-                    if (scrollToCell >= 0) {
-                        var scrollPosition = cellLayoutManager.getScrollPositionForCell({
-                            align: scrollToAlignment,
-                            cellIndex: scrollToCell,
-                            height: height,
-                            scrollLeft: scrollLeft,
-                            scrollTop: scrollTop,
-                            width: width
-                        });
-                        scrollPosition.scrollLeft === scrollLeft && scrollPosition.scrollTop === scrollTop || this._setScrollPosition(scrollPosition);
-                    }
-                }
-            }, {
-                key: "_onScroll",
-                value: function(event) {
-                    if (event.target === this._scrollingContainer) {
-                        this._enablePointerEventsAfterDelay();
-                        var _props7 = this.props, cellLayoutManager = _props7.cellLayoutManager, height = _props7.height, isScrollingChange = _props7.isScrollingChange, width = _props7.width, scrollbarSize = this._scrollbarSize, _cellLayoutManager$ge3 = cellLayoutManager.getTotalSize(), totalHeight = _cellLayoutManager$ge3.height, totalWidth = _cellLayoutManager$ge3.width, scrollLeft = Math.max(0, Math.min(totalWidth - width + scrollbarSize, event.target.scrollLeft)), scrollTop = Math.max(0, Math.min(totalHeight - height + scrollbarSize, event.target.scrollTop));
-                        if (this.state.scrollLeft !== scrollLeft || this.state.scrollTop !== scrollTop) {
-                            var scrollPositionChangeReason = event.cancelable ? SCROLL_POSITION_CHANGE_REASONS.OBSERVED : SCROLL_POSITION_CHANGE_REASONS.REQUESTED;
-                            this.state.isScrolling || isScrollingChange(!0), this.setState({
-                                isScrolling: !0,
-                                scrollLeft: scrollLeft,
-                                scrollPositionChangeReason: scrollPositionChangeReason,
-                                scrollTop: scrollTop
-                            });
-                        }
-                        this._invokeOnScrollMemoizer({
-                            scrollLeft: scrollLeft,
-                            scrollTop: scrollTop,
-                            totalWidth: totalWidth,
-                            totalHeight: totalHeight
-                        });
-                    }
-                }
-            } ]), CollectionView;
-        }(_react.Component);
-        CollectionView.defaultProps = {
-            "aria-label": "grid",
-            horizontalOverscanSize: 0,
-            noContentRenderer: function() {
-                return null;
-            },
-            onScroll: function() {
-                return null;
-            },
-            onSectionRendered: function() {
-                return null;
-            },
-            scrollToAlignment: "auto",
-            style: {},
-            verticalOverscanSize: 0
-        }, exports.default = CollectionView;
-    }, /* 107 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;
-        /*!
-	  Copyright (c) 2016 Jed Watson.
-	  Licensed under the MIT License (MIT), see
-	  http://jedwatson.github.io/classnames
-	*/
-        /* global define */
-        !function() {
-            "use strict";
-            function classNames() {
-                for (var classes = [], i = 0; i < arguments.length; i++) {
-                    var arg = arguments[i];
-                    if (arg) {
-                        var argType = typeof arg;
-                        if ("string" === argType || "number" === argType) classes.push(arg); else if (Array.isArray(arg)) classes.push(classNames.apply(null, arg)); else if ("object" === argType) for (var key in arg) hasOwn.call(arg, key) && arg[key] && classes.push(key);
-                    }
-                }
-                return classes.join(" ");
-            }
-            var hasOwn = {}.hasOwnProperty;
-            "undefined" != typeof module && module.exports ? module.exports = classNames : (__WEBPACK_AMD_DEFINE_ARRAY__ = [],
-            __WEBPACK_AMD_DEFINE_RESULT__ = function() {
-                return classNames;
-            }.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__), // register as 'classnames', consistent with npm package name
-            !(void 0 !== __WEBPACK_AMD_DEFINE_RESULT__ && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)));
-        }();
-    }, /* 108 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        function createCallbackMemoizer() {
-            var requireAllKeys = !(arguments.length > 0 && void 0 !== arguments[0]) || arguments[0], cachedIndices = {};
-            return function(_ref) {
-                var callback = _ref.callback, indices = _ref.indices, keys = (0, _keys2.default)(indices), allInitialized = !requireAllKeys || keys.every(function(key) {
-                    var value = indices[key];
-                    return Array.isArray(value) ? value.length > 0 : value >= 0;
-                }), indexChanged = keys.length !== (0, _keys2.default)(cachedIndices).length || keys.some(function(key) {
-                    var cachedValue = cachedIndices[key], value = indices[key];
-                    return Array.isArray(value) ? cachedValue.join(",") !== value.join(",") : cachedValue !== value;
-                });
-                cachedIndices = indices, allInitialized && indexChanged && callback(indices);
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _keys = __webpack_require__(109), _keys2 = _interopRequireDefault(_keys);
-        exports.default = createCallbackMemoizer;
-    }, /* 109 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        module.exports = {
-            default: __webpack_require__(110),
-            __esModule: !0
-        };
-    }, /* 110 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        __webpack_require__(111), module.exports = __webpack_require__(16).Object.keys;
-    }, /* 111 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        // 19.1.2.14 Object.keys(O)
-        var toObject = __webpack_require__(6), $keys = __webpack_require__(48);
-        __webpack_require__(14)("keys", function() {
-            return function(it) {
-                return $keys(toObject(it));
-            };
-        });
-    }, /* 112 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        var size, canUseDOM = __webpack_require__(113);
-        module.exports = function(recalc) {
-            if ((!size || recalc) && canUseDOM) {
-                var scrollDiv = document.createElementNS("http://www.w3.org/1999/xhtml","div");
-                scrollDiv.style.position = "absolute", scrollDiv.style.top = "-9999px", scrollDiv.style.width = "50px",
-                scrollDiv.style.height = "50px", scrollDiv.style.overflow = "scroll", document.firstElementChild.appendChild(scrollDiv),
-                size = scrollDiv.offsetWidth - scrollDiv.clientWidth, document.firstElementChild.removeChild(scrollDiv);
-            }
-            return size;
-        };
-    }, /* 113 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        module.exports = !("undefined" == typeof window || !window.document || !window.document.createElement);
-    }, /* 114 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        function calculateSizeAndPositionData(_ref) {
-            for (var cellCount = _ref.cellCount, cellSizeAndPositionGetter = _ref.cellSizeAndPositionGetter, sectionSize = _ref.sectionSize, cellMetadata = [], sectionManager = new _SectionManager2.default(sectionSize), height = 0, width = 0, index = 0; index < cellCount; index++) {
-                var cellMetadatum = cellSizeAndPositionGetter({
-                    index: index
-                });
-                if (null == cellMetadatum.height || isNaN(cellMetadatum.height) || null == cellMetadatum.width || isNaN(cellMetadatum.width) || null == cellMetadatum.x || isNaN(cellMetadatum.x) || null == cellMetadatum.y || isNaN(cellMetadatum.y)) throw Error("Invalid metadata returned for cell " + index + ":\n        x:" + cellMetadatum.x + ", y:" + cellMetadatum.y + ", width:" + cellMetadatum.width + ", height:" + cellMetadatum.height);
-                height = Math.max(height, cellMetadatum.y + cellMetadatum.height), width = Math.max(width, cellMetadatum.x + cellMetadatum.width),
-                cellMetadata[index] = cellMetadatum, sectionManager.registerCell({
-                    cellMetadatum: cellMetadatum,
-                    index: index
-                });
-            }
-            return {
-                cellMetadata: cellMetadata,
-                height: height,
-                sectionManager: sectionManager,
-                width: width
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.default = calculateSizeAndPositionData;
-        var _SectionManager = __webpack_require__(115), _SectionManager2 = _interopRequireDefault(_SectionManager);
-    }, /* 115 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _keys = __webpack_require__(109), _keys2 = _interopRequireDefault(_keys), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _Section = __webpack_require__(116), _Section2 = _interopRequireDefault(_Section), SECTION_SIZE = 100, SectionManager = function() {
-            function SectionManager() {
-                var sectionSize = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : SECTION_SIZE;
-                (0, _classCallCheck3.default)(this, SectionManager), this._sectionSize = sectionSize,
-                this._cellMetadata = [], this._sections = {};
-            }
-            return (0, _createClass3.default)(SectionManager, [ {
-                key: "getCellIndices",
-                value: function(_ref) {
-                    var height = _ref.height, width = _ref.width, x = _ref.x, y = _ref.y, indices = {};
-                    return this.getSections({
-                        height: height,
-                        width: width,
-                        x: x,
-                        y: y
-                    }).forEach(function(section) {
-                        return section.getCellIndices().forEach(function(index) {
-                            indices[index] = index;
-                        });
-                    }), (0, _keys2.default)(indices).map(function(index) {
-                        return indices[index];
-                    });
-                }
-            }, {
-                key: "getCellMetadata",
-                value: function(_ref2) {
-                    var index = _ref2.index;
-                    return this._cellMetadata[index];
-                }
-            }, {
-                key: "getSections",
-                value: function(_ref3) {
-                    for (var height = _ref3.height, width = _ref3.width, x = _ref3.x, y = _ref3.y, sectionXStart = Math.floor(x / this._sectionSize), sectionXStop = Math.floor((x + width - 1) / this._sectionSize), sectionYStart = Math.floor(y / this._sectionSize), sectionYStop = Math.floor((y + height - 1) / this._sectionSize), sections = [], sectionX = sectionXStart; sectionX <= sectionXStop; sectionX++) for (var sectionY = sectionYStart; sectionY <= sectionYStop; sectionY++) {
-                        var key = sectionX + "." + sectionY;
-                        this._sections[key] || (this._sections[key] = new _Section2.default({
-                            height: this._sectionSize,
-                            width: this._sectionSize,
-                            x: sectionX * this._sectionSize,
-                            y: sectionY * this._sectionSize
-                        })), sections.push(this._sections[key]);
-                    }
-                    return sections;
-                }
-            }, {
-                key: "getTotalSectionCount",
-                value: function() {
-                    return (0, _keys2.default)(this._sections).length;
-                }
-            }, {
-                key: "toString",
-                value: function() {
-                    var _this = this;
-                    return (0, _keys2.default)(this._sections).map(function(index) {
-                        return _this._sections[index].toString();
-                    });
-                }
-            }, {
-                key: "registerCell",
-                value: function(_ref4) {
-                    var cellMetadatum = _ref4.cellMetadatum, index = _ref4.index;
-                    this._cellMetadata[index] = cellMetadatum, this.getSections(cellMetadatum).forEach(function(section) {
-                        return section.addCellIndex({
-                            index: index
-                        });
-                    });
-                }
-            } ]), SectionManager;
-        }();
-        exports.default = SectionManager;
-    }, /* 116 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), Section = function() {
-            function Section(_ref) {
-                var height = _ref.height, width = _ref.width, x = _ref.x, y = _ref.y;
-                (0, _classCallCheck3.default)(this, Section), this.height = height, this.width = width,
-                this.x = x, this.y = y, this._indexMap = {}, this._indices = [];
-            }
-            return (0, _createClass3.default)(Section, [ {
-                key: "addCellIndex",
-                value: function(_ref2) {
-                    var index = _ref2.index;
-                    this._indexMap[index] || (this._indexMap[index] = !0, this._indices.push(index));
-                }
-            }, {
-                key: "getCellIndices",
-                value: function() {
-                    return this._indices;
-                }
-            }, {
-                key: "toString",
-                value: function() {
-                    return this.x + "," + this.y + " " + this.width + "x" + this.height;
-                }
-            } ]), Section;
-        }();
-        exports.default = Section;
-    }, /* 117 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        function getUpdatedOffsetForIndex(_ref) {
-            var _ref$align = _ref.align, align = void 0 === _ref$align ? "auto" : _ref$align, cellOffset = _ref.cellOffset, cellSize = _ref.cellSize, containerSize = _ref.containerSize, currentOffset = _ref.currentOffset, maxOffset = cellOffset, minOffset = maxOffset - containerSize + cellSize;
-            switch (align) {
-              case "start":
-                return maxOffset;
-
-              case "end":
-                return minOffset;
-
-              case "center":
-                return maxOffset - (containerSize - cellSize) / 2;
-
-              default:
-                return Math.max(minOffset, Math.min(maxOffset, currentOffset));
-            }
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.default = getUpdatedOffsetForIndex;
-    }, /* 118 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.ColumnSizer = exports.default = void 0;
-        var _ColumnSizer2 = __webpack_require__(119), _ColumnSizer3 = _interopRequireDefault(_ColumnSizer2);
-        exports.default = _ColumnSizer3.default, exports.ColumnSizer = _ColumnSizer3.default;
-    }, /* 119 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2), _react = __webpack_require__(89), _reactAddonsShallowCompare = __webpack_require__(90), _reactAddonsShallowCompare2 = _interopRequireDefault(_reactAddonsShallowCompare), _Grid = __webpack_require__(120), _Grid2 = _interopRequireDefault(_Grid), ColumnSizer = function(_Component) {
-            function ColumnSizer(props, context) {
-                (0, _classCallCheck3.default)(this, ColumnSizer);
-                var _this = (0, _possibleConstructorReturn3.default)(this, (ColumnSizer.__proto__ || (0,
-                _getPrototypeOf2.default)(ColumnSizer)).call(this, props, context));
-                return _this._registerChild = _this._registerChild.bind(_this), _this;
-            }
-            return (0, _inherits3.default)(ColumnSizer, _Component), (0, _createClass3.default)(ColumnSizer, [ {
-                key: "componentDidUpdate",
-                value: function(prevProps, prevState) {
-                    var _props = this.props, columnMaxWidth = _props.columnMaxWidth, columnMinWidth = _props.columnMinWidth, columnCount = _props.columnCount, width = _props.width;
-                    columnMaxWidth === prevProps.columnMaxWidth && columnMinWidth === prevProps.columnMinWidth && columnCount === prevProps.columnCount && width === prevProps.width || this._registeredChild && this._registeredChild.recomputeGridSize();
-                }
-            }, {
-                key: "render",
-                value: function() {
-                    var _props2 = this.props, children = _props2.children, columnMaxWidth = _props2.columnMaxWidth, columnMinWidth = _props2.columnMinWidth, columnCount = _props2.columnCount, width = _props2.width, safeColumnMinWidth = columnMinWidth || 1, safeColumnMaxWidth = columnMaxWidth ? Math.min(columnMaxWidth, width) : width, columnWidth = width / columnCount;
-                    columnWidth = Math.max(safeColumnMinWidth, columnWidth), columnWidth = Math.min(safeColumnMaxWidth, columnWidth),
-                    columnWidth = Math.floor(columnWidth);
-                    var adjustedWidth = Math.min(width, columnWidth * columnCount);
-                    return children({
-                        adjustedWidth: adjustedWidth,
-                        getColumnWidth: function() {
-                            return columnWidth;
-                        },
-                        registerChild: this._registerChild
-                    });
-                }
-            }, {
-                key: "shouldComponentUpdate",
-                value: function(nextProps, nextState) {
-                    return (0, _reactAddonsShallowCompare2.default)(this, nextProps, nextState);
-                }
-            }, {
-                key: "_registerChild",
-                value: function(child) {
-                    if (null !== child && !(child instanceof _Grid2.default)) throw Error("Unexpected child type registered; only Grid children are supported.");
-                    this._registeredChild = child, this._registeredChild && this._registeredChild.recomputeGridSize();
-                }
-            } ]), ColumnSizer;
-        }(_react.Component);
-        exports.default = ColumnSizer;
-    }, /* 120 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.defaultCellRangeRenderer = exports.Grid = exports.default = void 0;
-        var _Grid2 = __webpack_require__(121), _Grid3 = _interopRequireDefault(_Grid2), _defaultCellRangeRenderer2 = __webpack_require__(127), _defaultCellRangeRenderer3 = _interopRequireDefault(_defaultCellRangeRenderer2);
-        exports.default = _Grid3.default, exports.Grid = _Grid3.default, exports.defaultCellRangeRenderer = _defaultCellRangeRenderer3.default;
-    }, /* 121 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.DEFAULT_SCROLLING_RESET_TIME_INTERVAL = void 0;
-        var _extends2 = __webpack_require__(100), _extends3 = _interopRequireDefault(_extends2), _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2), _react = __webpack_require__(89), _react2 = _interopRequireDefault(_react), _classnames = __webpack_require__(107), _classnames2 = _interopRequireDefault(_classnames), _calculateSizeAndPositionDataAndUpdateScrollOffset = __webpack_require__(122), _calculateSizeAndPositionDataAndUpdateScrollOffset2 = _interopRequireDefault(_calculateSizeAndPositionDataAndUpdateScrollOffset), _ScalingCellSizeAndPositionManager = __webpack_require__(123), _ScalingCellSizeAndPositionManager2 = _interopRequireDefault(_ScalingCellSizeAndPositionManager), _createCallbackMemoizer = __webpack_require__(108), _createCallbackMemoizer2 = _interopRequireDefault(_createCallbackMemoizer), _getOverscanIndices = __webpack_require__(125), _getOverscanIndices2 = _interopRequireDefault(_getOverscanIndices), _scrollbarSize = __webpack_require__(112), _scrollbarSize2 = _interopRequireDefault(_scrollbarSize), _reactAddonsShallowCompare = __webpack_require__(90), _reactAddonsShallowCompare2 = _interopRequireDefault(_reactAddonsShallowCompare), _updateScrollIndexHelper = __webpack_require__(126), _updateScrollIndexHelper2 = _interopRequireDefault(_updateScrollIndexHelper), _defaultCellRangeRenderer = __webpack_require__(127), _defaultCellRangeRenderer2 = _interopRequireDefault(_defaultCellRangeRenderer), DEFAULT_SCROLLING_RESET_TIME_INTERVAL = exports.DEFAULT_SCROLLING_RESET_TIME_INTERVAL = 150, SCROLL_POSITION_CHANGE_REASONS = {
-            OBSERVED: "observed",
-            REQUESTED: "requested"
-        }, Grid = function(_Component) {
-            function Grid(props, context) {
-                (0, _classCallCheck3.default)(this, Grid);
-                var _this = (0, _possibleConstructorReturn3.default)(this, (Grid.__proto__ || (0,
-                _getPrototypeOf2.default)(Grid)).call(this, props, context));
-                return _this.state = {
-                    isScrolling: !1,
-                    scrollDirectionHorizontal: _getOverscanIndices.SCROLL_DIRECTION_FIXED,
-                    scrollDirectionVertical: _getOverscanIndices.SCROLL_DIRECTION_FIXED,
-                    scrollLeft: 0,
-                    scrollTop: 0
-                }, _this._onGridRenderedMemoizer = (0, _createCallbackMemoizer2.default)(), _this._onScrollMemoizer = (0,
-                _createCallbackMemoizer2.default)(!1), _this._enablePointerEventsAfterDelayCallback = _this._enablePointerEventsAfterDelayCallback.bind(_this),
-                _this._invokeOnGridRenderedHelper = _this._invokeOnGridRenderedHelper.bind(_this),
-                _this._onScroll = _this._onScroll.bind(_this), _this._updateScrollLeftForScrollToColumn = _this._updateScrollLeftForScrollToColumn.bind(_this),
-                _this._updateScrollTopForScrollToRow = _this._updateScrollTopForScrollToRow.bind(_this),
-                _this._columnWidthGetter = _this._wrapSizeGetter(props.columnWidth), _this._rowHeightGetter = _this._wrapSizeGetter(props.rowHeight),
-                _this._columnSizeAndPositionManager = new _ScalingCellSizeAndPositionManager2.default({
-                    cellCount: props.columnCount,
-                    cellSizeGetter: function(index) {
-                        return _this._columnWidthGetter(index);
-                    },
-                    estimatedCellSize: _this._getEstimatedColumnSize(props)
-                }), _this._rowSizeAndPositionManager = new _ScalingCellSizeAndPositionManager2.default({
-                    cellCount: props.rowCount,
-                    cellSizeGetter: function(index) {
-                        return _this._rowHeightGetter(index);
-                    },
-                    estimatedCellSize: _this._getEstimatedRowSize(props)
-                }), _this._cellCache = {}, _this;
-            }
-            return (0, _inherits3.default)(Grid, _Component), (0, _createClass3.default)(Grid, [ {
-                key: "measureAllCells",
-                value: function() {
-                    var _props = this.props, columnCount = _props.columnCount, rowCount = _props.rowCount;
-                    this._columnSizeAndPositionManager.getSizeAndPositionOfCell(columnCount - 1), this._rowSizeAndPositionManager.getSizeAndPositionOfCell(rowCount - 1);
-                }
-            }, {
-                key: "recomputeGridSize",
-                value: function() {
-                    var _ref = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {}, _ref$columnIndex = _ref.columnIndex, columnIndex = void 0 === _ref$columnIndex ? 0 : _ref$columnIndex, _ref$rowIndex = _ref.rowIndex, rowIndex = void 0 === _ref$rowIndex ? 0 : _ref$rowIndex;
-                    this._columnSizeAndPositionManager.resetCell(columnIndex), this._rowSizeAndPositionManager.resetCell(rowIndex),
-                    this._cellCache = {}, this.forceUpdate();
-                }
-            }, {
-                key: "componentDidMount",
-                value: function() {
-                    var _props2 = this.props, scrollLeft = _props2.scrollLeft, scrollToColumn = _props2.scrollToColumn, scrollTop = _props2.scrollTop, scrollToRow = _props2.scrollToRow;
-                    this._scrollbarSizeMeasured || (this._scrollbarSize = (0, _scrollbarSize2.default)(),
-                    this._scrollbarSizeMeasured = !0, this.setState({})), (scrollLeft >= 0 || scrollTop >= 0) && this._setScrollPosition({
-                        scrollLeft: scrollLeft,
-                        scrollTop: scrollTop
-                    }), (scrollToColumn >= 0 || scrollToRow >= 0) && (this._updateScrollLeftForScrollToColumn(),
-                    this._updateScrollTopForScrollToRow()), this._invokeOnGridRenderedHelper(), this._invokeOnScrollMemoizer({
-                        scrollLeft: scrollLeft || 0,
-                        scrollTop: scrollTop || 0,
-                        totalColumnsWidth: this._columnSizeAndPositionManager.getTotalSize(),
-                        totalRowsHeight: this._rowSizeAndPositionManager.getTotalSize()
-                    });
-                }
-            }, {
-                key: "componentDidUpdate",
-                value: function(prevProps, prevState) {
-                    var _this2 = this, _props3 = this.props, autoHeight = _props3.autoHeight, columnCount = _props3.columnCount, height = _props3.height, rowCount = _props3.rowCount, scrollToAlignment = _props3.scrollToAlignment, scrollToColumn = _props3.scrollToColumn, scrollToRow = _props3.scrollToRow, width = _props3.width, _state = this.state, scrollLeft = _state.scrollLeft, scrollPositionChangeReason = _state.scrollPositionChangeReason, scrollTop = _state.scrollTop, columnOrRowCountJustIncreasedFromZero = columnCount > 0 && 0 === prevProps.columnCount || rowCount > 0 && 0 === prevProps.rowCount;
-                    if (scrollPositionChangeReason === SCROLL_POSITION_CHANGE_REASONS.REQUESTED && (scrollLeft >= 0 && (scrollLeft !== prevState.scrollLeft && scrollLeft !== this._scrollingContainer.scrollLeft || columnOrRowCountJustIncreasedFromZero) && (this._scrollingContainer.scrollLeft = scrollLeft),
-                    !autoHeight && scrollTop >= 0 && (scrollTop !== prevState.scrollTop && scrollTop !== this._scrollingContainer.scrollTop || columnOrRowCountJustIncreasedFromZero) && (this._scrollingContainer.scrollTop = scrollTop)),
-                    (0, _updateScrollIndexHelper2.default)({
-                        cellSizeAndPositionManager: this._columnSizeAndPositionManager,
-                        previousCellsCount: prevProps.columnCount,
-                        previousCellSize: prevProps.columnWidth,
-                        previousScrollToAlignment: prevProps.scrollToAlignment,
-                        previousScrollToIndex: prevProps.scrollToColumn,
-                        previousSize: prevProps.width,
-                        scrollOffset: scrollLeft,
-                        scrollToAlignment: scrollToAlignment,
-                        scrollToIndex: scrollToColumn,
-                        size: width,
-                        updateScrollIndexCallback: function(scrollToColumn) {
-                            return _this2._updateScrollLeftForScrollToColumn((0, _extends3.default)({}, _this2.props, {
-                                scrollToColumn: scrollToColumn
-                            }));
-                        }
-                    }), (0, _updateScrollIndexHelper2.default)({
-                        cellSizeAndPositionManager: this._rowSizeAndPositionManager,
-                        previousCellsCount: prevProps.rowCount,
-                        previousCellSize: prevProps.rowHeight,
-                        previousScrollToAlignment: prevProps.scrollToAlignment,
-                        previousScrollToIndex: prevProps.scrollToRow,
-                        previousSize: prevProps.height,
-                        scrollOffset: scrollTop,
-                        scrollToAlignment: scrollToAlignment,
-                        scrollToIndex: scrollToRow,
-                        size: height,
-                        updateScrollIndexCallback: function(scrollToRow) {
-                            return _this2._updateScrollTopForScrollToRow((0, _extends3.default)({}, _this2.props, {
-                                scrollToRow: scrollToRow
-                            }));
-                        }
-                    }), this._invokeOnGridRenderedHelper(), scrollLeft !== prevState.scrollLeft || scrollTop !== prevState.scrollTop) {
-                        var totalRowsHeight = this._rowSizeAndPositionManager.getTotalSize(), totalColumnsWidth = this._columnSizeAndPositionManager.getTotalSize();
-                        this._invokeOnScrollMemoizer({
-                            scrollLeft: scrollLeft,
-                            scrollTop: scrollTop,
-                            totalColumnsWidth: totalColumnsWidth,
-                            totalRowsHeight: totalRowsHeight
-                        });
-                    }
-                }
-            }, {
-                key: "componentWillMount",
-                value: function() {
-                    this._scrollbarSize = (0, _scrollbarSize2.default)(), void 0 === this._scrollbarSize ? (this._scrollbarSizeMeasured = !1,
-                    this._scrollbarSize = 0) : this._scrollbarSizeMeasured = !0, this._calculateChildrenToRender();
-                }
-            }, {
-                key: "componentWillUnmount",
-                value: function() {
-                    this._disablePointerEventsTimeoutId && clearTimeout(this._disablePointerEventsTimeoutId);
-                }
-            }, {
-                key: "componentWillUpdate",
-                value: function(nextProps, nextState) {
-                    var _this3 = this;
-                    0 === nextProps.columnCount && 0 !== nextState.scrollLeft || 0 === nextProps.rowCount && 0 !== nextState.scrollTop ? this._setScrollPosition({
-                        scrollLeft: 0,
-                        scrollTop: 0
-                    }) : nextProps.scrollLeft === this.props.scrollLeft && nextProps.scrollTop === this.props.scrollTop || this._setScrollPosition({
-                        scrollLeft: nextProps.scrollLeft,
-                        scrollTop: nextProps.scrollTop
-                    }), this._columnWidthGetter = this._wrapSizeGetter(nextProps.columnWidth), this._rowHeightGetter = this._wrapSizeGetter(nextProps.rowHeight),
-                    this._columnSizeAndPositionManager.configure({
-                        cellCount: nextProps.columnCount,
-                        estimatedCellSize: this._getEstimatedColumnSize(nextProps)
-                    }), this._rowSizeAndPositionManager.configure({
-                        cellCount: nextProps.rowCount,
-                        estimatedCellSize: this._getEstimatedRowSize(nextProps)
-                    }), (0, _calculateSizeAndPositionDataAndUpdateScrollOffset2.default)({
-                        cellCount: this.props.columnCount,
-                        cellSize: this.props.columnWidth,
-                        computeMetadataCallback: function() {
-                            return _this3._columnSizeAndPositionManager.resetCell(0);
-                        },
-                        computeMetadataCallbackProps: nextProps,
-                        nextCellsCount: nextProps.columnCount,
-                        nextCellSize: nextProps.columnWidth,
-                        nextScrollToIndex: nextProps.scrollToColumn,
-                        scrollToIndex: this.props.scrollToColumn,
-                        updateScrollOffsetForScrollToIndex: function() {
-                            return _this3._updateScrollLeftForScrollToColumn(nextProps, nextState);
-                        }
-                    }), (0, _calculateSizeAndPositionDataAndUpdateScrollOffset2.default)({
-                        cellCount: this.props.rowCount,
-                        cellSize: this.props.rowHeight,
-                        computeMetadataCallback: function() {
-                            return _this3._rowSizeAndPositionManager.resetCell(0);
-                        },
-                        computeMetadataCallbackProps: nextProps,
-                        nextCellsCount: nextProps.rowCount,
-                        nextCellSize: nextProps.rowHeight,
-                        nextScrollToIndex: nextProps.scrollToRow,
-                        scrollToIndex: this.props.scrollToRow,
-                        updateScrollOffsetForScrollToIndex: function() {
-                            return _this3._updateScrollTopForScrollToRow(nextProps, nextState);
-                        }
-                    }), this._calculateChildrenToRender(nextProps, nextState);
-                }
-            }, {
-                key: "render",
-                value: function() {
-                    var _this4 = this, _props4 = this.props, autoContainerWidth = _props4.autoContainerWidth, autoHeight = _props4.autoHeight, className = _props4.className, containerStyle = _props4.containerStyle, height = _props4.height, id = _props4.id, noContentRenderer = _props4.noContentRenderer, style = _props4.style, tabIndex = _props4.tabIndex, width = _props4.width, isScrolling = this.state.isScrolling, gridStyle = {
-                        boxSizing: "border-box",
-                        height: autoHeight ? "auto" : height,
-                        position: "relative",
-                        width: width,
-                        WebkitOverflowScrolling: "touch",
-                        willChange: "transform"
-                    }, totalColumnsWidth = this._columnSizeAndPositionManager.getTotalSize(), totalRowsHeight = this._rowSizeAndPositionManager.getTotalSize(), verticalScrollBarSize = totalRowsHeight > height ? this._scrollbarSize : 0, horizontalScrollBarSize = totalColumnsWidth > width ? this._scrollbarSize : 0;
-                    gridStyle.overflowX = totalColumnsWidth + verticalScrollBarSize <= width ? "hidden" : "auto",
-                    gridStyle.overflowY = totalRowsHeight + horizontalScrollBarSize <= height ? "hidden" : "auto";
-                    var childrenToDisplay = this._childrenToDisplay, showNoContentRenderer = 0 === childrenToDisplay.length && height > 0 && width > 0;
-                    return _react2.default.createElement("div", {
-                        ref: function(_ref2) {
-                            _this4._scrollingContainer = _ref2;
-                        },
-                        "aria-label": this.props["aria-label"],
-                        className: (0, _classnames2.default)("ReactVirtualized__Grid", className),
-                        id: id,
-                        onScroll: this._onScroll,
-                        role: "grid",
-                        style: (0, _extends3.default)({}, gridStyle, style),
-                        tabIndex: tabIndex
-                    }, childrenToDisplay.length > 0 && _react2.default.createElement("div", {
-                        className: "ReactVirtualized__Grid__innerScrollContainer",
-                        style: (0, _extends3.default)({
-                            width: autoContainerWidth ? "auto" : totalColumnsWidth,
-                            height: totalRowsHeight,
-                            maxWidth: totalColumnsWidth,
-                            maxHeight: totalRowsHeight,
-                            overflow: "hidden",
-                            pointerEvents: isScrolling ? "none" : ""
-                        }, containerStyle)
-                    }, childrenToDisplay), showNoContentRenderer && noContentRenderer());
-                }
-            }, {
-                key: "shouldComponentUpdate",
-                value: function(nextProps, nextState) {
-                    return (0, _reactAddonsShallowCompare2.default)(this, nextProps, nextState);
-                }
-            }, {
-                key: "_calculateChildrenToRender",
-                value: function() {
-                    var props = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : this.props, state = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : this.state, cellRenderer = props.cellRenderer, cellRangeRenderer = props.cellRangeRenderer, columnCount = props.columnCount, height = props.height, overscanColumnCount = props.overscanColumnCount, overscanRowCount = props.overscanRowCount, rowCount = props.rowCount, width = props.width, isScrolling = state.isScrolling, scrollDirectionHorizontal = state.scrollDirectionHorizontal, scrollDirectionVertical = state.scrollDirectionVertical, scrollLeft = state.scrollLeft, scrollTop = state.scrollTop;
-                    if (this._childrenToDisplay = [], height > 0 && width > 0) {
-                        var visibleColumnIndices = this._columnSizeAndPositionManager.getVisibleCellRange({
-                            containerSize: width,
-                            offset: scrollLeft
-                        }), visibleRowIndices = this._rowSizeAndPositionManager.getVisibleCellRange({
-                            containerSize: height,
-                            offset: scrollTop
-                        }), horizontalOffsetAdjustment = this._columnSizeAndPositionManager.getOffsetAdjustment({
-                            containerSize: width,
-                            offset: scrollLeft
-                        }), verticalOffsetAdjustment = this._rowSizeAndPositionManager.getOffsetAdjustment({
-                            containerSize: height,
-                            offset: scrollTop
-                        });
-                        this._renderedColumnStartIndex = visibleColumnIndices.start, this._renderedColumnStopIndex = visibleColumnIndices.stop,
-                        this._renderedRowStartIndex = visibleRowIndices.start, this._renderedRowStopIndex = visibleRowIndices.stop;
-                        var overscanColumnIndices = (0, _getOverscanIndices2.default)({
-                            cellCount: columnCount,
-                            overscanCellsCount: overscanColumnCount,
-                            scrollDirection: scrollDirectionHorizontal,
-                            startIndex: this._renderedColumnStartIndex,
-                            stopIndex: this._renderedColumnStopIndex
-                        }), overscanRowIndices = (0, _getOverscanIndices2.default)({
-                            cellCount: rowCount,
-                            overscanCellsCount: overscanRowCount,
-                            scrollDirection: scrollDirectionVertical,
-                            startIndex: this._renderedRowStartIndex,
-                            stopIndex: this._renderedRowStopIndex
-                        });
-                        this._columnStartIndex = overscanColumnIndices.overscanStartIndex, this._columnStopIndex = overscanColumnIndices.overscanStopIndex,
-                        this._rowStartIndex = overscanRowIndices.overscanStartIndex, this._rowStopIndex = overscanRowIndices.overscanStopIndex,
-                        this._childrenToDisplay = cellRangeRenderer({
-                            cellCache: this._cellCache,
-                            cellRenderer: cellRenderer,
-                            columnSizeAndPositionManager: this._columnSizeAndPositionManager,
-                            columnStartIndex: this._columnStartIndex,
-                            columnStopIndex: this._columnStopIndex,
-                            horizontalOffsetAdjustment: horizontalOffsetAdjustment,
-                            isScrolling: isScrolling,
-                            rowSizeAndPositionManager: this._rowSizeAndPositionManager,
-                            rowStartIndex: this._rowStartIndex,
-                            rowStopIndex: this._rowStopIndex,
-                            scrollLeft: scrollLeft,
-                            scrollTop: scrollTop,
-                            verticalOffsetAdjustment: verticalOffsetAdjustment,
-                            visibleColumnIndices: visibleColumnIndices,
-                            visibleRowIndices: visibleRowIndices
-                        });
-                    }
-                }
-            }, {
-                key: "_enablePointerEventsAfterDelay",
-                value: function() {
-                    var scrollingResetTimeInterval = this.props.scrollingResetTimeInterval;
-                    this._disablePointerEventsTimeoutId && clearTimeout(this._disablePointerEventsTimeoutId),
-                    this._disablePointerEventsTimeoutId = setTimeout(this._enablePointerEventsAfterDelayCallback, scrollingResetTimeInterval);
-                }
-            }, {
-                key: "_enablePointerEventsAfterDelayCallback",
-                value: function() {
-                    this._disablePointerEventsTimeoutId = null, this._cellCache = {}, this.setState({
-                        isScrolling: !1,
-                        scrollDirectionHorizontal: _getOverscanIndices.SCROLL_DIRECTION_FIXED,
-                        scrollDirectionVertical: _getOverscanIndices.SCROLL_DIRECTION_FIXED
-                    });
-                }
-            }, {
-                key: "_getEstimatedColumnSize",
-                value: function(props) {
-                    return "number" == typeof props.columnWidth ? props.columnWidth : props.estimatedColumnSize;
-                }
-            }, {
-                key: "_getEstimatedRowSize",
-                value: function(props) {
-                    return "number" == typeof props.rowHeight ? props.rowHeight : props.estimatedRowSize;
-                }
-            }, {
-                key: "_invokeOnGridRenderedHelper",
-                value: function() {
-                    var onSectionRendered = this.props.onSectionRendered;
-                    this._onGridRenderedMemoizer({
-                        callback: onSectionRendered,
-                        indices: {
-                            columnOverscanStartIndex: this._columnStartIndex,
-                            columnOverscanStopIndex: this._columnStopIndex,
-                            columnStartIndex: this._renderedColumnStartIndex,
-                            columnStopIndex: this._renderedColumnStopIndex,
-                            rowOverscanStartIndex: this._rowStartIndex,
-                            rowOverscanStopIndex: this._rowStopIndex,
-                            rowStartIndex: this._renderedRowStartIndex,
-                            rowStopIndex: this._renderedRowStopIndex
-                        }
-                    });
-                }
-            }, {
-                key: "_invokeOnScrollMemoizer",
-                value: function(_ref3) {
-                    var _this5 = this, scrollLeft = _ref3.scrollLeft, scrollTop = _ref3.scrollTop, totalColumnsWidth = _ref3.totalColumnsWidth, totalRowsHeight = _ref3.totalRowsHeight;
-                    this._onScrollMemoizer({
-                        callback: function(_ref4) {
-                            var scrollLeft = _ref4.scrollLeft, scrollTop = _ref4.scrollTop, _props5 = _this5.props, height = _props5.height, onScroll = _props5.onScroll, width = _props5.width;
-                            onScroll({
-                                clientHeight: height,
-                                clientWidth: width,
-                                scrollHeight: totalRowsHeight,
-                                scrollLeft: scrollLeft,
-                                scrollTop: scrollTop,
-                                scrollWidth: totalColumnsWidth
-                            });
-                        },
-                        indices: {
-                            scrollLeft: scrollLeft,
-                            scrollTop: scrollTop
-                        }
-                    });
-                }
-            }, {
-                key: "_setScrollPosition",
-                value: function(_ref5) {
-                    var scrollLeft = _ref5.scrollLeft, scrollTop = _ref5.scrollTop, newState = {
-                        scrollPositionChangeReason: SCROLL_POSITION_CHANGE_REASONS.REQUESTED
-                    };
-                    scrollLeft >= 0 && (newState.scrollLeft = scrollLeft), scrollTop >= 0 && (newState.scrollTop = scrollTop),
-                    (scrollLeft >= 0 && scrollLeft !== this.state.scrollLeft || scrollTop >= 0 && scrollTop !== this.state.scrollTop) && this.setState(newState);
-                }
-            }, {
-                key: "_wrapPropertyGetter",
-                value: function(value) {
-                    return value instanceof Function ? value : function() {
-                        return value;
-                    };
-                }
-            }, {
-                key: "_wrapSizeGetter",
-                value: function(size) {
-                    return this._wrapPropertyGetter(size);
-                }
-            }, {
-                key: "_updateScrollLeftForScrollToColumn",
-                value: function() {
-                    var props = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : this.props, state = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : this.state, columnCount = props.columnCount, scrollToAlignment = props.scrollToAlignment, scrollToColumn = props.scrollToColumn, width = props.width, scrollLeft = state.scrollLeft;
-                    if (scrollToColumn >= 0 && columnCount > 0) {
-                        var targetIndex = Math.max(0, Math.min(columnCount - 1, scrollToColumn)), calculatedScrollLeft = this._columnSizeAndPositionManager.getUpdatedOffsetForIndex({
-                            align: scrollToAlignment,
-                            containerSize: width,
-                            currentOffset: scrollLeft,
-                            targetIndex: targetIndex
-                        });
-                        scrollLeft !== calculatedScrollLeft && this._setScrollPosition({
-                            scrollLeft: calculatedScrollLeft
-                        });
-                    }
-                }
-            }, {
-                key: "_updateScrollTopForScrollToRow",
-                value: function() {
-                    var props = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : this.props, state = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : this.state, height = props.height, rowCount = props.rowCount, scrollToAlignment = props.scrollToAlignment, scrollToRow = props.scrollToRow, scrollTop = state.scrollTop;
-                    if (scrollToRow >= 0 && rowCount > 0) {
-                        var targetIndex = Math.max(0, Math.min(rowCount - 1, scrollToRow)), calculatedScrollTop = this._rowSizeAndPositionManager.getUpdatedOffsetForIndex({
-                            align: scrollToAlignment,
-                            containerSize: height,
-                            currentOffset: scrollTop,
-                            targetIndex: targetIndex
-                        });
-                        scrollTop !== calculatedScrollTop && this._setScrollPosition({
-                            scrollTop: calculatedScrollTop
-                        });
-                    }
-                }
-            }, {
-                key: "_onScroll",
-                value: function(event) {
-                    if (event.target === this._scrollingContainer) {
-                        this._enablePointerEventsAfterDelay();
-                        var _props6 = this.props, height = _props6.height, width = _props6.width, scrollbarSize = this._scrollbarSize, totalRowsHeight = this._rowSizeAndPositionManager.getTotalSize(), totalColumnsWidth = this._columnSizeAndPositionManager.getTotalSize(), scrollLeft = Math.min(Math.max(0, totalColumnsWidth - width + scrollbarSize), event.target.scrollLeft), scrollTop = Math.min(Math.max(0, totalRowsHeight - height + scrollbarSize), event.target.scrollTop);
-                        if (this.state.scrollLeft !== scrollLeft || this.state.scrollTop !== scrollTop) {
-                            var scrollDirectionVertical = scrollTop > this.state.scrollTop ? _getOverscanIndices.SCROLL_DIRECTION_FORWARD : _getOverscanIndices.SCROLL_DIRECTION_BACKWARD, scrollDirectionHorizontal = scrollLeft > this.state.scrollLeft ? _getOverscanIndices.SCROLL_DIRECTION_FORWARD : _getOverscanIndices.SCROLL_DIRECTION_BACKWARD;
-                            this.setState({
-                                isScrolling: !0,
-                                scrollDirectionHorizontal: scrollDirectionHorizontal,
-                                scrollDirectionVertical: scrollDirectionVertical,
-                                scrollLeft: scrollLeft,
-                                scrollPositionChangeReason: SCROLL_POSITION_CHANGE_REASONS.OBSERVED,
-                                scrollTop: scrollTop
-                            });
-                        }
-                        this._invokeOnScrollMemoizer({
-                            scrollLeft: scrollLeft,
-                            scrollTop: scrollTop,
-                            totalColumnsWidth: totalColumnsWidth,
-                            totalRowsHeight: totalRowsHeight
-                        });
-                    }
-                }
-            } ]), Grid;
-        }(_react.Component);
-        Grid.defaultProps = {
-            "aria-label": "grid",
-            cellRangeRenderer: _defaultCellRangeRenderer2.default,
-            estimatedColumnSize: 100,
-            estimatedRowSize: 30,
-            noContentRenderer: function() {
-                return null;
-            },
-            onScroll: function() {
-                return null;
-            },
-            onSectionRendered: function() {
-                return null;
-            },
-            overscanColumnCount: 0,
-            overscanRowCount: 10,
-            scrollingResetTimeInterval: DEFAULT_SCROLLING_RESET_TIME_INTERVAL,
-            scrollToAlignment: "auto",
-            style: {},
-            tabIndex: 0
-        }, exports.default = Grid;
-    }, /* 122 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        function calculateSizeAndPositionDataAndUpdateScrollOffset(_ref) {
-            var cellCount = _ref.cellCount, cellSize = _ref.cellSize, computeMetadataCallback = _ref.computeMetadataCallback, computeMetadataCallbackProps = _ref.computeMetadataCallbackProps, nextCellsCount = _ref.nextCellsCount, nextCellSize = _ref.nextCellSize, nextScrollToIndex = _ref.nextScrollToIndex, scrollToIndex = _ref.scrollToIndex, updateScrollOffsetForScrollToIndex = _ref.updateScrollOffsetForScrollToIndex;
-            cellCount === nextCellsCount && ("number" != typeof cellSize && "number" != typeof nextCellSize || cellSize === nextCellSize) || (computeMetadataCallback(computeMetadataCallbackProps),
-            scrollToIndex >= 0 && scrollToIndex === nextScrollToIndex && updateScrollOffsetForScrollToIndex());
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.default = calculateSizeAndPositionDataAndUpdateScrollOffset;
-    }, /* 123 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.DEFAULT_MAX_SCROLL_SIZE = void 0;
-        var _objectWithoutProperties2 = __webpack_require__(105), _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _CellSizeAndPositionManager = __webpack_require__(124), _CellSizeAndPositionManager2 = _interopRequireDefault(_CellSizeAndPositionManager), DEFAULT_MAX_SCROLL_SIZE = exports.DEFAULT_MAX_SCROLL_SIZE = 15e5, ScalingCellSizeAndPositionManager = function() {
-            function ScalingCellSizeAndPositionManager(_ref) {
-                var _ref$maxScrollSize = _ref.maxScrollSize, maxScrollSize = void 0 === _ref$maxScrollSize ? DEFAULT_MAX_SCROLL_SIZE : _ref$maxScrollSize, params = (0,
-                _objectWithoutProperties3.default)(_ref, [ "maxScrollSize" ]);
-                (0, _classCallCheck3.default)(this, ScalingCellSizeAndPositionManager), this._cellSizeAndPositionManager = new _CellSizeAndPositionManager2.default(params),
-                this._maxScrollSize = maxScrollSize;
-            }
-            return (0, _createClass3.default)(ScalingCellSizeAndPositionManager, [ {
-                key: "configure",
-                value: function(params) {
-                    this._cellSizeAndPositionManager.configure(params);
-                }
-            }, {
-                key: "getCellCount",
-                value: function() {
-                    return this._cellSizeAndPositionManager.getCellCount();
-                }
-            }, {
-                key: "getEstimatedCellSize",
-                value: function() {
-                    return this._cellSizeAndPositionManager.getEstimatedCellSize();
-                }
-            }, {
-                key: "getLastMeasuredIndex",
-                value: function() {
-                    return this._cellSizeAndPositionManager.getLastMeasuredIndex();
-                }
-            }, {
-                key: "getOffsetAdjustment",
-                value: function(_ref2) {
-                    var containerSize = _ref2.containerSize, offset = _ref2.offset, totalSize = this._cellSizeAndPositionManager.getTotalSize(), safeTotalSize = this.getTotalSize(), offsetPercentage = this._getOffsetPercentage({
-                        containerSize: containerSize,
-                        offset: offset,
-                        totalSize: safeTotalSize
-                    });
-                    return Math.round(offsetPercentage * (safeTotalSize - totalSize));
-                }
-            }, {
-                key: "getSizeAndPositionOfCell",
-                value: function(index) {
-                    return this._cellSizeAndPositionManager.getSizeAndPositionOfCell(index);
-                }
-            }, {
-                key: "getSizeAndPositionOfLastMeasuredCell",
-                value: function() {
-                    return this._cellSizeAndPositionManager.getSizeAndPositionOfLastMeasuredCell();
-                }
-            }, {
-                key: "getTotalSize",
-                value: function() {
-                    return Math.min(this._maxScrollSize, this._cellSizeAndPositionManager.getTotalSize());
-                }
-            }, {
-                key: "getUpdatedOffsetForIndex",
-                value: function(_ref3) {
-                    var _ref3$align = _ref3.align, align = void 0 === _ref3$align ? "auto" : _ref3$align, containerSize = _ref3.containerSize, currentOffset = _ref3.currentOffset, targetIndex = _ref3.targetIndex, totalSize = _ref3.totalSize;
-                    currentOffset = this._safeOffsetToOffset({
-                        containerSize: containerSize,
-                        offset: currentOffset
-                    });
-                    var offset = this._cellSizeAndPositionManager.getUpdatedOffsetForIndex({
-                        align: align,
-                        containerSize: containerSize,
-                        currentOffset: currentOffset,
-                        targetIndex: targetIndex,
-                        totalSize: totalSize
-                    });
-                    return this._offsetToSafeOffset({
-                        containerSize: containerSize,
-                        offset: offset
-                    });
-                }
-            }, {
-                key: "getVisibleCellRange",
-                value: function(_ref4) {
-                    var containerSize = _ref4.containerSize, offset = _ref4.offset;
-                    return offset = this._safeOffsetToOffset({
-                        containerSize: containerSize,
-                        offset: offset
-                    }), this._cellSizeAndPositionManager.getVisibleCellRange({
-                        containerSize: containerSize,
-                        offset: offset
-                    });
-                }
-            }, {
-                key: "resetCell",
-                value: function(index) {
-                    this._cellSizeAndPositionManager.resetCell(index);
-                }
-            }, {
-                key: "_getOffsetPercentage",
-                value: function(_ref5) {
-                    var containerSize = _ref5.containerSize, offset = _ref5.offset, totalSize = _ref5.totalSize;
-                    return totalSize <= containerSize ? 0 : offset / (totalSize - containerSize);
-                }
-            }, {
-                key: "_offsetToSafeOffset",
-                value: function(_ref6) {
-                    var containerSize = _ref6.containerSize, offset = _ref6.offset, totalSize = this._cellSizeAndPositionManager.getTotalSize(), safeTotalSize = this.getTotalSize();
-                    if (totalSize === safeTotalSize) return offset;
-                    var offsetPercentage = this._getOffsetPercentage({
-                        containerSize: containerSize,
-                        offset: offset,
-                        totalSize: totalSize
-                    });
-                    return Math.round(offsetPercentage * (safeTotalSize - containerSize));
-                }
-            }, {
-                key: "_safeOffsetToOffset",
-                value: function(_ref7) {
-                    var containerSize = _ref7.containerSize, offset = _ref7.offset, totalSize = this._cellSizeAndPositionManager.getTotalSize(), safeTotalSize = this.getTotalSize();
-                    if (totalSize === safeTotalSize) return offset;
-                    var offsetPercentage = this._getOffsetPercentage({
-                        containerSize: containerSize,
-                        offset: offset,
-                        totalSize: safeTotalSize
-                    });
-                    return Math.round(offsetPercentage * (totalSize - containerSize));
-                }
-            } ]), ScalingCellSizeAndPositionManager;
-        }();
-        exports.default = ScalingCellSizeAndPositionManager;
-    }, /* 124 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), CellSizeAndPositionManager = function() {
-            function CellSizeAndPositionManager(_ref) {
-                var cellCount = _ref.cellCount, cellSizeGetter = _ref.cellSizeGetter, estimatedCellSize = _ref.estimatedCellSize;
-                (0, _classCallCheck3.default)(this, CellSizeAndPositionManager), this._cellSizeGetter = cellSizeGetter,
-                this._cellCount = cellCount, this._estimatedCellSize = estimatedCellSize, this._cellSizeAndPositionData = {},
-                this._lastMeasuredIndex = -1;
-            }
-            return (0, _createClass3.default)(CellSizeAndPositionManager, [ {
-                key: "configure",
-                value: function(_ref2) {
-                    var cellCount = _ref2.cellCount, estimatedCellSize = _ref2.estimatedCellSize;
-                    this._cellCount = cellCount, this._estimatedCellSize = estimatedCellSize;
-                }
-            }, {
-                key: "getCellCount",
-                value: function() {
-                    return this._cellCount;
-                }
-            }, {
-                key: "getEstimatedCellSize",
-                value: function() {
-                    return this._estimatedCellSize;
-                }
-            }, {
-                key: "getLastMeasuredIndex",
-                value: function() {
-                    return this._lastMeasuredIndex;
-                }
-            }, {
-                key: "getSizeAndPositionOfCell",
-                value: function(index) {
-                    if (index < 0 || index >= this._cellCount) throw Error("Requested index " + index + " is outside of range 0.." + this._cellCount);
-                    if (index > this._lastMeasuredIndex) {
-                        for (var lastMeasuredCellSizeAndPosition = this.getSizeAndPositionOfLastMeasuredCell(), _offset = lastMeasuredCellSizeAndPosition.offset + lastMeasuredCellSizeAndPosition.size, i = this._lastMeasuredIndex + 1; i <= index; i++) {
-                            var _size = this._cellSizeGetter({
-                                index: i
-                            });
-                            if (null == _size || isNaN(_size)) throw Error("Invalid size returned for cell " + i + " of value " + _size);
-                            this._cellSizeAndPositionData[i] = {
-                                offset: _offset,
-                                size: _size
-                            }, _offset += _size;
-                        }
-                        this._lastMeasuredIndex = index;
-                    }
-                    return this._cellSizeAndPositionData[index];
-                }
-            }, {
-                key: "getSizeAndPositionOfLastMeasuredCell",
-                value: function() {
-                    return this._lastMeasuredIndex >= 0 ? this._cellSizeAndPositionData[this._lastMeasuredIndex] : {
-                        offset: 0,
-                        size: 0
-                    };
-                }
-            }, {
-                key: "getTotalSize",
-                value: function() {
-                    var lastMeasuredCellSizeAndPosition = this.getSizeAndPositionOfLastMeasuredCell();
-                    return lastMeasuredCellSizeAndPosition.offset + lastMeasuredCellSizeAndPosition.size + (this._cellCount - this._lastMeasuredIndex - 1) * this._estimatedCellSize;
-                }
-            }, {
-                key: "getUpdatedOffsetForIndex",
-                value: function(_ref3) {
-                    var _ref3$align = _ref3.align, align = void 0 === _ref3$align ? "auto" : _ref3$align, containerSize = _ref3.containerSize, currentOffset = _ref3.currentOffset, targetIndex = _ref3.targetIndex;
-                    if (containerSize <= 0) return 0;
-                    var datum = this.getSizeAndPositionOfCell(targetIndex), maxOffset = datum.offset, minOffset = maxOffset - containerSize + datum.size, idealOffset = void 0;
-                    switch (align) {
-                      case "start":
-                        idealOffset = maxOffset;
-                        break;
-
-                      case "end":
-                        idealOffset = minOffset;
-                        break;
-
-                      case "center":
-                        idealOffset = maxOffset - (containerSize - datum.size) / 2;
-                        break;
-
-                      default:
-                        idealOffset = Math.max(minOffset, Math.min(maxOffset, currentOffset));
-                    }
-                    var totalSize = this.getTotalSize();
-                    return Math.max(0, Math.min(totalSize - containerSize, idealOffset));
-                }
-            }, {
-                key: "getVisibleCellRange",
-                value: function(_ref4) {
-                    var containerSize = _ref4.containerSize, offset = _ref4.offset, totalSize = this.getTotalSize();
-                    if (0 === totalSize) return {};
-                    var maxOffset = offset + containerSize, start = this._findNearestCell(offset), datum = this.getSizeAndPositionOfCell(start);
-                    offset = datum.offset + datum.size;
-                    for (var stop = start; offset < maxOffset && stop < this._cellCount - 1; ) stop++,
-                    offset += this.getSizeAndPositionOfCell(stop).size;
-                    return {
-                        start: start,
-                        stop: stop
-                    };
-                }
-            }, {
-                key: "resetCell",
-                value: function(index) {
-                    this._lastMeasuredIndex = Math.min(this._lastMeasuredIndex, index - 1);
-                }
-            }, {
-                key: "_binarySearch",
-                value: function(_ref5) {
-                    for (var high = _ref5.high, low = _ref5.low, offset = _ref5.offset, middle = void 0, currentOffset = void 0; low <= high; ) {
-                        if (middle = low + Math.floor((high - low) / 2), currentOffset = this.getSizeAndPositionOfCell(middle).offset,
-                        currentOffset === offset) return middle;
-                        currentOffset < offset ? low = middle + 1 : currentOffset > offset && (high = middle - 1);
-                    }
-                    if (low > 0) return low - 1;
-                }
-            }, {
-                key: "_exponentialSearch",
-                value: function(_ref6) {
-                    for (var index = _ref6.index, offset = _ref6.offset, interval = 1; index < this._cellCount && this.getSizeAndPositionOfCell(index).offset < offset; ) index += interval,
-                    interval *= 2;
-                    return this._binarySearch({
-                        high: Math.min(index, this._cellCount - 1),
-                        low: Math.floor(index / 2),
-                        offset: offset
-                    });
-                }
-            }, {
-                key: "_findNearestCell",
-                value: function(offset) {
-                    if (isNaN(offset)) throw Error("Invalid offset " + offset + " specified");
-                    offset = Math.max(0, offset);
-                    var lastMeasuredCellSizeAndPosition = this.getSizeAndPositionOfLastMeasuredCell(), lastMeasuredIndex = Math.max(0, this._lastMeasuredIndex);
-                    return lastMeasuredCellSizeAndPosition.offset >= offset ? this._binarySearch({
-                        high: lastMeasuredIndex,
-                        low: 0,
-                        offset: offset
-                    }) : this._exponentialSearch({
-                        index: lastMeasuredIndex,
-                        offset: offset
-                    });
-                }
-            } ]), CellSizeAndPositionManager;
-        }();
-        exports.default = CellSizeAndPositionManager;
-    }, /* 125 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        function getOverscanIndices(_ref) {
-            var cellCount = _ref.cellCount, overscanCellsCount = _ref.overscanCellsCount, scrollDirection = _ref.scrollDirection, startIndex = _ref.startIndex, stopIndex = _ref.stopIndex, overscanStartIndex = void 0, overscanStopIndex = void 0;
-            return scrollDirection === SCROLL_DIRECTION_FORWARD ? (overscanStartIndex = startIndex,
-            overscanStopIndex = stopIndex + 2 * overscanCellsCount) : scrollDirection === SCROLL_DIRECTION_BACKWARD ? (overscanStartIndex = startIndex - 2 * overscanCellsCount,
-            overscanStopIndex = stopIndex) : (overscanStartIndex = startIndex - overscanCellsCount,
-            overscanStopIndex = stopIndex + overscanCellsCount), {
-                overscanStartIndex: Math.max(0, overscanStartIndex),
-                overscanStopIndex: Math.min(cellCount - 1, overscanStopIndex)
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.default = getOverscanIndices;
-        var SCROLL_DIRECTION_BACKWARD = exports.SCROLL_DIRECTION_BACKWARD = -1, SCROLL_DIRECTION_FORWARD = (exports.SCROLL_DIRECTION_FIXED = 0,
-        exports.SCROLL_DIRECTION_FORWARD = 1);
-    }, /* 126 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        function updateScrollIndexHelper(_ref) {
-            var cellSize = _ref.cellSize, cellSizeAndPositionManager = _ref.cellSizeAndPositionManager, previousCellsCount = _ref.previousCellsCount, previousCellSize = _ref.previousCellSize, previousScrollToAlignment = _ref.previousScrollToAlignment, previousScrollToIndex = _ref.previousScrollToIndex, previousSize = _ref.previousSize, scrollOffset = _ref.scrollOffset, scrollToAlignment = _ref.scrollToAlignment, scrollToIndex = _ref.scrollToIndex, size = _ref.size, updateScrollIndexCallback = _ref.updateScrollIndexCallback, cellCount = cellSizeAndPositionManager.getCellCount(), hasScrollToIndex = scrollToIndex >= 0 && scrollToIndex < cellCount, sizeHasChanged = size !== previousSize || !previousCellSize || "number" == typeof cellSize && cellSize !== previousCellSize;
-            hasScrollToIndex && (sizeHasChanged || scrollToAlignment !== previousScrollToAlignment || scrollToIndex !== previousScrollToIndex) ? updateScrollIndexCallback(scrollToIndex) : !hasScrollToIndex && cellCount > 0 && (size < previousSize || cellCount < previousCellsCount) && scrollOffset > cellSizeAndPositionManager.getTotalSize() - size && updateScrollIndexCallback(cellCount - 1);
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.default = updateScrollIndexHelper;
-    }, /* 127 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        function defaultCellRangeRenderer(_ref) {
-            for (var cellCache = _ref.cellCache, cellRenderer = _ref.cellRenderer, columnSizeAndPositionManager = _ref.columnSizeAndPositionManager, columnStartIndex = _ref.columnStartIndex, columnStopIndex = _ref.columnStopIndex, horizontalOffsetAdjustment = _ref.horizontalOffsetAdjustment, isScrolling = _ref.isScrolling, rowSizeAndPositionManager = _ref.rowSizeAndPositionManager, rowStartIndex = _ref.rowStartIndex, rowStopIndex = _ref.rowStopIndex, verticalOffsetAdjustment = (_ref.scrollLeft,
-            _ref.scrollTop, _ref.verticalOffsetAdjustment), visibleColumnIndices = _ref.visibleColumnIndices, visibleRowIndices = _ref.visibleRowIndices, renderedCells = [], rowIndex = rowStartIndex; rowIndex <= rowStopIndex; rowIndex++) for (var rowDatum = rowSizeAndPositionManager.getSizeAndPositionOfCell(rowIndex), columnIndex = columnStartIndex; columnIndex <= columnStopIndex; columnIndex++) {
-                var columnDatum = columnSizeAndPositionManager.getSizeAndPositionOfCell(columnIndex), isVisible = columnIndex >= visibleColumnIndices.start && columnIndex <= visibleColumnIndices.stop && rowIndex >= visibleRowIndices.start && rowIndex <= visibleRowIndices.stop, key = rowIndex + "-" + columnIndex, style = {
-                    height: rowDatum.size,
-                    left: columnDatum.offset + horizontalOffsetAdjustment,
-                    position: "absolute",
-                    top: rowDatum.offset + verticalOffsetAdjustment,
-                    width: columnDatum.size
-                }, cellRendererParams = {
-                    columnIndex: columnIndex,
-                    isScrolling: isScrolling,
-                    isVisible: isVisible,
-                    key: key,
-                    rowIndex: rowIndex,
-                    style: style
-                }, renderedCell = void 0;
-                !isScrolling || horizontalOffsetAdjustment || verticalOffsetAdjustment ? renderedCell = cellRenderer(cellRendererParams) : (cellCache[key] || (cellCache[key] = cellRenderer(cellRendererParams)),
-                renderedCell = cellCache[key]), null != renderedCell && renderedCell !== !1 && renderedCells.push(renderedCell);
-            }
-            return renderedCells;
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.default = defaultCellRangeRenderer;
-    }, /* 128 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.SortIndicator = exports.SortDirection = exports.Column = exports.Table = exports.defaultRowRenderer = exports.defaultHeaderRenderer = exports.defaultCellRenderer = exports.defaultCellDataGetter = exports.default = void 0;
-        var _Table2 = __webpack_require__(129), _Table3 = _interopRequireDefault(_Table2), _defaultCellDataGetter2 = __webpack_require__(135), _defaultCellDataGetter3 = _interopRequireDefault(_defaultCellDataGetter2), _defaultCellRenderer2 = __webpack_require__(134), _defaultCellRenderer3 = _interopRequireDefault(_defaultCellRenderer2), _defaultHeaderRenderer2 = __webpack_require__(131), _defaultHeaderRenderer3 = _interopRequireDefault(_defaultHeaderRenderer2), _defaultRowRenderer2 = __webpack_require__(136), _defaultRowRenderer3 = _interopRequireDefault(_defaultRowRenderer2), _Column2 = __webpack_require__(130), _Column3 = _interopRequireDefault(_Column2), _SortDirection2 = __webpack_require__(133), _SortDirection3 = _interopRequireDefault(_SortDirection2), _SortIndicator2 = __webpack_require__(132), _SortIndicator3 = _interopRequireDefault(_SortIndicator2);
-        exports.default = _Table3.default, exports.defaultCellDataGetter = _defaultCellDataGetter3.default,
-        exports.defaultCellRenderer = _defaultCellRenderer3.default, exports.defaultHeaderRenderer = _defaultHeaderRenderer3.default,
-        exports.defaultRowRenderer = _defaultRowRenderer3.default, exports.Table = _Table3.default,
-        exports.Column = _Column3.default, exports.SortDirection = _SortDirection3.default,
-        exports.SortIndicator = _SortIndicator3.default;
-    }, /* 129 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _extends2 = __webpack_require__(100), _extends3 = _interopRequireDefault(_extends2), _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2), _classnames = __webpack_require__(107), _classnames2 = _interopRequireDefault(_classnames), _Column = __webpack_require__(130), _react = (_interopRequireDefault(_Column),
-        __webpack_require__(89)), _react2 = _interopRequireDefault(_react), _reactDom = __webpack_require__(96), _reactAddonsShallowCompare = __webpack_require__(90), _reactAddonsShallowCompare2 = _interopRequireDefault(_reactAddonsShallowCompare), _Grid = __webpack_require__(120), _Grid2 = _interopRequireDefault(_Grid), _defaultRowRenderer = __webpack_require__(136), _defaultRowRenderer2 = _interopRequireDefault(_defaultRowRenderer), _SortDirection = __webpack_require__(133), _SortDirection2 = _interopRequireDefault(_SortDirection), Table = function(_Component) {
-            function Table(props) {
-                (0, _classCallCheck3.default)(this, Table);
-                var _this = (0, _possibleConstructorReturn3.default)(this, (Table.__proto__ || (0,
-                _getPrototypeOf2.default)(Table)).call(this, props));
-                return _this.state = {
-                    scrollbarWidth: 0
-                }, _this._createColumn = _this._createColumn.bind(_this), _this._createRow = _this._createRow.bind(_this),
-                _this._onScroll = _this._onScroll.bind(_this), _this._onSectionRendered = _this._onSectionRendered.bind(_this),
-                _this;
-            }
-            return (0, _inherits3.default)(Table, _Component), (0, _createClass3.default)(Table, [ {
-                key: "forceUpdateGrid",
-                value: function() {
-                    this.Grid.forceUpdate();
-                }
-            }, {
-                key: "measureAllRows",
-                value: function() {
-                    this.Grid.measureAllCells();
-                }
-            }, {
-                key: "recomputeRowHeights",
-                value: function() {
-                    var index = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : 0;
-                    this.Grid.recomputeGridSize({
-                        rowIndex: index
-                    }), this.forceUpdateGrid();
-                }
-            }, {
-                key: "componentDidMount",
-                value: function() {
-                    this._setScrollbarWidth();
-                }
-            }, {
-                key: "componentDidUpdate",
-                value: function() {
-                    this._setScrollbarWidth();
-                }
-            }, {
-                key: "render",
-                value: function() {
-                    var _this2 = this, _props = this.props, children = _props.children, className = _props.className, disableHeader = _props.disableHeader, gridClassName = _props.gridClassName, gridStyle = _props.gridStyle, headerHeight = _props.headerHeight, height = _props.height, id = _props.id, noRowsRenderer = _props.noRowsRenderer, rowClassName = _props.rowClassName, rowStyle = _props.rowStyle, scrollToIndex = _props.scrollToIndex, style = _props.style, width = _props.width, scrollbarWidth = this.state.scrollbarWidth, availableRowsHeight = height - headerHeight, rowClass = rowClassName instanceof Function ? rowClassName({
-                        index: -1
-                    }) : rowClassName, rowStyleObject = rowStyle instanceof Function ? rowStyle({
-                        index: -1
-                    }) : rowStyle;
-                    return this._cachedColumnStyles = [], _react2.default.Children.toArray(children).forEach(function(column, index) {
-                        var flexStyles = _this2._getFlexStyleForColumn(column, column.props.style);
-                        _this2._cachedColumnStyles[index] = (0, _extends3.default)({}, flexStyles, {
-                            overflow: "hidden"
-                        });
-                    }), _react2.default.createElement("div", {
-                        className: (0, _classnames2.default)("ReactVirtualized__Table", className),
-                        id: id,
-                        style: style
-                    }, !disableHeader && _react2.default.createElement("div", {
-                        className: (0, _classnames2.default)("ReactVirtualized__Table__headerRow", rowClass),
-                        style: (0, _extends3.default)({}, rowStyleObject, {
-                            height: headerHeight,
-                            overflow: "hidden",
-                            paddingRight: scrollbarWidth,
-                            width: width
-                        })
-                    }, this._getRenderedHeaderRow()), _react2.default.createElement(_Grid2.default, (0,
-                    _extends3.default)({}, this.props, {
-                        autoContainerWidth: !0,
-                        className: (0, _classnames2.default)("ReactVirtualized__Table__Grid", gridClassName),
-                        cellRenderer: this._createRow,
-                        columnWidth: width,
-                        columnCount: 1,
-                        height: availableRowsHeight,
-                        id: void 0,
-                        noContentRenderer: noRowsRenderer,
-                        onScroll: this._onScroll,
-                        onSectionRendered: this._onSectionRendered,
-                        ref: function(_ref) {
-                            _this2.Grid = _ref;
-                        },
-                        scrollbarWidth: scrollbarWidth,
-                        scrollToRow: scrollToIndex,
-                        style: (0, _extends3.default)({}, gridStyle, {
-                            overflowX: "hidden"
-                        })
-                    })));
-                }
-            }, {
-                key: "shouldComponentUpdate",
-                value: function(nextProps, nextState) {
-                    return (0, _reactAddonsShallowCompare2.default)(this, nextProps, nextState);
-                }
-            }, {
-                key: "_createColumn",
-                value: function(_ref2) {
-                    var column = _ref2.column, columnIndex = _ref2.columnIndex, isScrolling = _ref2.isScrolling, rowData = _ref2.rowData, rowIndex = _ref2.rowIndex, _column$props = column.props, cellDataGetter = _column$props.cellDataGetter, cellRenderer = _column$props.cellRenderer, className = _column$props.className, columnData = _column$props.columnData, dataKey = _column$props.dataKey, cellData = cellDataGetter({
-                        columnData: columnData,
-                        dataKey: dataKey,
-                        rowData: rowData
-                    }), renderedCell = cellRenderer({
-                        cellData: cellData,
-                        columnData: columnData,
-                        dataKey: dataKey,
-                        isScrolling: isScrolling,
-                        rowData: rowData,
-                        rowIndex: rowIndex
-                    }), style = this._cachedColumnStyles[columnIndex], title = "string" == typeof renderedCell ? renderedCell : null;
-                    return _react2.default.createElement("div", {
-                        key: "Row" + rowIndex + "-Col" + columnIndex,
-                        className: (0, _classnames2.default)("ReactVirtualized__Table__rowColumn", className),
-                        style: style,
-                        title: title
-                    }, renderedCell);
-                }
-            }, {
-                key: "_createHeader",
-                value: function(_ref3) {
-                    var column = _ref3.column, index = _ref3.index, _props2 = this.props, headerClassName = _props2.headerClassName, headerStyle = _props2.headerStyle, onHeaderClick = _props2.onHeaderClick, sort = _props2.sort, sortBy = _props2.sortBy, sortDirection = _props2.sortDirection, _column$props2 = column.props, dataKey = _column$props2.dataKey, disableSort = _column$props2.disableSort, headerRenderer = _column$props2.headerRenderer, label = _column$props2.label, columnData = _column$props2.columnData, sortEnabled = !disableSort && sort, classNames = (0,
-                    _classnames2.default)("ReactVirtualized__Table__headerColumn", headerClassName, column.props.headerClassName, {
-                        ReactVirtualized__Table__sortableHeaderColumn: sortEnabled
-                    }), style = this._getFlexStyleForColumn(column, headerStyle), renderedHeader = headerRenderer({
-                        columnData: columnData,
-                        dataKey: dataKey,
-                        disableSort: disableSort,
-                        label: label,
-                        sortBy: sortBy,
-                        sortDirection: sortDirection
-                    }), a11yProps = {};
-                    return (sortEnabled || onHeaderClick) && !function() {
-                        var newSortDirection = sortBy !== dataKey || sortDirection === _SortDirection2.default.DESC ? _SortDirection2.default.ASC : _SortDirection2.default.DESC, onClick = function() {
-                            sortEnabled && sort({
-                                sortBy: dataKey,
-                                sortDirection: newSortDirection
-                            }), onHeaderClick && onHeaderClick({
-                                columnData: columnData,
-                                dataKey: dataKey
-                            });
-                        }, onKeyDown = function(event) {
-                            "Enter" !== event.key && " " !== event.key || onClick();
-                        };
-                        a11yProps["aria-label"] = column.props["aria-label"] || label || dataKey, a11yProps.role = "rowheader",
-                        a11yProps.tabIndex = 0, a11yProps.onClick = onClick, a11yProps.onKeyDown = onKeyDown;
-                    }(), _react2.default.createElement("div", (0, _extends3.default)({}, a11yProps, {
-                        key: "Header-Col" + index,
-                        className: classNames,
-                        style: style
-                    }), renderedHeader);
-                }
-            }, {
-                key: "_createRow",
-                value: function(_ref4) {
-                    var _this3 = this, index = _ref4.rowIndex, isScrolling = _ref4.isScrolling, key = _ref4.key, style = _ref4.style, _props3 = this.props, children = _props3.children, onRowClick = _props3.onRowClick, onRowDoubleClick = _props3.onRowDoubleClick, onRowMouseOver = _props3.onRowMouseOver, onRowMouseOut = _props3.onRowMouseOut, rowClassName = _props3.rowClassName, rowGetter = _props3.rowGetter, rowRenderer = _props3.rowRenderer, rowStyle = _props3.rowStyle, scrollbarWidth = this.state.scrollbarWidth, rowClass = rowClassName instanceof Function ? rowClassName({
-                        index: index
-                    }) : rowClassName, rowStyleObject = rowStyle instanceof Function ? rowStyle({
-                        index: index
-                    }) : rowStyle, rowData = rowGetter({
-                        index: index
-                    }), columns = _react2.default.Children.toArray(children).map(function(column, columnIndex) {
-                        return _this3._createColumn({
-                            column: column,
-                            columnIndex: columnIndex,
-                            isScrolling: isScrolling,
-                            rowData: rowData,
-                            rowIndex: index,
-                            scrollbarWidth: scrollbarWidth
-                        });
-                    }), className = (0, _classnames2.default)("ReactVirtualized__Table__row", rowClass), flattenedStyle = (0,
-                    _extends3.default)({}, style, rowStyleObject, {
-                        height: this._getRowHeight(index),
-                        overflow: "hidden",
-                        paddingRight: scrollbarWidth
-                    });
-                    return rowRenderer({
-                        className: className,
-                        columns: columns,
-                        index: index,
-                        isScrolling: isScrolling,
-                        key: key,
-                        onRowClick: onRowClick,
-                        onRowDoubleClick: onRowDoubleClick,
-                        onRowMouseOver: onRowMouseOver,
-                        onRowMouseOut: onRowMouseOut,
-                        rowData: rowData,
-                        style: flattenedStyle
-                    });
-                }
-            }, {
-                key: "_getFlexStyleForColumn",
-                value: function(column) {
-                    var customStyle = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {}, flexValue = column.props.flexGrow + " " + column.props.flexShrink + " " + column.props.width + "px", style = (0,
-                    _extends3.default)({}, customStyle, {
-                        flex: flexValue,
-                        msFlex: flexValue,
-                        WebkitFlex: flexValue
-                    });
-                    return column.props.maxWidth && (style.maxWidth = column.props.maxWidth), column.props.minWidth && (style.minWidth = column.props.minWidth),
-                    style;
-                }
-            }, {
-                key: "_getRenderedHeaderRow",
-                value: function() {
-                    var _this4 = this, _props4 = this.props, children = _props4.children, disableHeader = _props4.disableHeader, items = disableHeader ? [] : _react2.default.Children.toArray(children);
-                    return items.map(function(column, index) {
-                        return _this4._createHeader({
-                            column: column,
-                            index: index
-                        });
-                    });
-                }
-            }, {
-                key: "_getRowHeight",
-                value: function(rowIndex) {
-                    var rowHeight = this.props.rowHeight;
-                    return rowHeight instanceof Function ? rowHeight({
-                        index: rowIndex
-                    }) : rowHeight;
-                }
-            }, {
-                key: "_onScroll",
-                value: function(_ref5) {
-                    var clientHeight = _ref5.clientHeight, scrollHeight = _ref5.scrollHeight, scrollTop = _ref5.scrollTop, onScroll = this.props.onScroll;
-                    onScroll({
-                        clientHeight: clientHeight,
-                        scrollHeight: scrollHeight,
-                        scrollTop: scrollTop
-                    });
-                }
-            }, {
-                key: "_onSectionRendered",
-                value: function(_ref6) {
-                    var rowOverscanStartIndex = _ref6.rowOverscanStartIndex, rowOverscanStopIndex = _ref6.rowOverscanStopIndex, rowStartIndex = _ref6.rowStartIndex, rowStopIndex = _ref6.rowStopIndex, onRowsRendered = this.props.onRowsRendered;
-                    onRowsRendered({
-                        overscanStartIndex: rowOverscanStartIndex,
-                        overscanStopIndex: rowOverscanStopIndex,
-                        startIndex: rowStartIndex,
-                        stopIndex: rowStopIndex
-                    });
-                }
-            }, {
-                key: "_setScrollbarWidth",
-                value: function() {
-                    var Grid = (0, _reactDom.findDOMNode)(this.Grid), clientWidth = Grid.clientWidth || 0, offsetWidth = Grid.offsetWidth || 0, scrollbarWidth = offsetWidth - clientWidth;
-                    this.setState({
-                        scrollbarWidth: scrollbarWidth
-                    });
-                }
-            } ]), Table;
-        }(_react.Component);
-        Table.defaultProps = {
-            disableHeader: !1,
-            estimatedRowSize: 30,
-            headerHeight: 0,
-            headerStyle: {},
-            noRowsRenderer: function() {
-                return null;
-            },
-            onRowsRendered: function() {
-                return null;
-            },
-            onScroll: function() {
-                return null;
-            },
-            overscanRowCount: 10,
-            rowRenderer: _defaultRowRenderer2.default,
-            rowStyle: {},
-            scrollToAlignment: "auto",
-            style: {}
-        }, exports.default = Table;
-    }, /* 130 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2), _react = __webpack_require__(89), _defaultHeaderRenderer = __webpack_require__(131), _defaultHeaderRenderer2 = _interopRequireDefault(_defaultHeaderRenderer), _defaultCellRenderer = __webpack_require__(134), _defaultCellRenderer2 = _interopRequireDefault(_defaultCellRenderer), _defaultCellDataGetter = __webpack_require__(135), _defaultCellDataGetter2 = _interopRequireDefault(_defaultCellDataGetter), Column = function(_Component) {
-            function Column() {
-                return (0, _classCallCheck3.default)(this, Column), (0, _possibleConstructorReturn3.default)(this, (Column.__proto__ || (0,
-                _getPrototypeOf2.default)(Column)).apply(this, arguments));
-            }
-            return (0, _inherits3.default)(Column, _Component), Column;
-        }(_react.Component);
-        Column.defaultProps = {
-            cellDataGetter: _defaultCellDataGetter2.default,
-            cellRenderer: _defaultCellRenderer2.default,
-            flexGrow: 0,
-            flexShrink: 1,
-            headerRenderer: _defaultHeaderRenderer2.default,
-            style: {}
-        }, exports.default = Column;
-    }, /* 131 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        function defaultHeaderRenderer(_ref) {
-            var dataKey = (_ref.columnData, _ref.dataKey), label = (_ref.disableSort, _ref.label), sortBy = _ref.sortBy, sortDirection = _ref.sortDirection, showSortIndicator = sortBy === dataKey, children = [ _react2.default.createElement("span", {
-                className: "ReactVirtualized__Table__headerTruncatedText",
-                key: "label",
-                title: label
-            }, label) ];
-            return showSortIndicator && children.push(_react2.default.createElement(_SortIndicator2.default, {
-                key: "SortIndicator",
-                sortDirection: sortDirection
-            })), children;
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.default = defaultHeaderRenderer;
-        var _react = __webpack_require__(89), _react2 = _interopRequireDefault(_react), _SortIndicator = __webpack_require__(132), _SortIndicator2 = _interopRequireDefault(_SortIndicator);
-    }, /* 132 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        function SortIndicator(_ref) {
-            var sortDirection = _ref.sortDirection, classNames = (0, _classnames2.default)("ReactVirtualized__Table__sortableHeaderIcon", {
-                "ReactVirtualized__Table__sortableHeaderIcon--ASC": sortDirection === _SortDirection2.default.ASC,
-                "ReactVirtualized__Table__sortableHeaderIcon--DESC": sortDirection === _SortDirection2.default.DESC
-            });
-            return _react2.default.createElement("svg", {
-                className: classNames,
-                width: 18,
-                height: 18,
-                viewBox: "0 0 24 24"
-            }, sortDirection === _SortDirection2.default.ASC ? _react2.default.createElement("path", {
-                d: "M7 14l5-5 5 5z"
-            }) : _react2.default.createElement("path", {
-                d: "M7 10l5 5 5-5z"
-            }), _react2.default.createElement("path", {
-                d: "M0 0h24v24H0z",
-                fill: "none"
-            }));
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.default = SortIndicator;
-        var _react = __webpack_require__(89), _react2 = _interopRequireDefault(_react), _classnames = __webpack_require__(107), _classnames2 = _interopRequireDefault(_classnames), _SortDirection = __webpack_require__(133), _SortDirection2 = _interopRequireDefault(_SortDirection);
-    }, /* 133 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var SortDirection = {
-            ASC: "ASC",
-            DESC: "DESC"
-        };
-        exports.default = SortDirection;
-    }, /* 134 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        function defaultCellRenderer(_ref) {
-            var cellData = _ref.cellData;
-            _ref.cellDataKey, _ref.columnData, _ref.rowData, _ref.rowIndex;
-            return null == cellData ? "" : String(cellData);
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.default = defaultCellRenderer;
-    }, /* 135 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        function defaultCellDataGetter(_ref) {
-            var dataKey = (_ref.columnData, _ref.dataKey), rowData = _ref.rowData;
-            return rowData.get instanceof Function ? rowData.get(dataKey) : rowData[dataKey];
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.default = defaultCellDataGetter;
-    }, /* 136 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        function defaultRowRenderer(_ref) {
-            var className = _ref.className, columns = _ref.columns, index = _ref.index, key = (_ref.isScrolling,
-            _ref.key), onRowClick = _ref.onRowClick, onRowDoubleClick = _ref.onRowDoubleClick, onRowMouseOver = _ref.onRowMouseOver, onRowMouseOut = _ref.onRowMouseOut, style = (_ref.rowData,
-            _ref.style), a11yProps = {};
-            return (onRowClick || onRowDoubleClick || onRowMouseOver || onRowMouseOut) && (a11yProps["aria-label"] = "row",
-            a11yProps.role = "row", a11yProps.tabIndex = 0, onRowClick && (a11yProps.onClick = function() {
-                return onRowClick({
-                    index: index
-                });
-            }), onRowDoubleClick && (a11yProps.onDoubleClick = function() {
-                return onRowDoubleClick({
-                    index: index
-                });
-            }), onRowMouseOut && (a11yProps.onMouseOut = function() {
-                return onRowMouseOut({
-                    index: index
-                });
-            }), onRowMouseOver && (a11yProps.onMouseOver = function() {
-                return onRowMouseOver({
-                    index: index
-                });
-            })), _react2.default.createElement("div", (0, _extends3.default)({}, a11yProps, {
-                className: className,
-                key: key,
-                style: style
-            }), columns);
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _extends2 = __webpack_require__(100), _extends3 = _interopRequireDefault(_extends2);
-        exports.default = defaultRowRenderer;
-        var _react = __webpack_require__(89), _react2 = _interopRequireDefault(_react);
-    }, /* 137 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.InfiniteLoader = exports.default = void 0;
-        var _InfiniteLoader2 = __webpack_require__(138), _InfiniteLoader3 = _interopRequireDefault(_InfiniteLoader2);
-        exports.default = _InfiniteLoader3.default, exports.InfiniteLoader = _InfiniteLoader3.default;
-    }, /* 138 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        function isRangeVisible(_ref2) {
-            var lastRenderedStartIndex = _ref2.lastRenderedStartIndex, lastRenderedStopIndex = _ref2.lastRenderedStopIndex, startIndex = _ref2.startIndex, stopIndex = _ref2.stopIndex;
-            return !(startIndex > lastRenderedStopIndex || stopIndex < lastRenderedStartIndex);
-        }
-        function scanForUnloadedRanges(_ref3) {
-            for (var isRowLoaded = _ref3.isRowLoaded, minimumBatchSize = _ref3.minimumBatchSize, rowCount = _ref3.rowCount, startIndex = _ref3.startIndex, stopIndex = _ref3.stopIndex, unloadedRanges = [], rangeStartIndex = null, rangeStopIndex = null, index = startIndex; index <= stopIndex; index++) {
-                var loaded = isRowLoaded({
-                    index: index
-                });
-                loaded ? null !== rangeStopIndex && (unloadedRanges.push({
-                    startIndex: rangeStartIndex,
-                    stopIndex: rangeStopIndex
-                }), rangeStartIndex = rangeStopIndex = null) : (rangeStopIndex = index, null === rangeStartIndex && (rangeStartIndex = index));
-            }
-            if (null !== rangeStopIndex) {
-                for (var potentialStopIndex = Math.min(Math.max(rangeStopIndex, rangeStartIndex + minimumBatchSize - 1), rowCount - 1), _index = rangeStopIndex + 1; _index <= potentialStopIndex && !isRowLoaded({
-                    index: _index
-                }); _index++) rangeStopIndex = _index;
-                unloadedRanges.push({
-                    startIndex: rangeStartIndex,
-                    stopIndex: rangeStopIndex
-                });
-            }
-            if (unloadedRanges.length) for (var firstUnloadedRange = unloadedRanges[0]; firstUnloadedRange.stopIndex - firstUnloadedRange.startIndex + 1 < minimumBatchSize && firstUnloadedRange.startIndex > 0; ) {
-                var _index2 = firstUnloadedRange.startIndex - 1;
-                if (isRowLoaded({
-                    index: _index2
-                })) break;
-                firstUnloadedRange.startIndex = _index2;
-            }
-            return unloadedRanges;
-        }
-        function forceUpdateReactVirtualizedComponent(component) {
-            "function" == typeof component.forceUpdateGrid ? component.forceUpdateGrid() : component.forceUpdate();
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2);
-        exports.isRangeVisible = isRangeVisible, exports.scanForUnloadedRanges = scanForUnloadedRanges,
-        exports.forceUpdateReactVirtualizedComponent = forceUpdateReactVirtualizedComponent;
-        var _react = __webpack_require__(89), _reactAddonsShallowCompare = __webpack_require__(90), _reactAddonsShallowCompare2 = _interopRequireDefault(_reactAddonsShallowCompare), _createCallbackMemoizer = __webpack_require__(108), _createCallbackMemoizer2 = _interopRequireDefault(_createCallbackMemoizer), InfiniteLoader = function(_Component) {
-            function InfiniteLoader(props, context) {
-                (0, _classCallCheck3.default)(this, InfiniteLoader);
-                var _this = (0, _possibleConstructorReturn3.default)(this, (InfiniteLoader.__proto__ || (0,
-                _getPrototypeOf2.default)(InfiniteLoader)).call(this, props, context));
-                return _this._loadMoreRowsMemoizer = (0, _createCallbackMemoizer2.default)(), _this._onRowsRendered = _this._onRowsRendered.bind(_this),
-                _this._registerChild = _this._registerChild.bind(_this), _this;
-            }
-            return (0, _inherits3.default)(InfiniteLoader, _Component), (0, _createClass3.default)(InfiniteLoader, [ {
-                key: "render",
-                value: function() {
-                    var children = this.props.children;
-                    return children({
-                        onRowsRendered: this._onRowsRendered,
-                        registerChild: this._registerChild
-                    });
-                }
-            }, {
-                key: "shouldComponentUpdate",
-                value: function(nextProps, nextState) {
-                    return (0, _reactAddonsShallowCompare2.default)(this, nextProps, nextState);
-                }
-            }, {
-                key: "_loadUnloadedRanges",
-                value: function(unloadedRanges) {
-                    var _this2 = this, loadMoreRows = this.props.loadMoreRows;
-                    unloadedRanges.forEach(function(unloadedRange) {
-                        var promise = loadMoreRows(unloadedRange);
-                        promise && promise.then(function() {
-                            isRangeVisible({
-                                lastRenderedStartIndex: _this2._lastRenderedStartIndex,
-                                lastRenderedStopIndex: _this2._lastRenderedStopIndex,
-                                startIndex: unloadedRange.startIndex,
-                                stopIndex: unloadedRange.stopIndex
-                            }) && _this2._registeredChild && forceUpdateReactVirtualizedComponent(_this2._registeredChild);
-                        });
-                    });
-                }
-            }, {
-                key: "_onRowsRendered",
-                value: function(_ref) {
-                    var _this3 = this, startIndex = _ref.startIndex, stopIndex = _ref.stopIndex, _props = this.props, isRowLoaded = _props.isRowLoaded, minimumBatchSize = _props.minimumBatchSize, rowCount = _props.rowCount, threshold = _props.threshold;
-                    this._lastRenderedStartIndex = startIndex, this._lastRenderedStopIndex = stopIndex;
-                    var unloadedRanges = scanForUnloadedRanges({
-                        isRowLoaded: isRowLoaded,
-                        minimumBatchSize: minimumBatchSize,
-                        rowCount: rowCount,
-                        startIndex: Math.max(0, startIndex - threshold),
-                        stopIndex: Math.min(rowCount - 1, stopIndex + threshold)
-                    }), squashedUnloadedRanges = unloadedRanges.reduce(function(reduced, unloadedRange) {
-                        return reduced.concat([ unloadedRange.startIndex, unloadedRange.stopIndex ]);
-                    }, []);
-                    this._loadMoreRowsMemoizer({
-                        callback: function() {
-                            _this3._loadUnloadedRanges(unloadedRanges);
-                        },
-                        indices: {
-                            squashedUnloadedRanges: squashedUnloadedRanges
-                        }
-                    });
-                }
-            }, {
-                key: "_registerChild",
-                value: function(registeredChild) {
-                    this._registeredChild = registeredChild;
-                }
-            } ]), InfiniteLoader;
-        }(_react.Component);
-        InfiniteLoader.defaultProps = {
-            minimumBatchSize: 10,
-            rowCount: 0,
-            threshold: 15
-        }, exports.default = InfiniteLoader;
-    }, /* 139 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.ScrollSync = exports.default = void 0;
-        var _ScrollSync2 = __webpack_require__(140), _ScrollSync3 = _interopRequireDefault(_ScrollSync2);
-        exports.default = _ScrollSync3.default, exports.ScrollSync = _ScrollSync3.default;
-    }, /* 140 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2), _react = __webpack_require__(89), _reactAddonsShallowCompare = __webpack_require__(90), _reactAddonsShallowCompare2 = _interopRequireDefault(_reactAddonsShallowCompare), ScrollSync = function(_Component) {
-            function ScrollSync(props, context) {
-                (0, _classCallCheck3.default)(this, ScrollSync);
-                var _this = (0, _possibleConstructorReturn3.default)(this, (ScrollSync.__proto__ || (0,
-                _getPrototypeOf2.default)(ScrollSync)).call(this, props, context));
-                return _this.state = {
-                    clientHeight: 0,
-                    clientWidth: 0,
-                    scrollHeight: 0,
-                    scrollLeft: 0,
-                    scrollTop: 0,
-                    scrollWidth: 0
-                }, _this._onScroll = _this._onScroll.bind(_this), _this;
-            }
-            return (0, _inherits3.default)(ScrollSync, _Component), (0, _createClass3.default)(ScrollSync, [ {
-                key: "render",
-                value: function() {
-                    var children = this.props.children, _state = this.state, clientHeight = _state.clientHeight, clientWidth = _state.clientWidth, scrollHeight = _state.scrollHeight, scrollLeft = _state.scrollLeft, scrollTop = _state.scrollTop, scrollWidth = _state.scrollWidth;
-                    return children({
-                        clientHeight: clientHeight,
-                        clientWidth: clientWidth,
-                        onScroll: this._onScroll,
-                        scrollHeight: scrollHeight,
-                        scrollLeft: scrollLeft,
-                        scrollTop: scrollTop,
-                        scrollWidth: scrollWidth
-                    });
-                }
-            }, {
-                key: "shouldComponentUpdate",
-                value: function(nextProps, nextState) {
-                    return (0, _reactAddonsShallowCompare2.default)(this, nextProps, nextState);
-                }
-            }, {
-                key: "_onScroll",
-                value: function(_ref) {
-                    var clientHeight = _ref.clientHeight, clientWidth = _ref.clientWidth, scrollHeight = _ref.scrollHeight, scrollLeft = _ref.scrollLeft, scrollTop = _ref.scrollTop, scrollWidth = _ref.scrollWidth;
-                    this.setState({
-                        clientHeight: clientHeight,
-                        clientWidth: clientWidth,
-                        scrollHeight: scrollHeight,
-                        scrollLeft: scrollLeft,
-                        scrollTop: scrollTop,
-                        scrollWidth: scrollWidth
-                    });
-                }
-            } ]), ScrollSync;
-        }(_react.Component);
-        exports.default = ScrollSync;
-    }, /* 141 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.List = exports.default = void 0;
-        var _List2 = __webpack_require__(142), _List3 = _interopRequireDefault(_List2);
-        exports.default = _List3.default, exports.List = _List3.default;
-    }, /* 142 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _objectWithoutProperties2 = __webpack_require__(105), _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2), _extends2 = __webpack_require__(100), _extends3 = _interopRequireDefault(_extends2), _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2), _Grid = __webpack_require__(120), _Grid2 = _interopRequireDefault(_Grid), _react = __webpack_require__(89), _react2 = _interopRequireDefault(_react), _classnames = __webpack_require__(107), _classnames2 = _interopRequireDefault(_classnames), _reactAddonsShallowCompare = __webpack_require__(90), _reactAddonsShallowCompare2 = _interopRequireDefault(_reactAddonsShallowCompare), List = function(_Component) {
-            function List(props, context) {
-                (0, _classCallCheck3.default)(this, List);
-                var _this = (0, _possibleConstructorReturn3.default)(this, (List.__proto__ || (0,
-                _getPrototypeOf2.default)(List)).call(this, props, context));
-                return _this._cellRenderer = _this._cellRenderer.bind(_this), _this._onScroll = _this._onScroll.bind(_this),
-                _this._onSectionRendered = _this._onSectionRendered.bind(_this), _this;
-            }
-            return (0, _inherits3.default)(List, _Component), (0, _createClass3.default)(List, [ {
-                key: "forceUpdateGrid",
-                value: function() {
-                    this.Grid.forceUpdate();
-                }
-            }, {
-                key: "measureAllRows",
-                value: function() {
-                    this.Grid.measureAllCells();
-                }
-            }, {
-                key: "recomputeRowHeights",
-                value: function() {
-                    var index = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : 0;
-                    this.Grid.recomputeGridSize({
-                        rowIndex: index
-                    }), this.forceUpdateGrid();
-                }
-            }, {
-                key: "render",
-                value: function() {
-                    var _this2 = this, _props = this.props, className = _props.className, noRowsRenderer = _props.noRowsRenderer, scrollToIndex = _props.scrollToIndex, width = _props.width, classNames = (0,
-                    _classnames2.default)("ReactVirtualized__List", className);
-                    return _react2.default.createElement(_Grid2.default, (0, _extends3.default)({}, this.props, {
-                        autoContainerWidth: !0,
-                        cellRenderer: this._cellRenderer,
-                        className: classNames,
-                        columnWidth: width,
-                        columnCount: 1,
-                        noContentRenderer: noRowsRenderer,
-                        onScroll: this._onScroll,
-                        onSectionRendered: this._onSectionRendered,
-                        ref: function(_ref) {
-                            _this2.Grid = _ref;
-                        },
-                        scrollToRow: scrollToIndex
-                    }));
-                }
-            }, {
-                key: "shouldComponentUpdate",
-                value: function(nextProps, nextState) {
-                    return (0, _reactAddonsShallowCompare2.default)(this, nextProps, nextState);
-                }
-            }, {
-                key: "_cellRenderer",
-                value: function(_ref2) {
-                    var rowIndex = _ref2.rowIndex, style = _ref2.style, rest = (0, _objectWithoutProperties3.default)(_ref2, [ "rowIndex", "style" ]), rowRenderer = this.props.rowRenderer;
-                    return style.width = "100%", rowRenderer((0, _extends3.default)({
-                        index: rowIndex,
-                        style: style
-                    }, rest));
-                }
-            }, {
-                key: "_onScroll",
-                value: function(_ref3) {
-                    var clientHeight = _ref3.clientHeight, scrollHeight = _ref3.scrollHeight, scrollTop = _ref3.scrollTop, onScroll = this.props.onScroll;
-                    onScroll({
-                        clientHeight: clientHeight,
-                        scrollHeight: scrollHeight,
-                        scrollTop: scrollTop
-                    });
-                }
-            }, {
-                key: "_onSectionRendered",
-                value: function(_ref4) {
-                    var rowOverscanStartIndex = _ref4.rowOverscanStartIndex, rowOverscanStopIndex = _ref4.rowOverscanStopIndex, rowStartIndex = _ref4.rowStartIndex, rowStopIndex = _ref4.rowStopIndex, onRowsRendered = this.props.onRowsRendered;
-                    onRowsRendered({
-                        overscanStartIndex: rowOverscanStartIndex,
-                        overscanStopIndex: rowOverscanStopIndex,
-                        startIndex: rowStartIndex,
-                        stopIndex: rowStopIndex
-                    });
-                }
-            } ]), List;
-        }(_react.Component);
-        List.defaultProps = {
-            estimatedRowSize: 30,
-            noRowsRenderer: function() {
-                return null;
-            },
-            onRowsRendered: function() {
-                return null;
-            },
-            onScroll: function() {
-                return null;
-            },
-            overscanRowCount: 10,
-            scrollToAlignment: "auto",
-            style: {}
-        }, exports.default = List;
-    }, /* 143 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.IS_SCROLLING_TIMEOUT = exports.WindowScroller = exports.default = void 0;
-        var _onScroll = __webpack_require__(144);
-        Object.defineProperty(exports, "IS_SCROLLING_TIMEOUT", {
-            enumerable: !0,
-            get: function() {
-                return _onScroll.IS_SCROLLING_TIMEOUT;
-            }
-        });
-        var _WindowScroller2 = __webpack_require__(145), _WindowScroller3 = _interopRequireDefault(_WindowScroller2);
-        exports.default = _WindowScroller3.default, exports.WindowScroller = _WindowScroller3.default;
-    }, /* 144 */
-    /***/
-    function(module, exports) {
-        "use strict";
-        function enablePointerEventsIfDisabled() {
-            disablePointerEventsTimeoutId && (disablePointerEventsTimeoutId = null, document.firstElementChild.style.pointerEvents = originalBodyPointerEvents,
-            originalBodyPointerEvents = null);
-        }
-        function enablePointerEventsAfterDelayCallback() {
-            enablePointerEventsIfDisabled(), mountedInstances.forEach(function(component) {
-                return component._enablePointerEventsAfterDelayCallback();
-            });
-        }
-        function enablePointerEventsAfterDelay() {
-            disablePointerEventsTimeoutId && clearTimeout(disablePointerEventsTimeoutId), disablePointerEventsTimeoutId = setTimeout(enablePointerEventsAfterDelayCallback, IS_SCROLLING_TIMEOUT);
-        }
-        function onScrollWindow(event) {
-            null == originalBodyPointerEvents && (originalBodyPointerEvents = document.firstElementChild.style.pointerEvents,
-            document.firstElementChild.style.pointerEvents = "none", enablePointerEventsAfterDelay()), mountedInstances.forEach(function(component) {
-                return component._onScrollWindow(event);
-            });
-        }
-        function registerScrollListener(component) {
-            mountedInstances.length || window.addEventListener("scroll", onScrollWindow), mountedInstances.push(component);
-        }
-        function unregisterScrollListener(component) {
-            mountedInstances = mountedInstances.filter(function(c) {
-                return c !== component;
-            }), mountedInstances.length || (window.removeEventListener("scroll", onScrollWindow),
-            disablePointerEventsTimeoutId && (clearTimeout(disablePointerEventsTimeoutId), enablePointerEventsIfDisabled()));
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.registerScrollListener = registerScrollListener, exports.unregisterScrollListener = unregisterScrollListener;
-        var mountedInstances = [], originalBodyPointerEvents = null, disablePointerEventsTimeoutId = null, IS_SCROLLING_TIMEOUT = exports.IS_SCROLLING_TIMEOUT = 150;
-    }, /* 145 */
-    /***/
-    function(module, exports, __webpack_require__) {
-        "use strict";
-        function _interopRequireDefault(obj) {
-            return obj && obj.__esModule ? obj : {
-                default: obj
-            };
-        }
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        });
-        var _getPrototypeOf = __webpack_require__(3), _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf), _classCallCheck2 = __webpack_require__(29), _classCallCheck3 = _interopRequireDefault(_classCallCheck2), _createClass2 = __webpack_require__(30), _createClass3 = _interopRequireDefault(_createClass2), _possibleConstructorReturn2 = __webpack_require__(34), _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2), _inherits2 = __webpack_require__(81), _inherits3 = _interopRequireDefault(_inherits2), _react = __webpack_require__(89), _react2 = _interopRequireDefault(_react), _reactDom = __webpack_require__(96), _reactDom2 = _interopRequireDefault(_reactDom), _reactAddonsShallowCompare = __webpack_require__(90), _reactAddonsShallowCompare2 = _interopRequireDefault(_reactAddonsShallowCompare), _onScroll = __webpack_require__(144), WindowScroller = function(_Component) {
-            function WindowScroller(props) {
-                (0, _classCallCheck3.default)(this, WindowScroller);
-                var _this = (0, _possibleConstructorReturn3.default)(this, (WindowScroller.__proto__ || (0,
-                _getPrototypeOf2.default)(WindowScroller)).call(this, props)), height = "undefined" != typeof window ? window.innerHeight : 0;
-                return _this.state = {
-                    isScrolling: !1,
-                    height: height,
-                    scrollTop: 0
-                }, _this._onScrollWindow = _this._onScrollWindow.bind(_this), _this._onResizeWindow = _this._onResizeWindow.bind(_this),
-                _this._enablePointerEventsAfterDelayCallback = _this._enablePointerEventsAfterDelayCallback.bind(_this),
-                _this;
-            }
-            return (0, _inherits3.default)(WindowScroller, _Component), (0, _createClass3.default)(WindowScroller, [ {
-                key: "componentDidMount",
-                value: function() {
-                    var height = this.state.height;
-                    this._positionFromTop = _reactDom2.default.findDOMNode(this).getBoundingClientRect().top - document.documentElement.getBoundingClientRect().top,
-                    height !== window.innerHeight && this.setState({
-                        height: window.innerHeight
-                    }), (0, _onScroll.registerScrollListener)(this), window.addEventListener("resize", this._onResizeWindow, !1);
-                }
-            }, {
-                key: "componentWillUnmount",
-                value: function() {
-                    (0, _onScroll.unregisterScrollListener)(this), window.removeEventListener("resize", this._onResizeWindow, !1);
-                }
-            }, {
-                key: "render",
-                value: function() {
-                    var children = this.props.children, _state = this.state, isScrolling = _state.isScrolling, scrollTop = _state.scrollTop, height = _state.height;
-                    return _react2.default.createElement("div", null, children({
-                        height: height,
-                        isScrolling: isScrolling,
-                        scrollTop: scrollTop
-                    }));
-                }
-            }, {
-                key: "shouldComponentUpdate",
-                value: function(nextProps, nextState) {
-                    return (0, _reactAddonsShallowCompare2.default)(this, nextProps, nextState);
-                }
-            }, {
-                key: "_enablePointerEventsAfterDelayCallback",
-                value: function() {
-                    this.setState({
-                        isScrolling: !1
-                    });
-                }
-            }, {
-                key: "_onResizeWindow",
-                value: function(event) {
-                    var onResize = this.props.onResize, height = window.innerHeight || 0;
-                    this.setState({
-                        height: height
-                    }), onResize({
-                        height: height
-                    });
-                }
-            }, {
-                key: "_onScrollWindow",
-                value: function(event) {
-                    var onScroll = this.props.onScroll, scrollY = "scrollY" in window ? window.scrollY : document.documentElement.scrollTop, scrollTop = Math.max(0, scrollY - this._positionFromTop);
-                    this.setState({
-                        isScrolling: !0,
-                        scrollTop: scrollTop
-                    }), onScroll({
-                        scrollTop: scrollTop
-                    });
-                }
-            } ]), WindowScroller;
-        }(_react.Component);
-        WindowScroller.defaultProps = {
-            onResize: function() {},
-            onScroll: function() {}
-        }, exports.default = WindowScroller;
-    } ]);
-});
-//# sourceMappingURL=react-virtualized.js.map
\ No newline at end of file
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index 93bb3859ab0a..e7c880f0b10b 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -155,7 +155,6 @@
       <li><a href="about:license#react">React License</a></li>
       <li><a href="about:license#react-intl">React Intl License</a></li>
       <li><a href="about:license#react-redux">React-Redux License</a></li>
-      <li><a href="about:license#react-virtualized">React Virtualized License</a></li>
       <li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
       <li><a href="about:license#redox_syscall">redox_syscall License</a></li>
       <li><a href="about:license#redux">Redux License</a></li>
@@ -5555,34 +5554,6 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-</pre>
-
-    <hr>
-
-    <h1><a id="react-virtualized"></a>React Virtualized License</h1>
-
-    <p>This license applies to the file
-    <code>devtools/client/shared/vendor/react-virtualized.js</code>.</p>
-<pre>
-Copyright (c) 2015 Brian Vaughn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

From f6bb451a7ac6fdfda25901018c05a4ec49f0be0b Mon Sep 17 00:00:00 2001
From: Edouard Oger <eoger@fastmail.com>
Date: Tue, 28 Nov 2017 14:24:24 -0500
Subject: [PATCH 058/219] Bug 1419838 - Make Synced Tabs sidebar translucent
 friendly in all states. r=markh

MozReview-Commit-ID: 3O7J5D4o8hF

--HG--
extra : rebase_source : 2fffcea87ca284b1e525ebea437c2394570b912b
---
 .../themes/shared/fxa/sync-illustration.svg   | 105 +++++++++---------
 .../themes/shared/syncedtabs/sidebar.inc.css  |   1 +
 2 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/browser/themes/shared/fxa/sync-illustration.svg b/browser/themes/shared/fxa/sync-illustration.svg
index a85f954b3b04..74755f0cdcd0 100755
--- a/browser/themes/shared/fxa/sync-illustration.svg
+++ b/browser/themes/shared/fxa/sync-illustration.svg
@@ -1,59 +1,62 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 173.87 156.5">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 173.9 156.5">
   <style>
-    .cls-1{fill:#eaeaee;}
-    .cls-2{fill:#fff;}
-    .cls-3{fill:url(#linear-gradient);}
-    .cls-4{fill:#f9f9fa;}
-    .cls-5{fill:url(#New_Gradient_Swatch_1);}
-    .cls-6{fill:url(#New_Gradient_Swatch_1-2);}
-    .cls-7{fill:url(#New_Gradient_Swatch_1-3);}
-    .cls-8{fill:url(#New_Gradient_Swatch_1-4);}
-    .cls-9{fill:url(#linear-gradient-2);}
-    .cls-10{fill:url(#New_Gradient_Swatch_1-5);}
+    .st0{opacity:0.1;fill:#0C0C0D;enable-background:new ;} .st1{fill:#FFFFFF;} .st2{fill:url(#SVGID_1_);} .st3{fill:#F9F9FA;} .st4{fill:url(#SVGID_2_);} .st5{fill:url(#SVGID_3_);} .st6{fill:url(#SVGID_4_);} .st7{fill:url(#SVGID_5_);} .st8{fill:url(#SVGID_6_);} .st9{fill:url(#SVGID_7_);}
   </style>
-  <defs>
-    <linearGradient id="linear-gradient" x1="55.45" y1="55.54" x2="128.28" y2="128.38" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#ccfbff"/>
-      <stop offset="1" stop-color="#c9e4ff"/>
+  <path class="st0" d="M140.9 152h-69c-.6 0-1-.4-1-1s.4-1 1-1H141c.6 0 1 .4 1 1s-.5 1-1.1 1zm-9.3-5.1h-12c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h12c.3 0 .5.2.5.5s-.2.5-.5.5zm-15.7 9.6h-12c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h12c.3 0 .5.2.5.5s-.2.5-.5.5zm-20 0h-3c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h3c.3 0 .5.2.5.5s-.2.5-.5.5zm-7 0h-1c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h1c.3 0 .5.2.5.5s-.2.5-.5.5zm-10 0h-12c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h12c.3 0 .5.2.5.5s-.2.5-.5.5zm-20 0h-3c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h3c.3 0 .5.2.5.5s-.2.5-.5.5zm-7 0h-1c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h1c.3 0 .5.2.5.5s-.2.5-.5.5zm-10 0h-12c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h12c.3 0 .5.2.5.5s-.2.5-.5.5zm-20 0h-3c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h3c.3 0 .5.2.5.5s-.2.5-.5.5zm-7 0h-1c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h1c.3 0 .5.2.5.5s-.2.5-.5.5z"/>
+  <path class="st1" d="M85 20.4h21.3s-6.7-14.9 7.5-16.8c12.6-1.7 17.6 11.3 17.6 11.3s1.5-7.5 9-6.1 12.9 13.3 12.9 13.3h18.6"/>
+  <path class="st0" d="M172.2 18.6h-4c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h4c.3 0 .5.2.5.5s-.2.5-.5.5zm-13 0h-1c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h1c.3 0 .5.2.5.5s-.2.5-.5.5zm-5 0h-.8c-.1-.1-.2-.1-.2-.2-.1-.2-.5-1-1.2-2.1-.1-.2-.1-.5.2-.7.2-.1.5-.1.7.2.5.8.9 1.5 1.1 1.9h.2c.3 0 .5.2.5.5s-.2.4-.5.4zm-47.5-.6h-1.3c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h.6c-.1-.2-.2-.6-.3-.9-.1-.3.1-.6.3-.7.3-.1.6.1.7.3.3.9.6 1.5.6 1.5.1.3 0 .5-.3.7-.1.1-.2.1-.3.1zm-9.3 0h-12c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h12c.3 0 .5.2.5.5s-.3.5-.5.5zm7.8-5.5c-.3 0-.5-.2-.5-.4 0-.3-.1-.7-.1-1s.2-.5.5-.5.5.2.5.5 0 .6.1 1c.1.2-.1.4-.5.4.1.1.1.1 0 0zm26.2-1c-.2 0-.4-.1-.4-.3-.1-.2-.3-.5-.4-.9-.1-.2 0-.5.2-.7.2-.1.5 0 .7.2.2.3.3.6.5.9.1.2 0 .5-.2.7-.3.1-.3.1-.4.1zm16.1-1.3c-.1 0-.3 0-.4-.1-1.7-1.8-4-3.1-6.4-3.7-1.3-.3-2.6-.2-3.9.2-.3.1-.5-.1-.6-.3-.1-.3.1-.5.3-.6 1.4-.4 2.9-.5 4.4-.2 2.6.6 5.1 2 6.9 4 .2.2.2.5 0 .7-.1-.1-.2 0-.3 0zm-18.8-3c-.2 0-.3-.1-.4-.2-.6-.8-1.3-1.5-2-2.1-.2-.2-.1-.5.1-.7.2-.1.4-.1.6 0 .8.7 1.5 1.4 2.1 2.2.2.2.1.5-.1.7 0 .1-.2.1-.3.1zm-20.5-3.8c-.3 0-.5-.2-.5-.5 0-.2.1-.3.2-.4 1.8-1.3 4-2.2 6.2-2.4 1.9-.3 3.8-.2 5.7.2.3.1.5.3.4.6s-.3.5-.6.4c-1.7-.4-3.5-.4-5.3-.2-2.1.2-4.1.9-5.7 2.2-.2.1-.3.1-.4.1z"/>
+  <path class="st1" d="M172.9 22.4H85c-.6 0-1-.4-1-1s.4-1 1-1h87.9c.6 0 1 .4 1 1s-.5 1-1 1zM.8 37.7h11.9s-3.7-8.3 4.2-9.4c7-1 9.8 6.3 9.8 6.3s.8-4.2 5-3.4 7.2 7.4 7.2 7.4h10.3"/>
+  <path class="st0" d="M13 36.4H1.1c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h11.5c.2-.2.5-.2.7 0l.1.1v.1c.1.3 0 .5-.3.7 0 .1-.1.1-.1.1zm32.9-.2h-3c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h3c.3 0 .5.2.5.5s-.2.5-.5.5zM27 33h-.1c-.3-.1-.4-.4-.3-.6.5-2 2.3-3.5 4.4-3.5.4 0 .7 0 1.1.1 1.9.5 3.6 1.5 4.9 3 .2.2.2.5 0 .7s-.5.2-.7 0c-1.1-1.3-2.6-2.3-4.3-2.7-.3-.1-.6-.1-.9-.1-1.7 0-3.1 1.2-3.4 2.8-.3.2-.5.3-.7.3zm-13.6-4.3c-.3 0-.5-.2-.5-.5 0-.1.1-.3.1-.4.8-.8 1.8-1.3 2.8-1.6.3-.1.6.1.6.4s-.1.6-.4.6c-.9.2-1.7.7-2.4 1.3.1.2 0 .2-.2.2zm7.5-1.3h-.1c-.3-.1-.6-.2-.9-.2-.3-.1-.5-.3-.4-.6.1-.3.3-.5.6-.4.3.1.7.2 1 .3.3 0 .5.3.4.6 0 .1-.3.3-.6.3z"/>
+  <path class="st1" d="M49.9 39.7H1c-.6 0-1-.4-1-1s.4-1 1-1h48.8c.6 0 1 .4 1 1s-.4 1-.9 1zm85.5 37.5h-15.3V60.3c0-4.2-3.4-7.5-7.6-7.5H51.1c-4.2 0-7.5 3.4-7.5 7.5V101c0 1.3.4 2.6 1 3.7-.4.5-.8 1-1 1.6l-6.9 16.1c-.3.7-.5 1.5-.5 2.3v1.1c.1 3.4 2.8 6.1 6.2 6h60v3.2c0 4.1 3.3 7.4 7.4 7.4h25.6c4.1 0 7.4-3.3 7.4-7.4V84.7c.1-4.2-3.2-7.5-7.4-7.5z"/>
+  <path class="st1" d="M50.8 56.5h61.4c2 0 3.6 1.6 3.6 3.5v40.7c0 2-1.6 3.6-3.6 3.6H50.8c-2 0-3.5-1.6-3.5-3.6V60.1c0-2 1.6-3.6 3.5-3.6z"/>
+  <path class="st1" d="M52.7 62.5h57.7c1.2 0 2.1.9 2.1 2.1V99c0 1.2-.9 2.1-2.1 2.1H52.7c-1.2 0-2.1-.9-2.1-2.1V64.6c0-1.1 1-2.1 2.1-2.1z"/>
+  <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="55.4468" y1="665.5432" x2="128.2768" y2="738.3832" gradientTransform="translate(.02 -609.83)">
+    <stop offset="0" stop-color="#CCFBFF"/>
+    <stop offset="1" stop-color="#C9E4FF"/>
+  </linearGradient>
+  <path class="st2" d="M110.4 63.5c.6 0 1.1.5 1.1 1.1V99c0 .6-.5 1.1-1.1 1.1H52.7c-.6 0-1.1-.5-1.1-1.1V64.6c0-.6.5-1.1 1.1-1.1h57.7"/>
+  <path class="st3" d="M115.7 107.6c-.4-.8-1.2-1.3-2.1-1.2H49c-.9 0-1.7.5-2.1 1.3L40 123.8c-.1.2-.1.5-.1.7v1.1c.1 1.2 1 2.1 2.2 2H121c1.2.1 2.2-.8 2.2-2v-1c0-.3-.1-.5-.2-.7l-7.3-16.3z"/>
+  <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-4.5021" y1="627.6644" x2="182.4979" y2="797.1644" gradientTransform="translate(.02 -609.83)">
+    <stop offset="0" stop-color="#00C8D7"/>
+    <stop offset="1" stop-color="#0A84FF"/>
+  </linearGradient>
+  <path class="st4" d="M124.9 122.9l-7.3-16.1c-.3-.8-.9-1.4-1.6-1.8 1.2-1.1 1.9-2.6 1.9-4.2V60.1c0-3.1-2.5-5.5-5.6-5.5H50.9c-3.1 0-5.5 2.5-5.5 5.5v40.7c0 1.5.6 3 1.7 4-.9.4-1.6 1.1-2 2L38.2 123c-.2.5-.3 1-.3 1.5v1.1c.1 2.3 1.9 4.1 4.2 4H121c2.3.1 4.2-1.7 4.2-4v-1c0-.6-.1-1.2-.3-1.7zm-1.7 2.6c-.1 1.2-1 2.1-2.2 2H42.1c-1.2.1-2.2-.8-2.2-2v-1.1c0-.2 0-.5.1-.7l6.9-16.1c.4-.8 1.2-1.3 2.1-1.3h64.7c.9 0 1.7.5 2.1 1.2l7.3 16.1c.1.2.2.5.2.7l-.1 1.2zm-75.9-24.7V60.1c0-2 1.6-3.5 3.5-3.5h61.4c2 0 3.6 1.6 3.6 3.5v40.7c0 2-1.6 3.6-3.5 3.6H50.9c-2 0-3.6-1.6-3.6-3.6z"/>
+  <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-51.3994" y1="590.94" x2="201.6006" y2="840.94" gradientTransform="translate(.02 -609.83)">
+    <stop offset="0" stop-color="#00C8D7"/>
+    <stop offset="1" stop-color="#0A84FF"/>
+  </linearGradient>
+  <path class="st5" d="M94.7 121.8H68.4c-.4 0-.8-.2-.8-.5.3-1.7.5-2.6.8-4.4 0-.2.3-.4.7-.4l25.3-.2c.4 0 .7.2.7.4.2 1.5.4 3 .4 4.5.1.4-.3.6-.8.6zM64 112.4h-3.9c-.3 0-.6.2-.7.4-.1.5-.2.7-.3 1.2s.4.7.9.7h3.8c.3 0 .6-.1.7-.3.1-.5.2-.7.3-1.2s-.3-.8-.8-.8zm9.9 0h-4.1c-.4 0-.7.2-.7.4-.1.5-.1.7-.2 1.2-.1.3.4.6.9.6h3.9c.3 0 .6-.1.7-.4.1-.5.2-.7.3-1.2.1-.4-.3-.7-.8-.6zm20.5 1.4c-.1-.5-.1-.7-.2-1.2 0-.2-.3-.4-.7-.4h-4.1c-.5 0-.9.3-.9.6l.3 1.2c0 .2.3.4.7.4h3.9c.6 0 1.1-.3 1-.6zm-9.9.1l-.2-1.2c0-.2-.4-.4-.8-.4h-3.7c-.4 0-.8.2-.8.4-.1.5-.2.7-.2 1.2-.1.3.3.6.8.6h4.1c.4-.1.8-.3.8-.6zm19.6-.2l-.2-1.2c0-.2-.3-.3-.6-.3h-3.9c-.5 0-1 .3-.9.7l.3 1.2c.1.2.3.3.7.3h3.8c.4-.1.9-.4.8-.7zm-39.1-5h-3.7c-.3 0-.5.1-.6.3-.1.4-.2.7-.3 1.1s.3.6.8.6h3.6c.3 0 .5-.1.7-.3.2-.4.2-.7.4-1.1s-.4-.6-.9-.6zm9.4 0h-3.9c-.4 0-.7.2-.7.4-.1.4-.2.7-.3 1.1s.3.6.8.6h3.8c.3 0 .6-.1.7-.4.1-.4.2-.7.3-1.1s-.3-.6-.7-.6zm19.6 1.4l-.2-1.1c0-.2-.3-.4-.7-.4h-3.9c-.5 0-.9.3-.8.6l.2 1.1c0 .2.3.4.7.4h3.8c.5-.1.9-.3.9-.6zm-9.5.1l-.2-1.1c0-.2-.3-.4-.7-.4H80c-.4 0-.7.2-.8.4-.1.4-.2.7-.3 1.1-.1.3.3.5.8.5h3.9c.5 0 .9-.3.9-.5zm18.7-.1l-.2-1.1c0-.2-.3-.3-.6-.3h-3.7c-.5 0-1 .3-.9.6l.3 1.1c.1.2.3.3.6.3h3.6c.5-.1.9-.4.9-.6zm-48.1 2.4h-3.8c-.3 0-.6.1-.7.4-.2.4-.3.8-.4 1.2-.1.3.4.7.9.7h3.7c.3 0 .6-.2.6-.4.1-.4.2-.8.4-1.2.2-.5-.2-.8-.7-.7zm1.3-3.7h-3.5c-.2 0-.5.1-.6.3-.1.4-.2.7-.4 1.1-.1.3.2.6.7.6h3.5c.3 0 .5-.1.7-.3.2-.4.3-.7.5-1.1s-.4-.7-.9-.6zm50.9 4.1c.1.4.3.8.3 1.1 0 .2.3.3.6.3h3.7c.5 0 1-.3.9-.6-.1-.4-.2-.8-.3-1.1-.1-.2-.4-.4-.7-.3h-3.7c-.5-.1-.9.2-.8.6zm-1.1-3.7c.1.4.2.7.4 1.1.1.2.4.3.6.3h3.4c.5 0 .8-.3.8-.6-.1-.4-.2-.7-.3-1.1 0-.2-.2-.3-.6-.3H107c-.4 0-.9.3-.8.6z"/>
+  <g>
+    <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-22.6206" y1="563.3309" x2="225.3794" y2="813.3309" gradientTransform="translate(0 -610)">
+      <stop offset="0" stop-color="#00C8D7"/>
+      <stop offset="1" stop-color="#0A84FF"/>
     </linearGradient>
-    <linearGradient id="New_Gradient_Swatch_1" x1="-4.48" y1="17.64" x2="182.52" y2="187.14" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#00c8d7"/>
-      <stop offset="1" stop-color="#0a84ff"/>
+    <circle class="st6" cx="82.6" cy="59.4" r="1.2"/>
+  </g>
+  <path class="st1" d="M109.6 80h25.6c2.5 0 4.4 2 4.4 4.4v50.3c0 2.5-2 4.4-4.4 4.4h-25.6c-2.5 0-4.4-2-4.4-4.4V84.4c-.1-2.4 1.9-4.4 4.4-4.4z"/>
+  <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-19.2553" y1="590.7758" x2="221.2447" y2="809.2758" gradientTransform="translate(.02 -609.83)">
+    <stop offset="0" stop-color="#00C8D7"/>
+    <stop offset="1" stop-color="#0A84FF"/>
+  </linearGradient>
+  <path class="st7" d="M135.1 81c1.9 0 3.4 1.5 3.4 3.4v50.3c0 1.9-1.5 3.4-3.4 3.4h-25.6c-1.9 0-3.4-1.5-3.4-3.4V84.4c0-1.9 1.5-3.4 3.4-3.4h25.6m0-2h-25.6c-3 0-5.4 2.4-5.4 5.4v50.3c0 3 2.4 5.4 5.4 5.4h25.6c3 0 5.4-2.4 5.4-5.4V84.4c.1-3-2.4-5.4-5.4-5.4z"/>
+  <g>
+    <path class="st1" d="M111.1 84.8h22.4c.9 0 1.7.8 1.7 1.7v41.9c0 .9-.8 1.7-1.7 1.7h-22.4c-.9 0-1.7-.8-1.7-1.7V86.5c0-.9.8-1.7 1.7-1.7z"/>
+    <linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="62.995" y1="657.995" x2="135.835" y2="730.835" gradientTransform="translate(.02 -609.83)">
+      <stop offset="0" stop-color="#CCFBFF"/>
+      <stop offset="1" stop-color="#C9E4FF"/>
     </linearGradient>
-    <linearGradient id="New_Gradient_Swatch_1-2" x1="-51.35" y1="-19.11" x2="201.65" y2="230.89" xlink:href="#New_Gradient_Swatch_1"/>
-    <linearGradient id="New_Gradient_Swatch_1-3" x1="-22.65" y1="-46.64" x2="225.35" y2="203.36" xlink:href="#New_Gradient_Swatch_1"/>
-    <linearGradient id="New_Gradient_Swatch_1-4" x1="-19.25" y1="-19.23" x2="221.25" y2="199.27" xlink:href="#New_Gradient_Swatch_1"/>
-    <linearGradient id="linear-gradient-2" x1="63.01" y1="47.98" x2="135.85" y2="120.82" xlink:href="#linear-gradient"/>
-    <linearGradient id="New_Gradient_Swatch_1-5" x1="-73.41" y1="91.75" x2="262.92" y2="91.75" xlink:href="#New_Gradient_Swatch_1"/>
-  </defs>
-  <path class="cls-1" d="M140.93,151.83H71.85a1,1,0,0,1,0-2h69.08a1,1,0,0,1,0,2Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-1" d="M131.6,146.72h-12a.5.5,0,0,1,0-1h12a.5.5,0,1,1,0,1Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-1" d="M115.89,156.33h-12a.5.5,0,1,1,0-1h12a.5.5,0,0,1,0,1Zm-20,0h-3a.5.5,0,0,1,0-1h3a.5.5,0,1,1,0,1Zm-7,0h-1a.5.5,0,0,1,0-1h1a.5.5,0,1,1,0,1Zm-10,0h-12a.5.5,0,0,1,0-1h12a.5.5,0,1,1,0,1Zm-20,0h-3a.5.5,0,1,1,0-1h3a.5.5,0,0,1,0,1Zm-7,0h-1a.5.5,0,1,1,0-1h1a.5.5,0,0,1,0,1Zm-10,0h-12a.5.5,0,1,1,0-1h12a.5.5,0,0,1,0,1Zm-20,0h-3a.5.5,0,1,1,0-1h3a.5.5,0,0,1,0,1Zm-7,0h-1a.5.5,0,1,1,0-1h1a.5.5,0,0,1,0,1Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-2" d="M85,20.23H106.3S99.63,5.33,113.8,3.4c12.63-1.72,17.62,11.27,17.62,11.27s1.5-7.49,9-6.05S153.3,21.94,153.3,21.94h18.57" transform="translate(0.02 0.17)"/>
-  <path class="cls-1" d="M172.23,18.44h-4a.5.5,0,0,1,0-1h4a.5.5,0,0,1,0,1Zm-13,0h-1a.5.5,0,1,1,0-1h1a.5.5,0,1,1,0,1Zm-5,0h-.56a.5.5,0,0,1-.22-.05.54.54,0,0,1-.23-.23c-.11-.22-.53-1-1.2-2.08a.5.5,0,0,1,.85-.53c.53.84.9,1.52,1.1,1.89h.25a.5.5,0,1,1,0,1Zm-47.56-.61h-1.32a.5.5,0,1,1,0-1h.58c-.09-.25-.2-.56-.32-.92a.5.5,0,1,1,1-.31c.3.93.56,1.52.56,1.53a.5.5,0,0,1-.46.7Zm-9.32,0h-12a.5.5,0,1,1,0-1h12a.5.5,0,1,1,0,1Zm7.87-5.48a.5.5,0,0,1-.5-.44c0-.34-.07-.68-.09-1a.5.5,0,1,1,1-.06c0,.33,0,.65.09,1a.5.5,0,0,1-.44.56Zm26.15-1a.5.5,0,0,1-.45-.28c-.12-.25-.27-.54-.45-.87a.5.5,0,1,1,.88-.48c.19.34.34.65.47.91a.5.5,0,0,1-.45.72ZM147.48,10a.5.5,0,0,1-.35-.14,13.18,13.18,0,0,0-6.43-3.72,7.66,7.66,0,0,0-3.88.16.5.5,0,1,1-.32-.95,8.66,8.66,0,0,1,4.38-.19,14.15,14.15,0,0,1,6.93,4,.5.5,0,0,1-.35.86Zm-18.8-3a.5.5,0,0,1-.39-.19,19.12,19.12,0,0,0-2-2.13A.5.5,0,0,1,127,4a20.34,20.34,0,0,1,2.1,2.24.5.5,0,0,1-.39.81ZM108.19,3.27a.5.5,0,0,1-.31-.89A12.51,12.51,0,0,1,114.1,0a16.12,16.12,0,0,1,5.66.2.5.5,0,1,1-.22,1A15.06,15.06,0,0,0,114.23,1a11.54,11.54,0,0,0-5.73,2.18A.5.5,0,0,1,108.19,3.27Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-2" d="M172.85,22.23h0L85,22.21a1,1,0,1,1,0-2h0l87.87,0a1,1,0,1,1,0,2Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-2" d="M.76,37.55H12.62s-3.71-8.29,4.17-9.36c7-1,9.8,6.26,9.8,6.26s.83-4.16,5-3.37,7.16,7.41,7.16,7.41H49.08" transform="translate(0.02 0.17)"/>
-  <path class="cls-1" d="M13,36.23H1.13a.5.5,0,0,1,0-1H12.59a.5.5,0,0,1,.8.18l0,.12a.5.5,0,0,1-.46.7Zm32.86-.15h-3a.5.5,0,1,1,0-1h3a.5.5,0,1,1,0,1ZM27,32.86l-.14,0a.5.5,0,0,1-.34-.62,4.66,4.66,0,0,1,4.4-3.55,6,6,0,0,1,1.11.11,9.37,9.37,0,0,1,4.88,3,.5.5,0,1,1-.73.69,8.42,8.42,0,0,0-4.34-2.73,5,5,0,0,0-.93-.09,3.63,3.63,0,0,0-3.44,2.84A.5.5,0,0,1,27,32.86ZM13.4,28.53a.5.5,0,0,1-.36-.85,6,6,0,0,1,2.82-1.57.5.5,0,1,1,.26,1,5,5,0,0,0-2.36,1.29A.5.5,0,0,1,13.4,28.53Zm7.52-1.35-.15,0a7.39,7.39,0,0,0-.91-.23.5.5,0,0,1,.19-1,8.41,8.41,0,0,1,1,.26.5.5,0,0,1-.15,1Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-2" d="M49.84,39.56H1a1,1,0,1,1,0-2H49.84a1,1,0,1,1,0,2Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-2" d="M135.34,77H120.06V60.18a7.56,7.56,0,0,0-7.55-7.55H51.08a7.56,7.56,0,0,0-7.55,7.55v40.74a7.55,7.55,0,0,0,1,3.67,5.88,5.88,0,0,0-1,1.6l-6.89,16.12a5.73,5.73,0,0,0-.46,2.26v1.05a6.1,6.1,0,0,0,6.22,6h60v3.19a7.45,7.45,0,0,0,7.45,7.45h25.55a7.46,7.46,0,0,0,7.45-7.45V84.49A7.46,7.46,0,0,0,135.34,77Z" transform="translate(0.02 0.17)"/>
-  <rect class="cls-2" x="47.3" y="56.55" width="68.54" height="47.84" rx="3.55" ry="3.55"/>
-  <rect class="cls-2" x="50.64" y="62.52" width="61.86" height="38.58" rx="2.09" ry="2.09"/>
-  <path class="cls-3" d="M110.38,63.35a1.09,1.09,0,0,1,1.09,1.09V98.83a1.09,1.09,0,0,1-1.09,1.09H52.71a1.09,1.09,0,0,1-1.09-1.09V64.44a1.09,1.09,0,0,1,1.09-1.09h57.67" transform="translate(0.02 0.17)"/>
-  <path class="cls-4" d="M115.72,107.47a2.23,2.23,0,0,0-2.06-1.23H49a2.22,2.22,0,0,0-2.07,1.27L40,123.63a1.76,1.76,0,0,0-.14.69v1.05a2.1,2.1,0,0,0,2.22,2H121a2.1,2.1,0,0,0,2.22-2v-1a1.77,1.77,0,0,0-.16-.73Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-5" d="M124.88,122.78l-7.34-16.14a4,4,0,0,0-1.64-1.79,5.54,5.54,0,0,0,1.91-4.18V59.93a5.56,5.56,0,0,0-5.55-5.55H50.83a5.56,5.56,0,0,0-5.55,5.55v40.74a5.53,5.53,0,0,0,1.74,4,4,4,0,0,0-2,2l-6.89,16.12a3.75,3.75,0,0,0-.3,1.48v1.05a4.1,4.1,0,0,0,4.22,4H121a4.1,4.1,0,0,0,4.22-4v-1A3.75,3.75,0,0,0,124.88,122.78Zm-1.66,2.59a2.1,2.1,0,0,1-2.22,2H42.09a2.1,2.1,0,0,1-2.22-2v-1.05a1.76,1.76,0,0,1,.14-.69L46.9,107.5A2.22,2.22,0,0,1,49,106.24h64.69a2.23,2.23,0,0,1,2.06,1.23l7.34,16.14a1.77,1.77,0,0,1,.16.73ZM47.27,100.66V59.93a3.55,3.55,0,0,1,3.55-3.55h61.43a3.55,3.55,0,0,1,3.55,3.55v40.74a3.55,3.55,0,0,1-3.55,3.55H50.83A3.55,3.55,0,0,1,47.27,100.66Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-6" d="M94.71,121.68H68.43c-.43,0-.81-.25-.79-.53.33-1.7.48-2.59.82-4.38,0-.24.3-.43.68-.43l25.34-.19c.38,0,.66.17.66.41a43.55,43.55,0,0,1,.44,4.53C95.55,121.4,95.14,121.68,94.71,121.68ZM64,112.2H60.07c-.34,0-.61.15-.66.36-.11.48-.17.72-.28,1.2s.39.66.91.66l3.82,0c.34,0,.61-.14.67-.35.13-.47.2-.71.34-1.19S64.53,112.2,64,112.2Zm9.85,0-4.07,0c-.38,0-.69.17-.73.4-.09.48-.13.71-.21,1.18-.05.31.37.61.87.6l3.95,0a.73.73,0,0,0,.74-.4c.12-.47.18-.7.31-1.18C74.76,112.46,74.35,112.16,73.83,112.16Zm20.57,1.46c-.06-.46-.1-.69-.16-1.16,0-.23-.33-.39-.71-.39l-4.07,0c-.52,0-.95.3-.88.61l.26,1.16c0,.23.35.39.73.39l3.95,0C94,114.22,94.45,113.93,94.4,113.63Zm-9.93.09-.2-1.17c0-.25-.38-.43-.79-.43l-3.68,0c-.41,0-.76.19-.81.44-.1.47-.15.71-.25,1.17-.06.3.32.57.8.56l4.09,0C84.13,114.28,84.52,114,84.47,113.72Zm19.61-.19-.23-1.15c0-.2-.3-.34-.64-.34H99.3c-.54,0-1,.33-.93.65l.3,1.15c.05.2.32.34.65.34l3.82,0C103.67,114.17,104.14,113.84,104.08,113.53Zm-39.11-5H61.26a.64.64,0,0,0-.64.33c-.13.44-.2.66-.32,1.09s.33.61.83.61h3.62a.66.66,0,0,0,.65-.33c.15-.44.23-.66.39-1.09S65.49,108.53,65,108.53Zm9.36,0H70.46c-.37,0-.67.16-.72.37-.11.44-.16.66-.26,1.1s.33.56.81.56h3.77a.72.72,0,0,0,.72-.37c.13-.44.2-.66.33-1.1S74.83,108.5,74.33,108.5Zm19.61,1.4-.16-1.1c0-.22-.31-.37-.68-.37H89.23c-.5,0-.91.28-.85.58l.24,1.09c0,.21.34.37.7.36h3.77C93.57,110.46,94,110.19,93.94,109.9Zm-9.49.06-.17-1.1c0-.23-.35-.4-.74-.4H80c-.39,0-.73.18-.79.41-.11.44-.17.66-.27,1.1-.07.28.29.53.76.53h3.92C84.12,110.5,84.5,110.25,84.45,110Zm18.67-.13-.22-1.1c0-.2-.28-.33-.61-.33h-3.7c-.52,0-1,.32-.88.62l.29,1.09c.05.19.3.32.63.32h3.62C102.74,110.44,103.19,110.13,103.13,109.83Zm-48.06,2.4H51.32a.71.71,0,0,0-.69.36,9.8,9.8,0,0,0-.39,1.21c-.09.33.37.67.88.67l3.7,0c.33,0,.58-.15.63-.36a7.82,7.82,0,0,1,.39-1.2C56,112.57,55.59,112.23,55.06,112.23Zm1.32-3.68h-3.5a.57.57,0,0,0-.59.32,10,10,0,0,1-.37,1.09c-.12.3.23.61.7.61h3.45a.72.72,0,0,0,.67-.33c.2-.44.29-.66.45-1.09S56.87,108.55,56.38,108.55Zm50.9,4.12a7.26,7.26,0,0,1,.34,1.14c0,.2.29.33.62.33l3.7,0c.51,0,1-.32.9-.63a9.34,9.34,0,0,0-.34-1.14.68.68,0,0,0-.67-.34h-3.74C107.57,112,107.17,112.36,107.28,112.67Zm-1.1-3.66a8.86,8.86,0,0,0,.36,1.09.66.66,0,0,0,.64.32h3.45c.47,0,.84-.3.75-.6a7.35,7.35,0,0,1-.27-1.1c0-.2-.25-.33-.56-.33H107C106.55,108.39,106.1,108.71,106.18,109Z" transform="translate(0.02 0.17)"/>
-  <circle class="cls-7" cx="82.57" cy="59.42" r="1.15"/>
-  <rect class="cls-2" x="105.11" y="79.96" width="34.45" height="59.17" rx="4.45" ry="4.45"/>
-  <path class="cls-8" d="M135.09,80.79a3.45,3.45,0,0,1,3.45,3.45v50.28a3.45,3.45,0,0,1-3.45,3.45H109.53a3.45,3.45,0,0,1-3.45-3.45V84.24a3.45,3.45,0,0,1,3.45-3.45h25.55m0-2H109.53a5.45,5.45,0,0,0-5.45,5.45v50.28a5.45,5.45,0,0,0,5.45,5.45h25.55a5.45,5.45,0,0,0,5.45-5.45V84.24a5.45,5.45,0,0,0-5.45-5.45Z" transform="translate(0.02 0.17)"/>
-  <rect class="cls-2" x="109.42" y="84.79" width="25.82" height="45.33" rx="1.72" ry="1.72"/>
-  <path class="cls-9" d="M133.49,85.62a.72.72,0,0,1,.72.72v41.88a.72.72,0,0,1-.72.72H111.12a.72.72,0,0,1-.72-.72V86.34a.72.72,0,0,1,.72-.72h22.37" transform="translate(0.02 0.17)"/>
-  <path class="cls-10" d="M82.85,97.67a2.47,2.47,0,0,1-1.55-.55L66.32,85a12.45,12.45,0,0,1-3.66-3.66,12.77,12.77,0,0,1,1.67-16,12.69,12.69,0,0,1,17.95,0,.67.67,0,0,0,.49.22.68.68,0,0,0,.48-.21A12.71,12.71,0,1,1,99.26,85L84.41,97.12A2.49,2.49,0,0,1,82.85,97.67Zm41,23.7,11-9a9.67,9.67,0,1,0-12.19-14.9.24.24,0,0,1-.17.08.25.25,0,0,1-.18-.09,9.66,9.66,0,0,0-13.66,0,9.72,9.72,0,0,0-1.27,12.15,9.46,9.46,0,0,0,2.78,2.78l11.09,9a2.09,2.09,0,0,0,2.63,0Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-2" d="M73.28,62.67a11.66,11.66,0,0,1,8.29,3.44l0,0a1.66,1.66,0,0,0,1.18.5,1.68,1.68,0,0,0,1.19-.5l0,0A11.71,11.71,0,1,1,98.7,84.16L83.78,96.34a1.48,1.48,0,0,1-.93.33,1.45,1.45,0,0,1-.92-.33l-15-12.16a11.41,11.41,0,0,1-3.41-3.4A11.82,11.82,0,0,1,65,66.08a11.65,11.65,0,0,1,8.25-3.41m0-2h0a13.6,13.6,0,0,0-9.66,4,13.77,13.77,0,0,0-1.8,17.22,13.4,13.4,0,0,0,3.91,3.92L80.67,97.9a3.47,3.47,0,0,0,4.35,0L99.89,85.77A13.71,13.71,0,1,0,82.77,64.49a13.62,13.62,0,0,0-9.49-3.82Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-4" d="M66.31,76h-.16a2,2,0,0,1-1.79-2.11,8.69,8.69,0,0,1,6.8-7.8A2,2,0,1,1,72,69.92a4.8,4.8,0,0,0-3.76,4.31A2,2,0,0,1,66.31,76Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-2" d="M115.4,95.66a8.64,8.64,0,0,1,6.14,2.55h0a1.23,1.23,0,0,0,.88.37,1.24,1.24,0,0,0,.88-.37h0a8.67,8.67,0,1,1,10.91,13.37l-11.05,9a1.1,1.1,0,0,1-.69.24,1.08,1.08,0,0,1-.68-.24l-11.13-9a8.45,8.45,0,0,1-2.53-2.52,8.76,8.76,0,0,1,1.14-10.89,8.63,8.63,0,0,1,6.11-2.52m0-2h0a10.59,10.59,0,0,0-7.52,3.11,10.72,10.72,0,0,0-1.4,13.4,10.44,10.44,0,0,0,3,3l11,8.94a3.09,3.09,0,0,0,3.87,0l11-9a10.67,10.67,0,1,0-13-16.88,10.59,10.59,0,0,0-7-2.64Z" transform="translate(0.02 0.17)"/>
-  <path class="cls-4" d="M110.24,105.54h-.12a1.46,1.46,0,0,1-1.33-1.56,6.43,6.43,0,0,1,5-5.78,1.45,1.45,0,1,1,.63,2.83,3.56,3.56,0,0,0-2.78,3.19A1.45,1.45,0,0,1,110.24,105.54Z" transform="translate(0.02 0.17)"/>
+    <path class="st8" d="M133.5 85.8c.4 0 .7.3.7.7v41.9c0 .4-.3.7-.7.7h-22.4c-.4 0-.7-.3-.7-.7V86.5c0-.4.3-.7.7-.7h22.4"/>
+  </g>
+  <linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="-73.41" y1="701.6741" x2="262.92" y2="701.6741" gradientTransform="translate(.02 -609.83)">
+    <stop offset="0" stop-color="#00C8D7"/>
+    <stop offset="1" stop-color="#0A84FF"/>
+  </linearGradient>
+  <path class="st9" d="M82.9 97.8c-.6 0-1.1-.2-1.6-.6l-15-12.1c-1.5-1-2.7-2.2-3.7-3.7-3.3-5.1-2.6-11.7 1.7-16 5-5 13-5 17.9 0 .1.1.3.2.5.2s.4-.1.5-.2c5.1-4.8 13.1-4.6 18 .5s4.6 13.1-.5 18c-.5.4-1 .9-1.5 1.2L84.4 97.3c-.4.3-1 .5-1.5.5zm41 23.7l11-9c4.4-3 5.6-9 2.7-13.4-3-4.4-9-5.6-13.4-2.7-.5.3-1 .7-1.4 1.2 0 0-.1.1-.2.1s-.1 0-.2-.1c-3.8-3.8-9.9-3.8-13.7 0-3.2 3.2-3.8 8.3-1.3 12.2.7 1.1 1.7 2.1 2.8 2.8l11.1 9c.7.6 1.8.6 2.6-.1z"/>
+  <path class="st1" d="M73.3 62.8c3.1 0 6.1 1.2 8.3 3.4.3.3.7.5 1.2.5.4 0 .9-.2 1.2-.5 4.6-4.5 12-4.5 16.6.1 4.5 4.6 4.5 12-.1 16.6-.5.5-1.1 1-1.7 1.4l-15 12.2c-.3.2-.6.3-.9.3s-.7-.1-.9-.3L67 84.3c-1.4-.9-2.5-2-3.4-3.4-3-4.6-2.4-10.7 1.5-14.7 2.1-2.1 5.1-3.4 8.2-3.4m0-2c-3.6 0-7.1 1.4-9.7 4-4.6 4.6-5.3 11.8-1.8 17.2 1 1.6 2.3 2.9 3.9 3.9l15 12.1c1.3 1 3.1 1 4.3 0l14.9-12.1c6.3-4.2 8-12.7 3.8-19s-12.7-8-19-3.8c-.7.5-1.3 1-1.9 1.5-2.6-2.4-6-3.8-9.5-3.8z"/>
+  <path class="st3" d="M66.3 76.2h-.2c-1.1-.1-1.9-1-1.8-2.1.3-3.8 3.1-7 6.8-7.8 1-.4 2.2 0 2.6 1s0 2.2-1 2.6c-.2.1-.5.2-.8.2-2.1.5-3.6 2.2-3.8 4.3 0 1-.8 1.7-1.8 1.8z"/>
+  <path class="st1" d="M115.4 95.8c2.3 0 4.5.9 6.1 2.6.2.2.5.4.9.4.3 0 .6-.1.9-.4 3.4-3.4 8.9-3.4 12.3 0 3.4 3.4 3.4 8.9 0 12.3-.4.4-.8.8-1.3 1.1l-11.1 9c-.2.2-.4.2-.7.2-.2 0-.5-.1-.7-.2l-11.1-9c-1-.7-1.9-1.5-2.5-2.5-2.2-3.4-1.7-8 1.1-10.9 1.6-1.7 3.8-2.6 6.1-2.6m0-2c-2.8 0-5.5 1.1-7.5 3.1-3.6 3.6-4.1 9.2-1.4 13.4.8 1.2 1.8 2.2 3 3l11 8.9c1.1.9 2.7.9 3.9 0l11-9c4.9-3.3 6.1-10 2.8-14.8-3.3-4.9-10-6.1-14.8-2.8-.3.2-.7.5-1 .7-2-1.6-4.5-2.6-7-2.5z"/>
+  <path class="st3" d="M110.3 105.7c-.9-.1-1.5-.8-1.4-1.6.2-2.8 2.2-5.2 5-5.8.8-.2 1.6.3 1.8 1.1.2.8-.3 1.6-1.1 1.8h-.1c-1.5.3-2.7 1.6-2.8 3.2-.1.7-.7 1.3-1.4 1.3z"/>
 </svg>
diff --git a/browser/themes/shared/syncedtabs/sidebar.inc.css b/browser/themes/shared/syncedtabs/sidebar.inc.css
index 52d9b51d1080..1cedb03b6c7a 100644
--- a/browser/themes/shared/syncedtabs/sidebar.inc.css
+++ b/browser/themes/shared/syncedtabs/sidebar.inc.css
@@ -231,6 +231,7 @@ body {
 
 .deck .instructions {
   text-align: center;
+  color: rgba(12, 12, 13, .5);
   padding: 0 11px;
   max-width: 15em;
   margin: 1em auto;

From a3cb91721750c24badc2f57c85d5dbaca643a4ac Mon Sep 17 00:00:00 2001
From: Doug Thayer <dothayer@mozilla.com>
Date: Tue, 21 Nov 2017 14:43:47 -0800
Subject: [PATCH 059/219] Bug 1418443 - Send OnVisit notifications from single
 runnable r=mak

Because there's an overhead in simply creating/sending/receiving a
runnable, it makes sense to send our onVisits notifications from a
bulk runnable in the case where we're inserting many visits. This
is only step one of many optimizations we can and should make to
the observer system.

MozReview-Commit-ID: Co5yOUCRdnZ

--HG--
extra : rebase_source : 3f4f67f8dfe1798612a2b6ea210caff8556e9d72
---
 toolkit/components/places/History.cpp | 115 +++++++++++++++-----------
 1 file changed, 69 insertions(+), 46 deletions(-)

diff --git a/toolkit/components/places/History.cpp b/toolkit/components/places/History.cpp
index 19e46572034b..6bd91da8e594 100644
--- a/toolkit/components/places/History.cpp
+++ b/toolkit/components/places/History.cpp
@@ -621,18 +621,63 @@ NS_IMPL_ISUPPORTS_INHERITED(
 )
 
 /**
- * Notifies observers about a visit.
+ * Notifies observers about a visit or an array of visits.
  */
-class NotifyVisitObservers : public Runnable
+class NotifyManyVisitsObservers : public Runnable
 {
 public:
-  explicit NotifyVisitObservers(VisitData& aPlace)
-    : Runnable("places::NotifyVisitObservers")
+  explicit NotifyManyVisitsObservers(VisitData aPlace)
+    : Runnable("places::NotifyManyVisitsObservers")
     , mPlace(aPlace)
     , mHistory(History::GetService())
   {
   }
 
+  explicit NotifyManyVisitsObservers(nsTArray<VisitData>& aPlaces)
+    : Runnable("places::NotifyManyVisitsObservers")
+    , mHistory(History::GetService())
+  {
+    aPlaces.SwapElements(mPlaces);
+  }
+
+  nsresult NotifyVisit(nsNavHistory* aNavHistory,
+                       nsCOMPtr<nsIObserverService>& aObsService,
+                       PRTime aNow,
+                       VisitData aPlace) {
+    nsCOMPtr<nsIURI> uri;
+    MOZ_ALWAYS_SUCCEEDS(NS_NewURI(getter_AddRefs(uri), aPlace.spec));
+    if (!uri) {
+      return NS_ERROR_UNEXPECTED;
+    }
+    // Notify the visit.  Note that TRANSITION_EMBED visits are never added
+    // to the database, thus cannot be queried and we don't notify them.
+    if (aPlace.transitionType != nsINavHistoryService::TRANSITION_EMBED) {
+      aNavHistory->NotifyOnVisit(uri, aPlace.visitId, aPlace.visitTime,
+                                 aPlace.referrerVisitId, aPlace.transitionType,
+                                 aPlace.guid, aPlace.hidden,
+                                 aPlace.visitCount + 1, // Add current visit.
+                                 static_cast<uint32_t>(aPlace.typed),
+                                 aPlace.title);
+    }
+
+    if (aObsService) {
+      DebugOnly<nsresult> rv =
+        aObsService->NotifyObservers(uri, URI_VISIT_SAVED, nullptr);
+      NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Could not notify observers");
+    }
+
+    if (aNow - aPlace.visitTime < RECENTLY_VISITED_URIS_MAX_AGE) {
+      mHistory->AppendToRecentlyVisitedURIs(uri);
+    }
+    mHistory->NotifyVisited(uri);
+
+    if (aPlace.titleChanged) {
+      aNavHistory->NotifyTitleChange(uri, aPlace.title, aPlace.guid);
+    }
+
+    return NS_OK;
+  }
+
   NS_IMETHOD Run() override
   {
     MOZ_ASSERT(NS_IsMainThread(), "This should be called on the main thread");
@@ -645,45 +690,28 @@ public:
 
     nsNavHistory* navHistory = nsNavHistory::GetHistoryService();
     if (!navHistory) {
-      NS_WARNING("Trying to notify about a visit but cannot get the history service!");
+      NS_WARNING("Trying to notify visits observers but cannot get the history service!");
       return NS_OK;
     }
 
-    nsCOMPtr<nsIURI> uri;
-    MOZ_ALWAYS_SUCCEEDS(NS_NewURI(getter_AddRefs(uri), mPlace.spec));
-    if (!uri) {
-      return NS_ERROR_UNEXPECTED;
-    }
-
-    // Notify the visit.  Note that TRANSITION_EMBED visits are never added
-    // to the database, thus cannot be queried and we don't notify them.
-    if (mPlace.transitionType != nsINavHistoryService::TRANSITION_EMBED) {
-      navHistory->NotifyOnVisit(uri, mPlace.visitId, mPlace.visitTime,
-                                mPlace.referrerVisitId, mPlace.transitionType,
-                                mPlace.guid, mPlace.hidden,
-                                mPlace.visitCount + 1, // Add current visit.
-                                static_cast<uint32_t>(mPlace.typed),
-                                mPlace.title);
-    }
-
     nsCOMPtr<nsIObserverService> obsService =
       mozilla::services::GetObserverService();
-    if (obsService) {
-      DebugOnly<nsresult> rv =
-        obsService->NotifyObservers(uri, URI_VISIT_SAVED, nullptr);
-      NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Could not notify observers");
-    }
 
-    History* history = History::GetService();
-    NS_ENSURE_STATE(history);
-    if (PR_Now() - mPlace.visitTime < RECENTLY_VISITED_URIS_MAX_AGE) {
-      mHistory->AppendToRecentlyVisitedURIs(uri);
+    PRTime now = PR_Now();
+    if (mPlaces.Length() > 0) {
+      for (uint32_t i = 0; i < mPlaces.Length(); ++i) {
+        nsresult rv = NotifyVisit(navHistory, obsService, now, mPlaces[i]);
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
+    } else {
+      nsresult rv = NotifyVisit(navHistory, obsService, now, mPlace);
+      NS_ENSURE_SUCCESS(rv, rv);
     }
-    history->NotifyVisited(uri);
 
     return NS_OK;
   }
 private:
+  nsTArray<VisitData> mPlaces;
   VisitData mPlace;
   RefPtr<History> mHistory;
 };
@@ -987,7 +1015,8 @@ public:
     mozStorageTransaction transaction(mDBConn, false,
                                       mozIStorageConnection::TRANSACTION_IMMEDIATE);
 
-    VisitData* lastFetchedPlace = nullptr;
+    const VisitData* lastFetchedPlace = nullptr;
+    uint32_t lastFetchedVisitCount = 0;
     for (nsTArray<VisitData>::size_type i = 0; i < mPlaces.Length(); i++) {
       VisitData& place = mPlaces.ElementAt(i);
 
@@ -1010,6 +1039,7 @@ public:
           return NS_OK;
         }
         lastFetchedPlace = &mPlaces.ElementAt(i);
+        lastFetchedVisitCount = lastFetchedPlace->visitCount;
       } else {
         // Copy over the data from the already known place.
         place.placeId = lastFetchedPlace->placeId;
@@ -1019,7 +1049,7 @@ public:
         place.titleChanged = !lastFetchedPlace->title.Equals(place.title);
         place.frecency = lastFetchedPlace->frecency;
         // Add one visit for the previous loop.
-        place.visitCount = ++(*lastFetchedPlace).visitCount;
+        place.visitCount = ++lastFetchedVisitCount;
       }
 
       // If any transition is typed, ensure the page is marked as typed.
@@ -1057,17 +1087,6 @@ public:
       // If we get here, we must have been successful adding/updating this
       // visit/place, so update the count:
       mSuccessfulUpdatedCount++;
-
-      nsCOMPtr<nsIRunnable> event = new NotifyVisitObservers(place);
-      rv = NS_DispatchToMainThread(event);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      // Notify about title change if needed.
-      if (place.titleChanged) {
-        event = new NotifyTitleObservers(place.spec, place.title, place.guid);
-        rv = NS_DispatchToMainThread(event);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
     }
 
     {
@@ -1083,6 +1102,10 @@ public:
     nsresult rv = transaction.Commit();
     NS_ENSURE_SUCCESS(rv, rv);
 
+    nsCOMPtr<nsIRunnable> event = new NotifyManyVisitsObservers(mPlaces);
+    rv = NS_DispatchToMainThread(event);
+    NS_ENSURE_SUCCESS(rv, rv);
+
     return NS_OK;
   }
 private:
@@ -1920,7 +1943,7 @@ StoreAndNotifyEmbedVisit(VisitData& aPlace,
     }
   }
 
-  nsCOMPtr<nsIRunnable> event = new NotifyVisitObservers(aPlace);
+  nsCOMPtr<nsIRunnable> event = new NotifyManyVisitsObservers(aPlace);
   (void)NS_DispatchToMainThread(event);
 }
 

From 945b072cbc2316f36373677b857dd481c87fe924 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 30 Nov 2017 11:48:28 -0800
Subject: [PATCH 060/219] Bug 1412240 part 1: Add a preemptive stdlib.h include
 in our libavutil_visibility.h hackaround file. r=jya

MozReview-Commit-ID: 8nmOy2aqPA0

--HG--
extra : rebase_source : 485e205af8fbb205c81929e12eac00410570124d
---
 media/ffvpx/libavutil_visibility.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/media/ffvpx/libavutil_visibility.h b/media/ffvpx/libavutil_visibility.h
index a5cce0844af2..0bbce125e2a0 100644
--- a/media/ffvpx/libavutil_visibility.h
+++ b/media/ffvpx/libavutil_visibility.h
@@ -9,6 +9,16 @@
 #ifndef MOZILLA_AVUTIL_VISIBILITY_H
 #define MOZILLA_AVUTIL_VISIBILITY_H
 
+// We need to preemptively include <stdlib.h> before anyone[1] has a chance
+// to include <limits.h>. We do this to avoid a linux clang build error, in
+// -ffreestanding mode on automation, which happens when limits.h defines
+// MB_LEN_MAX to some value that is different from what stdlib.h expects. If
+// we include stdlib.h before limits.h, then they don't get a chance to
+// interact badly.
+//
+// [1] (e.g. libavutil/common.h, which is indirectly included by log.h below.)
+#include <stdlib.h>
+
 #pragma GCC visibility push(default)
 #include "libavutil/cpu.h"
 

From d84cb4a5a7cabf451fca909662ae96d3d23e0366 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 30 Nov 2017 10:57:07 -0800
Subject: [PATCH 061/219] Bug 1412240 part 2: Compile ffvpx library with
 -ffreestanding, to avoid triggering clang bug in icecc configurations.
 r=glandium,jya

Specifically: without this fix, icecc + clang users will hit this clang bug when compiling stdatomics.h:
  https://bugs.llvm.org/show_bug.cgi?id=26828

MozReview-Commit-ID: BJUN82HyXpF

--HG--
extra : rebase_source : 3f06d3401198de45240aa9f0c7c865e048f90b89
---
 media/ffvpx/ffvpxcommon.mozbuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media/ffvpx/ffvpxcommon.mozbuild b/media/ffvpx/ffvpxcommon.mozbuild
index fdca987f49ef..8c3cc63ad363 100644
--- a/media/ffvpx/ffvpxcommon.mozbuild
+++ b/media/ffvpx/ffvpxcommon.mozbuild
@@ -66,6 +66,8 @@ if CONFIG['GNU_CC']:
             '-Wno-incompatible-pointer-types-discards-qualifiers',
             '-Wno-string-conversion',
             '-Wno-visibility',
+            # Workaround for https://bugs.llvm.org/show_bug.cgi?id=26828#c4 :
+            '-ffreestanding',
         ]
     else:
         CFLAGS += [

From c57bd5cfc62c2984dc73309286c41d292c63a4b7 Mon Sep 17 00:00:00 2001
From: Ricky Chien <ricky060709@gmail.com>
Date: Fri, 24 Nov 2017 14:57:10 +0800
Subject: [PATCH 062/219] Bug 1418928 - requestCookies and responseCookies
 should be loaded lazily r=Honza

MozReview-Commit-ID: bywCQWGqWI

--HG--
extra : rebase_source : 41591be8f72e355ca370d4a53b6ffc0d7f966f9d
---
 .../netmonitor/src/components/CookiesPanel.js | 154 ++++++++++--------
 .../netmonitor/src/components/MonitorPanel.js |   2 +-
 .../components/RequestListColumnCookies.js    |  18 ++
 .../components/RequestListColumnSetCookies.js |  18 ++
 .../src/components/RequestListContent.js      |   2 +
 .../src/components/RequestListItem.js         |   8 +-
 .../netmonitor/src/components/TabboxPanel.js  |   6 +-
 .../netmonitor/src/components/Toolbar.js      |  12 ++
 .../src/connector/firefox-connector.js        |  35 ++--
 .../src/connector/firefox-data-provider.js    |  57 ++++---
 devtools/client/netmonitor/src/constants.js   |   2 +
 .../client/netmonitor/src/har/har-builder.js  |   1 -
 .../src/har/test/browser_net_har_post_data.js |   2 +-
 .../test/browser_net_har_throttle_upload.js   |   2 +-
 .../src/request-list-context-menu.js          |   3 +-
 .../src/utils/filter-autocomplete-provider.js |   4 +-
 .../netmonitor/test/browser_net_autoscroll.js |   2 -
 .../netmonitor/test/browser_net_cause.js      |   6 +-
 .../netmonitor/test/browser_net_charts-01.js  |   7 +-
 .../netmonitor/test/browser_net_charts-02.js  |   6 +-
 .../netmonitor/test/browser_net_charts-03.js  |   6 +-
 .../netmonitor/test/browser_net_charts-04.js  |   6 +-
 .../netmonitor/test/browser_net_charts-05.js  |   6 +-
 .../netmonitor/test/browser_net_charts-06.js  |   6 +-
 .../netmonitor/test/browser_net_charts-07.js  |   6 +-
 .../test/browser_net_complex-params.js        |   2 +-
 .../test/browser_net_copy_params.js           |   2 +-
 .../test/browser_net_cors_requests.js         |   2 +-
 .../netmonitor/test/browser_net_curl-utils.js |   2 +-
 .../test/browser_net_header-docs.js           |   2 +-
 .../test/browser_net_headers-alignment.js     |   2 -
 .../test/browser_net_params_sorted.js         |   2 +-
 .../test/browser_net_post-data-01.js          |   2 +-
 .../test/browser_net_post-data-02.js          |   2 +-
 .../test/browser_net_post-data-03.js          |   2 +-
 .../test/browser_net_post-data-04.js          |   2 +-
 .../test/browser_net_raw_headers.js           |   4 +-
 .../netmonitor/test/browser_net_resend.js     |   4 +-
 .../test/browser_net_resend_cors.js           |   4 +-
 .../test/browser_net_resend_headers.js        |   2 +-
 .../netmonitor/test/browser_net_throttle.js   |   5 +-
 .../test/browser_net_timing-division.js       |   6 -
 .../test/browser_net_view-source-debugger.js  |   2 +-
 devtools/client/netmonitor/test/head.js       |  62 +++++--
 .../client/netmonitor/test/shared-head.js     |   8 +-
 .../client/shared/components/SearchBox.js     |  15 ++
 46 files changed, 339 insertions(+), 172 deletions(-)

diff --git a/devtools/client/netmonitor/src/components/CookiesPanel.js b/devtools/client/netmonitor/src/components/CookiesPanel.js
index d35293ee80be..e5cdbb4e29f9 100644
--- a/devtools/client/netmonitor/src/components/CookiesPanel.js
+++ b/devtools/client/netmonitor/src/components/CookiesPanel.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-const { createFactory } = require("devtools/client/shared/vendor/react");
+const { Component, createFactory } = require("devtools/client/shared/vendor/react");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const { L10N } = require("../utils/l10n");
@@ -28,74 +28,98 @@ const SECTION_NAMES = [
  * Cookies panel component
  * This tab lists full details of any cookies sent with the request or response
  */
-function CookiesPanel({
-  request,
-  openLink,
-}) {
-  let {
-    requestCookies = { cookies: [] },
-    responseCookies = { cookies: [] },
-  } = request;
+class CookiesPanel extends Component {
+  static get propTypes() {
+    return {
+      connector: PropTypes.object.isRequired,
+      openLink: PropTypes.func,
+      request: PropTypes.object.isRequired,
+    };
+  }
 
-  requestCookies = requestCookies.cookies || requestCookies;
-  responseCookies = responseCookies.cookies || responseCookies;
+  componentDidMount() {
+    this.maybeFetchCookies(this.props);
+  }
 
-  if (!requestCookies.length && !responseCookies.length) {
-    return div({ className: "empty-notice" },
-      COOKIES_EMPTY_TEXT
+  componentWillReceiveProps(nextProps) {
+    this.maybeFetchCookies(nextProps);
+  }
+
+  /**
+   * When switching to another request, lazily fetch request cookies
+   * from the backend. The panel will first be empty and then display the content.
+   */
+  maybeFetchCookies(props) {
+    if (props.request.requestCookiesAvailable && !props.request.requestCookies) {
+      props.connector.requestData(props.request.id, "requestCookies");
+    }
+    if (props.request.responseCookiesAvailable && !props.request.responseCookies) {
+      props.connector.requestData(props.request.id, "responseCookies");
+    }
+  }
+
+  /**
+   * Mapping array to dict for TreeView usage.
+   * Since TreeView only support Object(dict) format.
+   *
+   * @param {Object[]} arr - key-value pair array like cookies or params
+   * @returns {Object}
+   */
+  getProperties(arr) {
+    return arr.reduce((map, obj) => {
+      // Generally cookies object contains only name and value properties and can
+      // be rendered as name: value pair.
+      // When there are more properties in cookies object such as extra or path,
+      // We will pass the object to display these extra information
+      if (Object.keys(obj).length > 2) {
+        map[obj.name] = Object.assign({}, obj);
+        delete map[obj.name].name;
+      } else {
+        map[obj.name] = obj.value;
+      }
+      return map;
+    }, {});
+  }
+
+  render() {
+    let {
+      request: {
+        requestCookies = { cookies: [] },
+        responseCookies = { cookies: [] },
+      },
+      openLink,
+    } = this.props;
+
+    requestCookies = requestCookies.cookies || requestCookies;
+    responseCookies = responseCookies.cookies || responseCookies;
+
+    if (!requestCookies.length && !responseCookies.length) {
+      return div({ className: "empty-notice" },
+        COOKIES_EMPTY_TEXT
+      );
+    }
+
+    let object = {};
+
+    if (responseCookies.length) {
+      object[RESPONSE_COOKIES] = sortObjectKeys(this.getProperties(responseCookies));
+    }
+
+    if (requestCookies.length) {
+      object[REQUEST_COOKIES] = sortObjectKeys(this.getProperties(requestCookies));
+    }
+
+    return (
+      div({ className: "panel-container" },
+        PropertiesView({
+          object,
+          filterPlaceHolder: COOKIES_FILTER_TEXT,
+          sectionNames: SECTION_NAMES,
+          openLink,
+        })
+      )
     );
   }
-
-  let object = {};
-
-  if (responseCookies.length) {
-    object[RESPONSE_COOKIES] = sortObjectKeys(getProperties(responseCookies));
-  }
-
-  if (requestCookies.length) {
-    object[REQUEST_COOKIES] = sortObjectKeys(getProperties(requestCookies));
-  }
-
-  return (
-    div({ className: "panel-container" },
-      PropertiesView({
-        object,
-        filterPlaceHolder: COOKIES_FILTER_TEXT,
-        sectionNames: SECTION_NAMES,
-        openLink,
-      })
-    )
-  );
-}
-
-CookiesPanel.displayName = "CookiesPanel";
-
-CookiesPanel.propTypes = {
-  request: PropTypes.object.isRequired,
-  openLink: PropTypes.func,
-};
-
-/**
- * Mapping array to dict for TreeView usage.
- * Since TreeView only support Object(dict) format.
- *
- * @param {Object[]} arr - key-value pair array like cookies or params
- * @returns {Object}
- */
-function getProperties(arr) {
-  return arr.reduce((map, obj) => {
-    // Generally cookies object contains only name and value properties and can
-    // be rendered as name: value pair.
-    // When there are more properties in cookies object such as extra or path,
-    // We will pass the object to display these extra information
-    if (Object.keys(obj).length > 2) {
-      map[obj.name] = Object.assign({}, obj);
-      delete map[obj.name].name;
-    } else {
-      map[obj.name] = obj.value;
-    }
-    return map;
-  }, {});
 }
 
 module.exports = CookiesPanel;
diff --git a/devtools/client/netmonitor/src/components/MonitorPanel.js b/devtools/client/netmonitor/src/components/MonitorPanel.js
index 66a915f7b891..19e336c66d8e 100644
--- a/devtools/client/netmonitor/src/components/MonitorPanel.js
+++ b/devtools/client/netmonitor/src/components/MonitorPanel.js
@@ -95,7 +95,7 @@ class MonitorPanel extends Component {
 
     return (
       div({ className: "monitor-panel" },
-        Toolbar(),
+        Toolbar({ connector }),
         SplitBox({
           className: "devtools-responsive-container",
           initialWidth: `${initialWidth}px`,
diff --git a/devtools/client/netmonitor/src/components/RequestListColumnCookies.js b/devtools/client/netmonitor/src/components/RequestListColumnCookies.js
index ffe9478ed549..e09b33381f9b 100644
--- a/devtools/client/netmonitor/src/components/RequestListColumnCookies.js
+++ b/devtools/client/netmonitor/src/components/RequestListColumnCookies.js
@@ -13,10 +13,19 @@ const { div } = dom;
 class RequestListColumnCookies extends Component {
   static get propTypes() {
     return {
+      connector: PropTypes.object.isRequired,
       item: PropTypes.object.isRequired,
     };
   }
 
+  componentDidMount() {
+    this.maybeFetchRequestCookies(this.props);
+  }
+
+  componentWillReceiveProps(nextProps) {
+    this.maybeFetchRequestCookies(nextProps);
+  }
+
   shouldComponentUpdate(nextProps) {
     let { requestCookies: currRequestCookies = { cookies: [] } } = this.props.item;
     let { requestCookies: nextRequestCookies = { cookies: [] } } = nextProps.item;
@@ -25,6 +34,15 @@ class RequestListColumnCookies extends Component {
     return currRequestCookies !== nextRequestCookies;
   }
 
+  /**
+   * Lazily fetch request cookies from the backend.
+   */
+  maybeFetchRequestCookies(props) {
+    if (props.item.requestCookiesAvailable && !props.requestCookies) {
+      props.connector.requestData(props.item.id, "requestCookies");
+    }
+  }
+
   render() {
     let { requestCookies = { cookies: [] } } = this.props.item;
     requestCookies = requestCookies.cookies || requestCookies;
diff --git a/devtools/client/netmonitor/src/components/RequestListColumnSetCookies.js b/devtools/client/netmonitor/src/components/RequestListColumnSetCookies.js
index 625f4693ee01..4fa3d0d97882 100644
--- a/devtools/client/netmonitor/src/components/RequestListColumnSetCookies.js
+++ b/devtools/client/netmonitor/src/components/RequestListColumnSetCookies.js
@@ -13,10 +13,19 @@ const { div } = dom;
 class RequestListColumnSetCookies extends Component {
   static get propTypes() {
     return {
+      connector: PropTypes.object.isRequired,
       item: PropTypes.object.isRequired,
     };
   }
 
+  componentDidMount() {
+    this.maybeFetchResponseCookies(this.props);
+  }
+
+  componentWillReceiveProps(nextProps) {
+    this.maybeFetchResponseCookies(nextProps);
+  }
+
   shouldComponentUpdate(nextProps) {
     let { responseCookies: currResponseCookies = { cookies: [] } } = this.props.item;
     let { responseCookies: nextResponseCookies = { cookies: [] } } = nextProps.item;
@@ -25,6 +34,15 @@ class RequestListColumnSetCookies extends Component {
     return currResponseCookies !== nextResponseCookies;
   }
 
+  /**
+   * Lazily fetch response cookies from the backend.
+   */
+  maybeFetchResponseCookies(props) {
+    if (props.item.responseCookiesAvailable && !props.responseCookies) {
+      props.connector.requestData(props.item.id, "responseCookies");
+    }
+  }
+
   render() {
     let { responseCookies = { cookies: [] } } = this.props.item;
     responseCookies = responseCookies.cookies || responseCookies;
diff --git a/devtools/client/netmonitor/src/components/RequestListContent.js b/devtools/client/netmonitor/src/components/RequestListContent.js
index 087bf67223c5..b54958752a86 100644
--- a/devtools/client/netmonitor/src/components/RequestListContent.js
+++ b/devtools/client/netmonitor/src/components/RequestListContent.js
@@ -211,6 +211,7 @@ class RequestListContent extends Component {
 
   render() {
     const {
+      connector,
       columns,
       displayedRequests,
       firstRequestStartedMillis,
@@ -236,6 +237,7 @@ class RequestListContent extends Component {
             displayedRequests.map((item, index) => RequestListItem({
               firstRequestStartedMillis,
               fromCache: item.status === "304" || item.fromCache,
+              connector,
               columns,
               item,
               index,
diff --git a/devtools/client/netmonitor/src/components/RequestListItem.js b/devtools/client/netmonitor/src/components/RequestListItem.js
index e076dccec695..59c666f6ff14 100644
--- a/devtools/client/netmonitor/src/components/RequestListItem.js
+++ b/devtools/client/netmonitor/src/components/RequestListItem.js
@@ -57,6 +57,8 @@ const UPDATED_REQ_ITEM_PROPS = [
   "transferredSize",
   "startedMillis",
   "totalTime",
+  "requestCookies",
+  "responseCookies",
 ];
 
 const UPDATED_REQ_PROPS = [
@@ -72,6 +74,7 @@ const UPDATED_REQ_PROPS = [
 class RequestListItem extends Component {
   static get propTypes() {
     return {
+      connector: PropTypes.object.isRequired,
       columns: PropTypes.object.isRequired,
       item: PropTypes.object.isRequired,
       index: PropTypes.number.isRequired,
@@ -111,6 +114,7 @@ class RequestListItem extends Component {
 
   render() {
     let {
+      connector,
       columns,
       item,
       index,
@@ -147,8 +151,8 @@ class RequestListItem extends Component {
         columns.get("remoteip") && RequestListColumnRemoteIP({ item }),
         columns.get("cause") && RequestListColumnCause({ item, onCauseBadgeMouseDown }),
         columns.get("type") && RequestListColumnType({ item }),
-        columns.get("cookies") && RequestListColumnCookies({ item }),
-        columns.get("setCookies") && RequestListColumnSetCookies({ item }),
+        columns.get("cookies") && RequestListColumnCookies({ connector, item }),
+        columns.get("setCookies") && RequestListColumnSetCookies({ connector, item }),
         columns.get("transferred") && RequestListColumnTransferredSize({ item }),
         columns.get("contentSize") && RequestListColumnContentSize({ item }),
         columns.get("startTime") &&
diff --git a/devtools/client/netmonitor/src/components/TabboxPanel.js b/devtools/client/netmonitor/src/components/TabboxPanel.js
index 9a85313e14e1..dc90d115b688 100644
--- a/devtools/client/netmonitor/src/components/TabboxPanel.js
+++ b/devtools/client/netmonitor/src/components/TabboxPanel.js
@@ -68,7 +68,11 @@ function TabboxPanel({
         id: PANELS.COOKIES,
         title: COOKIES_TITLE,
       },
-        CookiesPanel({ request, openLink }),
+        CookiesPanel({
+          connector,
+          openLink,
+          request,
+        }),
       ),
       TabPanel({
         id: PANELS.PARAMS,
diff --git a/devtools/client/netmonitor/src/components/Toolbar.js b/devtools/client/netmonitor/src/components/Toolbar.js
index 688e73d2f6b3..a352cf8c2278 100644
--- a/devtools/client/netmonitor/src/components/Toolbar.js
+++ b/devtools/client/netmonitor/src/components/Toolbar.js
@@ -56,6 +56,7 @@ const DISABLE_CACHE_LABEL = L10N.getStr("netmonitor.toolbar.disableCache.label")
 class Toolbar extends Component {
   static get propTypes() {
     return {
+      connector: PropTypes.object.isRequired,
       toggleRecording: PropTypes.func.isRequired,
       recording: PropTypes.bool.isRequired,
       clearRequests: PropTypes.func.isRequired,
@@ -78,6 +79,7 @@ class Toolbar extends Component {
   constructor(props) {
     super(props);
     this.autocompleteProvider = this.autocompleteProvider.bind(this);
+    this.onSearchBoxFocus = this.onSearchBoxFocus.bind(this);
     this.toggleRequestFilterType = this.toggleRequestFilterType.bind(this);
     this.updatePersistentLogsEnabled = this.updatePersistentLogsEnabled.bind(this);
     this.updateBrowserCacheDisabled = this.updateBrowserCacheDisabled.bind(this);
@@ -130,6 +132,15 @@ class Toolbar extends Component {
     return autocompleteProvider(filter, this.props.filteredRequests);
   }
 
+  onSearchBoxFocus() {
+    let { connector, filteredRequests } = this.props;
+
+    // Fetch responseCookies for building autocomplete list
+    filteredRequests.forEach((request) => {
+      connector.requestData(request.id, "responseCookies");
+    });
+  }
+
   render() {
     let {
       toggleRecording,
@@ -238,6 +249,7 @@ class Toolbar extends Component {
             type: "filter",
             ref: "searchbox",
             onChange: setRequestFilterText,
+            onFocus: this.onSearchBoxFocus,
             autocompleteProvider: this.autocompleteProvider,
           }),
           button({
diff --git a/devtools/client/netmonitor/src/connector/firefox-connector.js b/devtools/client/netmonitor/src/connector/firefox-connector.js
index b2dd5f5495bf..35fc02d8a58f 100644
--- a/devtools/client/netmonitor/src/connector/firefox-connector.js
+++ b/devtools/client/netmonitor/src/connector/firefox-connector.js
@@ -68,18 +68,19 @@ class FirefoxConnector {
   async disconnect() {
     this.actions.batchReset();
 
-    // The timeline front wasn't initialized and started if the server wasn't
-    // recent enough to emit the markers we were interested in.
-    if (this.tabTarget.getTrait("documentLoadingMarkers") && this.timelineFront) {
-      this.timelineFront.off("doc-loading", this.onDocLoadingMarker);
-      await this.timelineFront.destroy();
-    }
-
     this.removeListeners();
 
-    this.tabTarget.off("will-navigate");
+    if (this.tabTarget) {
+      // The timeline front wasn't initialized and started if the server wasn't
+      // recent enough to emit the markers we were interested in.
+      if (this.tabTarget.getTrait("documentLoadingMarkers") && this.timelineFront) {
+        this.timelineFront.off("doc-loading", this.onDocLoadingMarker);
+        await this.timelineFront.destroy();
+      }
 
-    this.tabTarget = null;
+      this.tabTarget.off("will-navigate");
+      this.tabTarget = null;
+    }
     this.webConsoleClient = null;
     this.timelineFront = null;
     this.dataProvider = null;
@@ -103,9 +104,13 @@ class FirefoxConnector {
   }
 
   removeListeners() {
-    this.tabTarget.off("close");
-    this.webConsoleClient.off("networkEvent");
-    this.webConsoleClient.off("networkEventUpdate");
+    if (this.tabTarget) {
+      this.tabTarget.off("close");
+    }
+    if (this.webConsoleClient) {
+      this.webConsoleClient.off("networkEvent");
+      this.webConsoleClient.off("networkEventUpdate");
+    }
   }
 
   willNavigate() {
@@ -316,6 +321,12 @@ class FirefoxConnector {
     }
   }
 
+  /**
+   * Fetch networkEventUpdate websocket message from back-end when
+   * data provider is connected.
+   * @param {object} request network request instance
+   * @param {string} type NetworkEventUpdate type
+   */
   requestData(request, type) {
     return this.dataProvider.requestData(request, type);
   }
diff --git a/devtools/client/netmonitor/src/connector/firefox-data-provider.js b/devtools/client/netmonitor/src/connector/firefox-data-provider.js
index a8494241c13d..29ac700c743b 100644
--- a/devtools/client/netmonitor/src/connector/firefox-data-provider.js
+++ b/devtools/client/netmonitor/src/connector/firefox-data-provider.js
@@ -7,9 +7,7 @@
 
 const { EVENTS } = require("../constants");
 const { CurlUtils } = require("devtools/client/shared/curl");
-const {
-  fetchHeaders,
-} = require("../utils/request-utils");
+const { fetchHeaders } = require("../utils/request-utils");
 
 /**
  * This object is responsible for fetching additional HTTP
@@ -180,6 +178,10 @@ class FirefoxDataProvider {
       requestPostData.postData.text = postData;
       payload.requestPostData = Object.assign({}, requestPostData);
       payload.requestHeadersFromUploadStream = { headers, headersSize };
+
+      // Lock down requestPostDataAvailable once we fetch data from back-end.
+      // Using this as flag to prevent fetching arrived data again.
+      payload.requestPostDataAvailable = false;
     }
     return payload;
   }
@@ -202,6 +204,10 @@ class FirefoxDataProvider {
           payload.responseCookies = resCookies;
         }
       }
+
+      // Lock down responseCookiesAvailable once we fetch data from back-end.
+      // Using this as flag to prevent fetching arrived data again.
+      payload.responseCookiesAvailable = false;
     }
     return payload;
   }
@@ -224,6 +230,10 @@ class FirefoxDataProvider {
           payload.requestCookies = reqCookies;
         }
       }
+
+      // Lock down requestCookiesAvailable once we fetch data from back-end.
+      // Using this as flag to prevent fetching arrived data again.
+      payload.requestCookiesAvailable = false;
     }
     return payload;
   }
@@ -265,12 +275,9 @@ class FirefoxDataProvider {
     // Note that we never fetch response header/cookies for request with security issues.
     // Bug 1404917 should simplify this heuristic by making all these field be lazily
     // fetched, only on-demand.
-    return record.requestHeaders && record.requestCookies && record.eventTimings &&
-      (
-        (record.responseHeaders && record.responseCookies) ||
-        payload.securityState === "broken" ||
-        (!payload.status && payload.responseContentAvailable)
-      );
+    return record.requestHeaders && record.eventTimings &&
+      (record.responseHeaders || payload.securityState === "broken" ||
+        (!payload.status && payload.responseContentAvailable));
   }
 
   /**
@@ -342,9 +349,7 @@ class FirefoxDataProvider {
     // Create tracking record for this request.
     this.rdpRequestMap.set(actor, {
       requestHeaders: false,
-      requestCookies: false,
       responseHeaders: false,
-      responseCookies: false,
       eventTimings: false,
     });
 
@@ -381,17 +386,15 @@ class FirefoxDataProvider {
 
     switch (updateType) {
       case "requestHeaders":
-      case "requestCookies":
       case "responseHeaders":
-      case "responseCookies":
         this.requestPayloadData(actor, updateType);
         break;
+      case "requestCookies":
+      case "responseCookies":
       case "requestPostData":
-        this.updateRequest(actor, {
-          // This field helps knowing when/if requestPostData property is available
-          // and can be requested via `requestData`
-          requestPostDataAvailable: true
-        });
+        // This field helps knowing when/if updateType property is available
+        // and can be requested via `requestData`
+        this.updateRequest(actor, { [`${updateType}Available`]: true });
         break;
       case "securityInfo":
         this.updateRequest(actor, { securityState: networkInfo.securityInfo });
@@ -554,7 +557,7 @@ class FirefoxDataProvider {
         // e.g. CustomRequestPanel will clone a request with additional '-clone' actor id
         this.webConsoleClient[clientMethodName](actor.replace("-clone", ""), (res) => {
           if (res.error) {
-            console.error(res.error);
+            console.error(res.message);
           }
           resolve(res);
         });
@@ -591,12 +594,12 @@ class FirefoxDataProvider {
    *
    * @param {object} response the message received from the server.
    */
-  onRequestCookies(response) {
-    return this.updateRequest(response.from, {
+  async onRequestCookies(response) {
+    let payload = await this.updateRequest(response.from, {
       requestCookies: response
-    }).then(() => {
-      emit(EVENTS.RECEIVED_REQUEST_COOKIES, response.from);
     });
+    emit(EVENTS.RECEIVED_REQUEST_COOKIES, response.from);
+    return payload.requestCookies;
   }
 
   /**
@@ -643,12 +646,12 @@ class FirefoxDataProvider {
    *
    * @param {object} response the message received from the server.
    */
-  onResponseCookies(response) {
-    return this.updateRequest(response.from, {
+  async onResponseCookies(response) {
+    let payload = await this.updateRequest(response.from, {
       responseCookies: response
-    }).then(() => {
-      emit(EVENTS.RECEIVED_RESPONSE_COOKIES, response.from);
     });
+    emit(EVENTS.RECEIVED_RESPONSE_COOKIES, response.from);
+    return payload.responseCookies;
   }
 
   /**
diff --git a/devtools/client/netmonitor/src/constants.js b/devtools/client/netmonitor/src/constants.js
index aaf93a67ec04..d922b3f52047 100644
--- a/devtools/client/netmonitor/src/constants.js
+++ b/devtools/client/netmonitor/src/constants.js
@@ -123,10 +123,12 @@ const UPDATE_PROPS = [
   "requestHeaders",
   "requestHeadersFromUploadStream",
   "requestCookies",
+  "requestCookiesAvailable",
   "requestPostData",
   "requestPostDataAvailable",
   "responseHeaders",
   "responseCookies",
+  "responseCookiesAvailable",
   "responseContent",
   "responseContentAvailable",
   "formDataSections",
diff --git a/devtools/client/netmonitor/src/har/har-builder.js b/devtools/client/netmonitor/src/har/har-builder.js
index 75b9180ceb5e..f7b50260ff37 100644
--- a/devtools/client/netmonitor/src/har/har-builder.js
+++ b/devtools/client/netmonitor/src/har/har-builder.js
@@ -268,7 +268,6 @@ HarBuilder.prototype = {
       postDataText: postData.text,
     })) {
       postData.mimeType = "application/x-www-form-urlencoded";
-
       // Extract form parameters and produce nice HAR array.
       let formDataSections = await getFormDataSections(
         requestHeaders,
diff --git a/devtools/client/netmonitor/src/har/test/browser_net_har_post_data.js b/devtools/client/netmonitor/src/har/test/browser_net_har_post_data.js
index 276d9b7146a8..aa0474a8914c 100644
--- a/devtools/client/netmonitor/src/har/test/browser_net_har_post_data.js
+++ b/devtools/client/netmonitor/src/har/test/browser_net_har_post_data.js
@@ -22,7 +22,7 @@ add_task(function* () {
   store.dispatch(Actions.batchEnable(false));
 
   // Execute one POST request on the page and wait till its done.
-  let wait = waitForNetworkEvents(monitor, 0, 1);
+  let wait = waitForNetworkEvents(monitor, 1);
   yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
     content.wrappedJSObject.executeTest();
   });
diff --git a/devtools/client/netmonitor/src/har/test/browser_net_har_throttle_upload.js b/devtools/client/netmonitor/src/har/test/browser_net_har_throttle_upload.js
index 2700dcf8d227..c475f3c61c39 100644
--- a/devtools/client/netmonitor/src/har/test/browser_net_har_throttle_upload.js
+++ b/devtools/client/netmonitor/src/har/test/browser_net_har_throttle_upload.js
@@ -47,7 +47,7 @@ function* throttleUploadTest(actuallyThrottle) {
   });
 
   // Execute one POST request on the page and wait till its done.
-  let wait = waitForNetworkEvents(monitor, 0, 1);
+  let wait = waitForNetworkEvents(monitor, 1);
   yield ContentTask.spawn(tab.linkedBrowser, { size }, function* (args) {
     content.wrappedJSObject.executeTest2(args.size);
   });
diff --git a/devtools/client/netmonitor/src/request-list-context-menu.js b/devtools/client/netmonitor/src/request-list-context-menu.js
index 7fbd995efe47..99bdf3ace781 100644
--- a/devtools/client/netmonitor/src/request-list-context-menu.js
+++ b/devtools/client/netmonitor/src/request-list-context-menu.js
@@ -43,6 +43,7 @@ class RequestListContextMenu {
       mimeType,
       httpVersion,
       requestHeaders,
+      requestPostData,
       requestPostDataAvailable,
       responseHeaders,
       responseContentAvailable,
@@ -73,7 +74,7 @@ class RequestListContextMenu {
       id: "request-list-context-copy-post-data",
       label: L10N.getStr("netmonitor.context.copyPostData"),
       accesskey: L10N.getStr("netmonitor.context.copyPostData.accesskey"),
-      visible: !!(selectedRequest && requestPostDataAvailable),
+      visible: !!(selectedRequest && (requestPostDataAvailable || requestPostData)),
       click: () => this.copyPostData(id),
     });
 
diff --git a/devtools/client/netmonitor/src/utils/filter-autocomplete-provider.js b/devtools/client/netmonitor/src/utils/filter-autocomplete-provider.js
index 3d0763cbcea1..615c4b0656f2 100644
--- a/devtools/client/netmonitor/src/utils/filter-autocomplete-provider.js
+++ b/devtools/client/netmonitor/src/utils/filter-autocomplete-provider.js
@@ -6,7 +6,7 @@
 
 const { FILTER_FLAGS } = require("../constants");
 
-/*
+/**
  * Generates a value for the given filter
  * ie. if flag = status-code, will generate "200" from the given request item.
  * For flags related to cookies, it might generate an array based on the request
@@ -70,7 +70,7 @@ function getAutocompleteValuesForFlag(flag, request) {
   return values;
 }
 
-/*
+/**
  * For a given lastToken passed ie. "is:", returns an array of populated flag
  * values for consumption in autocompleteProvider
  * ie. ["is:cached", "is:running", "is:from-cache"]
diff --git a/devtools/client/netmonitor/test/browser_net_autoscroll.js b/devtools/client/netmonitor/test/browser_net_autoscroll.js
index 9f41ee93b7e6..db75d61b2862 100644
--- a/devtools/client/netmonitor/test/browser_net_autoscroll.js
+++ b/devtools/client/netmonitor/test/browser_net_autoscroll.js
@@ -75,8 +75,6 @@ add_task(function* () {
     while (true) {
       info("Waiting for one network request");
       yield waitForNetworkEvents(monitor, 1);
-      console.log(requestsContainer.scrollHeight);
-      console.log(requestsContainer.clientHeight);
       if (requestsContainer.scrollHeight > requestsContainer.clientHeight) {
         info("The list is long enough, returning");
         return;
diff --git a/devtools/client/netmonitor/test/browser_net_cause.js b/devtools/client/netmonitor/test/browser_net_cause.js
index 793c3d2d2ef8..7b768b4dc32a 100644
--- a/devtools/client/netmonitor/test/browser_net_cause.js
+++ b/devtools/client/netmonitor/test/browser_net_cause.js
@@ -102,8 +102,6 @@ add_task(function* () {
   tab.linkedBrowser.loadURI(CAUSE_URL);
   yield wait;
 
-  // Fetch stack-trace data from the backend and wait till
-  // all packets are received.
   let requests = getSortedRequests(store.getState());
   yield Promise.all(requests.map(requestItem =>
     connector.requestData(requestItem.id, "stackTrace")));
@@ -111,7 +109,7 @@ add_task(function* () {
   is(store.getState().requests.requests.size, EXPECTED_REQUESTS.length,
     "All the page events should be recorded.");
 
-  EXPECTED_REQUESTS.forEach((spec, i) => {
+  EXPECTED_REQUESTS.forEach(async (spec, i) => {
     let { method, url, causeType, causeUri, stack } = spec;
 
     let requestItem = getSortedRequests(store.getState()).get(i);
@@ -127,6 +125,8 @@ add_task(function* () {
     let stacktrace = requestItem.stacktrace;
     let stackLen = stacktrace ? stacktrace.length : 0;
 
+    await waitUntil(() => !!requestItem.stacktrace);
+
     if (stack) {
       ok(stacktrace, `Request #${i} has a stacktrace`);
       ok(stackLen > 0,
diff --git a/devtools/client/netmonitor/test/browser_net_charts-01.js b/devtools/client/netmonitor/test/browser_net_charts-01.js
index 71ccbbf6d159..7f2c8f5f83ad 100644
--- a/devtools/client/netmonitor/test/browser_net_charts-01.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-01.js
@@ -8,12 +8,17 @@
  */
 
 add_task(function* () {
-  let { monitor } = yield initNetMonitor(SIMPLE_URL);
+  let { monitor, tab } = yield initNetMonitor(SIMPLE_URL);
+
   info("Starting test... ");
 
   let { document, windowRequire } = monitor.panelWin;
   let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
 
+  let wait = waitForNetworkEvents(monitor, 1);
+  tab.linkedBrowser.loadURI(SIMPLE_URL);
+  yield wait;
+
   let pie = Chart.Pie(document, {
     width: 100,
     height: 100,
diff --git a/devtools/client/netmonitor/test/browser_net_charts-02.js b/devtools/client/netmonitor/test/browser_net_charts-02.js
index 380742afae6a..492f58505beb 100644
--- a/devtools/client/netmonitor/test/browser_net_charts-02.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-02.js
@@ -11,12 +11,16 @@
 add_task(function* () {
   let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
 
-  let { monitor } = yield initNetMonitor(SIMPLE_URL);
+  let { monitor, tab } = yield initNetMonitor(SIMPLE_URL);
   info("Starting test... ");
 
   let { document, windowRequire } = monitor.panelWin;
   let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
 
+  let wait = waitForNetworkEvents(monitor, 1);
+  tab.linkedBrowser.loadURI(SIMPLE_URL);
+  yield wait;
+
   let pie = Chart.Pie(document, {
     data: null,
     width: 100,
diff --git a/devtools/client/netmonitor/test/browser_net_charts-03.js b/devtools/client/netmonitor/test/browser_net_charts-03.js
index af86ed371a45..600e9feef684 100644
--- a/devtools/client/netmonitor/test/browser_net_charts-03.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-03.js
@@ -10,12 +10,16 @@
 add_task(function* () {
   let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
 
-  let { monitor } = yield initNetMonitor(SIMPLE_URL);
+  let { monitor, tab } = yield initNetMonitor(SIMPLE_URL);
   info("Starting test... ");
 
   let { document, windowRequire } = monitor.panelWin;
   let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
 
+  let wait = waitForNetworkEvents(monitor, 1);
+  tab.linkedBrowser.loadURI(SIMPLE_URL);
+  yield wait;
+
   let table = Chart.Table(document, {
     title: "Table title",
     data: [{
diff --git a/devtools/client/netmonitor/test/browser_net_charts-04.js b/devtools/client/netmonitor/test/browser_net_charts-04.js
index 9ca5bc9e7ca6..4d843abd3f65 100644
--- a/devtools/client/netmonitor/test/browser_net_charts-04.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-04.js
@@ -11,12 +11,16 @@
 add_task(function* () {
   let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
 
-  let { monitor } = yield initNetMonitor(SIMPLE_URL);
+  let { monitor, tab } = yield initNetMonitor(SIMPLE_URL);
   info("Starting test... ");
 
   let { document, windowRequire } = monitor.panelWin;
   let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
 
+  let wait = waitForNetworkEvents(monitor, 1);
+  tab.linkedBrowser.loadURI(SIMPLE_URL);
+  yield wait;
+
   let table = Chart.Table(document, {
     title: "Table title",
     data: null,
diff --git a/devtools/client/netmonitor/test/browser_net_charts-05.js b/devtools/client/netmonitor/test/browser_net_charts-05.js
index 0b8f6e367897..0a408bffa46b 100644
--- a/devtools/client/netmonitor/test/browser_net_charts-05.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-05.js
@@ -10,12 +10,16 @@
 add_task(function* () {
   let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
 
-  let { monitor } = yield initNetMonitor(SIMPLE_URL);
+  let { monitor, tab } = yield initNetMonitor(SIMPLE_URL);
   info("Starting test... ");
 
   let { document, windowRequire } = monitor.panelWin;
   let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
 
+  let wait = waitForNetworkEvents(monitor, 1);
+  tab.linkedBrowser.loadURI(SIMPLE_URL);
+  yield wait;
+
   let chart = Chart.PieTable(document, {
     title: "Table title",
     data: [{
diff --git a/devtools/client/netmonitor/test/browser_net_charts-06.js b/devtools/client/netmonitor/test/browser_net_charts-06.js
index 65868239e93d..5ef24d684233 100644
--- a/devtools/client/netmonitor/test/browser_net_charts-06.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-06.js
@@ -10,12 +10,16 @@
 add_task(function* () {
   let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
 
-  let { monitor } = yield initNetMonitor(SIMPLE_URL);
+  let { monitor, tab } = yield initNetMonitor(SIMPLE_URL);
   info("Starting test... ");
 
   let { document, windowRequire } = monitor.panelWin;
   let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
 
+  let wait = waitForNetworkEvents(monitor, 1);
+  tab.linkedBrowser.loadURI(SIMPLE_URL);
+  yield wait;
+
   let pie = Chart.Pie(document, {
     data: [],
     width: 100,
diff --git a/devtools/client/netmonitor/test/browser_net_charts-07.js b/devtools/client/netmonitor/test/browser_net_charts-07.js
index aac2e5b80edd..59a3fb69c196 100644
--- a/devtools/client/netmonitor/test/browser_net_charts-07.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-07.js
@@ -10,12 +10,16 @@
 add_task(function* () {
   let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
 
-  let { monitor } = yield initNetMonitor(SIMPLE_URL);
+  let { monitor, tab } = yield initNetMonitor(SIMPLE_URL);
   info("Starting test... ");
 
   let { document, windowRequire } = monitor.panelWin;
   let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
 
+  let wait = waitForNetworkEvents(monitor, 1);
+  tab.linkedBrowser.loadURI(SIMPLE_URL);
+  yield wait;
+
   let table = Chart.Table(document, {
     data: [],
     totals: {
diff --git a/devtools/client/netmonitor/test/browser_net_complex-params.js b/devtools/client/netmonitor/test/browser_net_complex-params.js
index a068ada7b134..d22e1d36c1de 100644
--- a/devtools/client/netmonitor/test/browser_net_complex-params.js
+++ b/devtools/client/netmonitor/test/browser_net_complex-params.js
@@ -18,7 +18,7 @@ add_task(function* () {
 
   store.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForNetworkEvents(monitor, 1, 6);
+  let wait = waitForNetworkEvents(monitor, 7);
   yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
     content.wrappedJSObject.performRequests();
   });
diff --git a/devtools/client/netmonitor/test/browser_net_copy_params.js b/devtools/client/netmonitor/test/browser_net_copy_params.js
index 605cf5f31853..bfae40379b63 100644
--- a/devtools/client/netmonitor/test/browser_net_copy_params.js
+++ b/devtools/client/netmonitor/test/browser_net_copy_params.js
@@ -16,7 +16,7 @@ add_task(function* () {
 
   store.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForNetworkEvents(monitor, 1, 6);
+  let wait = waitForNetworkEvents(monitor, 7);
   yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
     content.wrappedJSObject.performRequests();
   });
diff --git a/devtools/client/netmonitor/test/browser_net_cors_requests.js b/devtools/client/netmonitor/test/browser_net_cors_requests.js
index 0d245d01af17..51e21a25ae3c 100644
--- a/devtools/client/netmonitor/test/browser_net_cors_requests.js
+++ b/devtools/client/netmonitor/test/browser_net_cors_requests.js
@@ -19,7 +19,7 @@ add_task(function* () {
 
   store.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForNetworkEvents(monitor, 1, 1);
+  let wait = waitForNetworkEvents(monitor, 2);
 
   info("Performing a CORS request");
   let requestUrl = "http://test1.example.com" + CORS_SJS_PATH;
diff --git a/devtools/client/netmonitor/test/browser_net_curl-utils.js b/devtools/client/netmonitor/test/browser_net_curl-utils.js
index f7598ab52576..8a7f8e993e6b 100644
--- a/devtools/client/netmonitor/test/browser_net_curl-utils.js
+++ b/devtools/client/netmonitor/test/browser_net_curl-utils.js
@@ -25,7 +25,7 @@ add_task(function* () {
 
   store.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForNetworkEvents(monitor, 1, 3);
+  let wait = waitForNetworkEvents(monitor, 4);
   yield ContentTask.spawn(tab.linkedBrowser, SIMPLE_SJS, function* (url) {
     content.wrappedJSObject.performRequests(url);
   });
diff --git a/devtools/client/netmonitor/test/browser_net_header-docs.js b/devtools/client/netmonitor/test/browser_net_header-docs.js
index 886aa6d2ed61..593e91049b60 100644
--- a/devtools/client/netmonitor/test/browser_net_header-docs.js
+++ b/devtools/client/netmonitor/test/browser_net_header-docs.js
@@ -20,7 +20,7 @@ add_task(function* () {
 
   store.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForNetworkEvents(monitor, 0, 2);
+  let wait = waitForNetworkEvents(monitor, 2);
   yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
     content.wrappedJSObject.performRequests();
   });
diff --git a/devtools/client/netmonitor/test/browser_net_headers-alignment.js b/devtools/client/netmonitor/test/browser_net_headers-alignment.js
index d69dfff24317..f75b5b0bb894 100644
--- a/devtools/client/netmonitor/test/browser_net_headers-alignment.js
+++ b/devtools/client/netmonitor/test/browser_net_headers-alignment.js
@@ -58,8 +58,6 @@ add_task(function* () {
     while (true) {
       info("Waiting for one network request");
       yield waitForNetworkEvents(monitor, 1);
-      console.log(requestsContainer.scrollHeight);
-      console.log(requestsContainer.clientHeight);
       if (requestsContainer.scrollHeight > requestsContainer.clientHeight) {
         info("The list is long enough, returning");
         return;
diff --git a/devtools/client/netmonitor/test/browser_net_params_sorted.js b/devtools/client/netmonitor/test/browser_net_params_sorted.js
index 9d571642cc9a..475fb4d652ae 100644
--- a/devtools/client/netmonitor/test/browser_net_params_sorted.js
+++ b/devtools/client/netmonitor/test/browser_net_params_sorted.js
@@ -16,7 +16,7 @@ add_task(function* () {
 
   store.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForNetworkEvents(monitor, 0, 2);
+  let wait = waitForNetworkEvents(monitor, 2);
   yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
     content.wrappedJSObject.performRequests();
   });
diff --git a/devtools/client/netmonitor/test/browser_net_post-data-01.js b/devtools/client/netmonitor/test/browser_net_post-data-01.js
index 90ac5744a6ae..e2e49e600cc4 100644
--- a/devtools/client/netmonitor/test/browser_net_post-data-01.js
+++ b/devtools/client/netmonitor/test/browser_net_post-data-01.js
@@ -25,7 +25,7 @@ add_task(function* () {
 
   store.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForNetworkEvents(monitor, 0, 2);
+  let wait = waitForNetworkEvents(monitor, 2);
   yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
     content.wrappedJSObject.performRequests();
   });
diff --git a/devtools/client/netmonitor/test/browser_net_post-data-02.js b/devtools/client/netmonitor/test/browser_net_post-data-02.js
index b244dc0dcda3..088368c710c8 100644
--- a/devtools/client/netmonitor/test/browser_net_post-data-02.js
+++ b/devtools/client/netmonitor/test/browser_net_post-data-02.js
@@ -19,7 +19,7 @@ add_task(function* () {
 
   store.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForNetworkEvents(monitor, 0, 1);
+  let wait = waitForNetworkEvents(monitor, 1);
   yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
     content.wrappedJSObject.performRequests();
   });
diff --git a/devtools/client/netmonitor/test/browser_net_post-data-03.js b/devtools/client/netmonitor/test/browser_net_post-data-03.js
index fb86636572fd..92886e7b45f3 100644
--- a/devtools/client/netmonitor/test/browser_net_post-data-03.js
+++ b/devtools/client/netmonitor/test/browser_net_post-data-03.js
@@ -19,7 +19,7 @@ add_task(function* () {
 
   store.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForNetworkEvents(monitor, 0, 1);
+  let wait = waitForNetworkEvents(monitor, 1);
   yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
     content.wrappedJSObject.performRequests();
   });
diff --git a/devtools/client/netmonitor/test/browser_net_post-data-04.js b/devtools/client/netmonitor/test/browser_net_post-data-04.js
index 032279ad54eb..9f5bb8b5e17c 100644
--- a/devtools/client/netmonitor/test/browser_net_post-data-04.js
+++ b/devtools/client/netmonitor/test/browser_net_post-data-04.js
@@ -19,7 +19,7 @@ add_task(function* () {
 
   store.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForNetworkEvents(monitor, 0, 1);
+  let wait = waitForNetworkEvents(monitor, 1);
   yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
     content.wrappedJSObject.performRequests();
   });
diff --git a/devtools/client/netmonitor/test/browser_net_raw_headers.js b/devtools/client/netmonitor/test/browser_net_raw_headers.js
index 1b9736add1f7..470f32328f17 100644
--- a/devtools/client/netmonitor/test/browser_net_raw_headers.js
+++ b/devtools/client/netmonitor/test/browser_net_raw_headers.js
@@ -19,7 +19,7 @@ add_task(function* () {
 
   store.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForNetworkEvents(monitor, 0, 2);
+  let wait = waitForNetworkEvents(monitor, 2);
   yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
     content.wrappedJSObject.performRequests();
   });
@@ -30,11 +30,9 @@ add_task(function* () {
     document.querySelectorAll(".request-list-item")[0]);
   yield wait;
 
-  let onRequestPostData = monitor.panelWin.once(EVENTS.RECEIVED_REQUEST_POST_DATA);
   wait = waitForDOM(document, ".raw-headers-container textarea", 2);
   EventUtils.sendMouseEvent({ type: "click" }, getRawHeadersButton());
   yield wait;
-  yield onRequestPostData;
 
   testRawHeaderButtonStyle(true);
 
diff --git a/devtools/client/netmonitor/test/browser_net_resend.js b/devtools/client/netmonitor/test/browser_net_resend.js
index 7578653f7a6b..3b77c3ddcdbc 100644
--- a/devtools/client/netmonitor/test/browser_net_resend.js
+++ b/devtools/client/netmonitor/test/browser_net_resend.js
@@ -26,7 +26,7 @@ add_task(function* () {
 
   store.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForNetworkEvents(monitor, 0, 2);
+  let wait = waitForNetworkEvents(monitor, 2);
   yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
     content.wrappedJSObject.performRequests();
   });
@@ -52,7 +52,7 @@ add_task(function* () {
   testCustomItemChanged(customItem, origItem);
 
   // send the new request
-  wait = waitForNetworkEvents(monitor, 0, 1);
+  wait = waitForNetworkEvents(monitor, 1);
   store.dispatch(Actions.sendCustomRequest(connector));
   yield wait;
 
diff --git a/devtools/client/netmonitor/test/browser_net_resend_cors.js b/devtools/client/netmonitor/test/browser_net_resend_cors.js
index 875ca53884c9..fe9b272caaec 100644
--- a/devtools/client/netmonitor/test/browser_net_resend_cors.js
+++ b/devtools/client/netmonitor/test/browser_net_resend_cors.js
@@ -23,7 +23,7 @@ add_task(function* () {
   let requestUrl = "http://test1.example.com" + CORS_SJS_PATH;
 
   info("Waiting for OPTIONS, then POST");
-  let wait = waitForNetworkEvents(monitor, 1, 1);
+  let wait = waitForNetworkEvents(monitor, 2);
   yield ContentTask.spawn(tab.linkedBrowser, requestUrl, function* (url) {
     content.wrappedJSObject.performRequests(url, "triggering/preflight", "post-data");
   });
@@ -40,7 +40,7 @@ add_task(function* () {
 
   // Resend both requests without modification. Wait for resent OPTIONS, then POST.
   // POST is supposed to have no preflight OPTIONS request this time (CORS is disabled)
-  let onRequests = waitForNetworkEvents(monitor, 1, 0);
+  let onRequests = waitForNetworkEvents(monitor, 1);
   ITEMS.forEach((item) => {
     info(`Selecting the ${item.method} request`);
     store.dispatch(Actions.selectRequest(item.id));
diff --git a/devtools/client/netmonitor/test/browser_net_resend_headers.js b/devtools/client/netmonitor/test/browser_net_resend_headers.js
index 78f0e3fd6d67..be39b978e7c1 100644
--- a/devtools/client/netmonitor/test/browser_net_resend_headers.js
+++ b/devtools/client/netmonitor/test/browser_net_resend_headers.js
@@ -30,7 +30,7 @@ add_task(function* () {
     { name: "Accept-Language", value: "cs-CZ" }
   ];
 
-  let wait = waitForNetworkEvents(monitor, 0, 1);
+  let wait = waitForNetworkEvents(monitor, 1);
   sendHTTPRequest({
     url: requestUrl,
     method: "POST",
diff --git a/devtools/client/netmonitor/test/browser_net_throttle.js b/devtools/client/netmonitor/test/browser_net_throttle.js
index dd06ad598208..63bafe9def6f 100644
--- a/devtools/client/netmonitor/test/browser_net_throttle.js
+++ b/devtools/client/netmonitor/test/browser_net_throttle.js
@@ -16,7 +16,6 @@ function* throttleTest(actuallyThrottle) {
   let { monitor } = yield initNetMonitor(SIMPLE_URL);
   let { store, windowRequire, connector } = monitor.panelWin;
   let { ACTIVITY_TYPE } = windowRequire("devtools/client/netmonitor/src/constants");
-  let { EVENTS } = windowRequire("devtools/client/netmonitor/src/constants");
   let { setPreferences, triggerActivity } = connector;
   let {
     getSortedRequests,
@@ -46,9 +45,9 @@ function* throttleTest(actuallyThrottle) {
     });
   });
 
-  let eventPromise = monitor.panelWin.once(EVENTS.RECEIVED_EVENT_TIMINGS);
+  let wait = waitForNetworkEvents(monitor, 1);
   yield triggerActivity(ACTIVITY_TYPE.RELOAD.WITH_CACHE_DISABLED);
-  yield eventPromise;
+  yield wait;
 
   yield waitUntil(() => {
     let requestItem = getSortedRequests(store.getState()).get(0);
diff --git a/devtools/client/netmonitor/test/browser_net_timing-division.js b/devtools/client/netmonitor/test/browser_net_timing-division.js
index 8cebb388b66f..1e50e6eab4f6 100644
--- a/devtools/client/netmonitor/test/browser_net_timing-division.js
+++ b/devtools/client/netmonitor/test/browser_net_timing-division.js
@@ -8,12 +8,6 @@
  */
 
 add_task(function* () {
-  // Make sure timing division can render properly
-  Services.prefs.setCharPref(
-    "devtools.netmonitor.visibleColumns",
-    "[\"waterfall\"]"
-  );
-
   let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
   info("Starting test... ");
 
diff --git a/devtools/client/netmonitor/test/browser_net_view-source-debugger.js b/devtools/client/netmonitor/test/browser_net_view-source-debugger.js
index 198fff38e54e..973f65c24e2f 100644
--- a/devtools/client/netmonitor/test/browser_net_view-source-debugger.js
+++ b/devtools/client/netmonitor/test/browser_net_view-source-debugger.js
@@ -17,7 +17,7 @@ add_task(async function () {
   let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
   store.dispatch(Actions.batchEnable(false));
 
-  let waitForContentRequests = waitForNetworkEvents(monitor, 0, 2);
+  let waitForContentRequests = waitForNetworkEvents(monitor, 2);
   await ContentTask.spawn(tab.linkedBrowser, {},
     () => content.wrappedJSObject.performRequests());
   await waitForContentRequests;
diff --git a/devtools/client/netmonitor/test/head.js b/devtools/client/netmonitor/test/head.js
index 4454701f934a..02818a393c02 100644
--- a/devtools/client/netmonitor/test/head.js
+++ b/devtools/client/netmonitor/test/head.js
@@ -221,6 +221,45 @@ function waitForAllRequestsFinished(monitor) {
   });
 }
 
+let finishedQueue = {};
+let updatingTypes = [
+  "NetMonitor:NetworkEventUpdating:RequestCookies",
+  "NetMonitor:NetworkEventUpdating:ResponseCookies",
+];
+let updatedTypes = [
+  "NetMonitor:NetworkEventUpdated:RequestCookies",
+  "NetMonitor:NetworkEventUpdated:ResponseCookies",
+];
+
+// Start collecting all networkEventUpdate event when panel is opened.
+// removeTab() should be called once all corresponded RECEIVED_* events finished.
+function startNetworkEventUpdateObserver(panelWin) {
+  updatingTypes.forEach((type) => panelWin.on(type, (event, actor) => {
+    let key = actor + "-" + event.replace("NetMonitor:NetworkEventUpdating:", "");
+    finishedQueue[key] = finishedQueue[key] ? finishedQueue[key] + 1 : 1;
+  }));
+
+  updatedTypes.forEach((type) => panelWin.on(type, (event, actor) => {
+    let key = actor + "-" + event.replace("NetMonitor:NetworkEventUpdated:", "");
+    finishedQueue[key]--;
+  }));
+}
+
+function* waitForAllNetworkUpdateEvents() {
+  function checkNetworkEventUpdateState() {
+    for (let key in finishedQueue) {
+      if (finishedQueue[key] > 0) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+  info("Wait for completion of all NetworkUpdateEvents packets...");
+  yield waitUntil(() => checkNetworkEventUpdateState());
+  finishedQueue = {};
+}
+
 function initNetMonitor(url, enableCache) {
   info("Initializing a network monitor pane.");
 
@@ -238,6 +277,8 @@ function initNetMonitor(url, enableCache) {
 
     let monitor = toolbox.getCurrentPanel();
 
+    startNetworkEventUpdateObserver(monitor.panelWin);
+
     if (!enableCache) {
       let panel = monitor.panelWin;
       let { store, windowRequire } = panel;
@@ -271,6 +312,9 @@ function restartNetMonitor(monitor, newUrl) {
     let tab = monitor.toolbox.target.tab;
     let url = newUrl || tab.linkedBrowser.currentURI.spec;
 
+    yield waitForAllNetworkUpdateEvents();
+    info("All pending requests finished.");
+
     let onDestroyed = monitor.once("destroyed");
     yield removeTab(tab);
     yield onDestroyed;
@@ -289,6 +333,7 @@ function teardown(monitor) {
     // done from FirefoxDataProvider.
     info("Wait for completion of all pending RDP requests...");
     yield waitForExistingRequests(monitor);
+    yield waitForAllNetworkUpdateEvents();
     info("All pending requests finished.");
 
     let onDestroyed = monitor.once("destroyed");
@@ -297,7 +342,7 @@ function teardown(monitor) {
   });
 }
 
-function waitForNetworkEvents(monitor, getRequests, postRequests = 0) {
+function waitForNetworkEvents(monitor, getRequests) {
   return new Promise((resolve) => {
     let panel = monitor.panelWin;
     let { getNetworkRequest } = panel.connector;
@@ -307,12 +352,8 @@ function waitForNetworkEvents(monitor, getRequests, postRequests = 0) {
     let awaitedEventsToListeners = [
       ["UPDATING_REQUEST_HEADERS", onGenericEvent],
       ["RECEIVED_REQUEST_HEADERS", onGenericEvent],
-      ["UPDATING_REQUEST_COOKIES", onGenericEvent],
-      ["RECEIVED_REQUEST_COOKIES", onGenericEvent],
       ["UPDATING_RESPONSE_HEADERS", onGenericEvent],
       ["RECEIVED_RESPONSE_HEADERS", onGenericEvent],
-      ["UPDATING_RESPONSE_COOKIES", onGenericEvent],
-      ["RECEIVED_RESPONSE_COOKIES", onGenericEvent],
       ["UPDATING_EVENT_TIMINGS", onGenericEvent],
       ["RECEIVED_EVENT_TIMINGS", onGenericEvent],
       ["PAYLOAD_READY", onPayloadReady]
@@ -359,10 +400,9 @@ function waitForNetworkEvents(monitor, getRequests, postRequests = 0) {
     }
 
     function maybeResolve(event, actor, networkInfo) {
-      info("> Network events progress: " +
-        "Payload: " + payloadReady + "/" + (getRequests + postRequests) + ", " +
-        "Generic: " + genericEvents + "/" +
-          ((getRequests + postRequests) * expectedGenericEvents) + ", " +
+      info("> Network event progress: " +
+        "Payload: " + payloadReady + "/" + getRequests + ", " +
+        "Generic: " + genericEvents + "/" + (getRequests * expectedGenericEvents) + ", " +
         "got " + event + " for " + actor);
 
       let url = networkInfo.request.url;
@@ -374,8 +414,8 @@ function waitForNetworkEvents(monitor, getRequests, postRequests = 0) {
       // There are `expectedGenericEvents` updates which need to be fired for a request
       // to be considered finished. The "requestPostData" packet isn't fired for non-POST
       // requests.
-      if (payloadReady >= (getRequests + postRequests) &&
-        genericEvents >= (getRequests + postRequests) * expectedGenericEvents) {
+      if (payloadReady >= getRequests &&
+        genericEvents >= getRequests * expectedGenericEvents) {
         awaitedEventsToListeners.forEach(([e, l]) => panel.off(EVENTS[e], l));
         executeSoon(resolve);
       }
diff --git a/devtools/client/netmonitor/test/shared-head.js b/devtools/client/netmonitor/test/shared-head.js
index fc2d071792b2..4d6834ff4874 100644
--- a/devtools/client/netmonitor/test/shared-head.js
+++ b/devtools/client/netmonitor/test/shared-head.js
@@ -22,11 +22,9 @@ async function waitForExistingRequests(monitor) {
       }
       // Do same check than FirefoxDataProvider.isRequestPayloadReady,
       // in order to ensure there is no more pending payload requests to be done.
-      if (!request.requestHeaders || !request.requestCookies ||
-          !request.eventTimings ||
-          ((!request.responseHeaders || !request.responseCookies) &&
-            request.securityState != "broken" &&
-            (!request.responseContentAvailable || request.status))) {
+      if (!request.requestHeaders || !request.eventTimings ||
+          (!request.responseHeaders && request.securityState !== "broken" &&
+          (!request.responseContentAvailable || request.status))) {
         return false;
       }
     }
diff --git a/devtools/client/shared/components/SearchBox.js b/devtools/client/shared/components/SearchBox.js
index 4c5d282bb67f..435b61455131 100644
--- a/devtools/client/shared/components/SearchBox.js
+++ b/devtools/client/shared/components/SearchBox.js
@@ -18,6 +18,9 @@ class SearchBox extends Component {
       delay: PropTypes.number,
       keyShortcut: PropTypes.string,
       onChange: PropTypes.func,
+      onFocus: PropTypes.func,
+      onBlur: PropTypes.func,
+      onKeyDown: PropTypes.func,
       placeholder: PropTypes.string,
       type: PropTypes.string,
       autocompleteProvider: PropTypes.func,
@@ -96,14 +99,26 @@ class SearchBox extends Component {
   }
 
   onFocus() {
+    if (this.props.onFocus) {
+      this.props.onFocus();
+    }
+
     this.setState({ focused: true });
   }
 
   onBlur() {
+    if (this.props.onBlur) {
+      this.props.onBlur();
+    }
+
     this.setState({ focused: false });
   }
 
   onKeyDown(e) {
+    if (this.props.onKeyDown) {
+      this.props.onKeyDown();
+    }
+
     let { autocomplete } = this.refs;
     if (!autocomplete || autocomplete.state.list.length <= 0) {
       return;

From bde5c06616d4492533ebcaade6db56c9c5836b0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 1 Dec 2017 10:41:33 -0600
Subject: [PATCH 063/219] servo: Merge #19446 - style: Make -moz-border-colors
 chrome only (from emilio:bye-moz-border-colors); r=xidorn

This also makes the `border` shorthand not reset them.

Bug: 1417200
Reviewed-by: xidorn
MozReview-Commit-ID: KNais1e5FnE
Source-Repo: https://github.com/servo/servo
Source-Revision: af8d53372f1cb7364b07f48bbd3d9ecd01d9b69a

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 20695ab01754b373d7f8514f5303c768d0edb3b1
---
 .../style/properties/longhand/border.mako.rs         |  1 +
 .../style/properties/shorthand/border.mako.rs        | 12 +-----------
 servo/tests/unit/stylo/size_of.rs                    |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/servo/components/style/properties/longhand/border.mako.rs b/servo/components/style/properties/longhand/border.mako.rs
index 89b707f90c01..2756cf28063f 100644
--- a/servo/components/style/properties/longhand/border.mako.rs
+++ b/servo/components/style/properties/longhand/border.mako.rs
@@ -74,6 +74,7 @@ ${helpers.gecko_keyword_conversion(Keyword('border-style',
                        spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-border-*-colors)"
                        products="gecko"
                        flags="APPLIES_TO_FIRST_LETTER"
+                       enabled_in="chrome"
                        ignored_when_colors_disabled="True">
         use std::fmt;
         use style_traits::ToCss;
diff --git a/servo/components/style/properties/shorthand/border.mako.rs b/servo/components/style/properties/shorthand/border.mako.rs
index 5a7eaf89f6d9..8fb1b749b3b6 100644
--- a/servo/components/style/properties/shorthand/border.mako.rs
+++ b/servo/components/style/properties/shorthand/border.mako.rs
@@ -131,16 +131,9 @@ pub fn parse_border<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
         for side in PHYSICAL_SIDES
         for prop in ['color', 'style', 'width'])}
         ${' '.join('border-image-%s' % name
-        for name in ['outset', 'repeat', 'slice', 'source', 'width'])}
-        ${' '.join('-moz-border-%s-colors' % side
-        for side in PHYSICAL_SIDES) if product == 'gecko' else ''}"
+        for name in ['outset', 'repeat', 'slice', 'source', 'width'])}"
     spec="https://drafts.csswg.org/css-backgrounds/#border">
 
-    % if product == "gecko":
-        use properties::longhands::{_moz_border_top_colors, _moz_border_right_colors,
-                                    _moz_border_bottom_colors, _moz_border_left_colors};
-    % endif
-
     pub fn parse_value<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
                                -> Result<Longhands, ParseError<'i>> {
         use properties::longhands::{border_image_outset, border_image_repeat, border_image_slice};
@@ -152,9 +145,6 @@ pub fn parse_border<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
                 border_${side}_color: color.clone(),
                 border_${side}_style: style,
                 border_${side}_width: width.clone(),
-                % if product == "gecko":
-                    _moz_border_${side}_colors: _moz_border_${side}_colors::get_initial_specified_value(),
-                % endif
             % endfor
 
             // The ‘border’ shorthand resets ‘border-image’ to its initial value.
diff --git a/servo/tests/unit/stylo/size_of.rs b/servo/tests/unit/stylo/size_of.rs
index 53ce16b42d43..9c2f6cbba1ca 100644
--- a/servo/tests/unit/stylo/size_of.rs
+++ b/servo/tests/unit/stylo/size_of.rs
@@ -50,7 +50,7 @@ size_of_test!(test_size_of_rule_node, RuleNode, 80);
 
 // This is huge, but we allocate it on the stack and then never move it,
 // we only pass `&mut SourcePropertyDeclaration` references around.
-size_of_test!(test_size_of_parsed_declaration, style::properties::SourcePropertyDeclaration, 704);
+size_of_test!(test_size_of_parsed_declaration, style::properties::SourcePropertyDeclaration, 576);
 
 size_of_test!(test_size_of_computed_image, computed::image::Image, 40);
 size_of_test!(test_size_of_specified_image, specified::image::Image, 40);

From 247165dd5b656a144d9535f0794c7d5a48ddb84a Mon Sep 17 00:00:00 2001
From: ddh <dianehosfelt@gmail.com>
Date: Fri, 1 Dec 2017 11:41:47 -0600
Subject: [PATCH 064/219] servo: Merge #19307 - change parse_own_css to queue
 event not fire synchronously (from avadacatavra:domrefcellpanic); r=jdm

<!-- Please describe your changes on the following line: -->
fixes a panic and aligns with spec

I've also added checks around each mutable borrow of the tokenizer to see if we can catch any other panics

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #18930 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 712d75af01e02fe9689d18d7a94c89318e39f52b

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 66a16b12a0302d6a108f7b6345a0554794c0f8de
---
 servo/components/script/dom/document.rs         |  7 +++++++
 servo/components/script/dom/eventtarget.rs      | 11 +++++++++++
 servo/components/script/dom/htmlstyleelement.rs |  6 +++---
 servo/components/script/dom/servoparser/mod.rs  |  4 ++++
 servo/components/script/dom/window.rs           |  4 ++++
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/servo/components/script/dom/document.rs b/servo/components/script/dom/document.rs
index 5be8e9b768a3..0cd6b22557df 100644
--- a/servo/components/script/dom/document.rs
+++ b/servo/components/script/dom/document.rs
@@ -1885,6 +1885,13 @@ impl Document {
         self.current_parser.get()
     }
 
+    pub fn can_invoke_script(&self) -> bool {
+        match self.get_current_parser() {
+            Some(parser) => parser.parser_is_not_active(),
+            None => true,
+        }
+    }
+
     /// Iterate over all iframes in the document.
     pub fn iter_iframes(&self) -> impl Iterator<Item=DomRoot<HTMLIFrameElement>> {
         self.upcast::<Node>()
diff --git a/servo/components/script/dom/eventtarget.rs b/servo/components/script/dom/eventtarget.rs
index 01fbc10c4633..43a0a3502a32 100644
--- a/servo/components/script/dom/eventtarget.rs
+++ b/servo/components/script/dom/eventtarget.rs
@@ -315,10 +315,21 @@ impl EventTarget {
     pub fn dispatch_event_with_target(&self,
                                       target: &EventTarget,
                                       event: &Event) -> EventStatus {
+        if let Some(window) = target.global().downcast::<Window>() {
+            if window.has_document() {
+                assert!(window.Document().can_invoke_script());
+            }
+        };
+
         event.dispatch(self, Some(target))
     }
 
     pub fn dispatch_event(&self, event: &Event) -> EventStatus {
+        if let Some(window) = self.global().downcast::<Window>() {
+            if window.has_document() {
+                assert!(window.Document().can_invoke_script());
+            }
+        };
         event.dispatch(self, None)
     }
 
diff --git a/servo/components/script/dom/htmlstyleelement.rs b/servo/components/script/dom/htmlstyleelement.rs
index f6d2caaccf84..6a6bc416d2db 100644
--- a/servo/components/script/dom/htmlstyleelement.rs
+++ b/servo/components/script/dom/htmlstyleelement.rs
@@ -12,7 +12,6 @@ use dom::bindings::root::{DomRoot, MutNullableDom};
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::document::Document;
 use dom::element::{Element, ElementCreator};
-use dom::eventtarget::EventTarget;
 use dom::htmlelement::HTMLElement;
 use dom::node::{ChildrenMutation, Node, UnbindContext, document_from_node, window_from_node};
 use dom::stylesheet::StyleSheet as DOMStyleSheet;
@@ -105,9 +104,10 @@ impl HTMLStyleElement {
 
         let sheet = Arc::new(sheet);
 
-        // No subresource loads were triggered, just fire the load event now.
+        // No subresource loads were triggered, queue load event
         if self.pending_loads.get() == 0 {
-            self.upcast::<EventTarget>().fire_event(atom!("load"));
+            let window = window_from_node(self);
+            window.dom_manipulation_task_source().queue_simple_event(self.upcast(), atom!("load"), &window);
         }
 
         self.set_stylesheet(sheet);
diff --git a/servo/components/script/dom/servoparser/mod.rs b/servo/components/script/dom/servoparser/mod.rs
index 6947ba5e8379..88dd2a740f57 100644
--- a/servo/components/script/dom/servoparser/mod.rs
+++ b/servo/components/script/dom/servoparser/mod.rs
@@ -102,6 +102,10 @@ enum LastChunkState {
 }
 
 impl ServoParser {
+    pub fn parser_is_not_active(&self) -> bool {
+        self.can_write() || self.tokenizer.try_borrow_mut().is_ok()
+    }
+
     pub fn parse_html_document(document: &Document, input: DOMString, url: ServoUrl) {
         let parser = if PREFS.get("dom.servoparser.async_html_tokenizer.enabled").as_boolean().unwrap() {
             ServoParser::new(document,
diff --git a/servo/components/script/dom/window.rs b/servo/components/script/dom/window.rs
index 76457e1ba6b0..71d13e8e8f75 100644
--- a/servo/components/script/dom/window.rs
+++ b/servo/components/script/dom/window.rs
@@ -1048,6 +1048,10 @@ impl Window {
         self.navigation_start_precise.get()
     }
 
+    pub fn has_document(&self) -> bool {
+        self.document.get().is_some()
+    }
+
     /// Cancels all the tasks associated with that window.
     ///
     /// This sets the current `ignore_further_async_events` sentinel value to

From 334f5f87006b33b0caa3e7b1f5a2f65da743086e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 1 Dec 2017 12:58:11 -0600
Subject: [PATCH 065/219] servo: Merge #19447 - servo_arc: Add some #[inline]
 and repr(C) annotations (from emilio:arc-soundness); r=jdm

inline is probably unnecessary, but anyway... We rely on those being repr(C), so
they rather have some.

Source-Repo: https://github.com/servo/servo
Source-Revision: 210d0ab30a72b58c2797d29db3c2a5521730285e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : d675471a908fe1b961aa39e2fd0b637d29bdc175
---
 servo/components/servo_arc/lib.rs | 33 ++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/servo/components/servo_arc/lib.rs b/servo/components/servo_arc/lib.rs
index cc378e237d37..0e77abd6e4bd 100644
--- a/servo/components/servo_arc/lib.rs
+++ b/servo/components/servo_arc/lib.rs
@@ -127,6 +127,7 @@ impl<T: Sized + 'static> Hash for NonZeroPtrMut<T> {
     }
 }
 
+#[repr(C)]
 pub struct Arc<T: ?Sized + 'static> {
     p: NonZeroPtrMut<ArcInner<T>>,
 }
@@ -168,6 +169,7 @@ impl<T> DerefMut for UniqueArc<T> {
 unsafe impl<T: ?Sized + Sync + Send> Send for Arc<T> {}
 unsafe impl<T: ?Sized + Sync + Send> Sync for Arc<T> {}
 
+#[repr(C)]
 struct ArcInner<T: ?Sized> {
     count: atomic::AtomicUsize,
     data: T,
@@ -186,13 +188,15 @@ impl<T> Arc<T> {
         Arc { p: NonZeroPtrMut::new(Box::into_raw(x)) }
     }
 
+    #[inline]
     pub fn into_raw(this: Self) -> *const T {
         let ptr = unsafe { &((*this.ptr()).data) as *const _ };
         mem::forget(this);
         ptr
     }
 
-    pub unsafe fn from_raw(ptr: *const T) -> Self {
+    #[inline]
+    unsafe fn from_raw(ptr: *const T) -> Self {
         // To find the corresponding pointer to the `ArcInner` we need
         // to subtract the offset of the `data` field from the pointer.
         let ptr = (ptr as *const u8).offset(-offset_of!(ArcInner<T>, data));
@@ -203,6 +207,7 @@ impl<T> Arc<T> {
 
     /// Produce a pointer to the data that can be converted back
     /// to an arc
+    #[inline]
     pub fn borrow_arc<'a>(&'a self) -> ArcBorrow<'a, T> {
         ArcBorrow(&**self)
     }
@@ -454,18 +459,21 @@ impl<T: ?Sized + Hash> Hash for Arc<T> {
 }
 
 impl<T> From<T> for Arc<T> {
+    #[inline]
     fn from(t: T) -> Self {
         Arc::new(t)
     }
 }
 
 impl<T: ?Sized> borrow::Borrow<T> for Arc<T> {
+    #[inline]
     fn borrow(&self) -> &T {
         &**self
     }
 }
 
 impl<T: ?Sized> AsRef<T> for Arc<T> {
+    #[inline]
     fn as_ref(&self) -> &T {
         &**self
     }
@@ -652,7 +660,7 @@ fn thin_to_thick<H, T>(thin: *mut ArcInner<HeaderSliceWithLength<H, [T; 1]>>)
 impl<H: 'static, T: 'static> ThinArc<H, T> {
     /// Temporarily converts |self| into a bonafide Arc and exposes it to the
     /// provided callback. The refcount is not modified.
-    #[inline(always)]
+    #[inline]
     pub fn with_arc<F, U>(&self, f: F) -> U
         where F: FnOnce(&Arc<HeaderSliceWithLength<H, [T]>>) -> U
     {
@@ -675,6 +683,7 @@ impl<H: 'static, T: 'static> ThinArc<H, T> {
 
     /// Returns the address on the heap of the ThinArc itself -- not the T
     /// within it -- for memory reporting.
+    #[inline]
     pub fn heap_ptr(&self) -> *const c_void {
         self.ptr as *const ArcInner<T> as *const c_void
     }
@@ -682,18 +691,22 @@ impl<H: 'static, T: 'static> ThinArc<H, T> {
 
 impl<H, T> Deref for ThinArc<H, T> {
     type Target = HeaderSliceWithLength<H, [T]>;
+
+    #[inline]
     fn deref(&self) -> &Self::Target {
         unsafe { &(*thin_to_thick(self.ptr)).data }
     }
 }
 
 impl<H: 'static, T: 'static> Clone for ThinArc<H, T> {
+    #[inline]
     fn clone(&self) -> Self {
         ThinArc::with_arc(self, |a| Arc::into_thin(a.clone()))
     }
 }
 
 impl<H: 'static, T: 'static> Drop for ThinArc<H, T> {
+    #[inline]
     fn drop(&mut self) {
         let _ = Arc::from_thin(ThinArc { ptr: self.ptr });
     }
@@ -702,6 +715,7 @@ impl<H: 'static, T: 'static> Drop for ThinArc<H, T> {
 impl<H: 'static, T: 'static> Arc<HeaderSliceWithLength<H, [T]>> {
     /// Converts an Arc into a ThinArc. This consumes the Arc, so the refcount
     /// is not modified.
+    #[inline]
     pub fn into_thin(a: Self) -> ThinArc<H, T> {
         assert!(a.header.length == a.slice.len(),
                 "Length needs to be correct for ThinArc to work");
@@ -715,6 +729,7 @@ impl<H: 'static, T: 'static> Arc<HeaderSliceWithLength<H, [T]>> {
 
     /// Converts a ThinArc into an Arc. This consumes the ThinArc, so the refcount
     /// is not modified.
+    #[inline]
     pub fn from_thin(a: ThinArc<H, T>) -> Self {
         let ptr = thin_to_thick(a.ptr);
         mem::forget(a);
@@ -725,6 +740,7 @@ impl<H: 'static, T: 'static> Arc<HeaderSliceWithLength<H, [T]>> {
 }
 
 impl<H: PartialEq + 'static, T: PartialEq + 'static> PartialEq for ThinArc<H, T> {
+    #[inline]
     fn eq(&self, other: &ThinArc<H, T>) -> bool {
         ThinArc::with_arc(self, |a| {
             ThinArc::with_arc(other, |b| {
@@ -752,6 +768,7 @@ impl<H: Eq + 'static, T: Eq + 'static> Eq for ThinArc<H, T> {}
 /// its contained data (and can be read from by both C++ and Rust),
 /// but we can also convert it to a "regular" Arc<T> by removing the offset
 #[derive(Eq)]
+#[repr(C)]
 pub struct RawOffsetArc<T: 'static> {
     ptr: NonZeroPtrMut<T>,
 }
@@ -767,6 +784,7 @@ impl<T: 'static> Deref for RawOffsetArc<T> {
 }
 
 impl<T: 'static> Clone for RawOffsetArc<T> {
+    #[inline]
     fn clone(&self) -> Self {
         Arc::into_raw_offset(self.clone_arc())
     }
@@ -798,7 +816,7 @@ impl<T: PartialEq> PartialEq for RawOffsetArc<T> {
 impl<T: 'static> RawOffsetArc<T> {
     /// Temporarily converts |self| into a bonafide Arc and exposes it to the
     /// provided callback. The refcount is not modified.
-    #[inline(always)]
+    #[inline]
     pub fn with_arc<F, U>(&self, f: F) -> U
         where F: FnOnce(&Arc<T>) -> U
     {
@@ -819,6 +837,7 @@ impl<T: 'static> RawOffsetArc<T> {
 
     /// If uniquely owned, provide a mutable reference
     /// Else create a copy, and mutate that
+    #[inline]
     pub fn make_mut(&mut self) -> &mut T where T: Clone {
         unsafe {
             // extract the RawOffsetArc as an owned variable
@@ -836,12 +855,14 @@ impl<T: 'static> RawOffsetArc<T> {
     }
 
     /// Clone it as an Arc
+    #[inline]
     pub fn clone_arc(&self) -> Arc<T> {
         RawOffsetArc::with_arc(self, |a| a.clone())
     }
 
     /// Produce a pointer to the data that can be converted back
     /// to an arc
+    #[inline]
     pub fn borrow_arc<'a>(&'a self) -> ArcBorrow<'a, T> {
         ArcBorrow(&**self)
     }
@@ -886,12 +907,14 @@ pub struct ArcBorrow<'a, T: 'a>(&'a T);
 
 impl<'a, T> Copy for ArcBorrow<'a, T> {}
 impl<'a, T> Clone for ArcBorrow<'a, T> {
+    #[inline]
     fn clone(&self) -> Self {
         *self
     }
 }
 
 impl<'a, T> ArcBorrow<'a, T> {
+    #[inline]
     pub fn clone_arc(&self) -> Arc<T> {
         let arc = unsafe { Arc::from_raw(self.0) };
         // addref it!
@@ -901,10 +924,12 @@ impl<'a, T> ArcBorrow<'a, T> {
 
     /// For constructing from a reference known to be Arc-backed,
     /// e.g. if we obtain such a reference over FFI
+    #[inline]
     pub unsafe fn from_ref(r: &'a T) -> Self {
         ArcBorrow(r)
     }
 
+    #[inline]
     pub fn with_arc<F, U>(&self, f: F) -> U where F: FnOnce(&Arc<T>) -> U, T: 'static {
         // Synthesize transient Arc, which never touches the refcount.
         let transient = unsafe { NoDrop::new(Arc::from_raw(self.0)) };
@@ -924,6 +949,8 @@ impl<'a, T> ArcBorrow<'a, T> {
 
 impl<'a, T> Deref for ArcBorrow<'a, T> {
     type Target = T;
+
+    #[inline]
     fn deref(&self) -> &T {
         &*self.0
     }

From 20360331185e9af896308efe8ff7f2ea1e9093a4 Mon Sep 17 00:00:00 2001
From: Patrick Brosset <pbrosset@mozilla.com>
Date: Fri, 1 Dec 2017 16:58:48 +0100
Subject: [PATCH 066/219] Bug 1419301 - Make HTML comments removal in
 prettifyCSS faster; r=tromey

MozReview-Commit-ID: LG8GKccRlXr

--HG--
extra : rebase_source : 86eb5612f8264bbe4f765ab5baaea4db8c7a84a3
---
 devtools/shared/inspector/css-logic.js         |  9 +++++++--
 devtools/shared/tests/unit/test_prettifyCSS.js | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/devtools/shared/inspector/css-logic.js b/devtools/shared/inspector/css-logic.js
index b9cbe32f9e80..7c646110578f 100644
--- a/devtools/shared/inspector/css-logic.js
+++ b/devtools/shared/inspector/css-logic.js
@@ -158,8 +158,13 @@ function prettifyCSS(text, ruleCount) {
     prettifyCSS.LINE_SEPARATOR = (os === "WINNT" ? "\r\n" : "\n");
   }
 
-  // remove initial and terminating HTML comments and surrounding whitespace
-  text = text.replace(/(?:^\s*<!--[\r\n]*)|(?:\s*-->\s*$)/g, "");
+  // Stylesheets may start and end with HTML comment tags (possibly with whitespaces
+  // before and after). Remove those first. Don't do anything there aren't any.
+  let trimmed = text.trim();
+  if (trimmed.startsWith("<!--")) {
+    text = trimmed.replace(/^<!--/, "").replace(/-->$/, "").trim();
+  }
+
   let originalText = text;
   text = text.trim();
 
diff --git a/devtools/shared/tests/unit/test_prettifyCSS.js b/devtools/shared/tests/unit/test_prettifyCSS.js
index 40eb680f3ee9..2184e4d12424 100644
--- a/devtools/shared/tests/unit/test_prettifyCSS.js
+++ b/devtools/shared/tests/unit/test_prettifyCSS.js
@@ -122,6 +122,24 @@ const TESTS_SPACE_INDENT = [
       "}",
     ]
   },
+
+  { name: "HTML comments with some whitespace padding",
+    input: "  \n\n\t  <!--\n\n\t body {color:red}  \n\n-->   \t\n",
+    expected: [
+      "body {",
+      " color:red",
+      "}"
+    ]
+  },
+
+  { name: "HTML comments without whitespace padding",
+    input: "<!--body {color:red}-->",
+    expected: [
+      "body {",
+      " color:red",
+      "}"
+    ]
+  },
 ];
 
 function run_test() {

From 54088f8c9eeb8dc2d0865235e5fe2b99b850c687 Mon Sep 17 00:00:00 2001
From: Edouard Oger <eoger@fastmail.com>
Date: Thu, 30 Nov 2017 15:11:19 -0500
Subject: [PATCH 067/219] Bug 1422115 - Remove storageserver.js from services/.
 r=markh,tcsc

MozReview-Commit-ID: 4UGCq6SolY1

--HG--
extra : rebase_source : 49e8a5d072d1cb15d0942e7fbc39c7a2c8c08c6f
---
 build/mach_bootstrap.py                       |    1 -
 .../common/modules-testing/storageserver.js   | 1691 -----------------
 services/common/moz.build                     |    4 -
 services/common/tests/mach_commands.py        |  111 --
 services/common/tests/run_storage_server.js   |   29 -
 .../common/tests/unit/test_load_modules.js    |    6 -
 .../common/tests/unit/test_storage_server.js  |  692 -------
 services/common/tests/unit/xpcshell.ini       |    3 -
 8 files changed, 2537 deletions(-)
 delete mode 100644 services/common/modules-testing/storageserver.js
 delete mode 100644 services/common/tests/mach_commands.py
 delete mode 100644 services/common/tests/run_storage_server.js
 delete mode 100644 services/common/tests/unit/test_storage_server.js

diff --git a/build/mach_bootstrap.py b/build/mach_bootstrap.py
index 24a7ebc7235b..66b9dd64a1d3 100644
--- a/build/mach_bootstrap.py
+++ b/build/mach_bootstrap.py
@@ -46,7 +46,6 @@ MACH_MODULES = [
     'python/mozbuild/mozbuild/backend/mach_commands.py',
     'python/mozbuild/mozbuild/compilation/codecomplete.py',
     'python/mozbuild/mozbuild/frontend/mach_commands.py',
-    'services/common/tests/mach_commands.py',
     'taskcluster/mach_commands.py',
     'testing/awsy/mach_commands.py',
     'testing/firefox-ui/mach_commands.py',
diff --git a/services/common/modules-testing/storageserver.js b/services/common/modules-testing/storageserver.js
deleted file mode 100644
index 2b3826ef07e3..000000000000
--- a/services/common/modules-testing/storageserver.js
+++ /dev/null
@@ -1,1691 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This file contains an implementation of the Storage Server in JavaScript.
- *
- * The server should not be used for any production purposes.
- */
-
-var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-
-this.EXPORTED_SYMBOLS = [
-  "ServerBSO",
-  "StorageServerCallback",
-  "StorageServerCollection",
-  "StorageServer",
-  "storageServerForUsers",
-];
-
-Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://services-common/async.js");
-Cu.import("resource://gre/modules/Log.jsm");
-Cu.import("resource://services-common/utils.js");
-
-const STORAGE_HTTP_LOGGER = "Services.Common.Test.Server";
-const STORAGE_API_VERSION = "2.0";
-
-// Use the same method that record.js does, which mirrors the server.
-function new_timestamp() {
-  return Math.round(Date.now());
-}
-
-function isInteger(s) {
-  let re = /^[0-9]+$/;
-  return re.test(s);
-}
-
-function writeHttpBody(response, body) {
-  if (!body) {
-    return;
-  }
-
-  response.bodyOutputStream.write(body, body.length);
-}
-
-function sendMozSvcError(request, response, code) {
-  response.setStatusLine(request.httpVersion, 400, "Bad Request");
-  response.setHeader("Content-Type", "text/plain", false);
-  response.bodyOutputStream.write(code, code.length);
-}
-
-/**
- * Represent a BSO on the server.
- *
- * A BSO is constructed from an ID, content, and a modified time.
- *
- * @param id
- *        (string) ID of the BSO being created.
- * @param payload
- *        (strong|object) Payload for the BSO. Should ideally be a string. If
- *        an object is passed, it will be fed into JSON.stringify and that
- *        output will be set as the payload.
- * @param modified
- *        (number) Milliseconds since UNIX epoch that the BSO was last
- *        modified. If not defined or null, the current time will be used.
- */
-this.ServerBSO = function ServerBSO(id, payload, modified) {
-  if (!id) {
-    throw new Error("No ID for ServerBSO!");
-  }
-
-  if (!id.match(/^[a-zA-Z0-9_-]{1,64}$/)) {
-    throw new Error("BSO ID is invalid: " + id);
-  }
-
-  this._log = Log.repository.getLogger(STORAGE_HTTP_LOGGER);
-
-  this.id = id;
-  if (!payload) {
-    return;
-  }
-
-  CommonUtils.ensureMillisecondsTimestamp(modified);
-
-  if (typeof payload == "object") {
-    payload = JSON.stringify(payload);
-  }
-
-  this.payload = payload;
-  this.modified = modified || new_timestamp();
-};
-ServerBSO.prototype = {
-  FIELDS: [
-    "id",
-    "modified",
-    "payload",
-    "ttl",
-    "sortindex",
-  ],
-
-  toJSON: function toJSON() {
-    let obj = {};
-
-    for (let key of this.FIELDS) {
-      if (this[key] !== undefined) {
-        obj[key] = this[key];
-      }
-    }
-
-    return obj;
-  },
-
-  delete: function delete_() {
-    this.deleted = true;
-
-    delete this.payload;
-    delete this.modified;
-  },
-
-  /**
-   * Handler for GET requests for this BSO.
-   */
-  getHandler: function getHandler(request, response) {
-    let code = 200;
-    let status = "OK";
-    let body;
-
-    function sendResponse() {
-      response.setStatusLine(request.httpVersion, code, status);
-      writeHttpBody(response, body);
-    }
-
-    if (request.hasHeader("x-if-modified-since")) {
-      let headerModified = parseInt(request.getHeader("x-if-modified-since"),
-                                    10);
-      CommonUtils.ensureMillisecondsTimestamp(headerModified);
-
-      if (headerModified >= this.modified) {
-        code = 304;
-        status = "Not Modified";
-
-        sendResponse();
-        return;
-      }
-    } else if (request.hasHeader("x-if-unmodified-since")) {
-      let requestModified = parseInt(request.getHeader("x-if-unmodified-since"),
-                                     10);
-      let serverModified = this.modified;
-
-      if (serverModified > requestModified) {
-        code = 412;
-        status = "Precondition Failed";
-        sendResponse();
-        return;
-      }
-    }
-
-    if (!this.deleted) {
-      body = JSON.stringify(this.toJSON());
-      response.setHeader("Content-Type", "application/json", false);
-      response.setHeader("X-Last-Modified", "" + this.modified, false);
-    } else {
-      code = 404;
-      status = "Not Found";
-    }
-
-    sendResponse();
-  },
-
-  /**
-   * Handler for PUT requests for this BSO.
-   */
-  putHandler: function putHandler(request, response) {
-    if (request.hasHeader("Content-Type")) {
-      let ct = request.getHeader("Content-Type");
-      if (ct != "application/json") {
-        throw HTTP_415;
-      }
-    }
-
-    let input = CommonUtils.readBytesFromInputStream(request.bodyInputStream);
-    let parsed;
-    try {
-      parsed = JSON.parse(input);
-    } catch (ex) {
-      sendMozSvcError(request, response, "8");
-      return;
-    }
-
-    if (typeof(parsed) != "object") {
-      sendMozSvcError(request, response, "8");
-      return;
-    }
-
-    // Don't update if a conditional request fails preconditions.
-    if (request.hasHeader("x-if-unmodified-since")) {
-      let reqModified = parseInt(request.getHeader("x-if-unmodified-since"));
-
-      if (reqModified < this.modified) {
-        response.setStatusLine(request.httpVersion, 412, "Precondition Failed");
-        return;
-      }
-    }
-
-    let code, status;
-    if (this.payload) {
-      code = 204;
-      status = "No Content";
-    } else {
-      code = 201;
-      status = "Created";
-    }
-
-    // Alert when we see unrecognized fields.
-    for (let [key, value] of Object.entries(parsed)) {
-      switch (key) {
-        case "payload":
-          if (typeof(value) != "string") {
-            sendMozSvcError(request, response, "8");
-            return;
-          }
-
-          this.payload = value;
-          break;
-
-        case "ttl":
-          if (!isInteger(value)) {
-            sendMozSvcError(request, response, "8");
-            return;
-          }
-          this.ttl = parseInt(value, 10);
-          break;
-
-        case "sortindex":
-          if (!isInteger(value) || value.length > 9) {
-            sendMozSvcError(request, response, "8");
-            return;
-          }
-          this.sortindex = parseInt(value, 10);
-          break;
-
-        case "id":
-          break;
-
-        default:
-          this._log.warn("Unexpected field in BSO record: " + key);
-          sendMozSvcError(request, response, "8");
-          return;
-      }
-    }
-
-    this.modified = request.timestamp;
-    this.deleted = false;
-    response.setHeader("X-Last-Modified", "" + this.modified, false);
-
-    response.setStatusLine(request.httpVersion, code, status);
-  },
-};
-
-/**
- * Represent a collection on the server.
- *
- * The '_bsos' attribute is a mapping of id -> ServerBSO objects.
- *
- * Note that if you want these records to be accessible individually,
- * you need to register their handlers with the server separately, or use a
- * containing HTTP server that will do so on your behalf.
- *
- * @param bsos
- *        An object mapping BSO IDs to ServerBSOs.
- * @param acceptNew
- *        If true, POSTs to this collection URI will result in new BSOs being
- *        created and wired in on the fly.
- * @param timestamp
- *        An optional timestamp value to initialize the modified time of the
- *        collection. This should be in the format returned by new_timestamp().
- */
-this.StorageServerCollection =
- function StorageServerCollection(bsos, acceptNew, timestamp = new_timestamp()) {
-  this._bsos = bsos || {};
-  this.acceptNew = acceptNew || false;
-
-  /*
-   * Track modified timestamp.
-   * We can't just use the timestamps of contained BSOs: an empty collection
-   * has a modified time.
-   */
-  CommonUtils.ensureMillisecondsTimestamp(timestamp);
-  this._timestamp = timestamp;
-
-  this._log = Log.repository.getLogger(STORAGE_HTTP_LOGGER);
-};
-StorageServerCollection.prototype = {
-  BATCH_MAX_COUNT: 100,         // # of records.
-  BATCH_MAX_SIZE: 1024 * 1024,  // # bytes.
-
-  _timestamp: null,
-
-  get timestamp() {
-    return this._timestamp;
-  },
-
-  set timestamp(timestamp) {
-    CommonUtils.ensureMillisecondsTimestamp(timestamp);
-    this._timestamp = timestamp;
-  },
-
-  get totalPayloadSize() {
-    let size = 0;
-    for (let bso of this.bsos()) {
-      size += bso.payload.length;
-    }
-
-    return size;
-  },
-
-  /**
-   * Convenience accessor for our BSO keys.
-   * Excludes deleted items, of course.
-   *
-   * @param filter
-   *        A predicate function (applied to the ID and BSO) which dictates
-   *        whether to include the BSO's ID in the output.
-   *
-   * @return an array of IDs.
-   */
-  keys: function keys(filter) {
-    let ids = [];
-    for (let [id, bso] of Object.entries(this._bsos)) {
-      if (!bso.deleted && (!filter || filter(id, bso))) {
-        ids.push(id);
-      }
-    }
-    return ids;
-  },
-
-  /**
-   * Convenience method to get an array of BSOs.
-   * Optionally provide a filter function.
-   *
-   * @param filter
-   *        A predicate function, applied to the BSO, which dictates whether to
-   *        include the BSO in the output.
-   *
-   * @return an array of ServerBSOs.
-   */
-  bsos: function bsos(filter) {
-    let os = [];
-    for (let bso of Object.values(this._bsos)) {
-      if (!bso.deleted) {
-        os.push(bso);
-      }
-    }
-
-    if (!filter) {
-      return os;
-    }
-
-    return os.filter(filter);
-  },
-
-  /**
-   * Obtain a BSO by ID.
-   */
-  bso: function bso(id) {
-    return this._bsos[id];
-  },
-
-  /**
-   * Obtain the payload of a specific BSO.
-   *
-   * Raises if the specified BSO does not exist.
-   */
-  payload: function payload(id) {
-    return this.bso(id).payload;
-  },
-
-  /**
-   * Insert the provided BSO under its ID.
-   *
-   * @return the provided BSO.
-   */
-  insertBSO: function insertBSO(bso) {
-    return this._bsos[bso.id] = bso;
-  },
-
-  /**
-   * Insert the provided payload as part of a new ServerBSO with the provided
-   * ID.
-   *
-   * @param id
-   *        The GUID for the BSO.
-   * @param payload
-   *        The payload, as provided to the ServerBSO constructor.
-   * @param modified
-   *        An optional modified time for the ServerBSO. If not specified, the
-   *        current time will be used.
-   *
-   * @return the inserted BSO.
-   */
-  insert: function insert(id, payload, modified) {
-    return this.insertBSO(new ServerBSO(id, payload, modified));
-  },
-
-  /**
-   * Removes an object entirely from the collection.
-   *
-   * @param id
-   *        (string) ID to remove.
-   */
-  remove: function remove(id) {
-    delete this._bsos[id];
-  },
-
-  _inResultSet: function _inResultSet(bso, options) {
-    if (!bso.payload) {
-      return false;
-    }
-
-    if (options.ids) {
-      if (options.ids.indexOf(bso.id) == -1) {
-        return false;
-      }
-    }
-
-    if (options.newer) {
-      if (bso.modified <= options.newer) {
-        return false;
-      }
-    }
-
-    if (options.older) {
-      if (bso.modified >= options.older) {
-        return false;
-      }
-    }
-
-    return true;
-  },
-
-  count: function count(options) {
-    options = options || {};
-    let c = 0;
-    for (let bso of Object.values(this._bsos)) {
-      if (bso.modified && this._inResultSet(bso, options)) {
-        c++;
-      }
-    }
-    return c;
-  },
-
-  get: function get(options) {
-    let data = [];
-    for (let id in this._bsos) {
-      let bso = this._bsos[id];
-      if (!bso.modified) {
-        continue;
-      }
-
-      if (!this._inResultSet(bso, options)) {
-        continue;
-      }
-
-      data.push(bso);
-    }
-
-    if (options.sort) {
-      if (options.sort == "oldest") {
-        data.sort(function sortOldest(a, b) {
-          if (a.modified == b.modified) {
-            return 0;
-          }
-
-          return a.modified < b.modified ? -1 : 1;
-        });
-      } else if (options.sort == "newest") {
-        data.sort(function sortNewest(a, b) {
-          if (a.modified == b.modified) {
-            return 0;
-          }
-
-          return a.modified > b.modified ? -1 : 1;
-        });
-      } else if (options.sort == "index") {
-        data.sort(function sortIndex(a, b) {
-          if (a.sortindex == b.sortindex) {
-            return 0;
-          }
-
-          if (a.sortindex !== undefined && b.sortindex == undefined) {
-            return 1;
-          }
-
-          if (a.sortindex === undefined && b.sortindex !== undefined) {
-            return -1;
-          }
-
-          return a.sortindex > b.sortindex ? -1 : 1;
-        });
-      }
-    }
-
-    if (options.limit) {
-      data = data.slice(0, options.limit);
-    }
-
-    return data;
-  },
-
-  post: function post(input, timestamp) {
-    let success = [];
-    let failed = {};
-    let count = 0;
-    let size = 0;
-
-    // This will count records where we have an existing ServerBSO
-    // registered with us as successful and all other records as failed.
-    for (let record of input) {
-      count += 1;
-      if (count > this.BATCH_MAX_COUNT) {
-        failed[record.id] = "Max record count exceeded.";
-        continue;
-      }
-
-      if (typeof(record.payload) != "string") {
-        failed[record.id] = "Payload is not a string!";
-        continue;
-      }
-
-      size += record.payload.length;
-      if (size > this.BATCH_MAX_SIZE) {
-        failed[record.id] = "Payload max size exceeded!";
-        continue;
-      }
-
-      if (record.sortindex) {
-        if (!isInteger(record.sortindex)) {
-          failed[record.id] = "sortindex is not an integer.";
-          continue;
-        }
-
-        if (record.sortindex.length > 9) {
-          failed[record.id] = "sortindex is too long.";
-          continue;
-        }
-      }
-
-      if ("ttl" in record) {
-        if (!isInteger(record.ttl)) {
-          failed[record.id] = "ttl is not an integer.";
-          continue;
-        }
-      }
-
-      try {
-        let bso = this.bso(record.id);
-        if (!bso && this.acceptNew) {
-          this._log.debug("Creating BSO " + JSON.stringify(record.id) +
-                          " on the fly.");
-          bso = new ServerBSO(record.id);
-          this.insertBSO(bso);
-        }
-        if (bso) {
-          bso.payload = record.payload;
-          bso.modified = timestamp;
-          bso.deleted = false;
-          success.push(record.id);
-
-          if (record.sortindex) {
-            bso.sortindex = parseInt(record.sortindex, 10);
-          }
-
-        } else {
-          failed[record.id] = "no bso configured";
-        }
-      } catch (ex) {
-        this._log.info("Exception when processing BSO", ex);
-        failed[record.id] = "Exception when processing.";
-      }
-    }
-    return {success, failed};
-  },
-
-  delete: function delete_(options) {
-    options = options || {};
-
-    // Protocol 2.0 only allows the "ids" query string argument.
-    let keys = Object.keys(options).filter(function(k) {
-      return k != "ids";
-    });
-    if (keys.length) {
-      this._log.warn("Invalid query string parameter to collection delete: " +
-                     keys.join(", "));
-      throw new Error("Malformed client request.");
-    }
-
-    if (options.ids && options.ids.length > this.BATCH_MAX_COUNT) {
-      throw HTTP_400;
-    }
-
-    let deleted = [];
-    for (let bso of Object.values(this._bsos)) {
-      if (this._inResultSet(bso, options)) {
-        this._log.debug("Deleting " + JSON.stringify(bso));
-        deleted.push(bso.id);
-        bso.delete();
-      }
-    }
-    return deleted;
-  },
-
-  parseOptions: function parseOptions(request) {
-    let options = {};
-
-    for (let chunk of request.queryString.split("&")) {
-      if (!chunk) {
-        continue;
-      }
-      chunk = chunk.split("=");
-      let key = decodeURIComponent(chunk[0]);
-      if (chunk.length == 1) {
-        options[key] = "";
-      } else {
-        options[key] = decodeURIComponent(chunk[1]);
-      }
-    }
-
-    if (options.ids) {
-      options.ids = options.ids.split(",");
-    }
-
-    if (options.newer) {
-      if (!isInteger(options.newer)) {
-        throw HTTP_400;
-      }
-
-      CommonUtils.ensureMillisecondsTimestamp(options.newer);
-      options.newer = parseInt(options.newer, 10);
-    }
-
-    if (options.older) {
-      if (!isInteger(options.older)) {
-        throw HTTP_400;
-      }
-
-      CommonUtils.ensureMillisecondsTimestamp(options.older);
-      options.older = parseInt(options.older, 10);
-    }
-
-    if (options.limit) {
-      if (!isInteger(options.limit)) {
-        throw HTTP_400;
-      }
-
-      options.limit = parseInt(options.limit, 10);
-    }
-
-    return options;
-  },
-
-  getHandler: function getHandler(request, response) {
-    let options = this.parseOptions(request);
-    let data = this.get(options);
-
-    if (request.hasHeader("x-if-modified-since")) {
-      let requestModified = parseInt(request.getHeader("x-if-modified-since"),
-                                     10);
-      let newestBSO = 0;
-      for (let bso of data) {
-        if (bso.modified > newestBSO) {
-          newestBSO = bso.modified;
-        }
-      }
-
-      if (requestModified >= newestBSO) {
-        response.setHeader("X-Last-Modified", "" + newestBSO);
-        response.setStatusLine(request.httpVersion, 304, "Not Modified");
-        return;
-      }
-    } else if (request.hasHeader("x-if-unmodified-since")) {
-      let requestModified = parseInt(request.getHeader("x-if-unmodified-since"),
-                                     10);
-      let serverModified = this.timestamp;
-
-      if (serverModified > requestModified) {
-        response.setHeader("X-Last-Modified", "" + serverModified);
-        response.setStatusLine(request.httpVersion, 412, "Precondition Failed");
-        return;
-      }
-    }
-
-    if (options.full) {
-      data = data.map(function map(bso) {
-        return bso.toJSON();
-      });
-    } else {
-      data = data.map(function map(bso) {
-        return bso.id;
-      });
-    }
-
-    // application/json is default media type.
-    let newlines = false;
-    if (request.hasHeader("accept")) {
-      let accept = request.getHeader("accept");
-      if (accept == "application/newlines") {
-        newlines = true;
-      } else if (accept != "application/json") {
-        throw HTTP_406;
-      }
-    }
-
-    let body;
-    if (newlines) {
-      response.setHeader("Content-Type", "application/newlines", false);
-      let normalized = data.map(function map(d) {
-        return JSON.stringify(d);
-      });
-
-      body = normalized.join("\n") + "\n";
-    } else {
-      response.setHeader("Content-Type", "application/json", false);
-      body = JSON.stringify({items: data});
-    }
-
-    this._log.info("Records: " + data.length);
-    response.setHeader("X-Num-Records", "" + data.length, false);
-    response.setHeader("X-Last-Modified", "" + this.timestamp, false);
-    response.setStatusLine(request.httpVersion, 200, "OK");
-    response.bodyOutputStream.write(body, body.length);
-  },
-
-  postHandler: function postHandler(request, response) {
-    if (!request.hasHeader("content-type")) {
-      this._log.info("No Content-Type request header!");
-      throw HTTP_400;
-    }
-
-    let inputStream = request.bodyInputStream;
-    let inputBody = CommonUtils.readBytesFromInputStream(inputStream);
-    let input = [];
-
-    let inputMediaType = request.getHeader("content-type");
-    if (inputMediaType == "application/json") {
-      try {
-        input = JSON.parse(inputBody);
-      } catch (ex) {
-        this._log.info("JSON parse error on input body!");
-        throw HTTP_400;
-      }
-
-      if (!Array.isArray(input)) {
-        this._log.info("Input JSON type not an array!");
-        sendMozSvcError(request, response, "8");
-        return;
-      }
-    } else if (inputMediaType == "application/newlines") {
-      for (let line of inputBody.split("\n")) {
-        let record;
-        try {
-          record = JSON.parse(line);
-        } catch (ex) {
-          this._log.info("JSON parse error on line!");
-          sendMozSvcError(request, response, "8");
-          return;
-        }
-
-        input.push(record);
-      }
-    } else {
-      this._log.info("Unknown media type: " + inputMediaType);
-      throw HTTP_415;
-    }
-
-    if (this._ensureUnmodifiedSince(request, response)) {
-      return;
-    }
-
-    let res = this.post(input, request.timestamp);
-    let body = JSON.stringify(res);
-    response.setHeader("Content-Type", "application/json", false);
-    this.timestamp = request.timestamp;
-    response.setHeader("X-Last-Modified", "" + this.timestamp, false);
-
-    response.setStatusLine(request.httpVersion, "200", "OK");
-    response.bodyOutputStream.write(body, body.length);
-  },
-
-  deleteHandler: function deleteHandler(request, response) {
-    this._log.debug("Invoking StorageServerCollection.DELETE.");
-
-    let options = this.parseOptions(request);
-
-    if (this._ensureUnmodifiedSince(request, response)) {
-      return;
-    }
-
-    let deleted = this.delete(options);
-    response.deleted = deleted;
-    this.timestamp = request.timestamp;
-
-    response.setStatusLine(request.httpVersion, 204, "No Content");
-  },
-
-  handler: function handler() {
-    let self = this;
-
-    return function(request, response) {
-      switch (request.method) {
-        case "GET":
-          self.getHandler(request, response);
-          return;
-
-        case "POST":
-          self.postHandler(request, response);
-          return;
-
-        case "DELETE":
-          self.deleteHandler(request, response);
-          return;
-
-      }
-
-      request.setHeader("Allow", "GET,POST,DELETE");
-      response.setStatusLine(request.httpVersion, 405, "Method Not Allowed");
-    };
-  },
-
-  _ensureUnmodifiedSince: function _ensureUnmodifiedSince(request, response) {
-    if (!request.hasHeader("x-if-unmodified-since")) {
-      return false;
-    }
-
-    let requestModified = parseInt(request.getHeader("x-if-unmodified-since"),
-                                   10);
-    let serverModified = this.timestamp;
-
-    this._log.debug("Request modified time: " + requestModified +
-                    "; Server modified time: " + serverModified);
-    if (serverModified <= requestModified) {
-      return false;
-    }
-
-    this._log.info("Conditional request rejected because client time older " +
-                   "than collection timestamp.");
-    response.setStatusLine(request.httpVersion, 412, "Precondition Failed");
-    return true;
-  },
-};
-
-
-// ===========================================================================//
-// httpd.js-based Storage server.                                            //
-// ===========================================================================//
-
-/**
- * In general, the preferred way of using StorageServer is to directly
- * introspect it. Callbacks are available for operations which are hard to
- * verify through introspection, such as deletions.
- *
- * One of the goals of this server is to provide enough hooks for test code to
- * find out what it needs without monkeypatching. Use this object as your
- * prototype, and override as appropriate.
- */
-this.StorageServerCallback = {
-  onCollectionDeleted: function onCollectionDeleted(user, collection) {},
-  onItemDeleted: function onItemDeleted(user, collection, bsoID) {},
-
-  /**
-   * Called at the top of every request.
-   *
-   * Allows the test to inspect the request. Hooks should be careful not to
-   * modify or change state of the request or they may impact future processing.
-   */
-  onRequest: function onRequest(request) {},
-};
-
-/**
- * Construct a new test Storage server. Takes a callback object (e.g.,
- * StorageServerCallback) as input.
- */
-this.StorageServer = function StorageServer(callback) {
-  this.callback     = callback || {__proto__: StorageServerCallback};
-  this.server       = new HttpServer();
-  this.started      = false;
-  this.users        = {};
-  this.requestCount = 0;
-  this._log         = Log.repository.getLogger(STORAGE_HTTP_LOGGER);
-
-  // Install our own default handler. This allows us to mess around with the
-  // whole URL space.
-  let handler = this.server._handler;
-  handler._handleDefault = this.handleDefault.bind(this, handler);
-};
-StorageServer.prototype = {
-  DEFAULT_QUOTA: 1024 * 1024, // # bytes.
-
-  server: null,    // HttpServer.
-  users:  null,    // Map of username => {collections, password}.
-
-  /**
-   * If true, the server will allow any arbitrary user to be used.
-   *
-   * No authentication will be performed. Whatever user is detected from the
-   * URL or auth headers will be created (if needed) and used.
-   */
-  allowAllUsers: false,
-
-  /**
-   * Start the StorageServer's underlying HTTP server.
-   *
-   * @param port
-   *        The numeric port on which to start. A falsy value implies to
-   *        select any available port.
-   * @param cb
-   *        A callback function (of no arguments) which is invoked after
-   *        startup.
-   */
-  start: function start(port, cb) {
-    if (this.started) {
-      this._log.warn("Warning: server already started on " + this.port);
-      return;
-    }
-    if (!port) {
-      port = -1;
-    }
-    this.port = port;
-
-    try {
-      this.server.start(this.port);
-      this.port = this.server.identity.primaryPort;
-      this.started = true;
-      if (cb) {
-        cb();
-      }
-    } catch (ex) {
-      this._log.error("==========================================");
-      this._log.error("Got exception starting Storage HTTP server on port " + this.port);
-      this._log.error("Error: " + Log.exceptionStr(ex));
-      this._log.error("Is there a process already listening on port " + this.port + "?");
-      this._log.error("==========================================");
-      throw ex;
-    }
-  },
-
-  /**
-   * Start the server synchronously.
-   *
-   * @param port
-   *        The numeric port on which to start. The default is to choose
-   *        any available port.
-   */
-  startSynchronous: function startSynchronous(port = -1) {
-    let cb = Async.makeSpinningCallback();
-    this.start(port, cb);
-    cb.wait();
-  },
-
-  /**
-   * Stop the StorageServer's HTTP server.
-   *
-   * @param cb
-   *        A callback function. Invoked after the server has been stopped.
-   *
-   */
-  stop: function stop(cb) {
-    if (!this.started) {
-      this._log.warn("StorageServer: Warning: server not running. Can't stop " +
-                     "me now!");
-      return;
-    }
-
-    this.server.stop(cb);
-    this.started = false;
-  },
-
-  serverTime: function serverTime() {
-    return new_timestamp();
-  },
-
-  /**
-   * Create a new user, complete with an empty set of collections.
-   *
-   * @param username
-   *        The username to use. An Error will be thrown if a user by that name
-   *        already exists.
-   * @param password
-   *        A password string.
-   *
-   * @return a user object, as would be returned by server.user(username).
-   */
-  registerUser: function registerUser(username, password) {
-    if (username in this.users) {
-      throw new Error("User already exists.");
-    }
-
-    if (!isFinite(parseInt(username))) {
-      throw new Error("Usernames must be numeric: " + username);
-    }
-
-    this._log.info("Registering new user with server: " + username);
-    this.users[username] = {
-      password,
-      collections: {},
-      quota: this.DEFAULT_QUOTA,
-    };
-    return this.user(username);
-  },
-
-  userExists: function userExists(username) {
-    return username in this.users;
-  },
-
-  getCollection: function getCollection(username, collection) {
-    return this.users[username].collections[collection];
-  },
-
-  _insertCollection: function _insertCollection(collections, collection, bsos) {
-    let coll = new StorageServerCollection(bsos, true);
-    coll.collectionHandler = coll.handler();
-    collections[collection] = coll;
-    return coll;
-  },
-
-  createCollection: function createCollection(username, collection, bsos) {
-    if (!(username in this.users)) {
-      throw new Error("Unknown user.");
-    }
-    let collections = this.users[username].collections;
-    if (collection in collections) {
-      throw new Error("Collection already exists.");
-    }
-    return this._insertCollection(collections, collection, bsos);
-  },
-
-  deleteCollection: function deleteCollection(username, collection) {
-    if (!(username in this.users)) {
-      throw new Error("Unknown user.");
-    }
-    delete this.users[username].collections[collection];
-  },
-
-  /**
-   * Accept a map like the following:
-   * {
-   *   meta: {global: {version: 1, ...}},
-   *   crypto: {"keys": {}, foo: {bar: 2}},
-   *   bookmarks: {}
-   * }
-   * to cause collections and BSOs to be created.
-   * If a collection already exists, no error is raised.
-   * If a BSO already exists, it will be updated to the new contents.
-   */
-  createContents: function createContents(username, collections) {
-    if (!(username in this.users)) {
-      throw new Error("Unknown user.");
-    }
-    let userCollections = this.users[username].collections;
-    for (let [id, contents] of Object.entries(collections)) {
-      let coll = userCollections[id] ||
-                 this._insertCollection(userCollections, id);
-      for (let [bsoID, payload] of Object.entries(contents)) {
-        coll.insert(bsoID, payload);
-      }
-    }
-  },
-
-  /**
-   * Insert a BSO in an existing collection.
-   */
-  insertBSO: function insertBSO(username, collection, bso) {
-    if (!(username in this.users)) {
-      throw new Error("Unknown user.");
-    }
-    let userCollections = this.users[username].collections;
-    if (!(collection in userCollections)) {
-      throw new Error("Unknown collection.");
-    }
-    userCollections[collection].insertBSO(bso);
-    return bso;
-  },
-
-  /**
-   * Delete all of the collections for the named user.
-   *
-   * @param username
-   *        The name of the affected user.
-   */
-  deleteCollections: function deleteCollections(username) {
-    if (!(username in this.users)) {
-      throw new Error("Unknown user.");
-    }
-    let userCollections = this.users[username].collections;
-    for (let name in userCollections) {
-      let coll = userCollections[name];
-      this._log.trace("Bulk deleting " + name + " for " + username + "...");
-      coll.delete({});
-    }
-    this.users[username].collections = {};
-  },
-
-  getQuota: function getQuota(username) {
-    if (!(username in this.users)) {
-      throw new Error("Unknown user.");
-    }
-
-    return this.users[username].quota;
-  },
-
-  /**
-   * Obtain the newest timestamp of all collections for a user.
-   */
-  newestCollectionTimestamp: function newestCollectionTimestamp(username) {
-    let collections = this.users[username].collections;
-    let newest = 0;
-    for (let name in collections) {
-      let collection = collections[name];
-      if (collection.timestamp > newest) {
-        newest = collection.timestamp;
-      }
-    }
-
-    return newest;
-  },
-
-  /**
-   * Compute the object that is returned for an info/collections request.
-   */
-  infoCollections: function infoCollections(username) {
-    let responseObject = {};
-    let colls = this.users[username].collections;
-    for (let coll in colls) {
-      responseObject[coll] = colls[coll].timestamp;
-    }
-    this._log.trace("StorageServer: info/collections returning " +
-                    JSON.stringify(responseObject));
-    return responseObject;
-  },
-
-  infoCounts: function infoCounts(username) {
-    let data = {};
-    let collections = this.users[username].collections;
-    for (let [k, v] of Object.entries(collections)) {
-      let count = v.count();
-      if (!count) {
-        continue;
-      }
-
-      data[k] = count;
-    }
-
-    return data;
-  },
-
-  infoUsage: function infoUsage(username) {
-    let data = {};
-    let collections = this.users[username].collections;
-    for (let [k, v] of Object.entries(collections)) {
-      data[k] = v.totalPayloadSize;
-    }
-
-    return data;
-  },
-
-  infoQuota: function infoQuota(username) {
-    let total = 0;
-    let usage = this.infoUsage(username);
-    for (let key in usage) {
-      let value = usage[key];
-      total += value;
-    }
-
-    return {
-      quota: this.getQuota(username),
-      usage: total
-    };
-  },
-
-  /**
-   * Simple accessor to allow collective binding and abbreviation of a bunch of
-   * methods. Yay!
-   * Use like this:
-   *
-   *   let u = server.user("john");
-   *   u.collection("bookmarks").bso("abcdefg").payload;  // Etc.
-   *
-   * @return a proxy for the user data stored in this server.
-   */
-  user: function user(username) {
-    let collection       = this.getCollection.bind(this, username);
-    let createCollection = this.createCollection.bind(this, username);
-    let createContents   = this.createContents.bind(this, username);
-    let modified         = function(collectionName) {
-      return collection(collectionName).timestamp;
-    };
-    let deleteCollections = this.deleteCollections.bind(this, username);
-    let quota             = this.getQuota.bind(this, username);
-    return {
-      collection,
-      createCollection,
-      createContents,
-      deleteCollections,
-      modified,
-      quota,
-    };
-  },
-
-  _pruneExpired: function _pruneExpired() {
-    let now = Date.now();
-
-    for (let username in this.users) {
-      let user = this.users[username];
-      for (let name in user.collections) {
-        let collection = user.collections[name];
-        for (let bso of collection.bsos()) {
-          // ttl === 0 is a special case, so we can't simply !ttl.
-          if (typeof(bso.ttl) != "number") {
-            continue;
-          }
-
-          let ttlDate = bso.modified + (bso.ttl * 1000);
-          if (ttlDate < now) {
-            this._log.info("Deleting BSO because TTL expired: " + bso.id);
-            bso.delete();
-          }
-        }
-      }
-    }
-  },
-
-  /*
-   * Regular expressions for splitting up Storage request paths.
-   * Storage URLs are of the form:
-   *   /$apipath/$version/$userid/$further
-   * where $further is usually:
-   *   storage/$collection/$bso
-   * or
-   *   storage/$collection
-   * or
-   *   info/$op
-   *
-   * We assume for the sake of simplicity that $apipath is empty.
-   *
-   * N.B., we don't follow any kind of username spec here, because as far as I
-   * can tell there isn't one. See Bug 689671. Instead we follow the Python
-   * server code.
-   *
-   * Path: [all, version, first, rest]
-   * Storage: [all, collection?, id?]
-   */
-  pathRE: /^\/([0-9]+(?:\.[0-9]+)?)(?:\/([0-9]+)\/([^\/]+)(?:\/(.+))?)?$/,
-  storageRE: /^([-_a-zA-Z0-9]+)(?:\/([-_a-zA-Z0-9]+)\/?)?$/,
-
-  defaultHeaders: {},
-
-  /**
-   * HTTP response utility.
-   */
-  respond: function respond(req, resp, code, status, body, headers, timestamp) {
-    this._log.info("Response: " + code + " " + status);
-    resp.setStatusLine(req.httpVersion, code, status);
-    if (!headers) {
-      headers = this.defaultHeaders;
-    }
-    for (let header in headers) {
-      let value = headers[header];
-      resp.setHeader(header, value, false);
-    }
-
-    if (timestamp) {
-      resp.setHeader("X-Timestamp", "" + timestamp, false);
-    }
-
-    if (body) {
-      resp.bodyOutputStream.write(body, body.length);
-    }
-  },
-
-  /**
-   * This is invoked by the HttpServer. `this` is bound to the StorageServer;
-   * `handler` is the HttpServer's handler.
-   *
-   * TODO: need to use the correct Storage API response codes and errors here.
-   */
-  handleDefault: function handleDefault(handler, req, resp) {
-    this.requestCount++;
-    let timestamp = new_timestamp();
-    try {
-      this._handleDefault(handler, req, resp, timestamp);
-    } catch (e) {
-      if (e instanceof HttpError) {
-        this.respond(req, resp, e.code, e.description, "", {}, timestamp);
-      } else {
-        this._log.warn("StorageServer: handleDefault caught an error", e);
-        throw e;
-      }
-    }
-  },
-
-  _handleDefault: function _handleDefault(handler, req, resp, timestamp) {
-    let path = req.path;
-    if (req.queryString.length) {
-      path += "?" + req.queryString;
-    }
-
-    this._log.debug("StorageServer: Handling request: " + req.method + " " +
-                    path);
-
-    if (this.callback.onRequest) {
-      this.callback.onRequest(req);
-    }
-
-    // Prune expired records for all users at top of request. This is the
-    // easiest way to process TTLs since all requests go through here.
-    this._pruneExpired();
-
-    req.timestamp = timestamp;
-    resp.setHeader("X-Timestamp", "" + timestamp, false);
-
-    let parts = this.pathRE.exec(req.path);
-    if (!parts) {
-      this._log.debug("StorageServer: Unexpected request: bad URL " + req.path);
-      throw HTTP_404;
-    }
-
-    let [, version, userPath, first, rest] = parts;
-    if (version != STORAGE_API_VERSION) {
-      this._log.debug("StorageServer: Unknown version.");
-      throw HTTP_404;
-    }
-
-    let username;
-
-    // By default, the server requires users to be authenticated. When a
-    // request arrives, the user must have been previously configured and
-    // the request must have authentication. In "allow all users" mode, we
-    // take the username from the URL, create the user on the fly, and don't
-    // perform any authentication.
-    if (!this.allowAllUsers) {
-      // Enforce authentication.
-      if (!req.hasHeader("authorization")) {
-        this.respond(req, resp, 401, "Authorization Required", "{}", {
-          "WWW-Authenticate": 'Basic realm="secret"'
-        });
-        return;
-      }
-
-      let ensureUserExists = username => {
-        if (this.userExists(username)) {
-          return;
-        }
-
-        this._log.info("StorageServer: Unknown user: " + username);
-        throw HTTP_401;
-      };
-
-      let auth = req.getHeader("authorization");
-      this._log.debug("Authorization: " + auth);
-
-      if (auth.indexOf("Basic ") == 0) {
-        let decoded = CommonUtils.safeAtoB(auth.substr(6));
-        this._log.debug("Decoded Basic Auth: " + decoded);
-        let [user, password] = decoded.split(":", 2);
-
-        if (!password) {
-          this._log.debug("Malformed HTTP Basic Authorization header: " + auth);
-          throw HTTP_400;
-        }
-
-        this._log.debug("Got HTTP Basic auth for user: " + user);
-        ensureUserExists(user);
-        username = user;
-
-        if (this.users[user].password != password) {
-          this._log.debug("StorageServer: Provided password is not correct.");
-          throw HTTP_401;
-        }
-      // TODO support token auth.
-      } else {
-        this._log.debug("Unsupported HTTP authorization type: " + auth);
-        throw HTTP_500;
-      }
-    // All users mode.
-    } else {
-      // Auto create user with dummy password.
-      if (!this.userExists(userPath)) {
-        this.registerUser(userPath, "DUMMY-PASSWORD-*&%#");
-      }
-
-      username = userPath;
-    }
-
-    // Hand off to the appropriate handler for this path component.
-    if (first in this.toplevelHandlers) {
-      let handler = this.toplevelHandlers[first];
-      try {
-        handler.call(this, handler, req, resp, version, username, rest);
-        return;
-      } catch (ex) {
-        this._log.warn("Got exception during request", ex);
-        throw ex;
-      }
-    }
-    this._log.debug("StorageServer: Unknown top-level " + first);
-    throw HTTP_404;
-  },
-
-  /**
-   * Collection of the handler methods we use for top-level path components.
-   */
-  toplevelHandlers: {
-    "storage": function handleStorage(handler, req, resp, version, username,
-                                      rest) {
-      let respond = this.respond.bind(this, req, resp);
-      if (!rest || !rest.length) {
-        this._log.debug("StorageServer: top-level storage " +
-                        req.method + " request.");
-
-        if (req.method != "DELETE") {
-          respond(405, "Method Not Allowed", null, {"Allow": "DELETE"});
-          return;
-        }
-
-        this.user(username).deleteCollections();
-
-        respond(204, "No Content");
-        return;
-      }
-
-      let match = this.storageRE.exec(rest);
-      if (!match) {
-        this._log.warn("StorageServer: Unknown storage operation " + rest);
-        throw HTTP_404;
-      }
-      let [, collection, bsoID] = match;
-      let coll = this.getCollection(username, collection);
-      let collectionExisted = !!coll;
-
-      switch (req.method) {
-        case "GET":
-          // Tried to GET on a collection that doesn't exist.
-          if (!coll) {
-            respond(404, "Not Found");
-            return;
-          }
-
-          // No BSO URL parameter goes to collection handler.
-          if (!bsoID) {
-            coll.collectionHandler(req, resp);
-            return;
-          }
-
-          // Handle non-existent BSO.
-          let bso = coll.bso(bsoID);
-          if (!bso) {
-            respond(404, "Not Found");
-            return;
-          }
-
-          // Proxy to BSO handler.
-          bso.getHandler(req, resp);
-          return;
-
-        case "DELETE":
-          // Collection doesn't exist.
-          if (!coll) {
-            respond(404, "Not Found");
-            return;
-          }
-
-          // Deleting a specific BSO.
-          if (bsoID) {
-            let bso = coll.bso(bsoID);
-
-            // BSO does not exist on the server. Nothing to do.
-            if (!bso) {
-              respond(404, "Not Found");
-              return;
-            }
-
-            if (req.hasHeader("x-if-unmodified-since")) {
-              let modified = parseInt(req.getHeader("x-if-unmodified-since"));
-              CommonUtils.ensureMillisecondsTimestamp(modified);
-
-              if (bso.modified > modified) {
-                respond(412, "Precondition Failed");
-                return;
-              }
-            }
-
-            bso.delete();
-            coll.timestamp = req.timestamp;
-            this.callback.onItemDeleted(username, collection, bsoID);
-            respond(204, "No Content");
-            return;
-          }
-
-          // Proxy to collection handler.
-          coll.collectionHandler(req, resp);
-
-          // Spot if this is a DELETE for some IDs, and don't blow away the
-          // whole collection!
-          //
-          // We already handled deleting the BSOs by invoking the deleted
-          // collection's handler. However, in the case of
-          //
-          //   DELETE storage/foobar
-          //
-          // we also need to remove foobar from the collections map. This
-          // clause tries to differentiate the above request from
-          //
-          //  DELETE storage/foobar?ids=foo,baz
-          //
-          // and do the right thing.
-          // TODO: less hacky method.
-          if (-1 == req.queryString.indexOf("ids=")) {
-            // When you delete the entire collection, we drop it.
-            this._log.debug("Deleting entire collection.");
-            delete this.users[username].collections[collection];
-            this.callback.onCollectionDeleted(username, collection);
-          }
-
-          // Notify of item deletion.
-          let deleted = resp.deleted || [];
-          for (let i = 0; i < deleted.length; ++i) {
-            this.callback.onItemDeleted(username, collection, deleted[i]);
-          }
-          return;
-
-        case "POST":
-        case "PUT":
-          // Auto-create collection if it doesn't exist.
-          if (!coll) {
-            coll = this.createCollection(username, collection);
-          }
-
-          try {
-            if (bsoID) {
-              let bso = coll.bso(bsoID);
-              if (!bso) {
-                this._log.trace("StorageServer: creating BSO " + collection +
-                                "/" + bsoID);
-                try {
-                  bso = coll.insert(bsoID);
-                } catch (ex) {
-                  sendMozSvcError(req, resp, "8");
-                  return;
-                }
-              }
-
-              bso.putHandler(req, resp);
-
-              coll.timestamp = req.timestamp;
-              return;
-            }
-
-            coll.collectionHandler(req, resp);
-            return;
-          } catch (ex) {
-            if (ex instanceof HttpError) {
-              if (!collectionExisted) {
-                this.deleteCollection(username, collection);
-              }
-            }
-
-            throw ex;
-          }
-
-        default:
-          throw new Error("Request method " + req.method + " not implemented.");
-      }
-    },
-
-    "info": function handleInfo(handler, req, resp, version, username, rest) {
-      switch (rest) {
-        case "collections":
-          this.handleInfoCollections(req, resp, username);
-          return;
-
-        case "collection_counts":
-          this.handleInfoCounts(req, resp, username);
-          return;
-
-        case "collection_usage":
-          this.handleInfoUsage(req, resp, username);
-          return;
-
-        case "quota":
-          this.handleInfoQuota(req, resp, username);
-          return;
-
-        default:
-          this._log.warn("StorageServer: Unknown info operation " + rest);
-          throw HTTP_404;
-      }
-    }
-  },
-
-  handleInfoConditional: function handleInfoConditional(request, response,
-                                                        user) {
-    if (!request.hasHeader("x-if-modified-since")) {
-      return false;
-    }
-
-    let requestModified = request.getHeader("x-if-modified-since");
-    requestModified = parseInt(requestModified, 10);
-
-    let serverModified = this.newestCollectionTimestamp(user);
-
-    this._log.info("Server mtime: " + serverModified + "; Client modified: " +
-                   requestModified);
-    if (serverModified > requestModified) {
-      return false;
-    }
-
-    this.respond(request, response, 304, "Not Modified", null, {
-      "X-Last-Modified": "" + serverModified
-    });
-
-    return true;
-  },
-
-  handleInfoCollections: function handleInfoCollections(request, response,
-                                                        user) {
-    if (this.handleInfoConditional(request, response, user)) {
-      return;
-    }
-
-    let info = this.infoCollections(user);
-    let body = JSON.stringify(info);
-    this.respond(request, response, 200, "OK", body, {
-      "Content-Type":    "application/json",
-      "X-Last-Modified": "" + this.newestCollectionTimestamp(user),
-    });
-  },
-
-  handleInfoCounts: function handleInfoCounts(request, response, user) {
-    if (this.handleInfoConditional(request, response, user)) {
-      return;
-    }
-
-    let counts = this.infoCounts(user);
-    let body = JSON.stringify(counts);
-
-    this.respond(request, response, 200, "OK", body, {
-      "Content-Type":    "application/json",
-      "X-Last-Modified": "" + this.newestCollectionTimestamp(user),
-    });
-  },
-
-  handleInfoUsage: function handleInfoUsage(request, response, user) {
-    if (this.handleInfoConditional(request, response, user)) {
-      return;
-    }
-
-    let body = JSON.stringify(this.infoUsage(user));
-    this.respond(request, response, 200, "OK", body, {
-      "Content-Type":    "application/json",
-      "X-Last-Modified": "" + this.newestCollectionTimestamp(user),
-    });
-  },
-
-  handleInfoQuota: function handleInfoQuota(request, response, user) {
-    if (this.handleInfoConditional(request, response, user)) {
-      return;
-    }
-
-    let body = JSON.stringify(this.infoQuota(user));
-    this.respond(request, response, 200, "OK", body, {
-      "Content-Type":    "application/json",
-      "X-Last-Modified": "" + this.newestCollectionTimestamp(user),
-    });
-  },
-};
-
-/**
- * Helper to create a storage server for a set of users.
- *
- * Each user is specified by a map of username to password.
- */
-this.storageServerForUsers =
- function storageServerForUsers(users, contents, callback) {
-  let server = new StorageServer(callback);
-  for (let [user, pass] of Object.entries(users)) {
-    server.registerUser(user, pass);
-    server.createContents(user, contents);
-  }
-  server.start();
-  return server;
-};
diff --git a/services/common/moz.build b/services/common/moz.build
index 63ac3a238a17..c5a8cbdc5c3d 100644
--- a/services/common/moz.build
+++ b/services/common/moz.build
@@ -34,10 +34,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
         'tokenserverclient.js',
     ]
 
-    TESTING_JS_MODULES.services.common += [
-        'modules-testing/storageserver.js',
-    ]
-
 TESTING_JS_MODULES.services.common += [
     'modules-testing/logging.js',
 ]
diff --git a/services/common/tests/mach_commands.py b/services/common/tests/mach_commands.py
deleted file mode 100644
index b57fa3aa26b3..000000000000
--- a/services/common/tests/mach_commands.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from __future__ import absolute_import, unicode_literals
-
-import mozpack.path as mozpath
-
-from mozbuild.base import (
-    MachCommandBase,
-)
-
-from mach.decorators import (
-    CommandArgument,
-    CommandProvider,
-    Command,
-)
-
-from mach.registrar import (
-    Registrar
-)
-
-from shutil import rmtree
-from subprocess import Popen
-from sys import argv
-from sys import exit
-from tempfile import mkdtemp
-
-
-
-DEFAULT_PORT = 8080
-DEFAULT_HOSTNAME = 'localhost'
-
-SRCDIR = mozpath.abspath(mozpath.dirname(__file__))
-
-STORAGE_SERVER_SCRIPT = mozpath.join(SRCDIR, 'run_storage_server.js')
-
-def SyncStorageCommand(func):
-    """Decorator that adds shared command arguments to services commands."""
-
-    port = CommandArgument('--port', metavar='PORT', type=int,
-                           default=DEFAULT_PORT, help='Port to run server on.')
-    func = port(func)
-
-    address = CommandArgument('--address', metavar='ADDRESS',
-                              default=DEFAULT_HOSTNAME,
-                              help='Hostname to bind server to.')
-    func = address(func)
-
-    return func
-
-Registrar.register_category(name='services',
-                            title='Services utilities',
-                            description='Commands for services development.')
-
-@CommandProvider
-class SyncTestCommands(MachCommandBase):
-    def __init__(self, context):
-        MachCommandBase.__init__(self, context)
-
-    def run_server(self, js_file, hostname, port):
-        topsrcdir = self.topsrcdir
-        topobjdir = self.topobjdir
-
-        unit_test_dir = mozpath.join(SRCDIR, 'unit')
-
-        head_paths = [
-            'head_global.js',
-            'head_helpers.js',
-            'head_http.js',
-            ]
-
-        head_paths = ['"%s"' % mozpath.join(unit_test_dir, path) for path in head_paths]
-
-        args = [
-            '%s/run-mozilla.sh' % self.bindir,
-            '%s/xpcshell' % self.bindir,
-            '-g', self.bindir,
-            '-a', self.bindir,
-            '-r', '%s/components/httpd.manifest' % self.bindir,
-            '-m',
-            '-s',
-            '-e', 'const _TESTING_MODULES_DIR = "%s/_tests/modules";' % topobjdir,
-            '-f', '%s/testing/xpcshell/head.js' % topsrcdir,
-            '-e', 'const _SERVER_ADDR = "%s";' % hostname,
-            '-e', 'const SERVER_PORT = "%s";' % port,
-            '-e', 'const INCLUDE_FILES = [%s];' % ', '.join(head_paths),
-            '-e', '_register_protocol_handlers();',
-            '-e', 'for (let name of INCLUDE_FILES) load(name);',
-            '-e', '_fakeIdleService.activate();',
-            '-f', js_file
-            ]
-
-        profile_dir = mkdtemp()
-        print 'Created profile directory: %s' % profile_dir
-
-        try:
-            env = {'XPCSHELL_TEST_PROFILE_DIR': profile_dir}
-            proc = Popen(args, env=env)
-
-            return proc.wait()
-
-        finally:
-            print 'Removing profile directory %s' % profile_dir
-            rmtree(profile_dir)
-
-    @Command('storage-server', category='services',
-             description='Run a storage server.')
-    @SyncStorageCommand
-    def run_storage_server(self, port=DEFAULT_PORT, address=DEFAULT_HOSTNAME):
-        exit(self.run_server(STORAGE_SERVER_SCRIPT, address, port))
diff --git a/services/common/tests/run_storage_server.js b/services/common/tests/run_storage_server.js
deleted file mode 100644
index 342663235032..000000000000
--- a/services/common/tests/run_storage_server.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This file runs a Storage Service server.
- *
- * It is meant to be executed with an xpcshell.
- *
- * The Makefile in this directory contains a target to run it:
- *
- *   $ make storage-server
- */
-
-// Disable eslint no-undef rule for this file, as it is simple and is complicated
-// to check all the imports.
-/* eslint no-undef:off */
-
-Cu.import("resource://testing-common/services/common/storageserver.js");
-
-initTestLogging();
-
-var server = new StorageServer();
-server.allowAllUsers = true;
-server.startSynchronous(SERVER_PORT);
-_("Storage server started on port " + SERVER_PORT);
-
-// Launch the thread manager.
-_do_main();
diff --git a/services/common/tests/unit/test_load_modules.js b/services/common/tests/unit/test_load_modules.js
index 232825cc1303..b600822c8453 100644
--- a/services/common/tests/unit/test_load_modules.js
+++ b/services/common/tests/unit/test_load_modules.js
@@ -20,10 +20,6 @@ const shared_test_modules = [
   "logging.js",
 ];
 
-const non_android_test_modules = [
-  "storageserver.js",
-];
-
 function expectImportsToSucceed(mm, base = MODULE_BASE) {
   for (let m of mm) {
     let resource = base + m;
@@ -60,9 +56,7 @@ function run_test() {
 
   if (AppConstants.platform != "android") {
     expectImportsToSucceed(non_android_modules);
-    expectImportsToSucceed(non_android_test_modules, TEST_BASE);
   } else {
     expectImportsToFail(non_android_modules);
-    expectImportsToFail(non_android_test_modules, TEST_BASE);
   }
 }
diff --git a/services/common/tests/unit/test_storage_server.js b/services/common/tests/unit/test_storage_server.js
deleted file mode 100644
index a3cb338b87e8..000000000000
--- a/services/common/tests/unit/test_storage_server.js
+++ /dev/null
@@ -1,692 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-Cu.import("resource://services-common/async.js");
-Cu.import("resource://services-common/rest.js");
-Cu.import("resource://services-common/utils.js");
-Cu.import("resource://testing-common/services/common/storageserver.js");
-
-const DEFAULT_USER = "123";
-const DEFAULT_PASSWORD = "password";
-
-/**
- * Helper function to prepare a RESTRequest against the server.
- */
-function localRequest(server, path, user = DEFAULT_USER, password = DEFAULT_PASSWORD) {
-  _("localRequest: " + path);
-  let identity = server.server.identity;
-  let url = identity.primaryScheme + "://" + identity.primaryHost + ":" +
-            identity.primaryPort + path;
-  _("url: " + url);
-  let req = new RESTRequest(url);
-
-  let header = basic_auth_header(user, password);
-  req.setHeader("Authorization", header);
-  req.setHeader("Accept", "application/json");
-
-  return req;
-}
-
-/**
- * Helper function to validate an HTTP response from the server.
- */
-function validateResponse(response) {
-  do_check_true("x-timestamp" in response.headers);
-
-  if ("content-length" in response.headers) {
-    let cl = parseInt(response.headers["content-length"]);
-
-    if (cl != 0) {
-      do_check_true("content-type" in response.headers);
-      do_check_eq("application/json", response.headers["content-type"]);
-    }
-  }
-
-  if (response.status == 204 || response.status == 304) {
-    do_check_false("content-type" in response.headers);
-
-    if ("content-length" in response.headers) {
-      do_check_eq(response.headers["content-length"], "0");
-    }
-  }
-
-  if (response.status == 405) {
-    do_check_true("allow" in response.headers);
-  }
-}
-
-/**
- * Helper function to synchronously wait for a response and validate it.
- */
-function waitAndValidateResponse(cb, request) {
-  let error = cb.wait();
-
-  if (!error) {
-    validateResponse(request.response);
-  }
-
-  return error;
-}
-
-/**
- * Helper function to synchronously perform a GET request.
- *
- * @return Error instance or null if no error.
- */
-function doGetRequest(request) {
-  let cb = Async.makeSpinningCallback();
-  request.get(cb);
-
-  return waitAndValidateResponse(cb, request);
-}
-
-/**
- * Helper function to synchronously perform a PUT request.
- *
- * @return Error instance or null if no error.
- */
-function doPutRequest(request, data) {
-  let cb = Async.makeSpinningCallback();
-  request.put(data, cb);
-
-  return waitAndValidateResponse(cb, request);
-}
-
-/**
- * Helper function to synchronously perform a DELETE request.
- *
- * @return Error or null if no error was encountered.
- */
-function doDeleteRequest(request) {
-  let cb = Async.makeSpinningCallback();
-  request.delete(cb);
-
-  return waitAndValidateResponse(cb, request);
-}
-
-function run_test() {
-  Log.repository.getLogger("Services.Common.Test.StorageServer").level =
-    Log.Level.Trace;
-  initTestLogging();
-
-  run_next_test();
-}
-
-add_test(function test_creation() {
-  _("Ensure a simple server can be created.");
-
-  // Explicit callback for this one.
-  let server = new StorageServer({
-    __proto__: StorageServerCallback,
-  });
-  do_check_true(!!server);
-
-  server.start(-1, function() {
-    _("Started on " + server.port);
-    server.stop(run_next_test);
-  });
-});
-
-add_test(function test_synchronous_start() {
-  _("Ensure starting using startSynchronous works.");
-
-  let server = new StorageServer();
-  server.startSynchronous();
-  server.stop(run_next_test);
-});
-
-add_test(function test_url_parsing() {
-  _("Ensure server parses URLs properly.");
-
-  let server = new StorageServer();
-
-  // Check that we can parse a BSO URI.
-  let parts = server.pathRE.exec("/2.0/12345/storage/crypto/keys");
-  let [all, version, user, first, rest] = parts;
-  do_check_eq(all, "/2.0/12345/storage/crypto/keys");
-  do_check_eq(version, "2.0");
-  do_check_eq(user, "12345");
-  do_check_eq(first, "storage");
-  do_check_eq(rest, "crypto/keys");
-  do_check_eq(null, server.pathRE.exec("/nothing/else"));
-
-  // Check that we can parse a collection URI.
-  parts = server.pathRE.exec("/2.0/123/storage/crypto");
-  [all, version, user, first, rest] = parts;
-  do_check_eq(all, "/2.0/123/storage/crypto");
-  do_check_eq(version, "2.0");
-  do_check_eq(user, "123");
-  do_check_eq(first, "storage");
-  do_check_eq(rest, "crypto");
-
-  // We don't allow trailing slash on storage URI.
-  parts = server.pathRE.exec("/2.0/1234/storage/");
-  do_check_eq(parts, undefined);
-
-  // storage alone is a valid request.
-  parts = server.pathRE.exec("/2.0/123456/storage");
-  [all, version, user, first, rest] = parts;
-  do_check_eq(all, "/2.0/123456/storage");
-  do_check_eq(version, "2.0");
-  do_check_eq(user, "123456");
-  do_check_eq(first, "storage");
-  do_check_eq(rest, undefined);
-
-  parts = server.storageRE.exec("storage");
-  let collection;
-  [all, , collection, ] = parts;
-  do_check_eq(all, "storage");
-  do_check_eq(collection, undefined);
-
-  run_next_test();
-});
-
-add_test(function test_basic_http() {
-  let server = new StorageServer();
-  server.registerUser("345", "password");
-  do_check_true(server.userExists("345"));
-  server.startSynchronous();
-
-  _("Started on " + server.port);
-  do_check_eq(server.requestCount, 0);
-  let req = localRequest(server, "/2.0/storage/crypto/keys");
-  _("req is " + req);
-  req.get(function(err) {
-    do_check_eq(null, err);
-    do_check_eq(server.requestCount, 1);
-    server.stop(run_next_test);
-  });
-});
-
-add_test(function test_info_collections() {
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.startSynchronous();
-
-  let path = "/2.0/123/info/collections";
-
-  _("info/collections on empty server should be empty object.");
-  let request = localRequest(server, path, "123", "password");
-  let error = doGetRequest(request);
-  do_check_eq(error, null);
-  do_check_eq(request.response.status, 200);
-  do_check_eq(request.response.body, "{}");
-
-  _("Creating an empty collection should result in collection appearing.");
-  let coll = server.createCollection("123", "col1");
-  request = localRequest(server, path, "123", "password");
-  error = doGetRequest(request);
-  do_check_eq(error, null);
-  do_check_eq(request.response.status, 200);
-  let info = JSON.parse(request.response.body);
-  do_check_attribute_count(info, 1);
-  do_check_true("col1" in info);
-  do_check_eq(info.col1, coll.timestamp);
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_bso_get_existing() {
-  _("Ensure that BSO retrieval works.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.createContents("123", {
-    test: {"bso": {"foo": "bar"}}
-  });
-  server.startSynchronous();
-
-  let coll = server.user("123").collection("test");
-
-  let request = localRequest(server, "/2.0/123/storage/test/bso", "123",
-                             "password");
-  let error = doGetRequest(request);
-  do_check_eq(error, null);
-  do_check_eq(request.response.status, 200);
-  do_check_eq(request.response.headers["content-type"], "application/json");
-  let bso = JSON.parse(request.response.body);
-  do_check_attribute_count(bso, 3);
-  do_check_eq(bso.id, "bso");
-  do_check_eq(bso.modified, coll.bso("bso").modified);
-  let payload = JSON.parse(bso.payload);
-  do_check_attribute_count(payload, 1);
-  do_check_eq(payload.foo, "bar");
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_percent_decoding() {
-  _("Ensure query string arguments with percent encoded are handled.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.startSynchronous();
-
-  let coll = server.user("123").createCollection("test");
-  coll.insert("001", {foo: "bar"});
-  coll.insert("002", {bar: "foo"});
-
-  let request = localRequest(server, "/2.0/123/storage/test?ids=001%2C002",
-                             "123", "password");
-  let error = doGetRequest(request);
-  do_check_null(error);
-  do_check_eq(request.response.status, 200);
-  let items = JSON.parse(request.response.body).items;
-  do_check_attribute_count(items, 2);
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_bso_404() {
-  _("Ensure the server responds with a 404 if a BSO does not exist.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.createContents("123", {
-    test: {}
-  });
-  server.startSynchronous();
-
-  let request = localRequest(server, "/2.0/123/storage/test/foo");
-  let error = doGetRequest(request);
-  do_check_eq(error, null);
-
-  do_check_eq(request.response.status, 404);
-  do_check_false("content-type" in request.response.headers);
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_bso_if_modified_since_304() {
-  _("Ensure the server responds properly to X-If-Modified-Since for BSOs.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.createContents("123", {
-    test: {bso: {foo: "bar"}}
-  });
-  server.startSynchronous();
-
-  let coll = server.user("123").collection("test");
-  do_check_neq(coll, null);
-
-  // Rewind clock just in case.
-  coll.timestamp -= 10000;
-  coll.bso("bso").modified -= 10000;
-
-  let request = localRequest(server, "/2.0/123/storage/test/bso",
-                             "123", "password");
-  request.setHeader("X-If-Modified-Since", "" + server.serverTime());
-  let error = doGetRequest(request);
-  do_check_eq(null, error);
-
-  do_check_eq(request.response.status, 304);
-  do_check_false("content-type" in request.response.headers);
-
-  request = localRequest(server, "/2.0/123/storage/test/bso",
-                             "123", "password");
-  request.setHeader("X-If-Modified-Since", "" + (server.serverTime() - 20000));
-  error = doGetRequest(request);
-  do_check_eq(null, error);
-  do_check_eq(request.response.status, 200);
-  do_check_eq(request.response.headers["content-type"], "application/json");
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_bso_if_unmodified_since() {
-  _("Ensure X-If-Unmodified-Since works properly on BSOs.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.createContents("123", {
-    test: {bso: {foo: "bar"}}
-  });
-  server.startSynchronous();
-
-  let coll = server.user("123").collection("test");
-  do_check_neq(coll, null);
-
-  let time = coll.bso("bso").modified;
-
-  _("Ensure we get a 412 for specified times older than server time.");
-  let request = localRequest(server, "/2.0/123/storage/test/bso",
-                             "123", "password");
-  request.setHeader("X-If-Unmodified-Since", time - 5000);
-  request.setHeader("Content-Type", "application/json");
-  let payload = JSON.stringify({"payload": "foobar"});
-  let error = doPutRequest(request, payload);
-  do_check_eq(null, error);
-  do_check_eq(request.response.status, 412);
-
-  _("Ensure we get a 204 if update goes through.");
-  request = localRequest(server, "/2.0/123/storage/test/bso",
-                         "123", "password");
-  request.setHeader("Content-Type", "application/json");
-  request.setHeader("X-If-Unmodified-Since", time + 1);
-  error = doPutRequest(request, payload);
-  do_check_eq(null, error);
-  do_check_eq(request.response.status, 204);
-  do_check_true(coll.timestamp > time);
-
-  // Not sure why a client would send X-If-Unmodified-Since if a BSO doesn't
-  // exist. But, why not test it?
-  _("Ensure we get a 201 if creation goes through.");
-  request = localRequest(server, "/2.0/123/storage/test/none",
-                         "123", "password");
-  request.setHeader("Content-Type", "application/json");
-  request.setHeader("X-If-Unmodified-Since", time);
-  error = doPutRequest(request, payload);
-  do_check_eq(null, error);
-  do_check_eq(request.response.status, 201);
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_bso_delete_not_exist() {
-  _("Ensure server behaves properly when deleting a BSO that does not exist.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.user("123").createCollection("empty");
-  server.startSynchronous();
-
-  server.callback.onItemDeleted = function onItemDeleted(username, collection,
-                                                         id) {
-    do_throw("onItemDeleted should not have been called.");
-  };
-
-  let request = localRequest(server, "/2.0/123/storage/empty/nada",
-                             "123", "password");
-  let error = doDeleteRequest(request);
-  do_check_eq(error, null);
-  do_check_eq(request.response.status, 404);
-  do_check_false("content-type" in request.response.headers);
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_bso_delete_exists() {
-  _("Ensure proper semantics when deleting a BSO that exists.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.startSynchronous();
-
-  let coll = server.user("123").createCollection("test");
-  coll.insert("myid", {foo: "bar"});
-  let timestamp = coll.timestamp;
-
-  server.callback.onItemDeleted = function onDeleted(username, collection, id) {
-    delete server.callback.onItemDeleted;
-    do_check_eq(username, "123");
-    do_check_eq(collection, "test");
-    do_check_eq(id, "myid");
-  };
-
-  let request = localRequest(server, "/2.0/123/storage/test/myid",
-                             "123", "password");
-  let error = doDeleteRequest(request);
-  do_check_eq(error, null);
-  do_check_eq(request.response.status, 204);
-  do_check_eq(coll.bsos().length, 0);
-  do_check_true(coll.timestamp > timestamp);
-
-  _("On next request the BSO should not exist.");
-  request = localRequest(server, "/2.0/123/storage/test/myid",
-                         "123", "password");
-  error = doGetRequest(request);
-  do_check_eq(error, null);
-  do_check_eq(request.response.status, 404);
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_bso_delete_unmodified() {
-  _("Ensure X-If-Unmodified-Since works when deleting BSOs.");
-
-  let server = new StorageServer();
-  server.startSynchronous();
-  server.registerUser("123", "password");
-  let coll = server.user("123").createCollection("test");
-  let bso = coll.insert("myid", {foo: "bar"});
-
-  let modified = bso.modified;
-
-  _("Issuing a DELETE with an older time should fail.");
-  let path = "/2.0/123/storage/test/myid";
-  let request = localRequest(server, path, "123", "password");
-  request.setHeader("X-If-Unmodified-Since", modified - 1000);
-  let error = doDeleteRequest(request);
-  do_check_eq(error, null);
-  do_check_eq(request.response.status, 412);
-  do_check_false("content-type" in request.response.headers);
-  do_check_neq(coll.bso("myid"), null);
-
-  _("Issuing a DELETE with a newer time should work.");
-  request = localRequest(server, path, "123", "password");
-  request.setHeader("X-If-Unmodified-Since", modified + 1000);
-  error = doDeleteRequest(request);
-  do_check_eq(error, null);
-  do_check_eq(request.response.status, 204);
-  do_check_true(coll.bso("myid").deleted);
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_collection_get_unmodified_since() {
-  _("Ensure conditional unmodified get on collection works when it should.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.startSynchronous();
-  let collection = server.user("123").createCollection("testcoll");
-  collection.insert("bso0", {foo: "bar"});
-
-  let serverModified = collection.timestamp;
-
-  let request1 = localRequest(server, "/2.0/123/storage/testcoll",
-                              "123", "password");
-  request1.setHeader("X-If-Unmodified-Since", serverModified);
-  let error = doGetRequest(request1);
-  do_check_null(error);
-  do_check_eq(request1.response.status, 200);
-
-  let request2 = localRequest(server, "/2.0/123/storage/testcoll",
-                              "123", "password");
-  request2.setHeader("X-If-Unmodified-Since", serverModified - 1);
-  error = doGetRequest(request2);
-  do_check_null(error);
-  do_check_eq(request2.response.status, 412);
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_bso_get_unmodified_since() {
-  _("Ensure conditional unmodified get on BSO works appropriately.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.startSynchronous();
-  let collection = server.user("123").createCollection("testcoll");
-  let bso = collection.insert("bso0", {foo: "bar"});
-
-  let serverModified = bso.modified;
-
-  let request1 = localRequest(server, "/2.0/123/storage/testcoll/bso0",
-                              "123", "password");
-  request1.setHeader("X-If-Unmodified-Since", serverModified);
-  let error = doGetRequest(request1);
-  do_check_null(error);
-  do_check_eq(request1.response.status, 200);
-
-  let request2 = localRequest(server, "/2.0/123/storage/testcoll/bso0",
-                              "123", "password");
-  request2.setHeader("X-If-Unmodified-Since", serverModified - 1);
-  error = doGetRequest(request2);
-  do_check_null(error);
-  do_check_eq(request2.response.status, 412);
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_missing_collection_404() {
-  _("Ensure a missing collection returns a 404.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.startSynchronous();
-
-  let request = localRequest(server, "/2.0/123/storage/none", "123", "password");
-  let error = doGetRequest(request);
-  do_check_eq(error, null);
-  do_check_eq(request.response.status, 404);
-  do_check_false("content-type" in request.response.headers);
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_get_storage_405() {
-  _("Ensure that a GET on /storage results in a 405.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.startSynchronous();
-
-  let request = localRequest(server, "/2.0/123/storage", "123", "password");
-  let error = doGetRequest(request);
-  do_check_eq(error, null);
-  do_check_eq(request.response.status, 405);
-  do_check_eq(request.response.headers.allow, "DELETE");
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_delete_storage() {
-  _("Ensure that deleting all of storage works.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.createContents("123", {
-    foo: {a: {foo: "bar"}, b: {bar: "foo"}},
-    baz: {c: {bob: "law"}, blah: {law: "blog"}}
-  });
-
-  server.startSynchronous();
-
-  let request = localRequest(server, "/2.0/123/storage", "123", "password");
-  let error = doDeleteRequest(request);
-  do_check_eq(error, null);
-  do_check_eq(request.response.status, 204);
-  do_check_attribute_count(server.users["123"].collections, 0);
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_x_num_records() {
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-
-  server.createContents("123", {
-    crypto: {foos: {foo: "bar"},
-             bars: {foo: "baz"}}
-  });
-  server.startSynchronous();
-  let bso = localRequest(server, "/2.0/123/storage/crypto/foos");
-  bso.get(function(err) {
-    // BSO fetches don't have one.
-    do_check_false("x-num-records" in this.response.headers);
-    let col = localRequest(server, "/2.0/123/storage/crypto");
-    col.get(function(err2) {
-      // Collection fetches do.
-      do_check_eq(this.response.headers["x-num-records"], "2");
-      server.stop(run_next_test);
-    });
-  });
-});
-
-add_test(function test_put_delete_put() {
-  _("Bug 790397: Ensure BSO deleted flag is reset on PUT.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.createContents("123", {
-    test: {bso: {foo: "bar"}}
-  });
-  server.startSynchronous();
-
-  _("Ensure we can PUT an existing record.");
-  let request1 = localRequest(server, "/2.0/123/storage/test/bso", "123", "password");
-  request1.setHeader("Content-Type", "application/json");
-  let payload1 = JSON.stringify({"payload": "foobar"});
-  let error1 = doPutRequest(request1, payload1);
-  do_check_eq(null, error1);
-  do_check_eq(request1.response.status, 204);
-
-  _("Ensure we can DELETE it.");
-  let request2 = localRequest(server, "/2.0/123/storage/test/bso", "123", "password");
-  let error2 = doDeleteRequest(request2);
-  do_check_eq(error2, null);
-  do_check_eq(request2.response.status, 204);
-  do_check_false("content-type" in request2.response.headers);
-
-  _("Ensure we can PUT a previously deleted record.");
-  let request3 = localRequest(server, "/2.0/123/storage/test/bso", "123", "password");
-  request3.setHeader("Content-Type", "application/json");
-  let payload3 = JSON.stringify({"payload": "foobar"});
-  let error3 = doPutRequest(request3, payload3);
-  do_check_eq(null, error3);
-  do_check_eq(request3.response.status, 201);
-
-  _("Ensure we can GET the re-uploaded record.");
-  let request4 = localRequest(server, "/2.0/123/storage/test/bso", "123", "password");
-  let error4 = doGetRequest(request4);
-  do_check_eq(error4, null);
-  do_check_eq(request4.response.status, 200);
-  do_check_eq(request4.response.headers["content-type"], "application/json");
-
-  server.stop(run_next_test);
-});
-
-add_test(function test_collection_get_newer() {
-  _("Ensure get with newer argument on collection works.");
-
-  let server = new StorageServer();
-  server.registerUser("123", "password");
-  server.startSynchronous();
-
-  let coll = server.user("123").createCollection("test");
-  let bso1 = coll.insert("001", {foo: "bar"});
-  let bso2 = coll.insert("002", {bar: "foo"});
-
-  // Don't want both records to have the same timestamp.
-  bso2.modified = bso1.modified + 1000;
-
-  function newerRequest(newer) {
-    return localRequest(server, "/2.0/123/storage/test?newer=" + newer,
-                        "123", "password");
-  }
-
-  let request1 = newerRequest(0);
-  let error1 = doGetRequest(request1);
-  do_check_null(error1);
-  do_check_eq(request1.response.status, 200);
-  let items1 = JSON.parse(request1.response.body).items;
-  do_check_attribute_count(items1, 2);
-
-  let request2 = newerRequest(bso1.modified + 1);
-  let error2 = doGetRequest(request2);
-  do_check_null(error2);
-  do_check_eq(request2.response.status, 200);
-  let items2 = JSON.parse(request2.response.body).items;
-  do_check_attribute_count(items2, 1);
-
-  let request3 = newerRequest(bso2.modified + 1);
-  let error3 = doGetRequest(request3);
-  do_check_null(error3);
-  do_check_eq(request3.response.status, 200);
-  let items3 = JSON.parse(request3.response.body).items;
-  do_check_attribute_count(items3, 0);
-
-  server.stop(run_next_test);
-});
diff --git a/services/common/tests/unit/xpcshell.ini b/services/common/tests/unit/xpcshell.ini
index 72eded8a78d4..2af2fdcea240 100644
--- a/services/common/tests/unit/xpcshell.ini
+++ b/services/common/tests/unit/xpcshell.ini
@@ -58,7 +58,4 @@ skip-if = os == "android"
 [test_tokenserverclient.js]
 skip-if = os == "android"
 
-[test_storage_server.js]
-skip-if = os == "android"
-
 [test_uptake_telemetry.js]

From 50bb585dd95e01838ad83b35d102792eeebcf926 Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Fri, 1 Dec 2017 15:46:26 -0500
Subject: [PATCH 068/219] Bug 1422403. Avoid float->integer->float conversion
 in ToRelativeLayoutRect. r=kats

RoundedToInt converts to ints but we want floats.

MozReview-Commit-ID: 76DtPRc8hnp

--HG--
extra : rebase_source : 213f9fae5841520862cc1d7ca4e05897ec583395
---
 gfx/layers/wr/StackingContextHelper.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gfx/layers/wr/StackingContextHelper.cpp b/gfx/layers/wr/StackingContextHelper.cpp
index 1afe49614b80..46be7369f160 100644
--- a/gfx/layers/wr/StackingContextHelper.cpp
+++ b/gfx/layers/wr/StackingContextHelper.cpp
@@ -64,7 +64,9 @@ StackingContextHelper::~StackingContextHelper()
 wr::LayoutRect
 StackingContextHelper::ToRelativeLayoutRect(const LayoutDeviceRect& aRect) const
 {
-  return wr::ToLayoutRect(RoundedToInt(aRect - mOrigin));
+  auto rect = aRect - mOrigin;
+  rect.Round();
+  return wr::ToLayoutRect(rect);
 }
 
 } // namespace layers

From 13a91fa9f670363cbc870046930e556b1d937a98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 28 Nov 2017 13:14:40 +0100
Subject: [PATCH 069/219] Bug 1417200: Make -moz-border-colors chrome only.
 r=xidorn

On a CLOSED TREE, since the servo patch managed to get in.

This also makes the border longhand no longer reset them.

MozReview-Commit-ID: KNais1e5FnE
---
 .../shared/css/generated/properties-db.js     |  60 -------
 .../chrome/test_animation_properties.html     |  52 +-----
 .../mozilla/file_discrete-animations.html     |  16 --
 .../mozilla/test_moz-prefixed-properties.html |  12 --
 .../progress/bar-pseudo-element-ref.html      |   2 +-
 .../progress/bar-pseudo-element-rtl-ref.html  |   2 +-
 .../bar-pseudo-element-vertical-ref.html      |   2 +-
 .../bar-pseudo-element-vertical-rtl-ref.html  |   2 +-
 .../forms/progress/block-invalidate-ref.html  |   2 +-
 .../reftests/forms/progress/in-cells-ref.html |   2 +-
 .../indeterminate-style-height-ref.html       |   2 +-
 .../indeterminate-style-width-ref.html        |   2 +-
 .../forms/progress/margin-padding-ref.html    |   2 +-
 .../progress/margin-padding-rtl-ref.html      |   2 +-
 .../progress/margin-padding-vertical-ref.html |   2 +-
 .../margin-padding-vertical-rtl-ref.html      |   2 +-
 .../forms/progress/transformations-ref.html   |   2 +-
 .../reftests/forms/progress/values-ref.html   |   2 +-
 .../forms/progress/values-rtl-ref.html        |   2 +-
 .../forms/progress/values-vertical-ref.html   |   2 +-
 .../progress/values-vertical-rtl-ref.html     |   2 +-
 layout/style/Declaration.cpp                  |  10 +-
 layout/style/nsCSSParser.cpp                  |  10 --
 layout/style/nsCSSPropList.h                  |  16 ++
 layout/style/nsCSSProps.cpp                   |   4 -
 layout/style/test/ListCSSProperties.cpp       |   6 +-
 layout/style/test/property_database.js        | 154 +++++++++---------
 .../test/test_dont_use_document_colors.html   |  20 ---
 .../test/test_shorthand_property_getters.html |  12 +-
 layout/tools/reftest/jar.mn                   |   1 +
 ...rogressbar-fallback-default-style-ref.html |  35 +---
 31 files changed, 128 insertions(+), 314 deletions(-)

diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
index b87366998a16..0ab8b125058b 100644
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -351,20 +351,6 @@ exports.CSS_PROPERTIES = {
       "url"
     ]
   },
-  "-moz-border-bottom-colors": {
-    "isInherited": false,
-    "subproperties": [
-      "-moz-border-bottom-colors"
-    ],
-    "supports": [
-      2
-    ],
-    "values": [
-      "inherit",
-      "initial",
-      "unset"
-    ]
-  },
   "-moz-border-end": {
     "isInherited": false,
     "subproperties": [
@@ -504,34 +490,6 @@ exports.CSS_PROPERTIES = {
       "url"
     ]
   },
-  "-moz-border-left-colors": {
-    "isInherited": false,
-    "subproperties": [
-      "-moz-border-left-colors"
-    ],
-    "supports": [
-      2
-    ],
-    "values": [
-      "inherit",
-      "initial",
-      "unset"
-    ]
-  },
-  "-moz-border-right-colors": {
-    "isInherited": false,
-    "subproperties": [
-      "-moz-border-right-colors"
-    ],
-    "supports": [
-      2
-    ],
-    "values": [
-      "inherit",
-      "initial",
-      "unset"
-    ]
-  },
   "-moz-border-start": {
     "isInherited": false,
     "subproperties": [
@@ -631,20 +589,6 @@ exports.CSS_PROPERTIES = {
       "unset"
     ]
   },
-  "-moz-border-top-colors": {
-    "isInherited": false,
-    "subproperties": [
-      "-moz-border-top-colors"
-    ],
-    "supports": [
-      2
-    ],
-    "values": [
-      "inherit",
-      "initial",
-      "unset"
-    ]
-  },
   "-moz-box-align": {
     "isInherited": false,
     "subproperties": [
@@ -4277,10 +4221,6 @@ exports.CSS_PROPERTIES = {
       "border-right-color",
       "border-bottom-color",
       "border-left-color",
-      "-moz-border-top-colors",
-      "-moz-border-right-colors",
-      "-moz-border-bottom-colors",
-      "-moz-border-left-colors",
       "border-image-source",
       "border-image-slice",
       "border-image-width",
diff --git a/dom/animation/test/chrome/test_animation_properties.html b/dom/animation/test/chrome/test_animation_properties.html
index fc819b06c4f4..8a878db1bd5f 100644
--- a/dom/animation/test/chrome/test_animation_properties.html
+++ b/dom/animation/test/chrome/test_animation_properties.html
@@ -168,18 +168,7 @@ var gTests = [
                 { property: 'border-image-width',
                   values: [ valueFormat(0, '1', 'replace', 'linear'),
                             valueFormat(1, '1', 'replace') ] },
-                { property: '-moz-border-bottom-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] },
-                { property: '-moz-border-left-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] },
-                { property: '-moz-border-right-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] },
-                { property: '-moz-border-top-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] } ]
+    ]
   },
   { desc:     'a property-indexed keyframe where a greater shorthand precedes'
               + ' a lesser shorthand',
@@ -239,18 +228,7 @@ var gTests = [
                 { property: 'border-image-width',
                   values: [ valueFormat(0, '1', 'replace', 'linear'),
                             valueFormat(1, '1', 'replace') ] },
-                { property: '-moz-border-bottom-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] },
-                { property: '-moz-border-left-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] },
-                { property: '-moz-border-right-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] },
-                { property: '-moz-border-top-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] } ]
+    ]
   },
 
   // ---------------------------------------------------------------------
@@ -519,18 +497,7 @@ var gTests = [
                 { property: 'border-image-width',
                   values: [ valueFormat(0, '1', 'replace', 'linear'),
                             valueFormat(1, '1', 'replace') ] },
-                { property: '-moz-border-bottom-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] },
-                { property: '-moz-border-left-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] },
-                { property: '-moz-border-right-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] },
-                { property: '-moz-border-top-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] } ]
+    ]
   },
   { desc:     'a keyframe sequence where greater shorthand precedes'
               + ' lesser shorthand',
@@ -589,18 +556,7 @@ var gTests = [
                 { property: 'border-image-width',
                   values: [ valueFormat(0, '1', 'replace', 'linear'),
                             valueFormat(1, '1', 'replace') ] },
-                { property: '-moz-border-bottom-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] },
-                { property: '-moz-border-left-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] },
-                { property: '-moz-border-right-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] },
-                { property: '-moz-border-top-colors',
-                  values: [ valueFormat(0, 'none', 'replace', 'linear'),
-                            valueFormat(1, 'none', 'replace') ] } ]
+    ]
   },
 
   // ---------------------------------------------------------------------
diff --git a/dom/animation/test/mozilla/file_discrete-animations.html b/dom/animation/test/mozilla/file_discrete-animations.html
index 3e3df7a4a52e..8e32184184e8 100644
--- a/dom/animation/test/mozilla/file_discrete-animations.html
+++ b/dom/animation/test/mozilla/file_discrete-animations.html
@@ -14,22 +14,6 @@ const gMozillaSpecificProperties = {
     from: "button",
     to: "none"
   },
-  "-moz-border-bottom-colors": {
-    from: "rgb(255, 0, 0) rgb(255, 0, 0) rgb(255, 0, 0) rgb(255, 0, 0)",
-    to: "rgb(0, 255, 0) rgb(0, 255, 0) rgb(0, 255, 0) rgb(0, 255, 0)"
-  },
-  "-moz-border-left-colors": {
-    from: "rgb(255, 0, 0) rgb(255, 0, 0) rgb(255, 0, 0) rgb(255, 0, 0)",
-    to: "rgb(0, 255, 0) rgb(0, 255, 0) rgb(0, 255, 0) rgb(0, 255, 0)"
-  },
-  "-moz-border-right-colors": {
-    from: "rgb(255, 0, 0) rgb(255, 0, 0) rgb(255, 0, 0) rgb(255, 0, 0)",
-    to: "rgb(0, 255, 0) rgb(0, 255, 0) rgb(0, 255, 0) rgb(0, 255, 0)"
-  },
-  "-moz-border-top-colors": {
-    from: "rgb(255, 0, 0) rgb(255, 0, 0) rgb(255, 0, 0) rgb(255, 0, 0)",
-    to: "rgb(0, 255, 0) rgb(0, 255, 0) rgb(0, 255, 0) rgb(0, 255, 0)"
-  },
   "-moz-box-align": {
     // https://developer.mozilla.org/en/docs/Web/CSS/box-align
     from: "center",
diff --git a/dom/animation/test/mozilla/test_moz-prefixed-properties.html b/dom/animation/test/mozilla/test_moz-prefixed-properties.html
index deace6b4c78f..d4ffd1b7b3de 100644
--- a/dom/animation/test/mozilla/test_moz-prefixed-properties.html
+++ b/dom/animation/test/mozilla/test_moz-prefixed-properties.html
@@ -16,18 +16,6 @@ const testcases = [
   {
     property: "-moz-appearance",
   },
-  {
-    property: "-moz-border-bottom-colors",
-  },
-  {
-    property: "-moz-border-left-colors",
-  },
-  {
-    property: "-moz-border-right-colors",
-  },
-  {
-    property: "-moz-border-top-colors",
-  },
   {
     property: "-moz-box-align"
   },
diff --git a/layout/reftests/forms/progress/bar-pseudo-element-ref.html b/layout/reftests/forms/progress/bar-pseudo-element-ref.html
index ae95d4e233dc..ed4b215ea6e7 100644
--- a/layout/reftests/forms/progress/bar-pseudo-element-ref.html
+++ b/layout/reftests/forms/progress/bar-pseudo-element-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     body > div:nth-child(1) > .progress-bar { margin: 10px; padding: 0px; }
     body > div:nth-child(2) > .progress-bar { margin: 0px; padding: 10px; }
diff --git a/layout/reftests/forms/progress/bar-pseudo-element-rtl-ref.html b/layout/reftests/forms/progress/bar-pseudo-element-rtl-ref.html
index 102fb61f5c5c..11bc76f1e38b 100644
--- a/layout/reftests/forms/progress/bar-pseudo-element-rtl-ref.html
+++ b/layout/reftests/forms/progress/bar-pseudo-element-rtl-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     body > div:nth-child(1) > .progress-bar { margin: 0px 10px 0px 0px; padding: 0px; }
     body > div:nth-child(2) > .progress-bar { margin: 0px 0px 0px 10px; padding: 0px; }
diff --git a/layout/reftests/forms/progress/bar-pseudo-element-vertical-ref.html b/layout/reftests/forms/progress/bar-pseudo-element-vertical-ref.html
index 11f73ed62919..4ee6b4663212 100644
--- a/layout/reftests/forms/progress/bar-pseudo-element-vertical-ref.html
+++ b/layout/reftests/forms/progress/bar-pseudo-element-vertical-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     .progress-element { margin: 10px; }
     body > div:nth-child(1) > .progress-bar { position: relative; top: 4px; left: 4px;
diff --git a/layout/reftests/forms/progress/bar-pseudo-element-vertical-rtl-ref.html b/layout/reftests/forms/progress/bar-pseudo-element-vertical-rtl-ref.html
index d76fb883c840..0bb86b43effa 100644
--- a/layout/reftests/forms/progress/bar-pseudo-element-vertical-rtl-ref.html
+++ b/layout/reftests/forms/progress/bar-pseudo-element-vertical-rtl-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     .progress-element { margin: 10px; }
     body > div:nth-child(1) > .progress-bar { position: relative; top: 4px; left: 4px;
diff --git a/layout/reftests/forms/progress/block-invalidate-ref.html b/layout/reftests/forms/progress/block-invalidate-ref.html
index c06092f72512..8f32a5ae50a7 100644
--- a/layout/reftests/forms/progress/block-invalidate-ref.html
+++ b/layout/reftests/forms/progress/block-invalidate-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     progress { display: block; }
   </style>
diff --git a/layout/reftests/forms/progress/in-cells-ref.html b/layout/reftests/forms/progress/in-cells-ref.html
index 7002706218f4..db8ace4387ab 100644
--- a/layout/reftests/forms/progress/in-cells-ref.html
+++ b/layout/reftests/forms/progress/in-cells-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     progress { width: 10em; height: 1em; }
     progress.vertical { -moz-orient: vertical; width: 1em; height: 10em; }
diff --git a/layout/reftests/forms/progress/indeterminate-style-height-ref.html b/layout/reftests/forms/progress/indeterminate-style-height-ref.html
index ca1f737b9707..da37560bcae7 100644
--- a/layout/reftests/forms/progress/indeterminate-style-height-ref.html
+++ b/layout/reftests/forms/progress/indeterminate-style-height-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     div.progress-element {
       height: 12em;
diff --git a/layout/reftests/forms/progress/indeterminate-style-width-ref.html b/layout/reftests/forms/progress/indeterminate-style-width-ref.html
index 8a135b2ea4cb..a11b4f153da7 100644
--- a/layout/reftests/forms/progress/indeterminate-style-width-ref.html
+++ b/layout/reftests/forms/progress/indeterminate-style-width-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     div.progress-bar {
       width:100%;
diff --git a/layout/reftests/forms/progress/margin-padding-ref.html b/layout/reftests/forms/progress/margin-padding-ref.html
index 33f35c306c79..52a5bb0fda72 100644
--- a/layout/reftests/forms/progress/margin-padding-ref.html
+++ b/layout/reftests/forms/progress/margin-padding-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     body > div:nth-child(1) { margin: 10px; padding: 0px; }
     body > div:nth-child(2) { margin: 0px; padding: 10px; }
diff --git a/layout/reftests/forms/progress/margin-padding-rtl-ref.html b/layout/reftests/forms/progress/margin-padding-rtl-ref.html
index dcf76f0f3b8b..f484fb6553c0 100644
--- a/layout/reftests/forms/progress/margin-padding-rtl-ref.html
+++ b/layout/reftests/forms/progress/margin-padding-rtl-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     body > div:nth-child(1) { margin: 10px; padding: 0px; }
     body > div:nth-child(2) { margin: 0px; padding: 10px; }
diff --git a/layout/reftests/forms/progress/margin-padding-vertical-ref.html b/layout/reftests/forms/progress/margin-padding-vertical-ref.html
index 1d964bdfa256..bc11543fc52b 100644
--- a/layout/reftests/forms/progress/margin-padding-vertical-ref.html
+++ b/layout/reftests/forms/progress/margin-padding-vertical-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     body > div:nth-child(1) { margin: 10px; padding: 0px; }
     body > div:nth-child(2) { margin: 0px; padding: 10px; }
diff --git a/layout/reftests/forms/progress/margin-padding-vertical-rtl-ref.html b/layout/reftests/forms/progress/margin-padding-vertical-rtl-ref.html
index 986a7ca44e62..8e1815eb7bd5 100644
--- a/layout/reftests/forms/progress/margin-padding-vertical-rtl-ref.html
+++ b/layout/reftests/forms/progress/margin-padding-vertical-rtl-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     body > div:nth-child(1) { margin: 10px; padding: 0px; }
     body > div:nth-child(2) { margin: 0px; padding: 10px; }
diff --git a/layout/reftests/forms/progress/transformations-ref.html b/layout/reftests/forms/progress/transformations-ref.html
index f77751ac823a..54aa2bde8ad5 100644
--- a/layout/reftests/forms/progress/transformations-ref.html
+++ b/layout/reftests/forms/progress/transformations-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     body > div:nth-child(1) { -moz-transform: matrix(1, -0.2, 0, 1, 0, 0); }
     body > div:nth-child(2) { -moz-transform: translateX(15em) matrix(1, 0, 0.6, 1, 0, 0); }
diff --git a/layout/reftests/forms/progress/values-ref.html b/layout/reftests/forms/progress/values-ref.html
index 048e1164ca85..5905c69c52f8 100644
--- a/layout/reftests/forms/progress/values-ref.html
+++ b/layout/reftests/forms/progress/values-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     div:nth-child(1) > .progress-bar { width: 100%; }
     div:nth-child(2) > .progress-bar { width: 0%; }
diff --git a/layout/reftests/forms/progress/values-rtl-ref.html b/layout/reftests/forms/progress/values-rtl-ref.html
index 99bf9fb2a785..8921496b833d 100644
--- a/layout/reftests/forms/progress/values-rtl-ref.html
+++ b/layout/reftests/forms/progress/values-rtl-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     div:nth-child(1) > .progress-bar { width: 100%; }
     div:nth-child(2) > .progress-bar { width: 0%; }
diff --git a/layout/reftests/forms/progress/values-vertical-ref.html b/layout/reftests/forms/progress/values-vertical-ref.html
index e6d85b31719e..a529eac39141 100644
--- a/layout/reftests/forms/progress/values-vertical-ref.html
+++ b/layout/reftests/forms/progress/values-vertical-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     div:nth-child(1) > .progress-bar { position: relative; top: 0%; height: 100%; }
     div:nth-child(2) > .progress-bar { position: relative; top: 100%; height: 0%; }
diff --git a/layout/reftests/forms/progress/values-vertical-rtl-ref.html b/layout/reftests/forms/progress/values-vertical-rtl-ref.html
index 6da23eae67af..03db5027677b 100644
--- a/layout/reftests/forms/progress/values-vertical-rtl-ref.html
+++ b/layout/reftests/forms/progress/values-vertical-rtl-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' type='text/css' href='style.css'>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
     div:nth-child(1) > .progress-bar { position: relative; top: 0%; height: 100%; }
     div:nth-child(2) > .progress-bar { position: relative; top: 100%; height: 0%; }
diff --git a/layout/style/Declaration.cpp b/layout/style/Declaration.cpp
index 464321b88105..22340e4d16dc 100644
--- a/layout/style/Declaration.cpp
+++ b/layout/style/Declaration.cpp
@@ -711,15 +711,7 @@ Declaration::GetPropertyValueInternal(
           !data->HasDefaultBorderImageSlice() ||
           !data->HasDefaultBorderImageWidth() ||
           !data->HasDefaultBorderImageOutset() ||
-          !data->HasDefaultBorderImageRepeat() ||
-          data->ValueFor(eCSSProperty__moz_border_top_colors)->GetUnit() !=
-            eCSSUnit_None ||
-          data->ValueFor(eCSSProperty__moz_border_right_colors)->GetUnit() !=
-            eCSSUnit_None ||
-          data->ValueFor(eCSSProperty__moz_border_bottom_colors)->GetUnit() !=
-            eCSSUnit_None ||
-          data->ValueFor(eCSSProperty__moz_border_left_colors)->GetUnit() !=
-            eCSSUnit_None) {
+          !data->HasDefaultBorderImageRepeat()) {
         break;
       }
 
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 1b50872e9d6c..9e297d9374d6 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -13449,13 +13449,6 @@ CSSParserImpl::ParseBorderSide(const nsCSSPropertyID aPropIDs[],
       AppendValue(kBorderColorIDs[index], values[2]);
     }
 
-    static const nsCSSPropertyID kBorderColorsProps[] = {
-      eCSSProperty__moz_border_top_colors,
-      eCSSProperty__moz_border_right_colors,
-      eCSSProperty__moz_border_bottom_colors,
-      eCSSProperty__moz_border_left_colors
-    };
-
     // Set the other properties that the border shorthand sets to their
     // initial values.
     nsCSSValue extraValue;
@@ -13476,9 +13469,6 @@ CSSParserImpl::ParseBorderSide(const nsCSSPropertyID aPropIDs[],
       SetBorderImageInitialValues();
       break;
     }
-    NS_FOR_CSS_SIDES(side) {
-      AppendValue(kBorderColorsProps[side], extraValue);
-    }
   }
   else {
     // Just set our one side
diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index 2d33cd56b39b..a7f6a367a039 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -793,11 +793,14 @@ CSS_PROP_BORDER(
     nullptr,
     offsetof(nsStyleBorder, mBorderBottomColor),
     eStyleAnimType_ComplexColor)
+#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_BORDER(
     -moz-border-bottom-colors,
     _moz_border_bottom_colors,
     CSS_PROP_DOMPROP_PREFIXED(BorderBottomColors),
     CSS_PROPERTY_PARSE_FUNCTION |
+        CSS_PROPERTY_INTERNAL |
+        CSS_PROPERTY_ENABLED_IN_UA_SHEETS_AND_CHROME |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
     "",
@@ -805,6 +808,7 @@ CSS_PROP_BORDER(
     nullptr,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_Discrete)
+#endif
 CSS_PROP_BORDER(
     border-bottom-left-radius,
     border_bottom_left_radius,
@@ -1057,11 +1061,14 @@ CSS_PROP_BORDER(
     nullptr,
     offsetof(nsStyleBorder, mBorderLeftColor),
     eStyleAnimType_ComplexColor)
+#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_BORDER(
     -moz-border-left-colors,
     _moz_border_left_colors,
     CSS_PROP_DOMPROP_PREFIXED(BorderLeftColors),
     CSS_PROPERTY_PARSE_FUNCTION |
+        CSS_PROPERTY_INTERNAL |
+        CSS_PROPERTY_ENABLED_IN_UA_SHEETS_AND_CHROME |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
     "",
@@ -1069,6 +1076,7 @@ CSS_PROP_BORDER(
     nullptr,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_Discrete)
+#endif
 CSS_PROP_BORDER(
     border-left-style,
     border_left_style,
@@ -1119,11 +1127,14 @@ CSS_PROP_BORDER(
     nullptr,
     offsetof(nsStyleBorder, mBorderRightColor),
     eStyleAnimType_ComplexColor)
+#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_BORDER(
     -moz-border-right-colors,
     _moz_border_right_colors,
     CSS_PROP_DOMPROP_PREFIXED(BorderRightColors),
     CSS_PROPERTY_PARSE_FUNCTION |
+        CSS_PROPERTY_INTERNAL |
+        CSS_PROPERTY_ENABLED_IN_UA_SHEETS_AND_CHROME |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
     "",
@@ -1131,6 +1142,7 @@ CSS_PROP_BORDER(
     nullptr,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_Discrete)
+#endif
 CSS_PROP_BORDER(
     border-right-style,
     border_right_style,
@@ -1193,11 +1205,14 @@ CSS_PROP_BORDER(
     nullptr,
     offsetof(nsStyleBorder, mBorderTopColor),
     eStyleAnimType_ComplexColor)
+#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
 CSS_PROP_BORDER(
     -moz-border-top-colors,
     _moz_border_top_colors,
     CSS_PROP_DOMPROP_PREFIXED(BorderTopColors),
     CSS_PROPERTY_PARSE_FUNCTION |
+        CSS_PROPERTY_INTERNAL |
+        CSS_PROPERTY_ENABLED_IN_UA_SHEETS_AND_CHROME |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
     "",
@@ -1205,6 +1220,7 @@ CSS_PROP_BORDER(
     nullptr,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_Discrete)
+#endif
 CSS_PROP_BORDER(
     border-top-left-radius,
     border_top_left_radius,
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index 5c1ab8e8aae3..fb2b7820469a 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -2685,10 +2685,6 @@ static const nsCSSPropertyID gBorderSubpropTable[] = {
   eCSSProperty_border_right_color,
   eCSSProperty_border_bottom_color,
   eCSSProperty_border_left_color,
-  eCSSProperty__moz_border_top_colors,
-  eCSSProperty__moz_border_right_colors,
-  eCSSProperty__moz_border_bottom_colors,
-  eCSSProperty__moz_border_left_colors,
   eCSSProperty_border_image_source,
   eCSSProperty_border_image_slice,
   eCSSProperty_border_image_width,
diff --git a/layout/style/test/ListCSSProperties.cpp b/layout/style/test/ListCSSProperties.cpp
index 8fe2ee2b7ca6..c9d42359b8c2 100644
--- a/layout/style/test/ListCSSProperties.cpp
+++ b/layout/style/test/ListCSSProperties.cpp
@@ -119,7 +119,11 @@ const char *gInaccessibleProperties[] = {
     "-moz-window-opacity", // chrome-only internal properties
     "-moz-window-transform", // chrome-only internal properties
     "-moz-window-transform-origin", // chrome-only internal properties
-    "-moz-window-shadow" // chrome-only internal properties
+    "-moz-window-shadow", // chrome-only internal properties
+    "-moz-border-top-colors", // chrome-only internal properties
+    "-moz-border-bottom-colors", // chrome-only internal properties
+    "-moz-border-left-colors", // chrome-only internal properties
+    "-moz-border-right-colors" // chrome-only internal properties
 };
 
 inline int
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index 9cf1fe792501..685cf3e5573f 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -1282,15 +1282,6 @@ var gCSSProperties = {
     other_values: [ "url(foo.xml)" ],
     invalid_values: []
   },
-  "-moz-border-bottom-colors": {
-    domProp: "MozBorderBottomColors",
-    inherited: false,
-    type: CSS_TYPE_LONGHAND,
-    applies_to_first_letter: true,
-    initial_values: [ "none" ],
-    other_values: [ "red green", "red #fc3", "#ff00cc", "currentColor", "blue currentColor orange currentColor" ],
-    invalid_values: [ "red none", "red inherit", "red, green", "none red", "inherit red", "ff00cc" ]
-  },
   "border-inline-end": {
     domProp: "borderInlineEnd",
     inherited: false,
@@ -1435,15 +1426,6 @@ var gCSSProperties = {
                     "space", "stretch space", "repeat space", "round space", "space space" ],
     invalid_values: [ "none", "stretch stretch stretch", "0", "10", "0%", "0px" ]
   },
-  "-moz-border-left-colors": {
-    domProp: "MozBorderLeftColors",
-    inherited: false,
-    type: CSS_TYPE_LONGHAND,
-    applies_to_first_letter: true,
-    initial_values: [ "none" ],
-    other_values: [ "red green", "red #fc3", "#ff00cc", "currentColor", "blue currentColor orange currentColor" ],
-    invalid_values: [ "red none", "red inherit", "red, green", "none red", "inherit red", "ff00cc" ]
-  },
   "border-radius": {
     domProp: "borderRadius",
     inherited: false,
@@ -1551,15 +1533,6 @@ var gCSSProperties = {
             ],
     invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "2px calc(0px + rubbish)" ]
   },
-  "-moz-border-right-colors": {
-    domProp: "MozBorderRightColors",
-    inherited: false,
-    type: CSS_TYPE_LONGHAND,
-    applies_to_first_letter: true,
-    initial_values: [ "none" ],
-    other_values: [ "red green", "red #fc3", "#ff00cc", "currentColor", "blue currentColor orange currentColor" ],
-    invalid_values: [ "red none", "red inherit", "red, green", "none red", "inherit red", "ff00cc" ]
-  },
   "border-inline-start": {
     domProp: "borderInlineStart",
     inherited: false,
@@ -1613,15 +1586,6 @@ var gCSSProperties = {
     ],
     invalid_values: [ "5%", "5" ]
   },
-  "-moz-border-top-colors": {
-    domProp: "MozBorderTopColors",
-    inherited: false,
-    type: CSS_TYPE_LONGHAND,
-    applies_to_first_letter: true,
-    initial_values: [ "none" ],
-    other_values: [ "red green", "red #fc3", "#ff00cc", "currentColor", "blue currentColor orange currentColor" ],
-    invalid_values: [ "red none", "red inherit", "red, green", "none red", "inherit red", "ff00cc" ]
-  },
   "-moz-box-align": {
     domProp: "MozBoxAlign",
     inherited: false,
@@ -3030,7 +2994,7 @@ var gCSSProperties = {
     domProp: "border",
     inherited: false,
     type: CSS_TYPE_TRUE_SHORTHAND,
-    subproperties: [ "border-bottom-color", "border-bottom-style", "border-bottom-width", "border-left-color", "border-left-style", "border-left-width", "border-right-color", "border-right-style", "border-right-width", "border-top-color", "border-top-style", "border-top-width", "-moz-border-top-colors", "-moz-border-right-colors", "-moz-border-bottom-colors", "-moz-border-left-colors", "border-image-source", "border-image-slice", "border-image-width", "border-image-outset", "border-image-repeat" ],
+    subproperties: [ "border-bottom-color", "border-bottom-style", "border-bottom-width", "border-left-color", "border-left-style", "border-left-width", "border-right-color", "border-right-style", "border-right-width", "border-top-color", "border-top-style", "border-top-width", "border-image-source", "border-image-slice", "border-image-width", "border-image-outset", "border-image-repeat" ],
     initial_values: [ "none", "medium", "currentColor", "thin", "none medium currentcolor", "calc(4px - 1px) none" ],
     other_values: [ "solid", "medium solid", "green solid", "10px solid", "thick solid", "calc(2px) solid blue" ],
     invalid_values: [ "5%", "medium solid ff00ff", "5 solid green" ]
@@ -8103,42 +8067,6 @@ if (IsCSSPropertyPrefEnabled("layout.css.prefixes.gradients")) {
   );
 }
 
-if (IsCSSPropertyPrefEnabled("layout.css.unset-value.enabled")) {
-  gCSSProperties["animation"].invalid_values.push("2s unset");
-  gCSSProperties["animation-direction"].invalid_values.push("normal, unset", "unset, normal");
-  gCSSProperties["animation-name"].invalid_values.push("bounce, unset", "unset, bounce");
-  gCSSProperties["-moz-border-bottom-colors"].invalid_values.push("red unset", "unset red");
-  gCSSProperties["-moz-border-left-colors"].invalid_values.push("red unset", "unset red");
-  gCSSProperties["border-radius"].invalid_values.push("unset 2px", "unset / 2px", "2px unset", "2px / unset");
-  gCSSProperties["border-bottom-left-radius"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["border-bottom-right-radius"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["border-top-left-radius"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["border-top-right-radius"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["-moz-border-right-colors"].invalid_values.push("red unset", "unset red");
-  gCSSProperties["-moz-border-top-colors"].invalid_values.push("red unset", "unset red");
-  gCSSProperties["-moz-outline-radius"].invalid_values.push("unset 2px", "unset / 2px", "2px unset", "2px / unset");
-  gCSSProperties["-moz-outline-radius-bottomleft"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["-moz-outline-radius-bottomright"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["-moz-outline-radius-topleft"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["-moz-outline-radius-topright"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["background-image"].invalid_values.push("linear-gradient(unset, 10px 10px, from(blue))", "linear-gradient(unset, 10px 10px, blue 0)", "repeating-linear-gradient(unset, 10px 10px, blue 0)");
-  gCSSProperties["box-shadow"].invalid_values.push("unset, 2px 2px", "2px 2px, unset", "inset unset");
-  gCSSProperties["text-overflow"].invalid_values.push('"hello" unset', 'unset "hello"', 'clip unset', 'unset clip', 'unset inherit', 'unset none', 'initial unset');
-  gCSSProperties["text-shadow"].invalid_values.push("unset, 2px 2px", "2px 2px, unset");
-  gCSSProperties["transition"].invalid_values.push("2s unset");
-  gCSSProperties["transition-property"].invalid_values.push("unset, color", "color, unset");
-  if (IsCSSPropertyPrefEnabled("layout.css.filters.enabled")) {
-    gCSSProperties["filter"].invalid_values.push("drop-shadow(unset, 2px 2px)", "drop-shadow(2px 2px, unset)");
-  }
-  if (IsCSSPropertyPrefEnabled("layout.css.prefixes.gradients")) {
-    gCSSProperties["background-image"].invalid_values.push(
-      "-moz-linear-gradient(unset, 10px 10px, from(blue))",
-      "-moz-linear-gradient(unset, 10px 10px, blue 0)",
-      "-moz-repeating-linear-gradient(unset, 10px 10px, blue 0)",
-    );
-  }
-}
-
 if (IsCSSPropertyPrefEnabled("layout.css.text-align-unsafe-value.enabled")) {
   gCSSProperties["text-align"].other_values.push("true left");
 } else {
@@ -8332,4 +8260,84 @@ if (false) {
     other_values: [ "green", "#fc3" ],
     invalid_values: [ "000000", "ff00ff" ]
   };
+
+  gCSSProperties["-moz-border-bottom-colors"] = {
+    domProp: "MozBorderBottomColors",
+    inherited: false,
+    type: CSS_TYPE_LONGHAND,
+    applies_to_first_letter: true,
+    initial_values: [ "none" ],
+    other_values: [ "red green", "red #fc3", "#ff00cc", "currentColor", "blue currentColor orange currentColor" ],
+    invalid_values: [ "red none", "red inherit", "red, green", "none red", "inherit red", "ff00cc" ]
+  };
+
+  gCSSProperties["-moz-border-left-colors"] = {
+    domProp: "MozBorderLeftColors",
+    inherited: false,
+    type: CSS_TYPE_LONGHAND,
+    applies_to_first_letter: true,
+    initial_values: [ "none" ],
+    other_values: [ "red green", "red #fc3", "#ff00cc", "currentColor", "blue currentColor orange currentColor" ],
+    invalid_values: [ "red none", "red inherit", "red, green", "none red", "inherit red", "ff00cc" ]
+  };
+
+  gCSSProperties["-moz-border-right-colors"] = {
+    domProp: "MozBorderRightColors",
+    inherited: false,
+    type: CSS_TYPE_LONGHAND,
+    applies_to_first_letter: true,
+    initial_values: [ "none" ],
+    other_values: [ "red green", "red #fc3", "#ff00cc", "currentColor", "blue currentColor orange currentColor" ],
+    invalid_values: [ "red none", "red inherit", "red, green", "none red", "inherit red", "ff00cc" ]
+  };
+
+  gCSSProperties["-moz-border-top-colors"] = {
+    domProp: "MozBorderTopColors",
+    inherited: false,
+    type: CSS_TYPE_LONGHAND,
+    applies_to_first_letter: true,
+    initial_values: [ "none" ],
+    other_values: [ "red green", "red #fc3", "#ff00cc", "currentColor", "blue currentColor orange currentColor" ],
+    invalid_values: [ "red none", "red inherit", "red, green", "none red", "inherit red", "ff00cc" ]
+  };
+}
+
+if (IsCSSPropertyPrefEnabled("layout.css.unset-value.enabled")) {
+  gCSSProperties["animation"].invalid_values.push("2s unset");
+  gCSSProperties["animation-direction"].invalid_values.push("normal, unset", "unset, normal");
+  gCSSProperties["animation-name"].invalid_values.push("bounce, unset", "unset, bounce");
+  if (gCSSProperties["-moz-border-bottom-colors"])
+    gCSSProperties["-moz-border-bottom-colors"].invalid_values.push("red unset", "unset red");
+  if (gCSSProperties["-moz-border-left-colors"])
+    gCSSProperties["-moz-border-left-colors"].invalid_values.push("red unset", "unset red");
+  if (gCSSProperties["-moz-border-right-colors"])
+    gCSSProperties["-moz-border-right-colors"].invalid_values.push("red unset", "unset red");
+  if (gCSSProperties["-moz-border-top-colors"])
+    gCSSProperties["-moz-border-top-colors"].invalid_values.push("red unset", "unset red");
+  gCSSProperties["border-radius"].invalid_values.push("unset 2px", "unset / 2px", "2px unset", "2px / unset");
+  gCSSProperties["border-bottom-left-radius"].invalid_values.push("unset 2px", "2px unset");
+  gCSSProperties["border-bottom-right-radius"].invalid_values.push("unset 2px", "2px unset");
+  gCSSProperties["border-top-left-radius"].invalid_values.push("unset 2px", "2px unset");
+  gCSSProperties["border-top-right-radius"].invalid_values.push("unset 2px", "2px unset");
+  gCSSProperties["-moz-outline-radius"].invalid_values.push("unset 2px", "unset / 2px", "2px unset", "2px / unset");
+  gCSSProperties["-moz-outline-radius-bottomleft"].invalid_values.push("unset 2px", "2px unset");
+  gCSSProperties["-moz-outline-radius-bottomright"].invalid_values.push("unset 2px", "2px unset");
+  gCSSProperties["-moz-outline-radius-topleft"].invalid_values.push("unset 2px", "2px unset");
+  gCSSProperties["-moz-outline-radius-topright"].invalid_values.push("unset 2px", "2px unset");
+  gCSSProperties["background-image"].invalid_values.push("linear-gradient(unset, 10px 10px, from(blue))", "linear-gradient(unset, 10px 10px, blue 0)", "repeating-linear-gradient(unset, 10px 10px, blue 0)");
+  gCSSProperties["box-shadow"].invalid_values.push("unset, 2px 2px", "2px 2px, unset", "inset unset");
+  gCSSProperties["text-overflow"].invalid_values.push('"hello" unset', 'unset "hello"', 'clip unset', 'unset clip', 'unset inherit', 'unset none', 'initial unset');
+  gCSSProperties["text-shadow"].invalid_values.push("unset, 2px 2px", "2px 2px, unset");
+  gCSSProperties["transition"].invalid_values.push("2s unset");
+  gCSSProperties["transition-property"].invalid_values.push("unset, color", "color, unset");
+  if (IsCSSPropertyPrefEnabled("layout.css.filters.enabled")) {
+    gCSSProperties["filter"].invalid_values.push("drop-shadow(unset, 2px 2px)", "drop-shadow(2px 2px, unset)");
+  }
+  if (IsCSSPropertyPrefEnabled("layout.css.prefixes.gradients")) {
+    gCSSProperties["background-image"].invalid_values.push(
+      "-moz-linear-gradient(unset, 10px 10px, from(blue))",
+      "-moz-linear-gradient(unset, 10px 10px, blue 0)",
+      "-moz-repeating-linear-gradient(unset, 10px 10px, blue 0)",
+    );
+  }
 }
diff --git a/layout/style/test/test_dont_use_document_colors.html b/layout/style/test/test_dont_use_document_colors.html
index d6ba04fb13f0..bb7da119c17d 100644
--- a/layout/style/test/test_dont_use_document_colors.html
+++ b/layout/style/test/test_dont_use_document_colors.html
@@ -13,10 +13,6 @@
   #five, #six {border: thick solid red; border-inline-start-color:green; border-inline-end-color:blue}
   #seven {
     border: 3px solid;
-    -moz-border-top-colors: blue aqua fuchsia;
-    -moz-border-right-colors: aqua blue fuchsia;
-    -moz-border-bottom-colors: blue fuchsia aqua;
-    -moz-border-left-colors: fuchsia blue blue;
   }
 
   /* XXX also test rgba() */
@@ -107,14 +103,6 @@ function part1()
           "border-inline-start-color applies");
     isnot(cs6.borderLeftColor, cs2.borderLeftColor,
           "border-inline-end-color applies");
-    isnot(cs7.MozBorderTopColors, cs2.MozBorderTopColors,
-          "-moz-border-top-colors applies");
-    isnot(cs7.MozBorderRightColors, cs2.MozBorderRightColors,
-          "-moz-border-right-colors applies");
-    isnot(cs7.MozBorderBottomColors, cs2.MozBorderBottomColors,
-          "-moz-border-bottom-colors applies");
-    isnot(cs7.MozBorderLeftColors, cs2.MozBorderLeftColors,
-          "-moz-border-left-colors applies");
     is(cs1.color, cs3.color, "color applies");
     is(cs1.backgroundColor, cs3.backgroundColor, "background-color applies");
     isnot(cs3.backgroundColor, cs4.backgroundColor, "background-color applies");
@@ -154,14 +142,6 @@ function part2()
        "border-inline-start-color is blocked");
     is(cs6.borderLeftColor, cs2.borderLeftColor,
        "border-inline-end-color is blocked");
-    is(cs7.MozBorderTopColors, cs2.MozBorderTopColors,
-       "-moz-border-top-colors is blocked");
-    is(cs7.MozBorderRightColors, cs2.MozBorderRightColors,
-       "-moz-border-right-colors is blocked");
-    is(cs7.MozBorderBottomColors, cs2.MozBorderBottomColors,
-       "-moz-border-bottom-colors is blocked");
-    is(cs7.MozBorderLeftColors, cs2.MozBorderLeftColors,
-       "-moz-border-left-colors is blocked");
     is(cs1.borderBottomColor, cs2.borderBottomColor,
        "border-bottom-color is blocked");
     is(cs1.MozColumnRuleColor, cs2.MozColumnRuleColor,
diff --git a/layout/style/test/test_shorthand_property_getters.html b/layout/style/test/test_shorthand_property_getters.html
index 13ee14036190..593cba54bc48 100644
--- a/layout/style/test/test_shorthand_property_getters.html
+++ b/layout/style/test/test_shorthand_property_getters.html
@@ -21,7 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=376075
 
 var e = document.getElementById("display");
 
-var borderExtras = ";-moz-border-top-colors: none; -moz-border-right-colors: none; -moz-border-bottom-colors: none; -moz-border-left-colors: none; border-image: none";
+var borderExtras = "; border-image: none";
 
 // Test that we only serialize the 'border' shorthand when appropriate.
 e.setAttribute("style", "border-left: medium solid blue; border-right: medium solid blue; border-top: medium blue solid; border-bottom: blue medium solid" + borderExtras);
@@ -233,7 +233,7 @@ e.setAttribute("style", "animation-name: bounce, roll; animation-duration: 1s, 2
 is(e.style.animation, "", "should not have animation shorthand (lists different lengths)");
 
 // Check that the 'border' shorthand resets 'border-image' and
-// '-moz-border-*-colors', but that other 'border-*' shorthands don't
+// but that other 'border-*' shorthands don't
 // (bug 482692).
 e.setAttribute("style", 'border-image: url("foo.png") 5 5 5 5 / 5 5 5 5 / 5 5 5 5 repeat repeat; border-left: medium solid green');
 is(e.style.cssText,
@@ -243,14 +243,6 @@ e.setAttribute("style", 'border-image: url("foo.png") 5 5 5 5; border: medium so
 is(e.style.cssText,
    'border: medium solid green;',
    "border DOES reset border-image");
-e.setAttribute("style", '-moz-border-left-colors: fuchsia blue; border-left: medium solid green');
-is(e.style.cssText,
-   '-moz-border-left-colors: fuchsia blue; border-left: medium solid green;',
-   "border-left does NOT reset -moz-border-left-colors");
-e.setAttribute("style", '-moz-border-left-colors: fuchsia blue; border: medium solid green');
-is(e.style.cssText,
-   'border: medium solid green;',
-   "border DOES reset -moz-border-left-colors");
 
 // Test that the color goes at the beginning of the last item of the
 // background shorthand.
diff --git a/layout/tools/reftest/jar.mn b/layout/tools/reftest/jar.mn
index 440bf57f453d..c9761df79045 100644
--- a/layout/tools/reftest/jar.mn
+++ b/layout/tools/reftest/jar.mn
@@ -6,6 +6,7 @@ reftest.jar:
   content/httpd.jsm (../../../netwerk/test/httpserver/httpd.js)
   content/StructuredLog.jsm (../../../testing/modules/StructuredLog.jsm)
   content/input.css (../../../editor/reftests/xul/input.css)
+  content/progress.css (../../../layout/reftests/forms/progress/style.css)
 *  content/manifest.jsm (manifest.jsm)
 *  content/reftest.jsm (reftest.jsm)
   content/reftest.xul (reftest.xul)
diff --git a/widget/reftests/progressbar-fallback-default-style-ref.html b/widget/reftests/progressbar-fallback-default-style-ref.html
index 5de4274ecb5b..94439caf5f10 100644
--- a/widget/reftests/progressbar-fallback-default-style-ref.html
+++ b/widget/reftests/progressbar-fallback-default-style-ref.html
@@ -1,40 +1,7 @@
 <!DOCTYPE html>
 <html>
+  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
   <style>
-    div.progress-element {
-      /**
-       * The purpose of this test is to not show the native style.
-       * -moz-appearance: progressbar;
-       */
-      display: inline-block;
-      height: 1em;
-      width: 10em;
-      vertical-align: -0.2em;
-
-      /* Default style in case of there is -moz-appearance: none; */
-      border: 2px solid;
-      -moz-border-top-colors: ThreeDShadow #e6e6e6;
-      -moz-border-right-colors: ThreeDHighlight #e6e6e6;
-      -moz-border-bottom-colors: ThreeDHighlight #e6e6e6;
-      -moz-border-left-colors: ThreeDShadow #e6e6e6;
-      background-color: #e6e6e6;
-    }
-
-    div.progress-bar {
-      /**
-       * The purpose of this test is to not show the native style.
-       * -moz-appearance: progresschunk;
-       */
-
-      height: 100%;
-      width: 100%;
-
-      box-sizing: border-box;
-
-      /* Default style in case of there is -moz-appearance: none; */
-      background-color: #0064b4;
-    }
-
     div.progress-element { padding: 5px; }
     body > div:nth-child(1)  { -moz-appearance: none; }
     body > div:nth-child(2) > .progress-bar { -moz-appearance: none; }

From 2b97da363fadac7a3b2ae6696a3ea818d61dbef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 29 Nov 2017 11:34:31 +0100
Subject: [PATCH 070/219] Bug 1417200: Stop using -moz-border-*-colors in
 forms.css. r=xidorn

On a CLOSED TREE, since the servo patch got in.

This removes one px of "padding" in:

 <progress style="-moz-appearance: none"></progress>

But it'd be worse to not be able as an author to override those somehow.

MozReview-Commit-ID: EFZIBHaUskM
---
 layout/reftests/forms/progress/style.css | 8 +++-----
 layout/style/res/forms.css               | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/layout/reftests/forms/progress/style.css b/layout/reftests/forms/progress/style.css
index 025bde8f8611..fe3bc80389d8 100644
--- a/layout/reftests/forms/progress/style.css
+++ b/layout/reftests/forms/progress/style.css
@@ -6,11 +6,9 @@ div.progress-element {
   vertical-align: -0.2em;
 
   /* Default style in case of there is -moz-appearance: none; */
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow #e6e6e6;
-  -moz-border-right-colors: ThreeDHighlight #e6e6e6;
-  -moz-border-bottom-colors: ThreeDHighlight #e6e6e6;
-  -moz-border-left-colors: ThreeDShadow #e6e6e6;
+  border: 1px solid ThreeDShadow;
+  border-right-color: ThreeDHighlight;
+  border-bottom-color: ThreeDHighlight;
   background-color: #e6e6e6;
 }
 
diff --git a/layout/style/res/forms.css b/layout/style/res/forms.css
index dc6006f6d055..c4e7ff49be31 100644
--- a/layout/style/res/forms.css
+++ b/layout/style/res/forms.css
@@ -839,12 +839,10 @@ progress {
   vertical-align: -0.2em;
 
   /* Default style in case of there is -moz-appearance: none; */
-  border: 2px solid;
+  border: 1px solid ThreeDShadow;
+  border-right-color: ThreeDHighlight;
+  border-bottom-color: ThreeDHighlight;
   /* #e6e6e6 is a light gray. */
-  -moz-border-top-colors: ThreeDShadow #e6e6e6;
-  -moz-border-right-colors: ThreeDHighlight #e6e6e6;
-  -moz-border-bottom-colors: ThreeDHighlight #e6e6e6;
-  -moz-border-left-colors: ThreeDShadow #e6e6e6;
   background-color: #e6e6e6;
 }
 

From e07748b33cd4d795367034bc239d3a64a6a19aac Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Sat, 2 Dec 2017 00:33:41 +0200
Subject: [PATCH 071/219] Backed out changeset 3aff028846c0 (bug 1422106) for
 failing syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js and
 browser-chrome's
 browser/components/customizableui/test/browser_synced_tabs_menu.js r=backout
 on a CLOSED TREE

--HG--
extra : rebase_source : ec98a160ef77f13abc4b067f8836e290e3b11e21
---
 browser/base/content/browser-menubar.inc              |  7 +------
 browser/base/content/browser-sets.inc                 |  1 -
 browser/base/content/browser-sync.js                  |  6 ++----
 browser/base/content/test/sync/browser_sync.js        |  9 ++++-----
 .../components/customizableui/content/panelUI.inc.xul | 11 -----------
 .../customizableui/test/browser_synced_tabs_menu.js   |  7 -------
 .../components/syncedtabs/SyncedTabsDeckComponent.js  |  6 +-----
 browser/components/syncedtabs/sidebar.xhtml           |  5 -----
 .../test/browser/browser_sidebar_syncedtabslist.js    |  6 ------
 browser/locales/en-US/chrome/browser/browser.dtd      |  2 --
 .../browser/browser_BrowserUITelemetry_syncedtabs.js  |  2 --
 browser/themes/shared/customizableui/panelUI.inc.css  |  1 -
 12 files changed, 8 insertions(+), 55 deletions(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index dab38488c671..e818cdfafcbe 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -477,17 +477,12 @@
                         key="key_openAddons"
                         command="Tools:Addons"/>
 
-              <!-- only one of sync-setup, sync-unverifieditem, sync-syncnowitem or sync-reauthitem will be showing at once -->
+              <!-- only one of sync-setup, sync-syncnowitem or sync-reauthitem will be showing at once -->
               <menuitem id="sync-setup"
                         label="&syncSignIn.label;"
                         accesskey="&syncSignIn.accesskey;"
                         observes="sync-setup-state"
                         oncommand="gSync.openPrefs('menubar')"/>
-              <menuitem id="sync-unverifieditem"
-                        label="&syncSignIn.label;"
-                        accesskey="&syncSignIn.accesskey;"
-                        observes="sync-unverified-state"
-                        oncommand="gSync.openPrefs('menubar')"/>
               <menuitem id="sync-syncnowitem"
                         label="&syncSyncNowItem.label;"
                         accesskey="&syncSyncNowItem.accesskey;"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 113121b92182..6ab1eb63a844 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -166,7 +166,6 @@
     <!-- broadcasters of the "hidden" attribute to reflect setup state for
          menus -->
     <broadcaster id="sync-setup-state"/>
-    <broadcaster id="sync-unverified-state" hidden="true"/>
     <broadcaster id="sync-syncnow-state" hidden="true"/>
     <broadcaster id="sync-reauth-state" hidden="true"/>
     <broadcaster id="viewTabsSidebar" autoCheck="false" sidebartitle="&syncedTabs.sidebar.label;"
diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js
index e5bbd01565d2..f1e3a2793c92 100644
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -218,15 +218,13 @@ var gSync = {
     document.getElementById("sync-reauth-state").hidden = true;
     document.getElementById("sync-setup-state").hidden = true;
     document.getElementById("sync-syncnow-state").hidden = true;
-    document.getElementById("sync-unverified-state").hidden = true;
 
     if (status == UIState.STATUS_LOGIN_FAILED) {
       // unhiding this element makes the menubar show the login failure state.
       document.getElementById("sync-reauth-state").hidden = false;
-    } else if (status == UIState.STATUS_NOT_CONFIGURED) {
+    } else if (status == UIState.STATUS_NOT_CONFIGURED ||
+               status == UIState.STATUS_NOT_VERIFIED) {
       document.getElementById("sync-setup-state").hidden = false;
-    } else if (status == UIState.STATUS_NOT_VERIFIED) {
-      document.getElementById("sync-unverified-state").hidden = false;
     } else {
       document.getElementById("sync-syncnow-state").hidden = false;
     }
diff --git a/browser/base/content/test/sync/browser_sync.js b/browser/base/content/test/sync/browser_sync.js
index bb58a6e8eba0..7cb870fa91b2 100644
--- a/browser/base/content/test/sync/browser_sync.js
+++ b/browser/base/content/test/sync/browser_sync.js
@@ -108,8 +108,8 @@ add_task(async function test_ui_state_unverified() {
     syncing: false,
     syncNowTooltip: tooltipText
   });
-  checkRemoteTabsPanel("PanelUI-remotetabs-unverified", false);
-  checkMenuBarItem("sync-unverifieditem");
+  checkRemoteTabsPanel("PanelUI-remotetabs-setupsync", false);
+  checkMenuBarItem("sync-setup");
 });
 
 add_task(async function test_ui_state_loginFailed() {
@@ -176,8 +176,7 @@ function checkPanelUIStatusBar({label, tooltip, fxastatus, avatarURL, syncing, s
 function checkRemoteTabsPanel(expectedShownItemId, syncing, syncNowTooltip) {
   checkItemsVisiblities(["PanelUI-remotetabs-main",
                          "PanelUI-remotetabs-setupsync",
-                         "PanelUI-remotetabs-reauthsync",
-                         "PanelUI-remotetabs-unverified"],
+                         "PanelUI-remotetabs-reauthsync"],
                         expectedShownItemId);
 
   if (syncing != undefined && syncNowTooltip != undefined) {
@@ -186,7 +185,7 @@ function checkRemoteTabsPanel(expectedShownItemId, syncing, syncNowTooltip) {
 }
 
 function checkMenuBarItem(expectedShownItemId) {
-  checkItemsVisiblities(["sync-setup", "sync-syncnowitem", "sync-reauthitem", "sync-unverifieditem"],
+  checkItemsVisiblities(["sync-setup", "sync-syncnowitem", "sync-reauthitem"],
                         expectedShownItemId);
 }
 
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index c2c7141ddcff..54d2587b1586 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -491,17 +491,6 @@
                            label="&appMenuRemoteTabs.signin.label;"
                            oncommand="gSync.openPrefs('synced-tabs');"/>
           </vbox>
-          <vbox id="PanelUI-remotetabs-unverified"
-                flex="1"
-                align="center"
-                class="PanelUI-remotetabs-instruction-box"
-                observes="sync-unverified-state">
-            <image class="fxaSyncIllustrationIssue"/>
-            <label class="PanelUI-remotetabs-instruction-label">&appMenuRemoteTabs.unverified.label;</label>
-            <toolbarbutton class="PanelUI-remotetabs-prefs-button"
-                           label="&appMenuRemoteTabs.signin.label;"
-                           oncommand="gSync.openPrefs('synced-tabs');"/>
-          </vbox>
         </hbox>
       </vbox>
     </panelview>
diff --git a/browser/components/customizableui/test/browser_synced_tabs_menu.js b/browser/components/customizableui/test/browser_synced_tabs_menu.js
index 132e14381f63..be4be0f87d86 100644
--- a/browser/components/customizableui/test/browser_synced_tabs_menu.js
+++ b/browser/components/customizableui/test/browser_synced_tabs_menu.js
@@ -139,13 +139,6 @@ add_task(async function() {
 });
 add_task(asyncCleanup);
 
-// When Sync is configured in an unverified state.
-add_task(async function() {
-  gSync.updateAllUI({ status: UIState.STATUS_NOT_VERIFIED, email: "foo@bar.com" });
-  await openPrefsFromMenuPanel("PanelUI-remotetabs-unverified", "synced-tabs");
-});
-add_task(asyncCleanup);
-
 // When Sync is configured in a "needs reauthentication" state.
 add_task(async function() {
   gSync.updateAllUI({ status: UIState.STATUS_LOGIN_FAILED, email: "foo@bar.com" });
diff --git a/browser/components/syncedtabs/SyncedTabsDeckComponent.js b/browser/components/syncedtabs/SyncedTabsDeckComponent.js
index 5115c54124fa..7701a40e957f 100644
--- a/browser/components/syncedtabs/SyncedTabsDeckComponent.js
+++ b/browser/components/syncedtabs/SyncedTabsDeckComponent.js
@@ -63,7 +63,6 @@ SyncedTabsDeckComponent.prototype = {
     NOT_AUTHED_INFO: "notAuthedInfo",
     SINGLE_DEVICE_INFO: "singleDeviceInfo",
     TABS_DISABLED: "tabs-disabled",
-    UNVERIFIED: "unverified"
   },
 
   get container() {
@@ -122,12 +121,9 @@ SyncedTabsDeckComponent.prototype = {
 
   getPanelStatus() {
     return this._getSignedInUser().then(user => {
-      if (!user || this._SyncedTabs.loginFailed) {
+      if (!user || !user.verified || this._SyncedTabs.loginFailed) {
         return this.PANELS.NOT_AUTHED_INFO;
       }
-      if (!user.verified) {
-        return this.PANELS.UNVERIFIED;
-      }
       if (!this._SyncedTabs.isConfiguredToSyncTabs) {
         return this.PANELS.TABS_DISABLED;
       }
diff --git a/browser/components/syncedtabs/sidebar.xhtml b/browser/components/syncedtabs/sidebar.xhtml
index debd1ef0d32d..bea7875121fd 100644
--- a/browser/components/syncedtabs/sidebar.xhtml
+++ b/browser/components/syncedtabs/sidebar.xhtml
@@ -80,11 +80,6 @@
           <p class="instructions">&syncedTabs.sidebar.notsignedin.label;</p>
           <button class="button sync-prefs">&fxaSignIn.label;</button>
         </div>
-        <div class="unverified sync-state">
-          <div class="syncIllustration"></div>
-          <p class="instructions">&syncedTabs.sidebar.unverified.label;</p>
-          <button class="button sync-prefs">&syncedTabs.sidebar.openprefs.label;</button>
-        </div>
         <div class="singleDeviceInfo sync-state">
           <div class="syncIllustrationIssue"></div>
           <p class="instructions">&syncedTabs.sidebar.noclients.subtitle;</p>
diff --git a/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js b/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
index fcd278f89f74..fc492893d5ed 100644
--- a/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
+++ b/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
@@ -228,12 +228,6 @@ add_task(async function testSyncedTabsSidebarStatus() {
   Assert.ok(selectedPanel.classList.contains("notAuthedInfo"),
     "not-authed panel is selected");
 
-  account = {verified: false};
-  await syncedTabsDeckComponent.updatePanel();
-  selectedPanel = syncedTabsDeckComponent.container.querySelector(".sync-state.selected");
-  Assert.ok(selectedPanel.classList.contains("unverified"),
-    "unverified panel is selected");
-
   account = {verified: true};
   await syncedTabsDeckComponent.updatePanel();
   selectedPanel = syncedTabsDeckComponent.container.querySelector(".sync-state.selected");
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index ca57bfe3e478..7f677278158a 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -381,7 +381,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY appMenuRemoteTabs.noclients.subtitle "Want to see your tabs from other devices here?">
 <!ENTITY appMenuRemoteTabs.openprefs.label "Sync Preferences">
 <!ENTITY appMenuRemoteTabs.notsignedin.label "Sign in to view a list of tabs from your other devices.">
-<!ENTITY appMenuRemoteTabs.unverified.label "Your account needs to be verified.">
 <!ENTITY appMenuRemoteTabs.signin.label "Sign in to Sync">
 <!ENTITY appMenuRemoteTabs.managedevices.label "Manage Devices…">
 <!ENTITY appMenuRemoteTabs.sidebar.label "View Synced Tabs Sidebar">
@@ -795,7 +794,6 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY syncedTabs.sidebar.noclients.label    "Sign in to Firefox from your other devices to view their tabs here.">
 <!ENTITY syncedTabs.sidebar.noclients.subtitle "Want to see your tabs from other devices here?">
 <!ENTITY syncedTabs.sidebar.notsignedin.label  "Sign in to view a list of tabs from your other devices.">
-<!ENTITY syncedTabs.sidebar.unverified.label   "Your account needs to be verified.">
 <!ENTITY syncedTabs.sidebar.notabs.label       "No open tabs">
 <!ENTITY syncedTabs.sidebar.openprefs.label    "Open &syncBrand.shortName.label; Preferences">
 <!-- LOCALIZATION NOTE (syncedTabs.sidebar.tabsnotsyncing.label): This is shown
diff --git a/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js b/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
index 7003089c0340..f90eb3e88dcb 100644
--- a/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
+++ b/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
@@ -36,7 +36,6 @@ function mockSyncedTabs() {
   // configure our broadcasters so we are in the right state.
   document.getElementById("sync-reauth-state").hidden = true;
   document.getElementById("sync-setup-state").hidden = true;
-  document.getElementById("sync-unverified-state").hidden = true;
   document.getElementById("sync-syncnow-state").hidden = false;
 
   registerCleanupFunction(() => {
@@ -44,7 +43,6 @@ function mockSyncedTabs() {
 
     document.getElementById("sync-reauth-state").hidden = true;
     document.getElementById("sync-setup-state").hidden = false;
-    document.getElementById("sync-unverified-state").hidden = true;
     document.getElementById("sync-syncnow-state").hidden = true;
   });
 }
diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css
index a97eef9b80c3..1505ccd73383 100644
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -718,7 +718,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton
 */
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-reauthsync,
-#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-unverified,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-nodevicespane,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-tabsdisabledpane {
   min-height: calc(var(--panel-ui-sync-illustration-height) +

From 44a0ff57f621fd6941abd5adea44ea4adc4bfc99 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Fri, 1 Dec 2017 17:59:05 +0100
Subject: [PATCH 072/219] Bug 1408937 - enable
 browser_webconsole_external_script_errors.js;r=bgrins

MozReview-Commit-ID: 4GcSKa2ph4j

--HG--
rename : devtools/client/webconsole/new-console-output/test/mochitest/test-bug-597136-external-script-errors.html => devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.html
rename : devtools/client/webconsole/new-console-output/test/mochitest/test-bug-597136-external-script-errors.js => devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.js
extra : rebase_source : 5b85c8d3991ef95e59b48352e6080adf9e169090
---
 .../test/mochitest/browser.ini                |  5 +--
 ...owser_webconsole_external_script_errors.js | 38 ++++++++-----------
 ....html => test-external-script-errors.html} |  2 +-
 ...rors.js => test-external-script-errors.js} |  0
 4 files changed, 18 insertions(+), 27 deletions(-)
 rename devtools/client/webconsole/new-console-output/test/mochitest/{test-bug-597136-external-script-errors.html => test-external-script-errors.html} (89%)
 rename devtools/client/webconsole/new-console-output/test/mochitest/{test-bug-597136-external-script-errors.js => test-external-script-errors.js} (100%)

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
index 62a7e6e911ee..2dea2ce9dda7 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -49,8 +49,6 @@ support-files =
   test-bug-595934-svg.xhtml
   test-bug-595934-workers.html
   test-bug-595934-workers.js
-  test-bug-597136-external-script-errors.html
-  test-bug-597136-external-script-errors.js
   test-bug-599725-response-headers.sjs
   test-bug-601177-log-levels.html
   test-bug-601177-log-levels.js
@@ -121,6 +119,8 @@ support-files =
   test-error.html
   test-eval-in-stackframe.html
   test-exception-stackframe.html
+  test-external-script-errors.html
+  test-external-script-errors.js
   test-file-location.js
   test-filter.html
   test-for-of.html
@@ -281,7 +281,6 @@ skip-if = true # Bug 1408893
 [browser_webconsole_execution_scope.js]
 skip-if = true #	Bug 1405333
 [browser_webconsole_external_script_errors.js]
-skip-if = true # Bug 1408937
 [browser_webconsole_file_uri.js]
 skip-if = true #	Bug 1404382
 [browser_webconsole_filter_scroll.js]
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js
index 9e413e41615d..b31db15627d6 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js
@@ -7,29 +7,21 @@
 
 // See Bug 597136.
 
-const TEST_URI = "http://example.com/browser/devtools/client/" +
-                 "webconsole/test/test-bug-597136-external-script-" +
-                 "errors.html";
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
+                 "new-console-output/test/mochitest/test-external-script-errors.html";
 
-function test() {
-  Task.spawn(function* () {
-    const {tab} = yield loadTab(TEST_URI);
-    const hud = yield openConsole(tab);
+add_task(async function () {
+  // On e10s, the exception is triggered in child process
+  // and is ignored by test harness
+  if (!Services.appinfo.browserTabsRemoteAutostart) {
+    expectUncaughtException();
+  }
 
-    // On e10s, the exception is triggered in child process
-    // and is ignored by test harness
-    if (!Services.appinfo.browserTabsRemoteAutostart) {
-      expectUncaughtException();
-    }
-    BrowserTestUtils.synthesizeMouseAtCenter("button", {}, gBrowser.selectedBrowser);
+  let hud = await openNewTabAndConsole(TEST_URI);
 
-    yield waitForMessages({
-      webconsole: hud,
-      messages: [{
-        text: "bogus is not defined",
-        category: CATEGORY_JS,
-        severity: SEVERITY_ERROR,
-      }],
-    });
-  }).then(finishTest);
-}
+  let onMessage = waitForMessage(hud, "bogus is not defined");
+  BrowserTestUtils.synthesizeMouseAtCenter("button", {}, gBrowser.selectedBrowser);
+  await onMessage;
+
+  ok(true, "Received the expected message");
+});
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-597136-external-script-errors.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.html
similarity index 89%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-597136-external-script-errors.html
rename to devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.html
index 25bdeecc5237..dbf846fcaaaa 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-597136-external-script-errors.html
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.html
@@ -19,7 +19,7 @@
     <p><button onclick="f()">Click me</button</p>
 
     <script type="text/javascript"
-      src="test-bug-597136-external-script-errors.js"></script>
+      src="test-external-script-errors.js"></script>
   </body>
 </html>
 
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-597136-external-script-errors.js b/devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-597136-external-script-errors.js
rename to devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.js

From 689bddee1283c9aa53cf63d7e1accedcc32426d5 Mon Sep 17 00:00:00 2001
From: Gabriele Svelto <gsvelto@mozilla.com>
Date: Fri, 1 Dec 2017 15:11:21 +0100
Subject: [PATCH 073/219] Bug 1421874 - Fix SessionStore to include
 AppConstants before using it; r=sebastian

MozReview-Commit-ID: IOSHvaOOE19

--HG--
extra : rebase_source : 674a7d486a156187bad7427abdb8a6feadf773a8
---
 mobile/android/components/SessionStore.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/android/components/SessionStore.js b/mobile/android/components/SessionStore.js
index 3c5b077b8d87..7ec914314ff9 100644
--- a/mobile/android/components/SessionStore.js
+++ b/mobile/android/components/SessionStore.js
@@ -8,6 +8,7 @@ const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
+Cu.import("resource://gre/modules/AppConstants.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 

From cd431e85f55813d39bbea27f64314f8069d285ae Mon Sep 17 00:00:00 2001
From: Henrik Skupin <mail@hskupin.info>
Date: Fri, 1 Dec 2017 22:15:44 +0100
Subject: [PATCH 074/219] Bug 1422373 - Re-add Firefox UI safebrowsing tests.
 r=jmaher

MozReview-Commit-ID: 1BitgKPG1JD

--HG--
extra : rebase_source : 3f79d15ef377d0aac546e1227f255fcf0f961ef0
---
 testing/firefox-ui/tests/functional/manifest.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/firefox-ui/tests/functional/manifest.ini b/testing/firefox-ui/tests/functional/manifest.ini
index bc254e96291d..fd9ac0a948d9 100644
--- a/testing/firefox-ui/tests/functional/manifest.ini
+++ b/testing/firefox-ui/tests/functional/manifest.ini
@@ -1,5 +1,6 @@
 [include:keyboard_shortcuts/manifest.ini]
 [include:locationbar/manifest.ini]
 [include:private_browsing/manifest.ini]
+[include:safebrowsing/manifest.ini]
 [include:security/manifest.ini]
 [include:sessionstore/manifest.ini]

From afb8b81041678aaedaf111b0972237c8f2ea8992 Mon Sep 17 00:00:00 2001
From: Edouard Oger <eoger@fastmail.com>
Date: Thu, 30 Nov 2017 16:01:40 -0500
Subject: [PATCH 075/219] Bug 1422106 - Show broken heart when unverified in
 synced tabs sidebar/panel. r=markh

MozReview-Commit-ID: BDTdmcIOHmn

--HG--
extra : rebase_source : 747637f3746356e3da208acc41a3629bd2597e2e
---
 browser/base/content/browser-menubar.inc              |  7 ++++++-
 browser/base/content/browser-sets.inc                 |  1 +
 browser/base/content/browser-sync.js                  |  6 ++++--
 browser/base/content/test/sync/browser_sync.js        |  9 +++++----
 .../components/customizableui/content/panelUI.inc.xul | 11 +++++++++++
 .../customizableui/test/browser_synced_tabs_menu.js   |  7 +++++++
 .../components/syncedtabs/SyncedTabsDeckComponent.js  |  6 +++++-
 browser/components/syncedtabs/sidebar.xhtml           |  5 +++++
 .../test/browser/browser_sidebar_syncedtabslist.js    |  6 ++++++
 .../test/xpcshell/test_SyncedTabsDeckComponent.js     |  2 +-
 browser/locales/en-US/chrome/browser/browser.dtd      |  2 ++
 .../browser/browser_BrowserUITelemetry_syncedtabs.js  |  2 ++
 browser/themes/shared/customizableui/panelUI.inc.css  |  1 +
 13 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index e818cdfafcbe..dab38488c671 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -477,12 +477,17 @@
                         key="key_openAddons"
                         command="Tools:Addons"/>
 
-              <!-- only one of sync-setup, sync-syncnowitem or sync-reauthitem will be showing at once -->
+              <!-- only one of sync-setup, sync-unverifieditem, sync-syncnowitem or sync-reauthitem will be showing at once -->
               <menuitem id="sync-setup"
                         label="&syncSignIn.label;"
                         accesskey="&syncSignIn.accesskey;"
                         observes="sync-setup-state"
                         oncommand="gSync.openPrefs('menubar')"/>
+              <menuitem id="sync-unverifieditem"
+                        label="&syncSignIn.label;"
+                        accesskey="&syncSignIn.accesskey;"
+                        observes="sync-unverified-state"
+                        oncommand="gSync.openPrefs('menubar')"/>
               <menuitem id="sync-syncnowitem"
                         label="&syncSyncNowItem.label;"
                         accesskey="&syncSyncNowItem.accesskey;"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 6ab1eb63a844..113121b92182 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -166,6 +166,7 @@
     <!-- broadcasters of the "hidden" attribute to reflect setup state for
          menus -->
     <broadcaster id="sync-setup-state"/>
+    <broadcaster id="sync-unverified-state" hidden="true"/>
     <broadcaster id="sync-syncnow-state" hidden="true"/>
     <broadcaster id="sync-reauth-state" hidden="true"/>
     <broadcaster id="viewTabsSidebar" autoCheck="false" sidebartitle="&syncedTabs.sidebar.label;"
diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js
index f1e3a2793c92..e5bbd01565d2 100644
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -218,13 +218,15 @@ var gSync = {
     document.getElementById("sync-reauth-state").hidden = true;
     document.getElementById("sync-setup-state").hidden = true;
     document.getElementById("sync-syncnow-state").hidden = true;
+    document.getElementById("sync-unverified-state").hidden = true;
 
     if (status == UIState.STATUS_LOGIN_FAILED) {
       // unhiding this element makes the menubar show the login failure state.
       document.getElementById("sync-reauth-state").hidden = false;
-    } else if (status == UIState.STATUS_NOT_CONFIGURED ||
-               status == UIState.STATUS_NOT_VERIFIED) {
+    } else if (status == UIState.STATUS_NOT_CONFIGURED) {
       document.getElementById("sync-setup-state").hidden = false;
+    } else if (status == UIState.STATUS_NOT_VERIFIED) {
+      document.getElementById("sync-unverified-state").hidden = false;
     } else {
       document.getElementById("sync-syncnow-state").hidden = false;
     }
diff --git a/browser/base/content/test/sync/browser_sync.js b/browser/base/content/test/sync/browser_sync.js
index 7cb870fa91b2..bb58a6e8eba0 100644
--- a/browser/base/content/test/sync/browser_sync.js
+++ b/browser/base/content/test/sync/browser_sync.js
@@ -108,8 +108,8 @@ add_task(async function test_ui_state_unverified() {
     syncing: false,
     syncNowTooltip: tooltipText
   });
-  checkRemoteTabsPanel("PanelUI-remotetabs-setupsync", false);
-  checkMenuBarItem("sync-setup");
+  checkRemoteTabsPanel("PanelUI-remotetabs-unverified", false);
+  checkMenuBarItem("sync-unverifieditem");
 });
 
 add_task(async function test_ui_state_loginFailed() {
@@ -176,7 +176,8 @@ function checkPanelUIStatusBar({label, tooltip, fxastatus, avatarURL, syncing, s
 function checkRemoteTabsPanel(expectedShownItemId, syncing, syncNowTooltip) {
   checkItemsVisiblities(["PanelUI-remotetabs-main",
                          "PanelUI-remotetabs-setupsync",
-                         "PanelUI-remotetabs-reauthsync"],
+                         "PanelUI-remotetabs-reauthsync",
+                         "PanelUI-remotetabs-unverified"],
                         expectedShownItemId);
 
   if (syncing != undefined && syncNowTooltip != undefined) {
@@ -185,7 +186,7 @@ function checkRemoteTabsPanel(expectedShownItemId, syncing, syncNowTooltip) {
 }
 
 function checkMenuBarItem(expectedShownItemId) {
-  checkItemsVisiblities(["sync-setup", "sync-syncnowitem", "sync-reauthitem"],
+  checkItemsVisiblities(["sync-setup", "sync-syncnowitem", "sync-reauthitem", "sync-unverifieditem"],
                         expectedShownItemId);
 }
 
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 54d2587b1586..c2c7141ddcff 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -491,6 +491,17 @@
                            label="&appMenuRemoteTabs.signin.label;"
                            oncommand="gSync.openPrefs('synced-tabs');"/>
           </vbox>
+          <vbox id="PanelUI-remotetabs-unverified"
+                flex="1"
+                align="center"
+                class="PanelUI-remotetabs-instruction-box"
+                observes="sync-unverified-state">
+            <image class="fxaSyncIllustrationIssue"/>
+            <label class="PanelUI-remotetabs-instruction-label">&appMenuRemoteTabs.unverified.label;</label>
+            <toolbarbutton class="PanelUI-remotetabs-prefs-button"
+                           label="&appMenuRemoteTabs.signin.label;"
+                           oncommand="gSync.openPrefs('synced-tabs');"/>
+          </vbox>
         </hbox>
       </vbox>
     </panelview>
diff --git a/browser/components/customizableui/test/browser_synced_tabs_menu.js b/browser/components/customizableui/test/browser_synced_tabs_menu.js
index be4be0f87d86..132e14381f63 100644
--- a/browser/components/customizableui/test/browser_synced_tabs_menu.js
+++ b/browser/components/customizableui/test/browser_synced_tabs_menu.js
@@ -139,6 +139,13 @@ add_task(async function() {
 });
 add_task(asyncCleanup);
 
+// When Sync is configured in an unverified state.
+add_task(async function() {
+  gSync.updateAllUI({ status: UIState.STATUS_NOT_VERIFIED, email: "foo@bar.com" });
+  await openPrefsFromMenuPanel("PanelUI-remotetabs-unverified", "synced-tabs");
+});
+add_task(asyncCleanup);
+
 // When Sync is configured in a "needs reauthentication" state.
 add_task(async function() {
   gSync.updateAllUI({ status: UIState.STATUS_LOGIN_FAILED, email: "foo@bar.com" });
diff --git a/browser/components/syncedtabs/SyncedTabsDeckComponent.js b/browser/components/syncedtabs/SyncedTabsDeckComponent.js
index 7701a40e957f..5115c54124fa 100644
--- a/browser/components/syncedtabs/SyncedTabsDeckComponent.js
+++ b/browser/components/syncedtabs/SyncedTabsDeckComponent.js
@@ -63,6 +63,7 @@ SyncedTabsDeckComponent.prototype = {
     NOT_AUTHED_INFO: "notAuthedInfo",
     SINGLE_DEVICE_INFO: "singleDeviceInfo",
     TABS_DISABLED: "tabs-disabled",
+    UNVERIFIED: "unverified"
   },
 
   get container() {
@@ -121,9 +122,12 @@ SyncedTabsDeckComponent.prototype = {
 
   getPanelStatus() {
     return this._getSignedInUser().then(user => {
-      if (!user || !user.verified || this._SyncedTabs.loginFailed) {
+      if (!user || this._SyncedTabs.loginFailed) {
         return this.PANELS.NOT_AUTHED_INFO;
       }
+      if (!user.verified) {
+        return this.PANELS.UNVERIFIED;
+      }
       if (!this._SyncedTabs.isConfiguredToSyncTabs) {
         return this.PANELS.TABS_DISABLED;
       }
diff --git a/browser/components/syncedtabs/sidebar.xhtml b/browser/components/syncedtabs/sidebar.xhtml
index bea7875121fd..debd1ef0d32d 100644
--- a/browser/components/syncedtabs/sidebar.xhtml
+++ b/browser/components/syncedtabs/sidebar.xhtml
@@ -80,6 +80,11 @@
           <p class="instructions">&syncedTabs.sidebar.notsignedin.label;</p>
           <button class="button sync-prefs">&fxaSignIn.label;</button>
         </div>
+        <div class="unverified sync-state">
+          <div class="syncIllustration"></div>
+          <p class="instructions">&syncedTabs.sidebar.unverified.label;</p>
+          <button class="button sync-prefs">&syncedTabs.sidebar.openprefs.label;</button>
+        </div>
         <div class="singleDeviceInfo sync-state">
           <div class="syncIllustrationIssue"></div>
           <p class="instructions">&syncedTabs.sidebar.noclients.subtitle;</p>
diff --git a/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js b/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
index fc492893d5ed..fcd278f89f74 100644
--- a/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
+++ b/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
@@ -228,6 +228,12 @@ add_task(async function testSyncedTabsSidebarStatus() {
   Assert.ok(selectedPanel.classList.contains("notAuthedInfo"),
     "not-authed panel is selected");
 
+  account = {verified: false};
+  await syncedTabsDeckComponent.updatePanel();
+  selectedPanel = syncedTabsDeckComponent.container.querySelector(".sync-state.selected");
+  Assert.ok(selectedPanel.classList.contains("unverified"),
+    "unverified panel is selected");
+
   account = {verified: true};
   await syncedTabsDeckComponent.updatePanel();
   selectedPanel = syncedTabsDeckComponent.container.querySelector(".sync-state.selected");
diff --git a/browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js b/browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js
index ceef304ada84..8f8a6c43f6e2 100644
--- a/browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js
+++ b/browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js
@@ -159,7 +159,7 @@ add_task(async function testPanelStatus() {
   account = {verified: false};
 
   result = await component.getPanelStatus();
-  Assert.equal(result, component.PANELS.NOT_AUTHED_INFO);
+  Assert.equal(result, component.PANELS.UNVERIFIED);
 
   account = {verified: true};
 
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 7f677278158a..ca57bfe3e478 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -381,6 +381,7 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY appMenuRemoteTabs.noclients.subtitle "Want to see your tabs from other devices here?">
 <!ENTITY appMenuRemoteTabs.openprefs.label "Sync Preferences">
 <!ENTITY appMenuRemoteTabs.notsignedin.label "Sign in to view a list of tabs from your other devices.">
+<!ENTITY appMenuRemoteTabs.unverified.label "Your account needs to be verified.">
 <!ENTITY appMenuRemoteTabs.signin.label "Sign in to Sync">
 <!ENTITY appMenuRemoteTabs.managedevices.label "Manage Devices…">
 <!ENTITY appMenuRemoteTabs.sidebar.label "View Synced Tabs Sidebar">
@@ -794,6 +795,7 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY syncedTabs.sidebar.noclients.label    "Sign in to Firefox from your other devices to view their tabs here.">
 <!ENTITY syncedTabs.sidebar.noclients.subtitle "Want to see your tabs from other devices here?">
 <!ENTITY syncedTabs.sidebar.notsignedin.label  "Sign in to view a list of tabs from your other devices.">
+<!ENTITY syncedTabs.sidebar.unverified.label   "Your account needs to be verified.">
 <!ENTITY syncedTabs.sidebar.notabs.label       "No open tabs">
 <!ENTITY syncedTabs.sidebar.openprefs.label    "Open &syncBrand.shortName.label; Preferences">
 <!-- LOCALIZATION NOTE (syncedTabs.sidebar.tabsnotsyncing.label): This is shown
diff --git a/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js b/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
index f90eb3e88dcb..7003089c0340 100644
--- a/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
+++ b/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
@@ -36,6 +36,7 @@ function mockSyncedTabs() {
   // configure our broadcasters so we are in the right state.
   document.getElementById("sync-reauth-state").hidden = true;
   document.getElementById("sync-setup-state").hidden = true;
+  document.getElementById("sync-unverified-state").hidden = true;
   document.getElementById("sync-syncnow-state").hidden = false;
 
   registerCleanupFunction(() => {
@@ -43,6 +44,7 @@ function mockSyncedTabs() {
 
     document.getElementById("sync-reauth-state").hidden = true;
     document.getElementById("sync-setup-state").hidden = false;
+    document.getElementById("sync-unverified-state").hidden = true;
     document.getElementById("sync-syncnow-state").hidden = true;
   });
 }
diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css
index 1505ccd73383..a97eef9b80c3 100644
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -718,6 +718,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton
 */
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-reauthsync,
+#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-unverified,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-nodevicespane,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-tabsdisabledpane {
   min-height: calc(var(--panel-ui-sync-illustration-height) +

From 6d8177ca1405faf5884e95ccbbd4a743396d8a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 1 Dec 2017 15:14:13 -0600
Subject: [PATCH 076/219] servo: Merge #19453 - style: Add a fast-path for
 GeckoElement::is_root (from emilio:is-root-is-slow); r=upsuper

Source-Repo: https://github.com/servo/servo
Source-Revision: bca8951182dc3608f3d8c6948bcce636f7860529

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : da8b2d4567782e69c382bc63f3d050720e62353c
---
 servo/components/style/gecko/wrapper.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/servo/components/style/gecko/wrapper.rs b/servo/components/style/gecko/wrapper.rs
index 15d3f785b6e2..2babb8664a73 100644
--- a/servo/components/style/gecko/wrapper.rs
+++ b/servo/components/style/gecko/wrapper.rs
@@ -1917,6 +1917,15 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
 
     #[inline]
     fn is_root(&self) -> bool {
+        let parent_node = match self.as_node().parent_node() {
+            Some(parent_node) => parent_node,
+            None => return false,
+        };
+
+        if !parent_node.is_document() {
+            return false;
+        }
+
         unsafe {
             Gecko_IsRootElement(self.0)
         }

From 4b8603c01ca1ad1d905c6434c56f98dae0a2cfa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 1 Dec 2017 16:52:34 -0600
Subject: [PATCH 077/219] servo: Merge #19451 - style: Inline some things that
 should never ever appear in a profile (from emilio:inlining-is-fun);
 r=upsuper

Source-Repo: https://github.com/servo/servo
Source-Revision: f7aa22a87ee2571d3cdb90bfe361b22ba45ddb23

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : cb3fcff96422313c36f06435a585eed84c82d62b
---
 servo/components/style/gecko/wrapper.rs                | 3 +++
 servo/components/style/properties/declaration_block.rs | 8 ++++++--
 servo/components/style/properties/properties.mako.rs   | 7 ++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/servo/components/style/gecko/wrapper.rs b/servo/components/style/gecko/wrapper.rs
index 2babb8664a73..c31b8f9ea8fb 100644
--- a/servo/components/style/gecko/wrapper.rs
+++ b/servo/components/style/gecko/wrapper.rs
@@ -211,6 +211,7 @@ impl<'ln> GeckoNode<'ln> {
 
     /// WARNING: This logic is duplicated in Gecko's FlattenedTreeParentIsParent.
     /// Make sure to mirror any modifications in both places.
+    #[inline]
     fn flattened_tree_parent_is_parent(&self) -> bool {
         use gecko_bindings::structs::*;
         let flags = self.flags();
@@ -236,6 +237,7 @@ impl<'ln> GeckoNode<'ln> {
         true
     }
 
+    #[inline]
     fn flattened_tree_parent(&self) -> Option<Self> {
         let fast_path = self.flattened_tree_parent_is_parent();
         debug_assert!(fast_path == unsafe { bindings::Gecko_FlattenedTreeParentIsParent(self.0) });
@@ -246,6 +248,7 @@ impl<'ln> GeckoNode<'ln> {
         }
     }
 
+    #[inline]
     fn contains_non_whitespace_content(&self) -> bool {
         unsafe { Gecko_IsSignificantChild(self.0, true, false) }
     }
diff --git a/servo/components/style/properties/declaration_block.rs b/servo/components/style/properties/declaration_block.rs
index d26557d5c1bf..f27c2c357ca9 100644
--- a/servo/components/style/properties/declaration_block.rs
+++ b/servo/components/style/properties/declaration_block.rs
@@ -91,7 +91,7 @@ pub struct DeclarationImportanceIterator<'a> {
 }
 
 impl<'a> DeclarationImportanceIterator<'a> {
-    /// Constructor
+    /// Constructor.
     pub fn new(declarations: &'a [PropertyDeclaration], important: &'a SmallBitVec) -> Self {
         DeclarationImportanceIterator {
             iter: declarations.iter().zip(important.iter()),
@@ -102,17 +102,20 @@ impl<'a> DeclarationImportanceIterator<'a> {
 impl<'a> Iterator for DeclarationImportanceIterator<'a> {
     type Item = (&'a PropertyDeclaration, Importance);
 
+    #[inline]
     fn next(&mut self) -> Option<Self::Item> {
         self.iter.next().map(|(decl, important)|
             (decl, if important { Importance::Important } else { Importance::Normal }))
     }
 
+    #[inline]
     fn size_hint(&self) -> (usize, Option<usize>) {
         self.iter.size_hint()
     }
 }
 
 impl<'a> DoubleEndedIterator for DeclarationImportanceIterator<'a> {
+    #[inline(always)]
     fn next_back(&mut self) -> Option<Self::Item> {
         self.iter.next_back().map(|(decl, important)|
             (decl, if important { Importance::Important } else { Importance::Normal }))
@@ -123,7 +126,8 @@ impl<'a> DoubleEndedIterator for DeclarationImportanceIterator<'a> {
 pub struct NormalDeclarationIterator<'a>(DeclarationImportanceIterator<'a>);
 
 impl<'a> NormalDeclarationIterator<'a> {
-    /// Constructor
+    /// Constructor.
+    #[inline]
     pub fn new(declarations: &'a [PropertyDeclaration], important: &'a SmallBitVec) -> Self {
         NormalDeclarationIterator(
             DeclarationImportanceIterator::new(declarations, important)
diff --git a/servo/components/style/properties/properties.mako.rs b/servo/components/style/properties/properties.mako.rs
index 0aa787f4231f..2c01ccedca5b 100644
--- a/servo/components/style/properties/properties.mako.rs
+++ b/servo/components/style/properties/properties.mako.rs
@@ -3129,6 +3129,9 @@ pub fn cascade(
 ) -> Arc<ComputedValues> {
     debug_assert_eq!(parent_style.is_some(), parent_style_ignoring_first_line.is_some());
     let empty = SmallBitVec::new();
+
+    let property_restriction = pseudo.and_then(|p| p.property_restriction());
+
     let iter_declarations = || {
         rule_node.self_and_ancestors().flat_map(|node| {
             let cascade_level = node.cascade_level();
@@ -3142,8 +3145,6 @@ pub fn cascade(
             };
             let node_importance = node.importance();
 
-            let property_restriction = pseudo.and_then(|p| p.property_restriction());
-
             declarations
                 // Yield declarations later in source order (with more precedence) first.
                 .rev()
@@ -3168,6 +3169,7 @@ pub fn cascade(
                 })
         })
     };
+
     apply_declarations(
         device,
         pseudo,
@@ -3187,7 +3189,6 @@ pub fn cascade(
 
 /// NOTE: This function expects the declaration with more priority to appear
 /// first.
-#[allow(unused_mut)] // conditionally compiled code for "position"
 pub fn apply_declarations<'a, F, I>(
     device: &Device,
     pseudo: Option<<&PseudoElement>,

From 01f6a3eed28d8c5c44e57c49693aab6dbf22c169 Mon Sep 17 00:00:00 2001
From: abhinav <abhinav.koppula@gmail.com>
Date: Wed, 29 Nov 2017 09:17:04 +0530
Subject: [PATCH 078/219] Bug 1419367 - NetMonitor: Stop using ImmutableJS in
 sort reducer. r=Honza

MozReview-Commit-ID: BXc9Y350MC

--HG--
extra : rebase_source : aeb89e8f42661bc376b7c6e26a510a1e799c7201
---
 .../client/netmonitor/src/reducers/sort.js    | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/devtools/client/netmonitor/src/reducers/sort.js b/devtools/client/netmonitor/src/reducers/sort.js
index 4c0729fdf732..4578a27be778 100644
--- a/devtools/client/netmonitor/src/reducers/sort.js
+++ b/devtools/client/netmonitor/src/reducers/sort.js
@@ -4,26 +4,27 @@
 
 "use strict";
 
-const I = require("devtools/client/shared/vendor/immutable");
 const { SORT_BY } = require("../constants");
 
-const Sort = I.Record({
-  // null means: sort by "waterfall", but don't highlight the table header
-  type: null,
-  ascending: true,
-});
+function Sort() {
+  return {
+    // null means: sort by "waterfall", but don't highlight the table header
+    type: null,
+    ascending: true,
+  };
+}
 
 function sortReducer(state = new Sort(), action) {
   switch (action.type) {
     case SORT_BY: {
-      return state.withMutations(st => {
-        if (action.sortType == st.type) {
-          st.ascending = !st.ascending;
-        } else {
-          st.type = action.sortType;
-          st.ascending = true;
-        }
-      });
+      state = { ...state };
+      if (action.sortType == state.type) {
+        state.ascending = !state.ascending;
+      } else {
+        state.type = action.sortType;
+        state.ascending = true;
+      }
+      return state;
     }
     default:
       return state;

From e1f486c0389d25feebd55deee30f79c9ca8dcba1 Mon Sep 17 00:00:00 2001
From: Scott Wu <scottcwwu@gmail.com>
Date: Thu, 30 Nov 2017 11:24:44 +0800
Subject: [PATCH 079/219] Bug 1419819 - Remove html|button padding rule from
 common stylesheet. r=jaws

Bug 1413162 added the html|button padding rule intended to normalize the way buttons are styled in preferences, but ended up causing problems for buttons outside of preferences, especially because !important keyword is used. This bug reverts that change.

MozReview-Commit-ID: FFQt2k6mCHE

--HG--
extra : rebase_source : 128c59dd582c1b21aa0aea12addc9ec7d6408ba8
---
 browser/extensions/formautofill/content/manageDialog.css   | 5 +++++
 browser/extensions/formautofill/skin/shared/editDialog.css | 5 +++++
 toolkit/themes/shared/in-content/common.inc.css            | 1 -
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/browser/extensions/formautofill/content/manageDialog.css b/browser/extensions/formautofill/content/manageDialog.css
index a84de1ec5a43..573b6a5aaf87 100644
--- a/browser/extensions/formautofill/content/manageDialog.css
+++ b/browser/extensions/formautofill/content/manageDialog.css
@@ -6,6 +6,11 @@ div {
   display: flex;
 }
 
+button {
+  padding-right: 10px;
+  padding-left: 10px;
+}
+
 fieldset {
   margin: 0;
   padding: 0;
diff --git a/browser/extensions/formautofill/skin/shared/editDialog.css b/browser/extensions/formautofill/skin/shared/editDialog.css
index 0e5b2667f397..8c0877b7902a 100644
--- a/browser/extensions/formautofill/skin/shared/editDialog.css
+++ b/browser/extensions/formautofill/skin/shared/editDialog.css
@@ -37,6 +37,11 @@ textarea {
   resize: none;
 }
 
+button {
+  padding-right: 10px;
+  padding-left: 10px;
+}
+
 input,
 select {
   box-sizing: border-box;
diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index dc439bea1af7..e9cb2c94eab0 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -269,7 +269,6 @@ xul|colorpicker[type="button"] {
   width: 50px;
 }
 
-html|button,
 xul|button > xul|*.button-box,
 xul|menulist > xul|*.menulist-label-box {
   padding-right: 10px !important;

From 171c255f604f4beac37c74f5abe221c2149a4d14 Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Sat, 2 Dec 2017 02:37:38 +0200
Subject: [PATCH 080/219] Backed out changeset 1ca98c1618a6 (bug 1422106) for
 failing browser/components/customizableui/test/browser_synced_tabs_menu.js
 r=backout on a CLOSED TREE

---
 browser/base/content/browser-menubar.inc              |  7 +------
 browser/base/content/browser-sets.inc                 |  1 -
 browser/base/content/browser-sync.js                  |  6 ++----
 browser/base/content/test/sync/browser_sync.js        |  9 ++++-----
 .../components/customizableui/content/panelUI.inc.xul | 11 -----------
 .../customizableui/test/browser_synced_tabs_menu.js   |  7 -------
 .../components/syncedtabs/SyncedTabsDeckComponent.js  |  6 +-----
 browser/components/syncedtabs/sidebar.xhtml           |  5 -----
 .../test/browser/browser_sidebar_syncedtabslist.js    |  6 ------
 .../test/xpcshell/test_SyncedTabsDeckComponent.js     |  2 +-
 browser/locales/en-US/chrome/browser/browser.dtd      |  2 --
 .../browser/browser_BrowserUITelemetry_syncedtabs.js  |  2 --
 browser/themes/shared/customizableui/panelUI.inc.css  |  1 -
 13 files changed, 9 insertions(+), 56 deletions(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index dab38488c671..e818cdfafcbe 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -477,17 +477,12 @@
                         key="key_openAddons"
                         command="Tools:Addons"/>
 
-              <!-- only one of sync-setup, sync-unverifieditem, sync-syncnowitem or sync-reauthitem will be showing at once -->
+              <!-- only one of sync-setup, sync-syncnowitem or sync-reauthitem will be showing at once -->
               <menuitem id="sync-setup"
                         label="&syncSignIn.label;"
                         accesskey="&syncSignIn.accesskey;"
                         observes="sync-setup-state"
                         oncommand="gSync.openPrefs('menubar')"/>
-              <menuitem id="sync-unverifieditem"
-                        label="&syncSignIn.label;"
-                        accesskey="&syncSignIn.accesskey;"
-                        observes="sync-unverified-state"
-                        oncommand="gSync.openPrefs('menubar')"/>
               <menuitem id="sync-syncnowitem"
                         label="&syncSyncNowItem.label;"
                         accesskey="&syncSyncNowItem.accesskey;"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 113121b92182..6ab1eb63a844 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -166,7 +166,6 @@
     <!-- broadcasters of the "hidden" attribute to reflect setup state for
          menus -->
     <broadcaster id="sync-setup-state"/>
-    <broadcaster id="sync-unverified-state" hidden="true"/>
     <broadcaster id="sync-syncnow-state" hidden="true"/>
     <broadcaster id="sync-reauth-state" hidden="true"/>
     <broadcaster id="viewTabsSidebar" autoCheck="false" sidebartitle="&syncedTabs.sidebar.label;"
diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js
index e5bbd01565d2..f1e3a2793c92 100644
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -218,15 +218,13 @@ var gSync = {
     document.getElementById("sync-reauth-state").hidden = true;
     document.getElementById("sync-setup-state").hidden = true;
     document.getElementById("sync-syncnow-state").hidden = true;
-    document.getElementById("sync-unverified-state").hidden = true;
 
     if (status == UIState.STATUS_LOGIN_FAILED) {
       // unhiding this element makes the menubar show the login failure state.
       document.getElementById("sync-reauth-state").hidden = false;
-    } else if (status == UIState.STATUS_NOT_CONFIGURED) {
+    } else if (status == UIState.STATUS_NOT_CONFIGURED ||
+               status == UIState.STATUS_NOT_VERIFIED) {
       document.getElementById("sync-setup-state").hidden = false;
-    } else if (status == UIState.STATUS_NOT_VERIFIED) {
-      document.getElementById("sync-unverified-state").hidden = false;
     } else {
       document.getElementById("sync-syncnow-state").hidden = false;
     }
diff --git a/browser/base/content/test/sync/browser_sync.js b/browser/base/content/test/sync/browser_sync.js
index bb58a6e8eba0..7cb870fa91b2 100644
--- a/browser/base/content/test/sync/browser_sync.js
+++ b/browser/base/content/test/sync/browser_sync.js
@@ -108,8 +108,8 @@ add_task(async function test_ui_state_unverified() {
     syncing: false,
     syncNowTooltip: tooltipText
   });
-  checkRemoteTabsPanel("PanelUI-remotetabs-unverified", false);
-  checkMenuBarItem("sync-unverifieditem");
+  checkRemoteTabsPanel("PanelUI-remotetabs-setupsync", false);
+  checkMenuBarItem("sync-setup");
 });
 
 add_task(async function test_ui_state_loginFailed() {
@@ -176,8 +176,7 @@ function checkPanelUIStatusBar({label, tooltip, fxastatus, avatarURL, syncing, s
 function checkRemoteTabsPanel(expectedShownItemId, syncing, syncNowTooltip) {
   checkItemsVisiblities(["PanelUI-remotetabs-main",
                          "PanelUI-remotetabs-setupsync",
-                         "PanelUI-remotetabs-reauthsync",
-                         "PanelUI-remotetabs-unverified"],
+                         "PanelUI-remotetabs-reauthsync"],
                         expectedShownItemId);
 
   if (syncing != undefined && syncNowTooltip != undefined) {
@@ -186,7 +185,7 @@ function checkRemoteTabsPanel(expectedShownItemId, syncing, syncNowTooltip) {
 }
 
 function checkMenuBarItem(expectedShownItemId) {
-  checkItemsVisiblities(["sync-setup", "sync-syncnowitem", "sync-reauthitem", "sync-unverifieditem"],
+  checkItemsVisiblities(["sync-setup", "sync-syncnowitem", "sync-reauthitem"],
                         expectedShownItemId);
 }
 
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index c2c7141ddcff..54d2587b1586 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -491,17 +491,6 @@
                            label="&appMenuRemoteTabs.signin.label;"
                            oncommand="gSync.openPrefs('synced-tabs');"/>
           </vbox>
-          <vbox id="PanelUI-remotetabs-unverified"
-                flex="1"
-                align="center"
-                class="PanelUI-remotetabs-instruction-box"
-                observes="sync-unverified-state">
-            <image class="fxaSyncIllustrationIssue"/>
-            <label class="PanelUI-remotetabs-instruction-label">&appMenuRemoteTabs.unverified.label;</label>
-            <toolbarbutton class="PanelUI-remotetabs-prefs-button"
-                           label="&appMenuRemoteTabs.signin.label;"
-                           oncommand="gSync.openPrefs('synced-tabs');"/>
-          </vbox>
         </hbox>
       </vbox>
     </panelview>
diff --git a/browser/components/customizableui/test/browser_synced_tabs_menu.js b/browser/components/customizableui/test/browser_synced_tabs_menu.js
index 132e14381f63..be4be0f87d86 100644
--- a/browser/components/customizableui/test/browser_synced_tabs_menu.js
+++ b/browser/components/customizableui/test/browser_synced_tabs_menu.js
@@ -139,13 +139,6 @@ add_task(async function() {
 });
 add_task(asyncCleanup);
 
-// When Sync is configured in an unverified state.
-add_task(async function() {
-  gSync.updateAllUI({ status: UIState.STATUS_NOT_VERIFIED, email: "foo@bar.com" });
-  await openPrefsFromMenuPanel("PanelUI-remotetabs-unverified", "synced-tabs");
-});
-add_task(asyncCleanup);
-
 // When Sync is configured in a "needs reauthentication" state.
 add_task(async function() {
   gSync.updateAllUI({ status: UIState.STATUS_LOGIN_FAILED, email: "foo@bar.com" });
diff --git a/browser/components/syncedtabs/SyncedTabsDeckComponent.js b/browser/components/syncedtabs/SyncedTabsDeckComponent.js
index 5115c54124fa..7701a40e957f 100644
--- a/browser/components/syncedtabs/SyncedTabsDeckComponent.js
+++ b/browser/components/syncedtabs/SyncedTabsDeckComponent.js
@@ -63,7 +63,6 @@ SyncedTabsDeckComponent.prototype = {
     NOT_AUTHED_INFO: "notAuthedInfo",
     SINGLE_DEVICE_INFO: "singleDeviceInfo",
     TABS_DISABLED: "tabs-disabled",
-    UNVERIFIED: "unverified"
   },
 
   get container() {
@@ -122,12 +121,9 @@ SyncedTabsDeckComponent.prototype = {
 
   getPanelStatus() {
     return this._getSignedInUser().then(user => {
-      if (!user || this._SyncedTabs.loginFailed) {
+      if (!user || !user.verified || this._SyncedTabs.loginFailed) {
         return this.PANELS.NOT_AUTHED_INFO;
       }
-      if (!user.verified) {
-        return this.PANELS.UNVERIFIED;
-      }
       if (!this._SyncedTabs.isConfiguredToSyncTabs) {
         return this.PANELS.TABS_DISABLED;
       }
diff --git a/browser/components/syncedtabs/sidebar.xhtml b/browser/components/syncedtabs/sidebar.xhtml
index debd1ef0d32d..bea7875121fd 100644
--- a/browser/components/syncedtabs/sidebar.xhtml
+++ b/browser/components/syncedtabs/sidebar.xhtml
@@ -80,11 +80,6 @@
           <p class="instructions">&syncedTabs.sidebar.notsignedin.label;</p>
           <button class="button sync-prefs">&fxaSignIn.label;</button>
         </div>
-        <div class="unverified sync-state">
-          <div class="syncIllustration"></div>
-          <p class="instructions">&syncedTabs.sidebar.unverified.label;</p>
-          <button class="button sync-prefs">&syncedTabs.sidebar.openprefs.label;</button>
-        </div>
         <div class="singleDeviceInfo sync-state">
           <div class="syncIllustrationIssue"></div>
           <p class="instructions">&syncedTabs.sidebar.noclients.subtitle;</p>
diff --git a/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js b/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
index fcd278f89f74..fc492893d5ed 100644
--- a/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
+++ b/browser/components/syncedtabs/test/browser/browser_sidebar_syncedtabslist.js
@@ -228,12 +228,6 @@ add_task(async function testSyncedTabsSidebarStatus() {
   Assert.ok(selectedPanel.classList.contains("notAuthedInfo"),
     "not-authed panel is selected");
 
-  account = {verified: false};
-  await syncedTabsDeckComponent.updatePanel();
-  selectedPanel = syncedTabsDeckComponent.container.querySelector(".sync-state.selected");
-  Assert.ok(selectedPanel.classList.contains("unverified"),
-    "unverified panel is selected");
-
   account = {verified: true};
   await syncedTabsDeckComponent.updatePanel();
   selectedPanel = syncedTabsDeckComponent.container.querySelector(".sync-state.selected");
diff --git a/browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js b/browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js
index 8f8a6c43f6e2..ceef304ada84 100644
--- a/browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js
+++ b/browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js
@@ -159,7 +159,7 @@ add_task(async function testPanelStatus() {
   account = {verified: false};
 
   result = await component.getPanelStatus();
-  Assert.equal(result, component.PANELS.UNVERIFIED);
+  Assert.equal(result, component.PANELS.NOT_AUTHED_INFO);
 
   account = {verified: true};
 
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index ca57bfe3e478..7f677278158a 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -381,7 +381,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY appMenuRemoteTabs.noclients.subtitle "Want to see your tabs from other devices here?">
 <!ENTITY appMenuRemoteTabs.openprefs.label "Sync Preferences">
 <!ENTITY appMenuRemoteTabs.notsignedin.label "Sign in to view a list of tabs from your other devices.">
-<!ENTITY appMenuRemoteTabs.unverified.label "Your account needs to be verified.">
 <!ENTITY appMenuRemoteTabs.signin.label "Sign in to Sync">
 <!ENTITY appMenuRemoteTabs.managedevices.label "Manage Devices…">
 <!ENTITY appMenuRemoteTabs.sidebar.label "View Synced Tabs Sidebar">
@@ -795,7 +794,6 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY syncedTabs.sidebar.noclients.label    "Sign in to Firefox from your other devices to view their tabs here.">
 <!ENTITY syncedTabs.sidebar.noclients.subtitle "Want to see your tabs from other devices here?">
 <!ENTITY syncedTabs.sidebar.notsignedin.label  "Sign in to view a list of tabs from your other devices.">
-<!ENTITY syncedTabs.sidebar.unverified.label   "Your account needs to be verified.">
 <!ENTITY syncedTabs.sidebar.notabs.label       "No open tabs">
 <!ENTITY syncedTabs.sidebar.openprefs.label    "Open &syncBrand.shortName.label; Preferences">
 <!-- LOCALIZATION NOTE (syncedTabs.sidebar.tabsnotsyncing.label): This is shown
diff --git a/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js b/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
index 7003089c0340..f90eb3e88dcb 100644
--- a/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
+++ b/browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
@@ -36,7 +36,6 @@ function mockSyncedTabs() {
   // configure our broadcasters so we are in the right state.
   document.getElementById("sync-reauth-state").hidden = true;
   document.getElementById("sync-setup-state").hidden = true;
-  document.getElementById("sync-unverified-state").hidden = true;
   document.getElementById("sync-syncnow-state").hidden = false;
 
   registerCleanupFunction(() => {
@@ -44,7 +43,6 @@ function mockSyncedTabs() {
 
     document.getElementById("sync-reauth-state").hidden = true;
     document.getElementById("sync-setup-state").hidden = false;
-    document.getElementById("sync-unverified-state").hidden = true;
     document.getElementById("sync-syncnow-state").hidden = true;
   });
 }
diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css
index a97eef9b80c3..1505ccd73383 100644
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -718,7 +718,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton
 */
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-reauthsync,
-#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-unverified,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-nodevicespane,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-tabsdisabledpane {
   min-height: calc(var(--panel-ui-sync-illustration-height) +

From 4b66a89aa0b507a417291d1381dd8de7893dd4cb Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 3 Nov 2017 10:27:05 -0400
Subject: [PATCH 081/219] Bug 1397426 - Add IPC interface to tell TabChild's to
 render and clear layers, distinct from setting the active state on the
 DocShell. r=billm

Originally, setting the active state on the DocShell for remote browsers also did the
work of making the TabChild render its layers and upload them to the compositor.

This patch adds a new renderLayers method to nsITabParent which allows more fine-grained
control - we can now, for example, cause layers to be rendered and uploaded without
activating the DocShell.

Note that if one activates or deactivates the DocShell, we'll still do the work of
attempting to render / clear the layers if it hasn't already been done.

MozReview-Commit-ID: KkLaMDTzfHi

--HG--
extra : rebase_source : 2d00dc71c584a41650696a412b6249aee3a505fe
---
 dom/interfaces/base/nsITabParent.idl |  13 +++-
 dom/ipc/PBrowser.ipdl                |  13 +++-
 dom/ipc/TabChild.cpp                 | 108 +++++++++++++++------------
 dom/ipc/TabChild.h                   |  11 ++-
 dom/ipc/TabParent.cpp                |  46 +++++++++---
 dom/ipc/TabParent.h                  |   3 +
 6 files changed, 125 insertions(+), 69 deletions(-)

diff --git a/dom/interfaces/base/nsITabParent.idl b/dom/interfaces/base/nsITabParent.idl
index f66180b3b875..3c6c79ad5f1e 100644
--- a/dom/interfaces/base/nsITabParent.idl
+++ b/dom/interfaces/base/nsITabParent.idl
@@ -17,10 +17,21 @@ interface nsITabParent : nsISupports
   readonly attribute boolean useAsyncPanZoom;
 
   /**
-    * Manages the docshell active state of the remote browser.
+    * Manages the docshell active state of the remote browser. Setting the
+    * docShell to be active will also cause it to render layers and upload
+    * them to the compositor. Setting the docShell as not active will clear
+    * those layers.
     */
   attribute boolean docShellIsActive;
 
+  /**
+   * When aEnabled is set to true, this tells the child to paint and
+   * upload layers to the compositor. When aEnabled is set to false,
+   * previous layers are cleared from the compositor, but only if
+   * preserveLayers is also set to false.
+   */
+  void renderLayers(in bool aEnabled);
+
   /**
    * Whether this tabParent is in prerender mode.
    */
diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
index 107a207c4fac..eaf0ef96a17d 100644
--- a/dom/ipc/PBrowser.ipdl
+++ b/dom/ipc/PBrowser.ipdl
@@ -791,11 +791,22 @@ child:
      *        Whether to activate or deactivate the docshell.
      * @param aPreserveLayers
      *        Whether layer trees should be preserved for inactive docshells.
+     */
+    async SetDocShellIsActive(bool aIsActive);
+
+    /**
+     * If aEnabled is true, tells the child to paint and upload layers to
+     * the compositor. If aEnabled is false, the child stops painting and
+     * clears the layers from the compositor.
+     *
+     * @param aEnabled
+     *        True if the child should render and upload layers, false if the
+     *        child should clear layers.
      * @param aLayerObserverEpoch
      *        The layer observer epoch for this activation. This message should be
      *        ignored if this epoch has already been observed (via ForcePaint).
      */
-    async SetDocShellIsActive(bool aIsActive, bool aPreserveLayers, uint64_t aLayerObserverEpoch);
+    async RenderLayers(bool aEnabled, uint64_t aLayerObserverEpoch);
 
     /**
      * Notify the child that it shouldn't paint the offscreen displayport.
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index b3e09ab8fc68..84adbfd0b693 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -436,7 +436,6 @@ TabChild::TabChild(nsIContentChild* aManager,
   , mTopLevelDocAccessibleChild(nullptr)
 #endif
   , mPendingDocShellIsActive(false)
-  , mPendingDocShellPreserveLayers(false)
   , mPendingDocShellReceivedMessage(false)
   , mPendingDocShellBlockers(0)
   , mWidgetNativeData(0)
@@ -2662,8 +2661,7 @@ TabChild::RemovePendingDocShellBlocker()
   mPendingDocShellBlockers--;
   if (!mPendingDocShellBlockers && mPendingDocShellReceivedMessage) {
     mPendingDocShellReceivedMessage = false;
-    InternalSetDocShellIsActive(mPendingDocShellIsActive,
-                                mPendingDocShellPreserveLayers);
+    InternalSetDocShellIsActive(mPendingDocShellIsActive);
   }
 }
 
@@ -2685,15 +2683,52 @@ TabChild::OnDocShellActivated(bool aIsActive)
 }
 
 void
-TabChild::InternalSetDocShellIsActive(bool aIsActive, bool aPreserveLayers)
+TabChild::InternalSetDocShellIsActive(bool aIsActive)
 {
+  // docshell is consider prerendered only if not active yet
+  mIsPrerendered &= !aIsActive;
+  nsCOMPtr<nsIDocShell> docShell = do_GetInterface(WebNavigation());
+
+  if (docShell) {
+    docShell->SetIsActive(aIsActive);
+  }
+}
+
+mozilla::ipc::IPCResult
+TabChild::RecvSetDocShellIsActive(const bool& aIsActive)
+{
+  // If we're currently waiting for window opening to complete, we need to hold
+  // off on setting the docshell active. We queue up the values we're receiving
+  // in the mWindowOpenDocShellActiveStatus.
+  if (mPendingDocShellBlockers > 0) {
+    mPendingDocShellReceivedMessage = true;
+    mPendingDocShellIsActive = aIsActive;
+    return IPC_OK();
+  }
+
+  InternalSetDocShellIsActive(aIsActive);
+  return IPC_OK();
+}
+
+mozilla::ipc::IPCResult
+TabChild::RecvRenderLayers(const bool& aEnabled, const uint64_t& aLayerObserverEpoch)
+{
+  // Since requests to change the rendering state come in from both the hang
+  // monitor channel and the PContent channel, we have an ordering problem. This
+  // code ensures that we respect the order in which the requests were made and
+  // ignore stale requests.
+  if (mLayerObserverEpoch >= aLayerObserverEpoch) {
+    return IPC_OK();
+  }
+  mLayerObserverEpoch = aLayerObserverEpoch;
+
   auto clearForcePaint = MakeScopeExit([&] {
     // We might force a paint, or we might already have painted and this is a
     // no-op. In either case, once we exit this scope, we need to alert the
     // ProcessHangMonitor that we've finished responding to what might have
     // been a request to force paint. This is so that the BackgroundHangMonitor
     // for force painting can be made to wait again.
-    if (aIsActive) {
+    if (aEnabled) {
       ProcessHangMonitor::ClearForcePaint();
     }
   });
@@ -2705,34 +2740,26 @@ TabChild::InternalSetDocShellIsActive(bool aIsActive, bool aPreserveLayers)
 
     // We send the current layer observer epoch to the compositor so that
     // TabParent knows whether a layer update notification corresponds to the
-    // latest SetDocShellIsActive request that was made.
+    // latest RecvRenderLayers request that was made.
     lm->SetLayerObserverEpoch(mLayerObserverEpoch);
   }
 
-  // docshell is consider prerendered only if not active yet
-  mIsPrerendered &= !aIsActive;
-  nsCOMPtr<nsIDocShell> docShell = do_GetInterface(WebNavigation());
-  if (docShell) {
-    bool wasActive;
-    docShell->GetIsActive(&wasActive);
-    if (aIsActive && wasActive) {
+  if (aEnabled) {
+    if (IsVisible()) {
       // This request is a no-op. In this case, we still want a MozLayerTreeReady
       // notification to fire in the parent (so that it knows that the child has
       // updated its epoch). ForcePaintNoOp does that.
       if (IPCOpen()) {
         Unused << SendForcePaintNoOp(mLayerObserverEpoch);
-        return;
+        return IPC_OK();
       }
     }
 
-    docShell->SetIsActive(aIsActive);
-  }
-
-  if (aIsActive) {
     MakeVisible();
 
+    nsCOMPtr<nsIDocShell> docShell = do_GetInterface(WebNavigation());
     if (!docShell) {
-      return;
+      return IPC_OK();
     }
 
     // We don't use TabChildBase::GetPresShell() here because that would create
@@ -2740,6 +2767,8 @@ TabChild::InternalSetDocShellIsActive(bool aIsActive, bool aPreserveLayers)
     // cause JS to run, which we want to avoid. nsIDocShell::GetPresShell
     // returns null if no content viewer exists yet.
     if (nsCOMPtr<nsIPresShell> presShell = docShell->GetPresShell()) {
+      presShell->SetIsActive(true);
+
       if (nsIFrame* root = presShell->FrameConstructor()->GetRootFrame()) {
         FrameLayerBuilder::InvalidateAllLayersForFrame(
           nsLayoutUtils::GetDisplayRootFrame(root));
@@ -2763,36 +2792,10 @@ TabChild::InternalSetDocShellIsActive(bool aIsActive, bool aPreserveLayers)
       }
       APZCCallbackHelper::SuppressDisplayport(false, presShell);
     }
-  } else if (!aPreserveLayers) {
+  } else {
     MakeHidden();
   }
-}
 
-mozilla::ipc::IPCResult
-TabChild::RecvSetDocShellIsActive(const bool& aIsActive,
-                                  const bool& aPreserveLayers,
-                                  const uint64_t& aLayerObserverEpoch)
-{
-  // Since requests to change the active docshell come in from both the hang
-  // monitor channel and the PContent channel, we have an ordering problem. This
-  // code ensures that we respect the order in which the requests were made and
-  // ignore stale requests.
-  if (mLayerObserverEpoch >= aLayerObserverEpoch) {
-    return IPC_OK();
-  }
-  mLayerObserverEpoch = aLayerObserverEpoch;
-
-  // If we're currently waiting for window opening to complete, we need to hold
-  // off on setting the docshell active. We queue up the values we're receiving
-  // in the mWindowOpenDocShellActiveStatus.
-  if (mPendingDocShellBlockers > 0) {
-    mPendingDocShellReceivedMessage = true;
-    mPendingDocShellIsActive = aIsActive;
-    mPendingDocShellPreserveLayers = aPreserveLayers;
-    return IPC_OK();
-  }
-
-  InternalSetDocShellIsActive(aIsActive, aPreserveLayers);
   return IPC_OK();
 }
 
@@ -3037,7 +3040,7 @@ TabChild::NotifyPainted()
 void
 TabChild::MakeVisible()
 {
-  if (mPuppetWidget && mPuppetWidget->IsVisible()) {
+  if (IsVisible()) {
     return;
   }
 
@@ -3049,7 +3052,7 @@ TabChild::MakeVisible()
 void
 TabChild::MakeHidden()
 {
-  if (mPuppetWidget && !mPuppetWidget->IsVisible()) {
+  if (!IsVisible()) {
     return;
   }
 
@@ -3063,6 +3066,7 @@ TabChild::MakeHidden()
       rootPresContext->ComputePluginGeometryUpdates(rootFrame, nullptr, nullptr);
       rootPresContext->ApplyPluginGeometryUpdates();
     }
+    shell->SetIsActive(false);
   }
 
   if (mPuppetWidget) {
@@ -3070,6 +3074,12 @@ TabChild::MakeHidden()
   }
 }
 
+bool
+TabChild::IsVisible()
+{
+  return mPuppetWidget && mPuppetWidget->IsVisible();
+}
+
 NS_IMETHODIMP
 TabChild::GetMessageManager(nsIContentFrameMessageManager** aResult)
 {
@@ -3558,7 +3568,7 @@ TabChild::ForcePaint(uint64_t aLayerObserverEpoch)
   }
 
   nsAutoScriptBlocker scriptBlocker;
-  RecvSetDocShellIsActive(true, false, aLayerObserverEpoch);
+  RecvRenderLayers(true, aLayerObserverEpoch);
 }
 
 void
diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
index 826cf2c51ebf..9a426a8028b7 100644
--- a/dom/ipc/TabChild.h
+++ b/dom/ipc/TabChild.h
@@ -579,6 +579,7 @@ public:
    */
   void MakeVisible();
   void MakeHidden();
+  bool IsVisible();
 
   void OnDocShellActivated(bool aIsActive);
 
@@ -802,9 +803,9 @@ protected:
 
   virtual mozilla::ipc::IPCResult RecvDestroy() override;
 
-  virtual mozilla::ipc::IPCResult RecvSetDocShellIsActive(const bool& aIsActive,
-                                                          const bool& aIsHidden,
-                                                          const uint64_t& aLayerObserverEpoch) override;
+  virtual mozilla::ipc::IPCResult RecvSetDocShellIsActive(const bool& aIsActive) override;
+
+  virtual mozilla::ipc::IPCResult RecvRenderLayers(const bool& aEnabled, const uint64_t& aLayerObserverEpoch) override;
 
   virtual mozilla::ipc::IPCResult RecvNavigateByKey(const bool& aForward,
                                                     const bool& aForDocumentNavigation) override;
@@ -895,8 +896,7 @@ private:
                           const ScrollableLayerGuid& aGuid,
                           const uint64_t& aInputBlockId);
 
-  void InternalSetDocShellIsActive(bool aIsActive,
-                                   bool aPreserveLayers);
+  void InternalSetDocShellIsActive(bool aIsActive);
 
   bool CreateRemoteLayerManager(mozilla::layers::PCompositorBridgeChild* aCompositorChild);
 
@@ -986,7 +986,6 @@ private:
   bool mCoalesceMouseMoveEvents;
 
   bool mPendingDocShellIsActive;
-  bool mPendingDocShellPreserveLayers;
   bool mPendingDocShellReceivedMessage;
   uint32_t mPendingDocShellBlockers;
 
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index 7b4e738590c2..af8edf44f7e8 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -173,6 +173,7 @@ TabParent::TabParent(nsIContentParent* aManager,
 #endif
   , mLayerTreeEpoch(0)
   , mPreserveLayers(false)
+  , mRenderingLayers(false)
   , mHasPresented(false)
   , mHasBeforeUnload(false)
   , mIsMouseEnterIntoWidgetEventSuppressed(false)
@@ -2902,14 +2903,11 @@ TabParent::GetUseAsyncPanZoom(bool* useAsyncPanZoom)
 NS_IMETHODIMP
 TabParent::SetDocShellIsActive(bool isActive)
 {
-  // Increment the epoch so that layer tree updates from previous
-  // SetDocShellIsActive requests are ignored.
-  mLayerTreeEpoch++;
-
   // docshell is consider prerendered only if not active yet
   mIsPrerendered &= !isActive;
   mDocShellIsActive = isActive;
-  Unused << SendSetDocShellIsActive(isActive, mPreserveLayers, mLayerTreeEpoch);
+  RenderLayers(isActive);
+  Unused << SendSetDocShellIsActive(isActive);
 
   // update active accessible documents on windows
 #if defined(XP_WIN) && defined(ACCESSIBILITY)
@@ -2932,13 +2930,6 @@ TabParent::SetDocShellIsActive(bool isActive)
   // changing of the process priority.
   ProcessPriorityManager::TabActivityChanged(this, isActive);
 
-  // Ask the child to repaint using the PHangMonitor channel/thread (which may
-  // be less congested).
-  if (isActive) {
-    ContentParent* cp = Manager()->AsContentParent();
-    cp->ForceTabPaint(this, mLayerTreeEpoch);
-  }
-
   return NS_OK;
 }
 
@@ -2956,6 +2947,37 @@ TabParent::GetIsPrerendered(bool* aIsPrerendered)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+TabParent::RenderLayers(bool aEnabled)
+{
+  if (aEnabled == mRenderingLayers) {
+    return NS_OK;
+  }
+
+  // Preserve layers means that attempts to stop rendering layers
+  // will be ignored.
+  if (!aEnabled && mPreserveLayers) {
+    return NS_OK;
+  }
+
+  mRenderingLayers = aEnabled;
+
+  // Increment the epoch so that layer tree updates from previous
+  // RenderLayers requests are ignored.
+  mLayerTreeEpoch++;
+
+  Unused << SendRenderLayers(aEnabled, mLayerTreeEpoch);
+
+  // Ask the child to repaint using the PHangMonitor channel/thread (which may
+  // be less congested).
+  if (aEnabled) {
+    ContentParent* cp = Manager()->AsContentParent();
+    cp->ForceTabPaint(this, mLayerTreeEpoch);
+  }
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 TabParent::PreserveLayers(bool aPreserveLayers)
 {
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
index 88108b306a6c..5fc16ba5340b 100644
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -782,6 +782,9 @@ private:
   // the tab's docshell is inactive.
   bool mPreserveLayers;
 
+  // Holds the most recent value passed to the RenderLayers function.
+  bool mRenderingLayers;
+
   // True if this TabParent has had its layer tree sent to the compositor
   // at least once.
   bool mHasPresented;

From 93aa55c535c6dca721f79edf5a7c150e45b50f51 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 22 Nov 2017 10:21:34 -0800
Subject: [PATCH 082/219] Bug 1397426 - Rename mRenderingLayers to
 mRenderLayers. r=billm

MozReview-Commit-ID: KTDhXM7PRdc

--HG--
extra : rebase_source : 055939b8c03b741ef6a0e9da3a2ae5812eefeccf
---
 dom/ipc/TabParent.cpp | 6 +++---
 dom/ipc/TabParent.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index af8edf44f7e8..05f107d773f6 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -173,7 +173,7 @@ TabParent::TabParent(nsIContentParent* aManager,
 #endif
   , mLayerTreeEpoch(0)
   , mPreserveLayers(false)
-  , mRenderingLayers(false)
+  , mRenderLayers(false)
   , mHasPresented(false)
   , mHasBeforeUnload(false)
   , mIsMouseEnterIntoWidgetEventSuppressed(false)
@@ -2950,7 +2950,7 @@ TabParent::GetIsPrerendered(bool* aIsPrerendered)
 NS_IMETHODIMP
 TabParent::RenderLayers(bool aEnabled)
 {
-  if (aEnabled == mRenderingLayers) {
+  if (aEnabled == mRenderLayers) {
     return NS_OK;
   }
 
@@ -2960,7 +2960,7 @@ TabParent::RenderLayers(bool aEnabled)
     return NS_OK;
   }
 
-  mRenderingLayers = aEnabled;
+  mRenderLayers = aEnabled;
 
   // Increment the epoch so that layer tree updates from previous
   // RenderLayers requests are ignored.
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
index 5fc16ba5340b..2f31c503133c 100644
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -783,7 +783,7 @@ private:
   bool mPreserveLayers;
 
   // Holds the most recent value passed to the RenderLayers function.
-  bool mRenderingLayers;
+  bool mRenderLayers;
 
   // True if this TabParent has had its layer tree sent to the compositor
   // at least once.

From e2a8eea6cef6c34be0ad7b8ef7c363de7040001f Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 7 Nov 2017 15:08:47 -0500
Subject: [PATCH 083/219] Bug 1397426 - When short-circuiting a
 TabParent::RenderLayers call, still fire the layer tree event if we've been
 preserving layers. r=billm

MozReview-Commit-ID: 7UT036vUY85

--HG--
extra : rebase_source : 2420294925a7c3b341499678f85713d8f212b6d8
---
 dom/ipc/TabParent.cpp | 48 +++++++++++++++++--------------------------
 dom/ipc/TabParent.h   |  8 +++++++-
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index 05f107d773f6..66425ece8c76 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -174,6 +174,7 @@ TabParent::TabParent(nsIContentParent* aManager,
   , mLayerTreeEpoch(0)
   , mPreserveLayers(false)
   , mRenderLayers(false)
+  , mHasLayers(false)
   , mHasPresented(false)
   , mHasBeforeUnload(false)
   , mIsMouseEnterIntoWidgetEventSuppressed(false)
@@ -2951,6 +2952,22 @@ NS_IMETHODIMP
 TabParent::RenderLayers(bool aEnabled)
 {
   if (aEnabled == mRenderLayers) {
+    if (aEnabled == mHasLayers && mPreserveLayers) {
+      // RenderLayers might be called when we've been preserving layers,
+      // and already had layers uploaded. In that case, the MozLayerTreeReady
+      // event will not naturally arrive, which can confuse the front-end
+      // layer. So we fire the event here.
+      RefPtr<TabParent> self = this;
+      bool epoch = mLayerTreeEpoch;
+      bool enabled = aEnabled;
+      NS_DispatchToMainThread(NS_NewRunnableFunction(
+        "dom::TabParent::RenderLayers",
+        [self, epoch, enabled] () {
+          MOZ_ASSERT(NS_IsMainThread());
+          self->LayerTreeUpdate(epoch, enabled);
+        }));
+    }
+
     return NS_OK;
   }
 
@@ -3065,35 +3082,6 @@ TabParent::GetHasBeforeUnload(bool* aResult)
   return NS_OK;
 }
 
-class LayerTreeUpdateRunnable final
-  : public mozilla::Runnable
-{
-  uint64_t mLayersId;
-  uint64_t mEpoch;
-  bool mActive;
-
-public:
-  explicit LayerTreeUpdateRunnable(uint64_t aLayersId,
-                                   uint64_t aEpoch,
-                                   bool aActive)
-    : Runnable("dom::LayerTreeUpdateRunnable")
-    , mLayersId(aLayersId)
-    , mEpoch(aEpoch)
-    , mActive(aActive)
-  {
-    MOZ_ASSERT(!NS_IsMainThread());
-  }
-
-private:
-  NS_IMETHOD Run() override {
-    MOZ_ASSERT(NS_IsMainThread());
-    if (RefPtr<TabParent> tabParent = TabParent::GetTabParentFromLayersId(mLayersId)) {
-      tabParent->LayerTreeUpdate(mEpoch, mActive);
-    }
-    return NS_OK;
-  }
-};
-
 void
 TabParent::LayerTreeUpdate(uint64_t aEpoch, bool aActive)
 {
@@ -3110,6 +3098,8 @@ TabParent::LayerTreeUpdate(uint64_t aEpoch, bool aActive)
     return;
   }
 
+  mHasLayers = aActive;
+
   RefPtr<Event> event = NS_NewDOMEvent(mFrameElement, nullptr, nullptr);
   if (aActive) {
     mHasPresented = true;
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
index 2f31c503133c..3a8cf8a2d1e8 100644
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -782,9 +782,15 @@ private:
   // the tab's docshell is inactive.
   bool mPreserveLayers;
 
-  // Holds the most recent value passed to the RenderLayers function.
+  // Holds the most recent value passed to the RenderLayers function. This
+  // does not necessarily mean that the layers have finished rendering
+  // and have uploaded - for that, use mHasLayers.
   bool mRenderLayers;
 
+  // True if the compositor has reported that the TabChild has uploaded
+  // layers.
+  bool mHasLayers;
+
   // True if this TabParent has had its layer tree sent to the compositor
   // at least once.
   bool mHasPresented;

From cacae0556b048f89cab02d60f61f84fdd5612481 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 3 Nov 2017 11:27:29 -0400
Subject: [PATCH 084/219] Bug 1397426 - Rename TabChild's notion of "active
 tabs" to "visible tabs" and move logic into renderLayers. r=billm

MozReview-Commit-ID: 1bBNwew7uCk

--HG--
extra : rebase_source : fb907f0e9f02635b122dbf67da7a7c1292427cec
---
 docshell/base/nsDocShell.cpp        |  4 ---
 dom/ipc/TabChild.cpp                | 40 ++++++++++++-----------------
 dom/ipc/TabChild.h                  | 32 +++++++++++------------
 ipc/glue/BackgroundChildImpl.cpp    |  4 +--
 xpcom/threads/LabeledEventQueue.cpp | 18 ++++++-------
 xpcom/threads/LabeledEventQueue.h   |  6 ++---
 6 files changed, 46 insertions(+), 58 deletions(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 6c7872eaf0b2..9f91e8d50dab 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -6420,10 +6420,6 @@ nsDocShell::SetIsActive(bool aIsActive)
   // Keep track ourselves.
   mIsActive = aIsActive;
 
-  if (TabChild* tc = TabChild::GetFrom(this)) {
-    tc->OnDocShellActivated(aIsActive);
-  }
-
   // Clear prerender flag if necessary.
   if (mIsPrerendered && aIsActive) {
     MOZ_ASSERT(mPrerenderGlobalHistory.get());
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 84adbfd0b693..865b5016672c 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -165,7 +165,7 @@ NS_IMPL_ISUPPORTS(TabChildSHistoryListener,
 
 static const char BEFORE_FIRST_PAINT[] = "before-first-paint";
 
-nsTHashtable<nsPtrHashKey<TabChild>>* TabChild::sActiveTabs;
+nsTHashtable<nsPtrHashKey<TabChild>>* TabChild::sVisibleTabs;
 
 typedef nsDataHashtable<nsUint64HashKey, TabChild*> TabChildMap;
 static TabChildMap* sTabChildren;
@@ -1150,11 +1150,11 @@ TabChild::ActorDestroy(ActorDestroyReason why)
 
 TabChild::~TabChild()
 {
-  if (sActiveTabs) {
-    sActiveTabs->RemoveEntry(this);
-    if (sActiveTabs->IsEmpty()) {
-      delete sActiveTabs;
-      sActiveTabs = nullptr;
+  if (sVisibleTabs) {
+    sVisibleTabs->RemoveEntry(this);
+    if (sVisibleTabs->IsEmpty()) {
+      delete sVisibleTabs;
+      sVisibleTabs = nullptr;
     }
   }
 
@@ -2665,23 +2665,6 @@ TabChild::RemovePendingDocShellBlocker()
   }
 }
 
-void
-TabChild::OnDocShellActivated(bool aIsActive)
-{
-  if (aIsActive) {
-    if (!sActiveTabs) {
-      sActiveTabs = new nsTHashtable<nsPtrHashKey<TabChild>>();
-    }
-    sActiveTabs->PutEntry(this);
-  } else {
-    if (sActiveTabs) {
-      sActiveTabs->RemoveEntry(this);
-      // We don't delete sActiveTabs here when it's empty since that
-      // could cause a lot of churn. Instead, we wait until ~TabChild.
-    }
-  }
-}
-
 void
 TabChild::InternalSetDocShellIsActive(bool aIsActive)
 {
@@ -2755,6 +2738,11 @@ TabChild::RecvRenderLayers(const bool& aEnabled, const uint64_t& aLayerObserverE
       }
     }
 
+    if (!sVisibleTabs) {
+      sVisibleTabs = new nsTHashtable<nsPtrHashKey<TabChild>>();
+    }
+    sVisibleTabs->PutEntry(this);
+
     MakeVisible();
 
     nsCOMPtr<nsIDocShell> docShell = do_GetInterface(WebNavigation());
@@ -2793,6 +2781,12 @@ TabChild::RecvRenderLayers(const bool& aEnabled, const uint64_t& aLayerObserverE
       APZCCallbackHelper::SuppressDisplayport(false, presShell);
     }
   } else {
+    if (sVisibleTabs) {
+      sVisibleTabs->RemoveEntry(this);
+      // We don't delete sVisibleTabs here when it's empty since that
+      // could cause a lot of churn. Instead, we wait until ~TabChild.
+    }
+
     MakeHidden();
   }
 
diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
index 9a426a8028b7..4ca4995d8bea 100644
--- a/dom/ipc/TabChild.h
+++ b/dom/ipc/TabChild.h
@@ -581,8 +581,6 @@ public:
   void MakeHidden();
   bool IsVisible();
 
-  void OnDocShellActivated(bool aIsActive);
-
   nsIContentChild* Manager() const { return mManager; }
 
   static inline TabChild*
@@ -778,20 +776,20 @@ public:
                                   const ScrollableLayerGuid& aGuid,
                                   const uint64_t& aInputBlockId);
 
-  static bool HasActiveTabs()
+  static bool HasVisibleTabs()
   {
-    return sActiveTabs && !sActiveTabs->IsEmpty();
+    return sVisibleTabs && !sVisibleTabs->IsEmpty();
   }
 
-  // Returns the set of TabChilds that are currently in the foreground. There
-  // can be multiple foreground TabChilds if Firefox has multiple windows
-  // open. There can also be zero foreground TabChilds if the foreground tab is
-  // in a different content process. Note that this function should only be
-  // called if HasActiveTabs() returns true.
-  static const nsTHashtable<nsPtrHashKey<TabChild>>& GetActiveTabs()
+  // Returns the set of TabChilds that are currently rendering layers. There
+  // can be multiple TabChilds in this state if Firefox has multiple windows
+  // open or is warming tabs up. There can also be zero TabChilds in this
+  // state. Note that this function should only be called if HasVisibleTabs()
+  // returns true.
+  static const nsTHashtable<nsPtrHashKey<TabChild>>& GetVisibleTabs()
   {
-    MOZ_ASSERT(HasActiveTabs());
-    return *sActiveTabs;
+    MOZ_ASSERT(HasVisibleTabs());
+    return *sVisibleTabs;
   }
 
 protected:
@@ -991,11 +989,11 @@ private:
 
   WindowsHandle mWidgetNativeData;
 
-  // This state is used to keep track of the current active tabs (the ones in
-  // the foreground). There may be more than one if there are multiple browser
-  // windows open. There may be none if this process does not host any
-  // foreground tabs.
-  static nsTHashtable<nsPtrHashKey<TabChild>>* sActiveTabs;
+  // This state is used to keep track of the current visible tabs (the ones rendering
+  // layers). There may be more than one if there are multiple browser windows open, or
+  // tabs are being warmed up. There may be none if this process does not host any
+  // visible or warming tabs.
+  static nsTHashtable<nsPtrHashKey<TabChild>>* sVisibleTabs;
 
   DISALLOW_EVIL_CONSTRUCTORS(TabChild);
 };
diff --git a/ipc/glue/BackgroundChildImpl.cpp b/ipc/glue/BackgroundChildImpl.cpp
index a8a63fa90877..38c42be09449 100644
--- a/ipc/glue/BackgroundChildImpl.cpp
+++ b/ipc/glue/BackgroundChildImpl.cpp
@@ -662,8 +662,8 @@ BackgroundChildImpl::GetMessageSchedulerGroups(const Message& aMsg, SchedulerGro
   if (aMsg.type() == layout::PVsync::MessageType::Msg_Notify__ID) {
     MOZ_ASSERT(NS_IsMainThread());
     aGroups.Clear();
-    if (dom::TabChild::HasActiveTabs()) {
-      for (auto iter = dom::TabChild::GetActiveTabs().ConstIter();
+    if (dom::TabChild::HasVisibleTabs()) {
+      for (auto iter = dom::TabChild::GetVisibleTabs().ConstIter();
            !iter.Done(); iter.Next()) {
         aGroups.Put(iter.Get()->GetKey()->TabGroup());
       }
diff --git a/xpcom/threads/LabeledEventQueue.cpp b/xpcom/threads/LabeledEventQueue.cpp
index d78228898544..c549095442b1 100644
--- a/xpcom/threads/LabeledEventQueue.cpp
+++ b/xpcom/threads/LabeledEventQueue.cpp
@@ -166,21 +166,21 @@ LabeledEventQueue::GetEvent(EventPriority* aPriority,
     return nullptr;
   }
 
-  // Move active tabs to the front of the queue. The mAvoidActiveTabCount field
-  // prevents us from preferentially processing events from active tabs twice in
+  // Move visible tabs to the front of the queue. The mAvoidVisibleTabCount field
+  // prevents us from preferentially processing events from visible tabs twice in
   // a row. This scheme is designed to prevent starvation.
-  if (TabChild::HasActiveTabs() && mAvoidActiveTabCount <= 0) {
-    for (auto iter = TabChild::GetActiveTabs().ConstIter();
+  if (TabChild::HasVisibleTabs() && mAvoidVisibleTabCount <= 0) {
+    for (auto iter = TabChild::GetVisibleTabs().ConstIter();
          !iter.Done(); iter.Next()) {
       SchedulerGroup* group = iter.Get()->GetKey()->TabGroup();
       if (!group->isInList() || group == sCurrentSchedulerGroup) {
         continue;
       }
 
-      // For each active tab we move to the front of the queue, we have to
-      // process two SchedulerGroups (the active tab and another one, presumably
-      // a background group) before we prioritize active tabs again.
-      mAvoidActiveTabCount += 2;
+      // For each visible tab we move to the front of the queue, we have to
+      // process two SchedulerGroups (the visible tab and another one, presumably
+      // a background group) before we prioritize visible tabs again.
+      mAvoidVisibleTabCount += 2;
 
       // We move |group| right before sCurrentSchedulerGroup and then set
       // sCurrentSchedulerGroup to group.
@@ -195,7 +195,7 @@ LabeledEventQueue::GetEvent(EventPriority* aPriority,
   SchedulerGroup* firstGroup = sCurrentSchedulerGroup;
   SchedulerGroup* group = firstGroup;
   do {
-    mAvoidActiveTabCount--;
+    mAvoidVisibleTabCount--;
 
     auto queueEntry = mLabeled.Lookup(group);
     if (!queueEntry) {
diff --git a/xpcom/threads/LabeledEventQueue.h b/xpcom/threads/LabeledEventQueue.h
index 4f1f1ef86cdb..db666e98805b 100644
--- a/xpcom/threads/LabeledEventQueue.h
+++ b/xpcom/threads/LabeledEventQueue.h
@@ -149,11 +149,11 @@ private:
   EpochQueue mEpochs;
   size_t mNumEvents = 0;
 
-  // Number of SchedulerGroups that must be processed before we prioritize an
-  // active tab. This field is designed to guarantee a 1:1 interleaving between
+  // Number of SchedulerGroups that must be processed before we prioritize a
+  // visible tab. This field is designed to guarantee a 1:1 interleaving between
   // foreground and background SchedulerGroups. For details, see its usage in
   // LabeledEventQueue.cpp.
-  int64_t mAvoidActiveTabCount = 0;
+  int64_t mAvoidVisibleTabCount = 0;
 };
 
 } // namespace mozilla

From 8a11644dbe8670c241ad4070e2a1ed30eaf6edb1 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 3 Nov 2017 10:27:35 -0400
Subject: [PATCH 085/219] Bug 1397426 - Make async tab switcher use new
 nsITabParent renderLayers function. r=billm

MozReview-Commit-ID: Go2EdMXGwa7

--HG--
extra : rebase_source : 15ad7b80c5d52d61fae5f4867e2a6599522adf0b
---
 browser/base/content/tabbrowser.xml | 55 ++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index b31d70894ba8..94a425c1c9a4 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -4383,16 +4383,26 @@
               let {tabParent} = browser.frameLoader;
               if (state == this.STATE_LOADING) {
                 this.assert(!this.minimizedOrFullyOccluded);
-                browser.docShellIsActive = true;
-                if (!tabParent) {
+
+                if (!this.tabbrowser.tabWarmingEnabled) {
+                  browser.docShellIsActive = true;
+                }
+
+                if (tabParent) {
+                  tabParent.renderLayers(true);
+                } else {
                   this.onLayersReady(browser);
                 }
               } else if (state == this.STATE_UNLOADING) {
                 this.unwarmTab(tab);
+                // Setting the docShell to be inactive will also cause it
+                // to stop rendering layers.
                 browser.docShellIsActive = false;
                 if (!tabParent) {
                   this.onLayersCleared(browser);
                 }
+              } else if (state == this.STATE_LOADED) {
+                this.maybeActivateDocShell(tab);
               }
 
               if (!tab.linkedBrowser.isRemoteBrowser) {
@@ -4417,11 +4427,6 @@
             init() {
               this.log("START");
 
-              // If we minimized the window before the switcher was activated,
-              // we might have set  the preserveLayers flag for the current
-              // browser. Let's clear it.
-              this.tabbrowser.mCurrentBrowser.preserveLayers(false);
-
               window.addEventListener("MozAfterPaint", this);
               window.addEventListener("MozLayerTreeReady", this);
               window.addEventListener("MozLayerTreeCleared", this);
@@ -4441,6 +4446,10 @@
                 this.setTabState(tab, tabIsLoaded ? this.STATE_LOADED
                                                   : this.STATE_LOADING);
               }
+              for (let ppBrowser of this.tabbrowser._printPreviewBrowsers) {
+                let ppTab = this.tabbrowser.getTabForBrowser(ppBrowser);
+                this.setTabState(ppTab, this.STATE_LOADING);
+              }
             },
 
             destroy() {
@@ -4619,6 +4628,8 @@
                     } else {
                       this.tabbrowser._adjustFocusAfterTabSwitch(showTab);
                     }
+
+                    this.maybeActivateDocShell(this.requestedTab);
                   }
                 }
 
@@ -4657,6 +4668,29 @@
               this.setTabState(this.requestedTab, this.STATE_LOADING);
             },
 
+            maybeActivateDocShell(tab) {
+              // If we've reached the point where the requested tab has entered
+              // the loaded state, but the DocShell is still not yet active, we
+              // should activate it.
+              let browser = tab.linkedBrowser;
+              let state = this.getTabState(tab);
+              let canCheckDocShellState = !browser.mDestroyed &&
+                                          (browser.docShell ||
+                                           browser.frameLoader.tabParent);
+              if (tab == this.requestedTab &&
+                  canCheckDocShellState &&
+                  state == this.STATE_LOADED &&
+                  !browser.docShellIsActive &&
+                  !this.minimizedOrFullyOccluded) {
+                browser.docShellIsActive = true;
+                this.logState("Set requested tab docshell to active and preserveLayers to false");
+                // If we minimized the window before the switcher was activated,
+                // we might have set the preserveLayers flag for the current
+                // browser. Let's clear it.
+                browser.preserveLayers(false);
+              }
+            },
+
             // This function runs before every event. It fixes up the state
             // to account for closed tabs.
             preActions() {
@@ -4970,7 +5004,12 @@
 
             activateBrowserForPrintPreview(browser) {
               let tab = this.tabbrowser.getTabForBrowser(browser);
-              this.setTabState(tab, this.STATE_LOADING);
+              let state = this.getTabState(tab);
+              if (state != this.STATE_LOADING &&
+                  state != this.STATE_LOADED) {
+                this.setTabState(tab, this.STATE_LOADING);
+                this.logState("Activated browser " + this.tinfo(tab) + " for print preview");
+              }
             },
 
             canWarmTab(tab) {

From 335bfa1671a480c6b1f93e56dea74f61d2e37090 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 25 Sep 2017 13:55:48 -0400
Subject: [PATCH 086/219] Bug 1397426 - Fix block comment formatting in
 nsITabParent.idl. r=billm

MozReview-Commit-ID: KWwDee0ujR

--HG--
extra : rebase_source : 0da6b32ca21dd2c2c915565ed5749795710d6c4a
---
 dom/interfaces/base/nsITabParent.idl | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dom/interfaces/base/nsITabParent.idl b/dom/interfaces/base/nsITabParent.idl
index 3c6c79ad5f1e..5c3cf2044b74 100644
--- a/dom/interfaces/base/nsITabParent.idl
+++ b/dom/interfaces/base/nsITabParent.idl
@@ -17,11 +17,11 @@ interface nsITabParent : nsISupports
   readonly attribute boolean useAsyncPanZoom;
 
   /**
-    * Manages the docshell active state of the remote browser. Setting the
-    * docShell to be active will also cause it to render layers and upload
-    * them to the compositor. Setting the docShell as not active will clear
-    * those layers.
-    */
+   * Manages the docshell active state of the remote browser. Setting the
+   * docShell to be active will also cause it to render layers and upload
+   * them to the compositor. Setting the docShell as not active will clear
+   * those layers.
+   */
   attribute boolean docShellIsActive;
 
   /**
@@ -38,12 +38,12 @@ interface nsITabParent : nsISupports
   [infallible] readonly attribute boolean isPrerendered;
 
   /**
-    * As an optimisation, setting the docshell's active state to
-    * inactive also triggers a layer invalidation to free up some
-    * potentially unhelpful memory usage. Calling preserveLayers
-    * will cause the layers to be preserved even for inactive
-    * docshells.
-    */
+   * As an optimisation, setting the docshell's active state to
+   * inactive also triggers a layer invalidation to free up some
+   * potentially unhelpful memory usage. Calling preserveLayers
+   * will cause the layers to be preserved even for inactive
+   * docshells.
+   */
   void preserveLayers(in boolean aPreserveLayers);
 
   /**

From 94c19b3bf142ec70aff1d54ec20720c275934fda Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 23 Oct 2017 17:01:48 -0400
Subject: [PATCH 087/219] Bug 1397426 - Stop disabling tab warming in
 browser_bug343515.js. r=billm

Tab warming was originally disabled in this test because it was accidentally
setting the DocShell to be active at an unexpected time.

Because tab warming no longer activates DocShells, we can revert this change,
though we also have to make it deal with the fact that switching tabs no longer
makes docShells become activate immediately.

MozReview-Commit-ID: K0fiA5AVfEm

--HG--
extra : rebase_source : 5de92eb125e1001dd358a5deaa76f626802e3928
---
 docshell/test/navigation/browser_bug343515.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/docshell/test/navigation/browser_bug343515.js b/docshell/test/navigation/browser_bug343515.js
index 4fb0779e79d5..cf1279e4414a 100644
--- a/docshell/test/navigation/browser_bug343515.js
+++ b/docshell/test/navigation/browser_bug343515.js
@@ -38,23 +38,17 @@ function test() {
   // Lots of callbacks going on here
   waitForExplicitFinish();
 
-  // Begin the test. First, we disable tab warming because it's
-  // possible for the mouse to be over one of the tabs during
-  // this test, warm it up, and cause this test to fail intermittently
-  // in automation.
-  SpecialPowers.pushPrefEnv({
-    set: [["browser.tabs.remote.warmup.enabled", false]],
-  }).then(step1);
+  // Begin the test
+  step1();
 }
 
-function step1() {
-
+async function step1() {
   // Get a handle on the initial tab
   ctx.tab0 = gBrowser.selectedTab;
   ctx.tab0Browser = gBrowser.getBrowserForTab(ctx.tab0);
 
-  // Our current tab should be active
-  ok(ctx.tab0Browser.docShellIsActive, "Tab 0 should be active at test start");
+  await BrowserTestUtils.waitForCondition(() => ctx.tab0Browser.docShellIsActive,
+    "Timed out waiting for initial tab to be active.");
 
   // Open a New Tab
   ctx.tab1 = BrowserTestUtils.addTab(gBrowser, testPath + "bug343515_pg1.html");

From 752b8e0615fe4a02d03e9f0fb20ced5c96633cc2 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 17 Nov 2017 09:55:29 -0800
Subject: [PATCH 088/219] Bug 1397426 - Add hasLayers to nsITabParent and use
 it in the async tab switcher. r=billm

This is necessary because sometimes the async tab switcher will instantiate when
there already exists some background tabs that are rendering via print preview. When
that happens, it's important for the state to be set correctly for them so that we
don't accidentally treat them as still loading, and wait (forever) for them to report
having finished loading.

MozReview-Commit-ID: 2dwo5WlXlgJ

--HG--
extra : rebase_source : 7d3def56bf6ba12bb6110b60bb3d79329bfc0abd
---
 browser/base/content/tabbrowser.xml        |  4 +++-
 dom/interfaces/base/nsITabParent.idl       |  6 ++++++
 dom/ipc/TabParent.cpp                      |  7 +++++++
 toolkit/content/widgets/browser.xml        |  8 ++++++++
 toolkit/content/widgets/remote-browser.xml | 10 ++++++++++
 5 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 94a425c1c9a4..dc978d4a912d 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -4448,7 +4448,9 @@
               }
               for (let ppBrowser of this.tabbrowser._printPreviewBrowsers) {
                 let ppTab = this.tabbrowser.getTabForBrowser(ppBrowser);
-                this.setTabState(ppTab, this.STATE_LOADING);
+                let state = ppBrowser.hasLayers ? this.STATE_LOADED
+                                                : this.STATE_LOADING;
+                this.setTabState(ppTab, state);
               }
             },
 
diff --git a/dom/interfaces/base/nsITabParent.idl b/dom/interfaces/base/nsITabParent.idl
index 5c3cf2044b74..aa29f871b24b 100644
--- a/dom/interfaces/base/nsITabParent.idl
+++ b/dom/interfaces/base/nsITabParent.idl
@@ -32,6 +32,12 @@ interface nsITabParent : nsISupports
    */
   void renderLayers(in bool aEnabled);
 
+  /**
+   * True if layers are being rendered and the compositor has reported
+   * receiving them.
+   */
+  readonly attribute boolean hasLayers;
+
   /**
    * Whether this tabParent is in prerender mode.
    */
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index 66425ece8c76..b1bbbe3c0e82 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -2995,6 +2995,13 @@ TabParent::RenderLayers(bool aEnabled)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+TabParent::GetHasLayers(bool* aResult)
+{
+  *aResult = mHasLayers;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 TabParent::PreserveLayers(bool aPreserveLayers)
 {
diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml
index ddfc7e6922f7..3e5978aceacf 100644
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -304,6 +304,14 @@
         </body>
       </method>
 
+      <property name="hasLayers" readonly="true">
+        <getter>
+          <![CDATA[
+            return this.docShellIsActive;
+          ]]>
+        </getter>
+      </property>
+
       <property name="imageDocument"
                 readonly="true">
         <getter>
diff --git a/toolkit/content/widgets/remote-browser.xml b/toolkit/content/widgets/remote-browser.xml
index aacf2fff6e0b..29e6941cd772 100644
--- a/toolkit/content/widgets/remote-browser.xml
+++ b/toolkit/content/widgets/remote-browser.xml
@@ -258,6 +258,16 @@
         ]]></body>
       </method>
 
+      <property name="hasLayers" readonly="true">
+        <getter><![CDATA[
+          let {frameLoader} = this;
+          if (frameLoader.tabParent) {
+            return frameLoader.tabParent.hasLayers;
+          }
+          return false;
+        ]]></getter>
+      </property>
+
       <field name="_manifestURI"/>
       <property name="manifestURI"
                 onget="return this._manifestURI"

From f476b048b237580995f46d6f4580a8d393027f06 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 20 Nov 2017 11:41:11 -0500
Subject: [PATCH 089/219] Bug 1397426 - Make TabParent's assume they're
 rendering layers by default on construction. r=billm

This assumption also mirrors how non-remote browsers have their docShells active by default.

In order to do this, I also have to increase the initial epoch's for the TabParent and TabChild,
as if a RenderLayers has been called. Originally, since the epochs initted at 0, and the epochs
stored by the [Layer|WebRender]TransactionParent were also initted at 0, we'd hit this branch:

https://searchfox.org/mozilla-central/rev/c633ffa4c4611f202ca11270dcddb7b29edddff8/gfx/layers/ipc/LayerTransactionParent.cpp#703

and then we'd never alert the TabParent about the layer upload.

MozReview-Commit-ID: 6PP1eCnisYK

--HG--
extra : rebase_source : da736415d6b60208fa54bc25fe449cc261e856d8
---
 browser/base/content/tabbrowser.xml | 10 ++++++++--
 dom/ipc/TabChild.cpp                | 16 +++++++++++++---
 dom/ipc/TabParent.cpp               |  4 ++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index dc978d4a912d..8084bd6433a2 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -4438,8 +4438,7 @@
 
               let tab = this.requestedTab;
               let browser = tab.linkedBrowser;
-              let tabIsLoaded = !browser.isRemoteBrowser ||
-                                browser.frameLoader.tabParent.hasPresented;
+              let tabIsLoaded = browser.renderingLayers;
 
               if (!this.minimizedOrFullyOccluded) {
                 this.log("Initial tab is loaded?: " + tabIsLoaded);
@@ -4861,6 +4860,13 @@
             // Fires when the layers become available for a tab.
             onLayersReady(browser) {
               let tab = this.tabbrowser.getTabForBrowser(browser);
+              if (!tab) {
+                // We probably got a layer update from a tab that got before
+                // the switcher was created, or for browser that's not being
+                // tracked by the async tab switcher (like the preloaded about:newtab).
+                return;
+              }
+
               this.logState(`onLayersReady(${tab._tPos}, ${browser.isRemoteBrowser})`);
 
               this.assert(this.getTabState(tab) == this.STATE_LOADING ||
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 865b5016672c..31a79dc972a6 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -428,7 +428,7 @@ TabChild::TabChild(nsIContentChild* aManager,
   , mDidLoadURLInit(false)
   , mAwaitingLA(false)
   , mSkipKeyPress(false)
-  , mLayerObserverEpoch(0)
+  , mLayerObserverEpoch(1)
 #if defined(XP_WIN) && defined(ACCESSIBILITY)
   , mNativeWindowHandle(0)
 #endif
@@ -2937,6 +2937,9 @@ TabChild::InitRenderingState(const TextureFactoryIdentifier& aTextureFactoryIden
       ImageBridgeChild::IdentifyCompositorTextureHost(mTextureFactoryIdentifier);
       gfx::VRManagerChild::IdentifyTextureHost(mTextureFactoryIdentifier);
       InitAPZState();
+      RefPtr<LayerManager> lm = mPuppetWidget->GetLayerManager();
+      MOZ_ASSERT(lm);
+      lm->SetLayerObserverEpoch(mLayerObserverEpoch);
     } else {
       NS_WARNING("Fallback to BasicLayerManager");
       mLayersConnected = Some(false);
@@ -3050,7 +3053,14 @@ TabChild::MakeHidden()
     return;
   }
 
-  ClearCachedResources();
+  // Due to the nested event loop in ContentChild::ProvideWindowCommon,
+  // it's possible to be told to become hidden before we're finished
+  // setting up a layer manager. We should skip clearing cached layers
+  // in that case, since doing so might accidentally put is into
+  // BasicLayers mode.
+  if (mPuppetWidget && mPuppetWidget->HasLayerManager()) {
+    ClearCachedResources();
+  }
 
   // Hide all plugins in this tab.
   if (nsCOMPtr<nsIPresShell> shell = GetPresShell()) {
@@ -3555,7 +3565,7 @@ TabChild::GetOuterRect()
 void
 TabChild::ForcePaint(uint64_t aLayerObserverEpoch)
 {
-  if (!IPCOpen()) {
+  if (!IPCOpen() || !mPuppetWidget || !mPuppetWidget->HasLayerManager()) {
     // Don't bother doing anything now. Better to wait until we receive the
     // message on the PContent channel.
     return;
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index b1bbbe3c0e82..10fb991c7883 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -171,9 +171,9 @@ TabParent::TabParent(nsIContentParent* aManager,
 #ifdef DEBUG
   , mActiveSupressDisplayportCount(0)
 #endif
-  , mLayerTreeEpoch(0)
+  , mLayerTreeEpoch(1)
   , mPreserveLayers(false)
-  , mRenderLayers(false)
+  , mRenderLayers(true)
   , mHasLayers(false)
   , mHasPresented(false)
   , mHasBeforeUnload(false)

From 3d0b1bf4e8d91c32fefbe5a982dfb9636037485a Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 21 Nov 2017 16:52:48 -0500
Subject: [PATCH 090/219] Bug 1397426 - TabChild::MakeHidden shouldn't cause
 script to run. r=billm

Calling GetPresShell() might create a content viewer, which might cause
script to run. This is bad if there's a ForcePaint message queued up,
because it could mean running the force painting code while we're still
in the midst of making a tab hidden, which would put us in an inconsistent
state.

MozReview-Commit-ID: 3rw2wGllGdk

--HG--
extra : rebase_source : 152716d81391ea4d890927a0dadff912c53a28e2
---
 dom/ipc/TabChild.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 31a79dc972a6..1e93f8363d89 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -3062,15 +3062,21 @@ TabChild::MakeHidden()
     ClearCachedResources();
   }
 
-  // Hide all plugins in this tab.
-  if (nsCOMPtr<nsIPresShell> shell = GetPresShell()) {
-    if (nsPresContext* presContext = shell->GetPresContext()) {
-      nsRootPresContext* rootPresContext = presContext->GetRootPresContext();
-      nsIFrame* rootFrame = shell->FrameConstructor()->GetRootFrame();
-      rootPresContext->ComputePluginGeometryUpdates(rootFrame, nullptr, nullptr);
-      rootPresContext->ApplyPluginGeometryUpdates();
+  nsCOMPtr<nsIDocShell> docShell = do_GetInterface(WebNavigation());
+  if (docShell) {
+    // Hide all plugins in this tab. We don't use TabChildBase::GetPresShell()
+    // here because that would create a content viewer if one doesn't exist yet.
+    // Creating a content viewer can cause JS to run, which we want to avoid.
+    // nsIDocShell::GetPresShell returns null if no content viewer exists yet.
+    if (nsCOMPtr<nsIPresShell> presShell = docShell->GetPresShell()) {
+      if (nsPresContext* presContext = presShell->GetPresContext()) {
+        nsRootPresContext* rootPresContext = presContext->GetRootPresContext();
+        nsIFrame* rootFrame = presShell->FrameConstructor()->GetRootFrame();
+        rootPresContext->ComputePluginGeometryUpdates(rootFrame, nullptr, nullptr);
+        rootPresContext->ApplyPluginGeometryUpdates();
+      }
+      presShell->SetIsActive(false);
     }
-    shell->SetIsActive(false);
   }
 
   if (mPuppetWidget) {

From 5b0d6be3e2bcb1f589a57bd6051c6ec2051962f0 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 22 Nov 2017 10:48:10 -0800
Subject: [PATCH 091/219] Bug 1397426 - Expose renderLayers state via
 nsITabParent and correctly set initial tab states in async tab switcher.
 r=billm

MozReview-Commit-ID: IIMmwrgJUV6

--HG--
extra : rebase_source : 00ca04b970feb98d96b082c9b582875d486d2ece
---
 browser/base/content/tabbrowser.xml        | 37 ++++++++++++++--------
 dom/interfaces/base/nsITabParent.idl       |  9 +++---
 dom/ipc/TabParent.cpp                      | 11 +++++--
 toolkit/content/widgets/browser.xml        | 13 ++++++++
 toolkit/content/widgets/remote-browser.xml | 21 ++++++++++++
 5 files changed, 70 insertions(+), 21 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 8084bd6433a2..0219b2d051cb 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -4389,7 +4389,7 @@
                 }
 
                 if (tabParent) {
-                  tabParent.renderLayers(true);
+                  browser.renderLayers = true;
                 } else {
                   this.onLayersReady(browser);
                 }
@@ -4436,21 +4436,30 @@
               window.addEventListener("SwapDocShells", this, true);
               window.addEventListener("EndSwapDocShells", this, true);
 
-              let tab = this.requestedTab;
-              let browser = tab.linkedBrowser;
-              let tabIsLoaded = browser.renderingLayers;
+              let initialTab = this.requestedTab;
 
-              if (!this.minimizedOrFullyOccluded) {
-                this.log("Initial tab is loaded?: " + tabIsLoaded);
-                this.setTabState(tab, tabIsLoaded ? this.STATE_LOADED
-                                                  : this.STATE_LOADING);
-              }
-              for (let ppBrowser of this.tabbrowser._printPreviewBrowsers) {
-                let ppTab = this.tabbrowser.getTabForBrowser(ppBrowser);
-                let state = ppBrowser.hasLayers ? this.STATE_LOADED
-                                                : this.STATE_LOADING;
-                this.setTabState(ppTab, state);
+              for (let tab of this.tabbrowser.tabs) {
+                if (tab == initialTab && this.minimizedOrFullyOccluded) {
+                  continue;
+                }
+
+                if (tab.linkedPanel) {
+                  let b = tab.linkedBrowser;
+                  let state;
+                  if (b.renderLayers && b.hasLayers) {
+                    state = this.STATE_LOADED;
+                  } else if (b.renderLayers && !b.hasLayers) {
+                    state = this.STATE_LOADING;
+                  } else if (!b.renderLayers && b.hasLayers) {
+                    state = this.STATE_UNLOADING;
+                  } else {
+                    state = this.STATE_UNLOADED;
+                  }
+
+                  this.setTabState(tab, state);
+                }
               }
+              this.logState("Tab states initialized");
             },
 
             destroy() {
diff --git a/dom/interfaces/base/nsITabParent.idl b/dom/interfaces/base/nsITabParent.idl
index aa29f871b24b..5e686a50d714 100644
--- a/dom/interfaces/base/nsITabParent.idl
+++ b/dom/interfaces/base/nsITabParent.idl
@@ -25,12 +25,11 @@ interface nsITabParent : nsISupports
   attribute boolean docShellIsActive;
 
   /**
-   * When aEnabled is set to true, this tells the child to paint and
-   * upload layers to the compositor. When aEnabled is set to false,
-   * previous layers are cleared from the compositor, but only if
-   * preserveLayers is also set to false.
+   * When set to true, this tells the child to paint and upload layers to
+   * the compositor. When set to false, previous layers are cleared from
+   * the compositor, but only if preserveLayers is also set to false.
    */
-  void renderLayers(in bool aEnabled);
+  attribute boolean renderLayers;
 
   /**
    * True if layers are being rendered and the compositor has reported
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index 10fb991c7883..2a694edabd7c 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -2907,7 +2907,7 @@ TabParent::SetDocShellIsActive(bool isActive)
   // docshell is consider prerendered only if not active yet
   mIsPrerendered &= !isActive;
   mDocShellIsActive = isActive;
-  RenderLayers(isActive);
+  SetRenderLayers(isActive);
   Unused << SendSetDocShellIsActive(isActive);
 
   // update active accessible documents on windows
@@ -2949,7 +2949,7 @@ TabParent::GetIsPrerendered(bool* aIsPrerendered)
 }
 
 NS_IMETHODIMP
-TabParent::RenderLayers(bool aEnabled)
+TabParent::SetRenderLayers(bool aEnabled)
 {
   if (aEnabled == mRenderLayers) {
     if (aEnabled == mHasLayers && mPreserveLayers) {
@@ -2995,6 +2995,13 @@ TabParent::RenderLayers(bool aEnabled)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+TabParent::GetRenderLayers(bool* aResult)
+{
+  *aResult = mRenderLayers;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 TabParent::GetHasLayers(bool* aResult)
 {
diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml
index 3e5978aceacf..73c628088863 100644
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -304,6 +304,19 @@
         </body>
       </method>
 
+      <property name="renderLayers">
+        <getter>
+          <![CDATA[
+            return this.docShellIsActive;
+          ]]>
+        </getter>
+        <setter>
+          <![CDATA[
+            return this.docShellIsActive = val;
+          ]]>
+        </setter>
+      </property>
+
       <property name="hasLayers" readonly="true">
         <getter>
           <![CDATA[
diff --git a/toolkit/content/widgets/remote-browser.xml b/toolkit/content/widgets/remote-browser.xml
index 29e6941cd772..8588c79bb3de 100644
--- a/toolkit/content/widgets/remote-browser.xml
+++ b/toolkit/content/widgets/remote-browser.xml
@@ -258,6 +258,27 @@
         ]]></body>
       </method>
 
+      <property name="renderLayers">
+        <getter>
+          <![CDATA[
+            let {frameLoader} = this;
+            if (frameLoader && frameLoader.tabParent) {
+              return frameLoader.tabParent.renderLayers;
+            }
+            return false;
+          ]]>
+        </getter>
+        <setter>
+          <![CDATA[
+            let {frameLoader} = this;
+            if (frameLoader && frameLoader.tabParent) {
+              return frameLoader.tabParent.renderLayers = val;
+            }
+            return false;
+          ]]>
+        </setter>
+      </property>
+
       <property name="hasLayers" readonly="true">
         <getter><![CDATA[
           let {frameLoader} = this;

From e61587fcaeabb698a88b094c38f32d7e80e9b17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 1 Dec 2017 18:03:11 -0600
Subject: [PATCH 092/219] servo: Merge #19455 - style: Don't waste an
 allocation when failing to parse a CSSParserColor (from
 emilio:color-does-stupid-things-too); r=upsuper

I see that allocation show up in the profiles, and it makes sense, because
system colors and such are common in Firefox, and they're just wasting it.

Note that the clone() added is refcounted.

Source-Repo: https://github.com/servo/servo
Source-Revision: 49e6594bc9f4c8178175232ab4a61581144dfa8e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 9cbfebb4036f9b67e1346da0c681b93aa19a91cf
---
 .../style/values/specified/color.rs           | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/servo/components/style/values/specified/color.rs b/servo/components/style/values/specified/color.rs
index a9f83e0d4712..2c961dea86a4 100644
--- a/servo/components/style/values/specified/color.rs
+++ b/servo/components/style/values/specified/color.rs
@@ -213,7 +213,7 @@ impl Color {
         // specified value.
         let start = input.state();
         let authored = match input.next() {
-            Ok(&Token::Ident(ref s)) => Some(s.to_lowercase().into_boxed_str()),
+            Ok(&Token::Ident(ref s)) => Some(s.clone()),
             _ => None,
         };
         input.reset(&start);
@@ -221,19 +221,25 @@ impl Color {
             Ok(value) =>
                 Ok(match value {
                     CSSParserColor::CurrentColor => Color::CurrentColor,
-                    CSSParserColor::RGBA(rgba) => Color::Numeric {
-                        parsed: rgba,
-                        authored: authored,
-                    },
+                    CSSParserColor::RGBA(rgba) => {
+                        Color::Numeric {
+                            parsed: rgba,
+                            authored: authored.map(|s| s.to_lowercase().into_boxed_str()),
+                        }
+                    }
                 }),
             Err(e) => {
-                #[cfg(feature = "gecko")] {
+                #[cfg(feature = "gecko")]
+                {
                     if let Ok(system) = input.try(SystemColor::parse) {
                         return Ok(Color::System(system));
-                    } else if let Ok(c) = gecko::SpecialColorKeyword::parse(input) {
+                    }
+
+                    if let Ok(c) = gecko::SpecialColorKeyword::parse(input) {
                         return Ok(Color::Special(c));
                     }
                 }
+
                 match e {
                     BasicParseError { kind: BasicParseErrorKind::UnexpectedToken(t), location } => {
                         Err(location.new_custom_error(

From 6f2c43a0f85c84e9a1b2411ded2677f8e6809fcf Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Fri, 1 Dec 2017 22:20:33 -0500
Subject: [PATCH 093/219] Bug 1422414. Remove unused
 StackingContextHelper::mOrigin. r=mstange

Now that ToRelativeLayoutPoint does no math we should be able to
eliminate a copy of the glyph buffer.

MozReview-Commit-ID: 1o6awTyE95v

--HG--
extra : rebase_source : 0133fd64fb96c1d5541f036b7f7f3ec8701cd3fd
---
 gfx/layers/wr/StackingContextHelper.cpp | 2 +-
 gfx/layers/wr/StackingContextHelper.h   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gfx/layers/wr/StackingContextHelper.cpp b/gfx/layers/wr/StackingContextHelper.cpp
index 46be7369f160..812405bf069b 100644
--- a/gfx/layers/wr/StackingContextHelper.cpp
+++ b/gfx/layers/wr/StackingContextHelper.cpp
@@ -64,7 +64,7 @@ StackingContextHelper::~StackingContextHelper()
 wr::LayoutRect
 StackingContextHelper::ToRelativeLayoutRect(const LayoutDeviceRect& aRect) const
 {
-  auto rect = aRect - mOrigin;
+  auto rect = aRect;
   rect.Round();
   return wr::ToLayoutRect(rect);
 }
diff --git a/gfx/layers/wr/StackingContextHelper.h b/gfx/layers/wr/StackingContextHelper.h
index 98691f8d681d..4d65d4167aed 100644
--- a/gfx/layers/wr/StackingContextHelper.h
+++ b/gfx/layers/wr/StackingContextHelper.h
@@ -61,7 +61,7 @@ public:
   // Same but for points
   wr::LayoutPoint ToRelativeLayoutPoint(const LayoutDevicePoint& aPoint) const
   {
-    return wr::ToLayoutPoint(aPoint - mOrigin);
+    return wr::ToLayoutPoint(aPoint);
   }
 
 
@@ -72,7 +72,6 @@ public:
 
 private:
   wr::DisplayListBuilder* mBuilder;
-  LayoutDevicePoint mOrigin;
   gfx::Matrix4x4 mTransform;
   gfx::Size mScale;
 };

From 0abf999334a64cd8462c17a120cf4ecb64e63e9f Mon Sep 17 00:00:00 2001
From: Nico Grunbaum <none@none>
Date: Tue, 14 Nov 2017 09:20:29 -0800
Subject: [PATCH 094/219] Bug 1363667 - P1 - Add RTP Sources WebIDL
 r=bkelly,mjf

MozReview-Commit-ID: 61RqPKfbrDw

--HG--
extra : rebase_source : 413164df9bbabe6e93c217f33b1127ddde6716b9
---
 dom/webidl/RTCRtpReceiver.webidl |  6 +++--
 dom/webidl/RTCRtpSources.webidl  | 39 ++++++++++++++++++++++++++++++++
 dom/webidl/moz.build             |  1 +
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 dom/webidl/RTCRtpSources.webidl

diff --git a/dom/webidl/RTCRtpReceiver.webidl b/dom/webidl/RTCRtpReceiver.webidl
index 3af604259929..0055432aedc6 100644
--- a/dom/webidl/RTCRtpReceiver.webidl
+++ b/dom/webidl/RTCRtpReceiver.webidl
@@ -10,6 +10,8 @@
 [Pref="media.peerconnection.enabled",
  JSImplementation="@mozilla.org/dom/rtpreceiver;1"]
 interface RTCRtpReceiver {
-  readonly attribute MediaStreamTrack track;
-  Promise<RTCStatsReport> getStats();
+  readonly attribute MediaStreamTrack   track;
+  Promise<RTCStatsReport>               getStats();
+  sequence<RTCRtpContributingSource>    getContributingSources();
+  sequence<RTCRtpSynchronizationSource> getSynchronizationSources();
 };
diff --git a/dom/webidl/RTCRtpSources.webidl b/dom/webidl/RTCRtpSources.webidl
new file mode 100644
index 000000000000..5d9671e99d59
--- /dev/null
+++ b/dom/webidl/RTCRtpSources.webidl
@@ -0,0 +1,39 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * https://www.w3.org/TR/2017/CR-webrtc-20171102/
+ */
+
+// WebIDL note: RTCRtpContrinbutingSource and RTCRtpSynchronizationSource
+// are specified currently as interfaces in the spec, however there is an
+// open issue which has yet to land changing them to dictionaries.
+// See: https://github.com/w3c/webrtc-pc/issues/1533
+// and https://bugzilla.mozilla.org/show_bug.cgi?id=1419093
+
+dictionary RTCRtpContributingSource {
+    DOMHighResTimeStamp  timestamp;
+    unsigned long        source;
+    byte?                audioLevel;
+};
+
+dictionary RTCRtpSynchronizationSource {
+    DOMHighResTimeStamp  timestamp;
+    unsigned long        source;
+    byte                 audioLevel;
+};
+
+/* Hidden shared representation of Contributing and Synchronization sources */
+enum RTCRtpSourceEntryType {
+    "contributing",
+    "synchronization",
+};
+
+dictionary RTCRtpSourceEntry {
+    DOMHighResTimeStamp    timestamp;
+    unsigned long          source;
+    byte?                  audioLevel;
+    RTCRtpSourceEntryType  sourceType;
+};
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index 7741f5daba19..d4bd49d1559d 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -995,6 +995,7 @@ if CONFIG['MOZ_WEBRTC']:
         'RTCPeerConnectionStatic.webidl',
         'RTCRtpReceiver.webidl',
         'RTCRtpSender.webidl',
+        'RTCRtpSources.webidl',
         'RTCRtpTransceiver.webidl',
         'RTCSessionDescription.webidl',
         'TransceiverImpl.webidl',

From 9dbbdd408093f6a15b09bd72fad5d19578968ba4 Mon Sep 17 00:00:00 2001
From: Nico Grunbaum <none@none>
Date: Tue, 14 Nov 2017 09:32:29 -0800
Subject: [PATCH 095/219] Bug 1363667 - P2 - Add RTP Sources RTP header
 extensions r=mjf

MozReview-Commit-ID: JVPR5OhHMOR

--HG--
extra : rebase_source : 15ee770fa7eb56b606ec1a497a43710207300c3e
---
 .../signaling/src/jsep/JsepSessionImpl.cpp    |  2 +-
 .../src/media-conduit/AudioConduit.cpp        | 21 +++++--
 .../src/media-conduit/AudioConduit.h          | 11 ++--
 .../src/media-conduit/MediaConduitInterface.h | 55 ++++++++++++------
 .../src/media-conduit/VideoConduit.cpp        | 13 +++--
 .../src/media-conduit/VideoConduit.h          |  9 ++-
 media/webrtc/trunk/webrtc/common_types.cc     |  3 +-
 media/webrtc/trunk/webrtc/common_types.h      | 12 ++++
 media/webrtc/trunk/webrtc/config.cc           |  7 ++-
 media/webrtc/trunk/webrtc/config.h            |  3 +
 .../trunk/webrtc/modules/rtp_rtcp/BUILD.gn    |  1 +
 .../rtp_rtcp/include/rtp_rtcp_defines.h       |  1 +
 .../webrtc/modules/rtp_rtcp/rtp_rtcp.gypi     |  1 +
 .../rtp_rtcp/source/rtp_header_extension.cc   |  1 +
 .../rtp_rtcp/source/rtp_header_extensions.cc  | 40 ++++++++++++-
 .../rtp_rtcp/source/rtp_header_extensions.h   | 12 ++++
 .../modules/rtp_rtcp/source/rtp_packet.cc     |  1 +
 .../rtp_rtcp/source/rtp_packet_unittest.cc    | 58 +++++++++++++++++++
 .../modules/rtp_rtcp/source/rtp_rtcp_impl.cc  |  2 +
 .../modules/rtp_rtcp/source/rtp_utility.cc    | 14 +++++
 .../rtp_rtcp/source/rtp_utility_unittest.cc   | 28 +++++----
 .../webrtc/test/fuzzers/rtp_packet_fuzzer.cc  |  5 ++
 .../trunk/webrtc/video/rtp_stream_receiver.cc |  8 +++
 23 files changed, 254 insertions(+), 54 deletions(-)

diff --git a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
index 70579d6603fd..950d53a3c25f 100644
--- a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
+++ b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
@@ -2043,7 +2043,7 @@ void
 JsepSessionImpl::SetupDefaultRtpExtensions()
 {
   AddAudioRtpExtension(webrtc::RtpExtension::kAudioLevelUri,
-                       SdpDirectionAttribute::Direction::kSendonly);
+                       SdpDirectionAttribute::Direction::kSendrecv);
   AddAudioRtpExtension(webrtc::RtpExtension::kMIdUri,
                        SdpDirectionAttribute::Direction::kSendrecv);
   AddVideoRtpExtension(webrtc::RtpExtension::kAbsSendTimeUri,
diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
index d40496eae740..279880abfd04 100644
--- a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
@@ -589,16 +589,27 @@ WebrtcAudioConduit::ConfigureRecvMediaCodecs(
 }
 
 MediaConduitErrorCode
-WebrtcAudioConduit::EnableAudioLevelExtension(bool enabled, uint8_t id)
+WebrtcAudioConduit::EnableAudioLevelExtension(bool aEnabled,
+                                              uint8_t aId,
+                                              bool aDirectionIsSend)
 {
-  CSFLogDebug(LOGTAG,  "%s %d %d ", __FUNCTION__, enabled, id);
+  CSFLogDebug(LOGTAG,  "%s %d %d %d", __FUNCTION__, aEnabled, aId,
+              aDirectionIsSend);
 
-  if (mPtrVoERTP_RTCP->SetSendAudioLevelIndicationStatus(mChannel, enabled, id) == -1)
-  {
+  bool ret;
+  if (aDirectionIsSend) {
+    ret = mPtrVoERTP_RTCP->SetSendAudioLevelIndicationStatus(mChannel,
+                                                             aEnabled,
+                                                             aId) == -1;
+  } else {
+    ret = mPtrRTP->SetReceiveAudioLevelIndicationStatus(mChannel,
+                                                        aEnabled,
+                                                        aId) == -1;
+  }
+  if (ret) {
     CSFLogError(LOGTAG, "%s SetSendAudioLevelIndicationStatus Failed", __FUNCTION__);
     return kMediaConduitUnknownError;
   }
-
   return kMediaConduitNoError;
 }
 
diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.h b/media/webrtc/signaling/src/media-conduit/AudioConduit.h
index 5da47197e91b..4f603845d5df 100644
--- a/media/webrtc/signaling/src/media-conduit/AudioConduit.h
+++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.h
@@ -92,11 +92,12 @@ public:
    */
   virtual MediaConduitErrorCode ConfigureRecvMediaCodecs(
     const std::vector<AudioCodecConfig* >& codecConfigList) override;
-  /**
-   * Function to enable the audio level extension
-   * @param enabled: enable extension
-   */
-  virtual MediaConduitErrorCode EnableAudioLevelExtension(bool enabled, uint8_t id) override;
+
+  MediaConduitErrorCode
+  EnableAudioLevelExtension(bool aEnabled,
+                            uint8_t aId,
+                            bool aDirectionIsSend) override;
+
   virtual MediaConduitErrorCode EnableMIDExtension(bool enabled, uint8_t id) override;
 
   /**
diff --git a/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h b/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h
index 069213520c42..6b73c3503cea 100644
--- a/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h
+++ b/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h
@@ -33,6 +33,8 @@ class VideoFrame;
 
 namespace mozilla {
 
+using RtpExtList = std::vector<webrtc::RtpExtension>;
+
 // Wrap the webrtc.org Call class adding mozilla add/ref support.
 class WebRtcCallWrapper : public RefCounted<WebRtcCallWrapper>
 {
@@ -237,6 +239,17 @@ public:
   virtual bool SetLocalSSRCs(const std::vector<unsigned int>& aSSRCs) = 0;
   virtual std::vector<unsigned int> GetLocalSSRCs() const = 0;
 
+  /**
+  * Adds negotiated RTP extensions
+  * XXX Move to MediaSessionConduit
+  */
+  virtual void
+  SetLocalRTPExtensions(bool aIsSend, const RtpExtList& extensions) = 0;
+  /**
+  * Returns the negotiated RTP extensions
+  */
+  virtual RtpExtList GetLocalRTPExtensions(bool aIsSend) const = 0;
+
   virtual bool GetRemoteSSRC(unsigned int* ssrc) = 0;
   virtual bool SetRemoteSSRC(unsigned int ssrc) = 0;
   virtual bool SetLocalCNAME(const char* cname) = 0;
@@ -341,20 +354,13 @@ public:
 
   virtual ~VideoSessionConduit() {}
 
-  virtual Type type() const { return VIDEO; }
+  Type type() const override { return VIDEO; }
 
-  /**
-  * Adds negotiated RTP extensions
-  * XXX Move to MediaSessionConduit
-  */
-  virtual void SetLocalRTPExtensions(bool aIsSend,
-                                     const std::vector<webrtc::RtpExtension>& extensions) = 0;
-
-  /**
-  * Returns the negotiated RTP extensions
-  */
-  virtual std::vector<webrtc::RtpExtension> GetLocalRTPExtensions(bool aIsSend) const = 0;
+  void
+  SetLocalRTPExtensions(bool aIsSend,
+                        const RtpExtList& extensions) override = 0;
 
+  RtpExtList GetLocalRTPExtensions(bool aIsSend) const override = 0;
 
   /**
    * Function to attach Renderer end-point of the Media-Video conduit.
@@ -365,7 +371,7 @@ public:
   virtual MediaConduitErrorCode AttachRenderer(RefPtr<mozilla::VideoRenderer> aRenderer) = 0;
   virtual void DetachRenderer() = 0;
 
-  virtual bool SetRemoteSSRC(unsigned int ssrc) = 0;
+  bool SetRemoteSSRC(unsigned int ssrc) override = 0;
 
   /**
    * Function to deliver a capture video frame for encoding and transport
@@ -460,9 +466,14 @@ public:
 
   virtual ~AudioSessionConduit() {}
 
-  virtual Type type() const { return AUDIO; }
+  Type type() const override { return AUDIO; }
 
+  void
+  SetLocalRTPExtensions(bool aIsSend,
+                        const RtpExtList& extensions) override {};
 
+  RtpExtList
+  GetLocalRTPExtensions(bool aIsSend) const override {return RtpExtList();}
   /**
    * Function to deliver externally captured audio sample for encoding and transport
    * @param audioData [in]: Pointer to array containing a frame of audio
@@ -523,12 +534,18 @@ public:
                                 const std::vector<AudioCodecConfig* >& recvCodecConfigList) = 0;
    /**
     * Function to enable the audio level extension
-    * @param enabled: enable extension
-    * @param id: id to be used for this rtp header extension
-    * NOTE: See AudioConduit for more information
+    * @param aEnabled: enable extension
+    * @param aId: the RTP extension header ID to use
+    * @param aDirectionIsSend: indicates whether to set the extension on the
+    *                          sender or the receiver side
+    * returns an error if the extension could not be set
     */
-  virtual MediaConduitErrorCode EnableAudioLevelExtension(bool enabled, uint8_t id) = 0;
-  virtual MediaConduitErrorCode EnableMIDExtension(bool enabled, uint8_t id) = 0;
+  virtual MediaConduitErrorCode
+  EnableAudioLevelExtension(bool aEnabled,
+                            uint8_t aId,
+                            bool aDirectionIsSend) = 0;
+  virtual MediaConduitErrorCode
+  EnableMIDExtension(bool enabled, uint8_t id) = 0;
 
   virtual bool SetDtmfPayloadType(unsigned char type, int freq) = 0;
 
diff --git a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
index 15514d19e520..b5921f2b0c69 100644
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -323,17 +323,18 @@ WebrtcVideoConduit::~WebrtcVideoConduit()
 
 void
 WebrtcVideoConduit::SetLocalRTPExtensions(bool aIsSend,
-  const std::vector<webrtc::RtpExtension> & aExtensions)
+                                          const RtpExtList & aExtensions)
 {
   auto& extList = aIsSend ? mSendStreamConfig.rtp.extensions :
                   mRecvStreamConfig.rtp.extensions;
   extList = aExtensions;
 }
 
-std::vector<webrtc::RtpExtension>
+RtpExtList
 WebrtcVideoConduit::GetLocalRTPExtensions(bool aIsSend) const
 {
-  return aIsSend ? mSendStreamConfig.rtp.extensions : mRecvStreamConfig.rtp.extensions;
+  return aIsSend ? mSendStreamConfig.rtp.extensions :
+                   mRecvStreamConfig.rtp.extensions;
 }
 
 bool WebrtcVideoConduit::SetLocalSSRCs(const std::vector<unsigned int> & aSSRCs)
@@ -547,7 +548,8 @@ ConfigureVideoEncoderSettings(const VideoCodecConfig* aConfig,
     return new rtc::RefCountedObject<
         webrtc::VideoEncoderConfig::H264EncoderSpecificSettings>(h264_settings);
 
-  } else if (aConfig->mName == "VP8") {
+  }
+  if (aConfig->mName == "VP8") {
     webrtc::VideoCodecVP8 vp8_settings =
         webrtc::VideoEncoder::GetDefaultVp8Settings();
     vp8_settings.automaticResizeOn = automatic_resize;
@@ -557,7 +559,8 @@ ConfigureVideoEncoderSettings(const VideoCodecConfig* aConfig,
     return new rtc::RefCountedObject<
         webrtc::VideoEncoderConfig::Vp8EncoderSpecificSettings>(vp8_settings);
 
-  } else if (aConfig->mName == "VP9") {
+  }
+  if (aConfig->mName == "VP9") {
     webrtc::VideoCodecVP9 vp9_settings =
         webrtc::VideoEncoder::GetDefaultVp9Settings();
     if (is_screencast) {
diff --git a/media/webrtc/signaling/src/media-conduit/VideoConduit.h b/media/webrtc/signaling/src/media-conduit/VideoConduit.h
index 29becb422263..2d96c48b83cd 100644
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.h
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.h
@@ -80,12 +80,11 @@ public:
 
   /**
   * Add rtp extensions to the the VideoSendStream
-  * TODO(@@NG) promote this the MediaConduitInterface when the VoE rework
-  * hits Webrtc.org.
   */
-  void SetLocalRTPExtensions(bool aIsSend,
-                             const std::vector<webrtc::RtpExtension>& extensions) override;
-  std::vector<webrtc::RtpExtension> GetLocalRTPExtensions(bool aIsSend) const override;
+  void
+  SetLocalRTPExtensions(bool aIsSend, const RtpExtList& extensions) override;
+
+  RtpExtList GetLocalRTPExtensions(bool aIsSend) const override;
 
   /**
    * Set up A/V sync between this (incoming) VideoConduit and an audio conduit.
diff --git a/media/webrtc/trunk/webrtc/common_types.cc b/media/webrtc/trunk/webrtc/common_types.cc
index fb93497fdb58..2514a4867152 100644
--- a/media/webrtc/trunk/webrtc/common_types.cc
+++ b/media/webrtc/trunk/webrtc/common_types.cc
@@ -50,7 +50,8 @@ RTPHeaderExtension::RTPHeaderExtension()
       voiceActivity(false),
       audioLevel(0),
       hasVideoRotation(false),
-      videoRotation(kVideoRotation_0) {
+      videoRotation(kVideoRotation_0),
+      csrcAudioLevels() {
 }
 
 RTPHeaderExtension::RTPHeaderExtension(const RTPHeaderExtension& rhs) {
diff --git a/media/webrtc/trunk/webrtc/common_types.h b/media/webrtc/trunk/webrtc/common_types.h
index fbdd6e2ff6d6..bfce06408b25 100644
--- a/media/webrtc/trunk/webrtc/common_types.h
+++ b/media/webrtc/trunk/webrtc/common_types.h
@@ -859,6 +859,17 @@ class StreamId {
   char value_[kMaxSize+1]; // mozilla: make sure we have space to null term.
 };
 
+// Audio level of CSRCs See:
+// https://tools.ietf.org/html/rfc6465
+struct CsrcAudioLevelList {
+  CsrcAudioLevelList() : numAudioLevels(0) { }
+  CsrcAudioLevelList(const CsrcAudioLevelList&) = default;
+  CsrcAudioLevelList& operator=(const CsrcAudioLevelList&) = default;
+  uint8_t numAudioLevels;
+  // arrOfAudioLevels has the same ordering as RTPHeader.arrOfCSRCs
+  uint8_t arrOfAudioLevels[kRtpCsrcSize];
+};
+
 struct RTPHeaderExtension {
   RTPHeaderExtension();
   RTPHeaderExtension(const RTPHeaderExtension& rhs);
@@ -892,6 +903,7 @@ struct RTPHeaderExtension {
   StreamId repairedRtpStreamId;
 
   StreamId mId;
+  CsrcAudioLevelList csrcAudioLevels;
 };
 
 struct RTPHeader {
diff --git a/media/webrtc/trunk/webrtc/config.cc b/media/webrtc/trunk/webrtc/config.cc
index b3b19d8d3bb7..8fc49d1c5c17 100644
--- a/media/webrtc/trunk/webrtc/config.cc
+++ b/media/webrtc/trunk/webrtc/config.cc
@@ -84,12 +84,17 @@ const char* RtpExtension::kMIdUri =
     "urn:ietf:params:rtp-hdrext:sdes:mid";
 const int RtpExtension::kMIdDefaultId = 9;
 
+const char* RtpExtension::kCsrcAudioLevelUri =
+    "urn:ietf:params:rtp-hdrext:csrc-audio-level";
+const int RtpExtension::kCsrcAudioLevelDefaultId = 10;
+
 bool RtpExtension::IsSupportedForAudio(const std::string& uri) {
   return uri == webrtc::RtpExtension::kAudioLevelUri ||
          uri == webrtc::RtpExtension::kTransportSequenceNumberUri ||
          uri == webrtc::RtpExtension::kRtpStreamIdUri ||
          uri == webrtc::RtpExtension::kRepairedRtpStreamIdUri ||
-         uri == webrtc::RtpExtension::kMIdUri;
+         uri == webrtc::RtpExtension::kMIdUri ||
+         uri == webrtc::RtpExtension::kCsrcAudioLevelUri;
 }
 
 bool RtpExtension::IsSupportedForVideo(const std::string& uri) {
diff --git a/media/webrtc/trunk/webrtc/config.h b/media/webrtc/trunk/webrtc/config.h
index c0a25ee8c104..5125ab8bb616 100644
--- a/media/webrtc/trunk/webrtc/config.h
+++ b/media/webrtc/trunk/webrtc/config.h
@@ -107,6 +107,9 @@ struct RtpExtension {
   static const char* kMIdUri;
   static const int kMIdDefaultId;
 
+  static const char* kCsrcAudioLevelUri;
+  static const int kCsrcAudioLevelDefaultId;
+
   std::string uri;
   int id;
 };
diff --git a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/BUILD.gn b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/BUILD.gn
index e806f070a1af..a0297bd58b8c 100644
--- a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/BUILD.gn
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/BUILD.gn
@@ -14,6 +14,7 @@ rtc_static_library("rtp_rtcp") {
     "include/flexfec_sender.h",
     "include/receive_statistics.h",
     "include/remote_ntp_time_estimator.h",
+    "include/rtp_audio_level_observer.h",
     "include/rtp_header_parser.h",
     "include/rtp_payload_registry.h",
     "include/rtp_receiver.h",
diff --git a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
index e66f422de9cb..796b20b601c1 100644
--- a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
@@ -78,6 +78,7 @@ enum RTPExtensionType {
   kRtpExtensionRtpStreamId,
   kRtpExtensionRepairedRtpStreamId,
   kRtpExtensionMId,
+  kRtpExtensionCsrcAudioLevel,
   kRtpExtensionNumberOfExtensions  // Must be the last entity in the enum.
 };
 
diff --git a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp.gypi b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp.gypi
index 32370431ff9a..6e3ebca9bc8f 100644
--- a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp.gypi
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp.gypi
@@ -23,6 +23,7 @@
         'include/flexfec_sender.h',
         'include/receive_statistics.h',
         'include/remote_ntp_time_estimator.h',
+        'include/rtp_audio_level_observer.h',
         'include/rtp_header_parser.h',
         'include/rtp_payload_registry.h',
         'include/rtp_receiver.h',
diff --git a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc
index c4480129e50d..8b319ad85e56 100644
--- a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc
@@ -41,6 +41,7 @@ constexpr ExtensionInfo kExtensions[] = {
     CreateExtensionInfo<RtpStreamId>(),
     CreateExtensionInfo<RepairedRtpStreamId>(),
     CreateExtensionInfo<MId>(),
+    CreateExtensionInfo<CsrcAudioLevel>(),
 };
 
 // Because of kRtpExtensionNone, NumberOfExtension is 1 bigger than the actual
diff --git a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc
index 2ad85cffe156..adf8fb8ee471 100644
--- a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc
@@ -7,7 +7,6 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 
 #include "webrtc/base/checks.h"
@@ -316,4 +315,43 @@ bool MId::Write(uint8_t* data, const std::string& mid) {
   return RtpStreamId::Write(data, mid);
 }
 
+// CSRCAudioLevel
+//  Sample Audio Level Encoding Using the One-Byte Header Format
+//  Note that the range of len is 1 to 15 which is encoded as 0 to 14
+//  0                   1                   2                   3
+//  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+// |  ID   | len=2 |0|   level 1   |0|   level 2   |0|   level 3   |
+// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+constexpr RTPExtensionType CsrcAudioLevel::kId;
+constexpr const char* CsrcAudioLevel::kUri;
+
+bool CsrcAudioLevel::Parse(rtc::ArrayView<const uint8_t> data,
+                           CsrcAudioLevelList* csrcAudioLevels) {
+  if (data.size() < 1 || data.size() > kRtpCsrcSize)
+    return false;
+  csrcAudioLevels->numAudioLevels = data.size();
+  for(uint8_t i = 0; i < csrcAudioLevels->numAudioLevels; i++) {
+    // Ensure range is 0 to 127 inclusive
+    csrcAudioLevels->arrOfAudioLevels[i] = 0x7f & data[i];
+  }
+  return true;
+}
+
+size_t CsrcAudioLevel::ValueSize(const CsrcAudioLevelList& csrcAudioLevels) {
+  return csrcAudioLevels.numAudioLevels;
+}
+
+bool CsrcAudioLevel::Write(uint8_t* data,
+                           const CsrcAudioLevelList& csrcAudioLevels) {
+  RTC_DCHECK_GE(csrcAudioLevels.numAudioLevels, 0);
+  for(uint8_t i = 0; i < csrcAudioLevels.numAudioLevels; i++) {
+    data[i] = csrcAudioLevels.arrOfAudioLevels[i] & 0x7f;
+  }
+  // This extension if used must have at least one audio level
+  return csrcAudioLevels.numAudioLevels;
+}
+
 }  // namespace webrtc
diff --git a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
index 517a83f57c6a..ad0be669b50f 100644
--- a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
@@ -152,5 +152,17 @@ class MId {
   static bool Write(uint8_t* data, const std::string& mid);
 };
 
+class CsrcAudioLevel {
+ public:
+  static constexpr RTPExtensionType kId = kRtpExtensionCsrcAudioLevel;
+  static constexpr const char* kUri =
+      "urn:ietf:params:rtp-hdrext:csrc-audio-level";
+
+  static bool Parse(rtc::ArrayView<const uint8_t> data,
+                    CsrcAudioLevelList* csrcAudioLevels);
+  static size_t ValueSize(const CsrcAudioLevelList& csrcAudioLevels);
+  static bool Write(uint8_t* data, const CsrcAudioLevelList& csrcAudioLevels);
+};
+
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_
diff --git a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_packet.cc b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_packet.cc
index 57f793a7632f..e2e955d0cf35 100644
--- a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_packet.cc
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_packet.cc
@@ -175,6 +175,7 @@ void Packet::GetHeader(RTPHeader* header) const {
   GetExtension<RepairedRtpStreamId>(&header->extension.repairedRtpStreamId);
   GetExtension<PlayoutDelayLimits>(&header->extension.playout_delay);
   GetExtension<MId>(&header->extension.mId);
+  GetExtension<CsrcAudioLevel>(&header->extension.csrcAudioLevels);
 }
 
 size_t Packet::headers_size() const {
diff --git a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
index 6c7cb39fdfa1..0974c13fbc5c 100644
--- a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
@@ -75,6 +75,18 @@ constexpr uint8_t kPacketWithMid[] = {
     0xb5, 'm',  'i',  'd',
     'v',  'a',  'l',  0x00};
 
+constexpr uint8_t kCsrcAudioLevelExtensionId = 0xc;
+constexpr uint8_t kCsrcAudioLevelsSize = 4;
+constexpr uint8_t kCsrcAudioLevels[] = {0x7f, 0x00, 0x10, 0x08};
+constexpr uint8_t kPacketWithCsrcAudioLevels[] = {
+    0x90, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte,
+    0x65, 0x43, 0x12, 0x78,
+    0x12, 0x34, 0x56, 0x78,
+    0xbe, 0xde, 0x00, 0x02,
+    (kCsrcAudioLevelExtensionId << 4) | (kCsrcAudioLevelsSize - 1),
+          0x7f, 0x00, 0x10,
+    0x08, 0x00, 0x00, 0x00};
+
 constexpr uint32_t kCsrcs[] = {0x34567890, 0x32435465};
 constexpr uint8_t kPayload[] = {'p', 'a', 'y', 'l', 'o', 'a', 'd'};
 constexpr uint8_t kPacketPaddingSize = 8;
@@ -164,6 +176,24 @@ TEST(RtpPacketTest, CreateWithDynamicSizedExtensionMid) {
   EXPECT_THAT(kPacketWithMid, ElementsAreArray(packet.data(), packet.size()));
 }
 
+TEST(RtpPacketTest, CreateWithDynamicSizedExtensionCsrcAudioLevel) {
+  RtpPacketToSend::ExtensionManager extensions;
+  extensions.Register<CsrcAudioLevel>(kCsrcAudioLevelExtensionId);
+  RtpPacketToSend packet(&extensions);
+  packet.SetPayloadType(kPayloadType);
+  packet.SetSequenceNumber(kSeqNum);
+  packet.SetTimestamp(kTimestamp);
+  packet.SetSsrc(kSsrc);
+  CsrcAudioLevelList levels;
+  levels.numAudioLevels = kCsrcAudioLevelsSize;
+  for (uint8_t i = 0; i < kCsrcAudioLevelsSize; i++) {
+    levels.arrOfAudioLevels[i] = kCsrcAudioLevels[i];
+  }
+  packet.SetExtension<CsrcAudioLevel>(levels);
+  EXPECT_THAT(kPacketWithCsrcAudioLevels,
+    ElementsAreArray(packet.data(), packet.size()));
+}
+
 TEST(RtpPacketTest, TryToCreateWithEmptyRsid) {
   RtpPacketToSend::ExtensionManager extensions;
   extensions.Register<RtpStreamId>(kRtpStreamIdExtensionId);
@@ -453,11 +483,22 @@ TEST(RtpPacketTest, ParseDynamicSizeExtension) {
     0x12, 'r', 't', 'x',     // Extension with id = 1, size = (2+1).
     0x35, 'm', 'i', 'd', 'v', 'a', 'l', // Extension with id = 3, size = (5+1).
     0x00, 0x00};  // Extension padding.
+  const uint8_t kPacket4[] = {
+    0x90, kPayloadType, kSeqNumFirstByte, kSeqNumSecondByte,
+    0x65, 0x43, 0x12, 0x78,  // Timestamp.
+    0x12, 0x34, 0x56, 0x78,  // Ssrc.
+    0xbe, 0xde, 0x00, 0x05,  // Extensions block of size 5x32bit words.
+    0x21, 'H', 'D',          // Extension with id = 2, size = (1+1).
+    0x12, 'r', 't', 'x',     // Extension with id = 1, size = (2+1).
+    0x35, 'm', 'i', 'd', 'v', 'a', 'l', // Extension with id = 3, size = (5+1).
+    0x43, 0x01, 0x10, 0x00,  // Extenstionwith id = 4, size = (3+1)
+    0x7f, 0x00}; // Extension 4 cont. 1 byte of padding.
   // clang-format on
   RtpPacketReceived::ExtensionManager extensions;
   extensions.Register<RtpStreamId>(1);
   extensions.Register<RepairedRtpStreamId>(2);
   extensions.Register<MId>(3);
+  extensions.Register<CsrcAudioLevel>(4);
   RtpPacketReceived packet(&extensions);
   ASSERT_TRUE(packet.Parse(kPacket1, sizeof(kPacket1)));
 
@@ -484,6 +525,23 @@ TEST(RtpPacketTest, ParseDynamicSizeExtension) {
   std::string mid;
   EXPECT_TRUE(packet.GetExtension<MId>(&mid));
   EXPECT_EQ(mid, "midval");
+
+  // Parse another packet with RtpStreamId, RepairedRtpStreamId, MId,
+  // CsrcAudioLevels
+  ASSERT_TRUE(packet.Parse(kPacket4, sizeof(kPacket4)));
+  EXPECT_TRUE(packet.GetExtension<RtpStreamId>(&rsid));
+  EXPECT_EQ(rsid, "rtx");
+  EXPECT_TRUE(packet.GetExtension<RepairedRtpStreamId>(&repaired_rsid));
+  EXPECT_EQ(repaired_rsid, "HD");
+  EXPECT_TRUE(packet.GetExtension<MId>(&mid));
+  EXPECT_EQ(mid, "midval");
+  CsrcAudioLevelList csrcAudioLevels;
+  EXPECT_TRUE(packet.GetExtension<CsrcAudioLevel>(&csrcAudioLevels));
+  EXPECT_EQ(csrcAudioLevels.numAudioLevels, 4);
+  EXPECT_EQ(csrcAudioLevels.arrOfAudioLevels[0], 0x01);
+  EXPECT_EQ(csrcAudioLevels.arrOfAudioLevels[1], 0x10);
+  EXPECT_EQ(csrcAudioLevels.arrOfAudioLevels[2], 0x00);
+  EXPECT_EQ(csrcAudioLevels.arrOfAudioLevels[3], 0x7f);
 }
 
 TEST(RtpPacketTest, RawExtensionFunctionsAcceptZeroIdAndReturnFalse) {
diff --git a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index f78b811addcb..8aa90aae38d7 100644
--- a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -47,6 +47,8 @@ RTPExtensionType StringToRtpExtensionType(const std::string& extension) {
     return kRtpExtensionRepairedRtpStreamId;
   if (extension == RtpExtension::kMIdUri)
     return kRtpExtensionMId;
+  if (extension == RtpExtension::kCsrcAudioLevelUri)
+    return kRtpExtensionCsrcAudioLevel;
   RTC_NOTREACHED() << "Looking up unsupported RTP extension.";
   return kRtpExtensionNone;
 }
diff --git a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
index c7ca0af8b071..8889a43df1c1 100644
--- a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
@@ -469,6 +469,20 @@ void RtpHeaderParser::ParseOneByteExtensionHeader(
           header->extension.mId.Set(rtc::MakeArrayView(ptr, len + 1));
           break;
         }
+        case kRtpExtensionCsrcAudioLevel: {
+          auto& levels = header->extension.csrcAudioLevels;
+          levels.numAudioLevels = static_cast<uint8_t>(len + 1);
+          if (levels.numAudioLevels > kRtpCsrcSize)  {
+            LOG(LS_WARNING) << "Incorrect number of CSRC audio levels: " <<
+                levels.numAudioLevels;
+            levels.numAudioLevels = 0;
+            return;
+          }
+          for (uint8_t i = 0; i < levels.numAudioLevels; i++) {
+            levels.arrOfAudioLevels[i] = ptr[i] & 0x7f;
+          }
+          break;
+        }
         default:
         case kRtpExtensionNone:
         case kRtpExtensionNumberOfExtensions: {
diff --git a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility_unittest.cc b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility_unittest.cc
index d6a49b87f0c9..32d639e311e2 100644
--- a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility_unittest.cc
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility_unittest.cc
@@ -148,17 +148,18 @@ TEST(RtpHeaderParser, ParseWithOverSizedExtension) {
   EXPECT_EQ(sizeof(kPacket), header.headerLength);
 }
 
-TEST(RtpHeaderParser, ParseAll9Extensions) {
+TEST(RtpHeaderParser, ParseAll10Extensions) {
   const uint8_t kAudioLevel = 0x5a;
   // clang-format off
   const uint8_t kPacket[] = {
       0x90, kPayloadType, 0x00, kSeqNum,
       0x65, 0x43, 0x12, 0x78,  // kTimestamp.
       0x12, 0x34, 0x56, 0x78,  // kSsrc.
-      0xbe, 0xde, 0x00, 0x0a,  // Extension of size 10x32bit words.
+      0xbe, 0xde, 0x00, 0x0b,  // Extension of size 10x32bit words.
       0x40, 0x80|kAudioLevel,  // AudioLevel.
       0x22, 0x01, 0x56, 0xce,  // TransmissionOffset.
       0x62, 0x12, 0x34, 0x56,  // AbsoluteSendTime.
+      0x72, 0x7f, 0x01, 0x10,  // CsrcAudioLevel
       0x81, 0xce, 0xab,        // TransportSequenceNumber.
       0xa0, 0x03,              // VideoRotation.
       0xb2, 0x12, 0x48, 0x76,  // PlayoutDelayLimits.
@@ -171,15 +172,16 @@ TEST(RtpHeaderParser, ParseAll9Extensions) {
   ASSERT_EQ(sizeof(kPacket) % 4, 0u);
 
   RtpHeaderExtensionMap extensions;
-  extensions.Register<TransmissionOffset>(2);
-  extensions.Register<AudioLevel>(4);
-  extensions.Register<AbsoluteSendTime>(6);
-  extensions.Register<TransportSequenceNumber>(8);
-  extensions.Register<VideoOrientation>(0xa);
-  extensions.Register<PlayoutDelayLimits>(0xb);
-  extensions.Register<RtpStreamId>(0xc);
-  extensions.Register<RepairedRtpStreamId>(0xd);
-  extensions.Register<MId>(0xe);
+  EXPECT_TRUE(extensions.Register<TransmissionOffset>(2));
+  EXPECT_TRUE(extensions.Register<AudioLevel>(4));
+  EXPECT_TRUE(extensions.Register<AbsoluteSendTime>(6));
+  EXPECT_TRUE(extensions.Register<CsrcAudioLevel>(7));
+  EXPECT_TRUE(extensions.Register<TransportSequenceNumber>(8));
+  EXPECT_TRUE(extensions.Register<VideoOrientation>(0xa));
+  EXPECT_TRUE(extensions.Register<PlayoutDelayLimits>(0xb));
+  EXPECT_TRUE(extensions.Register<RtpStreamId>(0xc));
+  EXPECT_TRUE(extensions.Register<RepairedRtpStreamId>(0xd));
+  EXPECT_TRUE(extensions.Register<MId>(0xe));
   RtpUtility::RtpHeaderParser parser(kPacket, sizeof(kPacket));
   RTPHeader header;
 
@@ -208,6 +210,10 @@ TEST(RtpHeaderParser, ParseAll9Extensions) {
   EXPECT_EQ(header.extension.rtpStreamId, StreamId("rtx"));
   EXPECT_EQ(header.extension.repairedRtpStreamId, StreamId("stream"));
   EXPECT_EQ(header.extension.mId, StreamId("midvalue"));
+  EXPECT_EQ(header.extension.csrcAudioLevels.numAudioLevels, 3);
+  EXPECT_EQ(header.extension.csrcAudioLevels.arrOfAudioLevels[0], 0x7f);
+  EXPECT_EQ(header.extension.csrcAudioLevels.arrOfAudioLevels[1], 0x01);
+  EXPECT_EQ(header.extension.csrcAudioLevels.arrOfAudioLevels[2], 0x10);
 }
 
 TEST(RtpHeaderParser, ParseMalformedRsidExtensions) {
diff --git a/media/webrtc/trunk/webrtc/test/fuzzers/rtp_packet_fuzzer.cc b/media/webrtc/trunk/webrtc/test/fuzzers/rtp_packet_fuzzer.cc
index 2d6a9a696ae1..5c4be5a6d6f2 100644
--- a/media/webrtc/trunk/webrtc/test/fuzzers/rtp_packet_fuzzer.cc
+++ b/media/webrtc/trunk/webrtc/test/fuzzers/rtp_packet_fuzzer.cc
@@ -101,6 +101,11 @@ void FuzzOneInput(const uint8_t* data, size_t size) {
         packet.GetExtension<MId>(&mid);
         break;
       }
+      case kRtpExtensionCsrcAudioLevel: {
+        CsrcAudioLevelList levels;
+        packet.GetExtension<CsrcAudioLevel>(&levels);
+        break;
+      }
     }
   }
 }
diff --git a/media/webrtc/trunk/webrtc/video/rtp_stream_receiver.cc b/media/webrtc/trunk/webrtc/video/rtp_stream_receiver.cc
index 081da7e08051..e919a3c774b7 100644
--- a/media/webrtc/trunk/webrtc/video/rtp_stream_receiver.cc
+++ b/media/webrtc/trunk/webrtc/video/rtp_stream_receiver.cc
@@ -412,6 +412,14 @@ bool RtpStreamReceiver::DeliverRtp(const uint8_t* rtp_packet,
         ss << ", repaired rid: " << header.extension.repairedRtpStreamId.data();
       if (!header.extension.mId.empty())
         ss << ", mid: " << header.extension.mId.data();
+      const auto& csrcLevels = header.extension.csrcAudioLevels;
+      if (csrcLevels.numAudioLevels) {
+        ss << ", csrc audio levels : {" << csrcLevels.arrOfAudioLevels[0];
+        for (uint8_t i = 1; i < csrcLevels.numAudioLevels; i++) {
+          ss << ", " << csrcLevels.arrOfAudioLevels[i];
+        }
+        ss << "}";
+      }
       LOG(LS_INFO) << ss.str();
       last_packet_log_ms_ = now_ms;
     }

From b42a174bc8bf750639d7517fef9a16b76472b1a6 Mon Sep 17 00:00:00 2001
From: Nico Grunbaum <none@none>
Date: Tue, 14 Nov 2017 10:17:10 -0800
Subject: [PATCH 096/219] Bug 1363667 - P3 - RTP Source Observer r=mjf

MozReview-Commit-ID: BwZhi49KlfB

--HG--
extra : rebase_source : b6b9230d07848952a200d2ded956d39439e5dc1e
---
 dom/bindings/moz.build                        |   1 +
 dom/media/bridge/moz.build                    |   1 +
 .../src/media-conduit/AudioConduit.cpp        |  43 +++++
 .../src/media-conduit/AudioConduit.h          |  18 +-
 .../src/media-conduit/MediaConduitInterface.h |   4 +
 .../src/media-conduit/RtpSourceObserver.cpp   | 167 +++++++++++++++++
 .../src/media-conduit/RtpSourceObserver.h     | 175 ++++++++++++++++++
 .../signaling/src/media-conduit/moz.build     |   1 +
 .../src/peerconnection/TransceiverImpl.cpp    |  47 ++++-
 .../src/peerconnection/TransceiverImpl.h      |  10 +
 .../rtp_rtcp/include/rtp_packet_observer.h    |  19 ++
 .../trunk/webrtc/voice_engine/channel.cc      |  18 +-
 .../trunk/webrtc/voice_engine/channel.h       |   5 +
 .../webrtc/voice_engine/channel_proxy.cc      |   4 +
 .../trunk/webrtc/voice_engine/channel_proxy.h |   4 +
 15 files changed, 514 insertions(+), 3 deletions(-)
 create mode 100644 media/webrtc/signaling/src/media-conduit/RtpSourceObserver.cpp
 create mode 100644 media/webrtc/signaling/src/media-conduit/RtpSourceObserver.h
 create mode 100644 media/webrtc/trunk/webrtc/modules/rtp_rtcp/include/rtp_packet_observer.h

diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index b695fe3ecc76..b1516f5c2f01 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -92,6 +92,7 @@ LOCAL_INCLUDES += [
     '/media/webrtc/',
     '/media/webrtc/signaling/src/common/time_profiling',
     '/media/webrtc/signaling/src/peerconnection',
+    '/media/webrtc/trunk/',
 ]
 
 DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
diff --git a/dom/media/bridge/moz.build b/dom/media/bridge/moz.build
index 6d396c6156f4..22db85e02b2b 100644
--- a/dom/media/bridge/moz.build
+++ b/dom/media/bridge/moz.build
@@ -23,6 +23,7 @@ LOCAL_INCLUDES += [
     '/media/webrtc/signaling/src/media-conduit',
     '/media/webrtc/signaling/src/mediapipeline',
     '/media/webrtc/signaling/src/peerconnection',
+    '/media/webrtc/trunk/',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
index 279880abfd04..56d9179a7f8f 100644
--- a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
@@ -285,6 +285,48 @@ bool WebrtcAudioConduit::InsertDTMFTone(int channel, int eventCode,
   return result != -1;
 }
 
+void
+WebrtcAudioConduit::OnRtpPacket(const webrtc::WebRtcRTPHeader* aHeader,
+                                const int64_t aTimestamp,
+                                const uint32_t aJitter) {
+  mRtpSourceObserver.OnRtpPacket(aHeader, aTimestamp, aJitter);
+}
+
+void
+WebrtcAudioConduit::GetRtpSources(const int64_t aTimeNow,
+                                  nsTArray<dom::RTCRtpSourceEntry>& outSources)
+{
+  return mRtpSourceObserver.GetRtpSources(aTimeNow, outSources);
+}
+
+// test-only: inserts a CSRC entry in a RtpSourceObserver's history for
+// getContributingSources mochitests
+void InsertAudioLevelForContributingSource(RtpSourceObserver& observer,
+                                           uint32_t aCsrcSource,
+                                           int64_t aTimestamp,
+                                           bool aHasAudioLevel,
+                                           uint8_t aAudioLevel)
+{
+  using EntryType = dom::RTCRtpSourceEntryType;
+  auto key = RtpSourceObserver::GetKey(aCsrcSource, EntryType::Contributing);
+  auto& hist = observer.mRtpSources[key];
+  hist.Insert(aTimestamp, aTimestamp, aHasAudioLevel, aAudioLevel);
+}
+
+
+void
+WebrtcAudioConduit::InsertAudioLevelForContributingSource(uint32_t aCsrcSource,
+                                                          int64_t aTimestamp,
+                                                          bool aHasAudioLevel,
+                                                          uint8_t aAudioLevel)
+{
+  mozilla::InsertAudioLevelForContributingSource(mRtpSourceObserver,
+                                                 aCsrcSource,
+                                                 aTimestamp,
+                                                 aHasAudioLevel,
+                                                 aAudioLevel);
+}
+
 /*
  * WebRTCAudioConduit Implementation
  */
@@ -371,6 +413,7 @@ MediaConduitErrorCode WebrtcAudioConduit::Init()
   webrtc::VoiceEngineImpl* s = static_cast<webrtc::VoiceEngineImpl*>(mVoiceEngine);
   mChannelProxy = s->GetChannelProxy(mChannel);
   MOZ_ASSERT(mChannelProxy);
+  mChannelProxy->SetRtpPacketObserver(this);
 
   CSFLogDebug(LOGTAG, "%s Channel Created %d ",__FUNCTION__, mChannel);
 
diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.h b/media/webrtc/signaling/src/media-conduit/AudioConduit.h
index 4f603845d5df..a7af9f9ed943 100644
--- a/media/webrtc/signaling/src/media-conduit/AudioConduit.h
+++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.h
@@ -13,6 +13,7 @@
 
 #include "MediaConduitInterface.h"
 #include "MediaEngineWrapper.h"
+#include "RtpSourceObserver.h"
 
 // Audio Engine Includes
 #include "webrtc/common_types.h"
@@ -49,7 +50,8 @@ NTPtoDOMHighResTimeStamp(uint32_t ntpHigh, uint32_t ntpLow);
  *  - media-source and target to external transport
  */
 class WebrtcAudioConduit: public AudioSessionConduit
-	      		, public webrtc::Transport
+                        , public webrtc::Transport
+                        , public webrtc::RtpPacketObserver
 {
 public:
   //VoiceEngine defined constant for Payload Name Size.
@@ -251,6 +253,18 @@ public:
   bool InsertDTMFTone(int channel, int eventCode, bool outOfBand,
                       int lengthMs, int attenuationDb) override;
 
+  void GetRtpSources(const int64_t aTimeNow,
+                     nsTArray<dom::RTCRtpSourceEntry>& outSources) override;
+
+  void OnRtpPacket(const webrtc::WebRtcRTPHeader* aRtpHeader,
+                   const int64_t aTimestamp,
+                   const uint32_t aJitter) override;
+
+  // test-only: inserts fake CSRCs and audio level data
+  void InsertAudioLevelForContributingSource(uint32_t aSource,
+                                             int64_t aTimestamp,
+                                             bool aHasLevel,
+                                             uint8_t aLevel);
 private:
   WebrtcAudioConduit(const WebrtcAudioConduit& other) = delete;
   void operator=(const WebrtcAudioConduit& other) = delete;
@@ -322,6 +336,8 @@ private:
 
   uint32_t mSamples;
   uint32_t mLastSyncLog;
+
+  RtpSourceObserver mRtpSourceObserver;
 };
 
 } // end namespace
diff --git a/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h b/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h
index 6b73c3503cea..6af8e5a85cea 100644
--- a/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h
+++ b/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h
@@ -12,6 +12,7 @@
 #include "mozilla/RefCounted.h"
 #include "mozilla/UniquePtr.h"
 #include "double-conversion/utils.h" // for DISALLOW_COPY_AND_ASSIGN
+#include "RtpSourceObserver.h"
 #include "CodecConfig.h"
 #include "VideoTypes.h"
 #include "MediaConduitErrors.h"
@@ -552,6 +553,9 @@ public:
   virtual bool InsertDTMFTone(int channel, int eventCode, bool outOfBand,
                               int lengthMs, int attenuationDb) = 0;
 
+  virtual void GetRtpSources(int64_t aTimeNow,
+                             nsTArray<dom::RTCRtpSourceEntry>& outSources) = 0;
+
 };
 }
 #endif
diff --git a/media/webrtc/signaling/src/media-conduit/RtpSourceObserver.cpp b/media/webrtc/signaling/src/media-conduit/RtpSourceObserver.cpp
new file mode 100644
index 000000000000..3f4df8e13d9e
--- /dev/null
+++ b/media/webrtc/signaling/src/media-conduit/RtpSourceObserver.cpp
@@ -0,0 +1,167 @@
+#include "RtpSourceObserver.h"
+#include "nsThreadUtils.h"
+#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/modules/include/module_common_types.h"
+
+namespace mozilla {
+
+using EntryType = dom::RTCRtpSourceEntryType;
+
+RtpSourceObserver::RtpSourceObserver() :
+  mLevelGuard("RtpSourceObserver::mLevelGuard") {}
+
+void
+RtpSourceObserver::OnRtpPacket(const webrtc::WebRtcRTPHeader* aHeader,
+                                     const int64_t aTimestamp,
+                                     const uint32_t aJitter)
+{
+  auto& header = aHeader->header;
+  MutexAutoLock lock(mLevelGuard);
+  {
+    mMaxJitterWindow = std::max(mMaxJitterWindow,
+                                static_cast<int64_t>(aJitter) * 2);
+    const auto jitterAdjusted = aTimestamp + aJitter;
+    auto& hist = mRtpSources[GetKey(header.ssrc, EntryType::Synchronization)];
+    hist.Prune(aTimestamp);
+    // ssrc-audio-level handling
+    hist.Insert(aTimestamp, jitterAdjusted,
+                header.extension.hasAudioLevel,
+                header.extension.audioLevel);
+
+    // csrc-audio-level handling
+    const auto& list = header.extension.csrcAudioLevels;
+    for (uint8_t i = 0; i < header.numCSRCs; i++) {
+      const uint32_t& csrc = header.arrOfCSRCs[i];
+      auto& hist = mRtpSources[GetKey(csrc, EntryType::Contributing)];
+      hist.Prune(aTimestamp);
+      bool hasLevel = i < list.numAudioLevels;
+      uint8_t level = hasLevel ? list.arrOfAudioLevels[i] : 0;
+      hist.Insert(aTimestamp, jitterAdjusted, hasLevel, level);
+    }
+  }
+}
+
+void
+RtpSourceObserver::GetRtpSources(const int64_t aTimeNow,
+    nsTArray<dom::RTCRtpSourceEntry>& outSources) const
+{
+  MutexAutoLock lock(mLevelGuard);
+  outSources.Clear();
+  for (const auto& it : mRtpSources) {
+    const RtpSourceEntry* entry = it.second.FindClosestNotAfter(aTimeNow);
+    if (entry) {
+      dom::RTCRtpSourceEntry domEntry;
+      domEntry.mSource.Construct(GetSourceFromKey(it.first));
+      domEntry.mSourceType.Construct(GetTypeFromKey(it.first));
+      domEntry.mTimestamp.Construct(entry->jitterAdjustedTimestamp);
+      if (entry->hasAudioLevel) {
+        domEntry.mAudioLevel.Construct(entry->audioLevel);
+      }
+      outSources.AppendElement(std::move(domEntry));
+    }
+  }
+}
+
+int64_t RtpSourceObserver::NowInReportClockTime() {
+  return webrtc::Clock::GetRealTimeClock()->TimeInMilliseconds();
+}
+
+const RtpSourceObserver::RtpSourceEntry*
+RtpSourceObserver::RtpSourceHistory::FindClosestNotAfter(int64_t aTime) const {
+  // This method scans the history for the entry whose timestamp is closest to a
+  // given timestamp but no greater. Because it is scanning forward, it keeps
+  // track of the closest entry it has found so far in case it overshoots.
+  // There is no before map.begin() which complicates things, so found tracks
+  // if something was really found.
+  auto lastFound = mDetailedHistory.cbegin();
+  bool found = false;
+  for (const auto& it : mDetailedHistory) {
+    if (it.second.jitterAdjustedTimestamp > aTime) {
+      break;
+    }
+    // lastFound can't start before begin, so the first inc must be skipped
+    if (found) {
+      lastFound++;
+    }
+    found = true;
+  }
+  if (found) {
+    return &lastFound->second;
+  }
+  if (HasEvicted() && aTime >= mLatestEviction.jitterAdjustedTimestamp) {
+    return &mLatestEviction;
+  }
+  return nullptr;
+}
+
+void
+RtpSourceObserver::RtpSourceHistory::Prune(const int64_t aTimeNow) {
+  const auto aTimeT = aTimeNow - mMaxJitterWindow;
+  const auto aTimePrehistory = aTimeNow - kHistoryWindow;
+  bool found = false;
+  // New lower bound of the map
+  auto lower = mDetailedHistory.begin();
+  for (auto& it : mDetailedHistory) {
+    if (it.second.jitterAdjustedTimestamp > aTimeT) {
+      found = true;
+      break;
+    }
+    if (found) {
+      lower++;
+    }
+    found = true;
+  }
+  if (found) {
+    if (lower->second.jitterAdjustedTimestamp > aTimePrehistory) {
+      mLatestEviction = lower->second;
+      mHasEvictedEntry = true;
+    }
+    lower++;
+    mDetailedHistory.erase(mDetailedHistory.begin(), lower);
+  }
+  if (HasEvicted() &&
+      (mLatestEviction.jitterAdjustedTimestamp + kHistoryWindow) < aTimeNow) {
+    mHasEvictedEntry = false;
+  }
+}
+
+void
+RtpSourceObserver::RtpSourceHistory::Insert(const int64_t aTimeNow,
+                                            const int64_t aTimestamp,
+                                            const bool aHasAudioLevel,
+                                            const uint8_t aAudioLevel)
+{
+  Insert(aTimeNow, aTimestamp).Update(aTimestamp, aHasAudioLevel, aAudioLevel);
+}
+
+RtpSourceObserver::RtpSourceEntry&
+RtpSourceObserver::RtpSourceHistory::Insert(const int64_t aTimeNow,
+                                            const int64_t aTimestamp)
+{
+  // Time T is the oldest time inside the jitter window (now - jitter)
+  // Time J is the newest time inside the jitter window (now + jitter)
+  // Time x is the jitter adjusted entry time
+  // Time Z is the time of the long term storage element
+  // Times A, B, C are times of entries in the jitter window buffer
+  // x-axis: time
+  // x or x        T   J
+  //  |------Z-----|ABC| -> |------Z-----|ABC|
+  if ((aTimestamp + kHistoryWindow) < aTimeNow ||
+      aTimestamp < mLatestEviction.jitterAdjustedTimestamp) {
+    return mPrehistory; // A.K.A. /dev/null
+  }
+  mMaxJitterWindow = std::max(mMaxJitterWindow,
+                              (aTimestamp - aTimeNow) * 2);
+  const int64_t aTimeT = aTimeNow - mMaxJitterWindow;
+  //           x  T   J
+  // |------Z-----|ABC| -> |--------x---|ABC|
+  if (aTimestamp < aTimeT) {
+    mHasEvictedEntry = true;
+    return mLatestEviction;
+  }
+  //              T  X J
+  // |------Z-----|AB-C| -> |--------x---|ABXC|
+  return mDetailedHistory[aTimestamp];
+}
+
+}
diff --git a/media/webrtc/signaling/src/media-conduit/RtpSourceObserver.h b/media/webrtc/signaling/src/media-conduit/RtpSourceObserver.h
new file mode 100644
index 000000000000..66f47cb5f2cf
--- /dev/null
+++ b/media/webrtc/signaling/src/media-conduit/RtpSourceObserver.h
@@ -0,0 +1,175 @@
+#ifndef AUDIOLEVELOBSERVER_H
+#define AUDIOLEVELOBSERVER_H
+
+#include <vector>
+#include <map>
+
+#include "mozilla/Mutex.h"
+#include "nsISupportsImpl.h"
+#include "mozilla/dom/RTCRtpSourcesBinding.h"
+#include "webrtc/modules/rtp_rtcp/include/rtp_packet_observer.h"
+
+// Unit Test class
+namespace test {
+  class RtpSourcesTest;
+}
+
+namespace mozilla {
+
+/* Observes reception of RTP packets and tabulates data about the
+ * most recent arival times by source (csrc or ssrc) and audio level information
+ *  * csrc-audio-level RTP header extension
+ *  * ssrc-audio-level RTP header extension
+ */
+class RtpSourceObserver: public webrtc::RtpPacketObserver {
+public:
+
+  RtpSourceObserver();
+
+  virtual ~RtpSourceObserver() {};
+
+  void OnRtpPacket(const webrtc::WebRtcRTPHeader* aRtpHeader,
+                   const int64_t aTimestamp,
+                   const uint32_t aJitter) override;
+
+  /* Get the local time in MS from the same clock source that is used
+   * to generate the capture timestamps. Use for computing the age of
+   * an entry relative to another clock, e.g. the JS
+   * @return time of now in MS
+   */
+  static int64_t NowInReportClockTime();
+
+  /*
+   * Get the most recent 10 second window of CSRC and SSRC sources.
+   * @param aTimeNow the current report clock time, @see NowInReportClockTime.
+   * @param outLevels will be popluted with source entries
+   * Note: this takes jitter into account when calculating the window so
+   * the window is actually [time - jitter - 10 sec .. time - jitter]
+   */
+  void
+  GetRtpSources(const int64_t aTimeNow,
+                nsTArray<dom::RTCRtpSourceEntry>& outSources) const;
+
+private:
+  // Note: these are pool allocated
+  struct RtpSourceEntry {
+    RtpSourceEntry() = default;
+    void Update(const int64_t aTimestamp,
+                const bool aHasAudioLevel,
+                const uint8_t aAudioLevel) {
+      jitterAdjustedTimestamp = aTimestamp;
+      // Audio level range is 0 - 127 inclusive
+      hasAudioLevel = aHasAudioLevel && !(aAudioLevel & 0x80);
+      audioLevel = aAudioLevel;
+    }
+    // Time this information was received + jitter
+    int64_t jitterAdjustedTimestamp = 0;
+    bool hasAudioLevel = false;
+    uint8_t audioLevel = 0;
+  };
+  /* Maintains a history of packets for reporting with getContributingSources
+   * and getSynchronizationSources. It is expected that entries will not always
+   * be observed in chronological order, and that the correct entry for a query
+   * not be the most recently added item. Many times the query time is expected
+   * to fall within [now - Jitter window .. now + Jitter Window]. A full history
+   * is kept within the jitter window, and only the most recent to fall out of
+   * the window is stored for the full 10 seconds. This value is only likely to
+   * be returned when the stream is stopped or paused.
+   *  x-axis: time (non-linear scale)
+   *  let J = now + Jitter Window
+   *  let T = now - Jitter Window
+   *  now - 10 seconds                             T      now       J
+   *  |-----------------Z--------------------------|-AB--CDEFG-HI--J|
+   *                    ^Latest evicted               ^Jitter buffer entries
+   *  Ex Query Time  ^Q0                  ^Q1          ^Q2 ^Q3     ^Q4
+   *  Query result:
+   *  Q0: Nothing
+   *  Q1: Z
+   *  Q2: B
+   *  Q3: E
+   *  Q4: I
+   */
+  class RtpSourceHistory {
+  public:
+    RtpSourceHistory() = default;
+    // Finds the closest entry to a time, and passes that value to a closure
+    // Note: the pointer is invalidated by any operation on the history
+    // Note: the pointer is owned by the RtpSourceHistory
+    const RtpSourceEntry* FindClosestNotAfter(int64_t aTime) const;
+    // Inserts data into the history, may silently drop data if it is too old
+    void Insert(const int64_t aTimeNow,
+                const int64_t aTimestamp,
+                const bool aHasAudioLevel,
+                const uint8_t aAudioLevel);
+    // Removes aged out from the jitter window
+    void Prune(const int64_t aTimeNow);
+    // Set Source
+    void SetSource(uint32_t aSource, dom::RTCRtpSourceEntryType aType);
+  private:
+    // Finds a place to insert data and returns a reference to it
+    RtpSourceObserver::RtpSourceEntry&
+    Insert(const int64_t aTimeNow, const int64_t aTimestamp);
+    // Is the history buffer empty?
+    bool Empty() const { return !mDetailedHistory.size(); }
+    // Is there an evicted entry
+    bool HasEvicted() const { return mHasEvictedEntry; }
+
+    // Minimum amount of time (ms) to store a complete packet history
+    constexpr static int64_t kMinJitterWindow = 1000;
+    // Size of the history window (ms)
+    constexpr static int64_t kHistoryWindow = 10000;
+    // This is 2 x the maximum observed jitter or the min which ever is higher
+    int64_t mMaxJitterWindow = kMinJitterWindow;
+    // The least old entry to be kicked from the buffer.
+    RtpSourceEntry mLatestEviction;
+    // Is there an evicted entry?
+    bool mHasEvictedEntry = false;
+    std::map<int64_t, RtpSourceEntry> mDetailedHistory;
+    // Entry before history
+    RtpSourceEntry mPrehistory;
+    // Unit test
+    friend test::RtpSourcesTest;
+  };
+
+  // Do not copy or assign
+  RtpSourceObserver(const RtpSourceObserver&) = delete;
+  RtpSourceObserver& operator=(RtpSourceObserver const&) = delete;
+  // Returns a key for a source and a type
+  static uint64_t
+  GetKey(const uint32_t id, const dom::RTCRtpSourceEntryType aType) {
+    return (aType == dom::RTCRtpSourceEntryType::Synchronization) ?
+      (static_cast<uint64_t>(id) | (static_cast<uint64_t>(0x1) << 32)) :
+      (static_cast<uint64_t>(id));
+  }
+  // Returns the source from a key
+  static uint32_t GetSourceFromKey(const uint64_t aKey) {
+    return static_cast<uint32_t>(aKey & ~(static_cast<uint64_t>(0x1) << 32));
+  }
+  // Returns the type from a key
+  static dom::RTCRtpSourceEntryType GetTypeFromKey(const uint64_t aKey) {
+    return (aKey & (static_cast<uint64_t>(0x1) << 32))
+        ? dom::RTCRtpSourceEntryType::Synchronization
+        : dom::RTCRtpSourceEntryType::Contributing;
+  }
+  // Map CSRC to RtpSourceEntry
+  std::map<uint64_t, RtpSourceHistory> mRtpSources;
+  // 2 x the largest observed
+  int64_t mMaxJitterWindow;
+  // Guards statistics
+  mutable Mutex mLevelGuard;
+
+  // Unit test
+  friend test::RtpSourcesTest;
+
+  // Testing only
+  // Inserts additional csrc audio levels for mochitests
+  friend void InsertAudioLevelForContributingSource(
+      RtpSourceObserver& observer,
+      uint32_t aCsrcSource,
+      int64_t aTimestamp,
+      bool aHasAudioLevel,
+      uint8_t aAudioLevel);
+};
+}
+#undef NG
+#endif // AUDIOLEVELOBSERVER_H
\ No newline at end of file
diff --git a/media/webrtc/signaling/src/media-conduit/moz.build b/media/webrtc/signaling/src/media-conduit/moz.build
index 6444b88ec048..ef663638b2d9 100644
--- a/media/webrtc/signaling/src/media-conduit/moz.build
+++ b/media/webrtc/signaling/src/media-conduit/moz.build
@@ -22,6 +22,7 @@ UNIFIED_SOURCES += [
     'AudioConduit.cpp',
     'GmpVideoCodec.cpp',
     'MediaDataDecoderCodec.cpp',
+    'RtpSourceObserver.cpp',
     'VideoConduit.cpp',
     'WebrtcGmpVideoCodec.cpp',
     'WebrtcMediaDataDecoderCodec.cpp',
diff --git a/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp b/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp
index 8b8026627594..4d1e01f331c1 100644
--- a/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp
@@ -703,6 +703,21 @@ TransceiverImpl::UpdateAudioConduit()
                           " ConfigureRecvMediaCodecs failed: " << error);
       return NS_ERROR_FAILURE;
     }
+
+    const SdpExtmapAttributeList::Extmap* audioLevelExt =
+        details.GetExt(webrtc::RtpExtension::kAudioLevelUri);
+    if (audioLevelExt) {
+      MOZ_MTLOG(ML_DEBUG, "Calling EnableAudioLevelExtension");
+      error = conduit->EnableAudioLevelExtension(true,
+                                                 audioLevelExt->entry,
+                                                 true);
+
+      if (error) {
+        MOZ_MTLOG(ML_ERROR, mPCHandle << "[" << mMid << "]: " << __FUNCTION__ <<
+                            " EnableAudioLevelExtension failed: " << error);
+        return NS_ERROR_FAILURE;
+      }
+    }
   }
 
   if (mJsepTransceiver->mSendTrack.GetNegotiatedDetails() &&
@@ -740,7 +755,9 @@ TransceiverImpl::UpdateAudioConduit()
 
     if (audioLevelExt) {
       MOZ_MTLOG(ML_DEBUG, "Calling EnableAudioLevelExtension");
-      error = conduit->EnableAudioLevelExtension(true, audioLevelExt->entry);
+      error = conduit->EnableAudioLevelExtension(true,
+                                                 audioLevelExt->entry,
+                                                 false);
 
       if (error) {
         MOZ_MTLOG(ML_ERROR, mPCHandle << "[" << mMid << "]: " << __FUNCTION__ <<
@@ -1072,4 +1089,32 @@ TransceiverImpl::IsVideo() const
   return mJsepTransceiver->GetMediaType() == SdpMediaSection::MediaType::kVideo;
 }
 
+void TransceiverImpl::GetRtpSources(const int64_t aTimeNow,
+    nsTArray<dom::RTCRtpSourceEntry>& outSources) const
+{
+  if (IsVideo()) {
+    return;
+  }
+  WebrtcAudioConduit *audio_conduit =
+    static_cast<WebrtcAudioConduit*>(mConduit.get());
+  audio_conduit->GetRtpSources(aTimeNow, outSources);
+}
+
+
+void TransceiverImpl::InsertAudioLevelForContributingSource(uint32_t aSource,
+                                                            int64_t aTimestamp,
+                                                            bool aHasLevel,
+                                                            uint8_t aLevel)
+{
+  if (IsVideo()) {
+    return;
+  }
+  WebrtcAudioConduit *audio_conduit =
+    static_cast<WebrtcAudioConduit*>(mConduit.get());
+  audio_conduit->InsertAudioLevelForContributingSource(aSource,
+                                                       aTimestamp,
+                                                       aHasLevel,
+                                                       aLevel);
+}
+
 } // namespace mozilla
diff --git a/media/webrtc/signaling/src/peerconnection/TransceiverImpl.h b/media/webrtc/signaling/src/peerconnection/TransceiverImpl.h
index 89156a489f72..5ff7a7a5fa3b 100644
--- a/media/webrtc/signaling/src/peerconnection/TransceiverImpl.h
+++ b/media/webrtc/signaling/src/peerconnection/TransceiverImpl.h
@@ -33,6 +33,7 @@ class JsepTrackNegotiatedDetails;
 
 namespace dom {
 class RTCRtpTransceiver;
+struct RTCRtpSourceEntry;
 }
 
 /**
@@ -109,6 +110,15 @@ public:
 
   bool IsVideo() const;
 
+  void GetRtpSources(const int64_t aTimeNow,
+                     nsTArray<dom::RTCRtpSourceEntry>& outSources) const;
+
+  // test-only: insert fake CSRCs and audio levels for testing
+  void InsertAudioLevelForContributingSource(uint32_t aSource,
+                                             int64_t aTimestamp,
+                                             bool aHasLevel,
+                                             uint8_t aLevel);
+
   NS_DECL_THREADSAFE_ISUPPORTS
 
 private:
diff --git a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/include/rtp_packet_observer.h b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/include/rtp_packet_observer.h
new file mode 100644
index 000000000000..ef9854d9396f
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/include/rtp_packet_observer.h
@@ -0,0 +1,19 @@
+#ifndef RTP_AUDIO_LEVEL_OBSERVER_H
+#define RTP_AUDIO_LEVEL_OBSERVER_H
+
+namespace webrtc {
+
+struct WebRtcRTPHeader;
+
+class RtpPacketObserver {
+  public:
+
+  virtual void
+  OnRtpPacket(const WebRtcRTPHeader* aRtpHeader,
+              const int64_t aTimestamp,
+              const uint32_t aJitter) = 0;
+};
+
+}
+
+#endif // RTP_AUDIO_LEVEL_OBSERVER_H
diff --git a/media/webrtc/trunk/webrtc/voice_engine/channel.cc b/media/webrtc/trunk/webrtc/voice_engine/channel.cc
index 4a012e7e7345..65358b084922 100644
--- a/media/webrtc/trunk/webrtc/voice_engine/channel.cc
+++ b/media/webrtc/trunk/webrtc/voice_engine/channel.cc
@@ -29,6 +29,7 @@
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/pacing/packet_router.h"
+#include "webrtc/modules/rtp_rtcp/include/rtp_packet_observer.h"
 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
@@ -596,6 +597,10 @@ bool Channel::GetRTCPReceiverStatistics(int64_t* timestamp,
   return true;
 }
 
+void Channel::SetRtpPacketObserver(RtpPacketObserver* observer) {
+  rtp_source_observer_ = observer;
+}
+
 int32_t Channel::SendData(FrameType frameType,
                           uint8_t payloadType,
                           uint32_t timeStamp,
@@ -781,7 +786,18 @@ int32_t Channel::OnReceivedPayloadData(const uint8_t* payloadData,
         "Channel::OnReceivedPayloadData() unable to push data to the ACM");
     return -1;
   }
-
+  // Observe incoming packets for getContributingSources and
+  // getSynchronizationSources.
+  if (rtp_source_observer_) {
+    const auto playoutFrequency = audio_coding_->PlayoutFrequency();
+    uint32_t jitter = 0;
+    if (playoutFrequency > 0) {
+      const ChannelStatistics stats = statistics_proxy_->GetStats();
+      jitter = stats.rtcp.jitter / (playoutFrequency / 1000);
+    }
+    rtp_source_observer_->OnRtpPacket(rtpHeader,
+        webrtc::Clock::GetRealTimeClock()->TimeInMilliseconds(), jitter);
+  }
   int64_t round_trip_time = 0;
   _rtpRtcpModule->RTT(rtp_receiver_->SSRC(), &round_trip_time, NULL, NULL,
                       NULL);
diff --git a/media/webrtc/trunk/webrtc/voice_engine/channel.h b/media/webrtc/trunk/webrtc/voice_engine/channel.h
index b5051d84ce73..0d4bfc37fa3c 100644
--- a/media/webrtc/trunk/webrtc/voice_engine/channel.h
+++ b/media/webrtc/trunk/webrtc/voice_engine/channel.h
@@ -50,6 +50,7 @@ class RateLimiter;
 class ReceiveStatistics;
 class RemoteNtpTimeEstimator;
 class RtcEventLog;
+class RtpPacketObserver;
 class RTPPayloadRegistry;
 class RtpReceiver;
 class RTPReceiverAudio;
@@ -432,6 +433,8 @@ class Channel
                                  uint64_t* bytesReceived,
                                  double* packetsFractionLost,
                                  int64_t* rtt) const;
+  virtual void SetRtpPacketObserver(RtpPacketObserver* observer);
+
  protected:
   void OnIncomingFractionLoss(int fraction_lost);
   void OnIncomingReceiverReports(const ReportBlockList& aReportBlocks,
@@ -570,6 +573,8 @@ class Channel
 
   // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
   rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
+
+  RtpPacketObserver* rtp_source_observer_ = nullptr;
 };
 
 }  // namespace voe
diff --git a/media/webrtc/trunk/webrtc/voice_engine/channel_proxy.cc b/media/webrtc/trunk/webrtc/voice_engine/channel_proxy.cc
index 90af37d68350..8465badb1f7b 100644
--- a/media/webrtc/trunk/webrtc/voice_engine/channel_proxy.cc
+++ b/media/webrtc/trunk/webrtc/voice_engine/channel_proxy.cc
@@ -293,6 +293,10 @@ void ChannelProxy::SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   channel()->SetRtcpRttStats(rtcp_rtt_stats);
 }
+void ChannelProxy::SetRtpPacketObserver(RtpPacketObserver* observer) {
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  channel()->SetRtpPacketObserver(observer);
+}
 
 Channel* ChannelProxy::channel() const {
   RTC_DCHECK(channel_owner_.channel());
diff --git a/media/webrtc/trunk/webrtc/voice_engine/channel_proxy.h b/media/webrtc/trunk/webrtc/voice_engine/channel_proxy.h
index 87f7a56d5460..afa207dbf1c0 100644
--- a/media/webrtc/trunk/webrtc/voice_engine/channel_proxy.h
+++ b/media/webrtc/trunk/webrtc/voice_engine/channel_proxy.h
@@ -28,6 +28,7 @@ class AudioSinkInterface;
 class PacketRouter;
 class RtcEventLog;
 class RtcpRttStats;
+class RtpPacketObserver;
 class RtpPacketSender;
 class Transport;
 class TransportFeedbackObserver;
@@ -111,6 +112,9 @@ class ChannelProxy {
 
   virtual void SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats);
 
+  virtual void SetRtpPacketObserver(
+      RtpPacketObserver* observer);
+
  private:
   Channel* channel() const;
 

From 89b0c3e5e91e8ae811aa6b3e6cfa01b6349e93ca Mon Sep 17 00:00:00 2001
From: Nico Grunbaum <none@none>
Date: Tue, 14 Nov 2017 10:26:04 -0800
Subject: [PATCH 097/219] Bug 1363667 - P4 - RTP Source Observer unit tests
 r=mjf

MozReview-Commit-ID: DuFqdReT7JD

--HG--
extra : rebase_source : 2341750f103f391b2e7903f1fed21252df2e95bb
---
 media/webrtc/signaling/gtest/moz.build        |   1 +
 .../signaling/gtest/rtpsources_unittests.cpp  | 352 ++++++++++++++++++
 2 files changed, 353 insertions(+)
 create mode 100644 media/webrtc/signaling/gtest/rtpsources_unittests.cpp

diff --git a/media/webrtc/signaling/gtest/moz.build b/media/webrtc/signaling/gtest/moz.build
index 70b0bbb0c58e..168c286c4f3d 100644
--- a/media/webrtc/signaling/gtest/moz.build
+++ b/media/webrtc/signaling/gtest/moz.build
@@ -27,6 +27,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'uikit' and CONFIG['OS_TARGET'] != 'Android':
         'jsep_session_unittest.cpp',
         'jsep_track_unittest.cpp',
         'mediaconduit_unittests.cpp',
+        'rtpsources_unittests.cpp',
         'sdp_unittests.cpp',
         'videoconduit_unittests.cpp',
     ]
diff --git a/media/webrtc/signaling/gtest/rtpsources_unittests.cpp b/media/webrtc/signaling/gtest/rtpsources_unittests.cpp
new file mode 100644
index 000000000000..1f27ca637857
--- /dev/null
+++ b/media/webrtc/signaling/gtest/rtpsources_unittests.cpp
@@ -0,0 +1,352 @@
+#include <RtpSourceObserver.h>
+#include "webrtc/modules/include/module_common_types.h"
+#define GTEST_HAS_RTTI 0
+#include "gtest/gtest.h"
+
+using namespace mozilla;
+
+namespace test {
+class RtpSourcesTest : public ::testing::Test
+{
+using RtpSourceHistory = RtpSourceObserver::RtpSourceHistory;
+using RtpSourceEntry = mozilla::RtpSourceObserver::RtpSourceEntry;
+public:
+
+  // History Tests
+
+  // Test init happens as expected
+  void TestInitState() {
+    RtpSourceHistory history;
+    EXPECT_EQ(history.mDetailedHistory.size(), static_cast<size_t>(0));
+    const auto& e = history.mLatestEviction;
+    EXPECT_FALSE(history.mHasEvictedEntry);
+    EXPECT_EQ(e.jitterAdjustedTimestamp, 0);
+    EXPECT_FALSE(e.hasAudioLevel);
+    EXPECT_EQ(e.audioLevel, 0);
+  }
+
+  // Test adding into the jitter window
+  void TestInsertIntoJitterWindow() {
+    const bool hasAudioLevel = true;
+    const uint8_t audioLevel = 10;
+    const int64_t jitter = 10;
+    RtpSourceHistory history;
+    const int64_t times[] = {100,
+                             120,
+                             140,
+                             160,
+                             180,
+                             200,
+                             220};
+    const size_t numEntries = sizeof(times) / sizeof(times[0]);
+    for (auto i : times) {
+      history.Insert(i, i + jitter, hasAudioLevel, audioLevel);
+     }
+     ASSERT_EQ(history.mDetailedHistory.size(), numEntries);
+     for (auto i : times) {
+       auto entry = history.FindClosestNotAfter(i + jitter);
+       ASSERT_NE(entry, nullptr);
+       if (entry) {
+         EXPECT_EQ(entry->jitterAdjustedTimestamp, i + jitter);
+         EXPECT_EQ(entry->hasAudioLevel, hasAudioLevel);
+         EXPECT_EQ(entry->audioLevel, audioLevel);
+       }
+     }
+  }
+
+  // Tests inserting before the jitter window, in long term history.
+  void TestInsertIntoLongTerm() {
+    RtpSourceHistory history;
+
+    constexpr int64_t timeNow = 100000;
+    // Should be discarded as too old
+    constexpr int64_t time0 = timeNow - (10 * 1000) - 1;
+    // Shold be commited
+    constexpr int64_t time1 = timeNow - (10 * 1000);
+    // Should be commited because it is newer
+    constexpr int64_t time2 = timeNow - (5 * 1000);
+    // Should be discarded because it is older
+    constexpr int64_t time3 = timeNow - (7 * 1000);
+    // Prune time0 should not prune time2
+    constexpr int64_t pruneTime0 = time2 + (10 * 1000);
+    // Prune time1 should prune time2
+    constexpr int64_t pruneTime1 = time2 + (10 * 1000) + 1;
+
+    // time0
+    history.Insert(timeNow, time0, true, 0);
+    EXPECT_TRUE(history.Empty());
+    EXPECT_FALSE(history.mHasEvictedEntry);
+
+    // time1
+    history.Insert(timeNow, time1, true, 0);
+    // Check that the jitter window buffer hasn't been used
+    EXPECT_TRUE(history.Empty());
+    ASSERT_EQ(history.mLatestEviction.jitterAdjustedTimestamp, time1);
+    EXPECT_TRUE(history.mHasEvictedEntry);
+
+    // time2
+    history.Insert(timeNow, time2, true, 0);
+    EXPECT_TRUE(history.Empty());
+    ASSERT_EQ(history.mLatestEviction.jitterAdjustedTimestamp, time2);
+    EXPECT_TRUE(history.mHasEvictedEntry);
+
+    // time3
+    history.Insert(timeNow, time3, true, 0);
+    EXPECT_TRUE(history.Empty());
+    ASSERT_EQ(history.mLatestEviction.jitterAdjustedTimestamp, time2);
+    EXPECT_TRUE(history.mHasEvictedEntry);
+
+    // pruneTime0
+    history.Prune(pruneTime0);
+    EXPECT_TRUE(history.Empty());
+    ASSERT_EQ(history.mLatestEviction.jitterAdjustedTimestamp, time2);
+    EXPECT_TRUE(history.mHasEvictedEntry);
+
+    // pruneTime1
+    history.Prune(pruneTime1);
+    EXPECT_TRUE(history.Empty());
+    EXPECT_FALSE(history.mHasEvictedEntry);
+  }
+
+  // Tests that a value inserted into the jitter window will age into long term
+  // storage
+  void TestAgeIntoLongTerm() {
+    RtpSourceHistory history;
+    constexpr int64_t jitterWindow = history.kMinJitterWindow;
+    constexpr int64_t jitter = jitterWindow / 2;
+    constexpr int64_t timeNow0 = 100000;
+    constexpr int64_t time0 = timeNow0;
+    constexpr int64_t time1 = timeNow0 + jitter;
+    // Prune at timeNow1 should evict time0
+    constexpr int64_t timeNow1 = time0 + jitterWindow + 1;
+    // Prune at timeNow2 should evict time1
+    constexpr int64_t timeNow2 = time1 + jitterWindow + 1;
+
+    // time0
+    history.Insert(timeNow0, time0, false, 1);
+    EXPECT_FALSE(history.Empty());
+    // Jitter window should not have grown
+    ASSERT_EQ(history.mMaxJitterWindow, jitterWindow);
+    EXPECT_EQ(history.mDetailedHistory.size(), static_cast<size_t>(1));
+    EXPECT_FALSE(history.mHasEvictedEntry);
+
+    // time1
+    history.Insert(timeNow0, time1, true, 2);
+    ASSERT_EQ(history.mMaxJitterWindow, jitterWindow);
+    EXPECT_EQ(history.mDetailedHistory.size(), static_cast<size_t>(2));
+    EXPECT_FALSE(history.mHasEvictedEntry);
+
+    // Prune at timeNow1
+    history.Prune(timeNow1);
+    ASSERT_EQ(history.mMaxJitterWindow, jitterWindow);
+    EXPECT_EQ(history.mDetailedHistory.size(), static_cast<size_t>(1));
+    EXPECT_TRUE(history.mHasEvictedEntry);
+    ASSERT_EQ(history.mLatestEviction.jitterAdjustedTimestamp, time0);
+    ASSERT_EQ(history.mLatestEviction.hasAudioLevel, false);
+    ASSERT_EQ(history.mLatestEviction.audioLevel, 1);
+
+    // Prune at timeNow1
+    history.Prune(timeNow2);
+    EXPECT_EQ(history.mMaxJitterWindow, jitterWindow);
+    EXPECT_EQ(history.mDetailedHistory.size(), static_cast<size_t>(0));
+    EXPECT_TRUE(history.mHasEvictedEntry);
+    EXPECT_EQ(history.mLatestEviction.jitterAdjustedTimestamp, time1);
+    EXPECT_EQ(history.mLatestEviction.hasAudioLevel, true);
+    EXPECT_EQ(history.mLatestEviction.audioLevel, 2);
+
+  }
+
+  // Packets have a maximum audio level of 127
+  void TestMaximumAudioLevel() {
+    RtpSourceHistory history;
+    constexpr int64_t timeNow = 0;
+    const int64_t jitterAdjusted = timeNow + 10;
+    const bool hasAudioLevel = true;
+    const uint8_t audioLevel0 = 127;
+    // should result in in hasAudioLevel = false
+    const uint8_t audioLevel1 = 255;
+    // should result in in hasAudioLevel = false
+    const uint8_t audioLevel2 = 128;
+
+    // audio level 0
+    history.Insert(timeNow, jitterAdjusted, hasAudioLevel, audioLevel0);
+    ASSERT_FALSE(history.mHasEvictedEntry);
+    EXPECT_EQ(history.mDetailedHistory.size(), static_cast<size_t>(1));
+    {
+      auto* entry = history.FindClosestNotAfter(jitterAdjusted);
+      ASSERT_NE(entry, nullptr);
+      EXPECT_TRUE(entry->hasAudioLevel);
+      EXPECT_EQ(entry->audioLevel, audioLevel0);
+    }
+    // audio level 1
+    history.Insert(timeNow, jitterAdjusted, hasAudioLevel, audioLevel1);
+    ASSERT_FALSE(history.mHasEvictedEntry);
+    EXPECT_EQ(history.mDetailedHistory.size(), static_cast<size_t>(1));
+    {
+      auto* entry = history.FindClosestNotAfter(jitterAdjusted);
+      ASSERT_NE(entry, nullptr);
+      EXPECT_FALSE(entry->hasAudioLevel);
+      EXPECT_EQ(entry->audioLevel, audioLevel1);
+    }
+    // audio level 2
+    history.Insert(timeNow, jitterAdjusted, hasAudioLevel, audioLevel2);
+    ASSERT_FALSE(history.mHasEvictedEntry);
+    EXPECT_EQ(history.mDetailedHistory.size(), static_cast<size_t>(1));
+    {
+      auto* entry = history.FindClosestNotAfter(jitterAdjusted);
+      ASSERT_NE(entry, nullptr);
+      EXPECT_FALSE(entry->hasAudioLevel);
+      EXPECT_EQ(entry->audioLevel, audioLevel2);
+    }
+  }
+
+  void TestEmptyPrune() {
+    // Empty Prune
+    RtpSourceHistory history;
+    const int64_t timeNow = 0;
+    history.Prune(timeNow);
+    EXPECT_TRUE(history.Empty());
+    EXPECT_EQ(history.mDetailedHistory.size(), static_cast<size_t>(0));
+    EXPECT_FALSE(history.mHasEvictedEntry);
+  }
+
+  void TestSinglePrune() {
+    RtpSourceHistory history;
+    constexpr int64_t timeNow = 10000;
+    constexpr int64_t jitter = history.kMinJitterWindow / 2;
+    const int64_t jitterAdjusted = timeNow + jitter;
+
+    history.Insert(timeNow, jitterAdjusted, 0, false);
+    history.Prune(timeNow + (jitter * 3) + 1);
+    EXPECT_EQ(history.mDetailedHistory.size(), static_cast<size_t>(0));
+    EXPECT_TRUE(history.mHasEvictedEntry);
+    EXPECT_EQ(jitterAdjusted, history.mLatestEviction.jitterAdjustedTimestamp);
+  }
+
+  // Observer tests that keys are properly handled
+  void TestKeyManipulation() {
+    constexpr unsigned int ssrc = 4682;
+    constexpr unsigned int csrc = 4682;
+    auto ssrcKey = RtpSourceObserver::GetKey(
+        ssrc, dom::RTCRtpSourceEntryType::Synchronization);
+    auto csrcKey = RtpSourceObserver::GetKey(
+        csrc, dom::RTCRtpSourceEntryType::Contributing);
+    // SSRC and CSRC keys are not the same
+    EXPECT_NE(ssrcKey, csrcKey);
+    // Keys can be reversed back to source
+    EXPECT_EQ(RtpSourceObserver::GetSourceFromKey(ssrcKey), ssrc);
+    EXPECT_EQ(RtpSourceObserver::GetSourceFromKey(csrcKey), csrc);
+    // Keys can be reversed back to type
+    EXPECT_EQ(RtpSourceObserver::GetTypeFromKey(ssrcKey),
+              dom::RTCRtpSourceEntryType::Synchronization);
+    EXPECT_EQ(RtpSourceObserver::GetTypeFromKey(csrcKey),
+              dom::RTCRtpSourceEntryType::Contributing);
+  }
+
+  // Observer a header with a single Csrc
+  void TestObserveOneCsrc() {
+    RtpSourceObserver observer;
+    webrtc::WebRtcRTPHeader header;
+    constexpr unsigned int ssrc = 857265;
+    constexpr unsigned int csrc = 3268365;
+    constexpr int64_t timestamp = 10000;
+    constexpr int64_t jitter = 0;
+
+    header.header.ssrc = ssrc;
+    header.header.numCSRCs = 1;
+    header.header.arrOfCSRCs[0] = csrc;
+    observer.OnRtpPacket(&header, timestamp, jitter);
+
+    // One for the SSRC, one for the CSRC
+    EXPECT_EQ(observer.mRtpSources.size(), static_cast<size_t>(2));
+    nsTArray<dom::RTCRtpSourceEntry> outLevels;
+    observer.GetRtpSources(timestamp, outLevels);
+    EXPECT_EQ(outLevels.Length(), static_cast<size_t>(2));
+    bool ssrcFound = false;
+    bool csrcFound = true;
+    for (auto& entry : outLevels) {
+      if (entry.mSource.Value() == ssrc) {
+        ssrcFound = true;
+        EXPECT_EQ(entry.mSourceType.Value(),
+                  dom::RTCRtpSourceEntryType::Synchronization);
+      }
+      if (entry.mSource.Value() == csrc) {
+        csrcFound = true;
+        EXPECT_EQ(entry.mSourceType.Value(),
+                  dom::RTCRtpSourceEntryType::Contributing);
+      }
+    }
+    EXPECT_TRUE(ssrcFound);
+    EXPECT_TRUE(csrcFound);
+  }
+
+  // Observer a header with two CSRCs
+  void TestObserveTwoCsrcs() {
+    RtpSourceObserver observer;
+    webrtc::WebRtcRTPHeader header;
+    constexpr unsigned int ssrc = 239485;
+    constexpr unsigned int csrc0 = 3425;
+    constexpr unsigned int csrc1 = 36457;
+    constexpr int64_t timestamp = 10000;
+    constexpr int64_t jitter = 0;
+
+    header.header.ssrc = ssrc;
+    header.header.numCSRCs = 2;
+    header.header.arrOfCSRCs[0] = csrc0;
+    header.header.arrOfCSRCs[1] = csrc1;
+    observer.OnRtpPacket(&header, timestamp, jitter);
+
+    // One for the SSRC, two for the CSRCs
+    EXPECT_EQ(observer.mRtpSources.size(), static_cast<size_t>(3));
+    nsTArray<dom::RTCRtpSourceEntry> outLevels;
+    observer.GetRtpSources(timestamp, outLevels);
+    EXPECT_EQ(outLevels.Length(), static_cast<size_t>(3));
+    bool ssrcFound = false;
+    bool csrc0Found = true;
+    bool csrc1Found = true;
+    for (auto& entry : outLevels) {
+      if (entry.mSource.Value() == ssrc) {
+        ssrcFound = true;
+        EXPECT_EQ(entry.mSourceType.Value(),
+                  dom::RTCRtpSourceEntryType::Synchronization);
+      }
+      if (entry.mSource.Value() == csrc0) {
+        csrc0Found = true;
+        EXPECT_EQ(entry.mSourceType.Value(),
+                  dom::RTCRtpSourceEntryType::Contributing);
+      }
+      if (entry.mSource.Value() == csrc1) {
+        csrc1Found = true;
+        EXPECT_EQ(entry.mSourceType.Value(),
+                  dom::RTCRtpSourceEntryType::Contributing);
+      }
+    }
+    EXPECT_TRUE(ssrcFound);
+    EXPECT_TRUE(csrc0Found);
+    EXPECT_TRUE(csrc1Found);
+  }
+
+  // Observer a header with a CSRC with audio level extension
+  void TestObserveCsrcWithAudioLevel() {
+    RtpSourceObserver observer;
+    webrtc::WebRtcRTPHeader header;
+  }
+
+};
+
+TEST_F(RtpSourcesTest, TestInitState) { TestInitState(); }
+TEST_F(RtpSourcesTest, TestInsertIntoJitterWindow) {
+  TestInsertIntoJitterWindow();
+}
+TEST_F(RtpSourcesTest, TestAgeIntoLongTerm){ TestAgeIntoLongTerm(); }
+TEST_F(RtpSourcesTest, TestInsertIntoLongTerm) { TestInsertIntoLongTerm(); }
+TEST_F(RtpSourcesTest, TestMaximumAudioLevel) { TestMaximumAudioLevel(); }
+TEST_F(RtpSourcesTest, TestEmptyPrune) { TestEmptyPrune(); }
+TEST_F(RtpSourcesTest, TestSinglePrune) { TestSinglePrune(); }
+TEST_F(RtpSourcesTest, TestKeyManipulation) { TestKeyManipulation(); }
+TEST_F(RtpSourcesTest, TestObserveOneCsrc) { TestObserveOneCsrc(); }
+TEST_F(RtpSourcesTest, TestObserveTwoCsrcs) { TestObserveTwoCsrcs(); }
+TEST_F(RtpSourcesTest, TestObserveCsrcWithAudioLevel) {
+  TestObserveCsrcWithAudioLevel();
+}
+}
\ No newline at end of file

From 2e647f7e5309fbfe3a369b4ae0dcdc220bba08e2 Mon Sep 17 00:00:00 2001
From: Nico Grunbaum <none@none>
Date: Tue, 14 Nov 2017 10:29:44 -0800
Subject: [PATCH 098/219] Bug 1363667 - P5 - RTP Source PeerConnection JS IF
 r=bkelly,mjf

MozReview-Commit-ID: HLG5MFzhMNK

--HG--
extra : rebase_source : 9aa29fea2b6b96d1c9802e35cf68e3afe13a3b2a
---
 dom/webidl/PeerConnectionImpl.webidl | 11 +++++++++++
 dom/webidl/RTCPeerConnection.webidl  | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/dom/webidl/PeerConnectionImpl.webidl b/dom/webidl/PeerConnectionImpl.webidl
index bd5719a5ee32..e87445a1073b 100644
--- a/dom/webidl/PeerConnectionImpl.webidl
+++ b/dom/webidl/PeerConnectionImpl.webidl
@@ -53,6 +53,10 @@ interface PeerConnectionImpl  {
                   optional unsigned long interToneGap = 70);
   [Throws]
   DOMString getDTMFToneBuffer(RTCRtpSender sender);
+  sequence<RTCRtpSourceEntry> getRtpSources(MediaStreamTrack track,
+                                            DOMHighResTimeStamp rtpSourceNow);
+  DOMHighResTimeStamp getNowInRtpSourceReferenceTime();
+
   [Throws]
   void replaceTrackNoRenegotiation(TransceiverImpl transceiverImpl,
                                    MediaStreamTrack? withTrack);
@@ -62,6 +66,13 @@ interface PeerConnectionImpl  {
   void addRIDExtension(MediaStreamTrack recvTrack, unsigned short extensionId);
   void addRIDFilter(MediaStreamTrack recvTrack, DOMString rid);
 
+  // Inserts CSRC data for the RtpSourceObserver for testing
+  void insertAudioLevelForContributingSource(MediaStreamTrack recvTrack,
+                                             unsigned long source,
+                                             DOMHighResTimeStamp timestamp,
+                                             boolean hasLevel,
+                                             byte level);
+
   void enablePacketDump(unsigned long level,
                         mozPacketDumpType type,
                         boolean sending);
diff --git a/dom/webidl/RTCPeerConnection.webidl b/dom/webidl/RTCPeerConnection.webidl
index d04f23ad9331..c907e6cb43cc 100644
--- a/dom/webidl/RTCPeerConnection.webidl
+++ b/dom/webidl/RTCPeerConnection.webidl
@@ -135,6 +135,16 @@ interface RTCPeerConnection : EventTarget  {
   sequence<RTCRtpReceiver> getReceivers();
   sequence<RTCRtpTransceiver> getTransceivers();
 
+  // test-only: for testing getContributingSources
+  [ChromeOnly]
+  DOMHighResTimeStamp mozGetNowInRtpSourceReferenceTime();
+  // test-only: for testing getContributingSources
+  [ChromeOnly]
+  void mozInsertAudioLevelForContributingSource(RTCRtpReceiver receiver,
+                                                unsigned long source,
+                                                DOMHighResTimeStamp timestamp,
+                                                boolean hasLevel,
+                                                byte level);
   [ChromeOnly]
   void mozAddRIDExtension(RTCRtpReceiver receiver, unsigned short extensionId);
   [ChromeOnly]

From a3f1b24f7a8cbf2e0d6e0b033b7c94c47adcbcd7 Mon Sep 17 00:00:00 2001
From: Nico Grunbaum <none@none>
Date: Tue, 14 Nov 2017 10:32:07 -0800
Subject: [PATCH 099/219] Bug 1363667 - P6 - RTP Source PeerConnection JS impl
 r=mjf

MozReview-Commit-ID: CkFY5fABkr

--HG--
extra : rebase_source : 85e274f27600affb29d09e16f9c6d43dee191df3
---
 dom/media/PeerConnection.js                   | 165 +++++++++++++++++-
 .../src/peerconnection/PeerConnectionImpl.cpp |  50 ++++++
 .../src/peerconnection/PeerConnectionImpl.h   |  26 +++
 3 files changed, 236 insertions(+), 5 deletions(-)

diff --git a/dom/media/PeerConnection.js b/dom/media/PeerConnection.js
index ebd610dfdf88..3dc44d283a9d 100644
--- a/dom/media/PeerConnection.js
+++ b/dom/media/PeerConnection.js
@@ -346,6 +346,23 @@ setupPrototype(RTCStatsReport, {
   }
 });
 
+// Cache for RTPSourceEntries
+// Note: each cache is only valid for one JS event loop execution
+class RTCRtpSourceCache {
+  constructor() {
+    // The time in RTP source time (ms)
+    this.tsNowInRtpSourceTime = null;
+    // The time in JS
+    this.jsTimestamp = null;
+    // Time difference between JS time and RTP source time
+    this.timestampOffset = null;
+    // RTPSourceEntries cached by track id
+    this.rtpSourcesByTrackId = new Map();
+    // Has a cache wipe already been scheduled
+    this.scheduledClear = null;
+  }
+}
+
 class RTCPeerConnection {
   constructor() {
     this._receiveStreams = new Map();
@@ -366,10 +383,13 @@ class RTCPeerConnection {
 
     this._hasStunServer = this._hasTurnServer = false;
     this._iceGatheredRelayCandidates = false;
-
-  // TODO: Remove legacy API eventually
-  // see Bug 1328194
-  this._onGetStatsIsLegacy = false;
+    // Stored webrtc timing information
+    this._storedRtpSourceReferenceTime = null;
+    // TODO: Remove legacy API eventually
+    // see Bug 1328194
+    this._onGetStatsIsLegacy = false;
+    // Stores cached RTP sources state
+    this._rtpSourceCache = new RTCRtpSourceCache();
   }
 
   init(win) {
@@ -1225,6 +1245,45 @@ class RTCPeerConnection {
     this._transceivers.push(transceiver);
   }
 
+  /* Returns a dictionary with three keys:
+   * sources: a list of contributing and synchronization sources
+   * sourceClockOffset: an offset to apply to the source timestamp to get a
+   * very close approximation of the sample time with respect to the local
+   * clock.
+   * jsTimestamp: the current JS time
+   * Note: because the two clocks can drift with respect to each other, once
+   *  a timestamp offset has been calculated it should not be recalculated
+   *  until the timestamp changes, this way it will not appear as if a new
+   *  audio level sample has arrived.
+   */
+  _getRtpSources(receiver) {
+    let cache = this._rtpSourceCache;
+    // Schedule cache invalidation
+    if (!cache.scheduledClear) {
+      cache.scheduledClear = true;
+      Promise.resolve().then(() => {
+        this._rtpSourceCache = new RTCRtpSourceCache();
+      });
+    }
+    // Fetch the RTP source local time, store it for reuse, calculate
+    // the local offset, likewise store it for reuse.
+    if (cache.tsNowInRtpSourceTime !== undefined) {
+      cache.tsNowInRtpSourceTime = this._impl.getNowInRtpSourceReferenceTime();
+      cache.jsTimestamp = new Date().getTime();
+      cache.timestampOffset = cache.jsTimestamp - cache.tsNowInRtpSourceTime;
+    }
+    let id = receiver.track.id;
+    if (cache.rtpSourcesByTrackId[id] === undefined) {
+      cache.rtpSourcesByTrackId[id] =
+          this._impl.getRtpSources(receiver.track, cache.tsNowInRtpSourceTime);
+    }
+    return {
+      sources: cache.rtpSourcesByTrackId[id],
+      sourceClockOffset: cache.timestampOffset,
+      jsTimestamp: cache.jsTimestamp,
+    };
+  }
+
   addTransceiver(sendTrackOrKind, init) {
     let transceiver = this._addTransceiverNoEvents(sendTrackOrKind, init);
     this.updateNegotiationNeeded();
@@ -1323,6 +1382,24 @@ class RTCPeerConnection {
     return this.getTransceivers().map(transceiver => transceiver.receiver);
   }
 
+  // test-only: get the current time using the webrtc clock
+  mozGetNowInRtpSourceReferenceTime() {
+    return this._impl.getNowInRtpSourceReferenceTime();
+  }
+
+  // test-only: insert a contributing source entry for a track
+  mozInsertAudioLevelForContributingSource(receiver,
+                                           source,
+                                           timestamp,
+                                           hasLevel,
+                                           level) {
+    this._impl.insertAudioLevelForContributingSource(receiver.track,
+                                                     source,
+                                                     timestamp,
+                                                     hasLevel,
+                                                     level);
+  }
+
   mozAddRIDExtension(receiver, extensionId) {
     this._impl.addRIDExtension(receiver.track, extensionId);
   }
@@ -1988,7 +2065,12 @@ class RTCRtpReceiver {
         {
           _pc: pc,
           _transceiverImpl: transceiverImpl,
-          track: transceiverImpl.getReceiveTrack()
+          track: transceiverImpl.getReceiveTrack(),
+          // Sync and contributing sources must be kept cached so that timestamps
+          // remain stable, as the timestamp offset can vary
+          // note key = entry.source + entry.sourceType
+          _rtpSources: new Map(),
+          _rtpSourcesJsTimestamp: null,
         });
   }
 
@@ -1998,6 +2080,79 @@ class RTCRtpReceiver {
     return this._pc._async(
       async () => this._pc.getStats(this.track));
   }
+
+  _getRtpSource(source, type) {
+    this._fetchRtpSources();
+    return this._rtpSources.get(type + source).entry;
+  }
+
+  /* Fetch all of the RTP Contributing and Sync sources for the receiver
+   * and store them so they are available when asked for.
+   */
+  _fetchRtpSources() {
+    if (this._rtpSourcesJsTimestamp !== null) {
+      return;
+    }
+    // Queue microtask to mark the cache as stale after this task completes
+    Promise.resolve().then(() => this._rtpSourcesJsTimestamp = null);
+    let {sources, sourceClockOffset, jsTimestamp} =
+        this._pc._getRtpSources(this);
+    this._rtpSourcesJsTimestamp = jsTimestamp;
+    for (let entry of sources) {
+      // Set the clock offset for calculating the 10-second window
+      entry.sourceClockOffset = sourceClockOffset;
+      // Store the new entries or update existing entries
+      let key =  entry.source + entry.sourceType;
+      let cached = this._rtpSources.get(key);
+      if (cached === undefined) {
+        this._rtpSources.set(key, entry);
+      } else if (cached.timestamp != entry.timestamp) {
+        // Only update if the timestamp has changed
+        // This also prevents the sourceClockOffset from changing unecessarily
+        // which could cause a value to flutter at the edge of the 10 second
+        // window.
+        this._rtpSources.set(key, entry);
+      }
+    }
+    // Clear old entries
+    let cutoffTime = this._rtpSourcesJsTimestamp - 10 * 1000;
+    let removeKeys = [];
+    for (let entry of this._rtpSources.values()) {
+      if ((entry.timestamp + entry.sourceClockOffset) < cutoffTime) {
+        removeKeys.push(entry.source + entry.sourceType);
+      }
+    }
+    for (let delKey of removeKeys) {
+      this._rtpSources.delete(delKey);
+    }
+  }
+
+
+
+  _getRtpSourcesByType(type) {
+    this._fetchRtpSources();
+    // Only return the values from within the last 10 seconds as per the spec
+    let cutoffTime = this._rtpSourcesJsTimestamp - 10 * 1000;
+    let sources = [...this._rtpSources.values()].filter(
+      (entry) => {
+        return entry.sourceType == type &&
+            (entry.timestamp + entry.sourceClockOffset) >= cutoffTime;
+      }).map(e => ({
+        source: e.source,
+        timestamp: e.timestamp + e.sourceClockOffset,
+        audioLevel: e.audioLevel,
+      }));
+      return sources;
+  }
+
+  getContributingSources() {
+    return this._getRtpSourcesByType("contributing");
+  }
+
+  getSynchronizationSources() {
+    return this._getRtpSourcesByType("synchronization");
+  }
+
 }
 setupPrototype(RTCRtpReceiver, {
   classID: PC_RECEIVER_CID,
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
index be3340a611a3..06727d6038eb 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -2223,6 +2223,55 @@ PeerConnectionImpl::DumpPacket_m(size_t level, dom::mozPacketDumpType type,
   pco->OnPacket(level, type, sending, arrayBuffer, jrv);
 }
 
+NS_IMETHODIMP
+PeerConnectionImpl::GetRtpSources(
+    MediaStreamTrack& aRecvTrack,
+    DOMHighResTimeStamp aRtpSourceTimeNow,
+    nsTArray<dom::RTCRtpSourceEntry>& outRtpSources)
+{
+  PC_AUTO_ENTER_API_CALL(true);
+  outRtpSources.Clear();
+  std::vector<RefPtr<TransceiverImpl>>& transceivers =
+    mMedia->GetTransceivers();
+  for (RefPtr<TransceiverImpl>& transceiver : transceivers) {
+    if (transceiver->HasReceiveTrack(&aRecvTrack)) {
+      transceiver->GetRtpSources(aRtpSourceTimeNow, outRtpSources);
+      break;
+    }
+  }
+  return NS_OK;
+}
+
+DOMHighResTimeStamp
+PeerConnectionImpl::GetNowInRtpSourceReferenceTime()
+{
+  return RtpSourceObserver::NowInReportClockTime();
+}
+
+// test-only: adds fake CSRCs and audio data
+nsresult
+PeerConnectionImpl::InsertAudioLevelForContributingSource(
+    dom::MediaStreamTrack& aRecvTrack,
+    unsigned long aSource,
+    DOMHighResTimeStamp aTimestamp,
+    bool aHasLevel,
+    uint8_t aLevel)
+{
+  PC_AUTO_ENTER_API_CALL(true);
+  std::vector<RefPtr<TransceiverImpl>>& transceivers =
+    mMedia->GetTransceivers();
+  for (RefPtr<TransceiverImpl>& transceiver : transceivers) {
+    if (transceiver->HasReceiveTrack(&aRecvTrack)) {
+      transceiver->InsertAudioLevelForContributingSource(aSource,
+                                                         aTimestamp,
+                                                         aHasLevel,
+                                                         aLevel);
+      break;
+    }
+  }
+  return NS_OK;
+}
+
 nsresult
 PeerConnectionImpl::AddRIDExtension(MediaStreamTrack& aRecvTrack,
                                     unsigned short aExtensionId)
@@ -2419,6 +2468,7 @@ PeerConnectionImpl::InsertDTMF(TransceiverImpl& transceiver,
   return NS_OK;
 }
 
+
 NS_IMETHODIMP
 PeerConnectionImpl::GetDTMFToneBuffer(mozilla::dom::RTCRtpSender& sender,
                                       nsAString& outToneBuffer) {
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
index a6851cc49a54..e708c6cebdc0 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
@@ -73,6 +73,7 @@ class DOMMediaStream;
 namespace dom {
 class RTCCertificate;
 struct RTCConfiguration;
+struct RTCRtpSourceEntry;
 class RTCDTMFSender;
 struct RTCIceServer;
 struct RTCOfferOptions;
@@ -427,6 +428,15 @@ public:
     rv = GetDTMFToneBuffer(sender, outToneBuffer);
   }
 
+  NS_IMETHODIMP_TO_ERRORRESULT(GetRtpSources, ErrorResult &rv,
+      dom::MediaStreamTrack& aRecvTrack,
+      DOMHighResTimeStamp aRtpSourceNow,
+      nsTArray<dom::RTCRtpSourceEntry>& outRtpSources) {
+    rv = GetRtpSources(aRecvTrack, aRtpSourceNow, outRtpSources);
+  }
+
+  DOMHighResTimeStamp GetNowInRtpSourceReferenceTime();
+
   NS_IMETHODIMP_TO_ERRORRESULT(ReplaceTrackNoRenegotiation, ErrorResult &rv,
                                TransceiverImpl& aTransceiver,
                                mozilla::dom::MediaStreamTrack* aWithTrack)
@@ -456,6 +466,22 @@ public:
   GetParameters(dom::MediaStreamTrack& aTrack,
                 std::vector<JsepTrack::JsConstraints>* aOutConstraints);
 
+  // test-onlg: called from contributing sources mochitests.
+  NS_IMETHODIMP_TO_ERRORRESULT(InsertAudioLevelForContributingSource,
+                               ErrorResult &rv,
+                               dom::MediaStreamTrack& aRecvTrack,
+                               unsigned long aSource,
+                               DOMHighResTimeStamp aTimestamp,
+                               bool aHasLevel,
+                               uint8_t aLevel)
+ {
+   rv = InsertAudioLevelForContributingSource(aRecvTrack,
+                                              aSource,
+                                              aTimestamp,
+                                              aHasLevel,
+                                              aLevel);
+ }
+
   // test-only: called from simulcast mochitests.
   NS_IMETHODIMP_TO_ERRORRESULT(AddRIDExtension, ErrorResult &rv,
                                dom::MediaStreamTrack& aRecvTrack,

From 98751926ce0248d5a6bdba119f62a220fc16f393 Mon Sep 17 00:00:00 2001
From: Nico Grunbaum <none@none>
Date: Tue, 14 Nov 2017 10:34:53 -0800
Subject: [PATCH 100/219] Bug 1363667 - P7 - RTP Source mochitests r=mjf

MozReview-Commit-ID: D4kBN2hVYpo

--HG--
extra : rebase_source : 02a668baf6c6880c2029c23fac7c433978c68d6c
---
 dom/media/tests/mochitest/mochitest.ini       |   4 +
 ...erConnection_audioContributingSources.html | 107 ++++++++++++++++++
 ...onnection_audioSynchronizationSources.html |  61 ++++++++++
 .../src/peerconnection/PeerConnectionImpl.h   |   2 +-
 4 files changed, 173 insertions(+), 1 deletion(-)
 create mode 100644 dom/media/tests/mochitest/test_peerConnection_audioContributingSources.html
 create mode 100644 dom/media/tests/mochitest/test_peerConnection_audioSynchronizationSources.html

diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini
index 1c5ea6dccd60..2614bb5890a5 100644
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -102,6 +102,10 @@ skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emula
 skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudio.html]
 skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
+[test_peerConnection_audioSynchronizationSources.html]
+skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
+[test_peerConnection_audioContributingSources.html]
+skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_checkPacketDumpHook.html]
 skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudioNATSrflx.html]
diff --git a/dom/media/tests/mochitest/test_peerConnection_audioContributingSources.html b/dom/media/tests/mochitest/test_peerConnection_audioContributingSources.html
new file mode 100644
index 000000000000..1a10ce3142e8
--- /dev/null
+++ b/dom/media/tests/mochitest/test_peerConnection_audioContributingSources.html
@@ -0,0 +1,107 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script type="application/javascript" src="pc.js"></script>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript">
+  createHTML({
+    bug: "1363667",
+    title: "Test audio receiver getContributingSources"
+  });
+
+  var SpWrap = (pc) => SpecialPowers.wrap(pc._pc);
+
+  var SpRtpSourceNowTimestamp = (pc) => {
+    return SpecialPowers.wrap(pc._pc).mozGetNowInRtpSourceReferenceTime();
+  }
+  var SpInsertLevelForContributingSource = (pc, ...args) => {
+    return SpecialPowers.wrap(pc._pc).mozInsertLevelForContributingSource(
+        ...args);
+  }
+  // test_peerConnection_audioSynchronizationSources.html tests
+  // much of the functionality of getContributingSources as the implementation
+  // is shared.
+  var testGetContributingSources = async (test) => {
+    let remoteReceiver = test.pcRemote.getReceivers()[0];
+    let localReceiver = test.pcLocal.getReceivers()[0];
+
+    // Check that getContributingSources is empty as there is no MCU
+    is(remoteReceiver.getContributingSources().length, 0,
+       "remote contributing sources is empty");
+    is(localReceiver.getContributingSources().length, 0,
+       "local contributing sources is empty");
+    // Wait for the next JS event loop iteration, to clear the cache
+    await Promise.resolve().then();
+    // Insert new entries as if there were an MCU
+    let csrc0 = 124756;
+    let timestamp0 = SpWrap(test.pcRemote).mozGetNowInRtpSourceReferenceTime();
+    let timestampOffset = new Date().getTime() - timestamp0;
+    let hasAudioLevel0 = true;
+    let audioLevel0 = 34;
+
+    SpWrap(test.pcRemote).mozInsertAudioLevelForContributingSource(
+        remoteReceiver,
+        csrc0,
+        timestamp0,
+        hasAudioLevel0,
+        audioLevel0);
+
+    let csrc1 = 5786;
+    let timestamp1 = timestamp0 - 200;
+    let hasAudioLevel1 = false;
+    let audioLevel1 = 0;
+
+    SpWrap(test.pcRemote).mozInsertAudioLevelForContributingSource(
+        remoteReceiver,
+        csrc1,
+        timestamp1,
+        hasAudioLevel1,
+        audioLevel1);
+
+    let contributingSources = remoteReceiver.getContributingSources();
+    is(contributingSources.length, 2,
+       "Expected number of contributing sources");
+
+    // Check that both inserted were returned
+    let source0 = contributingSources.find(c => c.source == csrc0);
+    ok(source0, "first csrc was found");
+
+    let source1 = contributingSources.find(c => c.source == csrc1);
+    ok(source1, "second csrsc was found");
+
+    // Add a small margin of error in the timestamps
+    let compareTimestamps = (ts1, ts2) => Math.abs(ts1 - ts2) < 100;
+
+    // Check the CSRC with audioLevel
+    is(source0.audioLevel, audioLevel0,
+       `Contributing source has correct audio level. (${source0.audioLevel})`);
+    ok(compareTimestamps(source0.timestamp, timestamp0 + timestampOffset),
+       `Contributing source has correct timestamp (${source0.timestamp})`);
+
+    // Check the CSRC without audioLevel
+    is(source1.audioLevel, undefined,
+       `Contributing source has no audio level. (${source1.audioLevel})`);
+    ok(compareTimestamps(source1.timestamp, timestamp1 + timestampOffset),
+       `Contributing source has correct timestamp (${source1.timestamp})`);
+
+    // Check caching
+    is(JSON.stringify(contributingSources),
+       JSON.stringify(remoteReceiver.getContributingSources()),
+       "getContributingSources is cached");
+  }
+
+  var test;
+  runNetworkTest(function(options) {
+    test = new PeerConnectionTest(options);
+    test.chain.insertAfter("PC_REMOTE_WAIT_FOR_MEDIA_FLOW",
+      [testGetContributingSources]);
+    test.setMediaConstraints([{audio: true}], [{audio: true}]);
+    test.pcLocal.audioElementsOnly = true;
+    test.run();
+  });
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/media/tests/mochitest/test_peerConnection_audioSynchronizationSources.html b/dom/media/tests/mochitest/test_peerConnection_audioSynchronizationSources.html
new file mode 100644
index 000000000000..b86b1fefa199
--- /dev/null
+++ b/dom/media/tests/mochitest/test_peerConnection_audioSynchronizationSources.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script type="application/javascript" src="pc.js"></script>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript">
+  createHTML({
+    bug: "1363667",
+    title: "Test audio receiver getSynchronizationSources"
+  });
+
+  var testGetSynchronizationSources = (test) => {
+    let receivers = [...test.pcRemote.getReceivers(),
+                     ...test.pcLocal.getReceivers()];
+    is(receivers.length, 2, "Expected number of receivers");
+    for (let recv of receivers) {
+      let syncSources = recv.getSynchronizationSources();
+      ok(syncSources,
+         "Receiver has Synchronization sources " + JSON.stringify(syncSources));
+      is(syncSources.length, 1, "Each receiver has only a single sync source");
+      let source = recv.getSynchronizationSources()[0];
+      ok(source.audioLevel,
+         `Synchronization source has audio level. (${source.audioLevel})`);
+      ok(source.audioLevel < 128,
+         `Synchronization source audio level < 128. (${source.audioLevel})`);
+         ok(Number.isInteger(source.audioLevel),
+         `Synchronization source audio level is int. (${source.audioLevel})`);
+      ok(source.timestamp,
+         `Synchronization source has timestamp (${source.timestamp})`);
+      ok(Number.isInteger(source.timestamp),
+        `Synchronization source timestamp is int (${source.timestamp})`);
+    }
+  }
+
+  var testSynchronizationSourceCached = (test) => {
+    let receivers = [...test.pcRemote.getReceivers(),
+                     ...test.pcLocal.getReceivers()];
+    is(receivers.length, 2, "Expected number of receivers");
+    for (let recv of receivers) {
+      is(JSON.stringify(recv.getSynchronizationSources()),
+         JSON.stringify(recv.getSynchronizationSources()),
+         "Subsequent getSynchronizationSources calls are cached.");
+    }
+  }
+
+  var test;
+  runNetworkTest(function(options) {
+    test = new PeerConnectionTest(options);
+    test.chain.insertAfter("PC_REMOTE_WAIT_FOR_MEDIA_FLOW",
+      [testGetSynchronizationSources,
+       testSynchronizationSourceCached]);
+    test.setMediaConstraints([{audio: true}], [{audio: true}]);
+    test.pcLocal.audioElementsOnly = true;
+    test.run();
+  });
+</script>
+</pre>
+</body>
+</html>
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
index e708c6cebdc0..a736c612d18b 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
@@ -466,7 +466,7 @@ public:
   GetParameters(dom::MediaStreamTrack& aTrack,
                 std::vector<JsepTrack::JsConstraints>* aOutConstraints);
 
-  // test-onlg: called from contributing sources mochitests.
+  // test-only: called from contributing sources mochitests.
   NS_IMETHODIMP_TO_ERRORRESULT(InsertAudioLevelForContributingSource,
                                ErrorResult &rv,
                                dom::MediaStreamTrack& aRecvTrack,

From bc576f0c9f56d736c05c692b499a0c5fcdfe7a32 Mon Sep 17 00:00:00 2001
From: Nico Grunbaum <none@none>
Date: Thu, 16 Nov 2017 22:06:57 -0800
Subject: [PATCH 101/219] Bug 1363667 - P7.1 - await on sync sources in
 mochitest r=mjf

MozReview-Commit-ID: 200XlBGldKa

--HG--
extra : rebase_source : f938688300a346ec080b44dd0080187b7e5163b2
---
 ...onnection_audioSynchronizationSources.html | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/dom/media/tests/mochitest/test_peerConnection_audioSynchronizationSources.html b/dom/media/tests/mochitest/test_peerConnection_audioSynchronizationSources.html
index b86b1fefa199..2e146671580f 100644
--- a/dom/media/tests/mochitest/test_peerConnection_audioSynchronizationSources.html
+++ b/dom/media/tests/mochitest/test_peerConnection_audioSynchronizationSources.html
@@ -11,10 +11,24 @@
     title: "Test audio receiver getSynchronizationSources"
   });
 
-  var testGetSynchronizationSources = (test) => {
+  var waitForSyncSources = async (test) => {
     let receivers = [...test.pcRemote.getReceivers(),
                      ...test.pcLocal.getReceivers()];
     is(receivers.length, 2, "Expected number of receivers");
+    // Wait for sync sources
+    while (true) {
+        if (receivers[0].getSynchronizationSources().length > 0 &&
+            receivers[1].getSynchronizationSources().length > 0) {
+        break;
+      }
+      await wait(250);
+    }
+  }
+
+  var testGetSynchronizationSources = async (test) => {
+    await waitForSyncSources(test);
+    let receivers = [...test.pcRemote.getReceivers(),
+                     ...test.pcLocal.getReceivers()];
     for (let recv of receivers) {
       let syncSources = recv.getSynchronizationSources();
       ok(syncSources,
@@ -34,7 +48,8 @@
     }
   }
 
-  var testSynchronizationSourceCached = (test) => {
+  var testSynchronizationSourceCached = async (test) => {
+    await waitForSyncSources(test);
     let receivers = [...test.pcRemote.getReceivers(),
                      ...test.pcLocal.getReceivers()];
     is(receivers.length, 2, "Expected number of receivers");

From 34b88025d1a9459cf507b7dd2e0400d4797e4f9d Mon Sep 17 00:00:00 2001
From: Nico Grunbaum <none@none>
Date: Tue, 21 Nov 2017 14:51:26 -0800
Subject: [PATCH 102/219] Bug 1363667 - P2.1 - Fix jsep extmap unit test r=mjf

MozReview-Commit-ID: A5aqX2t5Lqu

--HG--
extra : rebase_source : ff985e6046bb1819a9489f5af4d4c316d6905005
---
 .../signaling/gtest/jsep_session_unittest.cpp       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/media/webrtc/signaling/gtest/jsep_session_unittest.cpp b/media/webrtc/signaling/gtest/jsep_session_unittest.cpp
index ddb7af874f18..e9299c31cfbe 100644
--- a/media/webrtc/signaling/gtest/jsep_session_unittest.cpp
+++ b/media/webrtc/signaling/gtest/jsep_session_unittest.cpp
@@ -4438,13 +4438,16 @@ TEST_F(JsepSessionTest, TestExtmap)
   auto& answerMediaAttrs = parsedAnswer->GetMediaSection(0).GetAttributeList();
   ASSERT_TRUE(answerMediaAttrs.HasAttribute(SdpAttribute::kExtmapAttribute));
   auto& answerExtmap = answerMediaAttrs.GetExtmap().mExtmaps;
-  ASSERT_EQ(2U, answerExtmap.size());
-  ASSERT_EQ("urn:ietf:params:rtp-hdrext:sdes:mid",
-      answerExtmap[0].extensionname);
+  ASSERT_EQ(3U, answerExtmap.size());
+  ASSERT_EQ("urn:ietf:params:rtp-hdrext:ssrc-audio-level",
+      offerExtmap[0].extensionname);
   ASSERT_EQ(1U, offerExtmap[0].entry);
+  ASSERT_EQ("urn:ietf:params:rtp-hdrext:sdes:mid",
+      answerExtmap[1].extensionname);
+  ASSERT_EQ(2U, offerExtmap[1].entry);
   // We ensure that the entry for "bar" matches what was in the offer
-  ASSERT_EQ("bar", answerExtmap[1].extensionname);
-  ASSERT_EQ(4U, answerExtmap[1].entry);
+  ASSERT_EQ("bar", answerExtmap[2].extensionname);
+  ASSERT_EQ(4U, answerExtmap[2].entry);
 }
 
 TEST_F(JsepSessionTest, TestExtmapWithDuplicates)

From fe6e9d519033b583c38e24b1b4a6e03315440470 Mon Sep 17 00:00:00 2001
From: Nico Grunbaum <none@none>
Date: Wed, 22 Nov 2017 12:39:10 -0800
Subject: [PATCH 103/219] Bug 1363667 - P6.1 - disable broken web platform
 tests r=jib

MozReview-Commit-ID: 5DLyxnPFqpB

--HG--
extra : rebase_source : c35e892500932764bc8b137e308317d1eeee6558
---
 .../meta/webrtc/interfaces.https.html.ini     | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/testing/web-platform/meta/webrtc/interfaces.https.html.ini b/testing/web-platform/meta/webrtc/interfaces.https.html.ini
index 09e71495c1ac..fb288775fa6f 100644
--- a/testing/web-platform/meta/webrtc/interfaces.https.html.ini
+++ b/testing/web-platform/meta/webrtc/interfaces.https.html.ini
@@ -256,33 +256,43 @@
     expected: FAIL
 
   [RTCRtpReceiver interface: operation getContributingSources()]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: existence and properties of interface object]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface object length]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface object name]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: existence and properties of interface prototype object]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: existence and properties of interface prototype object's "constructor" property]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: attribute timestamp]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: attribute source]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: attribute audioLevel]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: attribute voiceActivityFlag]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpTransceiver interface: attribute direction]
@@ -706,6 +716,7 @@
     expected: FAIL
 
   [RTCRtpReceiver interface: operation getSynchronizationSources()]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "transport" with the proper type (1)]
@@ -724,36 +735,47 @@
     expected: FAIL
 
   [RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "getContributingSources" with the proper type (5)]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "getSynchronizationSources" with the proper type (6)]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: existence and properties of interface object]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface object length]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface object name]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: existence and properties of interface prototype object]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: existence and properties of interface prototype object's "constructor" property]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: attribute timestamp]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: attribute source]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: attribute audioLevel]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: attribute voiceActivityFlag]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpTransceiver interface: new RTCPeerConnection().addTransceiver('audio') must inherit property "setDirection" with the proper type (6)]
@@ -988,9 +1010,11 @@
     expected: FAIL
 
   [RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "getContributingSources()" with the proper type]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "getSynchronizationSources()" with the proper type]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpTransceiver interface: new RTCPeerConnection().addTransceiver('audio') must inherit property "setDirection(RTCRtpTransceiverDirection)" with the proper type]
@@ -1380,9 +1404,11 @@
     expected: FAIL
 
   [RTCRtpReceiver interface: operation getContributingSources()]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpReceiver interface: operation getSynchronizationSources()]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "transport" with the proper type]
@@ -1398,60 +1424,79 @@
     expected: FAIL
 
   [RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "getContributingSources()" with the proper type]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "getSynchronizationSources()" with the proper type]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: existence and properties of interface object]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface object length]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface object name]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: existence and properties of interface prototype object]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: existence and properties of interface prototype object's "constructor" property]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: attribute timestamp]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: attribute source]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpContributingSource interface: attribute audioLevel]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: existence and properties of interface object]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface object length]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface object name]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: existence and properties of interface prototype object]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: existence and properties of interface prototype object's "constructor" property]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: attribute timestamp]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: attribute source]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: attribute audioLevel]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpSynchronizationSource interface: attribute voiceActivityFlag]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1419900
     expected: FAIL
 
   [RTCRtpTransceiver interface: attribute direction]

From ddb93e1de50fd34d1cf6506a8d4b18c77852adf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 1 Dec 2017 22:08:22 -0600
Subject: [PATCH 104/219] servo: Merge #19452 - style: Remove pretty useless
 layer of abstraction (from emilio:layers-as-an-onion); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: e8593e29633a67e6a8f61a213217a19278aa2739

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 1be2c6957976b130222813f9f23016c02c9cd367
---
 servo/components/style/gecko/wrapper.rs | 18 ++----------------
 servo/ports/geckolib/glue.rs            | 11 ++++++++---
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/servo/components/style/gecko/wrapper.rs b/servo/components/style/gecko/wrapper.rs
index c31b8f9ea8fb..686f2deae7cf 100644
--- a/servo/components/style/gecko/wrapper.rs
+++ b/servo/components/style/gecko/wrapper.rs
@@ -22,7 +22,6 @@ use context::{QuirksMode, SharedStyleContext, PostAnimationTasks, UpdateAnimatio
 use data::ElementData;
 use dom::{LayoutIterator, NodeInfo, OpaqueNode, TElement, TDocument, TNode};
 use element_state::{ElementState, DocumentState};
-use error_reporting::ParseErrorReporter;
 use font_metrics::{FontMetrics, FontMetricsProvider, FontMetricsQueryResult};
 use gecko::data::PerDocumentStyleData;
 use gecko::global_style_data::GLOBAL_STYLE_DATA;
@@ -68,7 +67,7 @@ use gecko_bindings::sugar::ownership::{HasArcFFI, HasSimpleFFI};
 use hash::FnvHashMap;
 use logical_geometry::WritingMode;
 use media_queries::Device;
-use properties::{ComputedValues, LonghandId, parse_style_attribute};
+use properties::{ComputedValues, LonghandId};
 use properties::{Importance, PropertyDeclaration, PropertyDeclarationBlock};
 use properties::animated_properties::{AnimationValue, AnimationValueMap};
 use properties::animated_properties::TransitionProperty;
@@ -89,7 +88,6 @@ use std::mem;
 use std::ops::DerefMut;
 use std::ptr;
 use string_cache::{Atom, Namespace, WeakAtom, WeakNamespace};
-use stylesheets::UrlExtraData;
 use stylist::Stylist;
 
 /// A simple wrapper over `nsIDocument`.
@@ -495,19 +493,7 @@ impl<'le> GeckoElement<'le> {
         self.as_node().get_bool_flag(nsINode_BooleanFlag::ElementMayHaveAnonymousChildren)
     }
 
-    /// Parse the style attribute of an element.
-    pub fn parse_style_attribute<R>(
-        value: &str,
-        url_data: &UrlExtraData,
-        quirks_mode: QuirksMode,
-        reporter: &R,
-    ) -> PropertyDeclarationBlock
-    where
-        R: ParseErrorReporter,
-    {
-        parse_style_attribute(value, url_data, reporter, quirks_mode)
-    }
-
+    #[inline]
     fn flags(&self) -> u32 {
         self.raw_node()._base._base_1.mFlags
     }
diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs
index 35ca8d0f2fdf..3a1af21f7269 100644
--- a/servo/ports/geckolib/glue.rs
+++ b/servo/ports/geckolib/glue.rs
@@ -121,9 +121,9 @@ use style::properties::{CascadeFlags, ComputedValues, DeclarationSource, Importa
 use style::properties::{LonghandId, LonghandIdSet, PropertyDeclaration, PropertyDeclarationBlock, PropertyId};
 use style::properties::{PropertyDeclarationId, ShorthandId};
 use style::properties::{SourcePropertyDeclaration, StyleBuilder};
+use style::properties::{parse_one_declaration_into, parse_style_attribute};
 use style::properties::animated_properties::AnimationValue;
 use style::properties::animated_properties::compare_property_priority;
-use style::properties::parse_one_declaration_into;
 use style::rule_cache::RuleCacheConditions;
 use style::rule_tree::{CascadeLevel, StrongRuleNode, StyleSource};
 use style::selector_parser::{PseudoElementCascadeType, SelectorImpl};
@@ -2583,8 +2583,13 @@ pub extern "C" fn Servo_ParseStyleAttribute(
     let reporter = ErrorReporter::new(ptr::null_mut(), loader, raw_extra_data);
     let url_data = unsafe { RefPtr::from_ptr_ref(&raw_extra_data) };
     Arc::new(global_style_data.shared_lock.wrap(
-        GeckoElement::parse_style_attribute(value, url_data, quirks_mode.into(), &reporter)))
-        .into_strong()
+        parse_style_attribute(
+            value,
+            url_data,
+            &reporter,
+            quirks_mode.into(),
+        )
+    )).into_strong()
 }
 
 #[no_mangle]

From fecccc72f69a17274ea8b4ef217aae8577b1ad66 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Mon, 27 Nov 2017 12:45:14 +0900
Subject: [PATCH 105/219] Bug 943272 - Get rid of nsIPlatformCharset. r=emk

MozReview-Commit-ID: DVatkTEYA1q

--HG--
extra : rebase_source : f95d587d3af94c0e058dde5c98ab917d98fcc48a
---
 intl/build/nsI18nModule.cpp               |   3 -
 intl/locale/android/moz.build             |   1 -
 intl/locale/android/nsAndroidCharset.cpp  |  42 --
 intl/locale/mac/moz.build                 |   1 -
 intl/locale/mac/nsMacCharset.cpp          |  49 --
 intl/locale/moz.build                     |  11 +-
 intl/locale/nsIPlatformCharset.h          |  55 ---
 intl/locale/nsLocaleConstructors.h        |   2 -
 intl/locale/nsPlatformCharset.h           |  34 --
 intl/locale/unix/moz.build                |  28 --
 intl/locale/unix/nsUNIXCharset.cpp        | 135 ------
 intl/locale/unix/unixcharset.properties   | 536 ----------------------
 intl/locale/windows/moz.build             |   8 -
 intl/locale/windows/nsWinCharset.cpp      |  72 ---
 intl/locale/windows/wincharset.properties |  23 -
 15 files changed, 4 insertions(+), 996 deletions(-)
 delete mode 100644 intl/locale/android/nsAndroidCharset.cpp
 delete mode 100644 intl/locale/mac/nsMacCharset.cpp
 delete mode 100644 intl/locale/nsIPlatformCharset.h
 delete mode 100644 intl/locale/nsPlatformCharset.h
 delete mode 100644 intl/locale/unix/moz.build
 delete mode 100644 intl/locale/unix/nsUNIXCharset.cpp
 delete mode 100644 intl/locale/unix/unixcharset.properties
 delete mode 100644 intl/locale/windows/nsWinCharset.cpp
 delete mode 100644 intl/locale/windows/wincharset.properties

diff --git a/intl/build/nsI18nModule.cpp b/intl/build/nsI18nModule.cpp
index 076501e61c33..e8649c56384e 100644
--- a/intl/build/nsI18nModule.cpp
+++ b/intl/build/nsI18nModule.cpp
@@ -32,7 +32,6 @@ NS_DEFINE_NAMED_CID(NS_WBRK_CID);
 NS_DEFINE_NAMED_CID(NS_STRINGBUNDLESERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_STRINGBUNDLETEXTOVERRIDE_CID);
 NS_DEFINE_NAMED_CID(NS_COLLATIONFACTORY_CID);
-NS_DEFINE_NAMED_CID(NS_PLATFORMCHARSET_CID);
 NS_DEFINE_NAMED_CID(NS_COLLATION_CID);
 
 static const mozilla::Module::CIDEntry kIntlCIDs[] = {
@@ -43,7 +42,6 @@ static const mozilla::Module::CIDEntry kIntlCIDs[] = {
     { &kNS_STRINGBUNDLESERVICE_CID, false, nullptr, nsStringBundleServiceConstructor },
     { &kNS_STRINGBUNDLETEXTOVERRIDE_CID, false, nullptr, nsStringBundleTextOverrideConstructor },
     { &kNS_COLLATIONFACTORY_CID, false, nullptr, nsCollationFactoryConstructor },
-    { &kNS_PLATFORMCHARSET_CID, false, nullptr, nsPlatformCharsetConstructor },
     { &kNS_COLLATION_CID, false, nullptr, nsCollationConstructor },
     { nullptr }
 };
@@ -56,7 +54,6 @@ static const mozilla::Module::ContractIDEntry kIntlContracts[] = {
     { NS_STRINGBUNDLE_CONTRACTID, &kNS_STRINGBUNDLESERVICE_CID },
     { NS_STRINGBUNDLETEXTOVERRIDE_CONTRACTID, &kNS_STRINGBUNDLETEXTOVERRIDE_CID },
     { NS_COLLATIONFACTORY_CONTRACTID, &kNS_COLLATIONFACTORY_CID },
-    { NS_PLATFORMCHARSET_CONTRACTID, &kNS_PLATFORMCHARSET_CID },
     { NS_COLLATION_CONTRACTID, &kNS_COLLATION_CID },
     { nullptr }
 };
diff --git a/intl/locale/android/moz.build b/intl/locale/android/moz.build
index a56081a85078..bc0563a0c37c 100644
--- a/intl/locale/android/moz.build
+++ b/intl/locale/android/moz.build
@@ -5,7 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 UNIFIED_SOURCES += [
-    'nsAndroidCharset.cpp',
     'OSPreferences_android.cpp'
 ]
 
diff --git a/intl/locale/android/nsAndroidCharset.cpp b/intl/locale/android/nsAndroidCharset.cpp
deleted file mode 100644
index bae0e10d2bed..000000000000
--- a/intl/locale/android/nsAndroidCharset.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsIPlatformCharset.h"
-#include "nsPlatformCharset.h"
-
-NS_IMPL_ISUPPORTS(nsPlatformCharset, nsIPlatformCharset)
-
-nsPlatformCharset::nsPlatformCharset()
-{
-}
-
-nsPlatformCharset::~nsPlatformCharset()
-{
-}
-
-NS_IMETHODIMP
-nsPlatformCharset::Init()
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsACString& oResult)
-{
-  oResult.AssignLiteral("UTF-8");
-  return NS_OK;
-}
-
-nsresult
-nsPlatformCharset::InitGetCharset(nsACString &oString)
-{
-  return NS_OK;
-}
-
-nsresult
-nsPlatformCharset::VerifyCharset(nsCString &aCharset)
-{
-  return NS_OK;
-}
diff --git a/intl/locale/mac/moz.build b/intl/locale/mac/moz.build
index 3c317c10bbe7..6f933e2a5b6c 100644
--- a/intl/locale/mac/moz.build
+++ b/intl/locale/mac/moz.build
@@ -5,7 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 UNIFIED_SOURCES += [
-    'nsMacCharset.cpp',
     'OSPreferences_mac.cpp'
 ]
 
diff --git a/intl/locale/mac/nsMacCharset.cpp b/intl/locale/mac/nsMacCharset.cpp
deleted file mode 100644
index 51bfbb65547e..000000000000
--- a/intl/locale/mac/nsMacCharset.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include <Carbon/Carbon.h>
-#include "nsIPlatformCharset.h"
-#include "nsString.h"
-#include "nsPlatformCharset.h"
-
-NS_IMPL_ISUPPORTS(nsPlatformCharset, nsIPlatformCharset)
-
-nsPlatformCharset::nsPlatformCharset()
-{
-}
-nsPlatformCharset::~nsPlatformCharset()
-{
-}
-
-NS_IMETHODIMP
-nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsACString& oResult)
-{
-  oResult.AssignLiteral("UTF-8");
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPlatformCharset::Init()
-{
-  return NS_OK;
-}
-
-nsresult
-nsPlatformCharset::MapToCharset(nsAString& inANSICodePage, nsACString& outCharset)
-{
-  return NS_OK;
-}
-
-nsresult
-nsPlatformCharset::InitGetCharset(nsACString &oString)
-{
-  return NS_OK;
-}
-
-nsresult
-nsPlatformCharset::VerifyCharset(nsCString &aCharset)
-{
-  return NS_OK;
-}
diff --git a/intl/locale/moz.build b/intl/locale/moz.build
index 178f999ddd23..6114dd2f01ca 100644
--- a/intl/locale/moz.build
+++ b/intl/locale/moz.build
@@ -12,12 +12,10 @@ if toolkit == 'windows':
     DIRS += ['windows']
 elif toolkit == 'cocoa':
     DIRS += ['mac']
-else:
-    DIRS += ['unix']
-    if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-        DIRS += ['gtk']
-    elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-        DIRS += ['android']
+elif 'gtk' in toolkit:
+    DIRS += ['gtk']
+elif toolkit == 'android':
+    DIRS += ['android']
 
 XPIDL_SOURCES += [
     'mozILocaleService.idl',
@@ -30,7 +28,6 @@ XPIDL_MODULE = 'locale'
 EXPORTS += [
     'DateTimeFormat.h',
     'nsCollationCID.h',
-    'nsIPlatformCharset.h',
     'nsLanguageAtomService.h',
     'nsUConvPropertySearch.h',
 ]
diff --git a/intl/locale/nsIPlatformCharset.h b/intl/locale/nsIPlatformCharset.h
deleted file mode 100644
index 6a8e5193d186..000000000000
--- a/intl/locale/nsIPlatformCharset.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsIPlatformCharset_h__
-#define nsIPlatformCharset_h__
-
-#include "nsStringGlue.h"
-#include "nsISupports.h"
-
-// Interface ID for our nsIPlatformCharset interface
-
-/* 778859d5-fc01-4f4b-bfaa-3c0d1b6c81d6 */
-#define NS_IPLATFORMCHARSET_IID \
-{   0x778859d5, \
-    0xfc01, \
-    0x4f4b, \
-    {0xbf, 0xaa, 0x3c, 0x0d, 0x1b, 0x6c, 0x81, 0xd6} }
-
-#define NS_PLATFORMCHARSET_CID \
-{ 0x84b0f182, 0xc6c7, 0x11d2, {0xb3, 0xb0, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 }}
-
-#define NS_PLATFORMCHARSET_CONTRACTID "@mozilla.org/intl/platformcharset;1"
-
-typedef enum {
-     kPlatformCharsetSel_PlainTextInClipboard = 0,
-     kPlatformCharsetSel_FileName = 1,
-     kPlatformCharsetSel_Menu = 2,
-     kPlatformCharsetSel_4xBookmarkFile = 3,
-     kPlatformCharsetSel_KeyboardInput = 4,
-     kPlatformCharsetSel_WindowManager = 5,
-     kPlatformCharsetSel_4xPrefsJS = 6,
-     kPlatformCharsetSel_PlainTextInFile = 7
-} nsPlatformCharsetSel;
-
-/**
- * DO NOT ADD NEW USES OF THIS INTERFACE!
- * Removal is https://bugzilla.mozilla.org/show_bug.cgi?id=943272
- *
- * Instead, use UTF-16 APIs on Windows and UTF-8 APIs everywhere else.
- * Assume plain text files are UTF-8.
- */
-class nsIPlatformCharset : public nsISupports
-{
-public:
-
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IPLATFORMCHARSET_IID)
-
-  NS_IMETHOD GetCharset(nsPlatformCharsetSel selector, nsACString& oResult) = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIPlatformCharset, NS_IPLATFORMCHARSET_IID)
-
-#endif /* nsIPlatformCharset_h__ */
diff --git a/intl/locale/nsLocaleConstructors.h b/intl/locale/nsLocaleConstructors.h
index b5d27f8f5820..8b55e071cfc8 100644
--- a/intl/locale/nsLocaleConstructors.h
+++ b/intl/locale/nsLocaleConstructors.h
@@ -10,7 +10,6 @@
 #include "nsCollationCID.h"
 #include "mozilla/ModuleUtils.h"
 #include "nsIServiceManager.h"
-#include "nsPlatformCharset.h"
 #include "LocaleService.h"
 #include "OSPreferences.h"
 
@@ -33,7 +32,6 @@ ctor_(nsISupports* aOuter, REFNSIID aIID, void** aResult) \
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCollation)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCollationFactory)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPlatformCharset, Init)
 
 namespace mozilla {
 namespace intl {
diff --git a/intl/locale/nsPlatformCharset.h b/intl/locale/nsPlatformCharset.h
deleted file mode 100644
index 6063c24ff6fe..000000000000
--- a/intl/locale/nsPlatformCharset.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef nsPlatformCharset_h__
-#define nsPlatformCharset_h__
-
-#include "nsIPlatformCharset.h"
-
-class nsPlatformCharset final : public nsIPlatformCharset
-{
-  NS_DECL_ISUPPORTS
-
-public:
-
-  nsPlatformCharset();
-
-  NS_IMETHOD Init();
-  NS_IMETHOD GetCharset(nsPlatformCharsetSel selector, nsACString& oResult) override;
-
-private:
-  nsCString mCharset;
-  nsString mLocale; // remember the locale & charset
-
-  nsresult MapToCharset(nsAString& inANSICodePage, nsACString& outCharset);
-  nsresult InitGetCharset(nsACString& oString);
-  nsresult VerifyCharset(nsCString &aCharset);
-
-  virtual ~nsPlatformCharset();
-};
-
-#endif // nsPlatformCharset_h__
-
-
diff --git a/intl/locale/unix/moz.build b/intl/locale/unix/moz.build
deleted file mode 100644
index 860256fad39d..000000000000
--- a/intl/locale/unix/moz.build
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
-    SOURCES += [
-        'nsUNIXCharset.cpp',
-    ]
-    GENERATED_FILES = [
-        'unixcharset.properties.h',
-    ]
-    unixcharset = GENERATED_FILES['unixcharset.properties.h']
-    unixcharset.script = '../props2arrays.py'
-    unixcharset.inputs = ['unixcharset.properties']
-
-FINAL_LIBRARY = 'xul'
-
-LOCAL_INCLUDES += [
-    '..',
-]
-
-# CODESET is not automatically defined on some older versions of Redhat.
-# Define _XOPEN_SOURCE so CODESET will get defined and thus allow
-# nl_langinfo(CODESET) to compile on these systems.
-if CONFIG['OS_ARCH'] == 'Linux':
-    DEFINES['_XOPEN_SOURCE'] = 500
diff --git a/intl/locale/unix/nsUNIXCharset.cpp b/intl/locale/unix/nsUNIXCharset.cpp
deleted file mode 100644
index 78ca58eda2c9..000000000000
--- a/intl/locale/unix/nsUNIXCharset.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include <locale.h>
-
-#include "mozilla/ArrayUtils.h"
-
-#include "nsIPlatformCharset.h"
-#include "nsUConvPropertySearch.h"
-#include "nsCOMPtr.h"
-#include "nsReadableUtils.h"
-#if HAVE_GNU_LIBC_VERSION_H
-#include <gnu/libc-version.h>
-#endif
-#ifdef HAVE_NL_TYPES_H
-#include <nl_types.h>
-#endif
-#if HAVE_LANGINFO_CODESET
-#include <langinfo.h>
-#endif
-#include "nsPlatformCharset.h"
-#include "prinit.h"
-#include "nsUnicharUtils.h"
-#include "mozilla/Encoding.h"
-
-using namespace mozilla;
-
-static constexpr nsUConvProp kUnixCharsets[] = {
-#include "unixcharset.properties.h"
-};
-
-NS_IMPL_ISUPPORTS(nsPlatformCharset, nsIPlatformCharset)
-
-nsPlatformCharset::nsPlatformCharset()
-{
-}
-
-static nsresult
-ConvertLocaleToCharsetUsingDeprecatedConfig(const nsACString& locale,
-                                            nsACString& oResult)
-{
-  if (!(locale.IsEmpty())) {
-    if (NS_SUCCEEDED(nsUConvPropertySearch::SearchPropertyValue(kUnixCharsets,
-        ArrayLength(kUnixCharsets), locale, oResult))) {
-      return NS_OK;
-    }
-  }
-  NS_ERROR("unable to convert locale to charset using deprecated config");
-  oResult.AssignLiteral("ISO-8859-1");
-  return NS_SUCCESS_USING_FALLBACK_LOCALE;
-}
-
-nsPlatformCharset::~nsPlatformCharset()
-{
-}
-
-NS_IMETHODIMP
-nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsACString& oResult)
-{
-  oResult = mCharset;
-  return NS_OK;
-}
-
-nsresult
-nsPlatformCharset::InitGetCharset(nsACString &oString)
-{
-#if HAVE_LANGINFO_CODESET
-  char* nl_langinfo_codeset = nullptr;
-  nsCString aCharset;
-  nsresult res;
-
-  nl_langinfo_codeset = nl_langinfo(CODESET);
-  NS_ASSERTION(nl_langinfo_codeset, "cannot get nl_langinfo(CODESET)");
-
-  //
-  // see if we can use nl_langinfo(CODESET) directly
-  //
-  if (nl_langinfo_codeset) {
-    aCharset.Assign(nl_langinfo_codeset);
-    res = VerifyCharset(aCharset);
-    if (NS_SUCCEEDED(res)) {
-      oString = aCharset;
-      return res;
-    }
-  }
-
-  NS_ERROR("unable to use nl_langinfo(CODESET)");
-#endif
-
-  //
-  // try falling back on a deprecated (locale based) name
-  //
-  char* locale = setlocale(LC_CTYPE, nullptr);
-  nsAutoCString localeStr;
-  localeStr.Assign(locale);
-  return ConvertLocaleToCharsetUsingDeprecatedConfig(localeStr, oString);
-}
-
-NS_IMETHODIMP
-nsPlatformCharset::Init()
-{
-  //
-  // remember default locale so we can use the
-  // same charset when asked for the same locale
-  //
-  char* locale = setlocale(LC_CTYPE, nullptr);
-  NS_ASSERTION(locale, "cannot setlocale");
-  if (locale) {
-    CopyASCIItoUTF16(locale, mLocale);
-  } else {
-    mLocale.AssignLiteral("en_US");
-  }
-
-  // InitGetCharset only returns NS_OK or NS_SUCESS_USING_FALLBACK_LOCALE
-  return InitGetCharset(mCharset);
-}
-
-nsresult
-nsPlatformCharset::VerifyCharset(nsCString &aCharset)
-{
-  // fast path for UTF-8.  Most platform uses UTF-8 as charset now.
-  if (aCharset.EqualsLiteral("UTF-8")) {
-    return NS_OK;
-  }
-
-  const Encoding* encoding = Encoding::ForLabelNoReplacement(aCharset);
-  if (!encoding) {
-    return NS_ERROR_UCONV_NOCONV;
-  }
-
-  encoding->Name(aCharset);
-  return NS_OK;
-}
diff --git a/intl/locale/unix/unixcharset.properties b/intl/locale/unix/unixcharset.properties
deleted file mode 100644
index d62162efc3ae..000000000000
--- a/intl/locale/unix/unixcharset.properties
+++ /dev/null
@@ -1,536 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-##
-## NOTE: THIS FILE IS DEPRECATED
-##       except for those *nix systems that do not support
-##       nl_langinfo(CODESET) this file should not be used
-##
-## All platform section
-##   Put the general locale to charset mapping here.
-##   If somehow two platform use the same locale name with different
-##   charset, put the least common one in the platform specific section
-##   This section have lower priority than the platform specific section
-##
-## The key is the locale name
-# AIX
-ar_AA=ISO-8859-6
-# Solaris
-Ar_ARM=ISO-8859-6
-american.iso88591=ISO-8859-1
-bulgarian=ISO-8859-2
-bg_BG.ISO8859-5=ISO-8859-5
-# AIX
-bg_BG=ISO-8859-5
-C=ISO-8859-1
-# HP
-C.iso885915=ISO-8859-15
-c-french.iso88591=ISO-8859-1
-chinese=gb18030
-chinese-s=gb18030
-chinese-t.big5=Big5
-cs=ISO-8859-2
-cs_CZ=ISO-8859-2
-cs_CZ.ISO8859-2=ISO-8859-2
-cs_CZ.88592=ISO-8859-2
-czech=ISO-8859-2
-da=ISO-8859-1
-# Solaris
-da.ISO8859-15=ISO-8859-15
-da_DK.ISO8859-15=ISO-8859-15
-da_DK.ISO8859-15@euro=ISO-8859-15
-# Solaris
-da.ISO8859-15@euro=ISO-8859-15
-da_DK.88591=ISO-8859-1
-# HP
-da_DK.iso885915@euro=ISO-8859-15
-da_DK.ISO8859-1=ISO-8859-1
-da_DK=ISO-8859-1
-# AIX
-#Da_DK=IBM-850
-danish.iso88591=ISO-8859-1
-dutch.iso88591=ISO-8859-1
-de=ISO-8859-1
-# Solaris
-de.ISO8859-15=ISO-8859-15
-# Solaris
-de.ISO8859-15@euro=ISO-8859-15
-# Solaris
-de.UTF-8=UTF-8
-# Solaris
-de.UTF-8@euro=UTF-8
-de_AT=ISO-8859-1
-# Solaris
-de_AT.ISO8859-15=ISO-8859-15
-# Solaris
-de_AT.ISO8859-15@euro=ISO-8859-15
-de_CH=ISO-8859-1
-de_CH.88591=ISO-8859-1
-de_CH.ISO8859-1=ISO-8859-1
-de_DE.ISO8859-15=ISO-8859-15
-de_DE.ISO8859-15@euro=ISO-8859-15
-# AIX
-#De_CH=IBM-850
-de_DE=ISO-8859-1
-de_DE.88591=ISO-8859-1
-# HP
-de_DE.iso885915=ISO-8859-15
-# HP
-de_DE.iso885915@euro=ISO-8859-15
-de_DE.ISO8859-1=ISO-8859-1
-# AIX
-#De_DE=IBM-850
-# Solaris
-el_GR.ISO8859-7=ISO-8859-7
-el_GR.ISO8859-7@euro=ISO-8859-7
-en_AU.ISO8859-1=ISO-8859-1
-en_CA.ISO8859-1=ISO-8859-1
-# AIX
-el_GR=ISO-8859-7
-en=ISO-8859-1
-en_AU=ISO-8859-1
-en_CA=ISO-8859-1
-en_GB=ISO-8859-1
-# Solaris
-en_GB.ISO8859-15=ISO-8859-15
-# Solaris
-en_GB.ISO8859-15@euro=ISO-8859-15
-en_GB.88591=ISO-8859-1
-en_GB.ISO8859-1=ISO-8859-1
-# HP
-en_GB.iso885915@euro=ISO-8859-15
-# AIX
-#En_GB=IBM-850
-# Solaris
-en_IE.ISO8859-1=ISO-8859-1
-en_IE.ISO8859-15=ISO-8859-15
-# Solaris
-en_IE.ISO8859-15@euro=ISO-8859-15
-en_JP=EUC-JP
-en_JP.IBM-eucJP=EUC-JP
-En_JP.IBM-932=Shift_JIS
-En_JP=Shift_JIS
-en_KR=EUC-KR
-en_KR.IBM-eucKR=EUC-KR
-en_TH=ISO-8859-1
-en_US=ISO-8859-1
-en_US.88591=ISO-8859-1
-en_US.ISO8859-1=ISO-8859-1
-#FreeBSD
-en_US.ISO_8859-1=ISO-8859-1
-da_DK.ISO_8859-1=ISO-8859-1
-de_AT.ISO_8859-1=ISO-8859-1
-de_CH.ISO_8859-1=ISO-8859-1
-de_DE.ISO_8859-1=ISO-8859-1
-en_AU.ISO_8859-1=ISO-8859-1
-en_CA.ISO_8859-1=ISO-8859-1
-en_GB.ISO_8859-1=ISO-8859-1
-es_ES.ISO_8859-1=ISO-8859-1
-fi_FI.ISO_8859-1=ISO-8859-1
-fr_BE.ISO_8859-1=ISO-8859-1
-fr_CA.ISO_8859-1=ISO-8859-1
-fr_CH.ISO_8859-1=ISO-8859-1
-fr_FR.ISO_8859-1=ISO-8859-1
-is_IS.ISO_8859-1=ISO-8859-1
-it_CH.ISO_8859-1=ISO-8859-1
-it_IT.ISO_8859-1=ISO-8859-1
-la_LN.ISO_8859-1=ISO-8859-1
-nl_BE.ISO_8859-1=ISO-8859-1
-nl_NL.ISO_8859-1=ISO-8859-1
-no_NO.ISO_8859-1=ISO-8859-1
-pt_PT.ISO_8859-1=ISO-8859-1
-sv_SE.ISO_8859-1=ISO-8859-1
-# FreeBSD 8859-15
-da_DK.DIS_8859-15=ISO-8859-15
-de_AT.DIS_8859-15=ISO-8859-15
-de_CH.DIS_8859-15=ISO-8859-15
-de_DE.DIS_8859-15=ISO-8859-15
-en_AU.DIS_8859-15=ISO-8859-15
-en_CA.DIS_8859-15=ISO-8859-15
-en_GB.DIS_8859-15=ISO-8859-15
-en_US.DIS_8859-15=ISO-8859-15
-es_ES.DIS_8859-15=ISO-8859-15
-fi_FI.DIS_8859-15=ISO-8859-15
-fr_BE.DIS_8859-15=ISO-8859-15
-fr_CA.DIS_8859-15=ISO-8859-15
-fr_CH.DIS_8859-15=ISO-8859-15
-fr_FR.DIS_8859-15=ISO-8859-15
-is_IS.DIS_8859-15=ISO-8859-15
-it_CH.DIS_8859-15=ISO-8859-15
-it_IT.DIS_8859-15=ISO-8859-15
-la_LN.DIS_8859-15=ISO-8859-15
-nl_BE.DIS_8859-15=ISO-8859-15
-nl_NL.DIS_8859-15=ISO-8859-15
-no_NO.DIS_8859-15=ISO-8859-15
-pt_PT.DIS_8859-15=ISO-8859-15
-sv_SE.DIS_8859-15=ISO-8859-15
-# FreeBSD 8859-2
-cs_CZ.ISO_8859-2=ISO-8859-2
-hr_HR.ISO_8859-2=ISO-8859-2
-hu_HU.ISO_8859-2=ISO-8859-2
-la_LN.ISO_8859-2=ISO-8859-2
-pl_PL.ISO_8859-2=ISO-8859-2
-sl_SI.ISO_8859-2=ISO-8859-2
-# FreeBSD 8859-4
-la_LN.ISO_8859-4=ISO-8859-4
-lt_LT.ISO_8859-4=ISO-8859-4
-# FreeBSD 8859-5
-ru_RU.ISO_8859-5=ISO-8859-5
-ru_SU.ISO_8859-5=ISO-8859-5
-# FreeBSD Russian
-ru_SU.KOI8-R=KOI8-R
-# FreeBSD Ukrainian
-uk_UA.KOI8-U=KOI8-U
-# Solaris
-en_US.UTF-8=UTF-8
-# Solaris
-en_US.UTF-8@euro=UTF-8
-# AIX
-#En_US=IBM-850
-english.iso88591=ISO-8859-1
-es=ISO-8859-1
-# Solaris
-es.ISO8859-15=ISO-8859-15
-# Solaris
-es.ISO8859-15@euro=ISO-8859-15
-# Solaris
-es.UTF-8=UTF-8
-# Solaris
-es.UTF-8@euro=UTF-8
-es_ES=ISO-8859-1
-es_ES.ISO8859-15=ISO-8859-15
-es_ES.ISO8859-15@euro=ISO-8859-15
-es_AR.ISO8859-1=ISO-8859-1
-es_BO.ISO8859-1=ISO-8859-1
-es_CL.ISO8859-1=ISO-8859-1
-es_CO.ISO8859-1=ISO-8859-1
-es_CR.ISO8859-1=ISO-8859-1
-es_EC.ISO8859-1=ISO-8859-1
-es_GT.ISO8859-1=ISO-8859-1
-es_MX.ISO8859-1=ISO-8859-1
-es_NI.ISO8859-1=ISO-8859-1
-es_PA.ISO8859-1=ISO-8859-1
-es_PE.ISO8859-1=ISO-8859-1
-es_PY.ISO8859-1=ISO-8859-1
-es_SV.ISO8859-1=ISO-8859-1
-es_UY.ISO8859-1=ISO-8859-1
-es_VE.ISO8859-1=ISO-8859-1
-# HP
-es_ES.iso885915=ISO-8859-15
-# HP
-es_ES.iso885915@euro=ISO-8859-15
-es_ES.88591=ISO-8859-1
-es_ES.ISO8859-1=ISO-8859-1
-# AIX
-#En_ES=IBM-850
-# Solaris
-et_EE.ISO8859-15=ISO-8859-15
-# AIX
-#Et_ET=IBM-922
-# AIX
-ET_ET=UTF-8
-fi=ISO-8859-1
-# Solaris
-fi.ISO8859-15=ISO-8859-15
-# Solaris
-fi.ISO8859-15@euro=ISO-8859-15
-fi_FI=ISO-8859-1
-fi_FI.88591=ISO-8859-1
-fi_FI.ISO8859-1=ISO-8859-1
-fi_FI.ISO8859-15=ISO-8859-15
-fi_FI.ISO8859-15@euro=ISO-8859-15
-# HP
-fi_FI.iso885915@euro=ISO-8859-15
-# AIX
-#Fi_ES=IBM-850
-finnish.iso88591=ISO-8859-1
-fr=ISO-8859-1
-# Solaris
-fr.ISO8859-15=ISO-8859-15
-# Solaris
-fr.ISO8859-15@euro=ISO-8859-15
-# Solaris
-fr.UTF-8=UTF-8
-# Solaris
-fr.UTF-8@euro=UTF-8
-fr_BE=ISO-8859-1
-# Solaris
-fr_BE.ISO8859-15=ISO-8859-15
-# Solaris
-fr_BE.ISO8859-15@euro=ISO-8859-15
-fr_BE.88591=ISO-8859-1
-fr_BE.ISO8859-1=ISO-8859-1
-fr_BE.iso8859=ISO-8859-1
-# AIX
-#Fr_BE=IBM-850
-fr_CA=ISO-8859-1
-fr_CA.88591=ISO-8859-1
-fr_CA.iso8859=ISO-8859-1
-# HP
-fr_CA.iso885915@euro=ISO-8859-15
-fr_CA.ISO8859-1=ISO-8859-1
-# AIX
-#Fr_CA=IBM-850
-fr_CH=ISO-8859-1
-fr_CH.88591=ISO-8859-1
-fr_CH.iso8859=ISO-8859-1
-fr_CH.ISO8859-1=ISO-8859-1
-# Solaris
-fr_FR.ISO8859-15=ISO-8859-15
-fr_FR.ISO8859-15@euro=ISO-8859-15
-# AIX
-#Fr_CH=IBM-850
-fr_FR=ISO-8859-1
-fr_FR.88591=ISO-8859-1
-fr_FR.iso8859=ISO-8859-1
-# HP
-fr_FR.iso885915=ISO-8859-15
-# HP
-fr_FR.iso885915@euro=ISO-8859-15
-fr_FR.ISO8859-1=ISO-8859-1
-# AIX
-#Fr_FR=IBM-850
-french.iso88591=ISO-8859-1
-german.iso88591=ISO-8859-1
-# Solaris
-he_HE=ISO-8859-8
-he_IL=ISO-8859-8
-hr_HR.ISO8859-2=ISO-8859-2
-# AIX
-hr_HR=ISO-8859-2
-hu_HU=ISO-8859-2
-hu_HU.88592=ISO-8859-2
-hu_HU.ISO8859-2=ISO-8859-2
-hungarian=ISO-8859-2
-icelandic.iso88591=ISO-8859-1
-iso_8859_1=ISO-8859-1
-is=ISO-8859-1
-is_IS=ISO-8859-1
-is_IS.88591=ISO-8859-1
-is_IS.ISO8859-1=ISO-8859-1
-# HP
-is_IS.iso885915@euro=ISO-8859-15
-# AIX
-#Is_IS=IBM-850
-it=ISO-8859-1
-# Solaris
-it.ISO8859-15=ISO-8859-15
-# Solaris
-it.ISO8859-15@euro=ISO-8859-15
-# Solaris
-it.UTF-8=UTF-8
-# Solaris
-it.UTF-8@euro=UTF-8
-it_IT.ISO8859-15=ISO-8859-15
-it_IT.ISO8859-15@euro=ISO-8859-15
-# AIX
-#It_IT=IBM-850
-italian.iso8859-1=ISO-8859-1
-it_CH=ISO-8859-1
-it_IT=ISO-8859-1
-it_IT.88591=ISO-8859-1
-it_IT.ISO8859-1=ISO-8859-1
-# HP
-it_IT.iso885915=ISO-8859-15
-# HP
-it_IT.iso885915@euro=ISO-8859-15
-# AIX
-iw_IL=ISO-8859-8
-# AIX
-#Iw_IL=IBM-856
-ja=EUC-JP
-Ja_JP.IBM-932=Shift_JIS
-Ja_JP=Shift_JIS
-japanese=EUC-JP
-japanese.euc=EUC-JP
-ja_JP=EUC-JP
-# Solaris
-ja_JP.UTF-8=UTF-8
-# Solaris
-ja_JP.UTF-8@euro=UTF-8
-ja_JP.EUC=EUC-JP
-ja_JP.eucJP=EUC-JP
-ja_JP.SJIS=Shift_JIS
-ja_JP.PCK=Shift_JIS
-ja_JP.IBM-eucJP=EUC-JP
-ja_JP.mscode=Shift_JIS
-ja_JP.ujis=EUC-JP
-katakana=Shift_JIS
-ko=EUC-KR
-ko_KR=EUC-KR
-# Solaris
-ko_KR.UTF-8=UTF-8
-# Solaris
-ko_KR.UTF-8@euro=UTF-8
-ko_KR.euc=EUC-KR
-ko_KR.euckr=EUC-KR
-ko_KR.eucKR=EUC-KR
-ko_KR.IBM-eucKR=EUC-KR
-ko_KR.EUC=EUC-KR
-ko.UTF-8=UTF-8
-korean=EUC-KR
-# Solaris
-lt_LT.ISO8859-13=ISO-8859-13
-# AIX
-#Lt_LT=IBM-921
-# AIX
-LT_LT=UTF-8
-# Solaris
-lv_LV.ISO8859-13=ISO-8859-13
-# AIX
-#Lt_LV=IBM-921
-# AIX
-LT_LV=UTF-8
-# Solaris
-mk_MK.ISO8859-5=ISO-8859-5
-# AIX
-mk_MK=ISO-8859-5
-nl=ISO-8859-1
-# Solaris
-nl.ISO8859-15=ISO-8859-15
-# Solaris
-nl.ISO8859-15@euro=ISO-8859-15
-nl_BE=ISO-8859-1
-# Solaris
-nl_BE.ISO8859-15=ISO-8859-15
-# Solaris
-nl_BE.ISO8859-15@euro=ISO-8859-15
-nl_BE.88591=ISO-8859-1
-nl_BE.ISO8859-1=ISO-8859-1
-# Solaris
-nl_NL.ISO8859-15=ISO-8859-15
-nl_NL.ISO8859-15@euro=ISO-8859-15
-# AIX
-#NL_BE=IBM-850
-nl_NL=ISO-8859-1
-nl_NL.88591=ISO-8859-1
-nl_NL.ISO8859-1=ISO-8859-1
-# HP
-nl_NL.iso885915@euro=ISO-8859-15
-# AIX
-#NL_NL=IBM-850
-no=ISO-8859-1
-no_NO=ISO-8859-1
-no_NO.88591=ISO-8859-1
-no_NO.ISO8859-1=ISO-8859-1
-# Solaris
-no_NO.ISO8859-1@bokmal=ISO-8859-1
-no_NO.ISO8859-1@nynorsk=ISO-8859-1
-# HP
-no_NO.iso885915@euro=ISO-8859-15
-# AIX
-#No_NO=IBM-850
-norwegian.iso88591=ISO-8859-1
-pl=ISO-8859-2
-pl_PL=ISO-8859-2
-pl_PL.88592=ISO-8859-2
-pl_PL.ISO8859-2=ISO-8859-2
-polish=ISO-8859-2
-portuguese.iso88591=ISO-8859-1
-pt=ISO-8859-1
-# Solaris
-pt.ISO8859-15=ISO-8859-15
-# Solaris
-pt.ISO8859-15@euro=ISO-8859-15
-# Solaris
-pt_BR.ISO8859-1=ISO-8859-1
-pt_PT.ISO8859-15=ISO-8859-15
-pt_PT.ISO8859-15@euro=ISO-8859-15
-# AIX
-#Pt.PT=IBM-850
-pt_PT=ISO-8859-1
-pt_PT.88591=ISO-8859-1
-# HP
-pt_PT.iso885915@euro=ISO-8859-15
-pt_PT.ISO8859-1=ISO-8859-1
-# Solaris
-ro_RO.ISO8859-2=ISO-8859-2
-# AIX
-ro_RO=ISO-8859-5
-# Solaris
-#ru_RU.ANSI1251= ??? ANSI-1251 ???
-ru_RU.ISO8859-5=ISO-8859-5
-# AIX
-ru_RU=ISO-8859-5
-ru_RU.KOI8-R=KOI8-R
-# RedHat 7 reported by Garaschenko Slava <slava@maze.ambernet.kiev.ua bug 70601
-ru_RU.koi8r=KOI8-R
-# RedHat 7 reported by Garaschenko Slava <slava@maze.ambernet.kiev.ua bug 70601
-ru_UA=KOI8-U
-rumanian=ISO-8859-2
-serbocroatian=ISO-8859-2
-sh=ISO-8859-2
-# Solaris
-sh_BA.ISO8859-2@bosnia=ISO-8859-2
-sl_SI.ISO8859-2=ISO-8859-2
-sq_AL.ISO8859-2=ISO-8859-2
-# AIX
-sh_SP=ISO-8859-2
-sk=ISO-8859-2
-sk_SK=ISO-8859-2
-sk_SK.88592=ISO-8859-2
-sk_SK.ISO8859-2=ISO-8859-2
-slovene=ISO-8859-2
-spanish.iso88591=ISO-8859-1
-# AIX
-sq_AL=ISO-8859-1
-# Solaris
-sr_YU.ISO8859-5=ISO-8859-5
-# AIX
-sr_SP=ISO-8859-5
-sv=ISO-8859-1
-# Solaris
-sv.ISO8859-15=ISO-8859-15
-# Solaris
-sv.ISO8859-15@euro=ISO-8859-15
-# Solaris
-sv.UTF-8=UTF-8
-# Solaris
-sv.UTF-8@euro=UTF-8
-sv_SE=ISO-8859-1
-sv_SE.88591=ISO-8859-1
-sv_SE.ISO8859-15=ISO-8859-15
-sv_SE.ISO8859-15@euro=ISO-8859-15
-# HP
-sv_SE.iso885915=ISO-8859-15
-# HP
-sv_SE.iso885915@euro=ISO-8859-15
-sv_SE.ISO8859-1=ISO-8859-1
-# AIX
-swedish.iso88591=ISO-8859-1
-# Solaris
-tr_TR.ISO8859-9=windows-1254
-# AIX
-tr_TR=windows-1254
-# Solaris
-th_TH=windows-874
-th_TH.TIS620=windows-874
-th=windows-874
-th_TH.UTF-8=UTF-8
-# RedHat 7 reported by Garaschenko Slava <slava@maze.ambernet.kiev.ua bug 70601
-uk_UA=KOI8-U
-zh=gb18030
-zh_CN=gb18030
-zh_CN.EUC=gb18030
-zh.GBK=GBK
-zh_CN.UTF-8=UTF-8
-zh.UTF-8=UTF-8
-zh_TW.BIG5=Big5
-# saw the following name from news://xcin.linux.org.tw/tlug.cle-devel
-zh_CN.gb18030=gb18030
-# AIX
-ZH_CN=UTF-8
-zh_CN.ugb=gb18030
-zh_CN.GBK=GBK
-zh_HK.big5=Big5
-zh_TW.big5=Big5
-zh_TW.big5@chuyin=Big5
-zh_TW.big5@radical=Big5
-zh_TW.big5@stroke=Big5
-# AIX
-Zh_TW.big5=Big5
-# CLE 0.8
-zh_TW.Big5=Big5
-# SunOS 5.7 according to pofeng@linux.org.tw (already above)
-# zh_TW.BIG5=Big5
diff --git a/intl/locale/windows/moz.build b/intl/locale/windows/moz.build
index 29af4fa326e8..55bf36050e69 100644
--- a/intl/locale/windows/moz.build
+++ b/intl/locale/windows/moz.build
@@ -5,19 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
-    'nsWinCharset.cpp',
     'OSPreferences_win.cpp'
 ]
 
 FINAL_LIBRARY = 'xul'
 
-GENERATED_FILES = [
-    'wincharset.properties.h',
-]
-wincharset = GENERATED_FILES['wincharset.properties.h']
-wincharset.script = '../props2arrays.py'
-wincharset.inputs = ['wincharset.properties']
-
 LOCAL_INCLUDES += [
     '..',
 ]
diff --git a/intl/locale/windows/nsWinCharset.cpp b/intl/locale/windows/nsWinCharset.cpp
deleted file mode 100644
index 6014291a15ea..000000000000
--- a/intl/locale/windows/nsWinCharset.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "mozilla/ArrayUtils.h"
-
-#include "nsIPlatformCharset.h"
-#include "nsUConvPropertySearch.h"
-#include <windows.h>
-#include "nsString.h"
-#include "nsPlatformCharset.h"
-
-using namespace mozilla;
-
-static constexpr nsUConvProp kWinCharsets[] = {
-#include "wincharset.properties.h"
-};
-
-NS_IMPL_ISUPPORTS(nsPlatformCharset, nsIPlatformCharset)
-
-nsPlatformCharset::nsPlatformCharset()
-{
-  nsAutoString acpKey(NS_LITERAL_STRING("acp."));
-  acpKey.AppendInt(int32_t(::GetACP() & 0x00FFFF), 10);
-  MapToCharset(acpKey, mCharset);
-}
-
-nsPlatformCharset::~nsPlatformCharset()
-{
-}
-
-nsresult
-nsPlatformCharset::MapToCharset(nsAString& inANSICodePage, nsACString& outCharset)
-{
-  nsAutoCString key;
-  LossyCopyUTF16toASCII(inANSICodePage, key);
-
-  nsresult rv = nsUConvPropertySearch::SearchPropertyValue(kWinCharsets,
-      ArrayLength(kWinCharsets), key, outCharset);
-  if (NS_FAILED(rv)) {
-    outCharset.AssignLiteral("windows-1252");
-    return NS_SUCCESS_USING_FALLBACK_LOCALE;
-  }
-  return rv;
-}
-
-NS_IMETHODIMP
-nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector,
-                              nsACString& oResult)
-{
-  oResult = mCharset;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPlatformCharset::Init()
-{
-  return NS_OK;
-}
-
-nsresult
-nsPlatformCharset::InitGetCharset(nsACString &oString)
-{
-  return NS_OK;
-}
-
-nsresult
-nsPlatformCharset::VerifyCharset(nsCString &aCharset)
-{
-  return NS_OK;
-}
diff --git a/intl/locale/windows/wincharset.properties b/intl/locale/windows/wincharset.properties
deleted file mode 100644
index 79a802492a32..000000000000
--- a/intl/locale/windows/wincharset.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file map a ACP to a charset name
-# We use this to figure out the charset of file system, clipboard, etc
-#
-
-acp.874=windows-874
-acp.932=Shift_JIS
-acp.936=gb18030
-acp.949=EUC-KR
-acp.950=Big5
-acp.951=Big5
-acp.1250=windows-1250
-acp.1251=windows-1251
-acp.1252=windows-1252
-acp.1253=windows-1253
-acp.1254=windows-1254
-acp.1255=windows-1255
-acp.1256=windows-1256
-acp.1257=windows-1257
-acp.1258=windows-1258

From fcf9456236e52b6171c146e72da1c64944a0a9bc Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Wed, 29 Nov 2017 17:54:30 +0900
Subject: [PATCH 106/219] Bug 1421553 - Part 1. OffsetEntry should use nsINode
 instead of nsIDOMNode. r=masayuki

nsTextServicesDocument still use nsIDOMNode, so we should replace with nsINode
to reduce QI.

MozReview-Commit-ID: 7G9w31dRFi9

--HG--
extra : rebase_source : 322ae89f42183fe780b408f2ceb1c6d699ade985
---
 editor/txtsvc/nsTextServicesDocument.cpp | 485 +++++++++--------------
 editor/txtsvc/nsTextServicesDocument.h   |  27 +-
 2 files changed, 209 insertions(+), 303 deletions(-)

diff --git a/editor/txtsvc/nsTextServicesDocument.cpp b/editor/txtsvc/nsTextServicesDocument.cpp
index c367c45e379d..843bf3bdb20a 100644
--- a/editor/txtsvc/nsTextServicesDocument.cpp
+++ b/editor/txtsvc/nsTextServicesDocument.cpp
@@ -44,10 +44,10 @@
 using namespace mozilla;
 using namespace mozilla::dom;
 
-class OffsetEntry
+class OffsetEntry final
 {
 public:
-  OffsetEntry(nsIDOMNode *aNode, int32_t aOffset, int32_t aLength)
+  OffsetEntry(nsINode *aNode, int32_t aOffset, int32_t aLength)
     : mNode(aNode), mNodeOffset(0), mStrOffset(aOffset), mLength(aLength),
       mIsInsertedText(false), mIsValid(true)
   {
@@ -61,14 +61,9 @@ public:
 
   virtual ~OffsetEntry()
   {
-    mNode       = 0;
-    mNodeOffset = 0;
-    mStrOffset  = 0;
-    mLength     = 0;
-    mIsValid    = false;
   }
 
-  nsIDOMNode *mNode;
+  nsINode* mNode;
   int32_t mNodeOffset;
   int32_t mStrOffset;
   int32_t mLength;
@@ -239,7 +234,7 @@ nsTextServicesDocument::ExpandRangeToWordBoundaries(nsIDOMRange *aRange)
 
   // Get the end points of the range.
 
-  nsCOMPtr<nsIDOMNode> rngStartNode, rngEndNode;
+  nsCOMPtr<nsINode> rngStartNode, rngEndNode;
   int32_t rngStartOffset, rngEndOffset;
 
   nsresult rv = GetRangeEndPoints(range, getter_AddRefs(rngStartNode),
@@ -288,24 +283,16 @@ nsTextServicesDocument::ExpandRangeToWordBoundaries(nsIDOMRange *aRange)
 
   // Now make sure our end points are in terms of text nodes in the range!
 
-  nsCOMPtr<nsIDOMNode> firstTextNode = do_QueryInterface(firstText);
-  NS_ENSURE_TRUE(firstTextNode, NS_ERROR_FAILURE);
-
-  if (rngStartNode != firstTextNode) {
+  if (rngStartNode != firstText) {
     // The range includes the start of the first text node!
-    rngStartNode = firstTextNode;
+    rngStartNode = firstText;
     rngStartOffset = 0;
   }
 
-  nsCOMPtr<nsIDOMNode> lastTextNode = do_QueryInterface(lastText);
-  NS_ENSURE_TRUE(lastTextNode, NS_ERROR_FAILURE);
-
-  if (rngEndNode != lastTextNode) {
+  if (rngEndNode != lastText) {
     // The range includes the end of the last text node!
-    rngEndNode = lastTextNode;
-    nsAutoString str;
-    lastTextNode->GetNodeValue(str);
-    rngEndOffset = str.Length();
+    rngEndNode = lastText;
+    rngEndOffset = lastText->Length();
   }
 
   // Create a doc iterator so that we can scan beyond
@@ -333,7 +320,7 @@ nsTextServicesDocument::ExpandRangeToWordBoundaries(nsIDOMRange *aRange)
     return rv;
   }
 
-  nsCOMPtr<nsIDOMNode> wordStartNode, wordEndNode;
+  nsCOMPtr<nsINode> wordStartNode, wordEndNode;
   int32_t wordStartOffset, wordEndOffset;
 
   rv = FindWordBounds(&offsetTable, &blockStr,
@@ -385,9 +372,8 @@ nsTextServicesDocument::ExpandRangeToWordBoundaries(nsIDOMRange *aRange)
 
   // Now adjust the range so that it uses our new
   // end points.
-  nsCOMPtr<nsINode> startNode = do_QueryInterface(rngStartNode);
-  nsCOMPtr<nsINode> endNode = do_QueryInterface(rngEndNode);
-  rv = range->SetStartAndEnd(startNode, rngStartOffset, endNode, rngEndOffset);
+  rv = range->SetStartAndEnd(rngStartNode, rngStartOffset,
+                             rngEndNode, rngEndOffset);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -483,7 +469,7 @@ nsTextServicesDocument::LastSelectedBlock(TSDBlockSelectionStatus *aSelStatus,
 
   nsCOMPtr<nsIContentIterator> iter;
   RefPtr<nsRange> range;
-  nsCOMPtr<nsIDOMNode>         parent;
+  nsCOMPtr<nsINode> parent;
 
   if (selection->IsCollapsed()) {
     // We have a caret. Check if the caret is in a text node.
@@ -498,31 +484,19 @@ nsTextServicesDocument::LastSelectedBlock(TSDBlockSelectionStatus *aSelStatus,
       return NS_ERROR_FAILURE;
     }
 
-    nsresult rv = range->GetStartContainer(getter_AddRefs(parent));
-
-    if (NS_FAILED(rv)) {
-      UNLOCK_DOC(this);
-      return rv;
-    }
-
+    parent = range->GetStartContainer();
     if (!parent) {
       UNLOCK_DOC(this);
       return NS_ERROR_FAILURE;
     }
 
-    if (IsTextNode(parent)) {
+    nsresult rv;
+    if (parent->IsNodeOfType(nsINode::eTEXT)) {
       // The caret is in a text node. Find the beginning
       // of the text block containing this text node and
       // return.
 
-      nsCOMPtr<nsIContent> content(do_QueryInterface(parent));
-
-      if (!content) {
-        UNLOCK_DOC(this);
-        return NS_ERROR_FAILURE;
-      }
-
-      rv = mIterator->PositionAt(content);
+      rv = mIterator->PositionAt(parent);
 
       if (NS_FAILED(rv)) {
         UNLOCK_DOC(this);
@@ -562,13 +536,12 @@ nsTextServicesDocument::LastSelectedBlock(TSDBlockSelectionStatus *aSelStatus,
       // position to the end of the document, then walk forwards
       // till you find a text node, then find the beginning of it's block.
 
-      rv = CreateDocumentContentRootToNodeOffsetRange(
-             parent, range->StartOffset(), false,
-             getter_AddRefs(range));
+      range = CreateDocumentContentRootToNodeOffsetRange(
+                parent, range->StartOffset(), false);
 
-      if (NS_FAILED(rv)) {
+      if (NS_WARN_IF(!range)) {
         UNLOCK_DOC(this);
-        return rv;
+        return NS_ERROR_FAILURE;
       }
 
       if (range->Collapsed()) {
@@ -588,16 +561,13 @@ nsTextServicesDocument::LastSelectedBlock(TSDBlockSelectionStatus *aSelStatus,
 
       iter->First();
 
-      nsCOMPtr<nsIContent> content;
+      nsIContent* content = nullptr;
       while (!iter->IsDone()) {
-        content = do_QueryInterface(iter->GetCurrentNode());
-
-        if (IsTextNode(content)) {
+        nsINode* currentNode = iter->GetCurrentNode();
+        if (currentNode->IsNodeOfType(nsINode::eTEXT)) {
+          content = currentNode->AsContent();
           break;
         }
-
-        content = nullptr;
-
         iter->Next();
       }
 
@@ -689,9 +659,8 @@ nsTextServicesDocument::LastSelectedBlock(TSDBlockSelectionStatus *aSelStatus,
         // We found a text node, so position the document's
         // iterator at the beginning of the block, then get
         // the selection in terms of the string offset.
-        nsCOMPtr<nsIContent> content = iter->GetCurrentNode()->AsContent();
 
-        rv = mIterator->PositionAt(content);
+        rv = mIterator->PositionAt(iter->GetCurrentNode());
 
         if (NS_FAILED(rv)) {
           UNLOCK_DOC(this);
@@ -739,25 +708,18 @@ nsTextServicesDocument::LastSelectedBlock(TSDBlockSelectionStatus *aSelStatus,
     return NS_ERROR_FAILURE;
   }
 
-  nsresult rv = range->GetEndContainer(getter_AddRefs(parent));
-
-  if (NS_FAILED(rv)) {
-    UNLOCK_DOC(this);
-    return rv;
-  }
-
+  parent = range->GetEndContainer();
   if (!parent) {
     UNLOCK_DOC(this);
     return NS_ERROR_FAILURE;
   }
 
-  rv = CreateDocumentContentRootToNodeOffsetRange(
-         parent, range->EndOffset(), false,
-         getter_AddRefs(range));
+  range = CreateDocumentContentRootToNodeOffsetRange(
+            parent, range->EndOffset(), false);
 
-  if (NS_FAILED(rv)) {
+  if (NS_WARN_IF(!range)) {
     UNLOCK_DOC(this);
-    return rv;
+    return NS_ERROR_FAILURE;
   }
 
   if (range->Collapsed()) {
@@ -768,7 +730,7 @@ nsTextServicesDocument::LastSelectedBlock(TSDBlockSelectionStatus *aSelStatus,
     return NS_OK;
   }
 
-  rv = CreateContentIterator(range, getter_AddRefs(iter));
+  nsresult rv = CreateContentIterator(range, getter_AddRefs(iter));
 
   if (NS_FAILED(rv)) {
     UNLOCK_DOC(this);
@@ -781,9 +743,7 @@ nsTextServicesDocument::LastSelectedBlock(TSDBlockSelectionStatus *aSelStatus,
     if (iter->GetCurrentNode()->NodeType() == nsIDOMNode::TEXT_NODE) {
       // We found a text node! Adjust the document's iterator to point
       // to the beginning of its text block, then get the current selection.
-      nsCOMPtr<nsIContent> content = iter->GetCurrentNode()->AsContent();
-
-      rv = mIterator->PositionAt(content);
+      rv = mIterator->PositionAt(iter->GetCurrentNode());
 
       if (NS_FAILED(rv)) {
         UNLOCK_DOC(this);
@@ -1044,7 +1004,7 @@ nsTextServicesDocument::DeleteSelection()
   // end points so we can compare them against mExtent's
   // set after the deletion of the content.
 
-  nsCOMPtr<nsIDOMNode> origStartNode, origEndNode;
+  nsCOMPtr<nsINode> origStartNode, origEndNode;
   int32_t origStartOffset = 0, origEndOffset = 0;
 
   if (mExtent) {
@@ -1186,7 +1146,7 @@ nsTextServicesDocument::DeleteSelection()
   // we have to create a new content iterator!
 
   if (origStartNode && origEndNode) {
-    nsCOMPtr<nsIDOMNode> curStartNode, curEndNode;
+    nsCOMPtr<nsINode> curStartNode, curEndNode;
     int32_t curStartOffset = 0, curEndOffset = 0;
 
     rv = GetRangeEndPoints(mExtent,
@@ -1354,7 +1314,6 @@ nsTextServicesDocument::InsertText(const nsString *aText)
 
   int32_t strLength = aText->Length();
 
-  nsCOMPtr<nsISelection> selection;
   OffsetEntry *itEntry;
   OffsetEntry *entry = mOffsetTable[mSelStartIndex];
   void *node         = entry->mNode;
@@ -1444,10 +1403,9 @@ nsTextServicesDocument::InsertText(const nsString *aText)
 
     mSelStartIndex = mSelEndIndex = i;
 
-    rv = mSelCon->GetSelection(nsISelectionController::SELECTION_NORMAL,
-                               getter_AddRefs(selection));
-
-    if (NS_FAILED(rv)) {
+    RefPtr<Selection> selection =
+      mSelCon->GetDOMSelection(nsISelectionController::SELECTION_NORMAL);
+    if (NS_WARN_IF(!selection)) {
       editor->EndTransaction();
       UNLOCK_DOC(this);
       return rv;
@@ -1568,9 +1526,10 @@ nsTextServicesDocument::DidDeleteNode(nsIDOMNode *aChild, nsresult aResult)
   int32_t nodeIndex = 0;
   bool hasEntry = false;
   OffsetEntry *entry;
+  nsCOMPtr<nsINode> child = do_QueryInterface(aChild);
 
   nsresult rv =
-    NodeHasOffsetEntry(&mOffsetTable, aChild, &hasEntry, &nodeIndex);
+    NodeHasOffsetEntry(&mOffsetTable, child, &hasEntry, &nodeIndex);
 
   if (NS_FAILED(rv)) {
     UNLOCK_DOC(this);
@@ -1584,9 +1543,9 @@ nsTextServicesDocument::DidDeleteNode(nsIDOMNode *aChild, nsresult aResult)
     return NS_OK;
   }
 
-  nsCOMPtr<nsIDOMNode> node = do_QueryInterface(mIterator->GetCurrentNode());
+  nsINode* node = mIterator->GetCurrentNode();
 
-  if (node && node == aChild &&
+  if (node && node == child &&
       mIteratorStatus != nsTextServicesDocument::eIsDone) {
     // XXX: This should never really happen because
     // AdjustContentIterator() should have been called prior
@@ -1607,7 +1566,7 @@ nsTextServicesDocument::DidDeleteNode(nsIDOMNode *aChild, nsresult aResult)
       return NS_ERROR_FAILURE;
     }
 
-    if (entry->mNode == aChild) {
+    if (entry->mNode == child) {
       entry->mIsValid = false;
     }
 
@@ -1641,16 +1600,14 @@ nsTextServicesDocument::DidJoinNodes(nsIDOMNode  *aLeftNode,
 
   // Make sure that both nodes are text nodes -- otherwise we don't care.
 
-  uint16_t type;
-  nsresult rv = aLeftNode->GetNodeType(&type);
-  NS_ENSURE_SUCCESS(rv, NS_OK);
-  if (nsIDOMNode::TEXT_NODE != type) {
+  nsCOMPtr<nsINode> leftNode = do_QueryInterface(aLeftNode);
+  nsCOMPtr<nsINode> rightNode = do_QueryInterface(aRightNode);
+
+  if (!leftNode || !leftNode->IsNodeOfType(nsINode::eTEXT)) {
     return NS_OK;
   }
 
-  rv = aRightNode->GetNodeType(&type);
-  NS_ENSURE_SUCCESS(rv, NS_OK);
-  if (nsIDOMNode::TEXT_NODE != type) {
+  if (!rightNode || !rightNode->IsNodeOfType(nsINode::eTEXT)) {
     return NS_OK;
   }
 
@@ -1662,8 +1619,8 @@ nsTextServicesDocument::DidJoinNodes(nsIDOMNode  *aLeftNode,
   bool leftHasEntry = false;
   bool rightHasEntry = false;
 
-  rv = NodeHasOffsetEntry(&mOffsetTable, aLeftNode, &leftHasEntry, &leftIndex);
-
+  nsresult rv =
+    NodeHasOffsetEntry(&mOffsetTable, leftNode, &leftHasEntry, &leftIndex);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (!leftHasEntry) {
@@ -1672,7 +1629,7 @@ nsTextServicesDocument::DidJoinNodes(nsIDOMNode  *aLeftNode,
     return NS_OK;
   }
 
-  rv = NodeHasOffsetEntry(&mOffsetTable, aRightNode,
+  rv = NodeHasOffsetEntry(&mOffsetTable, rightNode,
                           &rightHasEntry, &rightIndex);
 
   NS_ENSURE_SUCCESS(rv, rv);
@@ -1698,17 +1655,15 @@ nsTextServicesDocument::DidJoinNodes(nsIDOMNode  *aLeftNode,
   // Run through the table and change all entries referring to
   // the left node so that they now refer to the right node:
 
-  nsAutoString str;
-  aLeftNode->GetNodeValue(str);
-  int32_t nodeLength = str.Length();
+  uint32_t nodeLength = leftNode->Length();
 
   for (int32_t i = leftIndex; i < rightIndex; i++) {
     entry = mOffsetTable[i];
-    if (entry->mNode != aLeftNode) {
+    if (entry->mNode != leftNode) {
       break;
     }
     if (entry->mIsValid) {
-      entry->mNode = aRightNode;
+      entry->mNode = rightNode;
     }
   }
 
@@ -1718,7 +1673,7 @@ nsTextServicesDocument::DidJoinNodes(nsIDOMNode  *aLeftNode,
   for (int32_t i = rightIndex;
        i < static_cast<int32_t>(mOffsetTable.Length()); i++) {
     entry = mOffsetTable[i];
-    if (entry->mNode != aRightNode) {
+    if (entry->mNode != rightNode) {
       break;
     }
     if (entry->mIsValid) {
@@ -1729,16 +1684,8 @@ nsTextServicesDocument::DidJoinNodes(nsIDOMNode  *aLeftNode,
   // Now check to see if the iterator is pointing to the
   // left node. If it is, make it point to the right node!
 
-  nsCOMPtr<nsIContent> leftContent = do_QueryInterface(aLeftNode);
-  nsCOMPtr<nsIContent> rightContent = do_QueryInterface(aRightNode);
-
-  if (!leftContent || !rightContent) {
-    UNLOCK_DOC(this);
-    return NS_ERROR_FAILURE;
-  }
-
-  if (mIterator->GetCurrentNode() == leftContent) {
-    mIterator->PositionAt(rightContent);
+  if (mIterator->GetCurrentNode() == leftNode) {
+    mIterator->PositionAt(rightNode);
   }
 
   UNLOCK_DOC(this);
@@ -1768,14 +1715,12 @@ nsTextServicesDocument::CreateContentIterator(nsRange* aRange,
   return NS_OK;
 }
 
-nsresult
-nsTextServicesDocument::GetDocumentContentRootNode(nsIDOMNode **aNode)
+already_AddRefed<nsINode>
+nsTextServicesDocument::GetDocumentContentRootNode()
 {
-  NS_ENSURE_TRUE(aNode, NS_ERROR_NULL_POINTER);
-
-  *aNode = 0;
-
-  NS_ENSURE_TRUE(mDOMDocument, NS_ERROR_FAILURE);
+  if (NS_WARN_IF(!mDOMDocument)) {
+    return nullptr;
+  }
 
   nsCOMPtr<nsIDOMHTMLDocument> htmlDoc = do_QueryInterface(mDOMDocument);
 
@@ -1785,73 +1730,67 @@ nsTextServicesDocument::GetDocumentContentRootNode(nsIDOMNode **aNode)
     nsCOMPtr<nsIDOMHTMLElement> bodyElement;
 
     nsresult rv = htmlDoc->GetBody(getter_AddRefs(bodyElement));
+    if (NS_WARN_IF(NS_FAILED(rv)) || NS_WARN_IF(!bodyElement)) {
+      return nullptr;
+    }
 
-    NS_ENSURE_SUCCESS(rv, rv);
+    nsCOMPtr<nsINode> node = do_QueryInterface(bodyElement);
+    return node.forget();
+  }
+  // For non-HTML documents, the content root node will be the document element.
 
-    NS_ENSURE_TRUE(bodyElement, NS_ERROR_FAILURE);
+  nsCOMPtr<nsIDOMElement> docElement;
 
-    bodyElement.forget(aNode);
-  } else {
-    // For non-HTML documents, the content root node will be the document element.
-
-    nsCOMPtr<nsIDOMElement> docElement;
-
-    nsresult rv = mDOMDocument->GetDocumentElement(getter_AddRefs(docElement));
-
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    NS_ENSURE_TRUE(docElement, NS_ERROR_FAILURE);
-
-    docElement.forget(aNode);
+  nsresult rv = mDOMDocument->GetDocumentElement(getter_AddRefs(docElement));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+   return nullptr;
   }
 
-  return NS_OK;
+  nsCOMPtr<nsINode> node = do_QueryInterface(docElement);
+  return node.forget();
 }
 
-nsresult
-nsTextServicesDocument::CreateDocumentContentRange(nsRange** aRange)
+already_AddRefed<nsRange>
+nsTextServicesDocument::CreateDocumentContentRange()
 {
-  *aRange = nullptr;
+  nsCOMPtr<nsINode> node = GetDocumentContentRootNode();
+  if (NS_WARN_IF(!node)) {
+    return nullptr;
+  }
 
-  nsCOMPtr<nsIDOMNode> node;
-  nsresult rv = GetDocumentContentRootNode(getter_AddRefs(node));
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(node, NS_ERROR_NULL_POINTER);
+  RefPtr<nsRange> range = new nsRange(node);
+  ErrorResult errorResult;
+  range->SelectNodeContents(*node, errorResult);
+  if (NS_WARN_IF(errorResult.Failed())) {
+    errorResult.SuppressException();
+    return nullptr;
+  }
 
-  nsCOMPtr<nsINode> nativeNode = do_QueryInterface(node);
-  NS_ENSURE_STATE(nativeNode);
-
-  RefPtr<nsRange> range = new nsRange(nativeNode);
-
-  rv = range->SelectNodeContents(node);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  range.forget(aRange);
-  return NS_OK;
+  return range.forget();
 }
 
-nsresult
+already_AddRefed<nsRange>
 nsTextServicesDocument::CreateDocumentContentRootToNodeOffsetRange(
-    nsIDOMNode* aParent, uint32_t aOffset, bool aToStart, nsRange** aRange)
+    nsINode* aParent, uint32_t aOffset, bool aToStart)
 {
-  NS_ENSURE_TRUE(aParent && aRange, NS_ERROR_NULL_POINTER);
+  if (NS_WARN_IF(!aParent)) {
+    return nullptr;
+  }
 
-  *aRange = nullptr;
+  nsCOMPtr<nsINode> bodyNode = GetDocumentContentRootNode();
+  if (NS_WARN_IF(!bodyNode)) {
+    return nullptr;
+  }
 
-  nsCOMPtr<nsIDOMNode> bodyNode;
-  nsresult rv = GetDocumentContentRootNode(getter_AddRefs(bodyNode));
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(bodyNode, NS_ERROR_NULL_POINTER);
-
-  nsCOMPtr<nsIDOMNode> startNode;
-  nsCOMPtr<nsIDOMNode> endNode;
+  nsCOMPtr<nsINode> startNode;
+  nsCOMPtr<nsINode> endNode;
   uint32_t startOffset, endOffset;
 
   if (aToStart) {
     // The range should begin at the start of the document
     // and extend up until (aParent, aOffset).
 
-    startNode   = bodyNode;
+    startNode = bodyNode;
     startOffset = 0;
     endNode     = aParent;
     endOffset   = aOffset;
@@ -1861,14 +1800,17 @@ nsTextServicesDocument::CreateDocumentContentRootToNodeOffsetRange(
 
     startNode   = aParent;
     startOffset = aOffset;
-    endNode     = bodyNode;
-
-    nsCOMPtr<nsINode> body = do_QueryInterface(bodyNode);
-    endOffset = body ? body->GetChildCount() : 0;
+    endNode = bodyNode;
+    endOffset = endNode ? endNode->GetChildCount() : 0;
   }
 
-  return nsRange::CreateRange(startNode, startOffset, endNode, endOffset,
-                              aRange);
+  RefPtr<nsRange> range;
+  nsresult rv = nsRange::CreateRange(startNode, startOffset, endNode, endOffset,
+                                     getter_AddRefs(range));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return nullptr;
+  }
+  return range.forget();
 }
 
 nsresult
@@ -1876,11 +1818,11 @@ nsTextServicesDocument::CreateDocumentContentIterator(nsIContentIterator **aIter
 {
   NS_ENSURE_TRUE(aIterator, NS_ERROR_NULL_POINTER);
 
-  RefPtr<nsRange> range;
-
-  nsresult rv = CreateDocumentContentRange(getter_AddRefs(range));
-
-  NS_ENSURE_SUCCESS(rv, rv);
+  RefPtr<nsRange> range  = CreateDocumentContentRange();
+  if (NS_WARN_IF(!range)) {
+    *aIterator = nullptr;
+    return NS_ERROR_FAILURE;
+  }
 
   return CreateContentIterator(range, aIterator);
 }
@@ -1890,24 +1832,22 @@ nsTextServicesDocument::AdjustContentIterator()
 {
   NS_ENSURE_TRUE(mIterator, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsIDOMNode> node(do_QueryInterface(mIterator->GetCurrentNode()));
-
+  nsCOMPtr<nsINode> node = mIterator->GetCurrentNode();
   NS_ENSURE_TRUE(node, NS_ERROR_FAILURE);
 
-  nsIDOMNode *nodePtr = node.get();
-  int32_t tcount      = mOffsetTable.Length();
+  size_t tcount = mOffsetTable.Length();
 
-  nsIDOMNode *prevValidNode = 0;
-  nsIDOMNode *nextValidNode = 0;
+  nsINode* prevValidNode = nullptr;
+  nsINode* nextValidNode = nullptr;
   bool foundEntry = false;
   OffsetEntry *entry;
 
-  for (int32_t i = 0; i < tcount && !nextValidNode; i++) {
+  for (size_t i = 0; i < tcount && !nextValidNode; i++) {
     entry = mOffsetTable[i];
 
     NS_ENSURE_TRUE(entry, NS_ERROR_FAILURE);
 
-    if (entry->mNode == nodePtr) {
+    if (entry->mNode == node) {
       if (entry->mIsValid) {
         // The iterator is still pointing to something valid!
         // Do nothing!
@@ -1931,9 +1871,13 @@ nsTextServicesDocument::AdjustContentIterator()
   nsCOMPtr<nsIContent> content;
 
   if (prevValidNode) {
-    content = do_QueryInterface(prevValidNode);
+    if (prevValidNode->IsContent()) {
+      content = prevValidNode->AsContent();
+    }
   } else if (nextValidNode) {
-    content = do_QueryInterface(nextValidNode);
+    if (nextValidNode->IsContent()) {
+      content = nextValidNode->AsContent();
+    }
   }
 
   if (content) {
@@ -2102,7 +2046,7 @@ nsTextServicesDocument::SetSelectionInternal(int32_t aOffset, int32_t aLength, b
         // match exactly!
 
         if (entry->mStrOffset == aOffset) {
-          startNode = do_QueryInterface(entry->mNode);
+          startNode = entry->mNode;
           startNodeOffset = entry->mNodeOffset + entry->mLength;
         }
       } else if (aOffset >= entry->mStrOffset) {
@@ -2129,7 +2073,7 @@ nsTextServicesDocument::SetSelectionInternal(int32_t aOffset, int32_t aLength, b
         }
 
         if (foundEntry) {
-          startNode = do_QueryInterface(entry->mNode);
+          startNode = entry->mNode;
           startNodeOffset = entry->mNodeOffset + aOffset - entry->mStrOffset;
         }
       }
@@ -2186,12 +2130,12 @@ nsTextServicesDocument::SetSelectionInternal(int32_t aOffset, int32_t aLength, b
           // If the selection ends on an inserted text offset entry,
           // the selection includes the entire entry!
 
-          endNode = do_QueryInterface(entry->mNode);
+          endNode = entry->mNode;
           endNodeOffset = entry->mNodeOffset + entry->mLength;
         }
       } else if (endOffset >= entry->mStrOffset &&
                  endOffset <= entry->mStrOffset + entry->mLength) {
-        endNode = do_QueryInterface(entry->mNode);
+        endNode = entry->mNode;
         endNodeOffset = entry->mNodeOffset + endOffset - entry->mStrOffset;
       }
 
@@ -2292,20 +2236,16 @@ nsTextServicesDocument::GetCollapsedSelection(nsITextServicesDocument::TSDBlockS
   RefPtr<nsRange> range = selection->GetRangeAt(0);
   NS_ENSURE_STATE(range);
 
-  nsCOMPtr<nsIDOMNode> domParent;
-  rv = range->GetStartContainer(getter_AddRefs(domParent));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<nsINode> parent = do_QueryInterface(domParent);
+  nsCOMPtr<nsINode> parent = range->GetStartContainer();
   MOZ_ASSERT(parent);
 
   uint32_t offset = range->StartOffset();
 
   int32_t e1s1 = nsContentUtils::ComparePoints(eStart->mNode, eStartOffset,
-                                               domParent,
+                                               parent,
                                                static_cast<int32_t>(offset));
   int32_t e2s1 = nsContentUtils::ComparePoints(eEnd->mNode, eEndOffset,
-                                               domParent,
+                                               parent,
                                                static_cast<int32_t>(offset));
 
   if (e1s1 > 0 || e2s1 < 0) {
@@ -2322,7 +2262,7 @@ nsTextServicesDocument::GetCollapsedSelection(nsITextServicesDocument::TSDBlockS
       OffsetEntry* entry = mOffsetTable[i];
       NS_ENSURE_TRUE(entry, NS_ERROR_FAILURE);
 
-      if (entry->mNode == domParent.get() &&
+      if (entry->mNode == parent &&
           entry->mNodeOffset <= static_cast<int32_t>(offset) &&
           static_cast<int32_t>(offset) <= entry->mNodeOffset + entry->mLength) {
         *aSelStatus = nsITextServicesDocument::eBlockContains;
@@ -2346,8 +2286,8 @@ nsTextServicesDocument::GetCollapsedSelection(nsITextServicesDocument::TSDBlockS
   // child of this non-text node. Then look for the closest text
   // node.
 
-  rv = CreateRange(eStart->mNode, eStartOffset, eEnd->mNode, eEndOffset,
-                   getter_AddRefs(range));
+  rv = nsRange::CreateRange(eStart->mNode, eStartOffset, eEnd->mNode,
+                            eEndOffset, getter_AddRefs(range));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIContentIterator> iter;
@@ -2392,7 +2332,7 @@ nsTextServicesDocument::GetCollapsedSelection(nsITextServicesDocument::TSDBlockS
   while (!iter->IsDone()) {
     nsINode* current = iter->GetCurrentNode();
     if (current->NodeType() == nsIDOMNode::TEXT_NODE) {
-      node = static_cast<nsIContent*>(current);
+      node = current->AsContent();
       break;
     }
 
@@ -2418,7 +2358,7 @@ nsTextServicesDocument::GetCollapsedSelection(nsITextServicesDocument::TSDBlockS
       nsINode* current = iter->GetCurrentNode();
 
       if (current->NodeType() == nsIDOMNode::TEXT_NODE) {
-        node = static_cast<nsIContent*>(current);
+        node = current->AsContent();
         break;
       }
 
@@ -2437,7 +2377,7 @@ nsTextServicesDocument::GetCollapsedSelection(nsITextServicesDocument::TSDBlockS
     OffsetEntry* entry = mOffsetTable[i];
     NS_ENSURE_TRUE(entry, NS_ERROR_FAILURE);
 
-    if (entry->mNode == node->AsDOMNode() &&
+    if (entry->mNode == node &&
         entry->mNodeOffset <= static_cast<int32_t>(offset) &&
         static_cast<int32_t>(offset) <= entry->mNodeOffset + entry->mLength) {
       *aSelStatus = nsITextServicesDocument::eBlockContains;
@@ -2475,7 +2415,7 @@ nsTextServicesDocument::GetUncollapsedSelection(nsITextServicesDocument::TSDBloc
   // selection is not collapsed, and that the input params to this
   // method are initialized to some defaults.
 
-  nsCOMPtr<nsIDOMNode> startContainer, endContainer;
+  nsCOMPtr<nsINode> startContainer, endContainer;
   int32_t startOffset, endOffset;
   int32_t tableCount;
   int32_t e1s1 = 0, e1s2 = 0, e2s1 = 0, e2s2 = 0;
@@ -2562,14 +2502,14 @@ nsTextServicesDocument::GetUncollapsedSelection(nsITextServicesDocument::TSDBloc
   // Now create a range based on the intersection of the
   // text block and range:
 
-  nsCOMPtr<nsIDOMNode> p1, p2;
+  nsCOMPtr<nsINode> p1, p2;
   int32_t     o1,  o2;
 
   // The start of the range will be the rightmost
   // start node.
 
   if (e1s1 >= 0) {
-    p1 = do_QueryInterface(eStart->mNode);
+    p1 = eStart->mNode;
     o1 = eStartOffset;
   } else {
     p1 = startContainer;
@@ -2580,14 +2520,14 @@ nsTextServicesDocument::GetUncollapsedSelection(nsITextServicesDocument::TSDBloc
   // end node.
 
   if (e2s2 <= 0) {
-    p2 = do_QueryInterface(eEnd->mNode);
+    p2 = eEnd->mNode;
     o2 = eEndOffset;
   } else {
     p2 = endContainer;
     o2 = endOffset;
   }
 
-  rv = CreateRange(p1, o1, p2, o2, getter_AddRefs(range));
+  rv = nsRange::CreateRange(p1, o1, p2, o2, getter_AddRefs(range));
 
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -2607,17 +2547,14 @@ nsTextServicesDocument::GetUncollapsedSelection(nsITextServicesDocument::TSDBloc
 
   iter->First();
 
-  if (!IsTextNode(p1)) {
+  if (!p1->IsNodeOfType(nsINode::eTEXT)) {
     found = false;
 
     while (!iter->IsDone()) {
-      content = do_QueryInterface(iter->GetCurrentNode());
-
-      if (IsTextNode(content)) {
-        p1 = do_QueryInterface(content);
-
-        NS_ENSURE_TRUE(p1, NS_ERROR_FAILURE);
+      nsINode* node = iter->GetCurrentNode();
 
+      if (node->IsNodeOfType(nsINode::eTEXT)) {
+        p1 = node;
         o1 = 0;
         found = true;
 
@@ -2634,22 +2571,13 @@ nsTextServicesDocument::GetUncollapsedSelection(nsITextServicesDocument::TSDBloc
 
   iter->Last();
 
-  if (!IsTextNode(p2)) {
+  if (!p2->IsNodeOfType(nsINode::eTEXT)) {
     found = false;
     while (!iter->IsDone()) {
-      content = do_QueryInterface(iter->GetCurrentNode());
-      if (IsTextNode(content)) {
-        p2 = do_QueryInterface(content);
-
-        NS_ENSURE_TRUE(p2, NS_ERROR_FAILURE);
-
-        nsString str;
-
-        rv = p2->GetNodeValue(str);
-
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        o2 = str.Length();
+      nsINode* node = iter->GetCurrentNode();
+      if (node->IsNodeOfType(nsINode::eTEXT)) {
+        p2 = node;
+        o2 = p2->Length();
         found = true;
 
         break;
@@ -2716,43 +2644,26 @@ nsTextServicesDocument::SelectionIsValid()
 
 nsresult
 nsTextServicesDocument::GetRangeEndPoints(nsRange* aRange,
-                                          nsIDOMNode** aStartContainer,
+                                          nsINode** aStartContainer,
                                           int32_t* aStartOffset,
-                                          nsIDOMNode** aEndContainer,
+                                          nsINode** aEndContainer,
                                           int32_t* aEndOffset)
 {
   NS_ENSURE_TRUE(aRange && aStartContainer && aStartOffset &&
                  aEndContainer && aEndOffset, NS_ERROR_NULL_POINTER);
 
-  nsresult rv = aRange->GetStartContainer(aStartContainer);
-
-  NS_ENSURE_SUCCESS(rv, rv);
-
+  NS_IF_ADDREF(*aStartContainer = aRange->GetStartContainer());
   NS_ENSURE_TRUE(aStartContainer, NS_ERROR_FAILURE);
 
   *aStartOffset = static_cast<int32_t>(aRange->StartOffset());
 
-  rv = aRange->GetEndContainer(aEndContainer);
-
-  NS_ENSURE_SUCCESS(rv, rv);
-
+  NS_IF_ADDREF(*aEndContainer = aRange->GetEndContainer());
   NS_ENSURE_TRUE(aEndContainer, NS_ERROR_FAILURE);
 
   *aEndOffset = static_cast<int32_t>(aRange->EndOffset());
   return NS_OK;
 }
 
-nsresult
-nsTextServicesDocument::CreateRange(nsIDOMNode* aStartContainer,
-                                    int32_t aStartOffset,
-                                    nsIDOMNode* aEndContainer,
-                                    int32_t aEndOffset,
-                                    nsRange** aRange)
-{
-  return nsRange::CreateRange(aStartContainer, aStartOffset, aEndContainer,
-                              aEndOffset, aRange);
-}
-
 nsresult
 nsTextServicesDocument::FirstTextNode(nsIContentIterator *aIterator,
                                       TSDIteratorStatus *aIteratorStatus)
@@ -2993,7 +2904,7 @@ nsTextServicesDocument::CreateOffsetTable(nsTArray<OffsetEntry*> *aOffsetTable,
   // they can be used in the while loop below to trim entries
   // for text nodes that are partially selected by aIterRange.
 
-  nsCOMPtr<nsIDOMNode> rngStartNode, rngEndNode;
+  nsCOMPtr<nsINode> rngStartNode, rngEndNode;
   int32_t rngStartOffset = 0, rngEndOffset = 0;
 
   if (aIterRange) {
@@ -3026,52 +2937,48 @@ nsTextServicesDocument::CreateOffsetTable(nsTArray<OffsetEntry*> *aOffsetTable,
         break;
       }
 
-      nsCOMPtr<nsIDOMNode> node = do_QueryInterface(content);
-      if (node) {
-        nsString str;
+      nsString str;
+      rv = content->AsDOMNode()->GetNodeValue(str);
 
-        rv = node->GetNodeValue(str);
+      NS_ENSURE_SUCCESS(rv, rv);
 
-        NS_ENSURE_SUCCESS(rv, rv);
+      // Add an entry for this text node into the offset table:
 
-        // Add an entry for this text node into the offset table:
+      OffsetEntry *entry = new OffsetEntry(content, offset, str.Length());
+      aOffsetTable->AppendElement(entry);
 
-        OffsetEntry *entry = new OffsetEntry(node, offset, str.Length());
-        aOffsetTable->AppendElement(entry);
+      // If one or both of the endpoints of the iteration range
+      // are in the text node for this entry, make sure the entry
+      // only accounts for the portion of the text node that is
+      // in the range.
 
-        // If one or both of the endpoints of the iteration range
-        // are in the text node for this entry, make sure the entry
-        // only accounts for the portion of the text node that is
-        // in the range.
+      int32_t startOffset = 0;
+      int32_t endOffset   = str.Length();
+      bool adjustStr    = false;
 
-        int32_t startOffset = 0;
-        int32_t endOffset   = str.Length();
-        bool adjustStr    = false;
+      if (entry->mNode == rngStartNode) {
+        entry->mNodeOffset = startOffset = rngStartOffset;
+        adjustStr = true;
+      }
 
-        if (entry->mNode == rngStartNode) {
-          entry->mNodeOffset = startOffset = rngStartOffset;
-          adjustStr = true;
-        }
+      if (entry->mNode == rngEndNode) {
+        endOffset = rngEndOffset;
+        adjustStr = true;
+      }
 
-        if (entry->mNode == rngEndNode) {
-          endOffset = rngEndOffset;
-          adjustStr = true;
-        }
+      if (adjustStr) {
+        entry->mLength = endOffset - startOffset;
+        str = Substring(str, startOffset, entry->mLength);
+      }
 
-        if (adjustStr) {
-          entry->mLength = endOffset - startOffset;
-          str = Substring(str, startOffset, entry->mLength);
-        }
+      offset += str.Length();
 
-        offset += str.Length();
-
-        if (aStr) {
-          // Append the text node's string to the output string:
-          if (!first) {
-            *aStr = str;
-          } else {
-            *aStr += str;
-          }
+      if (aStr) {
+        // Append the text node's string to the output string:
+        if (!first) {
+          *aStr = str;
+        } else {
+          *aStr += str;
         }
       }
 
@@ -3178,7 +3085,9 @@ nsTextServicesDocument::SplitOffsetEntry(int32_t aTableIndex, int32_t aNewEntryL
 }
 
 nsresult
-nsTextServicesDocument::NodeHasOffsetEntry(nsTArray<OffsetEntry*> *aOffsetTable, nsIDOMNode *aNode, bool *aHasEntry, int32_t *aEntryIndex)
+nsTextServicesDocument::NodeHasOffsetEntry(
+                          nsTArray<OffsetEntry*> *aOffsetTable,
+                          nsINode *aNode, bool *aHasEntry, int32_t *aEntryIndex)
 {
   NS_ENSURE_TRUE(aNode && aHasEntry && aEntryIndex, NS_ERROR_NULL_POINTER);
 
@@ -3205,11 +3114,11 @@ nsTextServicesDocument::NodeHasOffsetEntry(nsTArray<OffsetEntry*> *aOffsetTable,
 nsresult
 nsTextServicesDocument::FindWordBounds(nsTArray<OffsetEntry*> *aOffsetTable,
                                        nsString *aBlockStr,
-                                       nsIDOMNode *aNode,
+                                       nsINode *aNode,
                                        int32_t aNodeOffset,
-                                       nsIDOMNode **aWordStartNode,
+                                       nsINode **aWordStartNode,
                                        int32_t *aWordStartOffset,
-                                       nsIDOMNode **aWordEndNode,
+                                       nsINode **aWordEndNode,
                                        int32_t *aWordEndOffset)
 {
   // Initialize return values.
diff --git a/editor/txtsvc/nsTextServicesDocument.h b/editor/txtsvc/nsTextServicesDocument.h
index aa0a92803785..65f047103db4 100644
--- a/editor/txtsvc/nsTextServicesDocument.h
+++ b/editor/txtsvc/nsTextServicesDocument.h
@@ -130,13 +130,10 @@ public:
 
   /* Helper functions */
   static nsresult GetRangeEndPoints(nsRange* aRange,
-                                    nsIDOMNode** aStartContainer,
+                                    nsINode** aStartContainer,
                                     int32_t* aStartOffset,
-                                    nsIDOMNode** aEndContainer,
+                                    nsINode** aEndContainer,
                                     int32_t* aEndOffset);
-  static nsresult CreateRange(nsIDOMNode* aStartContainer, int32_t aStartOffset,
-                              nsIDOMNode* aEndContainer, int32_t aEndOffset,
-                              nsRange** aRange);
 
 private:
   /* nsTextServicesDocument private methods. */
@@ -144,12 +141,12 @@ private:
   nsresult CreateContentIterator(nsRange* aRange,
                                  nsIContentIterator** aIterator);
 
-  nsresult GetDocumentContentRootNode(nsIDOMNode **aNode);
-  nsresult CreateDocumentContentRange(nsRange** aRange);
-  nsresult CreateDocumentContentRootToNodeOffsetRange(nsIDOMNode* aParent,
-                                                      uint32_t aOffset,
-                                                      bool aToStart,
-                                                      nsRange** aRange);
+  already_AddRefed<nsINode> GetDocumentContentRootNode();
+  already_AddRefed<nsRange> CreateDocumentContentRange();
+  already_AddRefed<nsRange> CreateDocumentContentRootToNodeOffsetRange(
+                              nsINode* aParent,
+                              uint32_t aOffset,
+                              bool aToStart);
   nsresult CreateDocumentContentIterator(nsIContentIterator **aIterator);
 
   nsresult AdjustContentIterator();
@@ -188,7 +185,7 @@ private:
   static nsresult ClearOffsetTable(nsTArray<OffsetEntry*> *aOffsetTable);
 
   static nsresult NodeHasOffsetEntry(nsTArray<OffsetEntry*> *aOffsetTable,
-                                     nsIDOMNode *aNode,
+                                     nsINode *aNode,
                                      bool *aHasEntry,
                                      int32_t *aEntryIndex);
 
@@ -197,10 +194,10 @@ private:
 
   static nsresult FindWordBounds(nsTArray<OffsetEntry*> *offsetTable,
                                  nsString *blockStr,
-                                 nsIDOMNode *aNode, int32_t aNodeOffset,
-                                 nsIDOMNode **aWordStartNode,
+                                 nsINode* aNode, int32_t aNodeOffset,
+                                 nsINode** aWordStartNode,
                                  int32_t *aWordStartOffset,
-                                 nsIDOMNode **aWordEndNode,
+                                 nsINode** aWordEndNode,
                                  int32_t *aWordEndOffset);
 };
 

From 99a786194667339422d35ec5b8b3a3042ea527bb Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Wed, 29 Nov 2017 17:55:12 +0900
Subject: [PATCH 107/219] Bug 1421553 - Part 2. Remove nsIDOMRange usages from
 nsTextServicesDocument. r=masayuki

nsITextServicesDocument isn't scriptable, so there is no reason to use
nsIDOMRange.

MozReview-Commit-ID: AVPgrwmz38H

--HG--
extra : rebase_source : 0cb03cdb9b0dc4ef85b1b5582b7e3a54cb002904
---
 editor/txtsvc/nsITextServicesDocument.h  |  6 +++---
 editor/txtsvc/nsTextServicesDocument.cpp | 18 ++++++++----------
 editor/txtsvc/nsTextServicesDocument.h   |  5 ++---
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/editor/txtsvc/nsITextServicesDocument.h b/editor/txtsvc/nsITextServicesDocument.h
index 0f13371b2b18..de61d5cd556e 100644
--- a/editor/txtsvc/nsITextServicesDocument.h
+++ b/editor/txtsvc/nsITextServicesDocument.h
@@ -10,9 +10,9 @@
 #include "nsStringFwd.h"
 
 class nsIDOMDocument;
-class nsIDOMRange;
 class nsIEditor;
 class nsITextServicesFilter;
+class nsRange;
 
 /*
 TextServicesDocument interface to outside world
@@ -67,7 +67,7 @@ public:
    * @param aDOMRange is the range to use. aDOMRange must point to a
    * valid range object.
    */
-  NS_IMETHOD SetExtent(nsIDOMRange* aDOMRange) = 0;
+  NS_IMETHOD SetExtent(nsRange* aDOMRange) = 0;
 
   /**
    * Expands the end points of the range so that it spans complete words.
@@ -75,7 +75,7 @@ public:
    *
    * @param aDOMRange the range to be expanded/adjusted.
    */
-  NS_IMETHOD ExpandRangeToWordBoundaries(nsIDOMRange *aRange) = 0;
+  NS_IMETHOD ExpandRangeToWordBoundaries(nsRange* aRange) = 0;
 
   /**
    * Sets the filter to be used while iterating over content.
diff --git a/editor/txtsvc/nsTextServicesDocument.cpp b/editor/txtsvc/nsTextServicesDocument.cpp
index 843bf3bdb20a..cf4343c5f40a 100644
--- a/editor/txtsvc/nsTextServicesDocument.cpp
+++ b/editor/txtsvc/nsTextServicesDocument.cpp
@@ -22,7 +22,6 @@
 #include "nsIDOMHTMLDocument.h"         // for nsIDOMHTMLDocument
 #include "nsIDOMHTMLElement.h"          // for nsIDOMHTMLElement
 #include "nsIDOMNode.h"                 // for nsIDOMNode, etc
-#include "nsIDOMRange.h"                // for nsIDOMRange, etc
 #include "nsIEditor.h"                  // for nsIEditor, etc
 #include "nsINode.h"                    // for nsINode
 #include "nsIPlaintextEditor.h"         // for nsIPlaintextEditor
@@ -193,9 +192,9 @@ nsTextServicesDocument::GetDocument(nsIDOMDocument **aDoc)
 }
 
 NS_IMETHODIMP
-nsTextServicesDocument::SetExtent(nsIDOMRange* aDOMRange)
+nsTextServicesDocument::SetExtent(nsRange* aRange)
 {
-  NS_ENSURE_ARG_POINTER(aDOMRange);
+  NS_ENSURE_ARG_POINTER(aRange);
   NS_ENSURE_TRUE(mDOMDocument, NS_ERROR_FAILURE);
 
   LOCK_DOC(this);
@@ -203,7 +202,7 @@ nsTextServicesDocument::SetExtent(nsIDOMRange* aDOMRange)
   // We need to store a copy of aDOMRange since we don't
   // know where it came from.
 
-  mExtent = static_cast<nsRange*>(aDOMRange)->CloneRange();
+  mExtent = aRange->CloneRange();
 
   // Create a new iterator based on our new extent range.
 
@@ -227,17 +226,16 @@ nsTextServicesDocument::SetExtent(nsIDOMRange* aDOMRange)
 }
 
 NS_IMETHODIMP
-nsTextServicesDocument::ExpandRangeToWordBoundaries(nsIDOMRange *aRange)
+nsTextServicesDocument::ExpandRangeToWordBoundaries(nsRange* aRange)
 {
   NS_ENSURE_ARG_POINTER(aRange);
-  RefPtr<nsRange> range = static_cast<nsRange*>(aRange);
 
   // Get the end points of the range.
 
   nsCOMPtr<nsINode> rngStartNode, rngEndNode;
   int32_t rngStartOffset, rngEndOffset;
 
-  nsresult rv = GetRangeEndPoints(range, getter_AddRefs(rngStartNode),
+  nsresult rv = GetRangeEndPoints(aRange, getter_AddRefs(rngStartNode),
                                   &rngStartOffset,
                                   getter_AddRefs(rngEndNode),
                                   &rngEndOffset);
@@ -247,7 +245,7 @@ nsTextServicesDocument::ExpandRangeToWordBoundaries(nsIDOMRange *aRange)
   // Create a content iterator based on the range.
 
   nsCOMPtr<nsIContentIterator> iter;
-  rv = CreateContentIterator(range, getter_AddRefs(iter));
+  rv = CreateContentIterator(aRange, getter_AddRefs(iter));
 
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -372,8 +370,8 @@ nsTextServicesDocument::ExpandRangeToWordBoundaries(nsIDOMRange *aRange)
 
   // Now adjust the range so that it uses our new
   // end points.
-  rv = range->SetStartAndEnd(rngStartNode, rngStartOffset,
-                             rngEndNode, rngEndOffset);
+  rv = aRange->SetStartAndEnd(rngStartNode, rngStartOffset,
+                              rngEndNode, rngEndOffset);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
diff --git a/editor/txtsvc/nsTextServicesDocument.h b/editor/txtsvc/nsTextServicesDocument.h
index 65f047103db4..d9a2b93cd4c3 100644
--- a/editor/txtsvc/nsTextServicesDocument.h
+++ b/editor/txtsvc/nsTextServicesDocument.h
@@ -22,7 +22,6 @@ class nsIContentIterator;
 class nsIDOMCharacterData;
 class nsIDOMDocument;
 class nsIDOMNode;
-class nsIDOMRange;
 class nsIEditor;
 class nsISelection;
 class nsISelectionController;
@@ -77,8 +76,8 @@ public:
   /* nsITextServicesDocument method implementations. */
   NS_IMETHOD InitWithEditor(nsIEditor *aEditor) override;
   NS_IMETHOD GetDocument(nsIDOMDocument **aDoc) override;
-  NS_IMETHOD SetExtent(nsIDOMRange* aDOMRange) override;
-  NS_IMETHOD ExpandRangeToWordBoundaries(nsIDOMRange *aRange) override;
+  NS_IMETHOD SetExtent(nsRange* aRange) override;
+  NS_IMETHOD ExpandRangeToWordBoundaries(nsRange* aRange) override;
   NS_IMETHOD SetFilter(nsITextServicesFilter *aFilter) override;
   NS_IMETHOD GetCurrentTextBlock(nsString *aStr) override;
   NS_IMETHOD FirstBlock() override;

From f7b0829cce493e9436dd6b344c772b812e3126be Mon Sep 17 00:00:00 2001
From: Nevin Chen <cnevinchen@gmail.com>
Date: Tue, 28 Nov 2017 16:53:23 +0800
Subject: [PATCH 108/219] Bug 1421149 - [PWA] Icons in the "Add to Home screen"
 overlay should not have outline & dropshadow. r=maliu

MozReview-Commit-ID: LGq1h1sgWgt

--HG--
extra : rebase_source : e5e7b27640969dce95d5d0888d87f6bbedaff95b
---
 .../app/src/main/res/layout/pwa_confirm.xml   | 38 ++++++++-----------
 .../app/src/photon/res/values-v17/styles.xml  |  2 +-
 .../app/src/photon/res/values/styles.xml      |  2 +-
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/mobile/android/app/src/main/res/layout/pwa_confirm.xml b/mobile/android/app/src/main/res/layout/pwa_confirm.xml
index fa65b6466a56..af6270010d97 100644
--- a/mobile/android/app/src/main/res/layout/pwa_confirm.xml
+++ b/mobile/android/app/src/main/res/layout/pwa_confirm.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.mozilla.gecko.toolbar.PwaConfirm xmlns:android="http://schemas.android.com/apk/res/android"
-                                      xmlns:tools="http://schemas.android.com/tools"
-                                      android:id="@+id/pwa_confirm_root"
-                                      android:layout_width="match_parent"
-                                      android:layout_height="match_parent"
-                                      android:layout_marginTop="@dimen/browser_toolbar_height_flipper"
-                                      android:background="@color/dark_transparent_overlay"
-                                      android:clickable="true">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/pwa_confirm_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/browser_toolbar_height_flipper"
+    android:background="@color/dark_transparent_overlay"
+    android:clickable="true">
 
 
     <RelativeLayout
@@ -18,35 +18,27 @@
         android:clickable="true"
         android:elevation="15dp">
 
-        <android.support.v7.widget.CardView
-            xmlns:app="http://schemas.android.com/apk/res-auto"
 
-            android:id="@+id/pwa_confirm_icon_wrap"
+        <ImageView
+            android:id="@+id/pwa_confirm_icon"
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_margin="20dp"
-            app:cardCornerRadius="3dp">
+            tools:background="#f0f" />
 
-            <ImageView
-                android:id="@+id/pwa_confirm_icon"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:background="#f0f"/>
-
-        </android.support.v7.widget.CardView>
 
         <TextView
             android:id="@+id/pwa_confirm_title"
             style="@style/PwaConfirm.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/pwa_confirm_icon_wrap"
+            android:layout_alignTop="@+id/pwa_confirm_icon"
             android:ellipsize="end"
             android:maxLines="2"
             android:textColor="#333333"
             android:textSize="18sp"
             android:textStyle="bold"
-            tools:text="Mozilla title can grow to two lines... do"/>
+            tools:text="Mozilla title can grow to two lines... do" />
 
 
         <ImageButton
@@ -57,7 +49,7 @@
             android:layout_alignParentTop="true"
             android:background="@drawable/pwa_cancel_button"
             android:scaleType="center"
-            android:src="@drawable/ic_cancel_nm"/>
+            android:src="@drawable/ic_cancel_nm" />
 
         <Button
             android:id="@+id/pwa_confirm_action"
@@ -70,7 +62,7 @@
             android:text="@string/pwa_add_to_launcher_confirm"
             android:textAllCaps="true"
             android:textColor="#fff"
-            android:textStyle="bold"/>
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/pwa_confirm_url"
@@ -82,7 +74,7 @@
             android:maxLines="1"
             android:textColor="@color/ob_subtitle"
             android:textSize="13sp"
-            tools:text="http://www.mozilla.org/12345678911123"/>
+            tools:text="http://www.mozilla.org/12345678911123" />
     </RelativeLayout>
 
 </org.mozilla.gecko.toolbar.PwaConfirm>
\ No newline at end of file
diff --git a/mobile/android/app/src/photon/res/values-v17/styles.xml b/mobile/android/app/src/photon/res/values-v17/styles.xml
index 3ebb2ea99f59..ad00d6a462e7 100644
--- a/mobile/android/app/src/photon/res/values-v17/styles.xml
+++ b/mobile/android/app/src/photon/res/values-v17/styles.xml
@@ -116,7 +116,7 @@
     </style>
 
     <style name="PwaConfirm.Title">
-        <item name="android:layout_toEndOf">@id/pwa_confirm_icon_wrap</item>
+        <item name="android:layout_toEndOf">@id/pwa_confirm_icon</item>
         <item name="android:layout_toStartOf">@id/pwa_confirm_cancel</item>
     </style>
 
diff --git a/mobile/android/app/src/photon/res/values/styles.xml b/mobile/android/app/src/photon/res/values/styles.xml
index 118469bedec1..f3032693ee84 100644
--- a/mobile/android/app/src/photon/res/values/styles.xml
+++ b/mobile/android/app/src/photon/res/values/styles.xml
@@ -981,7 +981,7 @@
     </style>
 
     <style name="PwaConfirm.Title">
-        <item name="android:layout_toRightOf">@id/pwa_confirm_icon_wrap</item>
+        <item name="android:layout_toRightOf">@id/pwa_confirm_icon</item>
         <item name="android:layout_toLeftOf">@id/pwa_confirm_cancel</item>
     </style>
 

From 54299ade5a1280ec76679c5b6b52aa07de9821fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sat, 2 Dec 2017 01:40:00 -0600
Subject: [PATCH 109/219] servo: Merge #19454 - style: Add a missing fast-path
 in GeckoElement::each_class (from emilio:has-class-is-stupid); r=upsuper

This shows up when inserting elements in the bloom filter.

Source-Repo: https://github.com/servo/servo
Source-Revision: 45bbbac9d934bc375c735fd167730e37ce063325

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 0d8775c67ddbc18f5708796b9362f0f774b6a1a1
---
 .../style/gecko/snapshot_helpers.rs           | 22 +++++++++++--------
 servo/components/style/gecko/wrapper.rs       | 14 ++++++++----
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/servo/components/style/gecko/snapshot_helpers.rs b/servo/components/style/gecko/snapshot_helpers.rs
index 79963e69ca14..51953a0231cc 100644
--- a/servo/components/style/gecko/snapshot_helpers.rs
+++ b/servo/components/style/gecko/snapshot_helpers.rs
@@ -17,11 +17,12 @@ pub type ClassOrClassList<T> = unsafe extern fn (T, *mut *mut nsAtom, *mut *mut
 
 /// Given an item `T`, a class name, and a getter function, return whether that
 /// element has the class that `name` represents.
-pub fn has_class<T>(item: T,
-                    name: &Atom,
-                    case_sensitivity: CaseSensitivity,
-                    getter: ClassOrClassList<T>) -> bool
-{
+pub fn has_class<T>(
+    item: T,
+    name: &Atom,
+    case_sensitivity: CaseSensitivity,
+    getter: ClassOrClassList<T>,
+) -> bool {
     unsafe {
         let mut class: *mut nsAtom = ptr::null_mut();
         let mut list: *mut *mut nsAtom = ptr::null_mut();
@@ -40,10 +41,13 @@ pub fn has_class<T>(item: T,
 
 /// Given an item, a callback, and a getter, execute `callback` for each class
 /// this `item` has.
-pub fn each_class<F, T>(item: T,
-                        mut callback: F,
-                        getter: ClassOrClassList<T>)
-    where F: FnMut(&Atom)
+pub fn each_class<F, T>(
+    item: T,
+    mut callback: F,
+    getter: ClassOrClassList<T>,
+)
+where
+    F: FnMut(&Atom)
 {
     unsafe {
         let mut class: *mut nsAtom = ptr::null_mut();
diff --git a/servo/components/style/gecko/wrapper.rs b/servo/components/style/gecko/wrapper.rs
index 686f2deae7cf..9bbb07cb1c4f 100644
--- a/servo/components/style/gecko/wrapper.rs
+++ b/servo/components/style/gecko/wrapper.rs
@@ -1113,6 +1113,10 @@ impl<'le> TElement for GeckoElement<'le> {
     where
         F: FnMut(&Atom),
     {
+        if !self.may_have_class() {
+            return;
+        }
+
         snapshot_helpers::each_class(self.0, callback, Gecko_ClassOrClassList)
     }
 
@@ -2129,10 +2133,12 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             return false;
         }
 
-        snapshot_helpers::has_class(self.0,
-                                    name,
-                                    case_sensitivity,
-                                    Gecko_ClassOrClassList)
+        snapshot_helpers::has_class(
+            self.0,
+            name,
+            case_sensitivity,
+            Gecko_ClassOrClassList,
+        )
     }
 
     #[inline]

From 6d6d5c3c758315c9bf3e982291f2b06056853816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Thu, 30 Nov 2017 20:23:07 +0100
Subject: [PATCH 110/219] Bug 1422100 - Refactor in-content UI font sizes.
 r=jaws

MozReview-Commit-ID: DIxgLYcUvJh

--HG--
extra : rebase_source : 7af4709b4e75bb15230b9bdce9a0202c8d10e956
---
 .../linux/preferences/in-content/dialog.css   |  9 ++----
 .../preferences/in-content/preferences.css    | 28 ++-----------------
 .../osx/preferences/in-content/dialog.css     |  8 ++----
 .../preferences/in-content/preferences.css    | 15 ++--------
 .../shared/incontentprefs/dialog.inc.css      |  6 ----
 .../shared/incontentprefs/preferences.inc.css | 23 ++++++++-------
 .../windows/preferences/in-content/dialog.css |  8 ++----
 .../preferences/in-content/preferences.css    | 15 ++--------
 .../themes/linux/global/in-content/common.css |  8 ------
 .../linux/mozapps/extensions/extensions.css   |  4 +++
 .../themes/osx/global/in-content/common.css   | 13 ---------
 .../osx/mozapps/extensions/extensions.css     |  4 +++
 .../themes/shared/in-content/common.inc.css   | 17 ++++-------
 .../windows/global/in-content/common.css      |  8 ------
 .../windows/mozapps/extensions/extensions.css |  4 +++
 15 files changed, 43 insertions(+), 127 deletions(-)

diff --git a/browser/themes/linux/preferences/in-content/dialog.css b/browser/themes/linux/preferences/in-content/dialog.css
index e03ef198b4f7..aeda8be750c3 100644
--- a/browser/themes/linux/preferences/in-content/dialog.css
+++ b/browser/themes/linux/preferences/in-content/dialog.css
@@ -4,10 +4,7 @@
 
 %include ../../../shared/incontentprefs/dialog.inc.css
 
-label,
-textbox,
-description,
-.tab-text,
-menulist label {
-  font-size: 1.11rem;
+:root > * {
+  font-size: 1.05em;
 }
+
diff --git a/browser/themes/linux/preferences/in-content/preferences.css b/browser/themes/linux/preferences/in-content/preferences.css
index 0a263c80b7cc..9fc750ca8f94 100644
--- a/browser/themes/linux/preferences/in-content/preferences.css
+++ b/browser/themes/linux/preferences/in-content/preferences.css
@@ -4,19 +4,8 @@
 
 %include ../../../shared/incontentprefs/preferences.inc.css
 
-html *,
-page *,
-window * {
-  font-size: 1.11rem;
-}
-
-caption label {
-  font-size: 1.27rem;
-}
-
-.tip-caption,
-.help-label {
-  font-size: 1rem;
+:root > * {
+  font-size: 1.11em;
 }
 
 .treecol-sortdirection {
@@ -24,20 +13,9 @@ caption label {
   -moz-appearance: none;
 }
 
-.actionsMenu {
-  font-family: "Clear Sans", sans-serif;
-  font-size: 1.25rem;
-  line-height: 22px;
-}
-
 .actionsMenu > .menulist-label-box > .menulist-icon {
-  margin-top: 1px;
   margin-inline-start: 1px;
-  margin-inline-end: 6px;
-}
-
-.actionsMenu > .menulist-label-box > .menulist-label {
-  margin-top: 2px !important;
+  margin-inline-end: 8px;
 }
 
 filefield + button {
diff --git a/browser/themes/osx/preferences/in-content/dialog.css b/browser/themes/osx/preferences/in-content/dialog.css
index d0a318659e0a..11b5a6a8a67c 100644
--- a/browser/themes/osx/preferences/in-content/dialog.css
+++ b/browser/themes/osx/preferences/in-content/dialog.css
@@ -9,12 +9,8 @@ prefwindow,
   font: message-box !important;
 }
 
-label,
-textbox,
-description,
-.tab-text,
-menulist label {
-  font-size: 1.36rem;
+:root > * {
+  font-size: 1.18em;
 }
 
 caption {
diff --git a/browser/themes/osx/preferences/in-content/preferences.css b/browser/themes/osx/preferences/in-content/preferences.css
index 884b1c89dcfe..8ed0a4d23936 100644
--- a/browser/themes/osx/preferences/in-content/preferences.css
+++ b/browser/themes/osx/preferences/in-content/preferences.css
@@ -4,19 +4,8 @@
 
 %include ../../../shared/incontentprefs/preferences.inc.css
 
-html *,
-page *,
-window * {
-  font-size: 1.36rem;
-}
-
-caption label {
-  font-size: 1.55rem;
-}
-
-.tip-caption,
-.help-label {
-  font-size: 1.18rem;
+:root > * {
+  font-size: 1.36em;
 }
 
 .actionsMenu > .menulist-label-box > .menulist-icon {
diff --git a/browser/themes/shared/incontentprefs/dialog.inc.css b/browser/themes/shared/incontentprefs/dialog.inc.css
index 06784eca1308..7790c32376b8 100644
--- a/browser/themes/shared/incontentprefs/dialog.inc.css
+++ b/browser/themes/shared/incontentprefs/dialog.inc.css
@@ -50,7 +50,6 @@ caption {
 }
 
 groupbox {
-  font-size: 1em;
   margin-top: 0;
   margin-right: 4px;
   margin-left: 4px;
@@ -67,11 +66,6 @@ groupbox description {
   margin-left: 0;
 }
 
-label.menu-text,
-textbox.tree-input {
-  font-size: unset;
-}
-
 menulist label {
   font-weight: unset;
 }
diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/browser/themes/shared/incontentprefs/preferences.inc.css
index bde6cd20e080..bd22278bcdf1 100644
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -26,8 +26,6 @@
 #mainPrefPane {
   width: 100%;
   padding: 0;
-  font: message-box;
-  color: currentColor;
 }
 
 prefpane > groupbox + groupbox {
@@ -57,11 +55,15 @@ html|option {
 
 description,
 label {
-  line-height: 30px;
+  line-height: 1.8em;
   margin-top: 0 !important;
   margin-bottom: 0 !important;
 }
 
+.tip-caption {
+  font-size: .9em;
+}
+
 menulist > hbox > label,
 menuitem > label,
 button > hbox > label {
@@ -229,12 +231,10 @@ button > hbox > label {
 }
 
 #updateApp > .groupbox-body > label {
-  margin: 0 0 4px 0;
-  line-height: 30px;
+  margin: 0 0 4px;
 }
 
 #updateApp > .groupbox-body > description {
-  line-height: 30px;
   margin: 0;
 }
 
@@ -264,7 +264,7 @@ button > hbox > label {
 }
 
 #filter {
-  margin: 4px 0 8px 0;
+  margin: 4px 0 8px;
 }
 
 #handlersView {
@@ -308,7 +308,7 @@ button > hbox > label {
 /* Search Pane */
 
 #engineList {
-  margin: 2px 0 5px 0;
+  margin: 2px 0 5px;
 }
 
 #engineList > treechildren::-moz-tree-image(engineShown, checked),
@@ -337,7 +337,7 @@ button > hbox > label {
 }
 
 #addEnginesBox {
-  margin: 4px 0 0 0;
+  margin: 4px 0 0;
 }
 
 /* Privacy Pane */
@@ -430,7 +430,6 @@ button > hbox > label {
   background-color: #fbfbfb;
   background-clip: content-box;
   color: #424e5a;
-  font-size: 14px;
   /* `transparent` will use the dialogText color in high-contrast themes and
      when page colors are disabled */
   border: 1px solid transparent;
@@ -456,7 +455,7 @@ button > hbox > label {
 }
 
 .dialogTitle {
-  font-size: unset;
+  font-size: .9em;
   text-align: center;
   -moz-user-select: none;
 }
@@ -701,7 +700,7 @@ button > hbox > label {
 
 .help-label {
   margin: 0 4px;
-  line-height: 22px;
+  font-size: .9em;
   -moz-user-select: none;
 }
 
diff --git a/browser/themes/windows/preferences/in-content/dialog.css b/browser/themes/windows/preferences/in-content/dialog.css
index 5a9f9dd6af2c..e715b226544a 100644
--- a/browser/themes/windows/preferences/in-content/dialog.css
+++ b/browser/themes/windows/preferences/in-content/dialog.css
@@ -4,10 +4,6 @@
 
 %include ../../../shared/incontentprefs/dialog.inc.css
 
-label,
-textbox,
-description,
-.tab-text,
-menulist label {
-  font-size: 1.25rem;
+:root > * {
+  font-size: 1.12em;
 }
diff --git a/browser/themes/windows/preferences/in-content/preferences.css b/browser/themes/windows/preferences/in-content/preferences.css
index 5e7cc527e5b6..37f3cceb83ea 100644
--- a/browser/themes/windows/preferences/in-content/preferences.css
+++ b/browser/themes/windows/preferences/in-content/preferences.css
@@ -4,19 +4,8 @@
 
 %include ../../../shared/incontentprefs/preferences.inc.css
 
-html *,
-page *,
-window * {
-  font-size: 1.25rem;
-}
-
-caption label {
-  font-size: 1.42rem;
-}
-
-.tip-caption,
-.help-label {
-  font-size: 1.08rem;
+:root > * {
+  font-size: 1.25em;
 }
 
 .actionsMenu > .menulist-label-box > .menulist-icon {
diff --git a/toolkit/themes/linux/global/in-content/common.css b/toolkit/themes/linux/global/in-content/common.css
index 52a687819e1c..c82331c9a2f9 100644
--- a/toolkit/themes/linux/global/in-content/common.css
+++ b/toolkit/themes/linux/global/in-content/common.css
@@ -101,14 +101,6 @@ xul|treechildren::-moz-tree-row(selected) {
   background-color: var(--in-content-item-selected);
 }
 
-*|*.header-name {
-  font-size: 1.64rem;
-}
-
-*|*.category-name {
-  font-size: 1.19rem;
-}
-
 html|button {
   /* XUL button min-width */
   min-width: 6.3em;
diff --git a/toolkit/themes/linux/mozapps/extensions/extensions.css b/toolkit/themes/linux/mozapps/extensions/extensions.css
index d99060ba0742..0d347b7a508b 100644
--- a/toolkit/themes/linux/mozapps/extensions/extensions.css
+++ b/toolkit/themes/linux/mozapps/extensions/extensions.css
@@ -4,6 +4,10 @@
 
 %include ../../../shared/extensions/extensions.inc.css
 
+:root > * {
+  font-size: 1.11em;
+}
+
 #header-utils-btn .toolbarbutton-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg");
   -moz-context-properties: fill;
diff --git a/toolkit/themes/osx/global/in-content/common.css b/toolkit/themes/osx/global/in-content/common.css
index b06c9f8bd219..99471334c2ce 100644
--- a/toolkit/themes/osx/global/in-content/common.css
+++ b/toolkit/themes/osx/global/in-content/common.css
@@ -62,11 +62,6 @@ xul|*.numberbox-input-box {
   border-width: 0;
 }
 
-xul|description {
-  font-size: 1.25rem;
-  line-height: 22px;
-}
-
 xul|*.text-link:-moz-focusring {
   color: var(--in-content-link-highlight);
   text-decoration: underline;
@@ -116,14 +111,6 @@ xul|textbox[type="search"]:not([searchbutton]) > .textbox-input-box > .textbox-s
   margin-inline-end: 5px;
 }
 
-*|*.header-name {
-  font-size: 2rem;
-}
-
-*|*.category-name {
-  font-size: 1.45rem;
-}
-
 html|button {
   /* XUL button min-width */
   min-width: 79px;
diff --git a/toolkit/themes/osx/mozapps/extensions/extensions.css b/toolkit/themes/osx/mozapps/extensions/extensions.css
index 1879908c688a..ad2034e9be92 100644
--- a/toolkit/themes/osx/mozapps/extensions/extensions.css
+++ b/toolkit/themes/osx/mozapps/extensions/extensions.css
@@ -4,6 +4,10 @@
 
 %include ../../../shared/extensions/extensions.inc.css
 
+:root > * {
+  font-size: 1.36em;
+}
+
 .no-auto-hide > .menulist-dropmarker {
   padding-inline-start: 0px !important;
 }
diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index e9cb2c94eab0..35ab8687bbb2 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -73,6 +73,7 @@ html|hr {
 
 xul|caption {
   -moz-appearance: none;
+  font-size: 1.14em;
   margin: 0;
 }
 
@@ -80,7 +81,7 @@ html|h2,
 xul|caption xul|checkbox,
 xul|caption xul|label {
   font-weight: 600;
-  line-height: 22px;
+  line-height: 1.4em;
 }
 
 xul|caption xul|checkbox,
@@ -104,7 +105,6 @@ xul|groupbox {
   border: none;
   margin: 0;
   padding: 0;
-  font-size: 1.25rem;
 }
 
 xul|groupbox > xul|caption {
@@ -122,8 +122,6 @@ xul|groupbox xul|description {
 
 xul|tabpanels {
   -moz-appearance: none;
-  font-size: 1.25rem;
-  line-height: 22px;
   border: none;
   padding: 0;
   background-color: transparent;
@@ -165,11 +163,6 @@ xul|tab[selected] {
   border-bottom: 4px solid var(--in-content-border-highlight);
 }
 
-xul|*.tab-text {
-  font-size: 1.3rem;
-  line-height: 22px;
-}
-
 /* html buttons */
 
 html|button {
@@ -707,7 +700,8 @@ xul|*.radio-label-box {
 }
 
 *|*.category-name {
-  line-height: 22px;
+  font-size: 1.07em;
+  line-height: 1.4em;
   padding-bottom: 2px;
   padding-inline-start: 9px;
   margin: 0;
@@ -760,8 +754,9 @@ xul|*.radio-label-box {
 }
 
 *|*.header-name {
+  font-size: 1.46em;
   font-weight: 300;
-  line-height: 30px;
+  line-height: 1.3em;
   margin: 0;
   -moz-user-select: none;
 }
diff --git a/toolkit/themes/windows/global/in-content/common.css b/toolkit/themes/windows/global/in-content/common.css
index b7df3d6e697b..41ca6beedfe7 100644
--- a/toolkit/themes/windows/global/in-content/common.css
+++ b/toolkit/themes/windows/global/in-content/common.css
@@ -55,14 +55,6 @@ html|input[type="checkbox"]:-moz-focusring + html|label:before {
   }
 }
 
-*|*.header-name {
-  font-size: 1.83rem;
-}
-
-*|*.category-name {
-  font-size: 1.33rem;
-}
-
 html|button {
   /* XUL button min-width */
   min-width: 6.3em;
diff --git a/toolkit/themes/windows/mozapps/extensions/extensions.css b/toolkit/themes/windows/mozapps/extensions/extensions.css
index 827c7d9d7fe9..c522552a75a5 100644
--- a/toolkit/themes/windows/mozapps/extensions/extensions.css
+++ b/toolkit/themes/windows/mozapps/extensions/extensions.css
@@ -4,6 +4,10 @@
 
 %include ../../../shared/extensions/extensions.inc.css
 
+:root > * {
+  font-size: 1.25em;
+}
+
 #header-utils-btn {
   list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg");
   -moz-context-properties: fill;

From 0df2ec12c43880f39cfb25ce792363947c120965 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Thu, 19 Oct 2017 11:36:25 +0200
Subject: [PATCH 111/219] Bug 406738 - No longer show the kind of updates in
 'Show Update History' as they are all marked as "security updates" r=florian

MozReview-Commit-ID: 1TTK5vPRnfT

--HG--
extra : rebase_source : a7d6f2d06a2cb8f2e85139f5ca09f5e999ea0ef3
---
 .../preferences/in-content/tests/browser_advanced_update.js   | 4 ----
 .../locales/en-US/chrome/mozapps/update/updates.properties    | 3 ---
 toolkit/mozapps/update/content/history.js                     | 1 -
 toolkit/mozapps/update/content/updates.xml                    | 4 ----
 4 files changed, 12 deletions(-)

diff --git a/browser/components/preferences/in-content/tests/browser_advanced_update.js b/browser/components/preferences/in-content/tests/browser_advanced_update.js
index 047be251aeea..ad4246b501b8 100644
--- a/browser/components/preferences/in-content/tests/browser_advanced_update.js
+++ b/browser/components/preferences/in-content/tests/browser_advanced_update.js
@@ -56,7 +56,6 @@ const mockUpdateManager = {
       name: "Firefox Developer Edition 49.0a2",
       statusText: "The Update was successfully installed",
       buildID: "20160728004010",
-      type: "minor",
       installDate: 1469763105156,
       detailsURL: "https://www.mozilla.org/firefox/aurora/"
     },
@@ -64,7 +63,6 @@ const mockUpdateManager = {
       name: "Firefox Developer Edition 43.0a2",
       statusText: "The Update was successfully installed",
       buildID: "20150929004011",
-      type: "minor",
       installDate: 1443585886224,
       detailsURL: "https://www.mozilla.org/firefox/aurora/"
     },
@@ -72,7 +70,6 @@ const mockUpdateManager = {
       name: "Firefox Developer Edition 42.0a2",
       statusText: "The Update was successfully installed",
       buildID: "20150920004018",
-      type: "major",
       installDate: 1442818147544,
       detailsURL: "https://www.mozilla.org/firefox/aurora/"
     }
@@ -146,7 +143,6 @@ add_task(async function() {
     updateData = mockUpdateManager.getUpdateAt(i);
 
     is(update.name, updateData.name + " (" + updateData.buildID + ")", "Wrong update name");
-    is(update.type, updateData.type == "major" ? "New Version" : "Security Update", "Wrong update type");
     is(update.installDate, formatInstallDate(updateData.installDate), "Wrong update installDate");
     is(update.detailsURL, updateData.detailsURL, "Wrong update detailsURL");
     is(update.status, updateData.statusText, "Wrong update status");
diff --git a/toolkit/locales/en-US/chrome/mozapps/update/updates.properties b/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
index dadf03c47ec8..90a891d83492 100644
--- a/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
@@ -20,9 +20,6 @@ updateNightlyName=%1$S %2$S %3$S nightly
 intro_major=Do you want to upgrade to %1$S %2$S now?
 intro_minor=A security and stability update for %1$S is available:
 
-updateType_major=New Version
-updateType_minor=Security Update
-
 # LOCALIZATION NOTE: When present %S is brandShortName
 verificationError=%S could not confirm the integrity of the update package.
 resumePausedAfterCloseTitle=Software Update
diff --git a/toolkit/mozapps/update/content/history.js b/toolkit/mozapps/update/content/history.js
index 7a02eadd7e27..6cefc079129d 100644
--- a/toolkit/mozapps/update/content/history.js
+++ b/toolkit/mozapps/update/content/history.js
@@ -38,7 +38,6 @@ var gUpdateHistory = {
         this._view.appendChild(element);
         element.name = bundle.getFormattedString("updateFullName",
           [update.name, update.buildID]);
-        element.type = bundle.getString("updateType_" + update.type);
         element.installDate = this._formatDate(update.installDate);
         if (update.detailsURL)
           element.detailsURL = update.detailsURL;
diff --git a/toolkit/mozapps/update/content/updates.xml b/toolkit/mozapps/update/content/updates.xml
index 9218f433fd11..bbdce6923c82 100644
--- a/toolkit/mozapps/update/content/updates.xml
+++ b/toolkit/mozapps/update/content/updates.xml
@@ -33,7 +33,6 @@
         <xul:label xbl:inherits="href=detailsURL,hidden=hideDetailsURL" class="text-link"
                    value="&update.details.label;"/>
       </xul:hbox>
-      <xul:label class="update-type" xbl:inherits="value=type"/>
       <xul:grid>
         <xul:columns>
           <xul:column class="update-label-column"/>
@@ -61,9 +60,6 @@
       <property name="installDate"
                 onget="return this.getAttribute('installDate');"
                 onset="this.setAttribute('installDate', val); return val;"/>
-      <property name="type"
-                onget="return this.getAttribute('type');"
-                onset="this.setAttribute('type', val); return val;"/>
       <property name="hideDetailsURL"
                 onget="return this.getAttribute('hideDetailsURL');"
                 onset="this.setAttribute('hideDetailsURL', val); return val;"/>

From f903a3863997752e256267b41276b973d1d2a0ad Mon Sep 17 00:00:00 2001
From: Valentin Gosu <valentin.gosu@gmail.com>
Date: Sat, 2 Dec 2017 23:09:34 +0100
Subject: [PATCH 112/219] Bug 1420954 - Make nsIURIMutator setters return
 nsIURIMutator so we can chain setters r=bagder MozReview-Commit-ID:
 53BD91hB2yi

--HG--
extra : rebase_source : 45594a92e1a9f18f2f4b5bb2824b5f8ced584eab
---
 caps/NullPrincipalURI.h                       |  5 +-
 dom/file/nsHostObjectURI.h                    |  2 +-
 dom/jsurl/nsJSProtocolHandler.h               |  2 +-
 image/decoders/icon/nsIconURI.h               |  5 +-
 modules/libjar/nsJARURI.h                     |  2 +-
 netwerk/base/nsIURIMutator.idl                | 77 +++++++++++++++----
 netwerk/base/nsSimpleNestedURI.h              |  2 +-
 netwerk/base/nsSimpleURI.h                    |  2 +-
 netwerk/base/nsStandardURL.h                  |  2 +-
 .../protocol/about/nsAboutProtocolHandler.h   |  2 +-
 netwerk/test/unit/test_uri_mutator.js         | 23 ++++++
 netwerk/test/unit/xpcshell.ini                |  1 +
 12 files changed, 97 insertions(+), 28 deletions(-)
 create mode 100644 netwerk/test/unit/test_uri_mutator.js

diff --git a/caps/NullPrincipalURI.h b/caps/NullPrincipalURI.h
index 6d0b30e7861d..caaff5070555 100644
--- a/caps/NullPrincipalURI.h
+++ b/caps/NullPrincipalURI.h
@@ -58,7 +58,7 @@ public:
       , public BaseURIMutator<NullPrincipalURI>
   {
     NS_DECL_ISUPPORTS
-    NS_FORWARD_SAFE_NSIURISETTERS(mURI)
+    NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
 
     NS_IMETHOD Deserialize(const mozilla::ipc::URIParams& aParams) override
     {
@@ -76,8 +76,9 @@ public:
       return NS_OK;
     }
 
-    NS_IMETHOD SetSpec(const nsACString & aSpec) override
+    NS_IMETHOD SetSpec(const nsACString & aSpec, nsIURIMutator** aMutator) override
     {
+      NS_ADDREF(*aMutator = this);
       return NS_ERROR_NOT_IMPLEMENTED;
     }
 
diff --git a/dom/file/nsHostObjectURI.h b/dom/file/nsHostObjectURI.h
index 5925d7617fff..3a9a7b63aa47 100644
--- a/dom/file/nsHostObjectURI.h
+++ b/dom/file/nsHostObjectURI.h
@@ -83,7 +83,7 @@ public:
     , public BaseURIMutator<nsHostObjectURI>
   {
     NS_DECL_ISUPPORTS
-    NS_FORWARD_SAFE_NSIURISETTERS(mURI)
+    NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
     NS_DEFINE_NSIMUTATOR_COMMON
 
     explicit Mutator() { }
diff --git a/dom/jsurl/nsJSProtocolHandler.h b/dom/jsurl/nsJSProtocolHandler.h
index c83300050b44..d9500acb24a2 100644
--- a/dom/jsurl/nsJSProtocolHandler.h
+++ b/dom/jsurl/nsJSProtocolHandler.h
@@ -110,7 +110,7 @@ public:
         , public BaseURIMutator<nsJSURI>
     {
         NS_DECL_ISUPPORTS
-        NS_FORWARD_SAFE_NSIURISETTERS(mURI)
+        NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
         NS_DEFINE_NSIMUTATOR_COMMON
 
         explicit Mutator() { }
diff --git a/image/decoders/icon/nsIconURI.h b/image/decoders/icon/nsIconURI.h
index 5e01b11fb2d4..7da500ed11a7 100644
--- a/image/decoders/icon/nsIconURI.h
+++ b/image/decoders/icon/nsIconURI.h
@@ -51,7 +51,7 @@ public:
       , public BaseURIMutator<nsMozIconURI>
   {
     NS_DECL_ISUPPORTS
-    NS_FORWARD_SAFE_NSIURISETTERS(mURI)
+    NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
 
     NS_IMETHOD Deserialize(const mozilla::ipc::URIParams& aParams) override
     {
@@ -69,7 +69,8 @@ public:
       return NS_OK;
     }
 
-    NS_IMETHOD SetSpec(const nsACString & aSpec) override {
+    NS_IMETHOD SetSpec(const nsACString & aSpec, nsIURIMutator** aMutator) override {
+      NS_ADDREF(*aMutator = this);
       return InitFromSpec(aSpec);
     }
 
diff --git a/modules/libjar/nsJARURI.h b/modules/libjar/nsJARURI.h
index f62adb34a89f..45b232e7556d 100644
--- a/modules/libjar/nsJARURI.h
+++ b/modules/libjar/nsJARURI.h
@@ -104,7 +104,7 @@ public:
         , public BaseURIMutator<nsJARURI>
     {
         NS_DECL_ISUPPORTS
-        NS_FORWARD_SAFE_NSIURISETTERS(mURI)
+        NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
         NS_DEFINE_NSIMUTATOR_COMMON
 
         explicit Mutator() { }
diff --git a/netwerk/base/nsIURIMutator.idl b/netwerk/base/nsIURIMutator.idl
index 88abed405ea7..d02f24a8e605 100644
--- a/netwerk/base/nsIURIMutator.idl
+++ b/netwerk/base/nsIURIMutator.idl
@@ -6,6 +6,7 @@
 #include "nsISupports.idl"
 interface nsIURI;
 interface nsIObjectInputStream;
+interface nsIURIMutator;
 
 %{C++
 #include "nsStringGlue.h"
@@ -87,9 +88,8 @@ protected:
     { return InitFromInputStream(aStream); }                                  \
   NS_IMETHOD Finalize(nsIURI** aURI) override                                 \
     { mURI.forget(aURI); return NS_OK; }                                      \
-  NS_IMETHOD SetSpec(const nsACString & aSpec) override                       \
-    { return InitFromSpec(aSpec); }
-
+  NS_IMETHOD SetSpec(const nsACString & aSpec, nsIURIMutator** aMutator) override \
+    { NS_ADDREF(*aMutator = this); return InitFromSpec(aSpec); }
 %}
 
 [ptr] native Encoding(const mozilla::Encoding);
@@ -104,27 +104,70 @@ interface nsIURISetSpec : nsISupports
    * to define it separately, while the rest of the setters may be simply
    * forwarded to the mutable URI.
    */
-  void setSpec(in AUTF8String aSpec);
+  nsIURIMutator setSpec(in AUTF8String aSpec);
 };
 
+/**
+ * These methods allow the mutator to change various parts of the URI.
+ * They return the same nsIURIMutator so that we may chain setter operations:
+ * Example:
+ * let newURI = uri.mutate()
+ *                 .setSpec("http://example.com")
+ *                 .setQuery("hello")
+ *                 .finalize();
+ */
 [scriptable, builtinclass, uuid(5403a6ec-99d7-405e-8b45-9f805bbdfcef)]
 interface nsIURISetters : nsIURISetSpec
 {
-  void setScheme(in AUTF8String aScheme);
-  void setUserPass(in AUTF8String aUserPass);
-  void setUsername(in AUTF8String aUsername);
-  void setPassword(in AUTF8String aPassword);
-  void setHostPort(in AUTF8String aHostPort);
-  void setHostAndPort(in AUTF8String aHostAndPort);
-  void setHost(in AUTF8String aHost);
-  void setPort(in long aPort);
-  void setPathQueryRef(in AUTF8String aPathQueryRef);
-  void setRef(in AUTF8String aRef);
-  void setFilePath(in AUTF8String aFilePath);
-  void setQuery(in AUTF8String aQuery);
-  [noscript] void setQueryWithEncoding(in AUTF8String query, in Encoding encoding);
+  nsIURIMutator setScheme(in AUTF8String aScheme);
+  nsIURIMutator setUserPass(in AUTF8String aUserPass);
+  nsIURIMutator setUsername(in AUTF8String aUsername);
+  nsIURIMutator setPassword(in AUTF8String aPassword);
+  nsIURIMutator setHostPort(in AUTF8String aHostPort);
+  nsIURIMutator setHostAndPort(in AUTF8String aHostAndPort);
+  nsIURIMutator setHost(in AUTF8String aHost);
+  nsIURIMutator setPort(in long aPort);
+  nsIURIMutator setPathQueryRef(in AUTF8String aPathQueryRef);
+  nsIURIMutator setRef(in AUTF8String aRef);
+  nsIURIMutator setFilePath(in AUTF8String aFilePath);
+  nsIURIMutator setQuery(in AUTF8String aQuery);
+  [noscript] nsIURIMutator setQueryWithEncoding(in AUTF8String query, in Encoding encoding);
 };
 
+%{C++
+
+// Using this macro instead of NS_FORWARD_SAFE_NSIURISETTERS makes chaining
+// setter operations possible.
+#define NS_FORWARD_SAFE_NSIURISETTERS_RET(_to)                                                                         \
+  NS_IMETHOD SetScheme(const nsACString & aScheme, nsIURIMutator** aMutator) override                                  \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetScheme(aScheme); }                    \
+  NS_IMETHOD SetUserPass(const nsACString & aUserPass, nsIURIMutator** aMutator) override                              \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetUserPass(aUserPass); }                \
+  NS_IMETHOD SetUsername(const nsACString & aUsername, nsIURIMutator** aMutator) override                              \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetUsername(aUsername); }                \
+  NS_IMETHOD SetPassword(const nsACString & aPassword, nsIURIMutator** aMutator) override                              \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetPassword(aPassword); }                \
+  NS_IMETHOD SetHostPort(const nsACString & aHostPort, nsIURIMutator** aMutator) override                              \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetHostPort(aHostPort); }                \
+  NS_IMETHOD SetHostAndPort(const nsACString & aHostAndPort, nsIURIMutator** aMutator) override                        \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetHostAndPort(aHostAndPort); }          \
+  NS_IMETHOD SetHost(const nsACString & aHost, nsIURIMutator** aMutator) override                                      \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetHost(aHost); }                        \
+  NS_IMETHOD SetPort(int32_t aPort, nsIURIMutator** aMutator) override                                                 \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetPort(aPort); }                        \
+  NS_IMETHOD SetPathQueryRef(const nsACString & aPathQueryRef, nsIURIMutator** aMutator) override                      \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetPathQueryRef(aPathQueryRef); }        \
+  NS_IMETHOD SetRef(const nsACString & aRef, nsIURIMutator** aMutator) override                                        \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetRef(aRef); }                          \
+  NS_IMETHOD SetFilePath(const nsACString & aFilePath, nsIURIMutator** aMutator) override                              \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetFilePath(aFilePath); }                \
+  NS_IMETHOD SetQuery(const nsACString & aQuery, nsIURIMutator** aMutator) override                                    \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetQuery(aQuery); }                      \
+  NS_IMETHOD SetQueryWithEncoding(const nsACString & query, const mozilla::Encoding *encoding, nsIURIMutator** aMutator) override \
+    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetQueryWithEncoding(query, encoding); }
+
+%}
+
 [scriptable, builtinclass, uuid(4d1f3103-1c44-4dcd-b717-5d22a697a7d9)]
 interface nsIURIMutator : nsIURISetters
 {
diff --git a/netwerk/base/nsSimpleNestedURI.h b/netwerk/base/nsSimpleNestedURI.h
index f54810b13c71..330179de09ea 100644
--- a/netwerk/base/nsSimpleNestedURI.h
+++ b/netwerk/base/nsSimpleNestedURI.h
@@ -77,8 +77,8 @@ public:
         , public BaseURIMutator<nsSimpleNestedURI>
     {
         NS_DECL_ISUPPORTS
-        NS_FORWARD_SAFE_NSIURISETTERS(mURI)
         NS_DEFINE_NSIMUTATOR_COMMON
+        NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
 
         explicit Mutator() { }
     private:
diff --git a/netwerk/base/nsSimpleURI.h b/netwerk/base/nsSimpleURI.h
index 509622303542..56d3e923873d 100644
--- a/netwerk/base/nsSimpleURI.h
+++ b/netwerk/base/nsSimpleURI.h
@@ -118,7 +118,7 @@ public:
         , public BaseURIMutator<nsSimpleURI>
     {
         NS_DECL_ISUPPORTS
-        NS_FORWARD_SAFE_NSIURISETTERS(mURI)
+        NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
         NS_DEFINE_NSIMUTATOR_COMMON
 
         explicit Mutator() { }
diff --git a/netwerk/base/nsStandardURL.h b/netwerk/base/nsStandardURL.h
index 974d08b2abe8..9e42fd472a8f 100644
--- a/netwerk/base/nsStandardURL.h
+++ b/netwerk/base/nsStandardURL.h
@@ -318,7 +318,7 @@ public:
         , public BaseURIMutator<nsStandardURL>
     {
         NS_DECL_ISUPPORTS
-        NS_FORWARD_SAFE_NSIURISETTERS(mURI)
+        NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
         NS_DEFINE_NSIMUTATOR_COMMON
 
         explicit Mutator() { }
diff --git a/netwerk/protocol/about/nsAboutProtocolHandler.h b/netwerk/protocol/about/nsAboutProtocolHandler.h
index 739dece2865e..f041a8854741 100644
--- a/netwerk/protocol/about/nsAboutProtocolHandler.h
+++ b/netwerk/protocol/about/nsAboutProtocolHandler.h
@@ -92,7 +92,7 @@ public:
         , public BaseURIMutator<nsNestedAboutURI>
     {
         NS_DECL_ISUPPORTS
-        NS_FORWARD_SAFE_NSIURISETTERS(mURI)
+        NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
         NS_DEFINE_NSIMUTATOR_COMMON
 
         explicit Mutator() { }
diff --git a/netwerk/test/unit/test_uri_mutator.js b/netwerk/test/unit/test_uri_mutator.js
new file mode 100644
index 000000000000..bfadb4c6e767
--- /dev/null
+++ b/netwerk/test/unit/test_uri_mutator.js
@@ -0,0 +1,23 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+Cu.import("resource://gre/modules/NetUtil.jsm");
+
+function standardMutator()
+{
+  return Cc['@mozilla.org/network/standard-url-mutator;1']
+           .createInstance(Ci.nsIURIMutator);
+}
+
+add_task(async function test_simple_setter_chaining() {
+  let uri = standardMutator()
+              .setSpec("http://example.com/")
+              .setQuery("hello")
+              .setRef("bla")
+              .setScheme("ftp")
+              .finalize();
+  equal(uri.spec, "ftp://example.com/?hello#bla");
+});
diff --git a/netwerk/test/unit/xpcshell.ini b/netwerk/test/unit/xpcshell.ini
index d15c4228834e..1901da2d26cf 100644
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -405,3 +405,4 @@ skip-if = os == "android"
 [test_bug1378385_http1.js]
 [test_tls_flags_separate_connections.js]
 [test_tls_flags.js]
+[test_uri_mutator.js]

From 936a9adfc08a989949f5f04921c5ceff90712c69 Mon Sep 17 00:00:00 2001
From: Valentin Gosu <valentin.gosu@gmail.com>
Date: Sat, 2 Dec 2017 23:15:55 +0100
Subject: [PATCH 113/219] Bug 1420954 - Add NS_MutateURI helper function to
 chain nsIURIMutator setters in C++ r=bagder

MozReview-Commit-ID: 79NlOm08ebz

--HG--
extra : rebase_source : 2cb95ec86bd9dadbbaf233e6289bcb9d3087cd65
---
 netwerk/base/nsIURIMutator.idl         | 166 ++++++++++++++++++++-----
 netwerk/base/nsStandardURL.cpp         |   6 +
 netwerk/test/gtest/TestStandardURL.cpp |  25 +++-
 3 files changed, 168 insertions(+), 29 deletions(-)

diff --git a/netwerk/base/nsIURIMutator.idl b/netwerk/base/nsIURIMutator.idl
index d02f24a8e605..42c26dfb1e28 100644
--- a/netwerk/base/nsIURIMutator.idl
+++ b/netwerk/base/nsIURIMutator.idl
@@ -10,7 +10,9 @@ interface nsIURIMutator;
 
 %{C++
 #include "nsStringGlue.h"
+#include "nsCOMPtr.h"
 
+extern nsresult NS_GetURIMutator(nsIURI* aURI, nsIURIMutator** aMutator);
 #undef SetPort  // XXX Windows!
 
 namespace mozilla {
@@ -89,7 +91,7 @@ protected:
   NS_IMETHOD Finalize(nsIURI** aURI) override                                 \
     { mURI.forget(aURI); return NS_OK; }                                      \
   NS_IMETHOD SetSpec(const nsACString & aSpec, nsIURIMutator** aMutator) override \
-    { NS_ADDREF(*aMutator = this); return InitFromSpec(aSpec); }
+    { if (aMutator) NS_ADDREF(*aMutator = this); return InitFromSpec(aSpec); }
 %}
 
 [ptr] native Encoding(const mozilla::Encoding);
@@ -138,33 +140,33 @@ interface nsIURISetters : nsIURISetSpec
 
 // Using this macro instead of NS_FORWARD_SAFE_NSIURISETTERS makes chaining
 // setter operations possible.
-#define NS_FORWARD_SAFE_NSIURISETTERS_RET(_to)                                                                         \
-  NS_IMETHOD SetScheme(const nsACString & aScheme, nsIURIMutator** aMutator) override                                  \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetScheme(aScheme); }                    \
-  NS_IMETHOD SetUserPass(const nsACString & aUserPass, nsIURIMutator** aMutator) override                              \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetUserPass(aUserPass); }                \
-  NS_IMETHOD SetUsername(const nsACString & aUsername, nsIURIMutator** aMutator) override                              \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetUsername(aUsername); }                \
-  NS_IMETHOD SetPassword(const nsACString & aPassword, nsIURIMutator** aMutator) override                              \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetPassword(aPassword); }                \
-  NS_IMETHOD SetHostPort(const nsACString & aHostPort, nsIURIMutator** aMutator) override                              \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetHostPort(aHostPort); }                \
-  NS_IMETHOD SetHostAndPort(const nsACString & aHostAndPort, nsIURIMutator** aMutator) override                        \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetHostAndPort(aHostAndPort); }          \
-  NS_IMETHOD SetHost(const nsACString & aHost, nsIURIMutator** aMutator) override                                      \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetHost(aHost); }                        \
-  NS_IMETHOD SetPort(int32_t aPort, nsIURIMutator** aMutator) override                                                 \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetPort(aPort); }                        \
-  NS_IMETHOD SetPathQueryRef(const nsACString & aPathQueryRef, nsIURIMutator** aMutator) override                      \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetPathQueryRef(aPathQueryRef); }        \
-  NS_IMETHOD SetRef(const nsACString & aRef, nsIURIMutator** aMutator) override                                        \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetRef(aRef); }                          \
-  NS_IMETHOD SetFilePath(const nsACString & aFilePath, nsIURIMutator** aMutator) override                              \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetFilePath(aFilePath); }                \
-  NS_IMETHOD SetQuery(const nsACString & aQuery, nsIURIMutator** aMutator) override                                    \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetQuery(aQuery); }                      \
-  NS_IMETHOD SetQueryWithEncoding(const nsACString & query, const mozilla::Encoding *encoding, nsIURIMutator** aMutator) override \
-    { NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetQueryWithEncoding(query, encoding); }
+#define NS_FORWARD_SAFE_NSIURISETTERS_RET(_to)                                                                                         \
+  NS_IMETHOD SetScheme(const nsACString & aScheme, nsIURIMutator** aMutator) override                                                  \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetScheme(aScheme); }                      \
+  NS_IMETHOD SetUserPass(const nsACString & aUserPass, nsIURIMutator** aMutator) override                                              \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetUserPass(aUserPass); }                  \
+  NS_IMETHOD SetUsername(const nsACString & aUsername, nsIURIMutator** aMutator) override                                              \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetUsername(aUsername); }                  \
+  NS_IMETHOD SetPassword(const nsACString & aPassword, nsIURIMutator** aMutator) override                                              \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetPassword(aPassword); }                  \
+  NS_IMETHOD SetHostPort(const nsACString & aHostPort, nsIURIMutator** aMutator) override                                              \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetHostPort(aHostPort); }                  \
+  NS_IMETHOD SetHostAndPort(const nsACString & aHostAndPort, nsIURIMutator** aMutator) override                                        \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetHostAndPort(aHostAndPort); }            \
+  NS_IMETHOD SetHost(const nsACString & aHost, nsIURIMutator** aMutator) override                                                      \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetHost(aHost); }                          \
+  NS_IMETHOD SetPort(int32_t aPort, nsIURIMutator** aMutator) override                                                                 \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetPort(aPort); }                          \
+  NS_IMETHOD SetPathQueryRef(const nsACString & aPathQueryRef, nsIURIMutator** aMutator) override                                      \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetPathQueryRef(aPathQueryRef); }          \
+  NS_IMETHOD SetRef(const nsACString & aRef, nsIURIMutator** aMutator) override                                                        \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetRef(aRef); }                            \
+  NS_IMETHOD SetFilePath(const nsACString & aFilePath, nsIURIMutator** aMutator) override                                              \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetFilePath(aFilePath); }                  \
+  NS_IMETHOD SetQuery(const nsACString & aQuery, nsIURIMutator** aMutator) override                                                    \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetQuery(aQuery); }                        \
+  NS_IMETHOD SetQueryWithEncoding(const nsACString & query, const mozilla::Encoding *encoding, nsIURIMutator** aMutator) override      \
+    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetQueryWithEncoding(query, encoding); }
 
 %}
 
@@ -191,3 +193,111 @@ interface nsIURIMutator : nsIURISetters
   nsIURI finalize();
 };
 
+%{C++
+
+// This class provides a useful helper that allows chaining of setter operations
+class MOZ_STACK_CLASS NS_MutateURI
+{
+public:
+  NS_MutateURI(nsIURI* aURI)
+    { mStatus = NS_GetURIMutator(aURI, getter_AddRefs(mMutator)); }
+  NS_MutateURI(nsCOMPtr<nsIURIMutator> aMutator)
+    { mStatus = NS_OK; mMutator = aMutator; }
+
+  NS_MutateURI& SetSpec(const nsACString& aSpec)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetSpec(aSpec, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetScheme(const nsACString& aScheme)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetScheme(aScheme, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetUserPass(const nsACString& aUserPass)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetUserPass(aUserPass, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetUsername(const nsACString& aUsername)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetUsername(aUsername, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetPassword(const nsACString& aPassword)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetPassword(aPassword, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetHostPort(const nsACString& aHostPort)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetHostPort(aHostPort, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetHostAndPort(const nsACString& aHostAndPort)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetHostAndPort(aHostAndPort, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetHost(const nsACString& aHost)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetHost(aHost, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetPort(int32_t aPort)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetPort(aPort, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetPathQueryRef(const nsACString& aPathQueryRef)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetPathQueryRef(aPathQueryRef, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetRef(const nsACString& aRef)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetRef(aRef, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetFilePath(const nsACString& aFilePath)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetFilePath(aFilePath, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetQuery(const nsACString& aQuery)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetQuery(aQuery, nullptr);
+    return *this;
+  }
+  NS_MutateURI& SetQueryWithEncoding(const nsACString& query, const mozilla::Encoding *encoding)
+  {
+    NS_ENSURE_SUCCESS(mStatus, *this);
+    mStatus = mMutator->SetQueryWithEncoding(query, encoding, nullptr);
+    return *this;
+  }
+  nsresult Finalize(nsIURI** aURI)
+  {
+    NS_ENSURE_SUCCESS(mStatus, mStatus);
+    mStatus = mMutator->Finalize(aURI);
+    return mStatus;
+  }
+  nsresult GetStatus() { return mStatus; }
+private:
+  nsresult mStatus;
+  RefPtr<nsIURIMutator> mMutator;
+};
+
+%}
diff --git a/netwerk/base/nsStandardURL.cpp b/netwerk/base/nsStandardURL.cpp
index e1f16cf42da3..c079a5479d2b 100644
--- a/netwerk/base/nsStandardURL.cpp
+++ b/netwerk/base/nsStandardURL.cpp
@@ -3768,3 +3768,9 @@ Test_NormalizeIPv4(const nsACString& host, nsCString& result)
 {
     return nsStandardURL::NormalizeIPv4(host, result);
 }
+
+nsresult
+NS_GetURIMutator(nsIURI* aURI, nsIURIMutator** aMutator)
+{
+    return aURI->Mutate(aMutator);
+}
diff --git a/netwerk/test/gtest/TestStandardURL.cpp b/netwerk/test/gtest/TestStandardURL.cpp
index 9d2e22761d96..a486a1d667b6 100644
--- a/netwerk/test/gtest/TestStandardURL.cpp
+++ b/netwerk/test/gtest/TestStandardURL.cpp
@@ -7,7 +7,7 @@
 #include "nsString.h"
 #include "nsPrintfCString.h"
 #include "nsComponentManagerUtils.h"
-
+#include "nsIURIMutator.h"
 
 // In nsStandardURL.cpp
 extern nsresult Test_NormalizeIPv4(const nsACString& host, nsCString& result);
@@ -235,3 +235,26 @@ MOZ_GTEST_BENCH(TestStandardURL, NormalizePerfFails, [] {
     }
 });
 #endif
+
+
+TEST(TestStandardURL, Mutator)
+{
+  nsAutoCString out;
+  nsCOMPtr<nsIURI> uri;
+  nsresult rv = NS_MutateURI(do_CreateInstance(NS_STANDARDURLMUTATOR_CONTRACTID))
+                  .SetSpec(NS_LITERAL_CSTRING("http://example.com"))
+                  .Finalize(getter_AddRefs(uri));
+  ASSERT_EQ(rv, NS_OK);
+
+  ASSERT_EQ(uri->GetSpec(out), NS_OK);
+  ASSERT_TRUE(out == NS_LITERAL_CSTRING("http://example.com/"));
+
+  rv = NS_MutateURI(uri)
+         .SetScheme(NS_LITERAL_CSTRING("ftp"))
+         .SetHost(NS_LITERAL_CSTRING("mozilla.org"))
+         .SetPathQueryRef(NS_LITERAL_CSTRING("/path?query#ref"))
+         .Finalize(getter_AddRefs(uri));
+  ASSERT_EQ(rv, NS_OK);
+  ASSERT_EQ(uri->GetSpec(out), NS_OK);
+  ASSERT_TRUE(out == NS_LITERAL_CSTRING("ftp://mozilla.org/path?query#ref"));
+}

From fecd3a9c134f2d36b89d375a26321c0dae9e8811 Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Sat, 2 Dec 2017 22:40:18 +0000
Subject: [PATCH 114/219] Bug 1422535 - Add full-screen-api.ignore-widgets pref
 to all.js so it's listed in about:config. r=xidorn

MozReview-Commit-ID: 4k2Hj3pDLSR

--HG--
extra : rebase_source : 3de3ce28ea3b2f400db1f08a95c50001b001960e
---
 modules/libpref/init/all.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 8410dc512e5c..56f4e13c30f1 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4971,6 +4971,8 @@ pref("full-screen-api.unprefix.enabled", false);
 pref("full-screen-api.unprefix.enabled", true);
 #endif
 pref("full-screen-api.allow-trusted-requests-only", true);
+// whether to prevent the top level widget from going fullscreen
+pref("full-screen-api.ignore-widgets", false);
 pref("full-screen-api.pointer-lock.enabled", true);
 // transition duration of fade-to-black and fade-from-black, unit: ms
 #ifndef MOZ_WIDGET_GTK

From 7ba06ee564534682bf01901f5533486b23918196 Mon Sep 17 00:00:00 2001
From: shindli <shindli@mozilla.com>
Date: Sun, 3 Dec 2017 01:10:14 +0200
Subject: [PATCH 115/219] Backed out 2 changesets (bug 1420954) for build
 failure in
 /builds/worker/workspace/build/src/obj-firefox/dist/include/nsIURIMutator.h:340:3:
 r=backout on a CLOSED TREE

Backed out changeset 8ce0a0d49d9e (bug 1420954)
Backed out changeset 480c6e1721e9 (bug 1420954)
---
 caps/NullPrincipalURI.h                       |   5 +-
 dom/file/nsHostObjectURI.h                    |   2 +-
 dom/jsurl/nsJSProtocolHandler.h               |   2 +-
 image/decoders/icon/nsIconURI.h               |   5 +-
 modules/libjar/nsJARURI.h                     |   2 +-
 netwerk/base/nsIURIMutator.idl                | 187 ++----------------
 netwerk/base/nsSimpleNestedURI.h              |   2 +-
 netwerk/base/nsSimpleURI.h                    |   2 +-
 netwerk/base/nsStandardURL.cpp                |   6 -
 netwerk/base/nsStandardURL.h                  |   2 +-
 .../protocol/about/nsAboutProtocolHandler.h   |   2 +-
 netwerk/test/gtest/TestStandardURL.cpp        |  25 +--
 netwerk/test/unit/test_uri_mutator.js         |  23 ---
 netwerk/test/unit/xpcshell.ini                |   1 -
 14 files changed, 29 insertions(+), 237 deletions(-)
 delete mode 100644 netwerk/test/unit/test_uri_mutator.js

diff --git a/caps/NullPrincipalURI.h b/caps/NullPrincipalURI.h
index caaff5070555..6d0b30e7861d 100644
--- a/caps/NullPrincipalURI.h
+++ b/caps/NullPrincipalURI.h
@@ -58,7 +58,7 @@ public:
       , public BaseURIMutator<NullPrincipalURI>
   {
     NS_DECL_ISUPPORTS
-    NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
+    NS_FORWARD_SAFE_NSIURISETTERS(mURI)
 
     NS_IMETHOD Deserialize(const mozilla::ipc::URIParams& aParams) override
     {
@@ -76,9 +76,8 @@ public:
       return NS_OK;
     }
 
-    NS_IMETHOD SetSpec(const nsACString & aSpec, nsIURIMutator** aMutator) override
+    NS_IMETHOD SetSpec(const nsACString & aSpec) override
     {
-      NS_ADDREF(*aMutator = this);
       return NS_ERROR_NOT_IMPLEMENTED;
     }
 
diff --git a/dom/file/nsHostObjectURI.h b/dom/file/nsHostObjectURI.h
index 3a9a7b63aa47..5925d7617fff 100644
--- a/dom/file/nsHostObjectURI.h
+++ b/dom/file/nsHostObjectURI.h
@@ -83,7 +83,7 @@ public:
     , public BaseURIMutator<nsHostObjectURI>
   {
     NS_DECL_ISUPPORTS
-    NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
+    NS_FORWARD_SAFE_NSIURISETTERS(mURI)
     NS_DEFINE_NSIMUTATOR_COMMON
 
     explicit Mutator() { }
diff --git a/dom/jsurl/nsJSProtocolHandler.h b/dom/jsurl/nsJSProtocolHandler.h
index d9500acb24a2..c83300050b44 100644
--- a/dom/jsurl/nsJSProtocolHandler.h
+++ b/dom/jsurl/nsJSProtocolHandler.h
@@ -110,7 +110,7 @@ public:
         , public BaseURIMutator<nsJSURI>
     {
         NS_DECL_ISUPPORTS
-        NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
+        NS_FORWARD_SAFE_NSIURISETTERS(mURI)
         NS_DEFINE_NSIMUTATOR_COMMON
 
         explicit Mutator() { }
diff --git a/image/decoders/icon/nsIconURI.h b/image/decoders/icon/nsIconURI.h
index 7da500ed11a7..5e01b11fb2d4 100644
--- a/image/decoders/icon/nsIconURI.h
+++ b/image/decoders/icon/nsIconURI.h
@@ -51,7 +51,7 @@ public:
       , public BaseURIMutator<nsMozIconURI>
   {
     NS_DECL_ISUPPORTS
-    NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
+    NS_FORWARD_SAFE_NSIURISETTERS(mURI)
 
     NS_IMETHOD Deserialize(const mozilla::ipc::URIParams& aParams) override
     {
@@ -69,8 +69,7 @@ public:
       return NS_OK;
     }
 
-    NS_IMETHOD SetSpec(const nsACString & aSpec, nsIURIMutator** aMutator) override {
-      NS_ADDREF(*aMutator = this);
+    NS_IMETHOD SetSpec(const nsACString & aSpec) override {
       return InitFromSpec(aSpec);
     }
 
diff --git a/modules/libjar/nsJARURI.h b/modules/libjar/nsJARURI.h
index 45b232e7556d..f62adb34a89f 100644
--- a/modules/libjar/nsJARURI.h
+++ b/modules/libjar/nsJARURI.h
@@ -104,7 +104,7 @@ public:
         , public BaseURIMutator<nsJARURI>
     {
         NS_DECL_ISUPPORTS
-        NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
+        NS_FORWARD_SAFE_NSIURISETTERS(mURI)
         NS_DEFINE_NSIMUTATOR_COMMON
 
         explicit Mutator() { }
diff --git a/netwerk/base/nsIURIMutator.idl b/netwerk/base/nsIURIMutator.idl
index 42c26dfb1e28..88abed405ea7 100644
--- a/netwerk/base/nsIURIMutator.idl
+++ b/netwerk/base/nsIURIMutator.idl
@@ -6,13 +6,10 @@
 #include "nsISupports.idl"
 interface nsIURI;
 interface nsIObjectInputStream;
-interface nsIURIMutator;
 
 %{C++
 #include "nsStringGlue.h"
-#include "nsCOMPtr.h"
 
-extern nsresult NS_GetURIMutator(nsIURI* aURI, nsIURIMutator** aMutator);
 #undef SetPort  // XXX Windows!
 
 namespace mozilla {
@@ -90,8 +87,9 @@ protected:
     { return InitFromInputStream(aStream); }                                  \
   NS_IMETHOD Finalize(nsIURI** aURI) override                                 \
     { mURI.forget(aURI); return NS_OK; }                                      \
-  NS_IMETHOD SetSpec(const nsACString & aSpec, nsIURIMutator** aMutator) override \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return InitFromSpec(aSpec); }
+  NS_IMETHOD SetSpec(const nsACString & aSpec) override                       \
+    { return InitFromSpec(aSpec); }
+
 %}
 
 [ptr] native Encoding(const mozilla::Encoding);
@@ -106,70 +104,27 @@ interface nsIURISetSpec : nsISupports
    * to define it separately, while the rest of the setters may be simply
    * forwarded to the mutable URI.
    */
-  nsIURIMutator setSpec(in AUTF8String aSpec);
+  void setSpec(in AUTF8String aSpec);
 };
 
-/**
- * These methods allow the mutator to change various parts of the URI.
- * They return the same nsIURIMutator so that we may chain setter operations:
- * Example:
- * let newURI = uri.mutate()
- *                 .setSpec("http://example.com")
- *                 .setQuery("hello")
- *                 .finalize();
- */
 [scriptable, builtinclass, uuid(5403a6ec-99d7-405e-8b45-9f805bbdfcef)]
 interface nsIURISetters : nsIURISetSpec
 {
-  nsIURIMutator setScheme(in AUTF8String aScheme);
-  nsIURIMutator setUserPass(in AUTF8String aUserPass);
-  nsIURIMutator setUsername(in AUTF8String aUsername);
-  nsIURIMutator setPassword(in AUTF8String aPassword);
-  nsIURIMutator setHostPort(in AUTF8String aHostPort);
-  nsIURIMutator setHostAndPort(in AUTF8String aHostAndPort);
-  nsIURIMutator setHost(in AUTF8String aHost);
-  nsIURIMutator setPort(in long aPort);
-  nsIURIMutator setPathQueryRef(in AUTF8String aPathQueryRef);
-  nsIURIMutator setRef(in AUTF8String aRef);
-  nsIURIMutator setFilePath(in AUTF8String aFilePath);
-  nsIURIMutator setQuery(in AUTF8String aQuery);
-  [noscript] nsIURIMutator setQueryWithEncoding(in AUTF8String query, in Encoding encoding);
+  void setScheme(in AUTF8String aScheme);
+  void setUserPass(in AUTF8String aUserPass);
+  void setUsername(in AUTF8String aUsername);
+  void setPassword(in AUTF8String aPassword);
+  void setHostPort(in AUTF8String aHostPort);
+  void setHostAndPort(in AUTF8String aHostAndPort);
+  void setHost(in AUTF8String aHost);
+  void setPort(in long aPort);
+  void setPathQueryRef(in AUTF8String aPathQueryRef);
+  void setRef(in AUTF8String aRef);
+  void setFilePath(in AUTF8String aFilePath);
+  void setQuery(in AUTF8String aQuery);
+  [noscript] void setQueryWithEncoding(in AUTF8String query, in Encoding encoding);
 };
 
-%{C++
-
-// Using this macro instead of NS_FORWARD_SAFE_NSIURISETTERS makes chaining
-// setter operations possible.
-#define NS_FORWARD_SAFE_NSIURISETTERS_RET(_to)                                                                                         \
-  NS_IMETHOD SetScheme(const nsACString & aScheme, nsIURIMutator** aMutator) override                                                  \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetScheme(aScheme); }                      \
-  NS_IMETHOD SetUserPass(const nsACString & aUserPass, nsIURIMutator** aMutator) override                                              \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetUserPass(aUserPass); }                  \
-  NS_IMETHOD SetUsername(const nsACString & aUsername, nsIURIMutator** aMutator) override                                              \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetUsername(aUsername); }                  \
-  NS_IMETHOD SetPassword(const nsACString & aPassword, nsIURIMutator** aMutator) override                                              \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetPassword(aPassword); }                  \
-  NS_IMETHOD SetHostPort(const nsACString & aHostPort, nsIURIMutator** aMutator) override                                              \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetHostPort(aHostPort); }                  \
-  NS_IMETHOD SetHostAndPort(const nsACString & aHostAndPort, nsIURIMutator** aMutator) override                                        \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetHostAndPort(aHostAndPort); }            \
-  NS_IMETHOD SetHost(const nsACString & aHost, nsIURIMutator** aMutator) override                                                      \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetHost(aHost); }                          \
-  NS_IMETHOD SetPort(int32_t aPort, nsIURIMutator** aMutator) override                                                                 \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetPort(aPort); }                          \
-  NS_IMETHOD SetPathQueryRef(const nsACString & aPathQueryRef, nsIURIMutator** aMutator) override                                      \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetPathQueryRef(aPathQueryRef); }          \
-  NS_IMETHOD SetRef(const nsACString & aRef, nsIURIMutator** aMutator) override                                                        \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetRef(aRef); }                            \
-  NS_IMETHOD SetFilePath(const nsACString & aFilePath, nsIURIMutator** aMutator) override                                              \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetFilePath(aFilePath); }                  \
-  NS_IMETHOD SetQuery(const nsACString & aQuery, nsIURIMutator** aMutator) override                                                    \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetQuery(aQuery); }                        \
-  NS_IMETHOD SetQueryWithEncoding(const nsACString & query, const mozilla::Encoding *encoding, nsIURIMutator** aMutator) override      \
-    { if (aMutator) NS_ADDREF(*aMutator = this); return !_to ? NS_ERROR_NULL_POINTER : _to->SetQueryWithEncoding(query, encoding); }
-
-%}
-
 [scriptable, builtinclass, uuid(4d1f3103-1c44-4dcd-b717-5d22a697a7d9)]
 interface nsIURIMutator : nsIURISetters
 {
@@ -193,111 +148,3 @@ interface nsIURIMutator : nsIURISetters
   nsIURI finalize();
 };
 
-%{C++
-
-// This class provides a useful helper that allows chaining of setter operations
-class MOZ_STACK_CLASS NS_MutateURI
-{
-public:
-  NS_MutateURI(nsIURI* aURI)
-    { mStatus = NS_GetURIMutator(aURI, getter_AddRefs(mMutator)); }
-  NS_MutateURI(nsCOMPtr<nsIURIMutator> aMutator)
-    { mStatus = NS_OK; mMutator = aMutator; }
-
-  NS_MutateURI& SetSpec(const nsACString& aSpec)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetSpec(aSpec, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetScheme(const nsACString& aScheme)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetScheme(aScheme, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetUserPass(const nsACString& aUserPass)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetUserPass(aUserPass, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetUsername(const nsACString& aUsername)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetUsername(aUsername, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetPassword(const nsACString& aPassword)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetPassword(aPassword, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetHostPort(const nsACString& aHostPort)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetHostPort(aHostPort, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetHostAndPort(const nsACString& aHostAndPort)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetHostAndPort(aHostAndPort, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetHost(const nsACString& aHost)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetHost(aHost, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetPort(int32_t aPort)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetPort(aPort, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetPathQueryRef(const nsACString& aPathQueryRef)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetPathQueryRef(aPathQueryRef, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetRef(const nsACString& aRef)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetRef(aRef, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetFilePath(const nsACString& aFilePath)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetFilePath(aFilePath, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetQuery(const nsACString& aQuery)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetQuery(aQuery, nullptr);
-    return *this;
-  }
-  NS_MutateURI& SetQueryWithEncoding(const nsACString& query, const mozilla::Encoding *encoding)
-  {
-    NS_ENSURE_SUCCESS(mStatus, *this);
-    mStatus = mMutator->SetQueryWithEncoding(query, encoding, nullptr);
-    return *this;
-  }
-  nsresult Finalize(nsIURI** aURI)
-  {
-    NS_ENSURE_SUCCESS(mStatus, mStatus);
-    mStatus = mMutator->Finalize(aURI);
-    return mStatus;
-  }
-  nsresult GetStatus() { return mStatus; }
-private:
-  nsresult mStatus;
-  RefPtr<nsIURIMutator> mMutator;
-};
-
-%}
diff --git a/netwerk/base/nsSimpleNestedURI.h b/netwerk/base/nsSimpleNestedURI.h
index 330179de09ea..f54810b13c71 100644
--- a/netwerk/base/nsSimpleNestedURI.h
+++ b/netwerk/base/nsSimpleNestedURI.h
@@ -77,8 +77,8 @@ public:
         , public BaseURIMutator<nsSimpleNestedURI>
     {
         NS_DECL_ISUPPORTS
+        NS_FORWARD_SAFE_NSIURISETTERS(mURI)
         NS_DEFINE_NSIMUTATOR_COMMON
-        NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
 
         explicit Mutator() { }
     private:
diff --git a/netwerk/base/nsSimpleURI.h b/netwerk/base/nsSimpleURI.h
index 56d3e923873d..509622303542 100644
--- a/netwerk/base/nsSimpleURI.h
+++ b/netwerk/base/nsSimpleURI.h
@@ -118,7 +118,7 @@ public:
         , public BaseURIMutator<nsSimpleURI>
     {
         NS_DECL_ISUPPORTS
-        NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
+        NS_FORWARD_SAFE_NSIURISETTERS(mURI)
         NS_DEFINE_NSIMUTATOR_COMMON
 
         explicit Mutator() { }
diff --git a/netwerk/base/nsStandardURL.cpp b/netwerk/base/nsStandardURL.cpp
index c079a5479d2b..e1f16cf42da3 100644
--- a/netwerk/base/nsStandardURL.cpp
+++ b/netwerk/base/nsStandardURL.cpp
@@ -3768,9 +3768,3 @@ Test_NormalizeIPv4(const nsACString& host, nsCString& result)
 {
     return nsStandardURL::NormalizeIPv4(host, result);
 }
-
-nsresult
-NS_GetURIMutator(nsIURI* aURI, nsIURIMutator** aMutator)
-{
-    return aURI->Mutate(aMutator);
-}
diff --git a/netwerk/base/nsStandardURL.h b/netwerk/base/nsStandardURL.h
index 9e42fd472a8f..974d08b2abe8 100644
--- a/netwerk/base/nsStandardURL.h
+++ b/netwerk/base/nsStandardURL.h
@@ -318,7 +318,7 @@ public:
         , public BaseURIMutator<nsStandardURL>
     {
         NS_DECL_ISUPPORTS
-        NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
+        NS_FORWARD_SAFE_NSIURISETTERS(mURI)
         NS_DEFINE_NSIMUTATOR_COMMON
 
         explicit Mutator() { }
diff --git a/netwerk/protocol/about/nsAboutProtocolHandler.h b/netwerk/protocol/about/nsAboutProtocolHandler.h
index f041a8854741..739dece2865e 100644
--- a/netwerk/protocol/about/nsAboutProtocolHandler.h
+++ b/netwerk/protocol/about/nsAboutProtocolHandler.h
@@ -92,7 +92,7 @@ public:
         , public BaseURIMutator<nsNestedAboutURI>
     {
         NS_DECL_ISUPPORTS
-        NS_FORWARD_SAFE_NSIURISETTERS_RET(mURI)
+        NS_FORWARD_SAFE_NSIURISETTERS(mURI)
         NS_DEFINE_NSIMUTATOR_COMMON
 
         explicit Mutator() { }
diff --git a/netwerk/test/gtest/TestStandardURL.cpp b/netwerk/test/gtest/TestStandardURL.cpp
index a486a1d667b6..9d2e22761d96 100644
--- a/netwerk/test/gtest/TestStandardURL.cpp
+++ b/netwerk/test/gtest/TestStandardURL.cpp
@@ -7,7 +7,7 @@
 #include "nsString.h"
 #include "nsPrintfCString.h"
 #include "nsComponentManagerUtils.h"
-#include "nsIURIMutator.h"
+
 
 // In nsStandardURL.cpp
 extern nsresult Test_NormalizeIPv4(const nsACString& host, nsCString& result);
@@ -235,26 +235,3 @@ MOZ_GTEST_BENCH(TestStandardURL, NormalizePerfFails, [] {
     }
 });
 #endif
-
-
-TEST(TestStandardURL, Mutator)
-{
-  nsAutoCString out;
-  nsCOMPtr<nsIURI> uri;
-  nsresult rv = NS_MutateURI(do_CreateInstance(NS_STANDARDURLMUTATOR_CONTRACTID))
-                  .SetSpec(NS_LITERAL_CSTRING("http://example.com"))
-                  .Finalize(getter_AddRefs(uri));
-  ASSERT_EQ(rv, NS_OK);
-
-  ASSERT_EQ(uri->GetSpec(out), NS_OK);
-  ASSERT_TRUE(out == NS_LITERAL_CSTRING("http://example.com/"));
-
-  rv = NS_MutateURI(uri)
-         .SetScheme(NS_LITERAL_CSTRING("ftp"))
-         .SetHost(NS_LITERAL_CSTRING("mozilla.org"))
-         .SetPathQueryRef(NS_LITERAL_CSTRING("/path?query#ref"))
-         .Finalize(getter_AddRefs(uri));
-  ASSERT_EQ(rv, NS_OK);
-  ASSERT_EQ(uri->GetSpec(out), NS_OK);
-  ASSERT_TRUE(out == NS_LITERAL_CSTRING("ftp://mozilla.org/path?query#ref"));
-}
diff --git a/netwerk/test/unit/test_uri_mutator.js b/netwerk/test/unit/test_uri_mutator.js
deleted file mode 100644
index bfadb4c6e767..000000000000
--- a/netwerk/test/unit/test_uri_mutator.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-Cu.import("resource://gre/modules/NetUtil.jsm");
-
-function standardMutator()
-{
-  return Cc['@mozilla.org/network/standard-url-mutator;1']
-           .createInstance(Ci.nsIURIMutator);
-}
-
-add_task(async function test_simple_setter_chaining() {
-  let uri = standardMutator()
-              .setSpec("http://example.com/")
-              .setQuery("hello")
-              .setRef("bla")
-              .setScheme("ftp")
-              .finalize();
-  equal(uri.spec, "ftp://example.com/?hello#bla");
-});
diff --git a/netwerk/test/unit/xpcshell.ini b/netwerk/test/unit/xpcshell.ini
index 1901da2d26cf..d15c4228834e 100644
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -405,4 +405,3 @@ skip-if = os == "android"
 [test_bug1378385_http1.js]
 [test_tls_flags_separate_connections.js]
 [test_tls_flags.js]
-[test_uri_mutator.js]

From b564f2695bd4ff720a6cc2dceb945b8f772fd955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sat, 2 Dec 2017 20:36:53 +0100
Subject: [PATCH 116/219] Bug 1422524: Avoid calling nsAttrValue::Type twice in
 the common case. r=xidorn

MozReview-Commit-ID: JCnUrlYCWv3

--HG--
extra : rebase_source : be6dbb175202e4298cfceb96be2b3ee097fd3cd6
---
 layout/style/ServoBindings.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/layout/style/ServoBindings.cpp b/layout/style/ServoBindings.cpp
index 5cb23de71284..cb42dde3ec18 100644
--- a/layout/style/ServoBindings.cpp
+++ b/layout/style/ServoBindings.cpp
@@ -1101,21 +1101,22 @@ ClassOrClassList(Implementor* aElement, nsAtom** aClass, nsAtom*** aClassList)
 
   // For class values with only whitespace, Gecko just stores a string. For the
   // purposes of the style system, there is no class in this case.
-  if (attr->Type() == nsAttrValue::eString) {
+  nsAttrValue::ValueType type = attr->Type();
+  if (MOZ_UNLIKELY(type == nsAttrValue::eString)) {
     MOZ_ASSERT(nsContentUtils::TrimWhitespace<nsContentUtils::IsHTMLWhitespace>(
                  attr->GetStringValue()).IsEmpty());
     return 0;
   }
 
   // Single tokens are generally stored as an atom. Check that case.
-  if (attr->Type() == nsAttrValue::eAtom) {
+  if (type == nsAttrValue::eAtom) {
     *aClass = attr->GetAtomValue();
     return 1;
   }
 
   // At this point we should have an atom array. It is likely, but not
   // guaranteed, that we have two or more elements in the array.
-  MOZ_ASSERT(attr->Type() == nsAttrValue::eAtomArray);
+  MOZ_ASSERT(type == nsAttrValue::eAtomArray);
   nsTArray<RefPtr<nsAtom>>* atomArray = attr->GetAtomArrayValue();
   uint32_t length = atomArray->Length();
 

From c5dd8401e2d008c37a0007fd8d9baecf81a1462e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sat, 2 Dec 2017 20:43:12 +0100
Subject: [PATCH 117/219] Bug 1422524: Inline nsAttrValue::Type. r=xidorn

MozReview-Commit-ID: I2uTeremrsS

--HG--
extra : rebase_source : 95573455175379737efdd207542fa4f17f4cd674
---
 dom/base/Element.h            |  1 +
 dom/base/nsAttrValue.cpp      | 19 -------------
 dom/base/nsAttrValue.h        | 35 +----------------------
 dom/base/nsAttrValueInlines.h | 52 +++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/dom/base/Element.h b/dom/base/Element.h
index 29b82981156e..b52824339306 100644
--- a/dom/base/Element.h
+++ b/dom/base/Element.h
@@ -33,6 +33,7 @@
 #include "nsISMILAttr.h"
 #include "mozilla/dom/DOMRect.h"
 #include "nsAttrValue.h"
+#include "nsAttrValueInlines.h"
 #include "mozilla/EventForwards.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/DOMTokenListSupportedTokens.h"
diff --git a/dom/base/nsAttrValue.cpp b/dom/base/nsAttrValue.cpp
index 9ba351dda379..87f59d74bfd8 100644
--- a/dom/base/nsAttrValue.cpp
+++ b/dom/base/nsAttrValue.cpp
@@ -186,25 +186,6 @@ nsAttrValue::Shutdown()
   sEnumTableArray = nullptr;
 }
 
-nsAttrValue::ValueType
-nsAttrValue::Type() const
-{
-  switch (BaseType()) {
-    case eIntegerBase:
-    {
-      return static_cast<ValueType>(mBits & NS_ATTRVALUE_INTEGERTYPE_MASK);
-    }
-    case eOtherBase:
-    {
-      return GetMiscContainer()->mType;
-    }
-    default:
-    {
-      return static_cast<ValueType>(static_cast<uint16_t>(BaseType()));
-    }
-  }
-}
-
 void
 nsAttrValue::Reset()
 {
diff --git a/dom/base/nsAttrValue.h b/dom/base/nsAttrValue.h
index 98be4d1890a1..1669a076ccd9 100644
--- a/dom/base/nsAttrValue.h
+++ b/dom/base/nsAttrValue.h
@@ -132,7 +132,7 @@ public:
   static nsresult Init();
   static void Shutdown();
 
-  ValueType Type() const;
+  inline ValueType Type() const;
   // Returns true when this value is self-contained and does not depend on
   // the state of its associated element.
   // Returns false when this value depends on the state of its associated
@@ -504,13 +504,6 @@ nsAttrValue::operator=(const nsAttrValue& aOther)
   return *this;
 }
 
-inline nsAtom*
-nsAttrValue::GetAtomValue() const
-{
-  NS_PRECONDITION(Type() == eAtom, "wrong type");
-  return reinterpret_cast<nsAtom*>(GetPtr());
-}
-
 inline nsAttrValue::ValueBaseType
 nsAttrValue::BaseType() const
 {
@@ -531,30 +524,4 @@ nsAttrValue::IsEmptyString() const
   return !mBits;
 }
 
-inline void
-nsAttrValue::ToString(mozilla::dom::DOMString& aResult) const
-{
-  switch (Type()) {
-    case eString:
-    {
-      nsStringBuffer* str = static_cast<nsStringBuffer*>(GetPtr());
-      if (str) {
-        aResult.SetStringBuffer(str, str->StorageSize()/sizeof(char16_t) - 1);
-      }
-      // else aResult is already empty
-      return;
-    }
-    case eAtom:
-    {
-      nsAtom *atom = static_cast<nsAtom*>(GetPtr());
-      aResult.SetOwnedAtom(atom, mozilla::dom::DOMString::eNullNotExpected);
-      break;
-    }
-    default:
-    {
-      ToString(aResult.AsAString());
-    }
-  }
-}
-
 #endif
diff --git a/dom/base/nsAttrValueInlines.h b/dom/base/nsAttrValueInlines.h
index ed96fbec9bc2..a12b5ce200f2 100644
--- a/dom/base/nsAttrValueInlines.h
+++ b/dom/base/nsAttrValueInlines.h
@@ -236,4 +236,56 @@ nsAttrValue::GetIntInternal() const
          NS_ATTRVALUE_INTEGERTYPE_MULTIPLIER;
 }
 
+inline nsAttrValue::ValueType
+nsAttrValue::Type() const
+{
+  switch (BaseType()) {
+    case eIntegerBase:
+    {
+      return static_cast<ValueType>(mBits & NS_ATTRVALUE_INTEGERTYPE_MASK);
+    }
+    case eOtherBase:
+    {
+      return GetMiscContainer()->mType;
+    }
+    default:
+    {
+      return static_cast<ValueType>(static_cast<uint16_t>(BaseType()));
+    }
+  }
+}
+
+inline nsAtom*
+nsAttrValue::GetAtomValue() const
+{
+  NS_PRECONDITION(Type() == eAtom, "wrong type");
+  return reinterpret_cast<nsAtom*>(GetPtr());
+}
+
+inline void
+nsAttrValue::ToString(mozilla::dom::DOMString& aResult) const
+{
+  switch (Type()) {
+    case eString:
+    {
+      nsStringBuffer* str = static_cast<nsStringBuffer*>(GetPtr());
+      if (str) {
+        aResult.SetStringBuffer(str, str->StorageSize()/sizeof(char16_t) - 1);
+      }
+      // else aResult is already empty
+      return;
+    }
+    case eAtom:
+    {
+      nsAtom *atom = static_cast<nsAtom*>(GetPtr());
+      aResult.SetOwnedAtom(atom, mozilla::dom::DOMString::eNullNotExpected);
+      break;
+    }
+    default:
+    {
+      ToString(aResult.AsAString());
+    }
+  }
+}
+
 #endif

From 1fe91d8a29d3b230f79e054d71b87e96a5cd88e4 Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Sat, 2 Dec 2017 00:11:39 +0000
Subject: [PATCH 118/219] Bug 1391044 - Preserve newlines in textarea
 placeholders. r=bz

MozReview-Commit-ID: 7h1dXSd4Ci7

--HG--
extra : rebase_source : 9fe03a61f12b04dae0778d1aa0b3c95ee3fb3d8f
---
 layout/forms/nsTextControlFrame.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index a24149136761..c013dc52640d 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -494,7 +494,11 @@ nsTextControlFrame::CreatePlaceholderIfNeeded()
   // Do we need a placeholder node?
   nsAutoString placeholderTxt;
   mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::placeholder, placeholderTxt);
-  nsContentUtils::RemoveNewlines(placeholderTxt);
+  if (IsTextArea()) { // <textarea>s preserve newlines...
+    nsContentUtils::PlatformToDOMLineBreaks(placeholderTxt);
+  } else { // ...<input>s don't
+    nsContentUtils::RemoveNewlines(placeholderTxt);
+  }
 
   if (placeholderTxt.IsEmpty()) {
     return;

From 7bf599f0136aa905774e2f6efe7213f6f43ac477 Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Sat, 2 Dec 2017 00:38:18 +0000
Subject: [PATCH 119/219] Bug 1391044 - Add wpt reftests for multiline
 placeholders in <textarea> and <input>. r=bz

Includes a manifest update missed by bug 1037335 7678ac4b15ad and fd99633486a5

MozReview-Commit-ID: IXjqOQAGQU5

--HG--
extra : rebase_source : 34de13753b1f18334101a785fd948dda92e4d6eb
---
 testing/web-platform/meta/MANIFEST.json       | 129 +++++++++++++++++-
 .../multiline-placeholder-cr.html             |   1 +
 .../multiline-placeholder-crlf.html           |  21 +++
 .../multiline-placeholder-ref.html            |  15 ++
 .../multiline-placeholder.html                |  22 +++
 .../support/placeholder.css                   |   6 +
 .../multiline-cr.html                         |   1 +
 .../multiline-crlf.html                       |  19 +++
 .../multiline-ref.html                        |   5 +
 .../the-placeholder-attribute/multiline.html  |  19 +++
 testing/web-platform/tests/lint.whitelist     |   4 +
 11 files changed, 239 insertions(+), 3 deletions(-)
 create mode 100644 testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-cr.html
 create mode 100644 testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-crlf.html
 create mode 100644 testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-ref.html
 create mode 100644 testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder.html
 create mode 100644 testing/web-platform/tests/html/form-elements/the-textarea-element/support/placeholder.css
 create mode 100644 testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-cr.html
 create mode 100644 testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-crlf.html
 create mode 100644 testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-ref.html
 create mode 100644 testing/web-platform/tests/html/input/the-placeholder-attribute/multiline.html

diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 05a52518db37..0138a8a6d733 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -171757,6 +171757,78 @@
      {}
     ]
    ],
+   "html/form-elements/the-textarea-element/multiline-placeholder-cr.html": [
+    [
+     "/html/form-elements/the-textarea-element/multiline-placeholder-cr.html",
+     [
+      [
+       "/html/form-elements/the-textarea-element/multiline-placeholder-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "html/form-elements/the-textarea-element/multiline-placeholder-crlf.html": [
+    [
+     "/html/form-elements/the-textarea-element/multiline-placeholder-crlf.html",
+     [
+      [
+       "/html/form-elements/the-textarea-element/multiline-placeholder-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "html/form-elements/the-textarea-element/multiline-placeholder.html": [
+    [
+     "/html/form-elements/the-textarea-element/multiline-placeholder.html",
+     [
+      [
+       "/html/form-elements/the-textarea-element/multiline-placeholder-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "html/input/the-placeholder-attribute/multiline-cr.html": [
+    [
+     "/html/input/the-placeholder-attribute/multiline-cr.html",
+     [
+      [
+       "/html/input/the-placeholder-attribute/multiline-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "html/input/the-placeholder-attribute/multiline-crlf.html": [
+    [
+     "/html/input/the-placeholder-attribute/multiline-crlf.html",
+     [
+      [
+       "/html/input/the-placeholder-attribute/multiline-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "html/input/the-placeholder-attribute/multiline.html": [
+    [
+     "/html/input/the-placeholder-attribute/multiline.html",
+     [
+      [
+       "/html/input/the-placeholder-attribute/multiline-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "html/rendering/bindings/the-button-element/button-type-menu-historical.html": [
     [
      "/html/rendering/bindings/the-button-element/button-type-menu-historical.html",
@@ -270716,6 +270788,16 @@
      {}
     ]
    ],
+   "html/form-elements/the-textarea-element/multiline-placeholder-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "html/form-elements/the-textarea-element/support/placeholder.css": [
+    [
+     {}
+    ]
+   ],
    "html/iana/.gitkeep": [
     [
      {}
@@ -271201,6 +271283,11 @@
      {}
     ]
    ],
+   "html/input/the-placeholder-attribute/multiline-ref.html": [
+    [
+     {}
+    ]
+   ],
    "html/introduction/.gitkeep": [
     [
      {}
@@ -374036,7 +374123,7 @@
    "support"
   ],
   "./lint.whitelist": [
-   "c98d76fc8405224098f23f8c129524d74397a6e1",
+   "f5aceb7c8acf5cd74c4c5b53e59cb3702b0f4485",
    "support"
   ],
   "./serve.py": [
@@ -404040,7 +404127,7 @@
    "testharness"
   ],
   "content-security-policy/securitypolicyviolation/idl.html": [
-   "5f2ff4a87aa476168cf3d13b10a8d81a387b8e42",
+   "fb8f2938d76a29cc68c46fb49a12feebc0031e54",
    "testharness"
   ],
   "content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html": [
@@ -404196,7 +404283,7 @@
    "testharness"
   ],
   "content-security-policy/style-src/style-src-imported-style-blocked.html": [
-   "e59517d75d3fbc29b701ffa296b7dd007a05c79d",
+   "a7d3453f54478b773e4d5702a7d83f0a38664f19",
    "testharness"
   ],
   "content-security-policy/style-src/style-src-injected-inline-style-allowed.html": [
@@ -538759,6 +538846,26 @@
    "175e662819cfcc1f528fd8c0e3ed149eeba02e70",
    "reftest"
   ],
+  "html/form-elements/the-textarea-element/multiline-placeholder-cr.html": [
+   "e8f7683568ad37b625fb32d97e80f4e15a9b6f66",
+   "reftest"
+  ],
+  "html/form-elements/the-textarea-element/multiline-placeholder-crlf.html": [
+   "e0fbe39e2376e17611ec89f6f9a1b79b912cfe1a",
+   "reftest"
+  ],
+  "html/form-elements/the-textarea-element/multiline-placeholder-ref.html": [
+   "69fe9939aea706500232485a2e105ae67fca6783",
+   "support"
+  ],
+  "html/form-elements/the-textarea-element/multiline-placeholder.html": [
+   "3372eef00fd32ced307dbfa63f4b5c9cc6363f94",
+   "reftest"
+  ],
+  "html/form-elements/the-textarea-element/support/placeholder.css": [
+   "3b200a40e2b7ba13f060772e821328db1de82cd0",
+   "support"
+  ],
   "html/iana/.gitkeep": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
@@ -539287,6 +539394,22 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
+  "html/input/the-placeholder-attribute/multiline-cr.html": [
+   "687054d9b221998ff4c4071ccc0733faeeb129b7",
+   "reftest"
+  ],
+  "html/input/the-placeholder-attribute/multiline-crlf.html": [
+   "f953c175dce74670a915534fb513feb960fb5152",
+   "reftest"
+  ],
+  "html/input/the-placeholder-attribute/multiline-ref.html": [
+   "e497f7bbe3359c11265619a439dc97756131e827",
+   "support"
+  ],
+  "html/input/the-placeholder-attribute/multiline.html": [
+   "bc7c64db1dfdb3084a7c3606005a41fd71a20a9b",
+   "reftest"
+  ],
   "html/introduction/.gitkeep": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
diff --git a/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-cr.html b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-cr.html
new file mode 100644
index 000000000000..8879ca464791
--- /dev/null
+++ b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-cr.html
@@ -0,0 +1 @@
+<!doctype html>
<html class="reftest-wait">
<meta charset="utf-8">
<title>textarea multiline placeholder (CR)</title>
<link rel="help" href="https://html.spec.whatwg.org/multipage/form-elements.html#attr-textarea-placeholder">
<meta name="assert" content="textarea element's placeholder preserves newlines (CR)">
<link rel="match" href="/html/form-elements/the-textarea-element/multiline-placeholder-ref.html">
<link rel="stylesheet" href="support/placeholder.css">
<textarea rows="5" placeholder="this is
a multiline

placeholder"></textarea>
<textarea rows="5" placeholder="this is&#xd;a multiline&#xd;&#xd;placeholder"></textarea>
<textarea rows="5" id="dynamic"></textarea>
<script>
  document.querySelector("#dynamic")
          .setAttribute("placeholder", "this is\ra multiline\r\rplaceholder");
  document.documentElement.classList.remove("reftest-wait");
</script>
</html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-crlf.html b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-crlf.html
new file mode 100644
index 000000000000..9632ef1bb6c2
--- /dev/null
+++ b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-crlf.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>textarea multiline placeholder (CRLF)</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/form-elements.html#attr-textarea-placeholder">
+<meta name="assert" content="textarea element's placeholder preserves newlines (CRLF)">
+<link rel="match" href="/html/form-elements/the-textarea-element/multiline-placeholder-ref.html">
+<link rel="stylesheet" href="support/placeholder.css">
+<textarea rows="5" placeholder="this is
+a multiline
+
+placeholder"></textarea>
+<textarea rows="5" placeholder="this is&#xd;&#xa;a multiline&#xd;&#xa;&#xd;&#xa;placeholder"></textarea>
+<textarea rows="5" id="dynamic"></textarea>
+<script>
+  document.querySelector("#dynamic")
+          .setAttribute("placeholder", "this is\r\na multiline\r\n\r\nplaceholder");
+  document.documentElement.classList.remove("reftest-wait");
+</script>
+</html>
+
diff --git a/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-ref.html b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-ref.html
new file mode 100644
index 000000000000..0234ed64c9ad
--- /dev/null
+++ b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder-ref.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<meta charset="utf-8">
+<link rel="stylesheet" href="support/placeholder.css">
+<textarea rows="5" class="placeholder">this is
+a multiline
+
+placeholder</textarea>
+<textarea rows="5" class="placeholder">this is
+a multiline
+
+placeholder</textarea>
+<textarea rows="5" class="placeholder">this is
+a multiline
+
+placeholder</textarea>
diff --git a/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder.html b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder.html
new file mode 100644
index 000000000000..00bb9696d1a4
--- /dev/null
+++ b/testing/web-platform/tests/html/form-elements/the-textarea-element/multiline-placeholder.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>textarea multiline placeholder</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/form-elements.html#attr-textarea-placeholder">
+<meta name="assert" content="textarea element's placeholder preserves newlines">
+<link rel="match" href="/html/form-elements/the-textarea-element/multiline-placeholder-ref.html">
+<link rel="stylesheet" href="support/placeholder.css">
+<textarea rows="5" placeholder="this is
+a multiline
+
+placeholder"></textarea>
+<textarea rows="5" placeholder="this is&#xa;a multiline&#xa;&#xa;placeholder"></textarea>
+<textarea rows="5" id="dynamic"></textarea>
+<script>
+  document.querySelector("#dynamic")
+          .setAttribute("placeholder", "this is\na multiline\n\nplaceholder");
+  document.documentElement.classList.remove("reftest-wait");
+</script>
+</html>
+
+
diff --git a/testing/web-platform/tests/html/form-elements/the-textarea-element/support/placeholder.css b/testing/web-platform/tests/html/form-elements/the-textarea-element/support/placeholder.css
new file mode 100644
index 000000000000..9aaed05c86ac
--- /dev/null
+++ b/testing/web-platform/tests/html/form-elements/the-textarea-element/support/placeholder.css
@@ -0,0 +1,6 @@
+textarea.placeholder,
+textarea::placeholder {
+  /* revert browser styling of the placeholder */
+  color: GrayText; /* blink/webkit use colour */
+  opacity: 1.0; /* gecko uses opacity */
+}
diff --git a/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-cr.html b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-cr.html
new file mode 100644
index 000000000000..4184ab2c5ce2
--- /dev/null
+++ b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-cr.html
@@ -0,0 +1 @@
+<!doctype html>
<html class="reftest-wait">
<meta charset="utf-8">
<title>input multiline placeholder (CRLF)</title>
<link rel="help" href="https://html.spec.whatwg.org/multipage/input.html#the-placeholder-attribute">
<meta name="assert" content="input element's placeholder strips newlines (CRLF)">
<link rel="match" href="/html/input/the-placeholder-attribute/multiline-ref.html">
<input placeholder="this is
a multiline

placeholder">
<input placeholder="this is&#xd;a multiline&#xd;&#xd;placeholder">
<input id="dynamic">
<script>
  document.querySelector("#dynamic")
          .setAttribute("placeholder", "this is\ra multiline\r\rplaceholder");
  document.documentElement.classList.remove("reftest-wait");
</script>
</html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-crlf.html b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-crlf.html
new file mode 100644
index 000000000000..50c91fbe35e5
--- /dev/null
+++ b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-crlf.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>input multiline placeholder (CRLF)</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/input.html#the-placeholder-attribute">
+<meta name="assert" content="input element's placeholder strips newlines (CRLF)">
+<link rel="match" href="/html/input/the-placeholder-attribute/multiline-ref.html">
+<input placeholder="this is
+a multiline
+
+placeholder">
+<input placeholder="this is&#xd;&#xa;a multiline&#xd;&#xa;&#xd;&#xa;placeholder">
+<input id="dynamic">
+<script>
+  document.querySelector("#dynamic")
+          .setAttribute("placeholder", "this is\r\na multiline\r\n\r\nplaceholder");
+  document.documentElement.classList.remove("reftest-wait");
+</script>
+</html>
diff --git a/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-ref.html b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-ref.html
new file mode 100644
index 000000000000..2812f86e1e6c
--- /dev/null
+++ b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline-ref.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<meta charset=utf-8>
+<input placeholder="this isa multilineplaceholder">
+<input placeholder="this isa multilineplaceholder">
+<input placeholder="this isa multilineplaceholder">
diff --git a/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline.html b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline.html
new file mode 100644
index 000000000000..2d7102bd4acd
--- /dev/null
+++ b/testing/web-platform/tests/html/input/the-placeholder-attribute/multiline.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>input multiline placeholder</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/input.html#the-placeholder-attribute">
+<meta name="assert" content="input element's placeholder strips newlines">
+<link rel="match" href="/html/input/the-placeholder-attribute/multiline-ref.html">
+<input placeholder="this is
+a multiline
+
+placeholder">
+<input placeholder="this is&#xa;a multiline&#xa;&#xa;placeholder">
+<input id="dynamic">
+<script>
+  document.querySelector("#dynamic")
+          .setAttribute("placeholder", "this is\na multiline\n\nplaceholder");
+  document.documentElement.classList.remove("reftest-wait");
+</script>
+</html>
diff --git a/testing/web-platform/tests/lint.whitelist b/testing/web-platform/tests/lint.whitelist
index baa67d143f2a..b8f8cf4c51da 100644
--- a/testing/web-platform/tests/lint.whitelist
+++ b/testing/web-platform/tests/lint.whitelist
@@ -97,6 +97,10 @@ AHEM COPY: css/vendor-imports/mozilla/mozilla-central-reftests/*/Ahem.ttf
 # Intentional use of CRLF
 CR AT EOL: WebIDL/valid/idl/documentation-dos.widl
 CR AT EOL: cors/resources/cors-headers.asis
+CR AT EOL: html/form-elements/the-textarea-element/multiline-placefolder-cr.html
+CR AT EOL: html/form-elements/the-textarea-element/multiline-placefolder-crlf.html
+CR AT EOL: html/input/the-placeholder-attribute/multiline-cr.html
+CR AT EOL: html/input/the-placeholder-attribute/multiline-crlf.html
 CR AT EOL: html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html
 CR AT EOL: webvtt/parsing/file-parsing/tests/support/newlines.vtt
 

From dd31a370eb6ff5afbea8f28d53f046ce7bf35762 Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Sat, 2 Dec 2017 10:03:16 -0600
Subject: [PATCH 120/219] servo: Merge #19436 - style: Support
 'shape-image-threshold' property (from aethanyc:shape-image-threshold);
 r=heycam

This has been reviewed in https://bugzilla.mozilla.org/show_bug.cgi?id=1265343

Source-Repo: https://github.com/servo/servo
Source-Revision: d198caa9ff9fc4e7210085576df189b7fbf56374

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : a22ad7503bfdaadd6bea511c3fdfeaa4e8f27a44
---
 .../style/gecko/generated/bindings.rs         | 584 ++++++++++++++++++
 .../style/gecko/generated/structs.rs          | 543 ++++++++--------
 .../style/properties/longhand/box.mako.rs     |   8 +
 3 files changed, 865 insertions(+), 270 deletions(-)

diff --git a/servo/components/style/gecko/generated/bindings.rs b/servo/components/style/gecko/generated/bindings.rs
index 0c2cfd5a9173..19e10c387155 100644
--- a/servo/components/style/gecko/generated/bindings.rs
+++ b/servo/components/style/gecko/generated/bindings.rs
@@ -424,1171 +424,1755 @@ enum RawServoRuleNodeVoid { }
 pub struct RawServoRuleNode(RawServoRuleNodeVoid);
 
 extern "C" {
+ # [ link_name = "\u{1}_Gecko_EnsureTArrayCapacity" ] 
  pub fn Gecko_EnsureTArrayCapacity ( aArray : * mut :: std :: os :: raw :: c_void , aCapacity : usize , aElementSize : usize , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ClearPODTArray" ] 
  pub fn Gecko_ClearPODTArray ( aArray : * mut :: std :: os :: raw :: c_void , aElementSize : usize , aElementAlign : usize , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_AddRef" ] 
  pub fn Servo_CssRules_AddRef ( ptr : ServoCssRulesBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_Release" ] 
  pub fn Servo_CssRules_Release ( ptr : ServoCssRulesBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSheetContents_AddRef" ] 
  pub fn Servo_StyleSheetContents_AddRef ( ptr : RawServoStyleSheetContentsBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSheetContents_Release" ] 
  pub fn Servo_StyleSheetContents_Release ( ptr : RawServoStyleSheetContentsBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_AddRef" ] 
  pub fn Servo_DeclarationBlock_AddRef ( ptr : RawServoDeclarationBlockBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_Release" ] 
  pub fn Servo_DeclarationBlock_Release ( ptr : RawServoDeclarationBlockBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleRule_AddRef" ] 
  pub fn Servo_StyleRule_AddRef ( ptr : RawServoStyleRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleRule_Release" ] 
  pub fn Servo_StyleRule_Release ( ptr : RawServoStyleRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ImportRule_AddRef" ] 
  pub fn Servo_ImportRule_AddRef ( ptr : RawServoImportRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ImportRule_Release" ] 
  pub fn Servo_ImportRule_Release ( ptr : RawServoImportRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValue_AddRef" ] 
  pub fn Servo_AnimationValue_AddRef ( ptr : RawServoAnimationValueBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValue_Release" ] 
  pub fn Servo_AnimationValue_Release ( ptr : RawServoAnimationValueBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Keyframe_AddRef" ] 
  pub fn Servo_Keyframe_AddRef ( ptr : RawServoKeyframeBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Keyframe_Release" ] 
  pub fn Servo_Keyframe_Release ( ptr : RawServoKeyframeBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_KeyframesRule_AddRef" ] 
  pub fn Servo_KeyframesRule_AddRef ( ptr : RawServoKeyframesRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_KeyframesRule_Release" ] 
  pub fn Servo_KeyframesRule_Release ( ptr : RawServoKeyframesRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaList_AddRef" ] 
  pub fn Servo_MediaList_AddRef ( ptr : RawServoMediaListBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaList_Release" ] 
  pub fn Servo_MediaList_Release ( ptr : RawServoMediaListBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaRule_AddRef" ] 
  pub fn Servo_MediaRule_AddRef ( ptr : RawServoMediaRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaRule_Release" ] 
  pub fn Servo_MediaRule_Release ( ptr : RawServoMediaRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_NamespaceRule_AddRef" ] 
  pub fn Servo_NamespaceRule_AddRef ( ptr : RawServoNamespaceRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_NamespaceRule_Release" ] 
  pub fn Servo_NamespaceRule_Release ( ptr : RawServoNamespaceRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_PageRule_AddRef" ] 
  pub fn Servo_PageRule_AddRef ( ptr : RawServoPageRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_PageRule_Release" ] 
  pub fn Servo_PageRule_Release ( ptr : RawServoPageRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SupportsRule_AddRef" ] 
  pub fn Servo_SupportsRule_AddRef ( ptr : RawServoSupportsRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SupportsRule_Release" ] 
  pub fn Servo_SupportsRule_Release ( ptr : RawServoSupportsRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DocumentRule_AddRef" ] 
  pub fn Servo_DocumentRule_AddRef ( ptr : RawServoDocumentRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DocumentRule_Release" ] 
  pub fn Servo_DocumentRule_Release ( ptr : RawServoDocumentRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_FontFeatureValuesRule_AddRef" ] 
  pub fn Servo_FontFeatureValuesRule_AddRef ( ptr : RawServoFontFeatureValuesRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_FontFeatureValuesRule_Release" ] 
  pub fn Servo_FontFeatureValuesRule_Release ( ptr : RawServoFontFeatureValuesRuleBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_RuleNode_AddRef" ] 
  pub fn Servo_RuleNode_AddRef ( ptr : RawServoRuleNodeBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_RuleNode_Release" ] 
  pub fn Servo_RuleNode_Release ( ptr : RawServoRuleNodeBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_Drop" ] 
  pub fn Servo_StyleSet_Drop ( ptr : RawServoStyleSetOwned , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SelectorList_Drop" ] 
  pub fn Servo_SelectorList_Drop ( ptr : RawServoSelectorListOwned , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SourceSizeList_Drop" ] 
  pub fn Servo_SourceSizeList_Drop ( ptr : RawServoSourceSizeListOwned , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_IsInDocument" ] 
  pub fn Gecko_IsInDocument ( node : RawGeckoNodeBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_FlattenedTreeParentIsParent" ] 
  pub fn Gecko_FlattenedTreeParentIsParent ( node : RawGeckoNodeBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_IsSignificantChild" ] 
  pub fn Gecko_IsSignificantChild ( node : RawGeckoNodeBorrowed , text_is_significant : bool , whitespace_is_significant : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetLastChild" ] 
  pub fn Gecko_GetLastChild ( node : RawGeckoNodeBorrowed , ) -> RawGeckoNodeBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetFlattenedTreeParentNode" ] 
  pub fn Gecko_GetFlattenedTreeParentNode ( node : RawGeckoNodeBorrowed , ) -> RawGeckoNodeBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetBeforeOrAfterPseudo" ] 
  pub fn Gecko_GetBeforeOrAfterPseudo ( element : RawGeckoElementBorrowed , is_before : bool , ) -> RawGeckoElementBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetAnonymousContentForElement" ] 
  pub fn Gecko_GetAnonymousContentForElement ( element : RawGeckoElementBorrowed , ) -> * mut nsTArray < * mut nsIContent > ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_DestroyAnonymousContentList" ] 
  pub fn Gecko_DestroyAnonymousContentList ( anon_content : * mut nsTArray < * mut nsIContent > , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ServoStyleContext_Init" ] 
  pub fn Gecko_ServoStyleContext_Init ( context : * mut ServoStyleContext , parent_context : ServoStyleContextBorrowedOrNull , pres_context : RawGeckoPresContextBorrowed , values : ServoComputedDataBorrowed , pseudo_type : CSSPseudoElementType , pseudo_tag : * mut nsAtom , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ServoStyleContext_Destroy" ] 
  pub fn Gecko_ServoStyleContext_Destroy ( context : * mut ServoStyleContext , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ConstructStyleChildrenIterator" ] 
  pub fn Gecko_ConstructStyleChildrenIterator ( aElement : RawGeckoElementBorrowed , aIterator : RawGeckoStyleChildrenIteratorBorrowedMut , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_DestroyStyleChildrenIterator" ] 
  pub fn Gecko_DestroyStyleChildrenIterator ( aIterator : RawGeckoStyleChildrenIteratorBorrowedMut , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetNextStyleChild" ] 
  pub fn Gecko_GetNextStyleChild ( it : RawGeckoStyleChildrenIteratorBorrowedMut , ) -> RawGeckoNodeBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_LoadStyleSheet" ] 
  pub fn Gecko_LoadStyleSheet ( loader : * mut Loader , parent : * mut ServoStyleSheet , reusable_sheets : * mut LoaderReusableStyleSheets , base_url_data : * mut RawGeckoURLExtraData , url_bytes : * const u8 , url_length : u32 , media_list : RawServoMediaListStrong , ) -> * mut ServoStyleSheet ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ElementState" ] 
  pub fn Gecko_ElementState ( element : RawGeckoElementBorrowed , ) -> u64 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_DocumentState" ] 
  pub fn Gecko_DocumentState ( aDocument : * const nsIDocument , ) -> u64 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_IsRootElement" ] 
  pub fn Gecko_IsRootElement ( element : RawGeckoElementBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_MatchesElement" ] 
  pub fn Gecko_MatchesElement ( type_ : CSSPseudoClassType , element : RawGeckoElementBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Namespace" ] 
  pub fn Gecko_Namespace ( element : RawGeckoElementBorrowed , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_MatchLang" ] 
  pub fn Gecko_MatchLang ( element : RawGeckoElementBorrowed , override_lang : * mut nsAtom , has_override_lang : bool , value : * const u16 , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetXMLLangValue" ] 
  pub fn Gecko_GetXMLLangValue ( element : RawGeckoElementBorrowed , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetDocumentLWTheme" ] 
  pub fn Gecko_GetDocumentLWTheme ( aDocument : * const nsIDocument , ) -> nsIDocument_DocumentTheme ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AtomAttrValue" ] 
  pub fn Gecko_AtomAttrValue ( element : RawGeckoElementBorrowed , attribute : * mut nsAtom , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_LangValue" ] 
  pub fn Gecko_LangValue ( element : RawGeckoElementBorrowed , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_HasAttr" ] 
  pub fn Gecko_HasAttr ( element : RawGeckoElementBorrowed , ns : * mut nsAtom , name : * mut nsAtom , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AttrEquals" ] 
  pub fn Gecko_AttrEquals ( element : RawGeckoElementBorrowed , ns : * mut nsAtom , name : * mut nsAtom , str : * mut nsAtom , ignoreCase : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AttrDashEquals" ] 
  pub fn Gecko_AttrDashEquals ( element : RawGeckoElementBorrowed , ns : * mut nsAtom , name : * mut nsAtom , str : * mut nsAtom , ignore_case : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AttrIncludes" ] 
  pub fn Gecko_AttrIncludes ( element : RawGeckoElementBorrowed , ns : * mut nsAtom , name : * mut nsAtom , str : * mut nsAtom , ignore_case : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AttrHasSubstring" ] 
  pub fn Gecko_AttrHasSubstring ( element : RawGeckoElementBorrowed , ns : * mut nsAtom , name : * mut nsAtom , str : * mut nsAtom , ignore_case : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AttrHasPrefix" ] 
  pub fn Gecko_AttrHasPrefix ( element : RawGeckoElementBorrowed , ns : * mut nsAtom , name : * mut nsAtom , str : * mut nsAtom , ignore_case : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AttrHasSuffix" ] 
  pub fn Gecko_AttrHasSuffix ( element : RawGeckoElementBorrowed , ns : * mut nsAtom , name : * mut nsAtom , str : * mut nsAtom , ignore_case : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ClassOrClassList" ] 
  pub fn Gecko_ClassOrClassList ( element : RawGeckoElementBorrowed , class_ : * mut * mut nsAtom , classList : * mut * mut * mut nsAtom , ) -> u32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SnapshotAtomAttrValue" ] 
  pub fn Gecko_SnapshotAtomAttrValue ( element : * const ServoElementSnapshot , attribute : * mut nsAtom , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SnapshotLangValue" ] 
  pub fn Gecko_SnapshotLangValue ( element : * const ServoElementSnapshot , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SnapshotHasAttr" ] 
  pub fn Gecko_SnapshotHasAttr ( element : * const ServoElementSnapshot , ns : * mut nsAtom , name : * mut nsAtom , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SnapshotAttrEquals" ] 
  pub fn Gecko_SnapshotAttrEquals ( element : * const ServoElementSnapshot , ns : * mut nsAtom , name : * mut nsAtom , str : * mut nsAtom , ignoreCase : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SnapshotAttrDashEquals" ] 
  pub fn Gecko_SnapshotAttrDashEquals ( element : * const ServoElementSnapshot , ns : * mut nsAtom , name : * mut nsAtom , str : * mut nsAtom , ignore_case : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SnapshotAttrIncludes" ] 
  pub fn Gecko_SnapshotAttrIncludes ( element : * const ServoElementSnapshot , ns : * mut nsAtom , name : * mut nsAtom , str : * mut nsAtom , ignore_case : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SnapshotAttrHasSubstring" ] 
  pub fn Gecko_SnapshotAttrHasSubstring ( element : * const ServoElementSnapshot , ns : * mut nsAtom , name : * mut nsAtom , str : * mut nsAtom , ignore_case : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SnapshotAttrHasPrefix" ] 
  pub fn Gecko_SnapshotAttrHasPrefix ( element : * const ServoElementSnapshot , ns : * mut nsAtom , name : * mut nsAtom , str : * mut nsAtom , ignore_case : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SnapshotAttrHasSuffix" ] 
  pub fn Gecko_SnapshotAttrHasSuffix ( element : * const ServoElementSnapshot , ns : * mut nsAtom , name : * mut nsAtom , str : * mut nsAtom , ignore_case : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SnapshotClassOrClassList" ] 
  pub fn Gecko_SnapshotClassOrClassList ( element : * const ServoElementSnapshot , class_ : * mut * mut nsAtom , classList : * mut * mut * mut nsAtom , ) -> u32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetStyleAttrDeclarationBlock" ] 
  pub fn Gecko_GetStyleAttrDeclarationBlock ( element : RawGeckoElementBorrowed , ) -> RawServoDeclarationBlockStrongBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_UnsetDirtyStyleAttr" ] 
  pub fn Gecko_UnsetDirtyStyleAttr ( element : RawGeckoElementBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetHTMLPresentationAttrDeclarationBlock" ] 
  pub fn Gecko_GetHTMLPresentationAttrDeclarationBlock ( element : RawGeckoElementBorrowed , ) -> RawServoDeclarationBlockStrongBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetExtraContentStyleDeclarations" ] 
  pub fn Gecko_GetExtraContentStyleDeclarations ( element : RawGeckoElementBorrowed , ) -> RawServoDeclarationBlockStrongBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetUnvisitedLinkAttrDeclarationBlock" ] 
  pub fn Gecko_GetUnvisitedLinkAttrDeclarationBlock ( element : RawGeckoElementBorrowed , ) -> RawServoDeclarationBlockStrongBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetVisitedLinkAttrDeclarationBlock" ] 
  pub fn Gecko_GetVisitedLinkAttrDeclarationBlock ( element : RawGeckoElementBorrowed , ) -> RawServoDeclarationBlockStrongBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetActiveLinkAttrDeclarationBlock" ] 
  pub fn Gecko_GetActiveLinkAttrDeclarationBlock ( element : RawGeckoElementBorrowed , ) -> RawServoDeclarationBlockStrongBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_IsPrivateBrowsingEnabled" ] 
  pub fn Gecko_IsPrivateBrowsingEnabled ( aDoc : * const nsIDocument , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetAnimationRule" ] 
  pub fn Gecko_GetAnimationRule ( aElementOrPseudo : RawGeckoElementBorrowed , aCascadeLevel : EffectCompositor_CascadeLevel , aAnimationValues : RawServoAnimationValueMapBorrowedMut , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetSMILOverrideDeclarationBlock" ] 
  pub fn Gecko_GetSMILOverrideDeclarationBlock ( element : RawGeckoElementBorrowed , ) -> RawServoDeclarationBlockStrongBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_StyleAnimationsEquals" ] 
  pub fn Gecko_StyleAnimationsEquals ( arg1 : RawGeckoStyleAnimationListBorrowed , arg2 : RawGeckoStyleAnimationListBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyAnimationNames" ] 
  pub fn Gecko_CopyAnimationNames ( aDest : RawGeckoStyleAnimationListBorrowedMut , aSrc : RawGeckoStyleAnimationListBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetAnimationName" ] 
  pub fn Gecko_SetAnimationName ( aStyleAnimation : * mut StyleAnimation , aAtom : * mut nsAtom , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_UpdateAnimations" ] 
  pub fn Gecko_UpdateAnimations ( aElementOrPseudo : RawGeckoElementBorrowed , aOldComputedValues : ServoStyleContextBorrowedOrNull , aComputedValues : ServoStyleContextBorrowedOrNull , aTasks : UpdateAnimationsTasks , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ElementHasAnimations" ] 
  pub fn Gecko_ElementHasAnimations ( aElementOrPseudo : RawGeckoElementBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ElementHasCSSAnimations" ] 
  pub fn Gecko_ElementHasCSSAnimations ( aElementOrPseudo : RawGeckoElementBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ElementHasCSSTransitions" ] 
  pub fn Gecko_ElementHasCSSTransitions ( aElementOrPseudo : RawGeckoElementBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ElementTransitions_Length" ] 
  pub fn Gecko_ElementTransitions_Length ( aElementOrPseudo : RawGeckoElementBorrowed , ) -> usize ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ElementTransitions_PropertyAt" ] 
  pub fn Gecko_ElementTransitions_PropertyAt ( aElementOrPseudo : RawGeckoElementBorrowed , aIndex : usize , ) -> nsCSSPropertyID ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ElementTransitions_EndValueAt" ] 
  pub fn Gecko_ElementTransitions_EndValueAt ( aElementOrPseudo : RawGeckoElementBorrowed , aIndex : usize , ) -> RawServoAnimationValueBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetProgressFromComputedTiming" ] 
  pub fn Gecko_GetProgressFromComputedTiming ( aComputedTiming : RawGeckoComputedTimingBorrowed , ) -> f64 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetPositionInSegment" ] 
  pub fn Gecko_GetPositionInSegment ( aSegment : RawGeckoAnimationPropertySegmentBorrowed , aProgress : f64 , aBeforeFlag : ComputedTimingFunction_BeforeFlag , ) -> f64 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AnimationGetBaseStyle" ] 
  pub fn Gecko_AnimationGetBaseStyle ( aBaseStyles : RawServoAnimationValueTableBorrowed , aProperty : nsCSSPropertyID , ) -> RawServoAnimationValueBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_StyleTransition_SetUnsupportedProperty" ] 
  pub fn Gecko_StyleTransition_SetUnsupportedProperty ( aTransition : * mut StyleTransition , aAtom : * mut nsAtom , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Atomize" ] 
  pub fn Gecko_Atomize ( aString : * const :: std :: os :: raw :: c_char , aLength : u32 , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Atomize16" ] 
  pub fn Gecko_Atomize16 ( aString : * const nsAString , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AddRefAtom" ] 
  pub fn Gecko_AddRefAtom ( aAtom : * mut nsAtom , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ReleaseAtom" ] 
  pub fn Gecko_ReleaseAtom ( aAtom : * mut nsAtom , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetAtomAsUTF16" ] 
  pub fn Gecko_GetAtomAsUTF16 ( aAtom : * mut nsAtom , aLength : * mut u32 , ) -> * const u16 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AtomEqualsUTF8" ] 
  pub fn Gecko_AtomEqualsUTF8 ( aAtom : * mut nsAtom , aString : * const :: std :: os :: raw :: c_char , aLength : u32 , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AtomEqualsUTF8IgnoreCase" ] 
  pub fn Gecko_AtomEqualsUTF8IgnoreCase ( aAtom : * mut nsAtom , aString : * const :: std :: os :: raw :: c_char , aLength : u32 , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_EnsureMozBorderColors" ] 
  pub fn Gecko_EnsureMozBorderColors ( aBorder : * mut nsStyleBorder , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyFontFamilyFrom" ] 
  pub fn Gecko_CopyFontFamilyFrom ( dst : * mut nsFont , src : * const nsFont , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsTArray_FontFamilyName_AppendNamed" ] 
  pub fn Gecko_nsTArray_FontFamilyName_AppendNamed ( aNames : * mut nsTArray < FontFamilyName > , aName : * mut nsAtom , aQuoted : bool , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsTArray_FontFamilyName_AppendGeneric" ] 
  pub fn Gecko_nsTArray_FontFamilyName_AppendGeneric ( aNames : * mut nsTArray < FontFamilyName > , aType : FontFamilyType , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SharedFontList_Create" ] 
  pub fn Gecko_SharedFontList_Create ( ) -> * mut SharedFontList ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SharedFontList_SizeOfIncludingThis" ] 
  pub fn Gecko_SharedFontList_SizeOfIncludingThis ( fontlist : * mut SharedFontList , ) -> usize ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SharedFontList_SizeOfIncludingThisIfUnshared" ] 
  pub fn Gecko_SharedFontList_SizeOfIncludingThisIfUnshared ( fontlist : * mut SharedFontList , ) -> usize ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AddRefSharedFontListArbitraryThread" ] 
  pub fn Gecko_AddRefSharedFontListArbitraryThread ( aPtr : * mut SharedFontList , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ReleaseSharedFontListArbitraryThread" ] 
  pub fn Gecko_ReleaseSharedFontListArbitraryThread ( aPtr : * mut SharedFontList , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsFont_InitSystem" ] 
  pub fn Gecko_nsFont_InitSystem ( dst : * mut nsFont , font_id : i32 , font : * const nsStyleFont , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsFont_Destroy" ] 
  pub fn Gecko_nsFont_Destroy ( dst : * mut nsFont , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ConstructFontFeatureValueSet" ] 
  pub fn Gecko_ConstructFontFeatureValueSet ( ) -> * mut gfxFontFeatureValueSet ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AppendFeatureValueHashEntry" ] 
  pub fn Gecko_AppendFeatureValueHashEntry ( value_set : * mut gfxFontFeatureValueSet , family : * mut nsAtom , alternate : u32 , name : * mut nsAtom , ) -> * mut nsTArray < :: std :: os :: raw :: c_uint > ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsFont_SetFontFeatureValuesLookup" ] 
  pub fn Gecko_nsFont_SetFontFeatureValuesLookup ( font : * mut nsFont , pres_context : * const RawGeckoPresContext , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsFont_ResetFontFeatureValuesLookup" ] 
  pub fn Gecko_nsFont_ResetFontFeatureValuesLookup ( font : * mut nsFont , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ClearAlternateValues" ] 
  pub fn Gecko_ClearAlternateValues ( font : * mut nsFont , length : usize , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AppendAlternateValues" ] 
  pub fn Gecko_AppendAlternateValues ( font : * mut nsFont , alternate_name : u32 , atom : * mut nsAtom , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyAlternateValuesFrom" ] 
  pub fn Gecko_CopyAlternateValuesFrom ( dest : * mut nsFont , src : * const nsFont , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetImageOrientation" ] 
  pub fn Gecko_SetImageOrientation ( aVisibility : * mut nsStyleVisibility , aOrientation : u8 , aFlip : bool , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetImageOrientationAsFromImage" ] 
  pub fn Gecko_SetImageOrientationAsFromImage ( aVisibility : * mut nsStyleVisibility , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyImageOrientationFrom" ] 
  pub fn Gecko_CopyImageOrientationFrom ( aDst : * mut nsStyleVisibility , aSrc : * const nsStyleVisibility , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetCounterStyleToName" ] 
  pub fn Gecko_SetCounterStyleToName ( ptr : * mut CounterStylePtr , name : * mut nsAtom , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetCounterStyleToSymbols" ] 
  pub fn Gecko_SetCounterStyleToSymbols ( ptr : * mut CounterStylePtr , symbols_type : u8 , symbols : * const * const nsACString , symbols_count : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetCounterStyleToString" ] 
  pub fn Gecko_SetCounterStyleToString ( ptr : * mut CounterStylePtr , symbol : * const nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyCounterStyle" ] 
  pub fn Gecko_CopyCounterStyle ( dst : * mut CounterStylePtr , src : * const CounterStylePtr , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CounterStyle_GetName" ] 
  pub fn Gecko_CounterStyle_GetName ( ptr : * const CounterStylePtr , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CounterStyle_GetAnonymous" ] 
  pub fn Gecko_CounterStyle_GetAnonymous ( ptr : * const CounterStylePtr , ) -> * const AnonymousCounterStyle ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetNullImageValue" ] 
  pub fn Gecko_SetNullImageValue ( image : * mut nsStyleImage , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetGradientImageValue" ] 
  pub fn Gecko_SetGradientImageValue ( image : * mut nsStyleImage , gradient : * mut nsStyleGradient , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AddRefImageValueArbitraryThread" ] 
  pub fn Gecko_AddRefImageValueArbitraryThread ( aPtr : * mut ImageValue , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ReleaseImageValueArbitraryThread" ] 
  pub fn Gecko_ReleaseImageValueArbitraryThread ( aPtr : * mut ImageValue , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ImageValue_Create" ] 
  pub fn Gecko_ImageValue_Create ( aURI : ServoBundledURI , aURIString : ServoRawOffsetArc < RustString > , ) -> * mut ImageValue ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ImageValue_SizeOfIncludingThis" ] 
  pub fn Gecko_ImageValue_SizeOfIncludingThis ( aImageValue : * mut ImageValue , ) -> usize ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetLayerImageImageValue" ] 
  pub fn Gecko_SetLayerImageImageValue ( image : * mut nsStyleImage , aImageValue : * mut ImageValue , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetImageElement" ] 
  pub fn Gecko_SetImageElement ( image : * mut nsStyleImage , atom : * mut nsAtom , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyImageValueFrom" ] 
  pub fn Gecko_CopyImageValueFrom ( image : * mut nsStyleImage , other : * const nsStyleImage , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_InitializeImageCropRect" ] 
  pub fn Gecko_InitializeImageCropRect ( image : * mut nsStyleImage , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CreateGradient" ] 
  pub fn Gecko_CreateGradient ( shape : u8 , size : u8 , repeating : bool , legacy_syntax : bool , moz_legacy_syntax : bool , stops : u32 , ) -> * mut nsStyleGradient ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetURLValue" ] 
  pub fn Gecko_GetURLValue ( image : * const nsStyleImage , ) -> * const URLValueData ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetImageElement" ] 
  pub fn Gecko_GetImageElement ( image : * const nsStyleImage , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetGradientImageValue" ] 
  pub fn Gecko_GetGradientImageValue ( image : * const nsStyleImage , ) -> * const nsStyleGradient ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetListStyleImageNone" ] 
  pub fn Gecko_SetListStyleImageNone ( style_struct : * mut nsStyleList , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetListStyleImageImageValue" ] 
  pub fn Gecko_SetListStyleImageImageValue ( style_struct : * mut nsStyleList , aImageValue : * mut ImageValue , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyListStyleImageFrom" ] 
  pub fn Gecko_CopyListStyleImageFrom ( dest : * mut nsStyleList , src : * const nsStyleList , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetCursorArrayLength" ] 
  pub fn Gecko_SetCursorArrayLength ( ui : * mut nsStyleUserInterface , len : usize , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetCursorImageValue" ] 
  pub fn Gecko_SetCursorImageValue ( aCursor : * mut nsCursorImage , aImageValue : * mut ImageValue , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyCursorArrayFrom" ] 
  pub fn Gecko_CopyCursorArrayFrom ( dest : * mut nsStyleUserInterface , src : * const nsStyleUserInterface , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetContentDataImageValue" ] 
  pub fn Gecko_SetContentDataImageValue ( aList : * mut nsStyleContentData , aImageValue : * mut ImageValue , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetCounterFunction" ] 
  pub fn Gecko_SetCounterFunction ( content_data : * mut nsStyleContentData , type_ : nsStyleContentType , ) -> * mut nsStyleContentData_CounterFunction ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetNodeFlags" ] 
  pub fn Gecko_SetNodeFlags ( node : RawGeckoNodeBorrowed , flags : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_UnsetNodeFlags" ] 
  pub fn Gecko_UnsetNodeFlags ( node : RawGeckoNodeBorrowed , flags : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_NoteDirtyElement" ] 
  pub fn Gecko_NoteDirtyElement ( element : RawGeckoElementBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_NoteDirtySubtreeForInvalidation" ] 
  pub fn Gecko_NoteDirtySubtreeForInvalidation ( element : RawGeckoElementBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_NoteAnimationOnlyDirtyElement" ] 
  pub fn Gecko_NoteAnimationOnlyDirtyElement ( element : RawGeckoElementBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetImplementedPseudo" ] 
  pub fn Gecko_GetImplementedPseudo ( element : RawGeckoElementBorrowed , ) -> CSSPseudoElementType ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CalcStyleDifference" ] 
  pub fn Gecko_CalcStyleDifference ( old_style : ServoStyleContextBorrowed , new_style : ServoStyleContextBorrowed , any_style_changed : * mut bool , reset_only_changed : * mut bool , ) -> u32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetElementSnapshot" ] 
  pub fn Gecko_GetElementSnapshot ( table : * const ServoElementSnapshotTable , element : RawGeckoElementBorrowed , ) -> * const ServoElementSnapshot ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_DropElementSnapshot" ] 
  pub fn Gecko_DropElementSnapshot ( snapshot : ServoElementSnapshotOwned , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_HaveSeenPtr" ] 
  pub fn Gecko_HaveSeenPtr ( table : * mut SeenPtrs , ptr : * const :: std :: os :: raw :: c_void , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ResizeTArrayForStrings" ] 
  pub fn Gecko_ResizeTArrayForStrings ( array : * mut nsTArray <nsStringRepr> , length : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetStyleGridTemplate" ] 
  pub fn Gecko_SetStyleGridTemplate ( grid_template : * mut UniquePtr < nsStyleGridTemplate > , value : * mut nsStyleGridTemplate , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CreateStyleGridTemplate" ] 
  pub fn Gecko_CreateStyleGridTemplate ( track_sizes : u32 , name_size : u32 , ) -> * mut nsStyleGridTemplate ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyStyleGridTemplateValues" ] 
  pub fn Gecko_CopyStyleGridTemplateValues ( grid_template : * mut UniquePtr < nsStyleGridTemplate > , other : * const nsStyleGridTemplate , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_NewGridTemplateAreasValue" ] 
  pub fn Gecko_NewGridTemplateAreasValue ( areas : u32 , templates : u32 , columns : u32 , ) -> * mut GridTemplateAreasValue ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AddRefGridTemplateAreasValueArbitraryThread" ] 
  pub fn Gecko_AddRefGridTemplateAreasValueArbitraryThread ( aPtr : * mut GridTemplateAreasValue , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ReleaseGridTemplateAreasValueArbitraryThread" ] 
  pub fn Gecko_ReleaseGridTemplateAreasValueArbitraryThread ( aPtr : * mut GridTemplateAreasValue , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ClearAndResizeStyleContents" ] 
  pub fn Gecko_ClearAndResizeStyleContents ( content : * mut nsStyleContent , how_many : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ClearAndResizeCounterIncrements" ] 
  pub fn Gecko_ClearAndResizeCounterIncrements ( content : * mut nsStyleContent , how_many : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ClearAndResizeCounterResets" ] 
  pub fn Gecko_ClearAndResizeCounterResets ( content : * mut nsStyleContent , how_many : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyStyleContentsFrom" ] 
  pub fn Gecko_CopyStyleContentsFrom ( content : * mut nsStyleContent , other : * const nsStyleContent , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyCounterResetsFrom" ] 
  pub fn Gecko_CopyCounterResetsFrom ( content : * mut nsStyleContent , other : * const nsStyleContent , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyCounterIncrementsFrom" ] 
  pub fn Gecko_CopyCounterIncrementsFrom ( content : * mut nsStyleContent , other : * const nsStyleContent , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_EnsureImageLayersLength" ] 
  pub fn Gecko_EnsureImageLayersLength ( layers : * mut nsStyleImageLayers , len : usize , layer_type : nsStyleImageLayers_LayerType , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_EnsureStyleAnimationArrayLength" ] 
  pub fn Gecko_EnsureStyleAnimationArrayLength ( array : * mut :: std :: os :: raw :: c_void , len : usize , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_EnsureStyleTransitionArrayLength" ] 
  pub fn Gecko_EnsureStyleTransitionArrayLength ( array : * mut :: std :: os :: raw :: c_void , len : usize , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ClearWillChange" ] 
  pub fn Gecko_ClearWillChange ( display : * mut nsStyleDisplay , length : usize , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AppendWillChange" ] 
  pub fn Gecko_AppendWillChange ( display : * mut nsStyleDisplay , atom : * mut nsAtom , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyWillChangeFrom" ] 
  pub fn Gecko_CopyWillChangeFrom ( dest : * mut nsStyleDisplay , src : * mut nsStyleDisplay , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetOrCreateKeyframeAtStart" ] 
  pub fn Gecko_GetOrCreateKeyframeAtStart ( keyframes : RawGeckoKeyframeListBorrowedMut , offset : f32 , timingFunction : * const nsTimingFunction , ) -> * mut Keyframe ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetOrCreateInitialKeyframe" ] 
  pub fn Gecko_GetOrCreateInitialKeyframe ( keyframes : RawGeckoKeyframeListBorrowedMut , timingFunction : * const nsTimingFunction , ) -> * mut Keyframe ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetOrCreateFinalKeyframe" ] 
  pub fn Gecko_GetOrCreateFinalKeyframe ( keyframes : RawGeckoKeyframeListBorrowedMut , timingFunction : * const nsTimingFunction , ) -> * mut Keyframe ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AppendPropertyValuePair" ] 
  pub fn Gecko_AppendPropertyValuePair ( aProperties : RawGeckoPropertyValuePairListBorrowedMut , aProperty : nsCSSPropertyID , ) -> * mut PropertyValuePair ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ResetStyleCoord" ] 
  pub fn Gecko_ResetStyleCoord ( unit : * mut nsStyleUnit , value : * mut nsStyleUnion , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetStyleCoordCalcValue" ] 
  pub fn Gecko_SetStyleCoordCalcValue ( unit : * mut nsStyleUnit , value : * mut nsStyleUnion , calc : nsStyleCoord_CalcValue , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyShapeSourceFrom" ] 
  pub fn Gecko_CopyShapeSourceFrom ( dst : * mut StyleShapeSource , src : * const StyleShapeSource , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_DestroyShapeSource" ] 
  pub fn Gecko_DestroyShapeSource ( shape : * mut StyleShapeSource , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_NewBasicShape" ] 
  pub fn Gecko_NewBasicShape ( shape : * mut StyleShapeSource , type_ : StyleBasicShapeType , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_NewShapeImage" ] 
  pub fn Gecko_NewShapeImage ( shape : * mut StyleShapeSource , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_StyleShapeSource_SetURLValue" ] 
  pub fn Gecko_StyleShapeSource_SetURLValue ( shape : * mut StyleShapeSource , uri : ServoBundledURI , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ResetFilters" ] 
  pub fn Gecko_ResetFilters ( effects : * mut nsStyleEffects , new_len : usize , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyFiltersFrom" ] 
  pub fn Gecko_CopyFiltersFrom ( aSrc : * mut nsStyleEffects , aDest : * mut nsStyleEffects , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleFilter_SetURLValue" ] 
  pub fn Gecko_nsStyleFilter_SetURLValue ( effects : * mut nsStyleFilter , uri : ServoBundledURI , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleSVGPaint_CopyFrom" ] 
  pub fn Gecko_nsStyleSVGPaint_CopyFrom ( dest : * mut nsStyleSVGPaint , src : * const nsStyleSVGPaint , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleSVGPaint_SetURLValue" ] 
  pub fn Gecko_nsStyleSVGPaint_SetURLValue ( paint : * mut nsStyleSVGPaint , uri : ServoBundledURI , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleSVGPaint_Reset" ] 
  pub fn Gecko_nsStyleSVGPaint_Reset ( paint : * mut nsStyleSVGPaint , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleSVG_SetDashArrayLength" ] 
  pub fn Gecko_nsStyleSVG_SetDashArrayLength ( svg : * mut nsStyleSVG , len : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleSVG_CopyDashArray" ] 
  pub fn Gecko_nsStyleSVG_CopyDashArray ( dst : * mut nsStyleSVG , src : * const nsStyleSVG , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleSVG_SetContextPropertiesLength" ] 
  pub fn Gecko_nsStyleSVG_SetContextPropertiesLength ( svg : * mut nsStyleSVG , len : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleSVG_CopyContextProperties" ] 
  pub fn Gecko_nsStyleSVG_CopyContextProperties ( dst : * mut nsStyleSVG , src : * const nsStyleSVG , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_NewURLValue" ] 
  pub fn Gecko_NewURLValue ( uri : ServoBundledURI , ) -> * mut URLValue ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AddRefCSSURLValueArbitraryThread" ] 
  pub fn Gecko_AddRefCSSURLValueArbitraryThread ( aPtr : * mut URLValue , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ReleaseCSSURLValueArbitraryThread" ] 
  pub fn Gecko_ReleaseCSSURLValueArbitraryThread ( aPtr : * mut URLValue , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AddRefURLExtraDataArbitraryThread" ] 
  pub fn Gecko_AddRefURLExtraDataArbitraryThread ( aPtr : * mut RawGeckoURLExtraData , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ReleaseURLExtraDataArbitraryThread" ] 
  pub fn Gecko_ReleaseURLExtraDataArbitraryThread ( aPtr : * mut RawGeckoURLExtraData , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_FillAllImageLayers" ] 
  pub fn Gecko_FillAllImageLayers ( layers : * mut nsStyleImageLayers , max_len : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AddRefCalcArbitraryThread" ] 
  pub fn Gecko_AddRefCalcArbitraryThread ( aPtr : * mut nsStyleCoord_Calc , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ReleaseCalcArbitraryThread" ] 
  pub fn Gecko_ReleaseCalcArbitraryThread ( aPtr : * mut nsStyleCoord_Calc , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_NewCSSShadowArray" ] 
  pub fn Gecko_NewCSSShadowArray ( len : u32 , ) -> * mut nsCSSShadowArray ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AddRefCSSShadowArrayArbitraryThread" ] 
  pub fn Gecko_AddRefCSSShadowArrayArbitraryThread ( aPtr : * mut nsCSSShadowArray , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ReleaseCSSShadowArrayArbitraryThread" ] 
  pub fn Gecko_ReleaseCSSShadowArrayArbitraryThread ( aPtr : * mut nsCSSShadowArray , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_NewStyleQuoteValues" ] 
  pub fn Gecko_NewStyleQuoteValues ( len : u32 , ) -> * mut nsStyleQuoteValues ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AddRefQuoteValuesArbitraryThread" ] 
  pub fn Gecko_AddRefQuoteValuesArbitraryThread ( aPtr : * mut nsStyleQuoteValues , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ReleaseQuoteValuesArbitraryThread" ] 
  pub fn Gecko_ReleaseQuoteValuesArbitraryThread ( aPtr : * mut nsStyleQuoteValues , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_NewCSSValueSharedList" ] 
  pub fn Gecko_NewCSSValueSharedList ( len : u32 , ) -> * mut nsCSSValueSharedList ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_NewNoneTransform" ] 
  pub fn Gecko_NewNoneTransform ( ) -> * mut nsCSSValueSharedList ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_GetArrayItem" ] 
  pub fn Gecko_CSSValue_GetArrayItem ( css_value : nsCSSValueBorrowedMut , index : i32 , ) -> nsCSSValueBorrowedMut ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_GetArrayItemConst" ] 
  pub fn Gecko_CSSValue_GetArrayItemConst ( css_value : nsCSSValueBorrowed , index : i32 , ) -> nsCSSValueBorrowed ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_GetKeyword" ] 
  pub fn Gecko_CSSValue_GetKeyword ( aCSSValue : nsCSSValueBorrowed , ) -> nsCSSKeyword ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_GetNumber" ] 
  pub fn Gecko_CSSValue_GetNumber ( css_value : nsCSSValueBorrowed , ) -> f32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_GetPercentage" ] 
  pub fn Gecko_CSSValue_GetPercentage ( css_value : nsCSSValueBorrowed , ) -> f32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_GetCalc" ] 
  pub fn Gecko_CSSValue_GetCalc ( aCSSValue : nsCSSValueBorrowed , ) -> nsStyleCoord_CalcValue ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetNumber" ] 
  pub fn Gecko_CSSValue_SetNumber ( css_value : nsCSSValueBorrowedMut , number : f32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetKeyword" ] 
  pub fn Gecko_CSSValue_SetKeyword ( css_value : nsCSSValueBorrowedMut , keyword : nsCSSKeyword , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetPercentage" ] 
  pub fn Gecko_CSSValue_SetPercentage ( css_value : nsCSSValueBorrowedMut , percent : f32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetPixelLength" ] 
  pub fn Gecko_CSSValue_SetPixelLength ( aCSSValue : nsCSSValueBorrowedMut , aLen : f32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetCalc" ] 
  pub fn Gecko_CSSValue_SetCalc ( css_value : nsCSSValueBorrowedMut , calc : nsStyleCoord_CalcValue , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetFunction" ] 
  pub fn Gecko_CSSValue_SetFunction ( css_value : nsCSSValueBorrowedMut , len : i32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetString" ] 
  pub fn Gecko_CSSValue_SetString ( css_value : nsCSSValueBorrowedMut , string : * const u8 , len : u32 , unit : nsCSSUnit , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetStringFromAtom" ] 
  pub fn Gecko_CSSValue_SetStringFromAtom ( css_value : nsCSSValueBorrowedMut , atom : * mut nsAtom , unit : nsCSSUnit , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetAtomIdent" ] 
  pub fn Gecko_CSSValue_SetAtomIdent ( css_value : nsCSSValueBorrowedMut , atom : * mut nsAtom , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetArray" ] 
  pub fn Gecko_CSSValue_SetArray ( css_value : nsCSSValueBorrowedMut , len : i32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetURL" ] 
  pub fn Gecko_CSSValue_SetURL ( css_value : nsCSSValueBorrowedMut , uri : ServoBundledURI , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetInt" ] 
  pub fn Gecko_CSSValue_SetInt ( css_value : nsCSSValueBorrowedMut , integer : i32 , unit : nsCSSUnit , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetPair" ] 
  pub fn Gecko_CSSValue_SetPair ( css_value : nsCSSValueBorrowedMut , xvalue : nsCSSValueBorrowed , yvalue : nsCSSValueBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetList" ] 
  pub fn Gecko_CSSValue_SetList ( css_value : nsCSSValueBorrowedMut , len : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_SetPairList" ] 
  pub fn Gecko_CSSValue_SetPairList ( css_value : nsCSSValueBorrowedMut , len : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_InitSharedList" ] 
  pub fn Gecko_CSSValue_InitSharedList ( css_value : nsCSSValueBorrowedMut , len : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSValue_Drop" ] 
  pub fn Gecko_CSSValue_Drop ( css_value : nsCSSValueBorrowedMut , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AddRefCSSValueSharedListArbitraryThread" ] 
  pub fn Gecko_AddRefCSSValueSharedListArbitraryThread ( aPtr : * mut nsCSSValueSharedList , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ReleaseCSSValueSharedListArbitraryThread" ] 
  pub fn Gecko_ReleaseCSSValueSharedListArbitraryThread ( aPtr : * mut nsCSSValueSharedList , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleFont_SetLang" ] 
  pub fn Gecko_nsStyleFont_SetLang ( font : * mut nsStyleFont , atom : * mut nsAtom , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleFont_CopyLangFrom" ] 
  pub fn Gecko_nsStyleFont_CopyLangFrom ( aFont : * mut nsStyleFont , aSource : * const nsStyleFont , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleFont_FixupNoneGeneric" ] 
  pub fn Gecko_nsStyleFont_FixupNoneGeneric ( font : * mut nsStyleFont , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleFont_PrefillDefaultForGeneric" ] 
  pub fn Gecko_nsStyleFont_PrefillDefaultForGeneric ( font : * mut nsStyleFont , pres_context : RawGeckoPresContextBorrowed , generic_id : u8 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_nsStyleFont_FixupMinFontSize" ] 
  pub fn Gecko_nsStyleFont_FixupMinFontSize ( font : * mut nsStyleFont , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetBaseSize" ] 
  pub fn Gecko_GetBaseSize ( lang : * mut nsAtom , ) -> FontSizePrefs ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetBindingParent" ] 
  pub fn Gecko_GetBindingParent ( aElement : RawGeckoElementBorrowed , ) -> RawGeckoElementBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetXBLBinding" ] 
  pub fn Gecko_GetXBLBinding ( aElement : RawGeckoElementBorrowed , ) -> RawGeckoXBLBindingBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_XBLBinding_GetRawServoStyleSet" ] 
  pub fn Gecko_XBLBinding_GetRawServoStyleSet ( aXBLBinding : RawGeckoXBLBindingBorrowed , ) -> RawServoStyleSetBorrowedOrNull ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_XBLBinding_InheritsStyle" ] 
  pub fn Gecko_XBLBinding_InheritsStyle ( aXBLBinding : RawGeckoXBLBindingBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetFontMetrics" ] 
  pub fn Gecko_GetFontMetrics ( pres_context : RawGeckoPresContextBorrowed , is_vertical : bool , font : * const nsStyleFont , font_size : nscoord , use_user_font_set : bool , ) -> GeckoFontMetrics ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetAppUnitsPerPhysicalInch" ] 
  pub fn Gecko_GetAppUnitsPerPhysicalInch ( pres_context : RawGeckoPresContextBorrowed , ) -> i32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_StyleSheet_Clone" ] 
  pub fn Gecko_StyleSheet_Clone ( aSheet : * const ServoStyleSheet , aNewParentSheet : * const ServoStyleSheet , ) -> * mut ServoStyleSheet ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_StyleSheet_AddRef" ] 
  pub fn Gecko_StyleSheet_AddRef ( aSheet : * const ServoStyleSheet , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_StyleSheet_Release" ] 
  pub fn Gecko_StyleSheet_Release ( aSheet : * const ServoStyleSheet , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_LookupCSSKeyword" ] 
  pub fn Gecko_LookupCSSKeyword ( string : * const u8 , len : u32 , ) -> nsCSSKeyword ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSKeywordString" ] 
  pub fn Gecko_CSSKeywordString ( keyword : nsCSSKeyword , len : * mut u32 , ) -> * const :: std :: os :: raw :: c_char ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSFontFaceRule_Create" ] 
  pub fn Gecko_CSSFontFaceRule_Create ( line : u32 , column : u32 , ) -> * mut nsCSSFontFaceRule ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSFontFaceRule_Clone" ] 
  pub fn Gecko_CSSFontFaceRule_Clone ( rule : * const nsCSSFontFaceRule , ) -> * mut nsCSSFontFaceRule ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSFontFaceRule_GetCssText" ] 
  pub fn Gecko_CSSFontFaceRule_GetCssText ( rule : * const nsCSSFontFaceRule , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSFontFaceRule_AddRef" ] 
  pub fn Gecko_CSSFontFaceRule_AddRef ( aPtr : * mut nsCSSFontFaceRule , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSFontFaceRule_Release" ] 
  pub fn Gecko_CSSFontFaceRule_Release ( aPtr : * mut nsCSSFontFaceRule , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSCounterStyle_Create" ] 
  pub fn Gecko_CSSCounterStyle_Create ( name : * mut nsAtom , ) -> * mut nsCSSCounterStyleRule ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSCounterStyle_Clone" ] 
  pub fn Gecko_CSSCounterStyle_Clone ( rule : * const nsCSSCounterStyleRule , ) -> * mut nsCSSCounterStyleRule ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSCounterStyle_GetCssText" ] 
  pub fn Gecko_CSSCounterStyle_GetCssText ( rule : * const nsCSSCounterStyleRule , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSCounterStyleRule_AddRef" ] 
  pub fn Gecko_CSSCounterStyleRule_AddRef ( aPtr : * mut nsCSSCounterStyleRule , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CSSCounterStyleRule_Release" ] 
  pub fn Gecko_CSSCounterStyleRule_Release ( aPtr : * mut nsCSSCounterStyleRule , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_IsDocumentBody" ] 
  pub fn Gecko_IsDocumentBody ( element : RawGeckoElementBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetLookAndFeelSystemColor" ] 
  pub fn Gecko_GetLookAndFeelSystemColor ( color_id : i32 , pres_context : RawGeckoPresContextBorrowed , ) -> nscolor ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_MatchStringArgPseudo" ] 
  pub fn Gecko_MatchStringArgPseudo ( element : RawGeckoElementBorrowed , type_ : CSSPseudoClassType , ident : * const u16 , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AddPropertyToSet" ] 
  pub fn Gecko_AddPropertyToSet ( arg1 : nsCSSPropertyIDSetBorrowedMut , arg2 : nsCSSPropertyID , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_RegisterNamespace" ] 
  pub fn Gecko_RegisterNamespace ( ns : * mut nsAtom , ) -> i32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ShouldCreateStyleThreadPool" ] 
  pub fn Gecko_ShouldCreateStyleThreadPool ( ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleFont" ] 
  pub fn Gecko_Construct_Default_nsStyleFont ( ptr : * mut nsStyleFont , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleFont" ] 
  pub fn Gecko_CopyConstruct_nsStyleFont ( ptr : * mut nsStyleFont , other : * const nsStyleFont , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleFont" ] 
  pub fn Gecko_Destroy_nsStyleFont ( ptr : * mut nsStyleFont , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleColor" ] 
  pub fn Gecko_Construct_Default_nsStyleColor ( ptr : * mut nsStyleColor , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleColor" ] 
  pub fn Gecko_CopyConstruct_nsStyleColor ( ptr : * mut nsStyleColor , other : * const nsStyleColor , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleColor" ] 
  pub fn Gecko_Destroy_nsStyleColor ( ptr : * mut nsStyleColor , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleList" ] 
  pub fn Gecko_Construct_Default_nsStyleList ( ptr : * mut nsStyleList , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleList" ] 
  pub fn Gecko_CopyConstruct_nsStyleList ( ptr : * mut nsStyleList , other : * const nsStyleList , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleList" ] 
  pub fn Gecko_Destroy_nsStyleList ( ptr : * mut nsStyleList , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleText" ] 
  pub fn Gecko_Construct_Default_nsStyleText ( ptr : * mut nsStyleText , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleText" ] 
  pub fn Gecko_CopyConstruct_nsStyleText ( ptr : * mut nsStyleText , other : * const nsStyleText , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleText" ] 
  pub fn Gecko_Destroy_nsStyleText ( ptr : * mut nsStyleText , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleVisibility" ] 
  pub fn Gecko_Construct_Default_nsStyleVisibility ( ptr : * mut nsStyleVisibility , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleVisibility" ] 
  pub fn Gecko_CopyConstruct_nsStyleVisibility ( ptr : * mut nsStyleVisibility , other : * const nsStyleVisibility , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleVisibility" ] 
  pub fn Gecko_Destroy_nsStyleVisibility ( ptr : * mut nsStyleVisibility , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleUserInterface" ] 
  pub fn Gecko_Construct_Default_nsStyleUserInterface ( ptr : * mut nsStyleUserInterface , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleUserInterface" ] 
  pub fn Gecko_CopyConstruct_nsStyleUserInterface ( ptr : * mut nsStyleUserInterface , other : * const nsStyleUserInterface , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleUserInterface" ] 
  pub fn Gecko_Destroy_nsStyleUserInterface ( ptr : * mut nsStyleUserInterface , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleTableBorder" ] 
  pub fn Gecko_Construct_Default_nsStyleTableBorder ( ptr : * mut nsStyleTableBorder , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleTableBorder" ] 
  pub fn Gecko_CopyConstruct_nsStyleTableBorder ( ptr : * mut nsStyleTableBorder , other : * const nsStyleTableBorder , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleTableBorder" ] 
  pub fn Gecko_Destroy_nsStyleTableBorder ( ptr : * mut nsStyleTableBorder , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleSVG" ] 
  pub fn Gecko_Construct_Default_nsStyleSVG ( ptr : * mut nsStyleSVG , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleSVG" ] 
  pub fn Gecko_CopyConstruct_nsStyleSVG ( ptr : * mut nsStyleSVG , other : * const nsStyleSVG , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleSVG" ] 
  pub fn Gecko_Destroy_nsStyleSVG ( ptr : * mut nsStyleSVG , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleVariables" ] 
  pub fn Gecko_Construct_Default_nsStyleVariables ( ptr : * mut nsStyleVariables , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleVariables" ] 
  pub fn Gecko_CopyConstruct_nsStyleVariables ( ptr : * mut nsStyleVariables , other : * const nsStyleVariables , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleVariables" ] 
  pub fn Gecko_Destroy_nsStyleVariables ( ptr : * mut nsStyleVariables , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleBackground" ] 
  pub fn Gecko_Construct_Default_nsStyleBackground ( ptr : * mut nsStyleBackground , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleBackground" ] 
  pub fn Gecko_CopyConstruct_nsStyleBackground ( ptr : * mut nsStyleBackground , other : * const nsStyleBackground , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleBackground" ] 
  pub fn Gecko_Destroy_nsStyleBackground ( ptr : * mut nsStyleBackground , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStylePosition" ] 
  pub fn Gecko_Construct_Default_nsStylePosition ( ptr : * mut nsStylePosition , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStylePosition" ] 
  pub fn Gecko_CopyConstruct_nsStylePosition ( ptr : * mut nsStylePosition , other : * const nsStylePosition , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStylePosition" ] 
  pub fn Gecko_Destroy_nsStylePosition ( ptr : * mut nsStylePosition , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleTextReset" ] 
  pub fn Gecko_Construct_Default_nsStyleTextReset ( ptr : * mut nsStyleTextReset , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleTextReset" ] 
  pub fn Gecko_CopyConstruct_nsStyleTextReset ( ptr : * mut nsStyleTextReset , other : * const nsStyleTextReset , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleTextReset" ] 
  pub fn Gecko_Destroy_nsStyleTextReset ( ptr : * mut nsStyleTextReset , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleDisplay" ] 
  pub fn Gecko_Construct_Default_nsStyleDisplay ( ptr : * mut nsStyleDisplay , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleDisplay" ] 
  pub fn Gecko_CopyConstruct_nsStyleDisplay ( ptr : * mut nsStyleDisplay , other : * const nsStyleDisplay , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleDisplay" ] 
  pub fn Gecko_Destroy_nsStyleDisplay ( ptr : * mut nsStyleDisplay , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleContent" ] 
  pub fn Gecko_Construct_Default_nsStyleContent ( ptr : * mut nsStyleContent , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleContent" ] 
  pub fn Gecko_CopyConstruct_nsStyleContent ( ptr : * mut nsStyleContent , other : * const nsStyleContent , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleContent" ] 
  pub fn Gecko_Destroy_nsStyleContent ( ptr : * mut nsStyleContent , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleUIReset" ] 
  pub fn Gecko_Construct_Default_nsStyleUIReset ( ptr : * mut nsStyleUIReset , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleUIReset" ] 
  pub fn Gecko_CopyConstruct_nsStyleUIReset ( ptr : * mut nsStyleUIReset , other : * const nsStyleUIReset , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleUIReset" ] 
  pub fn Gecko_Destroy_nsStyleUIReset ( ptr : * mut nsStyleUIReset , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleTable" ] 
  pub fn Gecko_Construct_Default_nsStyleTable ( ptr : * mut nsStyleTable , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleTable" ] 
  pub fn Gecko_CopyConstruct_nsStyleTable ( ptr : * mut nsStyleTable , other : * const nsStyleTable , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleTable" ] 
  pub fn Gecko_Destroy_nsStyleTable ( ptr : * mut nsStyleTable , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleMargin" ] 
  pub fn Gecko_Construct_Default_nsStyleMargin ( ptr : * mut nsStyleMargin , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleMargin" ] 
  pub fn Gecko_CopyConstruct_nsStyleMargin ( ptr : * mut nsStyleMargin , other : * const nsStyleMargin , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleMargin" ] 
  pub fn Gecko_Destroy_nsStyleMargin ( ptr : * mut nsStyleMargin , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStylePadding" ] 
  pub fn Gecko_Construct_Default_nsStylePadding ( ptr : * mut nsStylePadding , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStylePadding" ] 
  pub fn Gecko_CopyConstruct_nsStylePadding ( ptr : * mut nsStylePadding , other : * const nsStylePadding , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStylePadding" ] 
  pub fn Gecko_Destroy_nsStylePadding ( ptr : * mut nsStylePadding , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleBorder" ] 
  pub fn Gecko_Construct_Default_nsStyleBorder ( ptr : * mut nsStyleBorder , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleBorder" ] 
  pub fn Gecko_CopyConstruct_nsStyleBorder ( ptr : * mut nsStyleBorder , other : * const nsStyleBorder , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleBorder" ] 
  pub fn Gecko_Destroy_nsStyleBorder ( ptr : * mut nsStyleBorder , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleOutline" ] 
  pub fn Gecko_Construct_Default_nsStyleOutline ( ptr : * mut nsStyleOutline , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleOutline" ] 
  pub fn Gecko_CopyConstruct_nsStyleOutline ( ptr : * mut nsStyleOutline , other : * const nsStyleOutline , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleOutline" ] 
  pub fn Gecko_Destroy_nsStyleOutline ( ptr : * mut nsStyleOutline , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleXUL" ] 
  pub fn Gecko_Construct_Default_nsStyleXUL ( ptr : * mut nsStyleXUL , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleXUL" ] 
  pub fn Gecko_CopyConstruct_nsStyleXUL ( ptr : * mut nsStyleXUL , other : * const nsStyleXUL , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleXUL" ] 
  pub fn Gecko_Destroy_nsStyleXUL ( ptr : * mut nsStyleXUL , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleSVGReset" ] 
  pub fn Gecko_Construct_Default_nsStyleSVGReset ( ptr : * mut nsStyleSVGReset , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleSVGReset" ] 
  pub fn Gecko_CopyConstruct_nsStyleSVGReset ( ptr : * mut nsStyleSVGReset , other : * const nsStyleSVGReset , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleSVGReset" ] 
  pub fn Gecko_Destroy_nsStyleSVGReset ( ptr : * mut nsStyleSVGReset , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleColumn" ] 
  pub fn Gecko_Construct_Default_nsStyleColumn ( ptr : * mut nsStyleColumn , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleColumn" ] 
  pub fn Gecko_CopyConstruct_nsStyleColumn ( ptr : * mut nsStyleColumn , other : * const nsStyleColumn , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleColumn" ] 
  pub fn Gecko_Destroy_nsStyleColumn ( ptr : * mut nsStyleColumn , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Construct_Default_nsStyleEffects" ] 
  pub fn Gecko_Construct_Default_nsStyleEffects ( ptr : * mut nsStyleEffects , pres_context : RawGeckoPresContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CopyConstruct_nsStyleEffects" ] 
  pub fn Gecko_CopyConstruct_nsStyleEffects ( ptr : * mut nsStyleEffects , other : * const nsStyleEffects , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_Destroy_nsStyleEffects" ] 
  pub fn Gecko_Destroy_nsStyleEffects ( ptr : * mut nsStyleEffects , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_RegisterProfilerThread" ] 
  pub fn Gecko_RegisterProfilerThread ( name : * const :: std :: os :: raw :: c_char , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_UnregisterProfilerThread" ] 
  pub fn Gecko_UnregisterProfilerThread ( ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_DocumentRule_UseForPresentation" ] 
  pub fn Gecko_DocumentRule_UseForPresentation ( arg1 : RawGeckoPresContextBorrowed , aPattern : * const nsACString , aURLMatchingFunction : URLMatchingFunction , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_SetJemallocThreadLocalArena" ] 
  pub fn Gecko_SetJemallocThreadLocalArena ( enabled : bool , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AddBufferToCrashReport" ] 
  pub fn Gecko_AddBufferToCrashReport ( addr : * const :: std :: os :: raw :: c_void , len : usize , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_AnnotateCrashReport" ] 
  pub fn Gecko_AnnotateCrashReport ( key_str : * const :: std :: os :: raw :: c_char , value_str : * const :: std :: os :: raw :: c_char , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Element_ClearData" ] 
  pub fn Servo_Element_ClearData ( node : RawGeckoElementBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Element_SizeOfExcludingThisAndCVs" ] 
  pub fn Servo_Element_SizeOfExcludingThisAndCVs ( malloc_size_of : MallocSizeOf , malloc_enclosing_size_of : MallocSizeOf , seen_ptrs : * mut SeenPtrs , node : RawGeckoElementBorrowed , ) -> usize ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Element_HasPrimaryComputedValues" ] 
  pub fn Servo_Element_HasPrimaryComputedValues ( node : RawGeckoElementBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Element_GetPrimaryComputedValues" ] 
  pub fn Servo_Element_GetPrimaryComputedValues ( node : RawGeckoElementBorrowed , ) -> ServoStyleContextStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Element_HasPseudoComputedValues" ] 
  pub fn Servo_Element_HasPseudoComputedValues ( node : RawGeckoElementBorrowed , index : usize , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Element_GetPseudoComputedValues" ] 
  pub fn Servo_Element_GetPseudoComputedValues ( node : RawGeckoElementBorrowed , index : usize , ) -> ServoStyleContextStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Element_IsDisplayNone" ] 
  pub fn Servo_Element_IsDisplayNone ( element : RawGeckoElementBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Element_IsPrimaryStyleReusedViaRuleNode" ] 
  pub fn Servo_Element_IsPrimaryStyleReusedViaRuleNode ( element : RawGeckoElementBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSheet_FromUTF8Bytes" ] 
  pub fn Servo_StyleSheet_FromUTF8Bytes ( loader : * mut Loader , gecko_stylesheet : * mut ServoStyleSheet , data : * const u8 , data_len : usize , parsing_mode : SheetParsingMode , extra_data : * mut RawGeckoURLExtraData , line_number_offset : u32 , quirks_mode : nsCompatibility , reusable_sheets : * mut LoaderReusableStyleSheets , ) -> RawServoStyleSheetContentsStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSheet_Empty" ] 
  pub fn Servo_StyleSheet_Empty ( parsing_mode : SheetParsingMode , ) -> RawServoStyleSheetContentsStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSheet_HasRules" ] 
  pub fn Servo_StyleSheet_HasRules ( sheet : RawServoStyleSheetContentsBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSheet_GetRules" ] 
  pub fn Servo_StyleSheet_GetRules ( sheet : RawServoStyleSheetContentsBorrowed , ) -> ServoCssRulesStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSheet_Clone" ] 
  pub fn Servo_StyleSheet_Clone ( sheet : RawServoStyleSheetContentsBorrowed , reference_sheet : * const ServoStyleSheet , ) -> RawServoStyleSheetContentsStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSheet_SizeOfIncludingThis" ] 
  pub fn Servo_StyleSheet_SizeOfIncludingThis ( malloc_size_of : MallocSizeOf , malloc_enclosing_size_of : MallocSizeOf , sheet : RawServoStyleSheetContentsBorrowed , ) -> usize ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSheet_GetSourceMapURL" ] 
  pub fn Servo_StyleSheet_GetSourceMapURL ( sheet : RawServoStyleSheetContentsBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSheet_GetSourceURL" ] 
  pub fn Servo_StyleSheet_GetSourceURL ( sheet : RawServoStyleSheetContentsBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSheet_GetOrigin" ] 
  pub fn Servo_StyleSheet_GetOrigin ( sheet : RawServoStyleSheetContentsBorrowed , ) -> u8 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_Init" ] 
  pub fn Servo_StyleSet_Init ( pres_context : RawGeckoPresContextOwned , ) -> * mut RawServoStyleSet ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_RebuildCachedData" ] 
  pub fn Servo_StyleSet_RebuildCachedData ( set : RawServoStyleSetBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_MediumFeaturesChanged" ] 
  pub fn Servo_StyleSet_MediumFeaturesChanged ( set : RawServoStyleSetBorrowed , viewport_units_used : * mut bool , ) -> u8 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_SetDevice" ] 
  pub fn Servo_StyleSet_SetDevice ( set : RawServoStyleSetBorrowed , pres_context : RawGeckoPresContextOwned , ) -> u8 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_CompatModeChanged" ] 
  pub fn Servo_StyleSet_CompatModeChanged ( raw_data : RawServoStyleSetBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_AppendStyleSheet" ] 
  pub fn Servo_StyleSet_AppendStyleSheet ( set : RawServoStyleSetBorrowed , gecko_sheet : * const ServoStyleSheet , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_PrependStyleSheet" ] 
  pub fn Servo_StyleSet_PrependStyleSheet ( set : RawServoStyleSetBorrowed , gecko_sheet : * const ServoStyleSheet , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_RemoveStyleSheet" ] 
  pub fn Servo_StyleSet_RemoveStyleSheet ( set : RawServoStyleSetBorrowed , gecko_sheet : * const ServoStyleSheet , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_InsertStyleSheetBefore" ] 
  pub fn Servo_StyleSet_InsertStyleSheetBefore ( set : RawServoStyleSetBorrowed , gecko_sheet : * const ServoStyleSheet , before : * const ServoStyleSheet , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_FlushStyleSheets" ] 
  pub fn Servo_StyleSet_FlushStyleSheets ( set : RawServoStyleSetBorrowed , doc_elem : RawGeckoElementBorrowedOrNull , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_NoteStyleSheetsChanged" ] 
  pub fn Servo_StyleSet_NoteStyleSheetsChanged ( set : RawServoStyleSetBorrowed , author_style_disabled : bool , changed_origins : OriginFlags , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_GetKeyframesForName" ] 
  pub fn Servo_StyleSet_GetKeyframesForName ( set : RawServoStyleSetBorrowed , name : * mut nsAtom , timing_function : nsTimingFunctionBorrowed , keyframe_list : RawGeckoKeyframeListBorrowedMut , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_GetFontFaceRules" ] 
  pub fn Servo_StyleSet_GetFontFaceRules ( set : RawServoStyleSetBorrowed , list : RawGeckoFontFaceRuleListBorrowedMut , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_GetCounterStyleRule" ] 
  pub fn Servo_StyleSet_GetCounterStyleRule ( set : RawServoStyleSetBorrowed , name : * mut nsAtom , ) -> * mut nsCSSCounterStyleRule ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_BuildFontFeatureValueSet" ] 
  pub fn Servo_StyleSet_BuildFontFeatureValueSet ( set : RawServoStyleSetBorrowed , ) -> * mut gfxFontFeatureValueSet ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_ResolveForDeclarations" ] 
  pub fn Servo_StyleSet_ResolveForDeclarations ( set : RawServoStyleSetBorrowed , parent_style : ServoStyleContextBorrowedOrNull , declarations : RawServoDeclarationBlockBorrowed , ) -> ServoStyleContextStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SelectorList_Parse" ] 
  pub fn Servo_SelectorList_Parse ( selector_list : * const nsACString , ) -> * mut RawServoSelectorList ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SourceSizeList_Parse" ] 
  pub fn Servo_SourceSizeList_Parse ( value : * const nsACString , ) -> * mut RawServoSourceSizeList ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SourceSizeList_Evaluate" ] 
  pub fn Servo_SourceSizeList_Evaluate ( set : RawServoStyleSetBorrowed , arg1 : RawServoSourceSizeListBorrowedOrNull , ) -> i32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SelectorList_Matches" ] 
  pub fn Servo_SelectorList_Matches ( arg1 : RawGeckoElementBorrowed , arg2 : RawServoSelectorListBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SelectorList_Closest" ] 
  pub fn Servo_SelectorList_Closest ( arg1 : RawGeckoElementBorrowed , arg2 : RawServoSelectorListBorrowed , ) -> * const RawGeckoElement ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SelectorList_QueryFirst" ] 
  pub fn Servo_SelectorList_QueryFirst ( arg1 : RawGeckoNodeBorrowed , arg2 : RawServoSelectorListBorrowed , may_use_invalidation : bool , ) -> * const RawGeckoElement ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SelectorList_QueryAll" ] 
  pub fn Servo_SelectorList_QueryAll ( arg1 : RawGeckoNodeBorrowed , arg2 : RawServoSelectorListBorrowed , content_list : * mut nsSimpleContentList , may_use_invalidation : bool , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_AddSizeOfExcludingThis" ] 
  pub fn Servo_StyleSet_AddSizeOfExcludingThis ( malloc_size_of : MallocSizeOf , malloc_enclosing_size_of : MallocSizeOf , sizes : * mut ServoStyleSetSizes , set : RawServoStyleSetBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_UACache_AddSizeOf" ] 
  pub fn Servo_UACache_AddSizeOf ( malloc_size_of : MallocSizeOf , malloc_enclosing_size_of : MallocSizeOf , sizes : * mut ServoStyleSetSizes , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleContext_AddRef" ] 
  pub fn Servo_StyleContext_AddRef ( ctx : ServoStyleContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleContext_Release" ] 
  pub fn Servo_StyleContext_Release ( ctx : ServoStyleContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_MightHaveAttributeDependency" ] 
  pub fn Servo_StyleSet_MightHaveAttributeDependency ( set : RawServoStyleSetBorrowed , element : RawGeckoElementBorrowed , local_name : * mut nsAtom , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_HasStateDependency" ] 
  pub fn Servo_StyleSet_HasStateDependency ( set : RawServoStyleSetBorrowed , element : RawGeckoElementBorrowed , state : u64 , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_HasDocumentStateDependency" ] 
  pub fn Servo_StyleSet_HasDocumentStateDependency ( set : RawServoStyleSetBorrowed , state : u64 , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_ListTypes" ] 
  pub fn Servo_CssRules_ListTypes ( rules : ServoCssRulesBorrowed , result : nsTArrayBorrowed_uintptr_t , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_InsertRule" ] 
  pub fn Servo_CssRules_InsertRule ( rules : ServoCssRulesBorrowed , sheet : RawServoStyleSheetContentsBorrowed , rule : * const nsACString , index : u32 , nested : bool , loader : * mut Loader , gecko_stylesheet : * mut ServoStyleSheet , rule_type : * mut u16 , ) -> nsresult ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_DeleteRule" ] 
  pub fn Servo_CssRules_DeleteRule ( rules : ServoCssRulesBorrowed , index : u32 , ) -> nsresult ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_GetStyleRuleAt" ] 
  pub fn Servo_CssRules_GetStyleRuleAt ( rules : ServoCssRulesBorrowed , index : u32 , line : * mut u32 , column : * mut u32 , ) -> RawServoStyleRuleStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleRule_Debug" ] 
  pub fn Servo_StyleRule_Debug ( rule : RawServoStyleRuleBorrowed , result : * mut nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleRule_GetCssText" ] 
  pub fn Servo_StyleRule_GetCssText ( rule : RawServoStyleRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_GetImportRuleAt" ] 
  pub fn Servo_CssRules_GetImportRuleAt ( rules : ServoCssRulesBorrowed , index : u32 , line : * mut u32 , column : * mut u32 , ) -> RawServoImportRuleStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ImportRule_Debug" ] 
  pub fn Servo_ImportRule_Debug ( rule : RawServoImportRuleBorrowed , result : * mut nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ImportRule_GetCssText" ] 
  pub fn Servo_ImportRule_GetCssText ( rule : RawServoImportRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Keyframe_Debug" ] 
  pub fn Servo_Keyframe_Debug ( rule : RawServoKeyframeBorrowed , result : * mut nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Keyframe_GetCssText" ] 
  pub fn Servo_Keyframe_GetCssText ( rule : RawServoKeyframeBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_GetKeyframesRuleAt" ] 
  pub fn Servo_CssRules_GetKeyframesRuleAt ( rules : ServoCssRulesBorrowed , index : u32 , line : * mut u32 , column : * mut u32 , ) -> RawServoKeyframesRuleStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_KeyframesRule_Debug" ] 
  pub fn Servo_KeyframesRule_Debug ( rule : RawServoKeyframesRuleBorrowed , result : * mut nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_KeyframesRule_GetCssText" ] 
  pub fn Servo_KeyframesRule_GetCssText ( rule : RawServoKeyframesRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_GetMediaRuleAt" ] 
  pub fn Servo_CssRules_GetMediaRuleAt ( rules : ServoCssRulesBorrowed , index : u32 , line : * mut u32 , column : * mut u32 , ) -> RawServoMediaRuleStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaRule_Debug" ] 
  pub fn Servo_MediaRule_Debug ( rule : RawServoMediaRuleBorrowed , result : * mut nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaRule_GetCssText" ] 
  pub fn Servo_MediaRule_GetCssText ( rule : RawServoMediaRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaRule_GetRules" ] 
  pub fn Servo_MediaRule_GetRules ( rule : RawServoMediaRuleBorrowed , ) -> ServoCssRulesStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_GetNamespaceRuleAt" ] 
  pub fn Servo_CssRules_GetNamespaceRuleAt ( rules : ServoCssRulesBorrowed , index : u32 , line : * mut u32 , column : * mut u32 , ) -> RawServoNamespaceRuleStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_NamespaceRule_Debug" ] 
  pub fn Servo_NamespaceRule_Debug ( rule : RawServoNamespaceRuleBorrowed , result : * mut nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_NamespaceRule_GetCssText" ] 
  pub fn Servo_NamespaceRule_GetCssText ( rule : RawServoNamespaceRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_GetPageRuleAt" ] 
  pub fn Servo_CssRules_GetPageRuleAt ( rules : ServoCssRulesBorrowed , index : u32 , line : * mut u32 , column : * mut u32 , ) -> RawServoPageRuleStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_PageRule_Debug" ] 
  pub fn Servo_PageRule_Debug ( rule : RawServoPageRuleBorrowed , result : * mut nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_PageRule_GetCssText" ] 
  pub fn Servo_PageRule_GetCssText ( rule : RawServoPageRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_GetSupportsRuleAt" ] 
  pub fn Servo_CssRules_GetSupportsRuleAt ( rules : ServoCssRulesBorrowed , index : u32 , line : * mut u32 , column : * mut u32 , ) -> RawServoSupportsRuleStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SupportsRule_Debug" ] 
  pub fn Servo_SupportsRule_Debug ( rule : RawServoSupportsRuleBorrowed , result : * mut nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SupportsRule_GetCssText" ] 
  pub fn Servo_SupportsRule_GetCssText ( rule : RawServoSupportsRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SupportsRule_GetRules" ] 
  pub fn Servo_SupportsRule_GetRules ( rule : RawServoSupportsRuleBorrowed , ) -> ServoCssRulesStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_GetDocumentRuleAt" ] 
  pub fn Servo_CssRules_GetDocumentRuleAt ( rules : ServoCssRulesBorrowed , index : u32 , line : * mut u32 , column : * mut u32 , ) -> RawServoDocumentRuleStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DocumentRule_Debug" ] 
  pub fn Servo_DocumentRule_Debug ( rule : RawServoDocumentRuleBorrowed , result : * mut nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DocumentRule_GetCssText" ] 
  pub fn Servo_DocumentRule_GetCssText ( rule : RawServoDocumentRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DocumentRule_GetRules" ] 
  pub fn Servo_DocumentRule_GetRules ( rule : RawServoDocumentRuleBorrowed , ) -> ServoCssRulesStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_GetFontFeatureValuesRuleAt" ] 
  pub fn Servo_CssRules_GetFontFeatureValuesRuleAt ( rules : ServoCssRulesBorrowed , index : u32 , line : * mut u32 , column : * mut u32 , ) -> RawServoFontFeatureValuesRuleStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_FontFeatureValuesRule_Debug" ] 
  pub fn Servo_FontFeatureValuesRule_Debug ( rule : RawServoFontFeatureValuesRuleBorrowed , result : * mut nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_FontFeatureValuesRule_GetCssText" ] 
  pub fn Servo_FontFeatureValuesRule_GetCssText ( rule : RawServoFontFeatureValuesRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_GetFontFaceRuleAt" ] 
  pub fn Servo_CssRules_GetFontFaceRuleAt ( rules : ServoCssRulesBorrowed , index : u32 , ) -> * mut nsCSSFontFaceRule ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CssRules_GetCounterStyleRuleAt" ] 
  pub fn Servo_CssRules_GetCounterStyleRuleAt ( rules : ServoCssRulesBorrowed , index : u32 , ) -> * mut nsCSSCounterStyleRule ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleRule_GetStyle" ] 
  pub fn Servo_StyleRule_GetStyle ( rule : RawServoStyleRuleBorrowed , ) -> RawServoDeclarationBlockStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleRule_SetStyle" ] 
  pub fn Servo_StyleRule_SetStyle ( rule : RawServoStyleRuleBorrowed , declarations : RawServoDeclarationBlockBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleRule_GetSelectorText" ] 
  pub fn Servo_StyleRule_GetSelectorText ( rule : RawServoStyleRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleRule_GetSelectorTextAtIndex" ] 
  pub fn Servo_StyleRule_GetSelectorTextAtIndex ( rule : RawServoStyleRuleBorrowed , index : u32 , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleRule_GetSpecificityAtIndex" ] 
  pub fn Servo_StyleRule_GetSpecificityAtIndex ( rule : RawServoStyleRuleBorrowed , index : u32 , specificity : * mut u64 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleRule_GetSelectorCount" ] 
  pub fn Servo_StyleRule_GetSelectorCount ( rule : RawServoStyleRuleBorrowed , count : * mut u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleRule_SelectorMatchesElement" ] 
  pub fn Servo_StyleRule_SelectorMatchesElement ( arg1 : RawServoStyleRuleBorrowed , arg2 : RawGeckoElementBorrowed , index : u32 , pseudo_type : CSSPseudoElementType , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ImportRule_GetHref" ] 
  pub fn Servo_ImportRule_GetHref ( rule : RawServoImportRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ImportRule_GetSheet" ] 
  pub fn Servo_ImportRule_GetSheet ( rule : RawServoImportRuleBorrowed , ) -> * const ServoStyleSheet ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Keyframe_GetKeyText" ] 
  pub fn Servo_Keyframe_GetKeyText ( keyframe : RawServoKeyframeBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Keyframe_SetKeyText" ] 
  pub fn Servo_Keyframe_SetKeyText ( keyframe : RawServoKeyframeBorrowed , text : * const nsACString , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Keyframe_GetStyle" ] 
  pub fn Servo_Keyframe_GetStyle ( keyframe : RawServoKeyframeBorrowed , ) -> RawServoDeclarationBlockStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Keyframe_SetStyle" ] 
  pub fn Servo_Keyframe_SetStyle ( keyframe : RawServoKeyframeBorrowed , declarations : RawServoDeclarationBlockBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_KeyframesRule_GetName" ] 
  pub fn Servo_KeyframesRule_GetName ( rule : RawServoKeyframesRuleBorrowed , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_KeyframesRule_SetName" ] 
  pub fn Servo_KeyframesRule_SetName ( rule : RawServoKeyframesRuleBorrowed , name : * mut nsAtom , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_KeyframesRule_GetCount" ] 
  pub fn Servo_KeyframesRule_GetCount ( rule : RawServoKeyframesRuleBorrowed , ) -> u32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_KeyframesRule_GetKeyframeAt" ] 
  pub fn Servo_KeyframesRule_GetKeyframeAt ( rule : RawServoKeyframesRuleBorrowed , index : u32 , line : * mut u32 , column : * mut u32 , ) -> RawServoKeyframeStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_KeyframesRule_FindRule" ] 
  pub fn Servo_KeyframesRule_FindRule ( rule : RawServoKeyframesRuleBorrowed , key : * const nsACString , ) -> u32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_KeyframesRule_AppendRule" ] 
  pub fn Servo_KeyframesRule_AppendRule ( rule : RawServoKeyframesRuleBorrowed , sheet : RawServoStyleSheetContentsBorrowed , css : * const nsACString , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_KeyframesRule_DeleteRule" ] 
  pub fn Servo_KeyframesRule_DeleteRule ( rule : RawServoKeyframesRuleBorrowed , index : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaRule_GetMedia" ] 
  pub fn Servo_MediaRule_GetMedia ( rule : RawServoMediaRuleBorrowed , ) -> RawServoMediaListStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_NamespaceRule_GetPrefix" ] 
  pub fn Servo_NamespaceRule_GetPrefix ( rule : RawServoNamespaceRuleBorrowed , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_NamespaceRule_GetURI" ] 
  pub fn Servo_NamespaceRule_GetURI ( rule : RawServoNamespaceRuleBorrowed , ) -> * mut nsAtom ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_PageRule_GetStyle" ] 
  pub fn Servo_PageRule_GetStyle ( rule : RawServoPageRuleBorrowed , ) -> RawServoDeclarationBlockStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_PageRule_SetStyle" ] 
  pub fn Servo_PageRule_SetStyle ( rule : RawServoPageRuleBorrowed , declarations : RawServoDeclarationBlockBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SupportsRule_GetConditionText" ] 
  pub fn Servo_SupportsRule_GetConditionText ( rule : RawServoSupportsRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DocumentRule_GetConditionText" ] 
  pub fn Servo_DocumentRule_GetConditionText ( rule : RawServoDocumentRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_FontFeatureValuesRule_GetFontFamily" ] 
  pub fn Servo_FontFeatureValuesRule_GetFontFamily ( rule : RawServoFontFeatureValuesRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_FontFeatureValuesRule_GetValueText" ] 
  pub fn Servo_FontFeatureValuesRule_GetValueText ( rule : RawServoFontFeatureValuesRuleBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ParseProperty" ] 
  pub fn Servo_ParseProperty ( property : nsCSSPropertyID , value : * const nsACString , data : * mut RawGeckoURLExtraData , parsing_mode : ParsingMode , quirks_mode : nsCompatibility , loader : * mut Loader , ) -> RawServoDeclarationBlockStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ParseEasing" ] 
  pub fn Servo_ParseEasing ( easing : * const nsAString , data : * mut RawGeckoURLExtraData , output : nsTimingFunctionBorrowedMut , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_GetComputedKeyframeValues" ] 
  pub fn Servo_GetComputedKeyframeValues ( keyframes : RawGeckoKeyframeListBorrowed , element : RawGeckoElementBorrowed , style : ServoStyleContextBorrowed , set : RawServoStyleSetBorrowed , result : RawGeckoComputedKeyframeValuesListBorrowedMut , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ComputedValues_ExtractAnimationValue" ] 
  pub fn Servo_ComputedValues_ExtractAnimationValue ( computed_values : ServoStyleContextBorrowed , property : nsCSSPropertyID , ) -> RawServoAnimationValueStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ComputedValues_SpecifiesAnimationsOrTransitions" ] 
  pub fn Servo_ComputedValues_SpecifiesAnimationsOrTransitions ( computed_values : ServoStyleContextBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Property_IsAnimatable" ] 
  pub fn Servo_Property_IsAnimatable ( property : nsCSSPropertyID , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Property_IsTransitionable" ] 
  pub fn Servo_Property_IsTransitionable ( property : nsCSSPropertyID , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Property_IsDiscreteAnimatable" ] 
  pub fn Servo_Property_IsDiscreteAnimatable ( property : nsCSSPropertyID , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_GetProperties_Overriding_Animation" ] 
  pub fn Servo_GetProperties_Overriding_Animation ( arg1 : RawGeckoElementBorrowed , arg2 : RawGeckoCSSPropertyIDListBorrowed , arg3 : nsCSSPropertyIDSetBorrowedMut , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MatrixTransform_Operate" ] 
  pub fn Servo_MatrixTransform_Operate ( matrix_operator : MatrixTransformOperator , from : * const RawGeckoGfxMatrix4x4 , to : * const RawGeckoGfxMatrix4x4 , progress : f64 , result : * mut RawGeckoGfxMatrix4x4 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_GetAnimationValues" ] 
  pub fn Servo_GetAnimationValues ( declarations : RawServoDeclarationBlockBorrowed , element : RawGeckoElementBorrowed , style : ServoStyleContextBorrowed , style_set : RawServoStyleSetBorrowed , animation_values : RawGeckoServoAnimationValueListBorrowedMut , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValues_Interpolate" ] 
  pub fn Servo_AnimationValues_Interpolate ( from : RawServoAnimationValueBorrowed , to : RawServoAnimationValueBorrowed , progress : f64 , ) -> RawServoAnimationValueStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValues_IsInterpolable" ] 
  pub fn Servo_AnimationValues_IsInterpolable ( from : RawServoAnimationValueBorrowed , to : RawServoAnimationValueBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValues_Add" ] 
  pub fn Servo_AnimationValues_Add ( a : RawServoAnimationValueBorrowed , b : RawServoAnimationValueBorrowed , ) -> RawServoAnimationValueStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValues_Accumulate" ] 
  pub fn Servo_AnimationValues_Accumulate ( a : RawServoAnimationValueBorrowed , b : RawServoAnimationValueBorrowed , count : u64 , ) -> RawServoAnimationValueStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValues_GetZeroValue" ] 
  pub fn Servo_AnimationValues_GetZeroValue ( value_to_match : RawServoAnimationValueBorrowed , ) -> RawServoAnimationValueStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValues_ComputeDistance" ] 
  pub fn Servo_AnimationValues_ComputeDistance ( from : RawServoAnimationValueBorrowed , to : RawServoAnimationValueBorrowed , ) -> f64 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValue_Serialize" ] 
  pub fn Servo_AnimationValue_Serialize ( value : RawServoAnimationValueBorrowed , property : nsCSSPropertyID , buffer : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Shorthand_AnimationValues_Serialize" ] 
  pub fn Servo_Shorthand_AnimationValues_Serialize ( shorthand_property : nsCSSPropertyID , values : RawGeckoServoAnimationValueListBorrowed , buffer : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValue_GetOpacity" ] 
  pub fn Servo_AnimationValue_GetOpacity ( value : RawServoAnimationValueBorrowed , ) -> f32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValue_Opacity" ] 
  pub fn Servo_AnimationValue_Opacity ( arg1 : f32 , ) -> RawServoAnimationValueStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValue_GetTransform" ] 
  pub fn Servo_AnimationValue_GetTransform ( value : RawServoAnimationValueBorrowed , list : * mut RefPtr < nsCSSValueSharedList > , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValue_Transform" ] 
  pub fn Servo_AnimationValue_Transform ( list : * const nsCSSValueSharedList , ) -> RawServoAnimationValueStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValue_DeepEqual" ] 
  pub fn Servo_AnimationValue_DeepEqual ( arg1 : RawServoAnimationValueBorrowed , arg2 : RawServoAnimationValueBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValue_Uncompute" ] 
  pub fn Servo_AnimationValue_Uncompute ( value : RawServoAnimationValueBorrowed , ) -> RawServoDeclarationBlockStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationValue_Compute" ] 
  pub fn Servo_AnimationValue_Compute ( element : RawGeckoElementBorrowed , declarations : RawServoDeclarationBlockBorrowed , style : ServoStyleContextBorrowed , raw_data : RawServoStyleSetBorrowed , ) -> RawServoAnimationValueStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ParseStyleAttribute" ] 
  pub fn Servo_ParseStyleAttribute ( data : * const nsACString , extra_data : * mut RawGeckoURLExtraData , quirks_mode : nsCompatibility , loader : * mut Loader , ) -> RawServoDeclarationBlockStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_CreateEmpty" ] 
  pub fn Servo_DeclarationBlock_CreateEmpty ( ) -> RawServoDeclarationBlockStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_Clone" ] 
  pub fn Servo_DeclarationBlock_Clone ( declarations : RawServoDeclarationBlockBorrowed , ) -> RawServoDeclarationBlockStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_Equals" ] 
  pub fn Servo_DeclarationBlock_Equals ( a : RawServoDeclarationBlockBorrowed , b : RawServoDeclarationBlockBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_GetCssText" ] 
  pub fn Servo_DeclarationBlock_GetCssText ( declarations : RawServoDeclarationBlockBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SerializeOneValue" ] 
  pub fn Servo_DeclarationBlock_SerializeOneValue ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , buffer : * mut nsAString , computed_values : ServoStyleContextBorrowedOrNull , custom_properties : RawServoDeclarationBlockBorrowedOrNull , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_Count" ] 
  pub fn Servo_DeclarationBlock_Count ( declarations : RawServoDeclarationBlockBorrowed , ) -> u32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_GetNthProperty" ] 
  pub fn Servo_DeclarationBlock_GetNthProperty ( declarations : RawServoDeclarationBlockBorrowed , index : u32 , result : * mut nsAString , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_GetPropertyValue" ] 
  pub fn Servo_DeclarationBlock_GetPropertyValue ( declarations : RawServoDeclarationBlockBorrowed , property : * const nsACString , value : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_GetPropertyValueById" ] 
  pub fn Servo_DeclarationBlock_GetPropertyValueById ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , value : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_GetPropertyIsImportant" ] 
  pub fn Servo_DeclarationBlock_GetPropertyIsImportant ( declarations : RawServoDeclarationBlockBorrowed , property : * const nsACString , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetProperty" ] 
  pub fn Servo_DeclarationBlock_SetProperty ( declarations : RawServoDeclarationBlockBorrowed , property : * const nsACString , value : * const nsACString , is_important : bool , data : * mut RawGeckoURLExtraData , parsing_mode : ParsingMode , quirks_mode : nsCompatibility , loader : * mut Loader , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetPropertyById" ] 
  pub fn Servo_DeclarationBlock_SetPropertyById ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , value : * const nsACString , is_important : bool , data : * mut RawGeckoURLExtraData , parsing_mode : ParsingMode , quirks_mode : nsCompatibility , loader : * mut Loader , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_RemoveProperty" ] 
  pub fn Servo_DeclarationBlock_RemoveProperty ( declarations : RawServoDeclarationBlockBorrowed , property : * const nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_RemovePropertyById" ] 
  pub fn Servo_DeclarationBlock_RemovePropertyById ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_HasCSSWideKeyword" ] 
  pub fn Servo_DeclarationBlock_HasCSSWideKeyword ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AnimationCompose" ] 
  pub fn Servo_AnimationCompose ( animation_values : RawServoAnimationValueMapBorrowedMut , base_values : RawServoAnimationValueTableBorrowed , property : nsCSSPropertyID , animation_segment : RawGeckoAnimationPropertySegmentBorrowed , last_segment : RawGeckoAnimationPropertySegmentBorrowed , computed_timing : RawGeckoComputedTimingBorrowed , iter_composite : IterationCompositeOperation , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ComposeAnimationSegment" ] 
  pub fn Servo_ComposeAnimationSegment ( animation_segment : RawGeckoAnimationPropertySegmentBorrowed , underlying_value : RawServoAnimationValueBorrowedOrNull , last_value : RawServoAnimationValueBorrowedOrNull , iter_composite : IterationCompositeOperation , progress : f64 , current_iteration : u64 , ) -> RawServoAnimationValueStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_PropertyIsSet" ] 
  pub fn Servo_DeclarationBlock_PropertyIsSet ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetIdentStringValue" ] 
  pub fn Servo_DeclarationBlock_SetIdentStringValue ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , value : * mut nsAtom , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetKeywordValue" ] 
  pub fn Servo_DeclarationBlock_SetKeywordValue ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , value : i32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetIntValue" ] 
  pub fn Servo_DeclarationBlock_SetIntValue ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , value : i32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetPixelValue" ] 
  pub fn Servo_DeclarationBlock_SetPixelValue ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , value : f32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetLengthValue" ] 
  pub fn Servo_DeclarationBlock_SetLengthValue ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , value : f32 , unit : nsCSSUnit , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetNumberValue" ] 
  pub fn Servo_DeclarationBlock_SetNumberValue ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , value : f32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetPercentValue" ] 
  pub fn Servo_DeclarationBlock_SetPercentValue ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , value : f32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetAutoValue" ] 
  pub fn Servo_DeclarationBlock_SetAutoValue ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetCurrentColor" ] 
  pub fn Servo_DeclarationBlock_SetCurrentColor ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetColorValue" ] 
  pub fn Servo_DeclarationBlock_SetColorValue ( declarations : RawServoDeclarationBlockBorrowed , property : nsCSSPropertyID , value : nscolor , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetFontFamily" ] 
  pub fn Servo_DeclarationBlock_SetFontFamily ( declarations : RawServoDeclarationBlockBorrowed , value : * const nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetTextDecorationColorOverride" ] 
  pub fn Servo_DeclarationBlock_SetTextDecorationColorOverride ( declarations : RawServoDeclarationBlockBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_DeclarationBlock_SetBackgroundImage" ] 
  pub fn Servo_DeclarationBlock_SetBackgroundImage ( declarations : RawServoDeclarationBlockBorrowed , value : * const nsAString , extra_data : * mut RawGeckoURLExtraData , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaList_Create" ] 
  pub fn Servo_MediaList_Create ( ) -> RawServoMediaListStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaList_DeepClone" ] 
  pub fn Servo_MediaList_DeepClone ( list : RawServoMediaListBorrowed , ) -> RawServoMediaListStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaList_Matches" ] 
  pub fn Servo_MediaList_Matches ( list : RawServoMediaListBorrowed , set : RawServoStyleSetBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaList_GetText" ] 
  pub fn Servo_MediaList_GetText ( list : RawServoMediaListBorrowed , result : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaList_SetText" ] 
  pub fn Servo_MediaList_SetText ( list : RawServoMediaListBorrowed , text : * const nsACString , aCallerType : CallerType , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaList_GetLength" ] 
  pub fn Servo_MediaList_GetLength ( list : RawServoMediaListBorrowed , ) -> u32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaList_GetMediumAt" ] 
  pub fn Servo_MediaList_GetMediumAt ( list : RawServoMediaListBorrowed , index : u32 , result : * mut nsAString , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaList_AppendMedium" ] 
  pub fn Servo_MediaList_AppendMedium ( list : RawServoMediaListBorrowed , new_medium : * const nsACString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MediaList_DeleteMedium" ] 
  pub fn Servo_MediaList_DeleteMedium ( list : RawServoMediaListBorrowed , old_medium : * const nsACString , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CSSSupports2" ] 
  pub fn Servo_CSSSupports2 ( name : * const nsACString , value : * const nsACString , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CSSSupports" ] 
  pub fn Servo_CSSSupports ( cond : * const nsACString , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ComputedValues_GetForAnonymousBox" ] 
  pub fn Servo_ComputedValues_GetForAnonymousBox ( parent_style_or_null : ServoStyleContextBorrowedOrNull , pseudo_tag : * mut nsAtom , set : RawServoStyleSetBorrowed , ) -> ServoStyleContextStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ComputedValues_Inherit" ] 
  pub fn Servo_ComputedValues_Inherit ( set : RawServoStyleSetBorrowed , pseudo_tag : * mut nsAtom , parent_style : ServoStyleContextBorrowedOrNull , target : InheritTarget , ) -> ServoStyleContextStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ComputedValues_GetStyleBits" ] 
  pub fn Servo_ComputedValues_GetStyleBits ( values : ServoStyleContextBorrowed , ) -> u64 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ComputedValues_EqualCustomProperties" ] 
  pub fn Servo_ComputedValues_EqualCustomProperties ( first : ServoComputedDataBorrowed , second : ServoComputedDataBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ComputedValues_GetStyleRuleList" ] 
  pub fn Servo_ComputedValues_GetStyleRuleList ( values : ServoStyleContextBorrowed , rules : RawGeckoServoStyleRuleListBorrowedMut , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Initialize" ] 
  pub fn Servo_Initialize ( dummy_url_data : * mut RawGeckoURLExtraData , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_InitializeCooperativeThread" ] 
  pub fn Servo_InitializeCooperativeThread ( ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_Shutdown" ] 
  pub fn Servo_Shutdown ( ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_NoteExplicitHints" ] 
  pub fn Servo_NoteExplicitHints ( element : RawGeckoElementBorrowed , restyle_hint : nsRestyleHint , change_hint : nsChangeHint , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_TakeChangeHint" ] 
  pub fn Servo_TakeChangeHint ( element : RawGeckoElementBorrowed , was_restyled : * mut bool , ) -> u32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ResolveStyle" ] 
  pub fn Servo_ResolveStyle ( element : RawGeckoElementBorrowed , set : RawServoStyleSetBorrowed , ) -> ServoStyleContextStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ResolvePseudoStyle" ] 
  pub fn Servo_ResolvePseudoStyle ( element : RawGeckoElementBorrowed , pseudo_type : CSSPseudoElementType , is_probe : bool , inherited_style : ServoStyleContextBorrowedOrNull , set : RawServoStyleSetBorrowed , ) -> ServoStyleContextStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ComputedValues_ResolveXULTreePseudoStyle" ] 
  pub fn Servo_ComputedValues_ResolveXULTreePseudoStyle ( element : RawGeckoElementBorrowed , pseudo_tag : * mut nsAtom , inherited_style : ServoStyleContextBorrowed , input_word : * const AtomArray , set : RawServoStyleSetBorrowed , ) -> ServoStyleContextStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SetExplicitStyle" ] 
  pub fn Servo_SetExplicitStyle ( element : RawGeckoElementBorrowed , primary_style : ServoStyleContextBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_HasAuthorSpecifiedRules" ] 
  pub fn Servo_HasAuthorSpecifiedRules ( style : ServoStyleContextBorrowed , element : RawGeckoElementBorrowed , pseudo_type : CSSPseudoElementType , rule_type_mask : u32 , author_colors_allowed : bool , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ResolveStyleLazily" ] 
  pub fn Servo_ResolveStyleLazily ( element : RawGeckoElementBorrowed , pseudo_type : CSSPseudoElementType , rule_inclusion : StyleRuleInclusion , snapshots : * const ServoElementSnapshotTable , set : RawServoStyleSetBorrowed , ignore_existing_styles : bool , ) -> ServoStyleContextStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ReparentStyle" ] 
  pub fn Servo_ReparentStyle ( style_to_reparent : ServoStyleContextBorrowed , parent_style : ServoStyleContextBorrowed , parent_style_ignoring_first_line : ServoStyleContextBorrowed , layout_parent_style : ServoStyleContextBorrowed , element : RawGeckoElementBorrowedOrNull , set : RawServoStyleSetBorrowed , ) -> ServoStyleContextStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_TraverseSubtree" ] 
  pub fn Servo_TraverseSubtree ( root : RawGeckoElementBorrowed , set : RawServoStyleSetBorrowed , snapshots : * const ServoElementSnapshotTable , flags : ServoTraversalFlags , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_AssertTreeIsClean" ] 
  pub fn Servo_AssertTreeIsClean ( root : RawGeckoElementBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_IsWorkerThread" ] 
  pub fn Servo_IsWorkerThread ( ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_MaybeGCRuleTree" ] 
  pub fn Servo_MaybeGCRuleTree ( set : RawServoStyleSetBorrowed , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_GetBaseComputedValuesForElement" ] 
  pub fn Servo_StyleSet_GetBaseComputedValuesForElement ( set : RawServoStyleSetBorrowed , element : RawGeckoElementBorrowed , existing_style : ServoStyleContextBorrowed , snapshots : * const ServoElementSnapshotTable , ) -> ServoStyleContextStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_StyleSet_GetComputedValuesByAddingAnimation" ] 
  pub fn Servo_StyleSet_GetComputedValuesByAddingAnimation ( set : RawServoStyleSetBorrowed , element : RawGeckoElementBorrowed , existing_style : ServoStyleContextBorrowed , snapshots : * const ServoElementSnapshotTable , animation : RawServoAnimationValueBorrowed , ) -> ServoStyleContextStrong ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_SerializeFontValueForCanvas" ] 
  pub fn Servo_SerializeFontValueForCanvas ( declarations : RawServoDeclarationBlockBorrowed , buffer : * mut nsAString , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_GetCustomPropertyValue" ] 
  pub fn Servo_GetCustomPropertyValue ( computed_values : ServoStyleContextBorrowed , name : * const nsAString , value : * mut nsAString , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_GetCustomPropertiesCount" ] 
  pub fn Servo_GetCustomPropertiesCount ( computed_values : ServoStyleContextBorrowed , ) -> u32 ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_GetCustomPropertyNameAt" ] 
  pub fn Servo_GetCustomPropertyNameAt ( arg1 : ServoStyleContextBorrowed , index : u32 , name : * mut nsAString , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ProcessInvalidations" ] 
  pub fn Servo_ProcessInvalidations ( set : RawServoStyleSetBorrowed , element : RawGeckoElementBorrowed , snapshots : * const ServoElementSnapshotTable , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_HasPendingRestyleAncestor" ] 
  pub fn Servo_HasPendingRestyleAncestor ( element : RawGeckoElementBorrowed , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_GetArcStringData" ] 
  pub fn Servo_GetArcStringData ( arg1 : * const RustString , chars : * mut * const u8 , len : * mut u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ReleaseArcStringData" ] 
  pub fn Servo_ReleaseArcStringData ( string : * const ServoRawOffsetArc < RustString > , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_CloneArcStringData" ] 
  pub fn Servo_CloneArcStringData ( string : * const ServoRawOffsetArc < RustString > , ) -> ServoRawOffsetArc < RustString > ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_IsValidCSSColor" ] 
  pub fn Servo_IsValidCSSColor ( value : * const nsAString , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ComputeColor" ] 
  pub fn Servo_ComputeColor ( set : RawServoStyleSetBorrowedOrNull , current_color : nscolor , value : * const nsAString , result_color : * mut nscolor , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ParseIntersectionObserverRootMargin" ] 
  pub fn Servo_ParseIntersectionObserverRootMargin ( value : * const nsAString , result : * mut nsCSSRect , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Servo_ParseTransformIntoMatrix" ] 
  pub fn Servo_ParseTransformIntoMatrix ( value : * const nsAString , contains_3d_transform : * mut bool , result : * mut RawGeckoGfxMatrix4x4 , ) -> bool ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_CreateCSSErrorReporter" ] 
  pub fn Gecko_CreateCSSErrorReporter ( sheet : * mut ServoStyleSheet , loader : * mut Loader , uri : * mut nsIURI , ) -> * mut ErrorReporter ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_DestroyCSSErrorReporter" ] 
  pub fn Gecko_DestroyCSSErrorReporter ( reporter : * mut ErrorReporter , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ReportUnexpectedCSSError" ] 
  pub fn Gecko_ReportUnexpectedCSSError ( reporter : * mut ErrorReporter , message : * const :: std :: os :: raw :: c_char , param : * const :: std :: os :: raw :: c_char , paramLen : u32 , prefix : * const :: std :: os :: raw :: c_char , prefixParam : * const :: std :: os :: raw :: c_char , prefixParamLen : u32 , suffix : * const :: std :: os :: raw :: c_char , source : * const :: std :: os :: raw :: c_char , sourceLen : u32 , lineNumber : u32 , colNumber : u32 , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_ContentList_AppendAll" ] 
  pub fn Gecko_ContentList_AppendAll ( aContentList : * mut nsSimpleContentList , aElements : * mut * const RawGeckoElement , aLength : usize , ) ; 
 } extern "C" {
+ # [ link_name = "\u{1}_Gecko_GetElementsWithId" ] 
  pub fn Gecko_GetElementsWithId ( aDocument : * const nsIDocument , aId : * mut nsAtom , ) -> * const nsTArray < * mut Element > ; 
 }
\ No newline at end of file
diff --git a/servo/components/style/gecko/generated/structs.rs b/servo/components/style/gecko/generated/structs.rs
index 2524d21fee61..ef9d006dcf84 100644
--- a/servo/components/style/gecko/generated/structs.rs
+++ b/servo/components/style/gecko/generated/structs.rs
@@ -17,7 +17,10 @@ pub type ServoComputedValueFlags = ::properties::computed_value_flags::ComputedV
 pub type ServoRawOffsetArc<T> = ::servo_arc::RawOffsetArc<T>;
 pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::properties::ComputedValues>;
 
-# [ allow ( non_snake_case , non_camel_case_types , non_upper_case_globals ) ] pub mod root { # [ repr ( C ) ] pub struct __BindgenUnionField < T > ( :: std :: marker :: PhantomData < T > ) ; impl < T > __BindgenUnionField < T > { # [ inline ] pub fn new ( ) -> Self { __BindgenUnionField ( :: std :: marker :: PhantomData ) } # [ inline ] pub unsafe fn as_ref ( & self ) -> & T { :: std :: mem :: transmute ( self ) } # [ inline ] pub unsafe fn as_mut ( & mut self ) -> & mut T { :: std :: mem :: transmute ( self ) } } impl < T > :: std :: default :: Default for __BindgenUnionField < T > { # [ inline ] fn default ( ) -> Self { Self :: new ( ) } } impl < T > :: std :: clone :: Clone for __BindgenUnionField < T > { # [ inline ] fn clone ( & self ) -> Self { Self :: new ( ) } } impl < T > :: std :: marker :: Copy for __BindgenUnionField < T > { } impl < T > :: std :: fmt :: Debug for __BindgenUnionField < T > { fn fmt ( & self , fmt : & mut :: std :: fmt :: Formatter ) -> :: std :: fmt :: Result { fmt . write_str ( "__BindgenUnionField" ) } } impl < T > :: std :: hash :: Hash for __BindgenUnionField < T > { fn hash < H : :: std :: hash :: Hasher > ( & self , _state : & mut H ) { } } impl < T > :: std :: cmp :: PartialEq for __BindgenUnionField < T > { fn eq ( & self , _other : & __BindgenUnionField < T > ) -> bool { true } } impl < T > :: std :: cmp :: Eq for __BindgenUnionField < T > { } # [ allow ( unused_imports ) ] use self :: super :: root ; pub const NS_FONT_STYLE_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_STYLE_ITALIC : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_STYLE_OBLIQUE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_WEIGHT_NORMAL : :: std :: os :: raw :: c_uint = 400 ; pub const NS_FONT_WEIGHT_BOLD : :: std :: os :: raw :: c_uint = 700 ; pub const NS_FONT_WEIGHT_THIN : :: std :: os :: raw :: c_uint = 100 ; pub const NS_FONT_STRETCH_ULTRA_CONDENSED : :: std :: os :: raw :: c_int = -4 ; pub const NS_FONT_STRETCH_EXTRA_CONDENSED : :: std :: os :: raw :: c_int = -3 ; pub const NS_FONT_STRETCH_CONDENSED : :: std :: os :: raw :: c_int = -2 ; pub const NS_FONT_STRETCH_SEMI_CONDENSED : :: std :: os :: raw :: c_int = -1 ; pub const NS_FONT_STRETCH_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_STRETCH_SEMI_EXPANDED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_STRETCH_EXPANDED : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_STRETCH_EXTRA_EXPANDED : :: std :: os :: raw :: c_uint = 3 ; pub const NS_FONT_STRETCH_ULTRA_EXPANDED : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_SMOOTHING_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_SMOOTHING_GRAYSCALE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_KERNING_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_KERNING_NONE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_KERNING_NORMAL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_SYNTHESIS_WEIGHT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_SYNTHESIS_STYLE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_DISPLAY_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_DISPLAY_BLOCK : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_DISPLAY_SWAP : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_DISPLAY_FALLBACK : :: std :: os :: raw :: c_uint = 3 ; pub const NS_FONT_DISPLAY_OPTIONAL : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_VARIANT_ALTERNATES_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_ALTERNATES_HISTORICAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_ALTERNATES_STYLISTIC : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_ALTERNATES_STYLESET : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_VARIANT_ALTERNATES_CHARACTER_VARIANT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_FONT_VARIANT_ALTERNATES_SWASH : :: std :: os :: raw :: c_uint = 16 ; pub const NS_FONT_VARIANT_ALTERNATES_ORNAMENTS : :: std :: os :: raw :: c_uint = 32 ; pub const NS_FONT_VARIANT_ALTERNATES_ANNOTATION : :: std :: os :: raw :: c_uint = 64 ; pub const NS_FONT_VARIANT_ALTERNATES_COUNT : :: std :: os :: raw :: c_uint = 7 ; pub const NS_FONT_VARIANT_ALTERNATES_ENUMERATED_MASK : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_ALTERNATES_FUNCTIONAL_MASK : :: std :: os :: raw :: c_uint = 126 ; pub const NS_FONT_VARIANT_CAPS_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_CAPS_SMALLCAPS : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_CAPS_ALLSMALL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_CAPS_PETITECAPS : :: std :: os :: raw :: c_uint = 3 ; pub const NS_FONT_VARIANT_CAPS_ALLPETITE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_VARIANT_CAPS_TITLING : :: std :: os :: raw :: c_uint = 5 ; pub const NS_FONT_VARIANT_CAPS_UNICASE : :: std :: os :: raw :: c_uint = 6 ; pub const NS_FONT_VARIANT_EAST_ASIAN_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_EAST_ASIAN_JIS78 : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_EAST_ASIAN_JIS83 : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_EAST_ASIAN_JIS90 : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_VARIANT_EAST_ASIAN_JIS04 : :: std :: os :: raw :: c_uint = 8 ; pub const NS_FONT_VARIANT_EAST_ASIAN_SIMPLIFIED : :: std :: os :: raw :: c_uint = 16 ; pub const NS_FONT_VARIANT_EAST_ASIAN_TRADITIONAL : :: std :: os :: raw :: c_uint = 32 ; pub const NS_FONT_VARIANT_EAST_ASIAN_FULL_WIDTH : :: std :: os :: raw :: c_uint = 64 ; pub const NS_FONT_VARIANT_EAST_ASIAN_PROP_WIDTH : :: std :: os :: raw :: c_uint = 128 ; pub const NS_FONT_VARIANT_EAST_ASIAN_RUBY : :: std :: os :: raw :: c_uint = 256 ; pub const NS_FONT_VARIANT_EAST_ASIAN_COUNT : :: std :: os :: raw :: c_uint = 9 ; pub const NS_FONT_VARIANT_EAST_ASIAN_VARIANT_MASK : :: std :: os :: raw :: c_uint = 63 ; pub const NS_FONT_VARIANT_EAST_ASIAN_WIDTH_MASK : :: std :: os :: raw :: c_uint = 192 ; pub const NS_FONT_VARIANT_LIGATURES_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_LIGATURES_NONE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_LIGATURES_COMMON : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_LIGATURES_NO_COMMON : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_VARIANT_LIGATURES_DISCRETIONARY : :: std :: os :: raw :: c_uint = 8 ; pub const NS_FONT_VARIANT_LIGATURES_NO_DISCRETIONARY : :: std :: os :: raw :: c_uint = 16 ; pub const NS_FONT_VARIANT_LIGATURES_HISTORICAL : :: std :: os :: raw :: c_uint = 32 ; pub const NS_FONT_VARIANT_LIGATURES_NO_HISTORICAL : :: std :: os :: raw :: c_uint = 64 ; pub const NS_FONT_VARIANT_LIGATURES_CONTEXTUAL : :: std :: os :: raw :: c_uint = 128 ; pub const NS_FONT_VARIANT_LIGATURES_NO_CONTEXTUAL : :: std :: os :: raw :: c_uint = 256 ; pub const NS_FONT_VARIANT_LIGATURES_COUNT : :: std :: os :: raw :: c_uint = 9 ; pub const NS_FONT_VARIANT_LIGATURES_COMMON_MASK : :: std :: os :: raw :: c_uint = 6 ; pub const NS_FONT_VARIANT_LIGATURES_DISCRETIONARY_MASK : :: std :: os :: raw :: c_uint = 24 ; pub const NS_FONT_VARIANT_LIGATURES_HISTORICAL_MASK : :: std :: os :: raw :: c_uint = 96 ; pub const NS_FONT_VARIANT_LIGATURES_CONTEXTUAL_MASK : :: std :: os :: raw :: c_uint = 384 ; pub const NS_FONT_VARIANT_NUMERIC_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_NUMERIC_LINING : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_NUMERIC_OLDSTYLE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_NUMERIC_PROPORTIONAL : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_VARIANT_NUMERIC_TABULAR : :: std :: os :: raw :: c_uint = 8 ; pub const NS_FONT_VARIANT_NUMERIC_DIAGONAL_FRACTIONS : :: std :: os :: raw :: c_uint = 16 ; pub const NS_FONT_VARIANT_NUMERIC_STACKED_FRACTIONS : :: std :: os :: raw :: c_uint = 32 ; pub const NS_FONT_VARIANT_NUMERIC_SLASHZERO : :: std :: os :: raw :: c_uint = 64 ; pub const NS_FONT_VARIANT_NUMERIC_ORDINAL : :: std :: os :: raw :: c_uint = 128 ; pub const NS_FONT_VARIANT_NUMERIC_COUNT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_FONT_VARIANT_NUMERIC_FIGURE_MASK : :: std :: os :: raw :: c_uint = 3 ; pub const NS_FONT_VARIANT_NUMERIC_SPACING_MASK : :: std :: os :: raw :: c_uint = 12 ; pub const NS_FONT_VARIANT_NUMERIC_FRACTION_MASK : :: std :: os :: raw :: c_uint = 48 ; pub const NS_FONT_VARIANT_POSITION_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_POSITION_SUPER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_POSITION_SUB : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_WIDTH_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_WIDTH_FULL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_WIDTH_HALF : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_WIDTH_THIRD : :: std :: os :: raw :: c_uint = 3 ; pub const NS_FONT_VARIANT_WIDTH_QUARTER : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_SUBSCRIPT_OFFSET_RATIO : f64 = 0.2 ; pub const NS_FONT_SUPERSCRIPT_OFFSET_RATIO : f64 = 0.34 ; pub const NS_FONT_SUB_SUPER_SIZE_RATIO_SMALL : f64 = 0.82 ; pub const NS_FONT_SUB_SUPER_SIZE_RATIO_LARGE : f64 = 0.667 ; pub const NS_FONT_SUB_SUPER_SMALL_SIZE : f64 = 20. ; pub const NS_FONT_SUB_SUPER_LARGE_SIZE : f64 = 45. ; pub const NS_FONT_VARIANT_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_SMALL_CAPS : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COLOR_INHERIT_FROM_BODY : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_WILL_CHANGE_STACKING_CONTEXT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WILL_CHANGE_TRANSFORM : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_WILL_CHANGE_SCROLL : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_WILL_CHANGE_OPACITY : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_WILL_CHANGE_FIXPOS_CB : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_WILL_CHANGE_ABSPOS_CB : :: std :: os :: raw :: c_uint = 32 ; pub const NS_STYLE_ANIMATION_ITERATION_COUNT_INFINITE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_ANIMATION_PLAY_STATE_RUNNING : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_ANIMATION_PLAY_STATE_PAUSED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_IMAGELAYER_ATTACHMENT_SCROLL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_IMAGELAYER_ATTACHMENT_FIXED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_IMAGELAYER_ATTACHMENT_LOCAL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_IMAGELAYER_CLIP_MOZ_ALMOST_PADDING : :: std :: os :: raw :: c_uint = 127 ; pub const NS_STYLE_IMAGELAYER_POSITION_CENTER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_IMAGELAYER_POSITION_TOP : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_IMAGELAYER_POSITION_BOTTOM : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_IMAGELAYER_POSITION_LEFT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_IMAGELAYER_POSITION_RIGHT : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_IMAGELAYER_SIZE_CONTAIN : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_IMAGELAYER_SIZE_COVER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_MASK_MODE_ALPHA : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_MASK_MODE_LUMINANCE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_MASK_MODE_MATCH_SOURCE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_BG_INLINE_POLICY_EACH_BOX : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BG_INLINE_POLICY_CONTINUOUS : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BG_INLINE_POLICY_BOUNDING_BOX : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_BORDER_COLLAPSE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BORDER_SEPARATE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BORDER_WIDTH_THIN : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BORDER_WIDTH_MEDIUM : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BORDER_WIDTH_THICK : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_BORDER_STYLE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BORDER_STYLE_GROOVE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BORDER_STYLE_RIDGE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_BORDER_STYLE_DOTTED : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_BORDER_STYLE_DASHED : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_BORDER_STYLE_SOLID : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_BORDER_STYLE_DOUBLE : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_BORDER_STYLE_INSET : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_BORDER_STYLE_OUTSET : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_BORDER_STYLE_HIDDEN : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_BORDER_STYLE_AUTO : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_BORDER_IMAGE_REPEAT_STRETCH : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BORDER_IMAGE_REPEAT_REPEAT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BORDER_IMAGE_REPEAT_ROUND : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_BORDER_IMAGE_REPEAT_SPACE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_BORDER_IMAGE_SLICE_NOFILL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BORDER_IMAGE_SLICE_FILL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CURSOR_AUTO : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CURSOR_CROSSHAIR : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_CURSOR_DEFAULT : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_CURSOR_POINTER : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_CURSOR_MOVE : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_CURSOR_E_RESIZE : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_CURSOR_NE_RESIZE : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_CURSOR_NW_RESIZE : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_CURSOR_N_RESIZE : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_CURSOR_SE_RESIZE : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_CURSOR_SW_RESIZE : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_CURSOR_S_RESIZE : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_CURSOR_W_RESIZE : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_CURSOR_TEXT : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_CURSOR_WAIT : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_CURSOR_HELP : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_CURSOR_COPY : :: std :: os :: raw :: c_uint = 17 ; pub const NS_STYLE_CURSOR_ALIAS : :: std :: os :: raw :: c_uint = 18 ; pub const NS_STYLE_CURSOR_CONTEXT_MENU : :: std :: os :: raw :: c_uint = 19 ; pub const NS_STYLE_CURSOR_CELL : :: std :: os :: raw :: c_uint = 20 ; pub const NS_STYLE_CURSOR_GRAB : :: std :: os :: raw :: c_uint = 21 ; pub const NS_STYLE_CURSOR_GRABBING : :: std :: os :: raw :: c_uint = 22 ; pub const NS_STYLE_CURSOR_SPINNING : :: std :: os :: raw :: c_uint = 23 ; pub const NS_STYLE_CURSOR_ZOOM_IN : :: std :: os :: raw :: c_uint = 24 ; pub const NS_STYLE_CURSOR_ZOOM_OUT : :: std :: os :: raw :: c_uint = 25 ; pub const NS_STYLE_CURSOR_NOT_ALLOWED : :: std :: os :: raw :: c_uint = 26 ; pub const NS_STYLE_CURSOR_COL_RESIZE : :: std :: os :: raw :: c_uint = 27 ; pub const NS_STYLE_CURSOR_ROW_RESIZE : :: std :: os :: raw :: c_uint = 28 ; pub const NS_STYLE_CURSOR_NO_DROP : :: std :: os :: raw :: c_uint = 29 ; pub const NS_STYLE_CURSOR_VERTICAL_TEXT : :: std :: os :: raw :: c_uint = 30 ; pub const NS_STYLE_CURSOR_ALL_SCROLL : :: std :: os :: raw :: c_uint = 31 ; pub const NS_STYLE_CURSOR_NESW_RESIZE : :: std :: os :: raw :: c_uint = 32 ; pub const NS_STYLE_CURSOR_NWSE_RESIZE : :: std :: os :: raw :: c_uint = 33 ; pub const NS_STYLE_CURSOR_NS_RESIZE : :: std :: os :: raw :: c_uint = 34 ; pub const NS_STYLE_CURSOR_EW_RESIZE : :: std :: os :: raw :: c_uint = 35 ; pub const NS_STYLE_CURSOR_NONE : :: std :: os :: raw :: c_uint = 36 ; pub const NS_STYLE_DIRECTION_LTR : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_DIRECTION_RTL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WRITING_MODE_HORIZONTAL_TB : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_WRITING_MODE_VERTICAL_RL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WRITING_MODE_VERTICAL_LR : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_WRITING_MODE_SIDEWAYS_MASK : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_WRITING_MODE_SIDEWAYS_RL : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_WRITING_MODE_SIDEWAYS_LR : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_CONTAIN_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_CONTAIN_STRICT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CONTAIN_LAYOUT : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_CONTAIN_STYLE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_CONTAIN_PAINT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_CONTAIN_ALL_BITS : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_ALIGN_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_ALIGN_NORMAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_ALIGN_START : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_ALIGN_END : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_ALIGN_FLEX_START : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_ALIGN_FLEX_END : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_ALIGN_CENTER : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_ALIGN_LEFT : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_ALIGN_RIGHT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_ALIGN_BASELINE : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_ALIGN_LAST_BASELINE : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_ALIGN_STRETCH : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_ALIGN_SELF_START : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_ALIGN_SELF_END : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_ALIGN_SPACE_BETWEEN : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_ALIGN_SPACE_AROUND : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_ALIGN_SPACE_EVENLY : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_ALIGN_LEGACY : :: std :: os :: raw :: c_uint = 32 ; pub const NS_STYLE_ALIGN_SAFE : :: std :: os :: raw :: c_uint = 64 ; pub const NS_STYLE_ALIGN_UNSAFE : :: std :: os :: raw :: c_uint = 128 ; pub const NS_STYLE_ALIGN_FLAG_BITS : :: std :: os :: raw :: c_uint = 224 ; pub const NS_STYLE_ALIGN_ALL_BITS : :: std :: os :: raw :: c_uint = 255 ; pub const NS_STYLE_ALIGN_ALL_SHIFT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_JUSTIFY_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_JUSTIFY_NORMAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_JUSTIFY_START : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_JUSTIFY_END : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_JUSTIFY_FLEX_START : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_JUSTIFY_FLEX_END : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_JUSTIFY_CENTER : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_JUSTIFY_LEFT : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_JUSTIFY_RIGHT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_JUSTIFY_BASELINE : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_JUSTIFY_LAST_BASELINE : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_JUSTIFY_STRETCH : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_JUSTIFY_SELF_START : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_JUSTIFY_SELF_END : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_JUSTIFY_SPACE_BETWEEN : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_JUSTIFY_SPACE_AROUND : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_JUSTIFY_SPACE_EVENLY : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_JUSTIFY_LEGACY : :: std :: os :: raw :: c_uint = 32 ; pub const NS_STYLE_JUSTIFY_SAFE : :: std :: os :: raw :: c_uint = 64 ; pub const NS_STYLE_JUSTIFY_UNSAFE : :: std :: os :: raw :: c_uint = 128 ; pub const NS_STYLE_JUSTIFY_FLAG_BITS : :: std :: os :: raw :: c_uint = 224 ; pub const NS_STYLE_JUSTIFY_ALL_BITS : :: std :: os :: raw :: c_uint = 255 ; pub const NS_STYLE_JUSTIFY_ALL_SHIFT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_FLEX_DIRECTION_ROW : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FLEX_DIRECTION_ROW_REVERSE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FLEX_DIRECTION_COLUMN : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FLEX_DIRECTION_COLUMN_REVERSE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_FLEX_WRAP_NOWRAP : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FLEX_WRAP_WRAP : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FLEX_WRAP_WRAP_REVERSE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_ORDER_INITIAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_JUSTIFY_CONTENT_FLEX_START : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_JUSTIFY_CONTENT_FLEX_END : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_JUSTIFY_CONTENT_CENTER : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_JUSTIFY_CONTENT_SPACE_BETWEEN : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_JUSTIFY_CONTENT_SPACE_AROUND : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_FILTER_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FILTER_URL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FILTER_BLUR : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FILTER_BRIGHTNESS : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_FILTER_CONTRAST : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_FILTER_GRAYSCALE : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_FILTER_INVERT : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_FILTER_OPACITY : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_FILTER_SATURATE : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_FILTER_SEPIA : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_FILTER_HUE_ROTATE : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_FILTER_DROP_SHADOW : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_FONT_STYLE_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FONT_STYLE_ITALIC : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FONT_STYLE_OBLIQUE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FONT_WEIGHT_NORMAL : :: std :: os :: raw :: c_uint = 400 ; pub const NS_STYLE_FONT_WEIGHT_BOLD : :: std :: os :: raw :: c_uint = 700 ; pub const NS_STYLE_FONT_WEIGHT_BOLDER : :: std :: os :: raw :: c_int = -1 ; pub const NS_STYLE_FONT_WEIGHT_LIGHTER : :: std :: os :: raw :: c_int = -2 ; pub const NS_STYLE_FONT_SIZE_XXSMALL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FONT_SIZE_XSMALL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FONT_SIZE_SMALL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FONT_SIZE_MEDIUM : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_FONT_SIZE_LARGE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_FONT_SIZE_XLARGE : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_FONT_SIZE_XXLARGE : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_FONT_SIZE_XXXLARGE : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_FONT_SIZE_LARGER : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_FONT_SIZE_SMALLER : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_FONT_SIZE_NO_KEYWORD : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_FONT_STRETCH_ULTRA_CONDENSED : :: std :: os :: raw :: c_int = -4 ; pub const NS_STYLE_FONT_STRETCH_EXTRA_CONDENSED : :: std :: os :: raw :: c_int = -3 ; pub const NS_STYLE_FONT_STRETCH_CONDENSED : :: std :: os :: raw :: c_int = -2 ; pub const NS_STYLE_FONT_STRETCH_SEMI_CONDENSED : :: std :: os :: raw :: c_int = -1 ; pub const NS_STYLE_FONT_STRETCH_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FONT_STRETCH_SEMI_EXPANDED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FONT_STRETCH_EXPANDED : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FONT_STRETCH_EXTRA_EXPANDED : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_FONT_STRETCH_ULTRA_EXPANDED : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_FONT_CAPTION : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FONT_ICON : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FONT_MENU : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_FONT_MESSAGE_BOX : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_FONT_SMALL_CAPTION : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_FONT_STATUS_BAR : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_FONT_WINDOW : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_FONT_DOCUMENT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_FONT_WORKSPACE : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_FONT_DESKTOP : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_FONT_INFO : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_FONT_DIALOG : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_FONT_BUTTON : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_FONT_PULL_DOWN_MENU : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_FONT_LIST : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_FONT_FIELD : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_GRID_AUTO_FLOW_ROW : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_GRID_AUTO_FLOW_COLUMN : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_GRID_AUTO_FLOW_DENSE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_GRID_TEMPLATE_SUBGRID : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_GRID_REPEAT_AUTO_FILL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_GRID_REPEAT_AUTO_FIT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_MATHML_DEFAULT_SCRIPT_SIZE_MULTIPLIER : f64 = 0.71 ; pub const NS_MATHML_DEFAULT_SCRIPT_MIN_SIZE_PT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_MATHML_MATHVARIANT_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_MATHML_MATHVARIANT_NORMAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_MATHML_MATHVARIANT_BOLD : :: std :: os :: raw :: c_uint = 2 ; pub const NS_MATHML_MATHVARIANT_ITALIC : :: std :: os :: raw :: c_uint = 3 ; pub const NS_MATHML_MATHVARIANT_BOLD_ITALIC : :: std :: os :: raw :: c_uint = 4 ; pub const NS_MATHML_MATHVARIANT_SCRIPT : :: std :: os :: raw :: c_uint = 5 ; pub const NS_MATHML_MATHVARIANT_BOLD_SCRIPT : :: std :: os :: raw :: c_uint = 6 ; pub const NS_MATHML_MATHVARIANT_FRAKTUR : :: std :: os :: raw :: c_uint = 7 ; pub const NS_MATHML_MATHVARIANT_DOUBLE_STRUCK : :: std :: os :: raw :: c_uint = 8 ; pub const NS_MATHML_MATHVARIANT_BOLD_FRAKTUR : :: std :: os :: raw :: c_uint = 9 ; pub const NS_MATHML_MATHVARIANT_SANS_SERIF : :: std :: os :: raw :: c_uint = 10 ; pub const NS_MATHML_MATHVARIANT_BOLD_SANS_SERIF : :: std :: os :: raw :: c_uint = 11 ; pub const NS_MATHML_MATHVARIANT_SANS_SERIF_ITALIC : :: std :: os :: raw :: c_uint = 12 ; pub const NS_MATHML_MATHVARIANT_SANS_SERIF_BOLD_ITALIC : :: std :: os :: raw :: c_uint = 13 ; pub const NS_MATHML_MATHVARIANT_MONOSPACE : :: std :: os :: raw :: c_uint = 14 ; pub const NS_MATHML_MATHVARIANT_INITIAL : :: std :: os :: raw :: c_uint = 15 ; pub const NS_MATHML_MATHVARIANT_TAILED : :: std :: os :: raw :: c_uint = 16 ; pub const NS_MATHML_MATHVARIANT_LOOPED : :: std :: os :: raw :: c_uint = 17 ; pub const NS_MATHML_MATHVARIANT_STRETCHED : :: std :: os :: raw :: c_uint = 18 ; pub const NS_MATHML_DISPLAYSTYLE_INLINE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_MATHML_DISPLAYSTYLE_BLOCK : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WIDTH_MAX_CONTENT : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_WIDTH_MIN_CONTENT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WIDTH_FIT_CONTENT : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_WIDTH_AVAILABLE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_POSITION_STATIC : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_POSITION_RELATIVE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_POSITION_ABSOLUTE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_POSITION_FIXED : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_POSITION_STICKY : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_CLIP_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_CLIP_RECT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CLIP_TYPE_MASK : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_CLIP_LEFT_AUTO : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_CLIP_TOP_AUTO : :: std :: os :: raw :: c_uint = 32 ; pub const NS_STYLE_CLIP_RIGHT_AUTO : :: std :: os :: raw :: c_uint = 64 ; pub const NS_STYLE_CLIP_BOTTOM_AUTO : :: std :: os :: raw :: c_uint = 128 ; pub const NS_STYLE_FRAME_YES : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FRAME_NO : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FRAME_0 : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FRAME_1 : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_FRAME_ON : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_FRAME_OFF : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_FRAME_AUTO : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_FRAME_SCROLL : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_FRAME_NOSCROLL : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_OVERFLOW_VISIBLE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_OVERFLOW_HIDDEN : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_OVERFLOW_SCROLL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_OVERFLOW_AUTO : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_OVERFLOW_CLIP : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_OVERFLOW_SCROLLBARS_HORIZONTAL : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_OVERFLOW_SCROLLBARS_VERTICAL : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_OVERFLOW_CLIP_BOX_PADDING_BOX : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_OVERFLOW_CLIP_BOX_CONTENT_BOX : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_LIST_STYLE_CUSTOM : :: std :: os :: raw :: c_int = -1 ; pub const NS_STYLE_LIST_STYLE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_LIST_STYLE_DECIMAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_LIST_STYLE_DISC : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_LIST_STYLE_CIRCLE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_LIST_STYLE_SQUARE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_LIST_STYLE_DISCLOSURE_CLOSED : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_LIST_STYLE_DISCLOSURE_OPEN : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_LIST_STYLE_HEBREW : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_LIST_STYLE_JAPANESE_FORMAL : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_LIST_STYLE_KOREAN_HANGUL_FORMAL : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_LIST_STYLE_KOREAN_HANJA_INFORMAL : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_LIST_STYLE_KOREAN_HANJA_FORMAL : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_LIST_STYLE_ETHIOPIC_NUMERIC : :: std :: os :: raw :: c_uint = 17 ; pub const NS_STYLE_LIST_STYLE_LOWER_ROMAN : :: std :: os :: raw :: c_uint = 100 ; pub const NS_STYLE_LIST_STYLE_UPPER_ROMAN : :: std :: os :: raw :: c_uint = 101 ; pub const NS_STYLE_LIST_STYLE_LOWER_ALPHA : :: std :: os :: raw :: c_uint = 102 ; pub const NS_STYLE_LIST_STYLE_UPPER_ALPHA : :: std :: os :: raw :: c_uint = 103 ; pub const NS_STYLE_LIST_STYLE_POSITION_INSIDE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_LIST_STYLE_POSITION_OUTSIDE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_MARGIN_SIZE_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_POINTER_EVENTS_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_POINTER_EVENTS_VISIBLEPAINTED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_POINTER_EVENTS_VISIBLEFILL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_POINTER_EVENTS_VISIBLESTROKE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_POINTER_EVENTS_VISIBLE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_POINTER_EVENTS_PAINTED : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_POINTER_EVENTS_FILL : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_POINTER_EVENTS_STROKE : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_POINTER_EVENTS_ALL : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_POINTER_EVENTS_AUTO : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_IMAGE_ORIENTATION_FLIP : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_IMAGE_ORIENTATION_FROM_IMAGE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_ISOLATION_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_ISOLATION_ISOLATE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_OBJECT_FIT_FILL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_OBJECT_FIT_CONTAIN : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_OBJECT_FIT_COVER : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_OBJECT_FIT_NONE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_OBJECT_FIT_SCALE_DOWN : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_RESIZE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_RESIZE_BOTH : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_RESIZE_HORIZONTAL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_RESIZE_VERTICAL : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TEXT_ALIGN_START : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_ALIGN_LEFT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_ALIGN_RIGHT : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_ALIGN_CENTER : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TEXT_ALIGN_JUSTIFY : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TEXT_ALIGN_CHAR : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_TEXT_ALIGN_END : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_TEXT_ALIGN_AUTO : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_TEXT_ALIGN_MOZ_CENTER : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TEXT_ALIGN_MOZ_RIGHT : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_TEXT_ALIGN_MOZ_LEFT : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_TEXT_ALIGN_MOZ_CENTER_OR_INHERIT : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_TEXT_ALIGN_UNSAFE : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_TEXT_ALIGN_MATCH_PARENT : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_TEXT_DECORATION_LINE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_DECORATION_LINE_OVERLINE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TEXT_DECORATION_LINE_BLINK : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_TEXT_DECORATION_LINE_LINES_MASK : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_DOTTED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_DASHED : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_SOLID : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_DOUBLE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_WAVY : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_MAX : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_TEXT_OVERFLOW_CLIP : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_OVERFLOW_ELLIPSIS : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_OVERFLOW_STRING : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_TRANSFORM_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_TRANSFORM_CAPITALIZE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_TRANSFORM_LOWERCASE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_TRANSFORM_UPPERCASE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TEXT_TRANSFORM_FULL_WIDTH : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TOUCH_ACTION_NONE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TOUCH_ACTION_AUTO : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TOUCH_ACTION_PAN_X : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TOUCH_ACTION_PAN_Y : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TOUCH_ACTION_MANIPULATION : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_TOP_LAYER_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TOP_LAYER_TOP : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_LINEAR : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE_IN : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE_OUT : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE_IN_OUT : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_START : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_END : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_VERTICAL_ALIGN_BASELINE : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_VERTICAL_ALIGN_SUB : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_VERTICAL_ALIGN_SUPER : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_VERTICAL_ALIGN_TOP : :: std :: os :: raw :: c_uint = 17 ; pub const NS_STYLE_VERTICAL_ALIGN_TEXT_TOP : :: std :: os :: raw :: c_uint = 18 ; pub const NS_STYLE_VERTICAL_ALIGN_MIDDLE : :: std :: os :: raw :: c_uint = 19 ; pub const NS_STYLE_VERTICAL_ALIGN_TEXT_BOTTOM : :: std :: os :: raw :: c_uint = 20 ; pub const NS_STYLE_VERTICAL_ALIGN_BOTTOM : :: std :: os :: raw :: c_uint = 21 ; pub const NS_STYLE_VERTICAL_ALIGN_MIDDLE_WITH_BASELINE : :: std :: os :: raw :: c_uint = 22 ; pub const NS_STYLE_VISIBILITY_HIDDEN : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_VISIBILITY_VISIBLE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_VISIBILITY_COLLAPSE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TABSIZE_INITIAL : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_WORDBREAK_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_WORDBREAK_BREAK_ALL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WORDBREAK_KEEP_ALL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_OVERFLOWWRAP_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_OVERFLOWWRAP_BREAK_WORD : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_RUBY_ALIGN_START : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_RUBY_ALIGN_CENTER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_RUBY_ALIGN_SPACE_BETWEEN : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_RUBY_ALIGN_SPACE_AROUND : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_RUBY_POSITION_OVER : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_RUBY_POSITION_UNDER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_RUBY_POSITION_INTER_CHARACTER : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_SIZE_ADJUST_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_SIZE_ADJUST_AUTO : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_ORIENTATION_MIXED : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_ORIENTATION_UPRIGHT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_ORIENTATION_SIDEWAYS : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_COMBINE_UPRIGHT_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_COMBINE_UPRIGHT_ALL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_COMBINE_UPRIGHT_DIGITS_2 : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_COMBINE_UPRIGHT_DIGITS_3 : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TEXT_COMBINE_UPRIGHT_DIGITS_4 : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_LINE_HEIGHT_BLOCK_HEIGHT : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_UNICODE_BIDI_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_UNICODE_BIDI_EMBED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_UNICODE_BIDI_ISOLATE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_UNICODE_BIDI_BIDI_OVERRIDE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_UNICODE_BIDI_ISOLATE_OVERRIDE : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_UNICODE_BIDI_PLAINTEXT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TABLE_LAYOUT_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TABLE_LAYOUT_FIXED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TABLE_EMPTY_CELLS_HIDE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TABLE_EMPTY_CELLS_SHOW : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CAPTION_SIDE_TOP : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_CAPTION_SIDE_RIGHT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CAPTION_SIDE_BOTTOM : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_CAPTION_SIDE_LEFT : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_CAPTION_SIDE_TOP_OUTSIDE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_CAPTION_SIDE_BOTTOM_OUTSIDE : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_CELL_SCOPE_ROW : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_CELL_SCOPE_COL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CELL_SCOPE_ROWGROUP : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_CELL_SCOPE_COLGROUP : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_PAGE_MARKS_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_PAGE_MARKS_CROP : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_PAGE_MARKS_REGISTER : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_PAGE_SIZE_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_PAGE_SIZE_PORTRAIT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_PAGE_SIZE_LANDSCAPE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_PAGE_BREAK_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_PAGE_BREAK_ALWAYS : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_PAGE_BREAK_AVOID : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_PAGE_BREAK_LEFT : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_PAGE_BREAK_RIGHT : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_COLUMN_COUNT_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COLUMN_COUNT_UNLIMITED : :: std :: os :: raw :: c_int = -1 ; pub const NS_STYLE_COLUMN_FILL_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COLUMN_FILL_BALANCE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COLUMN_SPAN_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COLUMN_SPAN_ALL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_IME_MODE_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_IME_MODE_NORMAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_IME_MODE_ACTIVE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_IME_MODE_DISABLED : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_IME_MODE_INACTIVE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_GRADIENT_SHAPE_LINEAR : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_GRADIENT_SHAPE_ELLIPTICAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_GRADIENT_SHAPE_CIRCULAR : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_GRADIENT_SIZE_CLOSEST_SIDE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_GRADIENT_SIZE_CLOSEST_CORNER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_GRADIENT_SIZE_FARTHEST_SIDE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_GRADIENT_SIZE_FARTHEST_CORNER : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_GRADIENT_SIZE_EXPLICIT_SIZE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_CONTEXT_PROPERTY_FILL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CONTEXT_PROPERTY_STROKE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_CONTEXT_PROPERTY_FILL_OPACITY : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_CONTEXT_PROPERTY_STROKE_OPACITY : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_WINDOW_SHADOW_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_WINDOW_SHADOW_DEFAULT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WINDOW_SHADOW_MENU : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_WINDOW_SHADOW_TOOLTIP : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_WINDOW_SHADOW_SHEET : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_DOMINANT_BASELINE_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_DOMINANT_BASELINE_USE_SCRIPT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_DOMINANT_BASELINE_NO_CHANGE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_DOMINANT_BASELINE_RESET_SIZE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_DOMINANT_BASELINE_IDEOGRAPHIC : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_DOMINANT_BASELINE_ALPHABETIC : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_DOMINANT_BASELINE_HANGING : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_DOMINANT_BASELINE_MATHEMATICAL : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_DOMINANT_BASELINE_CENTRAL : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_DOMINANT_BASELINE_MIDDLE : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_DOMINANT_BASELINE_TEXT_AFTER_EDGE : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_DOMINANT_BASELINE_TEXT_BEFORE_EDGE : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_IMAGE_RENDERING_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_IMAGE_RENDERING_OPTIMIZESPEED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_IMAGE_RENDERING_OPTIMIZEQUALITY : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_IMAGE_RENDERING_CRISPEDGES : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_MASK_TYPE_LUMINANCE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_MASK_TYPE_ALPHA : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_PAINT_ORDER_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_PAINT_ORDER_FILL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_PAINT_ORDER_STROKE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_PAINT_ORDER_MARKERS : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_PAINT_ORDER_LAST_VALUE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_PAINT_ORDER_BITWIDTH : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_SHAPE_RENDERING_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_SHAPE_RENDERING_OPTIMIZESPEED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_SHAPE_RENDERING_CRISPEDGES : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_SHAPE_RENDERING_GEOMETRICPRECISION : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_STROKE_LINECAP_BUTT : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_STROKE_LINECAP_ROUND : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_STROKE_LINECAP_SQUARE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_STROKE_LINEJOIN_MITER : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_STROKE_LINEJOIN_ROUND : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_STROKE_LINEJOIN_BEVEL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_STROKE_PROP_CONTEXT_VALUE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_ANCHOR_START : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_ANCHOR_MIDDLE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_ANCHOR_END : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_EMPHASIS_POSITION_OVER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_EMPHASIS_POSITION_UNDER : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_EMPHASIS_POSITION_LEFT : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TEXT_EMPHASIS_POSITION_RIGHT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TEXT_EMPHASIS_POSITION_DEFAULT : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_TEXT_EMPHASIS_POSITION_DEFAULT_ZH : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_FILL_MASK : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_FILLED : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_SHAPE_MASK : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_DOT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_CIRCLE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_DOUBLE_CIRCLE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_TRIANGLE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_SESAME : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_STRING : :: std :: os :: raw :: c_uint = 255 ; pub const NS_STYLE_TEXT_RENDERING_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_RENDERING_OPTIMIZESPEED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_RENDERING_OPTIMIZELEGIBILITY : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_RENDERING_GEOMETRICPRECISION : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_COLOR_ADJUST_ECONOMY : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COLOR_ADJUST_EXACT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COLOR_INTERPOLATION_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COLOR_INTERPOLATION_SRGB : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COLOR_INTERPOLATION_LINEARRGB : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_VECTOR_EFFECT_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_VECTOR_EFFECT_NON_SCALING_STROKE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BACKFACE_VISIBILITY_VISIBLE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BACKFACE_VISIBILITY_HIDDEN : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TRANSFORM_STYLE_FLAT : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TRANSFORM_STYLE_PRESERVE_3D : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CONTEXT_FILL_OPACITY : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_CONTEXT_STROKE_OPACITY : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BLEND_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BLEND_MULTIPLY : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BLEND_SCREEN : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_BLEND_OVERLAY : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_BLEND_DARKEN : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_BLEND_LIGHTEN : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_BLEND_COLOR_DODGE : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_BLEND_COLOR_BURN : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_BLEND_HARD_LIGHT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_BLEND_SOFT_LIGHT : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_BLEND_DIFFERENCE : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_BLEND_EXCLUSION : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_BLEND_HUE : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_BLEND_SATURATION : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_BLEND_COLOR : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_BLEND_LUMINOSITY : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_MASK_COMPOSITE_ADD : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_MASK_COMPOSITE_SUBTRACT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_MASK_COMPOSITE_INTERSECT : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_MASK_COMPOSITE_EXCLUDE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_CONTROL_CHARACTER_VISIBILITY_HIDDEN : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_CONTROL_CHARACTER_VISIBILITY_VISIBLE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COUNTER_SYSTEM_CYCLIC : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COUNTER_SYSTEM_NUMERIC : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COUNTER_SYSTEM_ALPHABETIC : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_COUNTER_SYSTEM_SYMBOLIC : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_COUNTER_SYSTEM_ADDITIVE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_COUNTER_SYSTEM_FIXED : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_COUNTER_SYSTEM_EXTENDS : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_COUNTER_RANGE_INFINITE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COUNTER_SPEAKAS_BULLETS : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COUNTER_SPEAKAS_NUMBERS : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COUNTER_SPEAKAS_WORDS : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_COUNTER_SPEAKAS_SPELL_OUT : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_COUNTER_SPEAKAS_OTHER : :: std :: os :: raw :: c_uint = 255 ; pub const NS_STYLE_SCROLL_BEHAVIOR_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_SCROLL_BEHAVIOR_SMOOTH : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_SCROLL_SNAP_TYPE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_SCROLL_SNAP_TYPE_MANDATORY : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_SCROLL_SNAP_TYPE_PROXIMITY : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_ORIENTATION_PORTRAIT : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_ORIENTATION_LANDSCAPE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_SCAN_PROGRESSIVE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_SCAN_INTERLACE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_DISPLAY_MODE_BROWSER : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_DISPLAY_MODE_MINIMAL_UI : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_DISPLAY_MODE_STANDALONE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_DISPLAY_MODE_FULLSCREEN : :: std :: os :: raw :: c_uint = 3 ; pub const CSS_PSEUDO_ELEMENT_IS_CSS2 : :: std :: os :: raw :: c_uint = 1 ; pub const CSS_PSEUDO_ELEMENT_CONTAINS_ELEMENTS : :: std :: os :: raw :: c_uint = 2 ; pub const CSS_PSEUDO_ELEMENT_SUPPORTS_STYLE_ATTRIBUTE : :: std :: os :: raw :: c_uint = 4 ; pub const CSS_PSEUDO_ELEMENT_SUPPORTS_USER_ACTION_STATE : :: std :: os :: raw :: c_uint = 8 ; pub const CSS_PSEUDO_ELEMENT_UA_SHEET_ONLY : :: std :: os :: raw :: c_uint = 16 ; pub const CSS_PSEUDO_ELEMENT_IS_JS_CREATED_NAC : :: std :: os :: raw :: c_uint = 32 ; pub const CSS_PSEUDO_ELEMENT_IS_FLEX_OR_GRID_ITEM : :: std :: os :: raw :: c_uint = 64 ; pub const kNameSpaceID_Unknown : :: std :: os :: raw :: c_int = -1 ; pub const kNameSpaceID_XMLNS : :: std :: os :: raw :: c_uint = 1 ; pub const kNameSpaceID_XML : :: std :: os :: raw :: c_uint = 2 ; pub const kNameSpaceID_XHTML : :: std :: os :: raw :: c_uint = 3 ; pub const kNameSpaceID_XLink : :: std :: os :: raw :: c_uint = 4 ; pub const kNameSpaceID_XSLT : :: std :: os :: raw :: c_uint = 5 ; pub const kNameSpaceID_XBL : :: std :: os :: raw :: c_uint = 6 ; pub const kNameSpaceID_MathML : :: std :: os :: raw :: c_uint = 7 ; pub const kNameSpaceID_RDF : :: std :: os :: raw :: c_uint = 8 ; pub const kNameSpaceID_XUL : :: std :: os :: raw :: c_uint = 9 ; pub const kNameSpaceID_SVG : :: std :: os :: raw :: c_uint = 10 ; pub const kNameSpaceID_disabled_MathML : :: std :: os :: raw :: c_uint = 11 ; pub const kNameSpaceID_disabled_SVG : :: std :: os :: raw :: c_uint = 12 ; pub const kNameSpaceID_LastBuiltin : :: std :: os :: raw :: c_uint = 12 ; pub const kNameSpaceID_Wildcard : :: std :: os :: raw :: c_int = -2147483648 ; pub const NS_AUTHOR_SPECIFIED_BACKGROUND : :: std :: os :: raw :: c_uint = 1 ; pub const NS_AUTHOR_SPECIFIED_BORDER : :: std :: os :: raw :: c_uint = 2 ; pub const NS_AUTHOR_SPECIFIED_PADDING : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_INHERIT_MASK : :: std :: os :: raw :: c_uint = 16777215 ; pub const NS_STYLE_HAS_TEXT_DECORATION_LINES : :: std :: os :: raw :: c_uint = 16777216 ; pub const NS_STYLE_HAS_PSEUDO_ELEMENT_DATA : :: std :: os :: raw :: c_uint = 33554432 ; pub const NS_STYLE_RELEVANT_LINK_VISITED : :: std :: os :: raw :: c_uint = 67108864 ; pub const NS_STYLE_IS_STYLE_IF_VISITED : :: std :: os :: raw :: c_uint = 134217728 ; pub const NS_STYLE_CHILD_USES_GRANDANCESTOR_STYLE : :: std :: os :: raw :: c_uint = 268435456 ; pub const NS_STYLE_IS_SHARED : :: std :: os :: raw :: c_uint = 536870912 ; pub const NS_STYLE_IS_GOING_AWAY : :: std :: os :: raw :: c_uint = 1073741824 ; pub const NS_STYLE_SUPPRESS_LINEBREAK : :: std :: os :: raw :: c_uint = 2147483648 ; pub const NS_STYLE_IN_DISPLAY_NONE_SUBTREE : :: std :: os :: raw :: c_ulonglong = 4294967296 ; pub const NS_STYLE_INELIGIBLE_FOR_SHARING : :: std :: os :: raw :: c_ulonglong = 8589934592 ; pub const NS_STYLE_HAS_CHILD_THAT_USES_RESET_STYLE : :: std :: os :: raw :: c_ulonglong = 17179869184 ; pub const NS_STYLE_IS_TEXT_COMBINED : :: std :: os :: raw :: c_ulonglong = 34359738368 ; pub const NS_STYLE_CONTEXT_IS_GECKO : :: std :: os :: raw :: c_ulonglong = 68719476736 ; pub const NS_STYLE_CONTEXT_TYPE_SHIFT : :: std :: os :: raw :: c_uint = 37 ; pub mod std { # [ allow ( unused_imports ) ] use self :: super :: super :: root ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct pair < _T1 , _T2 > { pub first : _T1 , pub second : _T2 , pub _phantom_0 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < _T1 > > , pub _phantom_1 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < _T2 > > , } pub type pair_first_type < _T1 > = _T1 ; pub type pair_second_type < _T2 > = _T2 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct input_iterator_tag { pub _address : u8 , } # [ test ] fn bindgen_test_layout_input_iterator_tag ( ) { assert_eq ! ( :: std :: mem :: size_of :: < input_iterator_tag > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( input_iterator_tag ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < input_iterator_tag > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( input_iterator_tag ) ) ) ; } impl Clone for input_iterator_tag { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct iterator { pub _address : u8 , } pub type iterator_iterator_category < _Category > = _Category ; pub type iterator_value_type < _Tp > = _Tp ; pub type iterator_difference_type < _Distance > = _Distance ; pub type iterator_pointer < _Pointer > = _Pointer ; pub type iterator_reference < _Reference > = _Reference ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct atomic { pub _address : u8 , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct function { pub _address : u8 , } pub type _Base_bitset__WordT = :: std :: os :: raw :: c_ulong ; pub type bitset__Base = u8 ; pub type bitset__WordT = :: std :: os :: raw :: c_ulong ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct bitset_reference { pub _M_wp : * mut root :: std :: bitset__WordT , pub _M_bpos : usize , } } pub mod __gnu_cxx { # [ allow ( unused_imports ) ] use self :: super :: super :: root ; } pub mod mozilla { # [ allow ( unused_imports ) ] use self :: super :: super :: root ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct fallible_t { pub _address : u8 , } # [ test ] fn bindgen_test_layout_fallible_t ( ) { assert_eq ! ( :: std :: mem :: size_of :: < fallible_t > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( fallible_t ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < fallible_t > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( fallible_t ) ) ) ; } impl Clone for fallible_t { fn clone ( & self ) -> Self { * self } } pub type IntegralConstant_ValueType < T > = T ; pub type IntegralConstant_Type = u8 ; 
+# [ allow ( non_snake_case , non_camel_case_types , non_upper_case_globals ) ] pub mod root { # [ repr ( C ) ] pub struct __BindgenUnionField < T > ( :: std :: marker :: PhantomData < T > ) ; impl < T > __BindgenUnionField < T > { # [ inline ] pub fn new ( ) -> Self { __BindgenUnionField ( :: std :: marker :: PhantomData ) } # [ inline ] pub unsafe fn as_ref ( & self ) -> & T { :: std :: mem :: transmute ( self ) } # [ inline ] pub unsafe fn as_mut ( & mut self ) -> & mut T { :: std :: mem :: transmute ( self ) } } impl < T > :: std :: default :: Default for __BindgenUnionField < T > { # [ inline ] fn default ( ) -> Self { Self :: new ( ) } } impl < T > :: std :: clone :: Clone for __BindgenUnionField < T > { # [ inline ] fn clone ( & self ) -> Self { Self :: new ( ) } } impl < T > :: std :: marker :: Copy for __BindgenUnionField < T > { } impl < T > :: std :: fmt :: Debug for __BindgenUnionField < T > { fn fmt ( & self , fmt : & mut :: std :: fmt :: Formatter ) -> :: std :: fmt :: Result { fmt . write_str ( "__BindgenUnionField" ) } } impl < T > :: std :: hash :: Hash for __BindgenUnionField < T > { fn hash < H : :: std :: hash :: Hasher > ( & self , _state : & mut H ) { } } impl < T > :: std :: cmp :: PartialEq for __BindgenUnionField < T > { fn eq ( & self , _other : & __BindgenUnionField < T > ) -> bool { true } } impl < T > :: std :: cmp :: Eq for __BindgenUnionField < T > { } # [ allow ( unused_imports ) ] use self :: super :: root ; pub const NS_FONT_STYLE_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_STYLE_ITALIC : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_STYLE_OBLIQUE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_WEIGHT_NORMAL : :: std :: os :: raw :: c_uint = 400 ; pub const NS_FONT_WEIGHT_BOLD : :: std :: os :: raw :: c_uint = 700 ; pub const NS_FONT_WEIGHT_THIN : :: std :: os :: raw :: c_uint = 100 ; pub const NS_FONT_STRETCH_ULTRA_CONDENSED : :: std :: os :: raw :: c_int = -4 ; pub const NS_FONT_STRETCH_EXTRA_CONDENSED : :: std :: os :: raw :: c_int = -3 ; pub const NS_FONT_STRETCH_CONDENSED : :: std :: os :: raw :: c_int = -2 ; pub const NS_FONT_STRETCH_SEMI_CONDENSED : :: std :: os :: raw :: c_int = -1 ; pub const NS_FONT_STRETCH_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_STRETCH_SEMI_EXPANDED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_STRETCH_EXPANDED : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_STRETCH_EXTRA_EXPANDED : :: std :: os :: raw :: c_uint = 3 ; pub const NS_FONT_STRETCH_ULTRA_EXPANDED : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_SMOOTHING_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_SMOOTHING_GRAYSCALE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_KERNING_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_KERNING_NONE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_KERNING_NORMAL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_SYNTHESIS_WEIGHT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_SYNTHESIS_STYLE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_DISPLAY_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_DISPLAY_BLOCK : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_DISPLAY_SWAP : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_DISPLAY_FALLBACK : :: std :: os :: raw :: c_uint = 3 ; pub const NS_FONT_DISPLAY_OPTIONAL : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_VARIANT_ALTERNATES_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_ALTERNATES_HISTORICAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_ALTERNATES_STYLISTIC : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_ALTERNATES_STYLESET : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_VARIANT_ALTERNATES_CHARACTER_VARIANT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_FONT_VARIANT_ALTERNATES_SWASH : :: std :: os :: raw :: c_uint = 16 ; pub const NS_FONT_VARIANT_ALTERNATES_ORNAMENTS : :: std :: os :: raw :: c_uint = 32 ; pub const NS_FONT_VARIANT_ALTERNATES_ANNOTATION : :: std :: os :: raw :: c_uint = 64 ; pub const NS_FONT_VARIANT_ALTERNATES_COUNT : :: std :: os :: raw :: c_uint = 7 ; pub const NS_FONT_VARIANT_ALTERNATES_ENUMERATED_MASK : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_ALTERNATES_FUNCTIONAL_MASK : :: std :: os :: raw :: c_uint = 126 ; pub const NS_FONT_VARIANT_CAPS_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_CAPS_SMALLCAPS : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_CAPS_ALLSMALL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_CAPS_PETITECAPS : :: std :: os :: raw :: c_uint = 3 ; pub const NS_FONT_VARIANT_CAPS_ALLPETITE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_VARIANT_CAPS_TITLING : :: std :: os :: raw :: c_uint = 5 ; pub const NS_FONT_VARIANT_CAPS_UNICASE : :: std :: os :: raw :: c_uint = 6 ; pub const NS_FONT_VARIANT_EAST_ASIAN_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_EAST_ASIAN_JIS78 : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_EAST_ASIAN_JIS83 : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_EAST_ASIAN_JIS90 : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_VARIANT_EAST_ASIAN_JIS04 : :: std :: os :: raw :: c_uint = 8 ; pub const NS_FONT_VARIANT_EAST_ASIAN_SIMPLIFIED : :: std :: os :: raw :: c_uint = 16 ; pub const NS_FONT_VARIANT_EAST_ASIAN_TRADITIONAL : :: std :: os :: raw :: c_uint = 32 ; pub const NS_FONT_VARIANT_EAST_ASIAN_FULL_WIDTH : :: std :: os :: raw :: c_uint = 64 ; pub const NS_FONT_VARIANT_EAST_ASIAN_PROP_WIDTH : :: std :: os :: raw :: c_uint = 128 ; pub const NS_FONT_VARIANT_EAST_ASIAN_RUBY : :: std :: os :: raw :: c_uint = 256 ; pub const NS_FONT_VARIANT_EAST_ASIAN_COUNT : :: std :: os :: raw :: c_uint = 9 ; pub const NS_FONT_VARIANT_EAST_ASIAN_VARIANT_MASK : :: std :: os :: raw :: c_uint = 63 ; pub const NS_FONT_VARIANT_EAST_ASIAN_WIDTH_MASK : :: std :: os :: raw :: c_uint = 192 ; pub const NS_FONT_VARIANT_LIGATURES_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_LIGATURES_NONE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_LIGATURES_COMMON : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_LIGATURES_NO_COMMON : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_VARIANT_LIGATURES_DISCRETIONARY : :: std :: os :: raw :: c_uint = 8 ; pub const NS_FONT_VARIANT_LIGATURES_NO_DISCRETIONARY : :: std :: os :: raw :: c_uint = 16 ; pub const NS_FONT_VARIANT_LIGATURES_HISTORICAL : :: std :: os :: raw :: c_uint = 32 ; pub const NS_FONT_VARIANT_LIGATURES_NO_HISTORICAL : :: std :: os :: raw :: c_uint = 64 ; pub const NS_FONT_VARIANT_LIGATURES_CONTEXTUAL : :: std :: os :: raw :: c_uint = 128 ; pub const NS_FONT_VARIANT_LIGATURES_NO_CONTEXTUAL : :: std :: os :: raw :: c_uint = 256 ; pub const NS_FONT_VARIANT_LIGATURES_COUNT : :: std :: os :: raw :: c_uint = 9 ; pub const NS_FONT_VARIANT_LIGATURES_COMMON_MASK : :: std :: os :: raw :: c_uint = 6 ; pub const NS_FONT_VARIANT_LIGATURES_DISCRETIONARY_MASK : :: std :: os :: raw :: c_uint = 24 ; pub const NS_FONT_VARIANT_LIGATURES_HISTORICAL_MASK : :: std :: os :: raw :: c_uint = 96 ; pub const NS_FONT_VARIANT_LIGATURES_CONTEXTUAL_MASK : :: std :: os :: raw :: c_uint = 384 ; pub const NS_FONT_VARIANT_NUMERIC_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_NUMERIC_LINING : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_NUMERIC_OLDSTYLE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_NUMERIC_PROPORTIONAL : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_VARIANT_NUMERIC_TABULAR : :: std :: os :: raw :: c_uint = 8 ; pub const NS_FONT_VARIANT_NUMERIC_DIAGONAL_FRACTIONS : :: std :: os :: raw :: c_uint = 16 ; pub const NS_FONT_VARIANT_NUMERIC_STACKED_FRACTIONS : :: std :: os :: raw :: c_uint = 32 ; pub const NS_FONT_VARIANT_NUMERIC_SLASHZERO : :: std :: os :: raw :: c_uint = 64 ; pub const NS_FONT_VARIANT_NUMERIC_ORDINAL : :: std :: os :: raw :: c_uint = 128 ; pub const NS_FONT_VARIANT_NUMERIC_COUNT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_FONT_VARIANT_NUMERIC_FIGURE_MASK : :: std :: os :: raw :: c_uint = 3 ; pub const NS_FONT_VARIANT_NUMERIC_SPACING_MASK : :: std :: os :: raw :: c_uint = 12 ; pub const NS_FONT_VARIANT_NUMERIC_FRACTION_MASK : :: std :: os :: raw :: c_uint = 48 ; pub const NS_FONT_VARIANT_POSITION_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_POSITION_SUPER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_POSITION_SUB : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_WIDTH_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_WIDTH_FULL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_FONT_VARIANT_WIDTH_HALF : :: std :: os :: raw :: c_uint = 2 ; pub const NS_FONT_VARIANT_WIDTH_THIRD : :: std :: os :: raw :: c_uint = 3 ; pub const NS_FONT_VARIANT_WIDTH_QUARTER : :: std :: os :: raw :: c_uint = 4 ; pub const NS_FONT_SUBSCRIPT_OFFSET_RATIO : f64 = 0.2 ; pub const NS_FONT_SUPERSCRIPT_OFFSET_RATIO : f64 = 0.34 ; pub const NS_FONT_SUB_SUPER_SIZE_RATIO_SMALL : f64 = 0.82 ; pub const NS_FONT_SUB_SUPER_SIZE_RATIO_LARGE : f64 = 0.667 ; pub const NS_FONT_SUB_SUPER_SMALL_SIZE : f64 = 20. ; pub const NS_FONT_SUB_SUPER_LARGE_SIZE : f64 = 45. ; pub const NS_FONT_VARIANT_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_FONT_VARIANT_SMALL_CAPS : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COLOR_INHERIT_FROM_BODY : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_WILL_CHANGE_STACKING_CONTEXT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WILL_CHANGE_TRANSFORM : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_WILL_CHANGE_SCROLL : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_WILL_CHANGE_OPACITY : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_WILL_CHANGE_FIXPOS_CB : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_WILL_CHANGE_ABSPOS_CB : :: std :: os :: raw :: c_uint = 32 ; pub const NS_STYLE_ANIMATION_ITERATION_COUNT_INFINITE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_ANIMATION_PLAY_STATE_RUNNING : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_ANIMATION_PLAY_STATE_PAUSED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_IMAGELAYER_ATTACHMENT_SCROLL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_IMAGELAYER_ATTACHMENT_FIXED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_IMAGELAYER_ATTACHMENT_LOCAL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_IMAGELAYER_CLIP_MOZ_ALMOST_PADDING : :: std :: os :: raw :: c_uint = 127 ; pub const NS_STYLE_IMAGELAYER_POSITION_CENTER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_IMAGELAYER_POSITION_TOP : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_IMAGELAYER_POSITION_BOTTOM : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_IMAGELAYER_POSITION_LEFT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_IMAGELAYER_POSITION_RIGHT : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_IMAGELAYER_SIZE_CONTAIN : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_IMAGELAYER_SIZE_COVER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_MASK_MODE_ALPHA : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_MASK_MODE_LUMINANCE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_MASK_MODE_MATCH_SOURCE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_BG_INLINE_POLICY_EACH_BOX : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BG_INLINE_POLICY_CONTINUOUS : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BG_INLINE_POLICY_BOUNDING_BOX : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_BORDER_COLLAPSE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BORDER_SEPARATE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BORDER_WIDTH_THIN : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BORDER_WIDTH_MEDIUM : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BORDER_WIDTH_THICK : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_BORDER_STYLE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BORDER_STYLE_GROOVE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BORDER_STYLE_RIDGE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_BORDER_STYLE_DOTTED : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_BORDER_STYLE_DASHED : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_BORDER_STYLE_SOLID : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_BORDER_STYLE_DOUBLE : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_BORDER_STYLE_INSET : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_BORDER_STYLE_OUTSET : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_BORDER_STYLE_HIDDEN : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_BORDER_STYLE_AUTO : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_BORDER_IMAGE_REPEAT_STRETCH : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BORDER_IMAGE_REPEAT_REPEAT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BORDER_IMAGE_REPEAT_ROUND : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_BORDER_IMAGE_REPEAT_SPACE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_BORDER_IMAGE_SLICE_NOFILL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BORDER_IMAGE_SLICE_FILL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CURSOR_AUTO : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CURSOR_CROSSHAIR : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_CURSOR_DEFAULT : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_CURSOR_POINTER : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_CURSOR_MOVE : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_CURSOR_E_RESIZE : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_CURSOR_NE_RESIZE : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_CURSOR_NW_RESIZE : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_CURSOR_N_RESIZE : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_CURSOR_SE_RESIZE : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_CURSOR_SW_RESIZE : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_CURSOR_S_RESIZE : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_CURSOR_W_RESIZE : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_CURSOR_TEXT : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_CURSOR_WAIT : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_CURSOR_HELP : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_CURSOR_COPY : :: std :: os :: raw :: c_uint = 17 ; pub const NS_STYLE_CURSOR_ALIAS : :: std :: os :: raw :: c_uint = 18 ; pub const NS_STYLE_CURSOR_CONTEXT_MENU : :: std :: os :: raw :: c_uint = 19 ; pub const NS_STYLE_CURSOR_CELL : :: std :: os :: raw :: c_uint = 20 ; pub const NS_STYLE_CURSOR_GRAB : :: std :: os :: raw :: c_uint = 21 ; pub const NS_STYLE_CURSOR_GRABBING : :: std :: os :: raw :: c_uint = 22 ; pub const NS_STYLE_CURSOR_SPINNING : :: std :: os :: raw :: c_uint = 23 ; pub const NS_STYLE_CURSOR_ZOOM_IN : :: std :: os :: raw :: c_uint = 24 ; pub const NS_STYLE_CURSOR_ZOOM_OUT : :: std :: os :: raw :: c_uint = 25 ; pub const NS_STYLE_CURSOR_NOT_ALLOWED : :: std :: os :: raw :: c_uint = 26 ; pub const NS_STYLE_CURSOR_COL_RESIZE : :: std :: os :: raw :: c_uint = 27 ; pub const NS_STYLE_CURSOR_ROW_RESIZE : :: std :: os :: raw :: c_uint = 28 ; pub const NS_STYLE_CURSOR_NO_DROP : :: std :: os :: raw :: c_uint = 29 ; pub const NS_STYLE_CURSOR_VERTICAL_TEXT : :: std :: os :: raw :: c_uint = 30 ; pub const NS_STYLE_CURSOR_ALL_SCROLL : :: std :: os :: raw :: c_uint = 31 ; pub const NS_STYLE_CURSOR_NESW_RESIZE : :: std :: os :: raw :: c_uint = 32 ; pub const NS_STYLE_CURSOR_NWSE_RESIZE : :: std :: os :: raw :: c_uint = 33 ; pub const NS_STYLE_CURSOR_NS_RESIZE : :: std :: os :: raw :: c_uint = 34 ; pub const NS_STYLE_CURSOR_EW_RESIZE : :: std :: os :: raw :: c_uint = 35 ; pub const NS_STYLE_CURSOR_NONE : :: std :: os :: raw :: c_uint = 36 ; pub const NS_STYLE_DIRECTION_LTR : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_DIRECTION_RTL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WRITING_MODE_HORIZONTAL_TB : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_WRITING_MODE_VERTICAL_RL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WRITING_MODE_VERTICAL_LR : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_WRITING_MODE_SIDEWAYS_MASK : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_WRITING_MODE_SIDEWAYS_RL : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_WRITING_MODE_SIDEWAYS_LR : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_CONTAIN_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_CONTAIN_STRICT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CONTAIN_LAYOUT : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_CONTAIN_STYLE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_CONTAIN_PAINT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_CONTAIN_ALL_BITS : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_ALIGN_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_ALIGN_NORMAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_ALIGN_START : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_ALIGN_END : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_ALIGN_FLEX_START : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_ALIGN_FLEX_END : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_ALIGN_CENTER : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_ALIGN_LEFT : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_ALIGN_RIGHT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_ALIGN_BASELINE : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_ALIGN_LAST_BASELINE : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_ALIGN_STRETCH : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_ALIGN_SELF_START : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_ALIGN_SELF_END : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_ALIGN_SPACE_BETWEEN : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_ALIGN_SPACE_AROUND : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_ALIGN_SPACE_EVENLY : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_ALIGN_LEGACY : :: std :: os :: raw :: c_uint = 32 ; pub const NS_STYLE_ALIGN_SAFE : :: std :: os :: raw :: c_uint = 64 ; pub const NS_STYLE_ALIGN_UNSAFE : :: std :: os :: raw :: c_uint = 128 ; pub const NS_STYLE_ALIGN_FLAG_BITS : :: std :: os :: raw :: c_uint = 224 ; pub const NS_STYLE_ALIGN_ALL_BITS : :: std :: os :: raw :: c_uint = 255 ; pub const NS_STYLE_ALIGN_ALL_SHIFT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_JUSTIFY_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_JUSTIFY_NORMAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_JUSTIFY_START : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_JUSTIFY_END : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_JUSTIFY_FLEX_START : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_JUSTIFY_FLEX_END : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_JUSTIFY_CENTER : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_JUSTIFY_LEFT : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_JUSTIFY_RIGHT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_JUSTIFY_BASELINE : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_JUSTIFY_LAST_BASELINE : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_JUSTIFY_STRETCH : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_JUSTIFY_SELF_START : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_JUSTIFY_SELF_END : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_JUSTIFY_SPACE_BETWEEN : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_JUSTIFY_SPACE_AROUND : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_JUSTIFY_SPACE_EVENLY : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_JUSTIFY_LEGACY : :: std :: os :: raw :: c_uint = 32 ; pub const NS_STYLE_JUSTIFY_SAFE : :: std :: os :: raw :: c_uint = 64 ; pub const NS_STYLE_JUSTIFY_UNSAFE : :: std :: os :: raw :: c_uint = 128 ; pub const NS_STYLE_JUSTIFY_FLAG_BITS : :: std :: os :: raw :: c_uint = 224 ; pub const NS_STYLE_JUSTIFY_ALL_BITS : :: std :: os :: raw :: c_uint = 255 ; pub const NS_STYLE_JUSTIFY_ALL_SHIFT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_FLEX_DIRECTION_ROW : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FLEX_DIRECTION_ROW_REVERSE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FLEX_DIRECTION_COLUMN : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FLEX_DIRECTION_COLUMN_REVERSE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_FLEX_WRAP_NOWRAP : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FLEX_WRAP_WRAP : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FLEX_WRAP_WRAP_REVERSE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_ORDER_INITIAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_JUSTIFY_CONTENT_FLEX_START : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_JUSTIFY_CONTENT_FLEX_END : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_JUSTIFY_CONTENT_CENTER : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_JUSTIFY_CONTENT_SPACE_BETWEEN : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_JUSTIFY_CONTENT_SPACE_AROUND : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_FILTER_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FILTER_URL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FILTER_BLUR : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FILTER_BRIGHTNESS : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_FILTER_CONTRAST : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_FILTER_GRAYSCALE : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_FILTER_INVERT : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_FILTER_OPACITY : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_FILTER_SATURATE : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_FILTER_SEPIA : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_FILTER_HUE_ROTATE : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_FILTER_DROP_SHADOW : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_FONT_STYLE_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FONT_STYLE_ITALIC : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FONT_STYLE_OBLIQUE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FONT_WEIGHT_NORMAL : :: std :: os :: raw :: c_uint = 400 ; pub const NS_STYLE_FONT_WEIGHT_BOLD : :: std :: os :: raw :: c_uint = 700 ; pub const NS_STYLE_FONT_WEIGHT_BOLDER : :: std :: os :: raw :: c_int = -1 ; pub const NS_STYLE_FONT_WEIGHT_LIGHTER : :: std :: os :: raw :: c_int = -2 ; pub const NS_STYLE_FONT_SIZE_XXSMALL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FONT_SIZE_XSMALL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FONT_SIZE_SMALL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FONT_SIZE_MEDIUM : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_FONT_SIZE_LARGE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_FONT_SIZE_XLARGE : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_FONT_SIZE_XXLARGE : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_FONT_SIZE_XXXLARGE : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_FONT_SIZE_LARGER : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_FONT_SIZE_SMALLER : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_FONT_SIZE_NO_KEYWORD : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_FONT_STRETCH_ULTRA_CONDENSED : :: std :: os :: raw :: c_int = -4 ; pub const NS_STYLE_FONT_STRETCH_EXTRA_CONDENSED : :: std :: os :: raw :: c_int = -3 ; pub const NS_STYLE_FONT_STRETCH_CONDENSED : :: std :: os :: raw :: c_int = -2 ; pub const NS_STYLE_FONT_STRETCH_SEMI_CONDENSED : :: std :: os :: raw :: c_int = -1 ; pub const NS_STYLE_FONT_STRETCH_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FONT_STRETCH_SEMI_EXPANDED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FONT_STRETCH_EXPANDED : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FONT_STRETCH_EXTRA_EXPANDED : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_FONT_STRETCH_ULTRA_EXPANDED : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_FONT_CAPTION : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FONT_ICON : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FONT_MENU : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_FONT_MESSAGE_BOX : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_FONT_SMALL_CAPTION : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_FONT_STATUS_BAR : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_FONT_WINDOW : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_FONT_DOCUMENT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_FONT_WORKSPACE : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_FONT_DESKTOP : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_FONT_INFO : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_FONT_DIALOG : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_FONT_BUTTON : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_FONT_PULL_DOWN_MENU : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_FONT_LIST : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_FONT_FIELD : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_GRID_AUTO_FLOW_ROW : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_GRID_AUTO_FLOW_COLUMN : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_GRID_AUTO_FLOW_DENSE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_GRID_TEMPLATE_SUBGRID : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_GRID_REPEAT_AUTO_FILL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_GRID_REPEAT_AUTO_FIT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_MATHML_DEFAULT_SCRIPT_SIZE_MULTIPLIER : f64 = 0.71 ; pub const NS_MATHML_DEFAULT_SCRIPT_MIN_SIZE_PT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_MATHML_MATHVARIANT_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_MATHML_MATHVARIANT_NORMAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_MATHML_MATHVARIANT_BOLD : :: std :: os :: raw :: c_uint = 2 ; pub const NS_MATHML_MATHVARIANT_ITALIC : :: std :: os :: raw :: c_uint = 3 ; pub const NS_MATHML_MATHVARIANT_BOLD_ITALIC : :: std :: os :: raw :: c_uint = 4 ; pub const NS_MATHML_MATHVARIANT_SCRIPT : :: std :: os :: raw :: c_uint = 5 ; pub const NS_MATHML_MATHVARIANT_BOLD_SCRIPT : :: std :: os :: raw :: c_uint = 6 ; pub const NS_MATHML_MATHVARIANT_FRAKTUR : :: std :: os :: raw :: c_uint = 7 ; pub const NS_MATHML_MATHVARIANT_DOUBLE_STRUCK : :: std :: os :: raw :: c_uint = 8 ; pub const NS_MATHML_MATHVARIANT_BOLD_FRAKTUR : :: std :: os :: raw :: c_uint = 9 ; pub const NS_MATHML_MATHVARIANT_SANS_SERIF : :: std :: os :: raw :: c_uint = 10 ; pub const NS_MATHML_MATHVARIANT_BOLD_SANS_SERIF : :: std :: os :: raw :: c_uint = 11 ; pub const NS_MATHML_MATHVARIANT_SANS_SERIF_ITALIC : :: std :: os :: raw :: c_uint = 12 ; pub const NS_MATHML_MATHVARIANT_SANS_SERIF_BOLD_ITALIC : :: std :: os :: raw :: c_uint = 13 ; pub const NS_MATHML_MATHVARIANT_MONOSPACE : :: std :: os :: raw :: c_uint = 14 ; pub const NS_MATHML_MATHVARIANT_INITIAL : :: std :: os :: raw :: c_uint = 15 ; pub const NS_MATHML_MATHVARIANT_TAILED : :: std :: os :: raw :: c_uint = 16 ; pub const NS_MATHML_MATHVARIANT_LOOPED : :: std :: os :: raw :: c_uint = 17 ; pub const NS_MATHML_MATHVARIANT_STRETCHED : :: std :: os :: raw :: c_uint = 18 ; pub const NS_MATHML_DISPLAYSTYLE_INLINE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_MATHML_DISPLAYSTYLE_BLOCK : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WIDTH_MAX_CONTENT : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_WIDTH_MIN_CONTENT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WIDTH_FIT_CONTENT : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_WIDTH_AVAILABLE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_POSITION_STATIC : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_POSITION_RELATIVE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_POSITION_ABSOLUTE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_POSITION_FIXED : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_POSITION_STICKY : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_CLIP_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_CLIP_RECT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CLIP_TYPE_MASK : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_CLIP_LEFT_AUTO : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_CLIP_TOP_AUTO : :: std :: os :: raw :: c_uint = 32 ; pub const NS_STYLE_CLIP_RIGHT_AUTO : :: std :: os :: raw :: c_uint = 64 ; pub const NS_STYLE_CLIP_BOTTOM_AUTO : :: std :: os :: raw :: c_uint = 128 ; pub const NS_STYLE_FRAME_YES : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_FRAME_NO : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_FRAME_0 : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_FRAME_1 : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_FRAME_ON : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_FRAME_OFF : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_FRAME_AUTO : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_FRAME_SCROLL : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_FRAME_NOSCROLL : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_OVERFLOW_VISIBLE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_OVERFLOW_HIDDEN : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_OVERFLOW_SCROLL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_OVERFLOW_AUTO : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_OVERFLOW_CLIP : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_OVERFLOW_SCROLLBARS_HORIZONTAL : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_OVERFLOW_SCROLLBARS_VERTICAL : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_OVERFLOW_CLIP_BOX_PADDING_BOX : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_OVERFLOW_CLIP_BOX_CONTENT_BOX : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_LIST_STYLE_CUSTOM : :: std :: os :: raw :: c_int = -1 ; pub const NS_STYLE_LIST_STYLE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_LIST_STYLE_DECIMAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_LIST_STYLE_DISC : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_LIST_STYLE_CIRCLE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_LIST_STYLE_SQUARE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_LIST_STYLE_DISCLOSURE_CLOSED : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_LIST_STYLE_DISCLOSURE_OPEN : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_LIST_STYLE_HEBREW : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_LIST_STYLE_JAPANESE_FORMAL : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_LIST_STYLE_KOREAN_HANGUL_FORMAL : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_LIST_STYLE_KOREAN_HANJA_INFORMAL : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_LIST_STYLE_KOREAN_HANJA_FORMAL : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_LIST_STYLE_ETHIOPIC_NUMERIC : :: std :: os :: raw :: c_uint = 17 ; pub const NS_STYLE_LIST_STYLE_LOWER_ROMAN : :: std :: os :: raw :: c_uint = 100 ; pub const NS_STYLE_LIST_STYLE_UPPER_ROMAN : :: std :: os :: raw :: c_uint = 101 ; pub const NS_STYLE_LIST_STYLE_LOWER_ALPHA : :: std :: os :: raw :: c_uint = 102 ; pub const NS_STYLE_LIST_STYLE_UPPER_ALPHA : :: std :: os :: raw :: c_uint = 103 ; pub const NS_STYLE_LIST_STYLE_POSITION_INSIDE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_LIST_STYLE_POSITION_OUTSIDE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_MARGIN_SIZE_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_POINTER_EVENTS_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_POINTER_EVENTS_VISIBLEPAINTED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_POINTER_EVENTS_VISIBLEFILL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_POINTER_EVENTS_VISIBLESTROKE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_POINTER_EVENTS_VISIBLE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_POINTER_EVENTS_PAINTED : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_POINTER_EVENTS_FILL : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_POINTER_EVENTS_STROKE : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_POINTER_EVENTS_ALL : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_POINTER_EVENTS_AUTO : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_IMAGE_ORIENTATION_FLIP : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_IMAGE_ORIENTATION_FROM_IMAGE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_ISOLATION_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_ISOLATION_ISOLATE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_OBJECT_FIT_FILL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_OBJECT_FIT_CONTAIN : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_OBJECT_FIT_COVER : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_OBJECT_FIT_NONE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_OBJECT_FIT_SCALE_DOWN : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_RESIZE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_RESIZE_BOTH : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_RESIZE_HORIZONTAL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_RESIZE_VERTICAL : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TEXT_ALIGN_START : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_ALIGN_LEFT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_ALIGN_RIGHT : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_ALIGN_CENTER : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TEXT_ALIGN_JUSTIFY : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TEXT_ALIGN_CHAR : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_TEXT_ALIGN_END : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_TEXT_ALIGN_AUTO : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_TEXT_ALIGN_MOZ_CENTER : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TEXT_ALIGN_MOZ_RIGHT : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_TEXT_ALIGN_MOZ_LEFT : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_TEXT_ALIGN_MOZ_CENTER_OR_INHERIT : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_TEXT_ALIGN_UNSAFE : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_TEXT_ALIGN_MATCH_PARENT : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_TEXT_DECORATION_LINE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_DECORATION_LINE_OVERLINE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TEXT_DECORATION_LINE_BLINK : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_TEXT_DECORATION_LINE_LINES_MASK : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_DOTTED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_DASHED : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_SOLID : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_DOUBLE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_WAVY : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_TEXT_DECORATION_STYLE_MAX : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_TEXT_OVERFLOW_CLIP : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_OVERFLOW_ELLIPSIS : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_OVERFLOW_STRING : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_TRANSFORM_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_TRANSFORM_CAPITALIZE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_TRANSFORM_LOWERCASE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_TRANSFORM_UPPERCASE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TEXT_TRANSFORM_FULL_WIDTH : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TOUCH_ACTION_NONE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TOUCH_ACTION_AUTO : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TOUCH_ACTION_PAN_X : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TOUCH_ACTION_PAN_Y : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TOUCH_ACTION_MANIPULATION : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_TOP_LAYER_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TOP_LAYER_TOP : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_LINEAR : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE_IN : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE_OUT : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE_IN_OUT : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_START : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_END : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_VERTICAL_ALIGN_BASELINE : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_VERTICAL_ALIGN_SUB : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_VERTICAL_ALIGN_SUPER : :: std :: os :: raw :: c_uint = 16 ; pub const NS_STYLE_VERTICAL_ALIGN_TOP : :: std :: os :: raw :: c_uint = 17 ; pub const NS_STYLE_VERTICAL_ALIGN_TEXT_TOP : :: std :: os :: raw :: c_uint = 18 ; pub const NS_STYLE_VERTICAL_ALIGN_MIDDLE : :: std :: os :: raw :: c_uint = 19 ; pub const NS_STYLE_VERTICAL_ALIGN_TEXT_BOTTOM : :: std :: os :: raw :: c_uint = 20 ; pub const NS_STYLE_VERTICAL_ALIGN_BOTTOM : :: std :: os :: raw :: c_uint = 21 ; pub const NS_STYLE_VERTICAL_ALIGN_MIDDLE_WITH_BASELINE : :: std :: os :: raw :: c_uint = 22 ; pub const NS_STYLE_VISIBILITY_HIDDEN : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_VISIBILITY_VISIBLE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_VISIBILITY_COLLAPSE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TABSIZE_INITIAL : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_WORDBREAK_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_WORDBREAK_BREAK_ALL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WORDBREAK_KEEP_ALL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_OVERFLOWWRAP_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_OVERFLOWWRAP_BREAK_WORD : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_RUBY_ALIGN_START : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_RUBY_ALIGN_CENTER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_RUBY_ALIGN_SPACE_BETWEEN : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_RUBY_ALIGN_SPACE_AROUND : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_RUBY_POSITION_OVER : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_RUBY_POSITION_UNDER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_RUBY_POSITION_INTER_CHARACTER : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_SIZE_ADJUST_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_SIZE_ADJUST_AUTO : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_ORIENTATION_MIXED : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_ORIENTATION_UPRIGHT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_ORIENTATION_SIDEWAYS : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_COMBINE_UPRIGHT_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_COMBINE_UPRIGHT_ALL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_COMBINE_UPRIGHT_DIGITS_2 : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_COMBINE_UPRIGHT_DIGITS_3 : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TEXT_COMBINE_UPRIGHT_DIGITS_4 : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_LINE_HEIGHT_BLOCK_HEIGHT : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_UNICODE_BIDI_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_UNICODE_BIDI_EMBED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_UNICODE_BIDI_ISOLATE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_UNICODE_BIDI_BIDI_OVERRIDE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_UNICODE_BIDI_ISOLATE_OVERRIDE : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_UNICODE_BIDI_PLAINTEXT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TABLE_LAYOUT_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TABLE_LAYOUT_FIXED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TABLE_EMPTY_CELLS_HIDE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TABLE_EMPTY_CELLS_SHOW : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CAPTION_SIDE_TOP : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_CAPTION_SIDE_RIGHT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CAPTION_SIDE_BOTTOM : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_CAPTION_SIDE_LEFT : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_CAPTION_SIDE_TOP_OUTSIDE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_CAPTION_SIDE_BOTTOM_OUTSIDE : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_CELL_SCOPE_ROW : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_CELL_SCOPE_COL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CELL_SCOPE_ROWGROUP : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_CELL_SCOPE_COLGROUP : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_PAGE_MARKS_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_PAGE_MARKS_CROP : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_PAGE_MARKS_REGISTER : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_PAGE_SIZE_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_PAGE_SIZE_PORTRAIT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_PAGE_SIZE_LANDSCAPE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_PAGE_BREAK_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_PAGE_BREAK_ALWAYS : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_PAGE_BREAK_AVOID : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_PAGE_BREAK_LEFT : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_PAGE_BREAK_RIGHT : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_COLUMN_COUNT_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COLUMN_COUNT_UNLIMITED : :: std :: os :: raw :: c_int = -1 ; pub const NS_STYLE_COLUMN_FILL_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COLUMN_FILL_BALANCE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COLUMN_SPAN_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COLUMN_SPAN_ALL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_IME_MODE_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_IME_MODE_NORMAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_IME_MODE_ACTIVE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_IME_MODE_DISABLED : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_IME_MODE_INACTIVE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_GRADIENT_SHAPE_LINEAR : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_GRADIENT_SHAPE_ELLIPTICAL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_GRADIENT_SHAPE_CIRCULAR : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_GRADIENT_SIZE_CLOSEST_SIDE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_GRADIENT_SIZE_CLOSEST_CORNER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_GRADIENT_SIZE_FARTHEST_SIDE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_GRADIENT_SIZE_FARTHEST_CORNER : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_GRADIENT_SIZE_EXPLICIT_SIZE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_CONTEXT_PROPERTY_FILL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CONTEXT_PROPERTY_STROKE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_CONTEXT_PROPERTY_FILL_OPACITY : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_CONTEXT_PROPERTY_STROKE_OPACITY : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_WINDOW_SHADOW_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_WINDOW_SHADOW_DEFAULT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_WINDOW_SHADOW_MENU : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_WINDOW_SHADOW_TOOLTIP : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_WINDOW_SHADOW_SHEET : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_DOMINANT_BASELINE_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_DOMINANT_BASELINE_USE_SCRIPT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_DOMINANT_BASELINE_NO_CHANGE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_DOMINANT_BASELINE_RESET_SIZE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_DOMINANT_BASELINE_IDEOGRAPHIC : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_DOMINANT_BASELINE_ALPHABETIC : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_DOMINANT_BASELINE_HANGING : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_DOMINANT_BASELINE_MATHEMATICAL : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_DOMINANT_BASELINE_CENTRAL : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_DOMINANT_BASELINE_MIDDLE : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_DOMINANT_BASELINE_TEXT_AFTER_EDGE : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_DOMINANT_BASELINE_TEXT_BEFORE_EDGE : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_IMAGE_RENDERING_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_IMAGE_RENDERING_OPTIMIZESPEED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_IMAGE_RENDERING_OPTIMIZEQUALITY : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_IMAGE_RENDERING_CRISPEDGES : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_MASK_TYPE_LUMINANCE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_MASK_TYPE_ALPHA : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_PAINT_ORDER_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_PAINT_ORDER_FILL : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_PAINT_ORDER_STROKE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_PAINT_ORDER_MARKERS : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_PAINT_ORDER_LAST_VALUE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_PAINT_ORDER_BITWIDTH : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_SHAPE_RENDERING_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_SHAPE_RENDERING_OPTIMIZESPEED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_SHAPE_RENDERING_CRISPEDGES : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_SHAPE_RENDERING_GEOMETRICPRECISION : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_STROKE_LINECAP_BUTT : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_STROKE_LINECAP_ROUND : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_STROKE_LINECAP_SQUARE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_STROKE_LINEJOIN_MITER : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_STROKE_LINEJOIN_ROUND : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_STROKE_LINEJOIN_BEVEL : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_STROKE_PROP_CONTEXT_VALUE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_ANCHOR_START : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_ANCHOR_MIDDLE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_ANCHOR_END : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_EMPHASIS_POSITION_OVER : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_EMPHASIS_POSITION_UNDER : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_EMPHASIS_POSITION_LEFT : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TEXT_EMPHASIS_POSITION_RIGHT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TEXT_EMPHASIS_POSITION_DEFAULT : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_TEXT_EMPHASIS_POSITION_DEFAULT_ZH : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_FILL_MASK : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_FILLED : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_SHAPE_MASK : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_DOT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_CIRCLE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_DOUBLE_CIRCLE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_TRIANGLE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_SESAME : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_TEXT_EMPHASIS_STYLE_STRING : :: std :: os :: raw :: c_uint = 255 ; pub const NS_STYLE_TEXT_RENDERING_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TEXT_RENDERING_OPTIMIZESPEED : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_TEXT_RENDERING_OPTIMIZELEGIBILITY : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_TEXT_RENDERING_GEOMETRICPRECISION : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_COLOR_ADJUST_ECONOMY : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COLOR_ADJUST_EXACT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COLOR_INTERPOLATION_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COLOR_INTERPOLATION_SRGB : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COLOR_INTERPOLATION_LINEARRGB : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_VECTOR_EFFECT_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_VECTOR_EFFECT_NON_SCALING_STROKE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BACKFACE_VISIBILITY_VISIBLE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BACKFACE_VISIBILITY_HIDDEN : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TRANSFORM_STYLE_FLAT : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_TRANSFORM_STYLE_PRESERVE_3D : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_CONTEXT_FILL_OPACITY : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_CONTEXT_STROKE_OPACITY : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BLEND_NORMAL : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_BLEND_MULTIPLY : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_BLEND_SCREEN : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_BLEND_OVERLAY : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_BLEND_DARKEN : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_BLEND_LIGHTEN : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_BLEND_COLOR_DODGE : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_BLEND_COLOR_BURN : :: std :: os :: raw :: c_uint = 7 ; pub const NS_STYLE_BLEND_HARD_LIGHT : :: std :: os :: raw :: c_uint = 8 ; pub const NS_STYLE_BLEND_SOFT_LIGHT : :: std :: os :: raw :: c_uint = 9 ; pub const NS_STYLE_BLEND_DIFFERENCE : :: std :: os :: raw :: c_uint = 10 ; pub const NS_STYLE_BLEND_EXCLUSION : :: std :: os :: raw :: c_uint = 11 ; pub const NS_STYLE_BLEND_HUE : :: std :: os :: raw :: c_uint = 12 ; pub const NS_STYLE_BLEND_SATURATION : :: std :: os :: raw :: c_uint = 13 ; pub const NS_STYLE_BLEND_COLOR : :: std :: os :: raw :: c_uint = 14 ; pub const NS_STYLE_BLEND_LUMINOSITY : :: std :: os :: raw :: c_uint = 15 ; pub const NS_STYLE_MASK_COMPOSITE_ADD : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_MASK_COMPOSITE_SUBTRACT : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_MASK_COMPOSITE_INTERSECT : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_MASK_COMPOSITE_EXCLUDE : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_CONTROL_CHARACTER_VISIBILITY_HIDDEN : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_CONTROL_CHARACTER_VISIBILITY_VISIBLE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COUNTER_SYSTEM_CYCLIC : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COUNTER_SYSTEM_NUMERIC : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COUNTER_SYSTEM_ALPHABETIC : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_COUNTER_SYSTEM_SYMBOLIC : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_COUNTER_SYSTEM_ADDITIVE : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_COUNTER_SYSTEM_FIXED : :: std :: os :: raw :: c_uint = 5 ; pub const NS_STYLE_COUNTER_SYSTEM_EXTENDS : :: std :: os :: raw :: c_uint = 6 ; pub const NS_STYLE_COUNTER_RANGE_INFINITE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COUNTER_SPEAKAS_BULLETS : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_COUNTER_SPEAKAS_NUMBERS : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_COUNTER_SPEAKAS_WORDS : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_COUNTER_SPEAKAS_SPELL_OUT : :: std :: os :: raw :: c_uint = 3 ; pub const NS_STYLE_COUNTER_SPEAKAS_OTHER : :: std :: os :: raw :: c_uint = 255 ; pub const NS_STYLE_SCROLL_BEHAVIOR_AUTO : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_SCROLL_BEHAVIOR_SMOOTH : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_SCROLL_SNAP_TYPE_NONE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_SCROLL_SNAP_TYPE_MANDATORY : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_SCROLL_SNAP_TYPE_PROXIMITY : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_ORIENTATION_PORTRAIT : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_ORIENTATION_LANDSCAPE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_SCAN_PROGRESSIVE : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_SCAN_INTERLACE : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_DISPLAY_MODE_BROWSER : :: std :: os :: raw :: c_uint = 0 ; pub const NS_STYLE_DISPLAY_MODE_MINIMAL_UI : :: std :: os :: raw :: c_uint = 1 ; pub const NS_STYLE_DISPLAY_MODE_STANDALONE : :: std :: os :: raw :: c_uint = 2 ; pub const NS_STYLE_DISPLAY_MODE_FULLSCREEN : :: std :: os :: raw :: c_uint = 3 ; pub const CSS_PSEUDO_ELEMENT_IS_CSS2 : :: std :: os :: raw :: c_uint = 1 ; pub const CSS_PSEUDO_ELEMENT_CONTAINS_ELEMENTS : :: std :: os :: raw :: c_uint = 2 ; pub const CSS_PSEUDO_ELEMENT_SUPPORTS_STYLE_ATTRIBUTE : :: std :: os :: raw :: c_uint = 4 ; pub const CSS_PSEUDO_ELEMENT_SUPPORTS_USER_ACTION_STATE : :: std :: os :: raw :: c_uint = 8 ; pub const CSS_PSEUDO_ELEMENT_UA_SHEET_ONLY : :: std :: os :: raw :: c_uint = 16 ; pub const CSS_PSEUDO_ELEMENT_IS_JS_CREATED_NAC : :: std :: os :: raw :: c_uint = 32 ; pub const CSS_PSEUDO_ELEMENT_IS_FLEX_OR_GRID_ITEM : :: std :: os :: raw :: c_uint = 64 ; pub const kNameSpaceID_Unknown : :: std :: os :: raw :: c_int = -1 ; pub const kNameSpaceID_XMLNS : :: std :: os :: raw :: c_uint = 1 ; pub const kNameSpaceID_XML : :: std :: os :: raw :: c_uint = 2 ; pub const kNameSpaceID_XHTML : :: std :: os :: raw :: c_uint = 3 ; pub const kNameSpaceID_XLink : :: std :: os :: raw :: c_uint = 4 ; pub const kNameSpaceID_XSLT : :: std :: os :: raw :: c_uint = 5 ; pub const kNameSpaceID_XBL : :: std :: os :: raw :: c_uint = 6 ; pub const kNameSpaceID_MathML : :: std :: os :: raw :: c_uint = 7 ; pub const kNameSpaceID_RDF : :: std :: os :: raw :: c_uint = 8 ; pub const kNameSpaceID_XUL : :: std :: os :: raw :: c_uint = 9 ; pub const kNameSpaceID_SVG : :: std :: os :: raw :: c_uint = 10 ; pub const kNameSpaceID_disabled_MathML : :: std :: os :: raw :: c_uint = 11 ; pub const kNameSpaceID_disabled_SVG : :: std :: os :: raw :: c_uint = 12 ; pub const kNameSpaceID_LastBuiltin : :: std :: os :: raw :: c_uint = 12 ; pub const kNameSpaceID_Wildcard : :: std :: os :: raw :: c_int = -2147483648 ; pub const NS_AUTHOR_SPECIFIED_BACKGROUND : :: std :: os :: raw :: c_uint = 1 ; pub const NS_AUTHOR_SPECIFIED_BORDER : :: std :: os :: raw :: c_uint = 2 ; pub const NS_AUTHOR_SPECIFIED_PADDING : :: std :: os :: raw :: c_uint = 4 ; pub const NS_STYLE_INHERIT_MASK : :: std :: os :: raw :: c_uint = 16777215 ; pub const NS_STYLE_HAS_TEXT_DECORATION_LINES : :: std :: os :: raw :: c_uint = 16777216 ; pub const NS_STYLE_HAS_PSEUDO_ELEMENT_DATA : :: std :: os :: raw :: c_uint = 33554432 ; pub const NS_STYLE_RELEVANT_LINK_VISITED : :: std :: os :: raw :: c_uint = 67108864 ; pub const NS_STYLE_IS_STYLE_IF_VISITED : :: std :: os :: raw :: c_uint = 134217728 ; pub const NS_STYLE_CHILD_USES_GRANDANCESTOR_STYLE : :: std :: os :: raw :: c_uint = 268435456 ; pub const NS_STYLE_IS_SHARED : :: std :: os :: raw :: c_uint = 536870912 ; pub const NS_STYLE_IS_GOING_AWAY : :: std :: os :: raw :: c_uint = 1073741824 ; pub const NS_STYLE_SUPPRESS_LINEBREAK : :: std :: os :: raw :: c_uint = 2147483648 ; pub const NS_STYLE_IN_DISPLAY_NONE_SUBTREE : :: std :: os :: raw :: c_ulonglong = 4294967296 ; pub const NS_STYLE_INELIGIBLE_FOR_SHARING : :: std :: os :: raw :: c_ulonglong = 8589934592 ; pub const NS_STYLE_HAS_CHILD_THAT_USES_RESET_STYLE : :: std :: os :: raw :: c_ulonglong = 17179869184 ; pub const NS_STYLE_IS_TEXT_COMBINED : :: std :: os :: raw :: c_ulonglong = 34359738368 ; pub const NS_STYLE_CONTEXT_IS_GECKO : :: std :: os :: raw :: c_ulonglong = 68719476736 ; pub const NS_STYLE_CONTEXT_TYPE_SHIFT : :: std :: os :: raw :: c_uint = 37 ; pub mod std { # [ allow ( unused_imports ) ] use self :: super :: super :: root ; pub type conditional_type < _If > = _If ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct pair < _T1 , _T2 > { pub first : _T1 , pub second : _T2 , pub _phantom_0 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < _T1 > > , pub _phantom_1 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < _T2 > > , } pub type pair_first_type < _T1 > = _T1 ; pub type pair_second_type < _T2 > = _T2 ; pub type pair__EnableB = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct pair__CheckArgs { pub _address : u8 , } pub type pair__CheckArgsDep = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct pair__CheckTupleLikeConstructor { pub _address : u8 , } pub type pair__CheckTLC = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct input_iterator_tag { pub _address : u8 , } # [ test ] fn bindgen_test_layout_input_iterator_tag ( ) { assert_eq ! ( :: std :: mem :: size_of :: < input_iterator_tag > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( input_iterator_tag ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < input_iterator_tag > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( input_iterator_tag ) ) ) ; } impl Clone for input_iterator_tag { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct forward_iterator_tag { pub _address : u8 , } # [ test ] fn bindgen_test_layout_forward_iterator_tag ( ) { assert_eq ! ( :: std :: mem :: size_of :: < forward_iterator_tag > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( forward_iterator_tag ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < forward_iterator_tag > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( forward_iterator_tag ) ) ) ; } impl Clone for forward_iterator_tag { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct bidirectional_iterator_tag { pub _address : u8 , } # [ test ] fn bindgen_test_layout_bidirectional_iterator_tag ( ) { assert_eq ! ( :: std :: mem :: size_of :: < bidirectional_iterator_tag > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( bidirectional_iterator_tag ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < bidirectional_iterator_tag > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( bidirectional_iterator_tag ) ) ) ; } impl Clone for bidirectional_iterator_tag { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct random_access_iterator_tag { pub _address : u8 , } # [ test ] fn bindgen_test_layout_random_access_iterator_tag ( ) { assert_eq ! ( :: std :: mem :: size_of :: < random_access_iterator_tag > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( random_access_iterator_tag ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < random_access_iterator_tag > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( random_access_iterator_tag ) ) ) ; } impl Clone for random_access_iterator_tag { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct iterator { pub _address : u8 , } pub type iterator_value_type < _Tp > = _Tp ; pub type iterator_difference_type < _Distance > = _Distance ; pub type iterator_pointer < _Pointer > = _Pointer ; pub type iterator_reference < _Reference > = _Reference ; pub type iterator_iterator_category < _Category > = _Category ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct atomic { pub _address : u8 , } pub type atomic___base = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct function { pub _address : u8 , } pub type __bit_reference___storage_type = [ u8 ; 0usize ] ; pub type __bit_reference___storage_pointer = [ u8 ; 0usize ] ; # [ repr ( C ) ] pub struct __bit_const_reference { pub __seg_ : root :: std :: __bit_const_reference___storage_pointer , pub __mask_ : root :: std :: __bit_const_reference___storage_type , } pub type __bit_const_reference___storage_type = [ u8 ; 0usize ] ; pub type __bit_const_reference___storage_pointer = [ u8 ; 0usize ] ; pub type __bit_iterator_difference_type = [ u8 ; 0usize ] ; pub type __bit_iterator_value_type = bool ; pub type __bit_iterator_pointer = u8 ; pub type __bit_iterator_reference = u8 ; pub type __bit_iterator_iterator_category = root :: std :: random_access_iterator_tag ; pub type __bit_iterator___storage_type = [ u8 ; 0usize ] ; pub type __bit_iterator___storage_pointer = [ u8 ; 0usize ] ; pub type __bitset_difference_type = isize ; pub type __bitset_size_type = usize ; pub type __bitset___storage_type = root :: std :: __bitset_size_type ; pub type __bitset___self = u8 ; pub type __bitset___storage_pointer = * mut root :: std :: __bitset___storage_type ; pub type __bitset___const_storage_pointer = * const root :: std :: __bitset___storage_type ; pub const __bitset___bits_per_word : :: std :: os :: raw :: c_uint = 64 ; pub type __bitset_reference = u8 ; pub type __bitset_const_reference = root :: std :: __bit_const_reference ; pub type __bitset_iterator = u8 ; pub type __bitset_const_iterator = u8 ; extern "C" {
+ # [ link_name = "\u{1}__n_words" ] 
+ pub static mut  bitset___n_words  :  :: std :: os :: raw :: c_uint ;
+} pub type bitset_base = u8 ; pub type bitset_reference = root :: std :: bitset_base ; pub type bitset_const_reference = root :: std :: bitset_base ; } pub mod mozilla { # [ allow ( unused_imports ) ] use self :: super :: super :: root ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct fallible_t { pub _address : u8 , } # [ test ] fn bindgen_test_layout_fallible_t ( ) { assert_eq ! ( :: std :: mem :: size_of :: < fallible_t > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( fallible_t ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < fallible_t > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( fallible_t ) ) ) ; } impl Clone for fallible_t { fn clone ( & self ) -> Self { * self } } pub type IntegralConstant_ValueType < T > = T ; pub type IntegralConstant_Type = u8 ; 
  /// Convenient aliases. 
  pub type TrueType = u8 ; pub type FalseType = u8 ; pub mod detail { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: root ; pub const StringDataFlags_TERMINATED : root :: mozilla :: detail :: StringDataFlags = 1 ; pub const StringDataFlags_VOIDED : root :: mozilla :: detail :: StringDataFlags = 2 ; pub const StringDataFlags_SHARED : root :: mozilla :: detail :: StringDataFlags = 4 ; pub const StringDataFlags_OWNED : root :: mozilla :: detail :: StringDataFlags = 8 ; pub const StringDataFlags_INLINE : root :: mozilla :: detail :: StringDataFlags = 16 ; pub const StringDataFlags_LITERAL : root :: mozilla :: detail :: StringDataFlags = 32 ; pub type StringDataFlags = u16 ; pub const StringClassFlags_INLINE : root :: mozilla :: detail :: StringClassFlags = 1 ; pub const StringClassFlags_NULL_TERMINATED : root :: mozilla :: detail :: StringClassFlags = 2 ; pub type StringClassFlags = u16 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsTStringRepr < T > { pub mData : * mut root :: mozilla :: detail :: nsTStringRepr_char_type < T > , pub mLength : root :: mozilla :: detail :: nsTStringRepr_size_type , pub mDataFlags : root :: mozilla :: detail :: nsTStringRepr_DataFlags , pub mClassFlags : root :: mozilla :: detail :: nsTStringRepr_ClassFlags , pub _phantom_0 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < T > > , } pub type nsTStringRepr_fallible_t = root :: mozilla :: fallible_t ; pub type nsTStringRepr_char_type < T > = T ; pub type nsTStringRepr_self_type < T > = root :: mozilla :: detail :: nsTStringRepr < T > ; pub type nsTStringRepr_base_string_type < T > = root :: mozilla :: detail :: nsTStringRepr_self_type < T > ; pub type nsTStringRepr_substring_type < T > = root :: nsTSubstring < T > ; pub type nsTStringRepr_substring_tuple_type < T > = root :: nsTSubstringTuple < T > ; pub type nsTStringRepr_literalstring_type < T > = root :: nsTLiteralString < T > ; pub type nsTStringRepr_const_iterator < T > = root :: nsReadingIterator < root :: mozilla :: detail :: nsTStringRepr_char_type < T > > ; pub type nsTStringRepr_iterator < T > = root :: nsWritingIterator < root :: mozilla :: detail :: nsTStringRepr_char_type < T > > ; pub type nsTStringRepr_comparator_type = root :: nsTStringComparator ; pub type nsTStringRepr_char_iterator < T > = * mut root :: mozilla :: detail :: nsTStringRepr_char_type < T > ; pub type nsTStringRepr_const_char_iterator < T > = * const root :: mozilla :: detail :: nsTStringRepr_char_type < T > ; pub type nsTStringRepr_index_type = u32 ; pub type nsTStringRepr_size_type = u32 ; pub use self :: super :: super :: super :: root :: mozilla :: detail :: StringDataFlags as nsTStringRepr_DataFlags ; pub use self :: super :: super :: super :: root :: mozilla :: detail :: StringClassFlags as nsTStringRepr_ClassFlags ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsTStringRepr_raw_type { pub _address : u8 , } pub type nsTStringRepr_raw_type_type < U > = * mut U ; 
  /// LinkedList supports refcounted elements using this adapter class. Clients
@@ -67,15 +70,15 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
  # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum SheetParsingMode { eAuthorSheetFeatures = 0 , eUserSheetFeatures = 1 , eAgentSheetFeatures = 2 , eSafeAgentSheetFeatures = 3 , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct GroupRule { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ImageLoader { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] pub struct URLValueData__bindgen_vtable ( :: std :: os :: raw :: c_void ) ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct URLValueData { pub vtable_ : * const URLValueData__bindgen_vtable , pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mURI : root :: nsMainThreadPtrHandle < root :: nsIURI > , pub mExtraData : root :: RefPtr < root :: mozilla :: URLExtraData > , pub mURIResolved : bool , pub mIsLocalRef : [ u8 ; 2usize ] , pub mMightHaveRef : [ u8 ; 2usize ] , pub mStrings : root :: mozilla :: css :: URLValueData_RustOrGeckoString , pub mUsingRustString : bool , pub mLoadedImage : bool , } pub type URLValueData_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct URLValueData_RustOrGeckoString { pub mString : root :: __BindgenUnionField < ::nsstring::nsStringRepr > , pub mRustString : root :: __BindgenUnionField < ::gecko_bindings::structs::ServoRawOffsetArc < root :: RustString > > , pub bindgen_union_field : [ u64 ; 2usize ] , } # [ test ] fn bindgen_test_layout_URLValueData_RustOrGeckoString ( ) { assert_eq ! ( :: std :: mem :: size_of :: < URLValueData_RustOrGeckoString > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( URLValueData_RustOrGeckoString ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < URLValueData_RustOrGeckoString > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( URLValueData_RustOrGeckoString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLValueData_RustOrGeckoString ) ) . mString as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( URLValueData_RustOrGeckoString ) , "::" , stringify ! ( mString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLValueData_RustOrGeckoString ) ) . mRustString as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( URLValueData_RustOrGeckoString ) , "::" , stringify ! ( mRustString ) ) ) ; } # [ test ] fn bindgen_test_layout_URLValueData ( ) { assert_eq ! ( :: std :: mem :: size_of :: < URLValueData > ( ) , 64usize , concat ! ( "Size of: " , stringify ! ( URLValueData ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < URLValueData > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( URLValueData ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLValueData ) ) . mRefCnt as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( URLValueData ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLValueData ) ) . mURI as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( URLValueData ) , "::" , stringify ! ( mURI ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLValueData ) ) . mExtraData as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( URLValueData ) , "::" , stringify ! ( mExtraData ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLValueData ) ) . mURIResolved as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( URLValueData ) , "::" , stringify ! ( mURIResolved ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLValueData ) ) . mIsLocalRef as * const _ as usize } , 33usize , concat ! ( "Alignment of field: " , stringify ! ( URLValueData ) , "::" , stringify ! ( mIsLocalRef ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLValueData ) ) . mMightHaveRef as * const _ as usize } , 35usize , concat ! ( "Alignment of field: " , stringify ! ( URLValueData ) , "::" , stringify ! ( mMightHaveRef ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLValueData ) ) . mStrings as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( URLValueData ) , "::" , stringify ! ( mStrings ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLValueData ) ) . mUsingRustString as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( URLValueData ) , "::" , stringify ! ( mUsingRustString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLValueData ) ) . mLoadedImage as * const _ as usize } , 57usize , concat ! ( "Alignment of field: " , stringify ! ( URLValueData ) , "::" , stringify ! ( mLoadedImage ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct URLValue { pub _base : root :: mozilla :: css :: URLValueData , } # [ test ] fn bindgen_test_layout_URLValue ( ) { assert_eq ! ( :: std :: mem :: size_of :: < URLValue > ( ) , 64usize , concat ! ( "Size of: " , stringify ! ( URLValue ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < URLValue > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( URLValue ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct ImageValue { pub _base : root :: mozilla :: css :: URLValueData , pub mRequests : [ u64 ; 4usize ] , } # [ test ] fn bindgen_test_layout_ImageValue ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ImageValue > ( ) , 96usize , concat ! ( "Size of: " , stringify ! ( ImageValue ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ImageValue > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ImageValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ImageValue ) ) . mRequests as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( ImageValue ) , "::" , stringify ! ( mRequests ) ) ) ; } # [ repr ( C ) ] pub struct GridNamedArea { pub mName : ::nsstring::nsStringRepr , pub mColumnStart : u32 , pub mColumnEnd : u32 , pub mRowStart : u32 , pub mRowEnd : u32 , } # [ test ] fn bindgen_test_layout_GridNamedArea ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GridNamedArea > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( GridNamedArea ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GridNamedArea > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GridNamedArea ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GridNamedArea ) ) . mName as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GridNamedArea ) , "::" , stringify ! ( mName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GridNamedArea ) ) . mColumnStart as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( GridNamedArea ) , "::" , stringify ! ( mColumnStart ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GridNamedArea ) ) . mColumnEnd as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( GridNamedArea ) , "::" , stringify ! ( mColumnEnd ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GridNamedArea ) ) . mRowStart as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( GridNamedArea ) , "::" , stringify ! ( mRowStart ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GridNamedArea ) ) . mRowEnd as * const _ as usize } , 28usize , concat ! ( "Alignment of field: " , stringify ! ( GridNamedArea ) , "::" , stringify ! ( mRowEnd ) ) ) ; } # [ repr ( C ) ] pub struct GridTemplateAreasValue { pub mNamedAreas : root :: nsTArray < root :: mozilla :: css :: GridNamedArea > , pub mTemplates : root :: nsTArray < ::nsstring::nsStringRepr > , pub mNColumns : u32 , pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , } pub type GridTemplateAreasValue_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_GridTemplateAreasValue ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GridTemplateAreasValue > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( GridTemplateAreasValue ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GridTemplateAreasValue > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GridTemplateAreasValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GridTemplateAreasValue ) ) . mNamedAreas as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GridTemplateAreasValue ) , "::" , stringify ! ( mNamedAreas ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GridTemplateAreasValue ) ) . mTemplates as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( GridTemplateAreasValue ) , "::" , stringify ! ( mTemplates ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GridTemplateAreasValue ) ) . mNColumns as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( GridTemplateAreasValue ) , "::" , stringify ! ( mNColumns ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GridTemplateAreasValue ) ) . mRefCnt as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( GridTemplateAreasValue ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct RGBAColorData { pub mR : f32 , pub mG : f32 , pub mB : f32 , pub mA : f32 , } # [ test ] fn bindgen_test_layout_RGBAColorData ( ) { assert_eq ! ( :: std :: mem :: size_of :: < RGBAColorData > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( RGBAColorData ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < RGBAColorData > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( RGBAColorData ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const RGBAColorData ) ) . mR as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( RGBAColorData ) , "::" , stringify ! ( mR ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const RGBAColorData ) ) . mG as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( RGBAColorData ) , "::" , stringify ! ( mG ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const RGBAColorData ) ) . mB as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( RGBAColorData ) , "::" , stringify ! ( mB ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const RGBAColorData ) ) . mA as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( RGBAColorData ) , "::" , stringify ! ( mA ) ) ) ; } impl Clone for RGBAColorData { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct ComplexColorData { pub mColor : root :: mozilla :: css :: RGBAColorData , pub mForegroundRatio : f32 , } # [ test ] fn bindgen_test_layout_ComplexColorData ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ComplexColorData > ( ) , 20usize , concat ! ( "Size of: " , stringify ! ( ComplexColorData ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ComplexColorData > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( ComplexColorData ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ComplexColorData ) ) . mColor as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( ComplexColorData ) , "::" , stringify ! ( mColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ComplexColorData ) ) . mForegroundRatio as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( ComplexColorData ) , "::" , stringify ! ( mForegroundRatio ) ) ) ; } impl Clone for ComplexColorData { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct ComplexColorValue { pub _base : root :: mozilla :: css :: ComplexColorData , pub mRefCnt : root :: nsAutoRefCnt , } pub type ComplexColorValue_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_ComplexColorValue ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ComplexColorValue > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( ComplexColorValue ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ComplexColorValue > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ComplexColorValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ComplexColorValue ) ) . mRefCnt as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( ComplexColorValue ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct SheetLoadData { _unused : [ u8 ; 0 ] } 
  /// Style sheet reuse * 
  # [ repr ( C ) ] pub struct LoaderReusableStyleSheets { pub mReusableSheets : root :: nsTArray < root :: RefPtr < root :: mozilla :: StyleSheet > > , } # [ test ] fn bindgen_test_layout_LoaderReusableStyleSheets ( ) { assert_eq ! ( :: std :: mem :: size_of :: < LoaderReusableStyleSheets > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( LoaderReusableStyleSheets ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < LoaderReusableStyleSheets > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( LoaderReusableStyleSheets ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LoaderReusableStyleSheets ) ) . mReusableSheets as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( LoaderReusableStyleSheets ) , "::" , stringify ! ( mReusableSheets ) ) ) ; } # [ repr ( C ) ] pub struct Loader { pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mSheets : root :: nsAutoPtr < root :: mozilla :: css :: Loader_Sheets > , pub mParsingDatas : [ u64 ; 10usize ] , pub mPostedEvents : root :: mozilla :: css :: Loader_LoadDataArray , pub mObservers : [ u64 ; 2usize ] , pub mDocument : * mut root :: nsIDocument , pub mDocGroup : root :: RefPtr < root :: mozilla :: dom :: DocGroup > , pub mDatasToNotifyOn : u32 , pub mCompatMode : root :: nsCompatibility , pub mPreferredSheet : ::nsstring::nsStringRepr , pub mStyleBackendType : [ u8 ; 2usize ] , pub mEnabled : bool , pub mReporter : root :: nsCOMPtr , } pub use self :: super :: super :: super :: root :: mozilla :: net :: ReferrerPolicy as Loader_ReferrerPolicy ; pub type Loader_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct Loader_cycleCollection { pub _base : root :: nsCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_Loader_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < Loader_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( Loader_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < Loader_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( Loader_cycleCollection ) ) ) ; } impl Clone for Loader_cycleCollection { fn clone ( & self ) -> Self { * self } } pub type Loader_LoadDataArray = root :: nsTArray < root :: RefPtr < root :: mozilla :: css :: SheetLoadData > > ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct Loader_Sheets { pub mCompleteSheets : [ u64 ; 4usize ] , pub mLoadingDatas : [ u64 ; 4usize ] , pub mPendingDatas : [ u64 ; 4usize ] , } # [ test ] fn bindgen_test_layout_Loader_Sheets ( ) { assert_eq ! ( :: std :: mem :: size_of :: < Loader_Sheets > ( ) , 96usize , concat ! ( "Size of: " , stringify ! ( Loader_Sheets ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < Loader_Sheets > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( Loader_Sheets ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader_Sheets ) ) . mCompleteSheets as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( Loader_Sheets ) , "::" , stringify ! ( mCompleteSheets ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader_Sheets ) ) . mLoadingDatas as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( Loader_Sheets ) , "::" , stringify ! ( mLoadingDatas ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader_Sheets ) ) . mPendingDatas as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( Loader_Sheets ) , "::" , stringify ! ( mPendingDatas ) ) ) ; } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla3css6Loader21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla3css6Loader21_cycleCollectorGlobalE" ] 
  pub static mut  Loader__cycleCollectorGlobal  :  root :: mozilla :: css :: Loader_cycleCollection ;
 } # [ test ] fn bindgen_test_layout_Loader ( ) { assert_eq ! ( :: std :: mem :: size_of :: < Loader > ( ) , 176usize , concat ! ( "Size of: " , stringify ! ( Loader ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < Loader > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( Loader ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mSheets as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mSheets ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mParsingDatas as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mParsingDatas ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mPostedEvents as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mPostedEvents ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mObservers as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mObservers ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mDocument as * const _ as usize } , 120usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mDocument ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mDocGroup as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mDocGroup ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mDatasToNotifyOn as * const _ as usize } , 136usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mDatasToNotifyOn ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mCompatMode as * const _ as usize } , 140usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mCompatMode ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mPreferredSheet as * const _ as usize } , 144usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mPreferredSheet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mStyleBackendType as * const _ as usize } , 160usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mStyleBackendType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mEnabled as * const _ as usize } , 162usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mEnabled ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Loader ) ) . mReporter as * const _ as usize } , 168usize , concat ! ( "Alignment of field: " , stringify ! ( Loader ) , "::" , stringify ! ( mReporter ) ) ) ; } # [ repr ( C ) ] pub struct ErrorReporter { pub mError : root :: nsAutoString , pub mErrorLine : ::nsstring::nsStringRepr , pub mFileName : ::nsstring::nsStringRepr , pub mScanner : * const root :: nsCSSScanner , pub mSheet : * const root :: mozilla :: StyleSheet , pub mLoader : * const root :: mozilla :: css :: Loader , pub mURI : * mut root :: nsIURI , pub mInnerWindowID : u64 , pub mErrorLineNumber : u32 , pub mPrevErrorLineNumber : u32 , pub mErrorColNumber : u32 , } # [ test ] fn bindgen_test_layout_ErrorReporter ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ErrorReporter > ( ) , 240usize , concat ! ( "Size of: " , stringify ! ( ErrorReporter ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ErrorReporter > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ErrorReporter ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ErrorReporter ) ) . mError as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( ErrorReporter ) , "::" , stringify ! ( mError ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ErrorReporter ) ) . mErrorLine as * const _ as usize } , 152usize , concat ! ( "Alignment of field: " , stringify ! ( ErrorReporter ) , "::" , stringify ! ( mErrorLine ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ErrorReporter ) ) . mFileName as * const _ as usize } , 168usize , concat ! ( "Alignment of field: " , stringify ! ( ErrorReporter ) , "::" , stringify ! ( mFileName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ErrorReporter ) ) . mScanner as * const _ as usize } , 184usize , concat ! ( "Alignment of field: " , stringify ! ( ErrorReporter ) , "::" , stringify ! ( mScanner ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ErrorReporter ) ) . mSheet as * const _ as usize } , 192usize , concat ! ( "Alignment of field: " , stringify ! ( ErrorReporter ) , "::" , stringify ! ( mSheet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ErrorReporter ) ) . mLoader as * const _ as usize } , 200usize , concat ! ( "Alignment of field: " , stringify ! ( ErrorReporter ) , "::" , stringify ! ( mLoader ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ErrorReporter ) ) . mURI as * const _ as usize } , 208usize , concat ! ( "Alignment of field: " , stringify ! ( ErrorReporter ) , "::" , stringify ! ( mURI ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ErrorReporter ) ) . mInnerWindowID as * const _ as usize } , 216usize , concat ! ( "Alignment of field: " , stringify ! ( ErrorReporter ) , "::" , stringify ! ( mInnerWindowID ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ErrorReporter ) ) . mErrorLineNumber as * const _ as usize } , 224usize , concat ! ( "Alignment of field: " , stringify ! ( ErrorReporter ) , "::" , stringify ! ( mErrorLineNumber ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ErrorReporter ) ) . mPrevErrorLineNumber as * const _ as usize } , 228usize , concat ! ( "Alignment of field: " , stringify ! ( ErrorReporter ) , "::" , stringify ! ( mPrevErrorLineNumber ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ErrorReporter ) ) . mErrorColNumber as * const _ as usize } , 232usize , concat ! ( "Alignment of field: " , stringify ! ( ErrorReporter ) , "::" , stringify ! ( mErrorColNumber ) ) ) ; } # [ repr ( i32 ) ] 
  /// Enum defining the type of URL matching function for a @-moz-document rule
             /// condition. 
  # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum URLMatchingFunction { eURL = 0 , eURLPrefix = 1 , eDomain = 2 , eRegExp = 3 , } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct Rule { pub _base : root :: nsIDOMCSSRule , pub _base_1 : root :: nsWrapperCache , pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mSheet : * mut root :: mozilla :: StyleSheet , pub mParentRule : * mut root :: mozilla :: css :: GroupRule , pub mLineNumber : u32 , pub mColumnNumber : u32 , } pub type Rule_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct Rule_cycleCollection { pub _base : root :: nsXPCOMCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_Rule_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < Rule_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( Rule_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < Rule_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( Rule_cycleCollection ) ) ) ; } impl Clone for Rule_cycleCollection { fn clone ( & self ) -> Self { * self } } pub const Rule_UNKNOWN_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 0 ; pub const Rule_CHARSET_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 1 ; pub const Rule_IMPORT_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 2 ; pub const Rule_NAMESPACE_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 3 ; pub const Rule_STYLE_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 4 ; pub const Rule_MEDIA_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 5 ; pub const Rule_FONT_FACE_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 6 ; pub const Rule_PAGE_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 7 ; pub const Rule_KEYFRAME_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 8 ; pub const Rule_KEYFRAMES_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 9 ; pub const Rule_DOCUMENT_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 10 ; pub const Rule_SUPPORTS_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 11 ; pub const Rule_FONT_FEATURE_VALUES_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 12 ; pub const Rule_COUNTER_STYLE_RULE : root :: mozilla :: css :: Rule__bindgen_ty_1 = 13 ; pub type Rule__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla3css4Rule21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla3css4Rule21_cycleCollectorGlobalE" ] 
  pub static mut  Rule__cycleCollectorGlobal  :  root :: mozilla :: css :: Rule_cycleCollection ;
-} # [ test ] fn bindgen_test_layout_Rule ( ) { assert_eq ! ( :: std :: mem :: size_of :: < Rule > ( ) , 64usize , concat ! ( "Size of: " , stringify ! ( Rule ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < Rule > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( Rule ) ) ) ; } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct ThreadSafeAutoRefCnt { pub mValue : u64 , } pub const ThreadSafeAutoRefCnt_isThreadSafe : bool = true ; # [ test ] fn bindgen_test_layout_ThreadSafeAutoRefCnt ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ThreadSafeAutoRefCnt > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( ThreadSafeAutoRefCnt ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ThreadSafeAutoRefCnt > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ThreadSafeAutoRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ThreadSafeAutoRefCnt ) ) . mValue as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( ThreadSafeAutoRefCnt ) , "::" , stringify ! ( mValue ) ) ) ; } pub type EnumeratedArray_ArrayType = u8 ; pub type EnumeratedArray_iterator = root :: mozilla :: EnumeratedArray_ArrayType ; pub type EnumeratedArray_const_iterator = root :: mozilla :: EnumeratedArray_ArrayType ; pub type EnumeratedArray_reverse_iterator = root :: mozilla :: EnumeratedArray_ArrayType ; pub type EnumeratedArray_const_reverse_iterator = root :: mozilla :: EnumeratedArray_ArrayType ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct LinkedListElement { pub mNext : * mut root :: mozilla :: LinkedListElement , pub mPrev : * mut root :: mozilla :: LinkedListElement , pub mIsSentinel : bool , } pub type LinkedListElement_Traits = root :: mozilla :: detail :: LinkedListElementTraits ; pub type LinkedListElement_RawType = root :: mozilla :: LinkedListElement_Traits ; pub type LinkedListElement_ConstRawType = root :: mozilla :: LinkedListElement_Traits ; pub type LinkedListElement_ClientType = root :: mozilla :: LinkedListElement_Traits ; pub type LinkedListElement_ConstClientType = root :: mozilla :: LinkedListElement_Traits ; pub const LinkedListElement_NodeKind_Normal : root :: mozilla :: LinkedListElement_NodeKind = 0 ; pub const LinkedListElement_NodeKind_Sentinel : root :: mozilla :: LinkedListElement_NodeKind = 0 ; pub type LinkedListElement_NodeKind = :: std :: os :: raw :: c_int ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct LinkedList { pub sentinel : root :: mozilla :: LinkedListElement , } pub type LinkedList_Traits = root :: mozilla :: detail :: LinkedListElementTraits ; pub type LinkedList_RawType = root :: mozilla :: LinkedList_Traits ; pub type LinkedList_ConstRawType = root :: mozilla :: LinkedList_Traits ; pub type LinkedList_ClientType = root :: mozilla :: LinkedList_Traits ; pub type LinkedList_ConstClientType = root :: mozilla :: LinkedList_Traits ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct LinkedList_Iterator { pub mCurrent : root :: mozilla :: LinkedList_RawType , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Maybe { pub _address : u8 , } pub type Maybe_ValueType < T > = T ; pub mod gfx { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: root ; pub type Float = f32 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct FontVariation { pub mTag : u32 , pub mValue : f32 , } # [ test ] fn bindgen_test_layout_FontVariation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < FontVariation > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( FontVariation ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < FontVariation > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( FontVariation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontVariation ) ) . mTag as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( FontVariation ) , "::" , stringify ! ( mTag ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontVariation ) ) . mValue as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( FontVariation ) , "::" , stringify ! ( mValue ) ) ) ; } impl Clone for FontVariation { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct SourceSurface { _unused : [ u8 ; 0 ] } } pub mod layers { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: root ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct LayerManager { _unused : [ u8 ; 0 ] } } pub mod dom { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: root ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct AllOwningUnionBase { pub _address : u8 , } # [ test ] fn bindgen_test_layout_AllOwningUnionBase ( ) { assert_eq ! ( :: std :: mem :: size_of :: < AllOwningUnionBase > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( AllOwningUnionBase ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < AllOwningUnionBase > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( AllOwningUnionBase ) ) ) ; } impl Clone for AllOwningUnionBase { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GlobalObject { pub mGlobalJSObject : [ u64 ; 3usize ] , pub mCx : * mut root :: JSContext , pub mGlobalObject : * mut root :: nsISupports , } # [ test ] fn bindgen_test_layout_GlobalObject ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GlobalObject > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( GlobalObject ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GlobalObject > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GlobalObject ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GlobalObject ) ) . mGlobalJSObject as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GlobalObject ) , "::" , stringify ! ( mGlobalJSObject ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GlobalObject ) ) . mCx as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( GlobalObject ) , "::" , stringify ! ( mCx ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GlobalObject ) ) . mGlobalObject as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( GlobalObject ) , "::" , stringify ! ( mGlobalObject ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Sequence { pub _address : u8 , } # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum CallerType { System = 0 , NonSystem = 1 , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Nullable { pub _address : u8 , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ClientSource { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct CSSImportRule { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ShadowRoot { _unused : [ u8 ; 0 ] } 
+} # [ test ] fn bindgen_test_layout_Rule ( ) { assert_eq ! ( :: std :: mem :: size_of :: < Rule > ( ) , 64usize , concat ! ( "Size of: " , stringify ! ( Rule ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < Rule > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( Rule ) ) ) ; } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct ThreadSafeAutoRefCnt { pub mValue : u64 , } pub const ThreadSafeAutoRefCnt_isThreadSafe : bool = true ; # [ test ] fn bindgen_test_layout_ThreadSafeAutoRefCnt ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ThreadSafeAutoRefCnt > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( ThreadSafeAutoRefCnt ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ThreadSafeAutoRefCnt > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ThreadSafeAutoRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ThreadSafeAutoRefCnt ) ) . mValue as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( ThreadSafeAutoRefCnt ) , "::" , stringify ! ( mValue ) ) ) ; } impl Clone for ThreadSafeAutoRefCnt { fn clone ( & self ) -> Self { * self } } pub type EnumeratedArray_ArrayType = u8 ; pub type EnumeratedArray_iterator = root :: mozilla :: EnumeratedArray_ArrayType ; pub type EnumeratedArray_const_iterator = root :: mozilla :: EnumeratedArray_ArrayType ; pub type EnumeratedArray_reverse_iterator = root :: mozilla :: EnumeratedArray_ArrayType ; pub type EnumeratedArray_const_reverse_iterator = root :: mozilla :: EnumeratedArray_ArrayType ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct LinkedListElement { pub mNext : * mut root :: mozilla :: LinkedListElement , pub mPrev : * mut root :: mozilla :: LinkedListElement , pub mIsSentinel : bool , } pub type LinkedListElement_Traits = root :: mozilla :: detail :: LinkedListElementTraits ; pub type LinkedListElement_RawType = root :: mozilla :: LinkedListElement_Traits ; pub type LinkedListElement_ConstRawType = root :: mozilla :: LinkedListElement_Traits ; pub type LinkedListElement_ClientType = root :: mozilla :: LinkedListElement_Traits ; pub type LinkedListElement_ConstClientType = root :: mozilla :: LinkedListElement_Traits ; pub const LinkedListElement_NodeKind_Normal : root :: mozilla :: LinkedListElement_NodeKind = 0 ; pub const LinkedListElement_NodeKind_Sentinel : root :: mozilla :: LinkedListElement_NodeKind = 0 ; pub type LinkedListElement_NodeKind = :: std :: os :: raw :: c_int ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct LinkedList { pub sentinel : root :: mozilla :: LinkedListElement , } pub type LinkedList_Traits = root :: mozilla :: detail :: LinkedListElementTraits ; pub type LinkedList_RawType = root :: mozilla :: LinkedList_Traits ; pub type LinkedList_ConstRawType = root :: mozilla :: LinkedList_Traits ; pub type LinkedList_ClientType = root :: mozilla :: LinkedList_Traits ; pub type LinkedList_ConstClientType = root :: mozilla :: LinkedList_Traits ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct LinkedList_Iterator { pub mCurrent : root :: mozilla :: LinkedList_RawType , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Maybe { pub _address : u8 , } pub type Maybe_ValueType < T > = T ; pub mod gfx { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: root ; pub type Float = f32 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct FontVariation { pub mTag : u32 , pub mValue : f32 , } # [ test ] fn bindgen_test_layout_FontVariation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < FontVariation > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( FontVariation ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < FontVariation > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( FontVariation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontVariation ) ) . mTag as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( FontVariation ) , "::" , stringify ! ( mTag ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontVariation ) ) . mValue as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( FontVariation ) , "::" , stringify ! ( mValue ) ) ) ; } impl Clone for FontVariation { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct SourceSurface { _unused : [ u8 ; 0 ] } } pub mod layers { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: root ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct LayerManager { _unused : [ u8 ; 0 ] } } pub mod dom { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: root ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct AllOwningUnionBase { pub _address : u8 , } # [ test ] fn bindgen_test_layout_AllOwningUnionBase ( ) { assert_eq ! ( :: std :: mem :: size_of :: < AllOwningUnionBase > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( AllOwningUnionBase ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < AllOwningUnionBase > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( AllOwningUnionBase ) ) ) ; } impl Clone for AllOwningUnionBase { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GlobalObject { pub mGlobalJSObject : [ u64 ; 3usize ] , pub mCx : * mut root :: JSContext , pub mGlobalObject : * mut root :: nsISupports , } # [ test ] fn bindgen_test_layout_GlobalObject ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GlobalObject > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( GlobalObject ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GlobalObject > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GlobalObject ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GlobalObject ) ) . mGlobalJSObject as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GlobalObject ) , "::" , stringify ! ( mGlobalJSObject ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GlobalObject ) ) . mCx as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( GlobalObject ) , "::" , stringify ! ( mCx ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GlobalObject ) ) . mGlobalObject as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( GlobalObject ) , "::" , stringify ! ( mGlobalObject ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Sequence { pub _address : u8 , } # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum CallerType { System = 0 , NonSystem = 1 , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Nullable { pub _address : u8 , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ClientSource { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct CSSImportRule { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ShadowRoot { _unused : [ u8 ; 0 ] } 
  /// Struct that stores info on an attribute. The name and value must either both
             /// be null or both be non-null.
             ///
@@ -83,9 +86,9 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
             /// this struct hold are only valid until the element or its attributes are
             /// mutated (directly or via script). 
  # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct BorrowedAttrInfo { pub mName : * const root :: nsAttrName , pub mValue : * const root :: nsAttrValue , } # [ test ] fn bindgen_test_layout_BorrowedAttrInfo ( ) { assert_eq ! ( :: std :: mem :: size_of :: < BorrowedAttrInfo > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( BorrowedAttrInfo ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < BorrowedAttrInfo > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( BorrowedAttrInfo ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const BorrowedAttrInfo ) ) . mName as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( BorrowedAttrInfo ) , "::" , stringify ! ( mName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const BorrowedAttrInfo ) ) . mValue as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( BorrowedAttrInfo ) , "::" , stringify ! ( mValue ) ) ) ; } impl Clone for BorrowedAttrInfo { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] pub struct NodeInfo { pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mDocument : * mut root :: nsIDocument , pub mInner : root :: mozilla :: dom :: NodeInfo_NodeInfoInner , pub mOwnerManager : root :: RefPtr < root :: nsNodeInfoManager > , pub mQualifiedName : ::nsstring::nsStringRepr , pub mNodeName : ::nsstring::nsStringRepr , pub mLocalName : ::nsstring::nsStringRepr , } pub type NodeInfo_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct NodeInfo_cycleCollection { pub _base : root :: nsCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_NodeInfo_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < NodeInfo_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( NodeInfo_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < NodeInfo_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( NodeInfo_cycleCollection ) ) ) ; } impl Clone for NodeInfo_cycleCollection { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct NodeInfo_NodeInfoInner { pub mName : * const root :: nsAtom , pub mPrefix : * mut root :: nsAtom , pub mNamespaceID : i32 , pub mNodeType : u16 , pub mNameString : * const root :: nsAString , pub mExtraName : * mut root :: nsAtom , pub mHash : root :: PLHashNumber , pub mHashInitialized : bool , } # [ test ] fn bindgen_test_layout_NodeInfo_NodeInfoInner ( ) { assert_eq ! ( :: std :: mem :: size_of :: < NodeInfo_NodeInfoInner > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( NodeInfo_NodeInfoInner ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < NodeInfo_NodeInfoInner > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( NodeInfo_NodeInfoInner ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo_NodeInfoInner ) ) . mName as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo_NodeInfoInner ) , "::" , stringify ! ( mName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo_NodeInfoInner ) ) . mPrefix as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo_NodeInfoInner ) , "::" , stringify ! ( mPrefix ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo_NodeInfoInner ) ) . mNamespaceID as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo_NodeInfoInner ) , "::" , stringify ! ( mNamespaceID ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo_NodeInfoInner ) ) . mNodeType as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo_NodeInfoInner ) , "::" , stringify ! ( mNodeType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo_NodeInfoInner ) ) . mNameString as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo_NodeInfoInner ) , "::" , stringify ! ( mNameString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo_NodeInfoInner ) ) . mExtraName as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo_NodeInfoInner ) , "::" , stringify ! ( mExtraName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo_NodeInfoInner ) ) . mHash as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo_NodeInfoInner ) , "::" , stringify ! ( mHash ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo_NodeInfoInner ) ) . mHashInitialized as * const _ as usize } , 44usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo_NodeInfoInner ) , "::" , stringify ! ( mHashInitialized ) ) ) ; } impl Clone for NodeInfo_NodeInfoInner { fn clone ( & self ) -> Self { * self } } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla3dom8NodeInfo21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla3dom8NodeInfo21_cycleCollectorGlobalE" ] 
  pub static mut  NodeInfo__cycleCollectorGlobal  :  root :: mozilla :: dom :: NodeInfo_cycleCollection ;
-} # [ test ] fn bindgen_test_layout_NodeInfo ( ) { assert_eq ! ( :: std :: mem :: size_of :: < NodeInfo > ( ) , 120usize , concat ! ( "Size of: " , stringify ! ( NodeInfo ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < NodeInfo > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( NodeInfo ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mDocument as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mDocument ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mInner as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mInner ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mOwnerManager as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mOwnerManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mQualifiedName as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mQualifiedName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mNodeName as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mNodeName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mLocalName as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mLocalName ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct EventTarget { pub _base : root :: nsIDOMEventTarget , pub _base_1 : root :: nsWrapperCache , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct EventTarget_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_EventTarget ( ) { assert_eq ! ( :: std :: mem :: size_of :: < EventTarget > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( EventTarget ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < EventTarget > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( EventTarget ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct BoxQuadOptions { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ConvertCoordinateOptions { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct DOMPoint { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct DOMQuad { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct TextOrElementOrDocument { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct DOMPointInit { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct HTMLSlotElement { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct TabGroup { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] pub struct DispatcherTrait__bindgen_vtable ( :: std :: os :: raw :: c_void ) ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct DispatcherTrait { pub vtable_ : * const DispatcherTrait__bindgen_vtable , } # [ test ] fn bindgen_test_layout_DispatcherTrait ( ) { assert_eq ! ( :: std :: mem :: size_of :: < DispatcherTrait > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( DispatcherTrait ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < DispatcherTrait > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( DispatcherTrait ) ) ) ; } impl Clone for DispatcherTrait { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct AudioContext { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct DocGroup { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Performance { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ServiceWorkerRegistration { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct TimeoutManager { _unused : [ u8 ; 0 ] } pub const LargeAllocStatus_NONE : root :: mozilla :: dom :: LargeAllocStatus = 0 ; pub const LargeAllocStatus_SUCCESS : root :: mozilla :: dom :: LargeAllocStatus = 1 ; pub const LargeAllocStatus_NON_GET : root :: mozilla :: dom :: LargeAllocStatus = 2 ; pub const LargeAllocStatus_NON_E10S : root :: mozilla :: dom :: LargeAllocStatus = 3 ; pub const LargeAllocStatus_NOT_ONLY_TOPLEVEL_IN_TABGROUP : root :: mozilla :: dom :: LargeAllocStatus = 4 ; pub const LargeAllocStatus_NON_WIN32 : root :: mozilla :: dom :: LargeAllocStatus = 5 ; pub type LargeAllocStatus = u8 ; pub mod prototypes { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: super :: root ; } pub mod constructors { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: super :: root ; } pub mod namedpropertiesobjects { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: super :: root ; } pub const VisibilityState_Hidden : root :: mozilla :: dom :: VisibilityState = 0 ; pub const VisibilityState_Visible : root :: mozilla :: dom :: VisibilityState = 1 ; pub const VisibilityState_Prerender : root :: mozilla :: dom :: VisibilityState = 2 ; pub const VisibilityState_EndGuard_ : root :: mozilla :: dom :: VisibilityState = 3 ; pub type VisibilityState = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct AnonymousContent { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct FontFaceSet { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct FullscreenRequest { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ImageTracker { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Link { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct MediaQueryList { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct XPathEvaluator { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct FrameRequestCallback { pub _bindgen_opaque_blob : [ u64 ; 6usize ] , } # [ test ] fn bindgen_test_layout_FrameRequestCallback ( ) { assert_eq ! ( :: std :: mem :: size_of :: < FrameRequestCallback > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( FrameRequestCallback ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < FrameRequestCallback > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( FrameRequestCallback ) ) ) ; } impl Clone for FrameRequestCallback { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] pub struct URLParams { pub mParams : root :: nsTArray < root :: mozilla :: dom :: URLParams_Param > , } # [ repr ( C ) ] pub struct URLParams_ForEachIterator__bindgen_vtable ( :: std :: os :: raw :: c_void ) ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct URLParams_ForEachIterator { pub vtable_ : * const URLParams_ForEachIterator__bindgen_vtable , } # [ test ] fn bindgen_test_layout_URLParams_ForEachIterator ( ) { assert_eq ! ( :: std :: mem :: size_of :: < URLParams_ForEachIterator > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( URLParams_ForEachIterator ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < URLParams_ForEachIterator > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( URLParams_ForEachIterator ) ) ) ; } impl Clone for URLParams_ForEachIterator { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] pub struct URLParams_Param { pub mKey : ::nsstring::nsStringRepr , pub mValue : ::nsstring::nsStringRepr , } # [ test ] fn bindgen_test_layout_URLParams_Param ( ) { assert_eq ! ( :: std :: mem :: size_of :: < URLParams_Param > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( URLParams_Param ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < URLParams_Param > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( URLParams_Param ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLParams_Param ) ) . mKey as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( URLParams_Param ) , "::" , stringify ! ( mKey ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLParams_Param ) ) . mValue as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( URLParams_Param ) , "::" , stringify ! ( mValue ) ) ) ; } # [ test ] fn bindgen_test_layout_URLParams ( ) { assert_eq ! ( :: std :: mem :: size_of :: < URLParams > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( URLParams ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < URLParams > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( URLParams ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLParams ) ) . mParams as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( URLParams ) , "::" , stringify ! ( mParams ) ) ) ; } # [ repr ( C ) ] pub struct SRIMetadata { pub mHashes : root :: nsTArray < root :: nsTString < :: std :: os :: raw :: c_char > > , pub mIntegrityString : ::nsstring::nsStringRepr , pub mAlgorithm : root :: nsCString , pub mAlgorithmType : i8 , pub mEmpty : bool , } pub const SRIMetadata_MAX_ALTERNATE_HASHES : u32 = 256 ; pub const SRIMetadata_UNKNOWN_ALGORITHM : i8 = -1 ; # [ test ] fn bindgen_test_layout_SRIMetadata ( ) { assert_eq ! ( :: std :: mem :: size_of :: < SRIMetadata > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( SRIMetadata ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < SRIMetadata > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( SRIMetadata ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const SRIMetadata ) ) . mHashes as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( SRIMetadata ) , "::" , stringify ! ( mHashes ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const SRIMetadata ) ) . mIntegrityString as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( SRIMetadata ) , "::" , stringify ! ( mIntegrityString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const SRIMetadata ) ) . mAlgorithm as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( SRIMetadata ) , "::" , stringify ! ( mAlgorithm ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const SRIMetadata ) ) . mAlgorithmType as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( SRIMetadata ) , "::" , stringify ! ( mAlgorithmType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const SRIMetadata ) ) . mEmpty as * const _ as usize } , 41usize , concat ! ( "Alignment of field: " , stringify ! ( SRIMetadata ) , "::" , stringify ! ( mEmpty ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct OwningNodeOrString { pub mType : root :: mozilla :: dom :: OwningNodeOrString_Type , pub mValue : root :: mozilla :: dom :: OwningNodeOrString_Value , } pub const OwningNodeOrString_Type_eUninitialized : root :: mozilla :: dom :: OwningNodeOrString_Type = 0 ; pub const OwningNodeOrString_Type_eNode : root :: mozilla :: dom :: OwningNodeOrString_Type = 1 ; pub const OwningNodeOrString_Type_eString : root :: mozilla :: dom :: OwningNodeOrString_Type = 2 ; pub type OwningNodeOrString_Type = :: std :: os :: raw :: c_uint ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct OwningNodeOrString_Value { pub _bindgen_opaque_blob : [ u64 ; 2usize ] , } # [ test ] fn bindgen_test_layout_OwningNodeOrString_Value ( ) { assert_eq ! ( :: std :: mem :: size_of :: < OwningNodeOrString_Value > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( OwningNodeOrString_Value ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < OwningNodeOrString_Value > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( OwningNodeOrString_Value ) ) ) ; } impl Clone for OwningNodeOrString_Value { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_OwningNodeOrString ( ) { assert_eq ! ( :: std :: mem :: size_of :: < OwningNodeOrString > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( OwningNodeOrString ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < OwningNodeOrString > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( OwningNodeOrString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const OwningNodeOrString ) ) . mType as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( OwningNodeOrString ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const OwningNodeOrString ) ) . mValue as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( OwningNodeOrString ) , "::" , stringify ! ( mValue ) ) ) ; } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum FillMode { None = 0 , Forwards = 1 , Backwards = 2 , Both = 3 , Auto = 4 , EndGuard_ = 5 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum PlaybackDirection { Normal = 0 , Reverse = 1 , Alternate = 2 , Alternate_reverse = 3 , EndGuard_ = 4 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum CompositeOperation { Replace = 0 , Add = 1 , Accumulate = 2 , EndGuard_ = 3 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum IterationCompositeOperation { Replace = 0 , Accumulate = 1 , EndGuard_ = 2 , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct XBLChildrenElement { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct CustomElementData { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] pub struct FragmentOrElement { pub _base : root :: nsIContent , pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , 
+} # [ test ] fn bindgen_test_layout_NodeInfo ( ) { assert_eq ! ( :: std :: mem :: size_of :: < NodeInfo > ( ) , 120usize , concat ! ( "Size of: " , stringify ! ( NodeInfo ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < NodeInfo > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( NodeInfo ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mDocument as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mDocument ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mInner as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mInner ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mOwnerManager as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mOwnerManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mQualifiedName as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mQualifiedName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mNodeName as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mNodeName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NodeInfo ) ) . mLocalName as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( NodeInfo ) , "::" , stringify ! ( mLocalName ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct EventTarget { pub _base : root :: nsIDOMEventTarget , pub _base_1 : root :: nsWrapperCache , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct EventTarget_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_EventTarget ( ) { assert_eq ! ( :: std :: mem :: size_of :: < EventTarget > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( EventTarget ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < EventTarget > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( EventTarget ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct BoxQuadOptions { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ConvertCoordinateOptions { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct DOMPoint { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct DOMQuad { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct TextOrElementOrDocument { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct DOMPointInit { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct HTMLSlotElement { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct TabGroup { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] pub struct DispatcherTrait__bindgen_vtable ( :: std :: os :: raw :: c_void ) ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct DispatcherTrait { pub vtable_ : * const DispatcherTrait__bindgen_vtable , } # [ test ] fn bindgen_test_layout_DispatcherTrait ( ) { assert_eq ! ( :: std :: mem :: size_of :: < DispatcherTrait > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( DispatcherTrait ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < DispatcherTrait > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( DispatcherTrait ) ) ) ; } impl Clone for DispatcherTrait { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct AudioContext { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct DocGroup { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Performance { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ServiceWorkerRegistration { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct TimeoutManager { _unused : [ u8 ; 0 ] } pub const LargeAllocStatus_NONE : root :: mozilla :: dom :: LargeAllocStatus = 0 ; pub const LargeAllocStatus_SUCCESS : root :: mozilla :: dom :: LargeAllocStatus = 1 ; pub const LargeAllocStatus_NON_GET : root :: mozilla :: dom :: LargeAllocStatus = 2 ; pub const LargeAllocStatus_NON_E10S : root :: mozilla :: dom :: LargeAllocStatus = 3 ; pub const LargeAllocStatus_NOT_ONLY_TOPLEVEL_IN_TABGROUP : root :: mozilla :: dom :: LargeAllocStatus = 4 ; pub const LargeAllocStatus_NON_WIN32 : root :: mozilla :: dom :: LargeAllocStatus = 5 ; pub type LargeAllocStatus = u8 ; pub mod prototypes { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: super :: root ; } pub mod constructors { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: super :: root ; } pub mod namedpropertiesobjects { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: super :: root ; } pub const VisibilityState_Hidden : root :: mozilla :: dom :: VisibilityState = 0 ; pub const VisibilityState_Visible : root :: mozilla :: dom :: VisibilityState = 1 ; pub const VisibilityState_Prerender : root :: mozilla :: dom :: VisibilityState = 2 ; pub const VisibilityState_EndGuard_ : root :: mozilla :: dom :: VisibilityState = 3 ; pub type VisibilityState = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct AnonymousContent { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct FontFaceSet { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct FullscreenRequest { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ImageTracker { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Link { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct MediaQueryList { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct XPathEvaluator { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct FrameRequestCallback { pub _bindgen_opaque_blob : [ u64 ; 6usize ] , } # [ test ] fn bindgen_test_layout_FrameRequestCallback ( ) { assert_eq ! ( :: std :: mem :: size_of :: < FrameRequestCallback > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( FrameRequestCallback ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < FrameRequestCallback > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( FrameRequestCallback ) ) ) ; } impl Clone for FrameRequestCallback { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] pub struct URLParams { pub mParams : root :: nsTArray < root :: mozilla :: dom :: URLParams_Param > , } # [ repr ( C ) ] pub struct URLParams_ForEachIterator__bindgen_vtable ( :: std :: os :: raw :: c_void ) ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct URLParams_ForEachIterator { pub vtable_ : * const URLParams_ForEachIterator__bindgen_vtable , } # [ test ] fn bindgen_test_layout_URLParams_ForEachIterator ( ) { assert_eq ! ( :: std :: mem :: size_of :: < URLParams_ForEachIterator > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( URLParams_ForEachIterator ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < URLParams_ForEachIterator > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( URLParams_ForEachIterator ) ) ) ; } impl Clone for URLParams_ForEachIterator { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] pub struct URLParams_Param { pub mKey : ::nsstring::nsStringRepr , pub mValue : ::nsstring::nsStringRepr , } # [ test ] fn bindgen_test_layout_URLParams_Param ( ) { assert_eq ! ( :: std :: mem :: size_of :: < URLParams_Param > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( URLParams_Param ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < URLParams_Param > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( URLParams_Param ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLParams_Param ) ) . mKey as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( URLParams_Param ) , "::" , stringify ! ( mKey ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLParams_Param ) ) . mValue as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( URLParams_Param ) , "::" , stringify ! ( mValue ) ) ) ; } # [ test ] fn bindgen_test_layout_URLParams ( ) { assert_eq ! ( :: std :: mem :: size_of :: < URLParams > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( URLParams ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < URLParams > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( URLParams ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLParams ) ) . mParams as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( URLParams ) , "::" , stringify ! ( mParams ) ) ) ; } # [ repr ( C ) ] pub struct SRIMetadata { pub mHashes : root :: nsTArray < root :: nsCString > , pub mIntegrityString : ::nsstring::nsStringRepr , pub mAlgorithm : root :: nsCString , pub mAlgorithmType : i8 , pub mEmpty : bool , } pub const SRIMetadata_MAX_ALTERNATE_HASHES : u32 = 256 ; pub const SRIMetadata_UNKNOWN_ALGORITHM : i8 = -1 ; # [ test ] fn bindgen_test_layout_SRIMetadata ( ) { assert_eq ! ( :: std :: mem :: size_of :: < SRIMetadata > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( SRIMetadata ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < SRIMetadata > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( SRIMetadata ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const SRIMetadata ) ) . mHashes as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( SRIMetadata ) , "::" , stringify ! ( mHashes ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const SRIMetadata ) ) . mIntegrityString as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( SRIMetadata ) , "::" , stringify ! ( mIntegrityString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const SRIMetadata ) ) . mAlgorithm as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( SRIMetadata ) , "::" , stringify ! ( mAlgorithm ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const SRIMetadata ) ) . mAlgorithmType as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( SRIMetadata ) , "::" , stringify ! ( mAlgorithmType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const SRIMetadata ) ) . mEmpty as * const _ as usize } , 41usize , concat ! ( "Alignment of field: " , stringify ! ( SRIMetadata ) , "::" , stringify ! ( mEmpty ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct OwningNodeOrString { pub mType : root :: mozilla :: dom :: OwningNodeOrString_Type , pub mValue : root :: mozilla :: dom :: OwningNodeOrString_Value , } pub const OwningNodeOrString_Type_eUninitialized : root :: mozilla :: dom :: OwningNodeOrString_Type = 0 ; pub const OwningNodeOrString_Type_eNode : root :: mozilla :: dom :: OwningNodeOrString_Type = 1 ; pub const OwningNodeOrString_Type_eString : root :: mozilla :: dom :: OwningNodeOrString_Type = 2 ; pub type OwningNodeOrString_Type = :: std :: os :: raw :: c_uint ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct OwningNodeOrString_Value { pub _bindgen_opaque_blob : [ u64 ; 2usize ] , } # [ test ] fn bindgen_test_layout_OwningNodeOrString_Value ( ) { assert_eq ! ( :: std :: mem :: size_of :: < OwningNodeOrString_Value > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( OwningNodeOrString_Value ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < OwningNodeOrString_Value > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( OwningNodeOrString_Value ) ) ) ; } impl Clone for OwningNodeOrString_Value { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_OwningNodeOrString ( ) { assert_eq ! ( :: std :: mem :: size_of :: < OwningNodeOrString > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( OwningNodeOrString ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < OwningNodeOrString > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( OwningNodeOrString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const OwningNodeOrString ) ) . mType as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( OwningNodeOrString ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const OwningNodeOrString ) ) . mValue as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( OwningNodeOrString ) , "::" , stringify ! ( mValue ) ) ) ; } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum FillMode { None = 0 , Forwards = 1 , Backwards = 2 , Both = 3 , Auto = 4 , EndGuard_ = 5 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum PlaybackDirection { Normal = 0 , Reverse = 1 , Alternate = 2 , Alternate_reverse = 3 , EndGuard_ = 4 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum CompositeOperation { Replace = 0 , Add = 1 , Accumulate = 2 , EndGuard_ = 3 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum IterationCompositeOperation { Replace = 0 , Accumulate = 1 , EndGuard_ = 2 , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct XBLChildrenElement { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct CustomElementData { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] pub struct FragmentOrElement { pub _base : root :: nsIContent , pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , 
  /// Array containing all attributes and children for this element 
  pub mAttrsAndChildren : root :: nsAttrAndChildArray , } pub type FragmentOrElement_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct FragmentOrElement_cycleCollection { pub _base : root :: nsXPCOMCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_FragmentOrElement_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < FragmentOrElement_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( FragmentOrElement_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < FragmentOrElement_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( FragmentOrElement_cycleCollection ) ) ) ; } impl Clone for FragmentOrElement_cycleCollection { fn clone ( & self ) -> Self { * self } } 
  /// There are a set of DOM- and scripting-specific instance variables
@@ -138,16 +141,16 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
  pub mChildrenList : root :: RefPtr < root :: nsContentList > , 
  /// An object implementing the .classList property for this element. 
  pub mClassList : root :: RefPtr < root :: nsDOMTokenList > , pub mExtendedSlots : root :: mozilla :: UniquePtr < root :: mozilla :: dom :: FragmentOrElement_nsExtendedDOMSlots > , } # [ test ] fn bindgen_test_layout_FragmentOrElement_nsDOMSlots ( ) { assert_eq ! ( :: std :: mem :: size_of :: < FragmentOrElement_nsDOMSlots > ( ) , 120usize , concat ! ( "Size of: " , stringify ! ( FragmentOrElement_nsDOMSlots ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < FragmentOrElement_nsDOMSlots > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( FragmentOrElement_nsDOMSlots ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FragmentOrElement_nsDOMSlots ) ) . mStyle as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( FragmentOrElement_nsDOMSlots ) , "::" , stringify ! ( mStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FragmentOrElement_nsDOMSlots ) ) . mDataset as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( FragmentOrElement_nsDOMSlots ) , "::" , stringify ! ( mDataset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FragmentOrElement_nsDOMSlots ) ) . mAttributeMap as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( FragmentOrElement_nsDOMSlots ) , "::" , stringify ! ( mAttributeMap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FragmentOrElement_nsDOMSlots ) ) . mChildrenList as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( FragmentOrElement_nsDOMSlots ) , "::" , stringify ! ( mChildrenList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FragmentOrElement_nsDOMSlots ) ) . mClassList as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( FragmentOrElement_nsDOMSlots ) , "::" , stringify ! ( mClassList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FragmentOrElement_nsDOMSlots ) ) . mExtendedSlots as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( FragmentOrElement_nsDOMSlots ) , "::" , stringify ! ( mExtendedSlots ) ) ) ; } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla3dom17FragmentOrElement21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla3dom17FragmentOrElement21_cycleCollectorGlobalE" ] 
  pub static mut  FragmentOrElement__cycleCollectorGlobal  :  root :: mozilla :: dom :: FragmentOrElement_cycleCollection ;
 } # [ test ] fn bindgen_test_layout_FragmentOrElement ( ) { assert_eq ! ( :: std :: mem :: size_of :: < FragmentOrElement > ( ) , 104usize , concat ! ( "Size of: " , stringify ! ( FragmentOrElement ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < FragmentOrElement > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( FragmentOrElement ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FragmentOrElement ) ) . mRefCnt as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( FragmentOrElement ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FragmentOrElement ) ) . mAttrsAndChildren as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( FragmentOrElement ) , "::" , stringify ! ( mAttrsAndChildren ) ) ) ; } # [ repr ( C ) ] pub struct Attr { pub _base : root :: nsIAttribute , pub _base_1 : root :: nsIDOMAttr , pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mValue : ::nsstring::nsStringRepr , } pub type Attr_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct Attr_cycleCollection { pub _base : root :: nsXPCOMCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_Attr_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < Attr_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( Attr_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < Attr_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( Attr_cycleCollection ) ) ) ; } impl Clone for Attr_cycleCollection { fn clone ( & self ) -> Self { * self } } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla3dom4Attr21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla3dom4Attr21_cycleCollectorGlobalE" ] 
  pub static mut  Attr__cycleCollectorGlobal  :  root :: mozilla :: dom :: Attr_cycleCollection ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla3dom4Attr12sInitializedE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla3dom4Attr12sInitializedE" ] 
  pub static mut  Attr_sInitialized  :  bool ;
 } # [ test ] fn bindgen_test_layout_Attr ( ) { assert_eq ! ( :: std :: mem :: size_of :: < Attr > ( ) , 128usize , concat ! ( "Size of: " , stringify ! ( Attr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < Attr > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( Attr ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct DOMRectReadOnly { pub _base : root :: nsISupports , pub _base_1 : root :: nsWrapperCache , pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mParent : root :: nsCOMPtr , } pub type DOMRectReadOnly_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct DOMRectReadOnly_cycleCollection { pub _base : root :: nsXPCOMCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_DOMRectReadOnly_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < DOMRectReadOnly_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( DOMRectReadOnly_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < DOMRectReadOnly_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( DOMRectReadOnly_cycleCollection ) ) ) ; } impl Clone for DOMRectReadOnly_cycleCollection { fn clone ( & self ) -> Self { * self } } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla3dom15DOMRectReadOnly21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla3dom15DOMRectReadOnly21_cycleCollectorGlobalE" ] 
  pub static mut  DOMRectReadOnly__cycleCollectorGlobal  :  root :: mozilla :: dom :: DOMRectReadOnly_cycleCollection ;
 } # [ test ] fn bindgen_test_layout_DOMRectReadOnly ( ) { assert_eq ! ( :: std :: mem :: size_of :: < DOMRectReadOnly > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( DOMRectReadOnly ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < DOMRectReadOnly > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( DOMRectReadOnly ) ) ) ; } # [ repr ( C ) ] pub struct Element { pub _base : root :: mozilla :: dom :: FragmentOrElement , pub mState : root :: mozilla :: EventStates , pub mServoData : ::gecko_bindings::structs::ServoCell < * mut ::gecko_bindings::structs::ServoNodeData > , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Element_COMTypeInfo { pub _address : u8 , } 
  /// StyleStateLocks is used to specify which event states should be locked,
@@ -181,7 +184,7 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
             /// We require this to be memmovable since Rust code can create and move
             /// StyleChildrenIterators. 
  # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct StyleChildrenIterator { pub _base : root :: mozilla :: dom :: AllChildrenIterator , } # [ test ] fn bindgen_test_layout_StyleChildrenIterator ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleChildrenIterator > ( ) , 72usize , concat ! ( "Size of: " , stringify ! ( StyleChildrenIterator ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleChildrenIterator > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleChildrenIterator ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct MediaList { pub _base : root :: nsIDOMMediaList , pub _base_1 : root :: nsWrapperCache , pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mStyleSheet : * mut root :: mozilla :: StyleSheet , } pub type MediaList_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct MediaList_cycleCollection { pub _base : root :: nsXPCOMCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_MediaList_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < MediaList_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( MediaList_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < MediaList_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( MediaList_cycleCollection ) ) ) ; } impl Clone for MediaList_cycleCollection { fn clone ( & self ) -> Self { * self } } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla3dom9MediaList21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla3dom9MediaList21_cycleCollectorGlobalE" ] 
  pub static mut  MediaList__cycleCollectorGlobal  :  root :: mozilla :: dom :: MediaList_cycleCollection ;
 } # [ test ] fn bindgen_test_layout_MediaList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < MediaList > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( MediaList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < MediaList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( MediaList ) ) ) ; } } # [ repr ( C ) ] pub struct CSSVariableValues { 
  /// Map of variable names to IDs.  Variable IDs are indexes into
@@ -206,7 +209,7 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
         /// value (in Servo) and the computed value (in both Gecko and Servo) of the
         /// font-family property. 
  # [ repr ( C ) ] pub struct SharedFontList { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mNames : root :: nsTArray < root :: mozilla :: FontFamilyName > , } pub type SharedFontList_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla14SharedFontList6sEmptyE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla14SharedFontList6sEmptyE" ] 
  pub static mut  SharedFontList_sEmpty  :  root :: mozilla :: StaticRefPtr < root :: mozilla :: SharedFontList > ;
 } # [ test ] fn bindgen_test_layout_SharedFontList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < SharedFontList > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( SharedFontList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < SharedFontList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( SharedFontList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const SharedFontList ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( SharedFontList ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const SharedFontList ) ) . mNames as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( SharedFontList ) , "::" , stringify ! ( mNames ) ) ) ; } # [ test ] fn __bindgen_test_layout_StaticRefPtr_open0_SharedFontList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: StaticRefPtr < root :: mozilla :: SharedFontList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: mozilla :: SharedFontList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: StaticRefPtr < root :: mozilla :: SharedFontList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: mozilla :: SharedFontList > ) ) ) ; } 
  /// font family list, array of font families and a default font type.
@@ -274,7 +277,7 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
  pub mValue : root :: mozilla :: TimeStampValue , } # [ test ] fn bindgen_test_layout_TimeStamp ( ) { assert_eq ! ( :: std :: mem :: size_of :: < TimeStamp > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( TimeStamp ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < TimeStamp > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( TimeStamp ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const TimeStamp ) ) . mValue as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( TimeStamp ) , "::" , stringify ! ( mValue ) ) ) ; } impl Clone for TimeStamp { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct MallocAllocPolicy { pub _address : u8 , } # [ test ] fn bindgen_test_layout_MallocAllocPolicy ( ) { assert_eq ! ( :: std :: mem :: size_of :: < MallocAllocPolicy > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( MallocAllocPolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < MallocAllocPolicy > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( MallocAllocPolicy ) ) ) ; } impl Clone for MallocAllocPolicy { fn clone ( & self ) -> Self { * self } } pub type Vector_Impl = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Vector_CapacityAndReserved { pub mCapacity : usize , } pub type Vector_ElementType < T > = T ; pub const Vector_InlineLength : root :: mozilla :: Vector__bindgen_ty_1 = 0 ; pub type Vector__bindgen_ty_1 = i32 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Vector_Range < T > { pub mCur : * mut T , pub mEnd : * mut T , pub _phantom_0 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < T > > , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Vector_ConstRange < T > { pub mCur : * mut T , pub mEnd : * mut T , pub _phantom_0 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < T > > , } pub mod binding_danger { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: root ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct AssertAndSuppressCleanupPolicy { pub _address : u8 , } pub const AssertAndSuppressCleanupPolicy_assertHandled : bool = true ; pub const AssertAndSuppressCleanupPolicy_suppress : bool = true ; # [ test ] fn bindgen_test_layout_AssertAndSuppressCleanupPolicy ( ) { assert_eq ! ( :: std :: mem :: size_of :: < AssertAndSuppressCleanupPolicy > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( AssertAndSuppressCleanupPolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < AssertAndSuppressCleanupPolicy > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( AssertAndSuppressCleanupPolicy ) ) ) ; } impl Clone for AssertAndSuppressCleanupPolicy { fn clone ( & self ) -> Self { * self } } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct OwningNonNull < T > { pub mPtr : root :: RefPtr < T > , pub _phantom_0 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < T > > , } pub mod net { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: root ; pub const ReferrerPolicy_RP_No_Referrer : root :: mozilla :: net :: ReferrerPolicy = 2 ; pub const ReferrerPolicy_RP_Origin : root :: mozilla :: net :: ReferrerPolicy = 3 ; pub const ReferrerPolicy_RP_No_Referrer_When_Downgrade : root :: mozilla :: net :: ReferrerPolicy = 1 ; pub const ReferrerPolicy_RP_Origin_When_Crossorigin : root :: mozilla :: net :: ReferrerPolicy = 4 ; pub const ReferrerPolicy_RP_Unsafe_URL : root :: mozilla :: net :: ReferrerPolicy = 5 ; pub const ReferrerPolicy_RP_Same_Origin : root :: mozilla :: net :: ReferrerPolicy = 6 ; pub const ReferrerPolicy_RP_Strict_Origin : root :: mozilla :: net :: ReferrerPolicy = 7 ; pub const ReferrerPolicy_RP_Strict_Origin_When_Cross_Origin : root :: mozilla :: net :: ReferrerPolicy = 8 ; pub const ReferrerPolicy_RP_Unset : root :: mozilla :: net :: ReferrerPolicy = 0 ; pub type ReferrerPolicy = :: std :: os :: raw :: c_uint ; } pub const CORSMode_CORS_NONE : root :: mozilla :: CORSMode = 0 ; pub const CORSMode_CORS_ANONYMOUS : root :: mozilla :: CORSMode = 1 ; pub const CORSMode_CORS_USE_CREDENTIALS : root :: mozilla :: CORSMode = 2 ; pub type CORSMode = u8 ; 
  /// Superclass for data common to CSSStyleSheet and ServoStyleSheet. 
  # [ repr ( C ) ] pub struct StyleSheet { pub _base : root :: nsIDOMCSSStyleSheet , pub _base_1 : root :: nsICSSLoaderObserver , pub _base_2 : root :: nsWrapperCache , pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mParent : * mut root :: mozilla :: StyleSheet , pub mTitle : ::nsstring::nsStringRepr , pub mDocument : * mut root :: nsIDocument , pub mOwningNode : * mut root :: nsINode , pub mOwnerRule : * mut root :: mozilla :: dom :: CSSImportRule , pub mMedia : root :: RefPtr < root :: mozilla :: dom :: MediaList > , pub mNext : root :: RefPtr < root :: mozilla :: StyleSheet > , pub mParsingMode : root :: mozilla :: css :: SheetParsingMode , pub mType : root :: mozilla :: StyleBackendType , pub mDisabled : bool , pub mDirty : bool , pub mDocumentAssociationMode : root :: mozilla :: StyleSheet_DocumentAssociationMode , pub mInner : * mut root :: mozilla :: StyleSheetInfo , pub mStyleSets : root :: nsTArray < root :: mozilla :: StyleSetHandle > , } pub type StyleSheet_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct StyleSheet_cycleCollection { pub _base : root :: nsXPCOMCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_StyleSheet_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleSheet_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( StyleSheet_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleSheet_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleSheet_cycleCollection ) ) ) ; } impl Clone for StyleSheet_cycleCollection { fn clone ( & self ) -> Self { * self } } pub const StyleSheet_ChangeType_Added : root :: mozilla :: StyleSheet_ChangeType = 0 ; pub const StyleSheet_ChangeType_Removed : root :: mozilla :: StyleSheet_ChangeType = 1 ; pub const StyleSheet_ChangeType_ApplicableStateChanged : root :: mozilla :: StyleSheet_ChangeType = 2 ; pub const StyleSheet_ChangeType_RuleAdded : root :: mozilla :: StyleSheet_ChangeType = 3 ; pub const StyleSheet_ChangeType_RuleRemoved : root :: mozilla :: StyleSheet_ChangeType = 4 ; pub const StyleSheet_ChangeType_RuleChanged : root :: mozilla :: StyleSheet_ChangeType = 5 ; pub const StyleSheet_ChangeType_ReparsedFromInspector : root :: mozilla :: StyleSheet_ChangeType = 6 ; pub type StyleSheet_ChangeType = :: std :: os :: raw :: c_int ; pub const StyleSheet_DocumentAssociationMode_OwnedByDocument : root :: mozilla :: StyleSheet_DocumentAssociationMode = 0 ; pub const StyleSheet_DocumentAssociationMode_NotOwnedByDocument : root :: mozilla :: StyleSheet_DocumentAssociationMode = 1 ; pub type StyleSheet_DocumentAssociationMode = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct StyleSheet_ChildSheetListBuilder { pub sheetSlot : * mut root :: RefPtr < root :: mozilla :: StyleSheet > , pub parent : * mut root :: mozilla :: StyleSheet , } # [ test ] fn bindgen_test_layout_StyleSheet_ChildSheetListBuilder ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleSheet_ChildSheetListBuilder > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( StyleSheet_ChildSheetListBuilder ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleSheet_ChildSheetListBuilder > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleSheet_ChildSheetListBuilder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheet_ChildSheetListBuilder ) ) . sheetSlot as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheet_ChildSheetListBuilder ) , "::" , stringify ! ( sheetSlot ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheet_ChildSheetListBuilder ) ) . parent as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheet_ChildSheetListBuilder ) , "::" , stringify ! ( parent ) ) ) ; } impl Clone for StyleSheet_ChildSheetListBuilder { fn clone ( & self ) -> Self { * self } } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla10StyleSheet21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla10StyleSheet21_cycleCollectorGlobalE" ] 
  pub static mut  StyleSheet__cycleCollectorGlobal  :  root :: mozilla :: StyleSheet_cycleCollection ;
 } # [ test ] fn bindgen_test_layout_StyleSheet ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleSheet > ( ) , 136usize , concat ! ( "Size of: " , stringify ! ( StyleSheet ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleSheet > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleSheet ) ) ) ; } pub const CSSEnabledState_eForAllContent : root :: mozilla :: CSSEnabledState = 0 ; pub const CSSEnabledState_eInUASheets : root :: mozilla :: CSSEnabledState = 1 ; pub const CSSEnabledState_eInChrome : root :: mozilla :: CSSEnabledState = 2 ; pub const CSSEnabledState_eIgnoreEnabledState : root :: mozilla :: CSSEnabledState = 255 ; pub type CSSEnabledState = :: std :: os :: raw :: c_int ; pub type CSSPseudoElementTypeBase = u8 ; pub const CSSPseudoElementType_InheritingAnonBox : root :: mozilla :: CSSPseudoElementType = CSSPseudoElementType :: Count ; # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum CSSPseudoElementType { after = 0 , before = 1 , backdrop = 2 , cue = 3 , firstLetter = 4 , firstLine = 5 , mozSelection = 6 , mozFocusInner = 7 , mozFocusOuter = 8 , mozListBullet = 9 , mozListNumber = 10 , mozMathAnonymous = 11 , mozNumberWrapper = 12 , mozNumberText = 13 , mozNumberSpinBox = 14 , mozNumberSpinUp = 15 , mozNumberSpinDown = 16 , mozProgressBar = 17 , mozRangeTrack = 18 , mozRangeProgress = 19 , mozRangeThumb = 20 , mozMeterBar = 21 , mozPlaceholder = 22 , placeholder = 23 , mozColorSwatch = 24 , Count = 25 , NonInheritingAnonBox = 26 , XULTree = 27 , NotPseudo = 28 , MAX = 29 , } 
  /// Smart pointer class that can hold a pointer to either an nsStyleSet
@@ -298,13 +301,13 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
  /// The location in memory of the data portion of the arena. 
  pub offset : usize , 
  /// The location in memory of the end of the data portion of the arena. 
- pub tail : usize , } impl Clone for ArenaAllocator_ArenaHeader { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct ArenaAllocator_ArenaChunk { pub canary : root :: mozilla :: CorruptionCanary , pub header : root :: mozilla :: ArenaAllocator_ArenaHeader , pub next : * mut root :: mozilla :: ArenaAllocator_ArenaChunk , } pub mod a11y { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: root ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct DocAccessible { _unused : [ u8 ; 0 ] } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Encoding { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct Runnable { pub _base : root :: nsIRunnable , pub _base_1 : root :: nsINamed , pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mName : * const :: std :: os :: raw :: c_char , } pub type Runnable_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_Runnable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < Runnable > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( Runnable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < Runnable > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( Runnable ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct SegmentedVector_SegmentImpl_Storage { pub mBuf : root :: __BindgenUnionField < * mut :: std :: os :: raw :: c_char > , pub mAlign : root :: __BindgenUnionField < u8 > , pub bindgen_union_field : u64 , } pub type SegmentedVector_Segment = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct SegmentedVector_IterImpl { pub mSegment : * mut root :: mozilla :: SegmentedVector_Segment , pub mIndex : usize , } pub const UseCounter_eUseCounter_UNKNOWN : root :: mozilla :: UseCounter = -1 ; pub const UseCounter_eUseCounter_SVGSVGElement_getElementById : root :: mozilla :: UseCounter = 0 ; pub const UseCounter_eUseCounter_SVGSVGElement_currentScale_getter : root :: mozilla :: UseCounter = 1 ; pub const UseCounter_eUseCounter_SVGSVGElement_currentScale_setter : root :: mozilla :: UseCounter = 2 ; pub const UseCounter_eUseCounter_property_Fill : root :: mozilla :: UseCounter = 3 ; pub const UseCounter_eUseCounter_property_FillOpacity : root :: mozilla :: UseCounter = 4 ; pub const UseCounter_eUseCounter_XMLDocument_async_getter : root :: mozilla :: UseCounter = 5 ; pub const UseCounter_eUseCounter_XMLDocument_async_setter : root :: mozilla :: UseCounter = 6 ; pub const UseCounter_eUseCounter_DOMError_name_getter : root :: mozilla :: UseCounter = 7 ; pub const UseCounter_eUseCounter_DOMError_name_setter : root :: mozilla :: UseCounter = 8 ; pub const UseCounter_eUseCounter_DOMError_message_getter : root :: mozilla :: UseCounter = 9 ; pub const UseCounter_eUseCounter_DOMError_message_setter : root :: mozilla :: UseCounter = 10 ; pub const UseCounter_eUseCounter_custom_DOMErrorConstructor : root :: mozilla :: UseCounter = 11 ; pub const UseCounter_eUseCounter_PushManager_subscribe : root :: mozilla :: UseCounter = 12 ; pub const UseCounter_eUseCounter_PushSubscription_unsubscribe : root :: mozilla :: UseCounter = 13 ; pub const UseCounter_eUseCounter_Window_sidebar_getter : root :: mozilla :: UseCounter = 14 ; pub const UseCounter_eUseCounter_Window_sidebar_setter : root :: mozilla :: UseCounter = 15 ; pub const UseCounter_eUseCounter_External_addSearchEngine : root :: mozilla :: UseCounter = 16 ; pub const UseCounter_eUseCounter_OfflineResourceList_swapCache : root :: mozilla :: UseCounter = 17 ; pub const UseCounter_eUseCounter_OfflineResourceList_update : root :: mozilla :: UseCounter = 18 ; pub const UseCounter_eUseCounter_OfflineResourceList_status_getter : root :: mozilla :: UseCounter = 19 ; pub const UseCounter_eUseCounter_OfflineResourceList_status_setter : root :: mozilla :: UseCounter = 20 ; pub const UseCounter_eUseCounter_OfflineResourceList_onchecking_getter : root :: mozilla :: UseCounter = 21 ; pub const UseCounter_eUseCounter_OfflineResourceList_onchecking_setter : root :: mozilla :: UseCounter = 22 ; pub const UseCounter_eUseCounter_OfflineResourceList_onerror_getter : root :: mozilla :: UseCounter = 23 ; pub const UseCounter_eUseCounter_OfflineResourceList_onerror_setter : root :: mozilla :: UseCounter = 24 ; pub const UseCounter_eUseCounter_OfflineResourceList_onnoupdate_getter : root :: mozilla :: UseCounter = 25 ; pub const UseCounter_eUseCounter_OfflineResourceList_onnoupdate_setter : root :: mozilla :: UseCounter = 26 ; pub const UseCounter_eUseCounter_OfflineResourceList_ondownloading_getter : root :: mozilla :: UseCounter = 27 ; pub const UseCounter_eUseCounter_OfflineResourceList_ondownloading_setter : root :: mozilla :: UseCounter = 28 ; pub const UseCounter_eUseCounter_OfflineResourceList_onprogress_getter : root :: mozilla :: UseCounter = 29 ; pub const UseCounter_eUseCounter_OfflineResourceList_onprogress_setter : root :: mozilla :: UseCounter = 30 ; pub const UseCounter_eUseCounter_OfflineResourceList_onupdateready_getter : root :: mozilla :: UseCounter = 31 ; pub const UseCounter_eUseCounter_OfflineResourceList_onupdateready_setter : root :: mozilla :: UseCounter = 32 ; pub const UseCounter_eUseCounter_OfflineResourceList_oncached_getter : root :: mozilla :: UseCounter = 33 ; pub const UseCounter_eUseCounter_OfflineResourceList_oncached_setter : root :: mozilla :: UseCounter = 34 ; pub const UseCounter_eUseCounter_OfflineResourceList_onobsolete_getter : root :: mozilla :: UseCounter = 35 ; pub const UseCounter_eUseCounter_OfflineResourceList_onobsolete_setter : root :: mozilla :: UseCounter = 36 ; pub const UseCounter_eUseCounter_IDBDatabase_createMutableFile : root :: mozilla :: UseCounter = 37 ; pub const UseCounter_eUseCounter_IDBDatabase_mozCreateFileHandle : root :: mozilla :: UseCounter = 38 ; pub const UseCounter_eUseCounter_IDBMutableFile_open : root :: mozilla :: UseCounter = 39 ; pub const UseCounter_eUseCounter_IDBMutableFile_getFile : root :: mozilla :: UseCounter = 40 ; pub const UseCounter_eUseCounter_DataTransfer_addElement : root :: mozilla :: UseCounter = 41 ; pub const UseCounter_eUseCounter_DataTransfer_mozItemCount_getter : root :: mozilla :: UseCounter = 42 ; pub const UseCounter_eUseCounter_DataTransfer_mozItemCount_setter : root :: mozilla :: UseCounter = 43 ; pub const UseCounter_eUseCounter_DataTransfer_mozCursor_getter : root :: mozilla :: UseCounter = 44 ; pub const UseCounter_eUseCounter_DataTransfer_mozCursor_setter : root :: mozilla :: UseCounter = 45 ; pub const UseCounter_eUseCounter_DataTransfer_mozTypesAt : root :: mozilla :: UseCounter = 46 ; pub const UseCounter_eUseCounter_DataTransfer_mozClearDataAt : root :: mozilla :: UseCounter = 47 ; pub const UseCounter_eUseCounter_DataTransfer_mozSetDataAt : root :: mozilla :: UseCounter = 48 ; pub const UseCounter_eUseCounter_DataTransfer_mozGetDataAt : root :: mozilla :: UseCounter = 49 ; pub const UseCounter_eUseCounter_DataTransfer_mozUserCancelled_getter : root :: mozilla :: UseCounter = 50 ; pub const UseCounter_eUseCounter_DataTransfer_mozUserCancelled_setter : root :: mozilla :: UseCounter = 51 ; pub const UseCounter_eUseCounter_DataTransfer_mozSourceNode_getter : root :: mozilla :: UseCounter = 52 ; pub const UseCounter_eUseCounter_DataTransfer_mozSourceNode_setter : root :: mozilla :: UseCounter = 53 ; pub const UseCounter_eUseCounter_custom_JS_asmjs : root :: mozilla :: UseCounter = 54 ; pub const UseCounter_eUseCounter_custom_JS_wasm : root :: mozilla :: UseCounter = 55 ; pub const UseCounter_eUseCounter_EnablePrivilege : root :: mozilla :: UseCounter = 56 ; pub const UseCounter_eUseCounter_DOMExceptionCode : root :: mozilla :: UseCounter = 57 ; pub const UseCounter_eUseCounter_MutationEvent : root :: mozilla :: UseCounter = 58 ; pub const UseCounter_eUseCounter_Components : root :: mozilla :: UseCounter = 59 ; pub const UseCounter_eUseCounter_PrefixedVisibilityAPI : root :: mozilla :: UseCounter = 60 ; pub const UseCounter_eUseCounter_NodeIteratorDetach : root :: mozilla :: UseCounter = 61 ; pub const UseCounter_eUseCounter_LenientThis : root :: mozilla :: UseCounter = 62 ; pub const UseCounter_eUseCounter_GetPreventDefault : root :: mozilla :: UseCounter = 63 ; pub const UseCounter_eUseCounter_GetSetUserData : root :: mozilla :: UseCounter = 64 ; pub const UseCounter_eUseCounter_MozGetAsFile : root :: mozilla :: UseCounter = 65 ; pub const UseCounter_eUseCounter_UseOfCaptureEvents : root :: mozilla :: UseCounter = 66 ; pub const UseCounter_eUseCounter_UseOfReleaseEvents : root :: mozilla :: UseCounter = 67 ; pub const UseCounter_eUseCounter_UseOfDOM3LoadMethod : root :: mozilla :: UseCounter = 68 ; pub const UseCounter_eUseCounter_ChromeUseOfDOM3LoadMethod : root :: mozilla :: UseCounter = 69 ; pub const UseCounter_eUseCounter_ShowModalDialog : root :: mozilla :: UseCounter = 70 ; pub const UseCounter_eUseCounter_SyncXMLHttpRequest : root :: mozilla :: UseCounter = 71 ; pub const UseCounter_eUseCounter_Window_Cc_ontrollers : root :: mozilla :: UseCounter = 72 ; pub const UseCounter_eUseCounter_ImportXULIntoContent : root :: mozilla :: UseCounter = 73 ; pub const UseCounter_eUseCounter_PannerNodeDoppler : root :: mozilla :: UseCounter = 74 ; pub const UseCounter_eUseCounter_NavigatorGetUserMedia : root :: mozilla :: UseCounter = 75 ; pub const UseCounter_eUseCounter_WebrtcDeprecatedPrefix : root :: mozilla :: UseCounter = 76 ; pub const UseCounter_eUseCounter_RTCPeerConnectionGetStreams : root :: mozilla :: UseCounter = 77 ; pub const UseCounter_eUseCounter_AppCache : root :: mozilla :: UseCounter = 78 ; pub const UseCounter_eUseCounter_PrefixedImageSmoothingEnabled : root :: mozilla :: UseCounter = 79 ; pub const UseCounter_eUseCounter_PrefixedFullscreenAPI : root :: mozilla :: UseCounter = 80 ; pub const UseCounter_eUseCounter_LenientSetter : root :: mozilla :: UseCounter = 81 ; pub const UseCounter_eUseCounter_FileLastModifiedDate : root :: mozilla :: UseCounter = 82 ; pub const UseCounter_eUseCounter_ImageBitmapRenderingContext_TransferImageBitmap : root :: mozilla :: UseCounter = 83 ; pub const UseCounter_eUseCounter_URLCreateObjectURL_MediaStream : root :: mozilla :: UseCounter = 84 ; pub const UseCounter_eUseCounter_XMLBaseAttribute : root :: mozilla :: UseCounter = 85 ; pub const UseCounter_eUseCounter_WindowContentUntrusted : root :: mozilla :: UseCounter = 86 ; pub const UseCounter_eUseCounter_Count : root :: mozilla :: UseCounter = 87 ; pub type UseCounter = i16 ; # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_RawServoStyleSet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_RawServoSelectorList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_RawServoSourceSizeList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct ScrollbarStyles { pub mHorizontal : u8 , pub mVertical : u8 , pub mScrollBehavior : u8 , pub mOverscrollBehaviorX : root :: mozilla :: StyleOverscrollBehavior , pub mOverscrollBehaviorY : root :: mozilla :: StyleOverscrollBehavior , pub mScrollSnapTypeX : u8 , pub mScrollSnapTypeY : u8 , pub mScrollSnapPointsX : root :: nsStyleCoord , pub mScrollSnapPointsY : root :: nsStyleCoord , pub mScrollSnapDestinationX : root :: nsStyleCoord_CalcValue , pub mScrollSnapDestinationY : root :: nsStyleCoord_CalcValue , } # [ test ] fn bindgen_test_layout_ScrollbarStyles ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ScrollbarStyles > ( ) , 64usize , concat ! ( "Size of: " , stringify ! ( ScrollbarStyles ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ScrollbarStyles > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ScrollbarStyles ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mHorizontal as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mHorizontal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mVertical as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mVertical ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollBehavior as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollBehavior ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mOverscrollBehaviorX as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mOverscrollBehaviorX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mOverscrollBehaviorY as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mOverscrollBehaviorY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollSnapTypeX as * const _ as usize } , 5usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollSnapTypeX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollSnapTypeY as * const _ as usize } , 6usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollSnapTypeY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollSnapPointsX as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollSnapPointsX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollSnapPointsY as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollSnapPointsY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollSnapDestinationX as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollSnapDestinationX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollSnapDestinationY as * const _ as usize } , 52usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollSnapDestinationY ) ) ) ; } # [ repr ( C ) ] pub struct LangGroupFontPrefs { pub mLangGroup : root :: RefPtr < root :: nsAtom > , pub mMinimumFontSize : root :: nscoord , pub mDefaultVariableFont : root :: nsFont , pub mDefaultFixedFont : root :: nsFont , pub mDefaultSerifFont : root :: nsFont , pub mDefaultSansSerifFont : root :: nsFont , pub mDefaultMonospaceFont : root :: nsFont , pub mDefaultCursiveFont : root :: nsFont , pub mDefaultFantasyFont : root :: nsFont , pub mNext : root :: nsAutoPtr < root :: mozilla :: LangGroupFontPrefs > , } # [ test ] fn bindgen_test_layout_LangGroupFontPrefs ( ) { assert_eq ! ( :: std :: mem :: size_of :: < LangGroupFontPrefs > ( ) , 696usize , concat ! ( "Size of: " , stringify ! ( LangGroupFontPrefs ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < LangGroupFontPrefs > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( LangGroupFontPrefs ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mLangGroup as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mLangGroup ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mMinimumFontSize as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mMinimumFontSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultVariableFont as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultVariableFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultFixedFont as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultFixedFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultSerifFont as * const _ as usize } , 208usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultSerifFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultSansSerifFont as * const _ as usize } , 304usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultSansSerifFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultMonospaceFont as * const _ as usize } , 400usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultMonospaceFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultCursiveFont as * const _ as usize } , 496usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultCursiveFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultFantasyFont as * const _ as usize } , 592usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultFantasyFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mNext as * const _ as usize } , 688usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mNext ) ) ) ; } 
+ pub tail : usize , } impl Clone for ArenaAllocator_ArenaHeader { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct ArenaAllocator_ArenaChunk { pub canary : root :: mozilla :: CorruptionCanary , pub header : root :: mozilla :: ArenaAllocator_ArenaHeader , pub next : * mut root :: mozilla :: ArenaAllocator_ArenaChunk , } pub mod a11y { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: root ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct DocAccessible { _unused : [ u8 ; 0 ] } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Encoding { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct Runnable { pub _base : root :: nsIRunnable , pub _base_1 : root :: nsINamed , pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mName : * const :: std :: os :: raw :: c_char , } pub type Runnable_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_Runnable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < Runnable > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( Runnable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < Runnable > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( Runnable ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct SegmentedVector_SegmentImpl_Storage { pub mBuf : root :: __BindgenUnionField < * mut :: std :: os :: raw :: c_char > , pub mAlign : root :: __BindgenUnionField < u8 > , pub bindgen_union_field : u64 , } pub type SegmentedVector_Segment = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct SegmentedVector_IterImpl { pub mSegment : * mut root :: mozilla :: SegmentedVector_Segment , pub mIndex : usize , } pub const UseCounter_eUseCounter_UNKNOWN : root :: mozilla :: UseCounter = -1 ; pub const UseCounter_eUseCounter_SVGSVGElement_getElementById : root :: mozilla :: UseCounter = 0 ; pub const UseCounter_eUseCounter_SVGSVGElement_currentScale_getter : root :: mozilla :: UseCounter = 1 ; pub const UseCounter_eUseCounter_SVGSVGElement_currentScale_setter : root :: mozilla :: UseCounter = 2 ; pub const UseCounter_eUseCounter_property_Fill : root :: mozilla :: UseCounter = 3 ; pub const UseCounter_eUseCounter_property_FillOpacity : root :: mozilla :: UseCounter = 4 ; pub const UseCounter_eUseCounter_XMLDocument_async_getter : root :: mozilla :: UseCounter = 5 ; pub const UseCounter_eUseCounter_XMLDocument_async_setter : root :: mozilla :: UseCounter = 6 ; pub const UseCounter_eUseCounter_DOMError_name_getter : root :: mozilla :: UseCounter = 7 ; pub const UseCounter_eUseCounter_DOMError_name_setter : root :: mozilla :: UseCounter = 8 ; pub const UseCounter_eUseCounter_DOMError_message_getter : root :: mozilla :: UseCounter = 9 ; pub const UseCounter_eUseCounter_DOMError_message_setter : root :: mozilla :: UseCounter = 10 ; pub const UseCounter_eUseCounter_custom_DOMErrorConstructor : root :: mozilla :: UseCounter = 11 ; pub const UseCounter_eUseCounter_PushManager_subscribe : root :: mozilla :: UseCounter = 12 ; pub const UseCounter_eUseCounter_PushSubscription_unsubscribe : root :: mozilla :: UseCounter = 13 ; pub const UseCounter_eUseCounter_Window_sidebar_getter : root :: mozilla :: UseCounter = 14 ; pub const UseCounter_eUseCounter_Window_sidebar_setter : root :: mozilla :: UseCounter = 15 ; pub const UseCounter_eUseCounter_External_addSearchEngine : root :: mozilla :: UseCounter = 16 ; pub const UseCounter_eUseCounter_OfflineResourceList_swapCache : root :: mozilla :: UseCounter = 17 ; pub const UseCounter_eUseCounter_OfflineResourceList_update : root :: mozilla :: UseCounter = 18 ; pub const UseCounter_eUseCounter_OfflineResourceList_status_getter : root :: mozilla :: UseCounter = 19 ; pub const UseCounter_eUseCounter_OfflineResourceList_status_setter : root :: mozilla :: UseCounter = 20 ; pub const UseCounter_eUseCounter_OfflineResourceList_onchecking_getter : root :: mozilla :: UseCounter = 21 ; pub const UseCounter_eUseCounter_OfflineResourceList_onchecking_setter : root :: mozilla :: UseCounter = 22 ; pub const UseCounter_eUseCounter_OfflineResourceList_onerror_getter : root :: mozilla :: UseCounter = 23 ; pub const UseCounter_eUseCounter_OfflineResourceList_onerror_setter : root :: mozilla :: UseCounter = 24 ; pub const UseCounter_eUseCounter_OfflineResourceList_onnoupdate_getter : root :: mozilla :: UseCounter = 25 ; pub const UseCounter_eUseCounter_OfflineResourceList_onnoupdate_setter : root :: mozilla :: UseCounter = 26 ; pub const UseCounter_eUseCounter_OfflineResourceList_ondownloading_getter : root :: mozilla :: UseCounter = 27 ; pub const UseCounter_eUseCounter_OfflineResourceList_ondownloading_setter : root :: mozilla :: UseCounter = 28 ; pub const UseCounter_eUseCounter_OfflineResourceList_onprogress_getter : root :: mozilla :: UseCounter = 29 ; pub const UseCounter_eUseCounter_OfflineResourceList_onprogress_setter : root :: mozilla :: UseCounter = 30 ; pub const UseCounter_eUseCounter_OfflineResourceList_onupdateready_getter : root :: mozilla :: UseCounter = 31 ; pub const UseCounter_eUseCounter_OfflineResourceList_onupdateready_setter : root :: mozilla :: UseCounter = 32 ; pub const UseCounter_eUseCounter_OfflineResourceList_oncached_getter : root :: mozilla :: UseCounter = 33 ; pub const UseCounter_eUseCounter_OfflineResourceList_oncached_setter : root :: mozilla :: UseCounter = 34 ; pub const UseCounter_eUseCounter_OfflineResourceList_onobsolete_getter : root :: mozilla :: UseCounter = 35 ; pub const UseCounter_eUseCounter_OfflineResourceList_onobsolete_setter : root :: mozilla :: UseCounter = 36 ; pub const UseCounter_eUseCounter_IDBDatabase_createMutableFile : root :: mozilla :: UseCounter = 37 ; pub const UseCounter_eUseCounter_IDBDatabase_mozCreateFileHandle : root :: mozilla :: UseCounter = 38 ; pub const UseCounter_eUseCounter_IDBMutableFile_open : root :: mozilla :: UseCounter = 39 ; pub const UseCounter_eUseCounter_IDBMutableFile_getFile : root :: mozilla :: UseCounter = 40 ; pub const UseCounter_eUseCounter_DataTransfer_addElement : root :: mozilla :: UseCounter = 41 ; pub const UseCounter_eUseCounter_DataTransfer_mozItemCount_getter : root :: mozilla :: UseCounter = 42 ; pub const UseCounter_eUseCounter_DataTransfer_mozItemCount_setter : root :: mozilla :: UseCounter = 43 ; pub const UseCounter_eUseCounter_DataTransfer_mozCursor_getter : root :: mozilla :: UseCounter = 44 ; pub const UseCounter_eUseCounter_DataTransfer_mozCursor_setter : root :: mozilla :: UseCounter = 45 ; pub const UseCounter_eUseCounter_DataTransfer_mozTypesAt : root :: mozilla :: UseCounter = 46 ; pub const UseCounter_eUseCounter_DataTransfer_mozClearDataAt : root :: mozilla :: UseCounter = 47 ; pub const UseCounter_eUseCounter_DataTransfer_mozSetDataAt : root :: mozilla :: UseCounter = 48 ; pub const UseCounter_eUseCounter_DataTransfer_mozGetDataAt : root :: mozilla :: UseCounter = 49 ; pub const UseCounter_eUseCounter_DataTransfer_mozUserCancelled_getter : root :: mozilla :: UseCounter = 50 ; pub const UseCounter_eUseCounter_DataTransfer_mozUserCancelled_setter : root :: mozilla :: UseCounter = 51 ; pub const UseCounter_eUseCounter_DataTransfer_mozSourceNode_getter : root :: mozilla :: UseCounter = 52 ; pub const UseCounter_eUseCounter_DataTransfer_mozSourceNode_setter : root :: mozilla :: UseCounter = 53 ; pub const UseCounter_eUseCounter_custom_JS_asmjs : root :: mozilla :: UseCounter = 54 ; pub const UseCounter_eUseCounter_custom_JS_wasm : root :: mozilla :: UseCounter = 55 ; pub const UseCounter_eUseCounter_EnablePrivilege : root :: mozilla :: UseCounter = 56 ; pub const UseCounter_eUseCounter_DOMExceptionCode : root :: mozilla :: UseCounter = 57 ; pub const UseCounter_eUseCounter_MutationEvent : root :: mozilla :: UseCounter = 58 ; pub const UseCounter_eUseCounter_Components : root :: mozilla :: UseCounter = 59 ; pub const UseCounter_eUseCounter_PrefixedVisibilityAPI : root :: mozilla :: UseCounter = 60 ; pub const UseCounter_eUseCounter_NodeIteratorDetach : root :: mozilla :: UseCounter = 61 ; pub const UseCounter_eUseCounter_LenientThis : root :: mozilla :: UseCounter = 62 ; pub const UseCounter_eUseCounter_GetPreventDefault : root :: mozilla :: UseCounter = 63 ; pub const UseCounter_eUseCounter_GetSetUserData : root :: mozilla :: UseCounter = 64 ; pub const UseCounter_eUseCounter_MozGetAsFile : root :: mozilla :: UseCounter = 65 ; pub const UseCounter_eUseCounter_UseOfCaptureEvents : root :: mozilla :: UseCounter = 66 ; pub const UseCounter_eUseCounter_UseOfReleaseEvents : root :: mozilla :: UseCounter = 67 ; pub const UseCounter_eUseCounter_UseOfDOM3LoadMethod : root :: mozilla :: UseCounter = 68 ; pub const UseCounter_eUseCounter_ChromeUseOfDOM3LoadMethod : root :: mozilla :: UseCounter = 69 ; pub const UseCounter_eUseCounter_ShowModalDialog : root :: mozilla :: UseCounter = 70 ; pub const UseCounter_eUseCounter_SyncXMLHttpRequest : root :: mozilla :: UseCounter = 71 ; pub const UseCounter_eUseCounter_Window_Cc_ontrollers : root :: mozilla :: UseCounter = 72 ; pub const UseCounter_eUseCounter_ImportXULIntoContent : root :: mozilla :: UseCounter = 73 ; pub const UseCounter_eUseCounter_PannerNodeDoppler : root :: mozilla :: UseCounter = 74 ; pub const UseCounter_eUseCounter_NavigatorGetUserMedia : root :: mozilla :: UseCounter = 75 ; pub const UseCounter_eUseCounter_WebrtcDeprecatedPrefix : root :: mozilla :: UseCounter = 76 ; pub const UseCounter_eUseCounter_RTCPeerConnectionGetStreams : root :: mozilla :: UseCounter = 77 ; pub const UseCounter_eUseCounter_AppCache : root :: mozilla :: UseCounter = 78 ; pub const UseCounter_eUseCounter_PrefixedImageSmoothingEnabled : root :: mozilla :: UseCounter = 79 ; pub const UseCounter_eUseCounter_PrefixedFullscreenAPI : root :: mozilla :: UseCounter = 80 ; pub const UseCounter_eUseCounter_LenientSetter : root :: mozilla :: UseCounter = 81 ; pub const UseCounter_eUseCounter_FileLastModifiedDate : root :: mozilla :: UseCounter = 82 ; pub const UseCounter_eUseCounter_ImageBitmapRenderingContext_TransferImageBitmap : root :: mozilla :: UseCounter = 83 ; pub const UseCounter_eUseCounter_URLCreateObjectURL_MediaStream : root :: mozilla :: UseCounter = 84 ; pub const UseCounter_eUseCounter_XMLBaseAttribute : root :: mozilla :: UseCounter = 85 ; pub const UseCounter_eUseCounter_WindowContentUntrusted : root :: mozilla :: UseCounter = 86 ; pub const UseCounter_eUseCounter_Count : root :: mozilla :: UseCounter = 87 ; pub type UseCounter = i16 ; pub type ComputedKeyframeValues = root :: nsTArray < root :: mozilla :: PropertyStyleAnimationValuePair > ; # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_RawServoStyleSet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_RawServoSelectorList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_RawServoSourceSizeList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct ScrollbarStyles { pub mHorizontal : u8 , pub mVertical : u8 , pub mScrollBehavior : u8 , pub mOverscrollBehaviorX : root :: mozilla :: StyleOverscrollBehavior , pub mOverscrollBehaviorY : root :: mozilla :: StyleOverscrollBehavior , pub mScrollSnapTypeX : u8 , pub mScrollSnapTypeY : u8 , pub mScrollSnapPointsX : root :: nsStyleCoord , pub mScrollSnapPointsY : root :: nsStyleCoord , pub mScrollSnapDestinationX : root :: nsStyleCoord_CalcValue , pub mScrollSnapDestinationY : root :: nsStyleCoord_CalcValue , } # [ test ] fn bindgen_test_layout_ScrollbarStyles ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ScrollbarStyles > ( ) , 64usize , concat ! ( "Size of: " , stringify ! ( ScrollbarStyles ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ScrollbarStyles > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ScrollbarStyles ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mHorizontal as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mHorizontal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mVertical as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mVertical ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollBehavior as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollBehavior ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mOverscrollBehaviorX as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mOverscrollBehaviorX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mOverscrollBehaviorY as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mOverscrollBehaviorY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollSnapTypeX as * const _ as usize } , 5usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollSnapTypeX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollSnapTypeY as * const _ as usize } , 6usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollSnapTypeY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollSnapPointsX as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollSnapPointsX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollSnapPointsY as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollSnapPointsY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollSnapDestinationX as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollSnapDestinationX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ScrollbarStyles ) ) . mScrollSnapDestinationY as * const _ as usize } , 52usize , concat ! ( "Alignment of field: " , stringify ! ( ScrollbarStyles ) , "::" , stringify ! ( mScrollSnapDestinationY ) ) ) ; } # [ repr ( C ) ] pub struct LangGroupFontPrefs { pub mLangGroup : root :: RefPtr < root :: nsAtom > , pub mMinimumFontSize : root :: nscoord , pub mDefaultVariableFont : root :: nsFont , pub mDefaultFixedFont : root :: nsFont , pub mDefaultSerifFont : root :: nsFont , pub mDefaultSansSerifFont : root :: nsFont , pub mDefaultMonospaceFont : root :: nsFont , pub mDefaultCursiveFont : root :: nsFont , pub mDefaultFantasyFont : root :: nsFont , pub mNext : root :: nsAutoPtr < root :: mozilla :: LangGroupFontPrefs > , } # [ test ] fn bindgen_test_layout_LangGroupFontPrefs ( ) { assert_eq ! ( :: std :: mem :: size_of :: < LangGroupFontPrefs > ( ) , 696usize , concat ! ( "Size of: " , stringify ! ( LangGroupFontPrefs ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < LangGroupFontPrefs > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( LangGroupFontPrefs ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mLangGroup as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mLangGroup ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mMinimumFontSize as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mMinimumFontSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultVariableFont as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultVariableFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultFixedFont as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultFixedFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultSerifFont as * const _ as usize } , 208usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultSerifFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultSansSerifFont as * const _ as usize } , 304usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultSansSerifFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultMonospaceFont as * const _ as usize } , 400usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultMonospaceFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultCursiveFont as * const _ as usize } , 496usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultCursiveFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mDefaultFantasyFont as * const _ as usize } , 592usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mDefaultFantasyFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const LangGroupFontPrefs ) ) . mNext as * const _ as usize } , 688usize , concat ! ( "Alignment of field: " , stringify ! ( LangGroupFontPrefs ) , "::" , stringify ! ( mNext ) ) ) ; } 
  /// Some functionality that has historically lived on nsPresContext does not
         /// actually need to be per-document. This singleton class serves as a host
         /// for that functionality. We delegate to it from nsPresContext where
         /// appropriate, and use it standalone in some cases as well. 
  # [ repr ( C ) ] pub struct StaticPresData { pub mLangService : * mut root :: nsLanguageAtomService , pub mBorderWidthTable : [ root :: nscoord ; 3usize ] , pub mStaticLangGroupFontPrefs : root :: mozilla :: LangGroupFontPrefs , } # [ test ] fn bindgen_test_layout_StaticPresData ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StaticPresData > ( ) , 720usize , concat ! ( "Size of: " , stringify ! ( StaticPresData ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StaticPresData > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StaticPresData ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StaticPresData ) ) . mLangService as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StaticPresData ) , "::" , stringify ! ( mLangService ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StaticPresData ) ) . mBorderWidthTable as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( StaticPresData ) , "::" , stringify ! ( mBorderWidthTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StaticPresData ) ) . mStaticLangGroupFontPrefs as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( StaticPresData ) , "::" , stringify ! ( mStaticLangGroupFontPrefs ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct EventStateManager { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RestyleManager { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct URLExtraData { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mBaseURI : root :: nsCOMPtr , pub mReferrer : root :: nsCOMPtr , pub mPrincipal : root :: nsCOMPtr , pub mIsChrome : bool , } pub type URLExtraData_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla12URLExtraData6sDummyE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla12URLExtraData6sDummyE" ] 
  pub static mut  URLExtraData_sDummy  :  root :: mozilla :: StaticRefPtr < root :: mozilla :: URLExtraData > ;
 } # [ test ] fn bindgen_test_layout_URLExtraData ( ) { assert_eq ! ( :: std :: mem :: size_of :: < URLExtraData > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( URLExtraData ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < URLExtraData > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( URLExtraData ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLExtraData ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( URLExtraData ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLExtraData ) ) . mBaseURI as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( URLExtraData ) , "::" , stringify ! ( mBaseURI ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLExtraData ) ) . mReferrer as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( URLExtraData ) , "::" , stringify ! ( mReferrer ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLExtraData ) ) . mPrincipal as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( URLExtraData ) , "::" , stringify ! ( mPrincipal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URLExtraData ) ) . mIsChrome as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( URLExtraData ) , "::" , stringify ! ( mIsChrome ) ) ) ; } # [ test ] fn __bindgen_test_layout_StaticRefPtr_open0_URLExtraData_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: StaticRefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: mozilla :: URLExtraData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: StaticRefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: mozilla :: URLExtraData > ) ) ) ; } pub mod image { # [ allow ( unused_imports ) ] use self :: super :: super :: super :: root ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ImageURL { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct Image { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ProgressTracker { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] pub struct IProgressObserver__bindgen_vtable ( :: std :: os :: raw :: c_void ) ; 
  /// An interface for observing changes to image state, as reported by
@@ -317,17 +320,17 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
             /// XXX(seth): It's preferable to avoid adding anything to this interface if
             /// possible.  In the long term, it would be ideal to get to a place where we can
             /// just use the imgINotificationObserver interface internally as well. 
- # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct IProgressObserver { pub vtable_ : * const IProgressObserver__bindgen_vtable , pub _base : u64 , } # [ test ] fn bindgen_test_layout_IProgressObserver ( ) { assert_eq ! ( :: std :: mem :: size_of :: < IProgressObserver > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( IProgressObserver ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < IProgressObserver > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( IProgressObserver ) ) ) ; } } # [ repr ( C ) ] pub struct CounterStyle__bindgen_vtable ( :: std :: os :: raw :: c_void ) ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct CounterStyle { pub vtable_ : * const CounterStyle__bindgen_vtable , pub mStyle : i32 , } # [ test ] fn bindgen_test_layout_CounterStyle ( ) { assert_eq ! ( :: std :: mem :: size_of :: < CounterStyle > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( CounterStyle ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < CounterStyle > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( CounterStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CounterStyle ) ) . mStyle as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( CounterStyle ) , "::" , stringify ! ( mStyle ) ) ) ; } impl Clone for CounterStyle { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct AnonymousCounterStyle { pub _base : root :: mozilla :: CounterStyle , pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mSingleString : bool , pub mSystem : u8 , pub mSymbols : root :: nsTArray < ::nsstring::nsStringRepr > , } pub type AnonymousCounterStyle_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_AnonymousCounterStyle ( ) { assert_eq ! ( :: std :: mem :: size_of :: < AnonymousCounterStyle > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( AnonymousCounterStyle ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < AnonymousCounterStyle > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( AnonymousCounterStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnonymousCounterStyle ) ) . mRefCnt as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( AnonymousCounterStyle ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnonymousCounterStyle ) ) . mSingleString as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( AnonymousCounterStyle ) , "::" , stringify ! ( mSingleString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnonymousCounterStyle ) ) . mSystem as * const _ as usize } , 25usize , concat ! ( "Alignment of field: " , stringify ! ( AnonymousCounterStyle ) , "::" , stringify ! ( mSystem ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnonymousCounterStyle ) ) . mSymbols as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( AnonymousCounterStyle ) , "::" , stringify ! ( mSymbols ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct CounterStylePtr { pub mRaw : usize , } pub const CounterStylePtr_Type_eCounterStyle : root :: mozilla :: CounterStylePtr_Type = 0 ; pub const CounterStylePtr_Type_eAnonymousCounterStyle : root :: mozilla :: CounterStylePtr_Type = 1 ; pub const CounterStylePtr_Type_eUnresolvedAtom : root :: mozilla :: CounterStylePtr_Type = 2 ; pub const CounterStylePtr_Type_eMask : root :: mozilla :: CounterStylePtr_Type = 3 ; pub type CounterStylePtr_Type = usize ; # [ test ] fn bindgen_test_layout_CounterStylePtr ( ) { assert_eq ! ( :: std :: mem :: size_of :: < CounterStylePtr > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( CounterStylePtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < CounterStylePtr > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( CounterStylePtr ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CounterStylePtr ) ) . mRaw as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( CounterStylePtr ) , "::" , stringify ! ( mRaw ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct CounterStyleManager { pub mRefCnt : root :: nsAutoRefCnt , pub mPresContext : * mut root :: nsPresContext , pub mStyles : [ u64 ; 4usize ] , pub mRetiredStyles : root :: nsTArray < * mut root :: mozilla :: CounterStyle > , } pub type CounterStyleManager_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_CounterStyleManager ( ) { assert_eq ! ( :: std :: mem :: size_of :: < CounterStyleManager > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( CounterStyleManager ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < CounterStyleManager > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( CounterStyleManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CounterStyleManager ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( CounterStyleManager ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CounterStyleManager ) ) . mPresContext as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( CounterStyleManager ) , "::" , stringify ! ( mPresContext ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CounterStyleManager ) ) . mStyles as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( CounterStyleManager ) , "::" , stringify ! ( mStyles ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CounterStyleManager ) ) . mRetiredStyles as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( CounterStyleManager ) , "::" , stringify ! ( mRetiredStyles ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct Position { pub mXPosition : root :: mozilla :: Position_Coord , pub mYPosition : root :: mozilla :: Position_Coord , } pub type Position_Coord = root :: nsStyleCoord_CalcValue ; # [ test ] fn bindgen_test_layout_Position ( ) { assert_eq ! ( :: std :: mem :: size_of :: < Position > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( Position ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < Position > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( Position ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Position ) ) . mXPosition as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( Position ) , "::" , stringify ! ( mXPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Position ) ) . mYPosition as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( Position ) , "::" , stringify ! ( mYPosition ) ) ) ; } impl Clone for Position { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct StyleTransition { pub mTimingFunction : root :: nsTimingFunction , pub mDuration : f32 , pub mDelay : f32 , pub mProperty : root :: nsCSSPropertyID , pub mUnknownProperty : root :: RefPtr < root :: nsAtom > , } # [ test ] fn bindgen_test_layout_StyleTransition ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleTransition > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( StyleTransition ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleTransition > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleTransition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleTransition ) ) . mTimingFunction as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleTransition ) , "::" , stringify ! ( mTimingFunction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleTransition ) ) . mDuration as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( StyleTransition ) , "::" , stringify ! ( mDuration ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleTransition ) ) . mDelay as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( StyleTransition ) , "::" , stringify ! ( mDelay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleTransition ) ) . mProperty as * const _ as usize } , 28usize , concat ! ( "Alignment of field: " , stringify ! ( StyleTransition ) , "::" , stringify ! ( mProperty ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleTransition ) ) . mUnknownProperty as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( StyleTransition ) , "::" , stringify ! ( mUnknownProperty ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct StyleAnimation { pub mTimingFunction : root :: nsTimingFunction , pub mDuration : f32 , pub mDelay : f32 , pub mName : root :: RefPtr < root :: nsAtom > , pub mDirection : root :: mozilla :: dom :: PlaybackDirection , pub mFillMode : root :: mozilla :: dom :: FillMode , pub mPlayState : u8 , pub mIterationCount : f32 , } # [ test ] fn bindgen_test_layout_StyleAnimation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleAnimation > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( StyleAnimation ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleAnimation > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleAnimation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mTimingFunction as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mTimingFunction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mDuration as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mDuration ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mDelay as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mDelay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mName as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mDirection as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mDirection ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mFillMode as * const _ as usize } , 41usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mFillMode ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mPlayState as * const _ as usize } , 42usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mPlayState ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mIterationCount as * const _ as usize } , 44usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mIterationCount ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct StyleBasicShape { pub mType : root :: mozilla :: StyleBasicShapeType , pub mFillRule : root :: mozilla :: StyleFillRule , pub mCoordinates : root :: nsTArray < root :: nsStyleCoord > , pub mPosition : root :: mozilla :: Position , pub mRadius : root :: nsStyleCorners , } # [ test ] fn bindgen_test_layout_StyleBasicShape ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleBasicShape > ( ) , 112usize , concat ! ( "Size of: " , stringify ! ( StyleBasicShape ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleBasicShape > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleBasicShape ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleBasicShape ) ) . mType as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleBasicShape ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleBasicShape ) ) . mFillRule as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( StyleBasicShape ) , "::" , stringify ! ( mFillRule ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleBasicShape ) ) . mCoordinates as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( StyleBasicShape ) , "::" , stringify ! ( mCoordinates ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleBasicShape ) ) . mPosition as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( StyleBasicShape ) , "::" , stringify ! ( mPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleBasicShape ) ) . mRadius as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( StyleBasicShape ) , "::" , stringify ! ( mRadius ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct StyleShapeSource { pub mBasicShape : root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > , pub mShapeImage : root :: mozilla :: UniquePtr < root :: nsStyleImage > , pub mType : root :: mozilla :: StyleShapeSourceType , pub mReferenceBox : root :: mozilla :: StyleGeometryBox , } # [ test ] fn bindgen_test_layout_StyleShapeSource ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleShapeSource > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( StyleShapeSource ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleShapeSource > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleShapeSource ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleShapeSource ) ) . mBasicShape as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleShapeSource ) , "::" , stringify ! ( mBasicShape ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleShapeSource ) ) . mShapeImage as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( StyleShapeSource ) , "::" , stringify ! ( mShapeImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleShapeSource ) ) . mType as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( StyleShapeSource ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleShapeSource ) ) . mReferenceBox as * const _ as usize } , 17usize , concat ! ( "Alignment of field: " , stringify ! ( StyleShapeSource ) , "::" , stringify ! ( mReferenceBox ) ) ) ; } 
+ # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct IProgressObserver { pub vtable_ : * const IProgressObserver__bindgen_vtable , pub _base : u64 , } # [ test ] fn bindgen_test_layout_IProgressObserver ( ) { assert_eq ! ( :: std :: mem :: size_of :: < IProgressObserver > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( IProgressObserver ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < IProgressObserver > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( IProgressObserver ) ) ) ; } } # [ repr ( C ) ] pub struct CounterStyle__bindgen_vtable ( :: std :: os :: raw :: c_void ) ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct CounterStyle { pub vtable_ : * const CounterStyle__bindgen_vtable , pub mStyle : i32 , } # [ test ] fn bindgen_test_layout_CounterStyle ( ) { assert_eq ! ( :: std :: mem :: size_of :: < CounterStyle > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( CounterStyle ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < CounterStyle > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( CounterStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CounterStyle ) ) . mStyle as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( CounterStyle ) , "::" , stringify ! ( mStyle ) ) ) ; } impl Clone for CounterStyle { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] pub struct AnonymousCounterStyle { pub _base : root :: mozilla :: CounterStyle , pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mSingleString : bool , pub mSystem : u8 , pub mSymbols : root :: nsTArray < ::nsstring::nsStringRepr > , } pub type AnonymousCounterStyle_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_AnonymousCounterStyle ( ) { assert_eq ! ( :: std :: mem :: size_of :: < AnonymousCounterStyle > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( AnonymousCounterStyle ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < AnonymousCounterStyle > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( AnonymousCounterStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnonymousCounterStyle ) ) . mRefCnt as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( AnonymousCounterStyle ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnonymousCounterStyle ) ) . mSingleString as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( AnonymousCounterStyle ) , "::" , stringify ! ( mSingleString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnonymousCounterStyle ) ) . mSystem as * const _ as usize } , 25usize , concat ! ( "Alignment of field: " , stringify ! ( AnonymousCounterStyle ) , "::" , stringify ! ( mSystem ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnonymousCounterStyle ) ) . mSymbols as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( AnonymousCounterStyle ) , "::" , stringify ! ( mSymbols ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct CounterStylePtr { pub mRaw : usize , } pub const CounterStylePtr_Type_eCounterStyle : root :: mozilla :: CounterStylePtr_Type = 0 ; pub const CounterStylePtr_Type_eAnonymousCounterStyle : root :: mozilla :: CounterStylePtr_Type = 1 ; pub const CounterStylePtr_Type_eUnresolvedAtom : root :: mozilla :: CounterStylePtr_Type = 2 ; pub const CounterStylePtr_Type_eMask : root :: mozilla :: CounterStylePtr_Type = 3 ; pub type CounterStylePtr_Type = usize ; # [ test ] fn bindgen_test_layout_CounterStylePtr ( ) { assert_eq ! ( :: std :: mem :: size_of :: < CounterStylePtr > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( CounterStylePtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < CounterStylePtr > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( CounterStylePtr ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CounterStylePtr ) ) . mRaw as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( CounterStylePtr ) , "::" , stringify ! ( mRaw ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct CounterStyleManager { pub mRefCnt : root :: nsAutoRefCnt , pub mPresContext : * mut root :: nsPresContext , pub mStyles : [ u64 ; 4usize ] , pub mRetiredStyles : root :: nsTArray < * mut root :: mozilla :: CounterStyle > , } pub type CounterStyleManager_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_CounterStyleManager ( ) { assert_eq ! ( :: std :: mem :: size_of :: < CounterStyleManager > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( CounterStyleManager ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < CounterStyleManager > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( CounterStyleManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CounterStyleManager ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( CounterStyleManager ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CounterStyleManager ) ) . mPresContext as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( CounterStyleManager ) , "::" , stringify ! ( mPresContext ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CounterStyleManager ) ) . mStyles as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( CounterStyleManager ) , "::" , stringify ! ( mStyles ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CounterStyleManager ) ) . mRetiredStyles as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( CounterStyleManager ) , "::" , stringify ! ( mRetiredStyles ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct Position { pub mXPosition : root :: mozilla :: Position_Coord , pub mYPosition : root :: mozilla :: Position_Coord , } pub type Position_Coord = root :: nsStyleCoord_CalcValue ; # [ test ] fn bindgen_test_layout_Position ( ) { assert_eq ! ( :: std :: mem :: size_of :: < Position > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( Position ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < Position > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( Position ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Position ) ) . mXPosition as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( Position ) , "::" , stringify ! ( mXPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const Position ) ) . mYPosition as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( Position ) , "::" , stringify ! ( mYPosition ) ) ) ; } impl Clone for Position { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct StyleTransition { pub mTimingFunction : root :: nsTimingFunction , pub mDuration : f32 , pub mDelay : f32 , pub mProperty : root :: nsCSSPropertyID , pub mUnknownProperty : root :: RefPtr < root :: nsAtom > , } # [ test ] fn bindgen_test_layout_StyleTransition ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleTransition > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( StyleTransition ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleTransition > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleTransition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleTransition ) ) . mTimingFunction as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleTransition ) , "::" , stringify ! ( mTimingFunction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleTransition ) ) . mDuration as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( StyleTransition ) , "::" , stringify ! ( mDuration ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleTransition ) ) . mDelay as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( StyleTransition ) , "::" , stringify ! ( mDelay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleTransition ) ) . mProperty as * const _ as usize } , 28usize , concat ! ( "Alignment of field: " , stringify ! ( StyleTransition ) , "::" , stringify ! ( mProperty ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleTransition ) ) . mUnknownProperty as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( StyleTransition ) , "::" , stringify ! ( mUnknownProperty ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct StyleAnimation { pub mTimingFunction : root :: nsTimingFunction , pub mDuration : f32 , pub mDelay : f32 , pub mName : root :: RefPtr < root :: nsAtom > , pub mDirection : root :: mozilla :: dom :: PlaybackDirection , pub mFillMode : root :: mozilla :: dom :: FillMode , pub mPlayState : u8 , pub mIterationCount : f32 , } # [ test ] fn bindgen_test_layout_StyleAnimation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleAnimation > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( StyleAnimation ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleAnimation > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleAnimation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mTimingFunction as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mTimingFunction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mDuration as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mDuration ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mDelay as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mDelay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mName as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mDirection as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mDirection ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mFillMode as * const _ as usize } , 41usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mFillMode ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mPlayState as * const _ as usize } , 42usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mPlayState ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimation ) ) . mIterationCount as * const _ as usize } , 44usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimation ) , "::" , stringify ! ( mIterationCount ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct StyleBasicShape { pub mType : root :: mozilla :: StyleBasicShapeType , pub mFillRule : root :: mozilla :: StyleFillRule , pub mCoordinates : root :: nsTArray < root :: nsStyleCoord > , pub mPosition : root :: mozilla :: Position , pub mRadius : root :: nsStyleCorners , } # [ test ] fn bindgen_test_layout_StyleBasicShape ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleBasicShape > ( ) , 112usize , concat ! ( "Size of: " , stringify ! ( StyleBasicShape ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleBasicShape > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleBasicShape ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleBasicShape ) ) . mType as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleBasicShape ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleBasicShape ) ) . mFillRule as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( StyleBasicShape ) , "::" , stringify ! ( mFillRule ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleBasicShape ) ) . mCoordinates as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( StyleBasicShape ) , "::" , stringify ! ( mCoordinates ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleBasicShape ) ) . mPosition as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( StyleBasicShape ) , "::" , stringify ! ( mPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleBasicShape ) ) . mRadius as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( StyleBasicShape ) , "::" , stringify ! ( mRadius ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct StyleShapeSource { pub mBasicShape : root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > , pub mShapeImage : root :: mozilla :: UniquePtr < root :: nsStyleImage > , pub mType : root :: mozilla :: StyleShapeSourceType , pub mReferenceBox : root :: mozilla :: StyleGeometryBox , } # [ test ] fn bindgen_test_layout_StyleShapeSource ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleShapeSource > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( StyleShapeSource ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleShapeSource > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleShapeSource ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleShapeSource ) ) . mBasicShape as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleShapeSource ) , "::" , stringify ! ( mBasicShape ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleShapeSource ) ) . mShapeImage as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( StyleShapeSource ) , "::" , stringify ! ( mShapeImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleShapeSource ) ) . mType as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( StyleShapeSource ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleShapeSource ) ) . mReferenceBox as * const _ as usize } , 17usize , concat ! ( "Alignment of field: " , stringify ! ( StyleShapeSource ) , "::" , stringify ! ( mReferenceBox ) ) ) ; } 
  /// <div rustbindgen="true" replaces="mozilla::UniquePtr">
         ///
         /// TODO(Emilio): This is a workaround and we should be able to get rid of this
         /// one. 
- # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct UniquePtr < T > { pub mPtr : * mut T , pub _phantom_0 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < T > > , } pub const SERVO_PREF_ENABLED_align_content : bool = false ; pub const SERVO_PREF_ENABLED_align_items : bool = false ; pub const SERVO_PREF_ENABLED_align_self : bool = false ; pub const SERVO_PREF_ENABLED_all : bool = true ; pub const SERVO_PREF_ENABLED_animation : bool = false ; pub const SERVO_PREF_ENABLED_animation_delay : bool = false ; pub const SERVO_PREF_ENABLED_animation_direction : bool = false ; pub const SERVO_PREF_ENABLED_animation_duration : bool = false ; pub const SERVO_PREF_ENABLED_animation_fill_mode : bool = false ; pub const SERVO_PREF_ENABLED_animation_iteration_count : bool = false ; pub const SERVO_PREF_ENABLED_animation_name : bool = false ; pub const SERVO_PREF_ENABLED_animation_play_state : bool = false ; pub const SERVO_PREF_ENABLED_animation_timing_function : bool = false ; pub const SERVO_PREF_ENABLED__moz_appearance : bool = false ; pub const SERVO_PREF_ENABLED_backface_visibility : bool = false ; pub const SERVO_PREF_ENABLED_background : bool = false ; pub const SERVO_PREF_ENABLED_background_attachment : bool = false ; pub const SERVO_PREF_ENABLED_background_blend_mode : bool = true ; pub const SERVO_PREF_ENABLED_background_clip : bool = false ; pub const SERVO_PREF_ENABLED_background_color : bool = false ; pub const SERVO_PREF_ENABLED_background_image : bool = false ; pub const SERVO_PREF_ENABLED_background_origin : bool = false ; pub const SERVO_PREF_ENABLED_background_position : bool = false ; pub const SERVO_PREF_ENABLED_background_position_x : bool = false ; pub const SERVO_PREF_ENABLED_background_position_y : bool = false ; pub const SERVO_PREF_ENABLED_background_repeat : bool = false ; pub const SERVO_PREF_ENABLED_background_size : bool = false ; pub const SERVO_PREF_ENABLED__moz_binding : bool = false ; pub const SERVO_PREF_ENABLED_block_size : bool = false ; pub const SERVO_PREF_ENABLED_border : bool = false ; pub const SERVO_PREF_ENABLED_border_block_end : bool = false ; pub const SERVO_PREF_ENABLED_border_block_end_color : bool = false ; pub const SERVO_PREF_ENABLED_border_block_end_style : bool = false ; pub const SERVO_PREF_ENABLED_border_block_end_width : bool = false ; pub const SERVO_PREF_ENABLED_border_block_start : bool = false ; pub const SERVO_PREF_ENABLED_border_block_start_color : bool = false ; pub const SERVO_PREF_ENABLED_border_block_start_style : bool = false ; pub const SERVO_PREF_ENABLED_border_block_start_width : bool = false ; pub const SERVO_PREF_ENABLED_border_bottom : bool = false ; pub const SERVO_PREF_ENABLED_border_bottom_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_bottom_colors : bool = false ; pub const SERVO_PREF_ENABLED_border_bottom_left_radius : bool = false ; pub const SERVO_PREF_ENABLED_border_bottom_right_radius : bool = false ; pub const SERVO_PREF_ENABLED_border_bottom_style : bool = false ; pub const SERVO_PREF_ENABLED_border_bottom_width : bool = false ; pub const SERVO_PREF_ENABLED_border_collapse : bool = false ; pub const SERVO_PREF_ENABLED_border_color : bool = false ; pub const SERVO_PREF_ENABLED_border_image : bool = false ; pub const SERVO_PREF_ENABLED_border_image_outset : bool = false ; pub const SERVO_PREF_ENABLED_border_image_repeat : bool = false ; pub const SERVO_PREF_ENABLED_border_image_slice : bool = false ; pub const SERVO_PREF_ENABLED_border_image_source : bool = false ; pub const SERVO_PREF_ENABLED_border_image_width : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_end : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_end_color : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_end_style : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_end_width : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_start : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_start_color : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_start_style : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_start_width : bool = false ; pub const SERVO_PREF_ENABLED_border_left : bool = false ; pub const SERVO_PREF_ENABLED_border_left_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_left_colors : bool = false ; pub const SERVO_PREF_ENABLED_border_left_style : bool = false ; pub const SERVO_PREF_ENABLED_border_left_width : bool = false ; pub const SERVO_PREF_ENABLED_border_radius : bool = false ; pub const SERVO_PREF_ENABLED_border_right : bool = false ; pub const SERVO_PREF_ENABLED_border_right_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_right_colors : bool = false ; pub const SERVO_PREF_ENABLED_border_right_style : bool = false ; pub const SERVO_PREF_ENABLED_border_right_width : bool = false ; pub const SERVO_PREF_ENABLED_border_spacing : bool = false ; pub const SERVO_PREF_ENABLED_border_style : bool = false ; pub const SERVO_PREF_ENABLED_border_top : bool = false ; pub const SERVO_PREF_ENABLED_border_top_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_top_colors : bool = false ; pub const SERVO_PREF_ENABLED_border_top_left_radius : bool = false ; pub const SERVO_PREF_ENABLED_border_top_right_radius : bool = false ; pub const SERVO_PREF_ENABLED_border_top_style : bool = false ; pub const SERVO_PREF_ENABLED_border_top_width : bool = false ; pub const SERVO_PREF_ENABLED_border_width : bool = false ; pub const SERVO_PREF_ENABLED_bottom : bool = false ; pub const SERVO_PREF_ENABLED__moz_box_align : bool = false ; pub const SERVO_PREF_ENABLED_box_decoration_break : bool = true ; pub const SERVO_PREF_ENABLED__moz_box_direction : bool = false ; pub const SERVO_PREF_ENABLED__moz_box_flex : bool = false ; pub const SERVO_PREF_ENABLED__moz_box_ordinal_group : bool = false ; pub const SERVO_PREF_ENABLED__moz_box_orient : bool = false ; pub const SERVO_PREF_ENABLED__moz_box_pack : bool = false ; pub const SERVO_PREF_ENABLED_box_shadow : bool = false ; pub const SERVO_PREF_ENABLED_box_sizing : bool = false ; pub const SERVO_PREF_ENABLED_caption_side : bool = false ; pub const SERVO_PREF_ENABLED_caret_color : bool = false ; pub const SERVO_PREF_ENABLED_clear : bool = false ; pub const SERVO_PREF_ENABLED_clip : bool = false ; pub const SERVO_PREF_ENABLED_clip_path : bool = false ; pub const SERVO_PREF_ENABLED_clip_rule : bool = false ; pub const SERVO_PREF_ENABLED_color : bool = false ; pub const SERVO_PREF_ENABLED_color_adjust : bool = true ; pub const SERVO_PREF_ENABLED_color_interpolation : bool = false ; pub const SERVO_PREF_ENABLED_color_interpolation_filters : bool = false ; pub const SERVO_PREF_ENABLED_column_count : bool = false ; pub const SERVO_PREF_ENABLED_column_fill : bool = false ; pub const SERVO_PREF_ENABLED_column_gap : bool = false ; pub const SERVO_PREF_ENABLED_column_rule : bool = false ; pub const SERVO_PREF_ENABLED_column_rule_color : bool = false ; pub const SERVO_PREF_ENABLED_column_rule_style : bool = false ; pub const SERVO_PREF_ENABLED_column_rule_width : bool = false ; pub const SERVO_PREF_ENABLED_column_span : bool = true ; pub const SERVO_PREF_ENABLED_column_width : bool = false ; pub const SERVO_PREF_ENABLED_columns : bool = false ; pub const SERVO_PREF_ENABLED_contain : bool = true ; pub const SERVO_PREF_ENABLED_content : bool = false ; pub const SERVO_PREF_ENABLED__moz_context_properties : bool = false ; pub const SERVO_PREF_ENABLED__moz_control_character_visibility : bool = false ; pub const SERVO_PREF_ENABLED_counter_increment : bool = false ; pub const SERVO_PREF_ENABLED_counter_reset : bool = false ; pub const SERVO_PREF_ENABLED_cursor : bool = false ; pub const SERVO_PREF_ENABLED_direction : bool = false ; pub const SERVO_PREF_ENABLED_display : bool = false ; pub const SERVO_PREF_ENABLED_dominant_baseline : bool = false ; pub const SERVO_PREF_ENABLED_empty_cells : bool = false ; pub const SERVO_PREF_ENABLED_fill : bool = false ; pub const SERVO_PREF_ENABLED_fill_opacity : bool = false ; pub const SERVO_PREF_ENABLED_fill_rule : bool = false ; pub const SERVO_PREF_ENABLED_filter : bool = false ; pub const SERVO_PREF_ENABLED_flex : bool = false ; pub const SERVO_PREF_ENABLED_flex_basis : bool = false ; pub const SERVO_PREF_ENABLED_flex_direction : bool = false ; pub const SERVO_PREF_ENABLED_flex_flow : bool = false ; pub const SERVO_PREF_ENABLED_flex_grow : bool = false ; pub const SERVO_PREF_ENABLED_flex_shrink : bool = false ; pub const SERVO_PREF_ENABLED_flex_wrap : bool = false ; pub const SERVO_PREF_ENABLED_float_ : bool = false ; pub const SERVO_PREF_ENABLED__moz_float_edge : bool = false ; pub const SERVO_PREF_ENABLED_flood_color : bool = false ; pub const SERVO_PREF_ENABLED_flood_opacity : bool = false ; pub const SERVO_PREF_ENABLED_font : bool = false ; pub const SERVO_PREF_ENABLED_font_family : bool = false ; pub const SERVO_PREF_ENABLED_font_feature_settings : bool = false ; pub const SERVO_PREF_ENABLED_font_kerning : bool = false ; pub const SERVO_PREF_ENABLED_font_language_override : bool = false ; pub const SERVO_PREF_ENABLED_font_size : bool = false ; pub const SERVO_PREF_ENABLED_font_size_adjust : bool = false ; pub const SERVO_PREF_ENABLED__moz_font_smoothing_background_color : bool = false ; pub const SERVO_PREF_ENABLED_font_stretch : bool = false ; pub const SERVO_PREF_ENABLED_font_style : bool = false ; pub const SERVO_PREF_ENABLED_font_synthesis : bool = false ; pub const SERVO_PREF_ENABLED_font_variant : bool = false ; pub const SERVO_PREF_ENABLED_font_variant_alternates : bool = false ; pub const SERVO_PREF_ENABLED_font_variant_caps : bool = false ; pub const SERVO_PREF_ENABLED_font_variant_east_asian : bool = false ; pub const SERVO_PREF_ENABLED_font_variant_ligatures : bool = false ; pub const SERVO_PREF_ENABLED_font_variant_numeric : bool = false ; pub const SERVO_PREF_ENABLED_font_variant_position : bool = false ; pub const SERVO_PREF_ENABLED_font_variation_settings : bool = true ; pub const SERVO_PREF_ENABLED_font_weight : bool = false ; pub const SERVO_PREF_ENABLED__moz_force_broken_image_icon : bool = false ; pub const SERVO_PREF_ENABLED_grid : bool = true ; pub const SERVO_PREF_ENABLED_grid_area : bool = true ; pub const SERVO_PREF_ENABLED_grid_auto_columns : bool = true ; pub const SERVO_PREF_ENABLED_grid_auto_flow : bool = true ; pub const SERVO_PREF_ENABLED_grid_auto_rows : bool = true ; pub const SERVO_PREF_ENABLED_grid_column : bool = true ; pub const SERVO_PREF_ENABLED_grid_column_end : bool = true ; pub const SERVO_PREF_ENABLED_grid_column_gap : bool = true ; pub const SERVO_PREF_ENABLED_grid_column_start : bool = true ; pub const SERVO_PREF_ENABLED_grid_gap : bool = true ; pub const SERVO_PREF_ENABLED_grid_row : bool = true ; pub const SERVO_PREF_ENABLED_grid_row_end : bool = true ; pub const SERVO_PREF_ENABLED_grid_row_gap : bool = true ; pub const SERVO_PREF_ENABLED_grid_row_start : bool = true ; pub const SERVO_PREF_ENABLED_grid_template : bool = true ; pub const SERVO_PREF_ENABLED_grid_template_areas : bool = true ; pub const SERVO_PREF_ENABLED_grid_template_columns : bool = true ; pub const SERVO_PREF_ENABLED_grid_template_rows : bool = true ; pub const SERVO_PREF_ENABLED_height : bool = false ; pub const SERVO_PREF_ENABLED_hyphens : bool = false ; pub const SERVO_PREF_ENABLED_initial_letter : bool = true ; pub const SERVO_PREF_ENABLED_image_orientation : bool = true ; pub const SERVO_PREF_ENABLED__moz_image_region : bool = false ; pub const SERVO_PREF_ENABLED_image_rendering : bool = false ; pub const SERVO_PREF_ENABLED_ime_mode : bool = false ; pub const SERVO_PREF_ENABLED_inline_size : bool = false ; pub const SERVO_PREF_ENABLED_isolation : bool = true ; pub const SERVO_PREF_ENABLED_justify_content : bool = false ; pub const SERVO_PREF_ENABLED_justify_items : bool = false ; pub const SERVO_PREF_ENABLED_justify_self : bool = false ; pub const SERVO_PREF_ENABLED__x_lang : bool = false ; pub const SERVO_PREF_ENABLED_left : bool = false ; pub const SERVO_PREF_ENABLED_letter_spacing : bool = false ; pub const SERVO_PREF_ENABLED_lighting_color : bool = false ; pub const SERVO_PREF_ENABLED_line_height : bool = false ; pub const SERVO_PREF_ENABLED_list_style : bool = false ; pub const SERVO_PREF_ENABLED_list_style_image : bool = false ; pub const SERVO_PREF_ENABLED_list_style_position : bool = false ; pub const SERVO_PREF_ENABLED_list_style_type : bool = false ; pub const SERVO_PREF_ENABLED_margin : bool = false ; pub const SERVO_PREF_ENABLED_margin_block_end : bool = false ; pub const SERVO_PREF_ENABLED_margin_block_start : bool = false ; pub const SERVO_PREF_ENABLED_margin_bottom : bool = false ; pub const SERVO_PREF_ENABLED_margin_inline_end : bool = false ; pub const SERVO_PREF_ENABLED_margin_inline_start : bool = false ; pub const SERVO_PREF_ENABLED_margin_left : bool = false ; pub const SERVO_PREF_ENABLED_margin_right : bool = false ; pub const SERVO_PREF_ENABLED_margin_top : bool = false ; pub const SERVO_PREF_ENABLED_marker : bool = false ; pub const SERVO_PREF_ENABLED_marker_end : bool = false ; pub const SERVO_PREF_ENABLED_marker_mid : bool = false ; pub const SERVO_PREF_ENABLED_marker_start : bool = false ; pub const SERVO_PREF_ENABLED_mask : bool = false ; pub const SERVO_PREF_ENABLED_mask_clip : bool = false ; pub const SERVO_PREF_ENABLED_mask_composite : bool = false ; pub const SERVO_PREF_ENABLED_mask_image : bool = false ; pub const SERVO_PREF_ENABLED_mask_mode : bool = false ; pub const SERVO_PREF_ENABLED_mask_origin : bool = false ; pub const SERVO_PREF_ENABLED_mask_position : bool = false ; pub const SERVO_PREF_ENABLED_mask_position_x : bool = false ; pub const SERVO_PREF_ENABLED_mask_position_y : bool = false ; pub const SERVO_PREF_ENABLED_mask_repeat : bool = false ; pub const SERVO_PREF_ENABLED_mask_size : bool = false ; pub const SERVO_PREF_ENABLED_mask_type : bool = false ; pub const SERVO_PREF_ENABLED__moz_math_display : bool = false ; pub const SERVO_PREF_ENABLED__moz_math_variant : bool = false ; pub const SERVO_PREF_ENABLED_max_block_size : bool = false ; pub const SERVO_PREF_ENABLED_max_height : bool = false ; pub const SERVO_PREF_ENABLED_max_inline_size : bool = false ; pub const SERVO_PREF_ENABLED_max_width : bool = false ; pub const SERVO_PREF_ENABLED_min_block_size : bool = false ; pub const SERVO_PREF_ENABLED__moz_min_font_size_ratio : bool = false ; pub const SERVO_PREF_ENABLED_min_height : bool = false ; pub const SERVO_PREF_ENABLED_min_inline_size : bool = false ; pub const SERVO_PREF_ENABLED_min_width : bool = false ; pub const SERVO_PREF_ENABLED_mix_blend_mode : bool = true ; pub const SERVO_PREF_ENABLED_object_fit : bool = false ; pub const SERVO_PREF_ENABLED_object_position : bool = false ; pub const SERVO_PREF_ENABLED_offset_block_end : bool = false ; pub const SERVO_PREF_ENABLED_offset_block_start : bool = false ; pub const SERVO_PREF_ENABLED_offset_inline_end : bool = false ; pub const SERVO_PREF_ENABLED_offset_inline_start : bool = false ; pub const SERVO_PREF_ENABLED_opacity : bool = false ; pub const SERVO_PREF_ENABLED_order : bool = false ; pub const SERVO_PREF_ENABLED__moz_orient : bool = false ; pub const SERVO_PREF_ENABLED__moz_osx_font_smoothing : bool = true ; pub const SERVO_PREF_ENABLED_outline : bool = false ; pub const SERVO_PREF_ENABLED_outline_color : bool = false ; pub const SERVO_PREF_ENABLED_outline_offset : bool = false ; pub const SERVO_PREF_ENABLED__moz_outline_radius : bool = false ; pub const SERVO_PREF_ENABLED__moz_outline_radius_bottomleft : bool = false ; pub const SERVO_PREF_ENABLED__moz_outline_radius_bottomright : bool = false ; pub const SERVO_PREF_ENABLED__moz_outline_radius_topleft : bool = false ; pub const SERVO_PREF_ENABLED__moz_outline_radius_topright : bool = false ; pub const SERVO_PREF_ENABLED_outline_style : bool = false ; pub const SERVO_PREF_ENABLED_outline_width : bool = false ; pub const SERVO_PREF_ENABLED_overflow : bool = false ; pub const SERVO_PREF_ENABLED_overflow_clip_box : bool = true ; pub const SERVO_PREF_ENABLED_overflow_x : bool = false ; pub const SERVO_PREF_ENABLED_overflow_y : bool = false ; pub const SERVO_PREF_ENABLED_padding : bool = false ; pub const SERVO_PREF_ENABLED_padding_block_end : bool = false ; pub const SERVO_PREF_ENABLED_padding_block_start : bool = false ; pub const SERVO_PREF_ENABLED_padding_bottom : bool = false ; pub const SERVO_PREF_ENABLED_padding_inline_end : bool = false ; pub const SERVO_PREF_ENABLED_padding_inline_start : bool = false ; pub const SERVO_PREF_ENABLED_padding_left : bool = false ; pub const SERVO_PREF_ENABLED_padding_right : bool = false ; pub const SERVO_PREF_ENABLED_padding_top : bool = false ; pub const SERVO_PREF_ENABLED_page_break_after : bool = false ; pub const SERVO_PREF_ENABLED_page_break_before : bool = false ; pub const SERVO_PREF_ENABLED_page_break_inside : bool = false ; pub const SERVO_PREF_ENABLED_paint_order : bool = true ; pub const SERVO_PREF_ENABLED_perspective : bool = false ; pub const SERVO_PREF_ENABLED_perspective_origin : bool = false ; pub const SERVO_PREF_ENABLED_place_content : bool = false ; pub const SERVO_PREF_ENABLED_place_items : bool = false ; pub const SERVO_PREF_ENABLED_place_self : bool = false ; pub const SERVO_PREF_ENABLED_pointer_events : bool = false ; pub const SERVO_PREF_ENABLED_position : bool = false ; pub const SERVO_PREF_ENABLED_quotes : bool = false ; pub const SERVO_PREF_ENABLED_resize : bool = false ; pub const SERVO_PREF_ENABLED_right : bool = false ; pub const SERVO_PREF_ENABLED_ruby_align : bool = false ; pub const SERVO_PREF_ENABLED_ruby_position : bool = false ; pub const SERVO_PREF_ENABLED__moz_script_level : bool = false ; pub const SERVO_PREF_ENABLED__moz_script_min_size : bool = false ; pub const SERVO_PREF_ENABLED__moz_script_size_multiplier : bool = false ; pub const SERVO_PREF_ENABLED_scroll_behavior : bool = true ; pub const SERVO_PREF_ENABLED_overscroll_behavior : bool = true ; pub const SERVO_PREF_ENABLED_overscroll_behavior_x : bool = true ; pub const SERVO_PREF_ENABLED_overscroll_behavior_y : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_coordinate : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_destination : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_points_x : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_points_y : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_type : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_type_x : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_type_y : bool = true ; pub const SERVO_PREF_ENABLED_shape_outside : bool = true ; pub const SERVO_PREF_ENABLED_shape_rendering : bool = false ; pub const SERVO_PREF_ENABLED__x_span : bool = false ; pub const SERVO_PREF_ENABLED__moz_stack_sizing : bool = false ; pub const SERVO_PREF_ENABLED_stop_color : bool = false ; pub const SERVO_PREF_ENABLED_stop_opacity : bool = false ; pub const SERVO_PREF_ENABLED_stroke : bool = false ; pub const SERVO_PREF_ENABLED_stroke_dasharray : bool = false ; pub const SERVO_PREF_ENABLED_stroke_dashoffset : bool = false ; pub const SERVO_PREF_ENABLED_stroke_linecap : bool = false ; pub const SERVO_PREF_ENABLED_stroke_linejoin : bool = false ; pub const SERVO_PREF_ENABLED_stroke_miterlimit : bool = false ; pub const SERVO_PREF_ENABLED_stroke_opacity : bool = false ; pub const SERVO_PREF_ENABLED_stroke_width : bool = false ; pub const SERVO_PREF_ENABLED__x_system_font : bool = false ; pub const SERVO_PREF_ENABLED__moz_tab_size : bool = false ; pub const SERVO_PREF_ENABLED_table_layout : bool = false ; pub const SERVO_PREF_ENABLED_text_align : bool = false ; pub const SERVO_PREF_ENABLED_text_align_last : bool = false ; pub const SERVO_PREF_ENABLED_text_anchor : bool = false ; pub const SERVO_PREF_ENABLED_text_combine_upright : bool = true ; pub const SERVO_PREF_ENABLED_text_decoration : bool = false ; pub const SERVO_PREF_ENABLED_text_decoration_color : bool = false ; pub const SERVO_PREF_ENABLED_text_decoration_line : bool = false ; pub const SERVO_PREF_ENABLED_text_decoration_style : bool = false ; pub const SERVO_PREF_ENABLED_text_emphasis : bool = false ; pub const SERVO_PREF_ENABLED_text_emphasis_color : bool = false ; pub const SERVO_PREF_ENABLED_text_emphasis_position : bool = false ; pub const SERVO_PREF_ENABLED_text_emphasis_style : bool = false ; pub const SERVO_PREF_ENABLED__webkit_text_fill_color : bool = true ; pub const SERVO_PREF_ENABLED_text_indent : bool = false ; pub const SERVO_PREF_ENABLED_text_justify : bool = true ; pub const SERVO_PREF_ENABLED_text_orientation : bool = false ; pub const SERVO_PREF_ENABLED_text_overflow : bool = false ; pub const SERVO_PREF_ENABLED_text_rendering : bool = false ; pub const SERVO_PREF_ENABLED_text_shadow : bool = false ; pub const SERVO_PREF_ENABLED__moz_text_size_adjust : bool = false ; pub const SERVO_PREF_ENABLED__webkit_text_stroke : bool = true ; pub const SERVO_PREF_ENABLED__webkit_text_stroke_color : bool = true ; pub const SERVO_PREF_ENABLED__webkit_text_stroke_width : bool = true ; pub const SERVO_PREF_ENABLED_text_transform : bool = false ; pub const SERVO_PREF_ENABLED__x_text_zoom : bool = false ; pub const SERVO_PREF_ENABLED_top : bool = false ; pub const SERVO_PREF_ENABLED__moz_top_layer : bool = false ; pub const SERVO_PREF_ENABLED_touch_action : bool = true ; pub const SERVO_PREF_ENABLED_transform : bool = false ; pub const SERVO_PREF_ENABLED__moz_transform : bool = true ; pub const SERVO_PREF_ENABLED_transform_box : bool = true ; pub const SERVO_PREF_ENABLED_transform_origin : bool = false ; pub const SERVO_PREF_ENABLED_transform_style : bool = false ; pub const SERVO_PREF_ENABLED_transition : bool = false ; pub const SERVO_PREF_ENABLED_transition_delay : bool = false ; pub const SERVO_PREF_ENABLED_transition_duration : bool = false ; pub const SERVO_PREF_ENABLED_transition_property : bool = false ; pub const SERVO_PREF_ENABLED_transition_timing_function : bool = false ; pub const SERVO_PREF_ENABLED_unicode_bidi : bool = false ; pub const SERVO_PREF_ENABLED__moz_user_focus : bool = false ; pub const SERVO_PREF_ENABLED__moz_user_input : bool = false ; pub const SERVO_PREF_ENABLED__moz_user_modify : bool = false ; pub const SERVO_PREF_ENABLED__moz_user_select : bool = false ; pub const SERVO_PREF_ENABLED_vector_effect : bool = false ; pub const SERVO_PREF_ENABLED_vertical_align : bool = false ; pub const SERVO_PREF_ENABLED_visibility : bool = false ; pub const SERVO_PREF_ENABLED_white_space : bool = false ; pub const SERVO_PREF_ENABLED_width : bool = false ; pub const SERVO_PREF_ENABLED_will_change : bool = false ; pub const SERVO_PREF_ENABLED__moz_window_dragging : bool = false ; pub const SERVO_PREF_ENABLED__moz_window_shadow : bool = false ; pub const SERVO_PREF_ENABLED__moz_window_opacity : bool = false ; pub const SERVO_PREF_ENABLED__moz_window_transform : bool = false ; pub const SERVO_PREF_ENABLED__moz_window_transform_origin : bool = false ; pub const SERVO_PREF_ENABLED_word_break : bool = false ; pub const SERVO_PREF_ENABLED_word_spacing : bool = false ; pub const SERVO_PREF_ENABLED_overflow_wrap : bool = false ; pub const SERVO_PREF_ENABLED_writing_mode : bool = false ; pub const SERVO_PREF_ENABLED_z_index : bool = false ; pub const SERVO_PREF_ENABLED_word_wrap : bool = false ; pub const SERVO_PREF_ENABLED__moz_transform_origin : bool = true ; pub const SERVO_PREF_ENABLED__moz_perspective_origin : bool = true ; pub const SERVO_PREF_ENABLED__moz_perspective : bool = true ; pub const SERVO_PREF_ENABLED__moz_transform_style : bool = true ; pub const SERVO_PREF_ENABLED__moz_backface_visibility : bool = true ; pub const SERVO_PREF_ENABLED__moz_border_image : bool = true ; pub const SERVO_PREF_ENABLED__moz_transition : bool = true ; pub const SERVO_PREF_ENABLED__moz_transition_delay : bool = true ; pub const SERVO_PREF_ENABLED__moz_transition_duration : bool = true ; pub const SERVO_PREF_ENABLED__moz_transition_property : bool = true ; pub const SERVO_PREF_ENABLED__moz_transition_timing_function : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_delay : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_direction : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_duration : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_fill_mode : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_iteration_count : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_name : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_play_state : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_timing_function : bool = true ; pub const SERVO_PREF_ENABLED__moz_box_sizing : bool = true ; pub const SERVO_PREF_ENABLED__moz_font_feature_settings : bool = true ; pub const SERVO_PREF_ENABLED__moz_font_language_override : bool = true ; pub const SERVO_PREF_ENABLED__moz_padding_end : bool = false ; pub const SERVO_PREF_ENABLED__moz_padding_start : bool = false ; pub const SERVO_PREF_ENABLED__moz_margin_end : bool = false ; pub const SERVO_PREF_ENABLED__moz_margin_start : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_end : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_end_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_end_style : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_end_width : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_start : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_start_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_start_style : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_start_width : bool = false ; pub const SERVO_PREF_ENABLED__moz_hyphens : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_count : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_fill : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_gap : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_rule : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_rule_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_rule_style : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_rule_width : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_width : bool = false ; pub const SERVO_PREF_ENABLED__moz_columns : bool = false ; pub const SERVO_PREF_ENABLED__webkit_animation : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_delay : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_direction : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_duration : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_fill_mode : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_iteration_count : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_name : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_play_state : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_timing_function : bool = true ; pub const SERVO_PREF_ENABLED__webkit_filter : bool = true ; pub const SERVO_PREF_ENABLED__webkit_text_size_adjust : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transform : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transform_origin : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transform_style : bool = true ; pub const SERVO_PREF_ENABLED__webkit_backface_visibility : bool = true ; pub const SERVO_PREF_ENABLED__webkit_perspective : bool = true ; pub const SERVO_PREF_ENABLED__webkit_perspective_origin : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transition : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transition_delay : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transition_duration : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transition_property : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transition_timing_function : bool = true ; pub const SERVO_PREF_ENABLED__webkit_border_radius : bool = true ; pub const SERVO_PREF_ENABLED__webkit_border_top_left_radius : bool = true ; pub const SERVO_PREF_ENABLED__webkit_border_top_right_radius : bool = true ; pub const SERVO_PREF_ENABLED__webkit_border_bottom_left_radius : bool = true ; pub const SERVO_PREF_ENABLED__webkit_border_bottom_right_radius : bool = true ; pub const SERVO_PREF_ENABLED__webkit_background_clip : bool = true ; pub const SERVO_PREF_ENABLED__webkit_background_origin : bool = true ; pub const SERVO_PREF_ENABLED__webkit_background_size : bool = true ; pub const SERVO_PREF_ENABLED__webkit_border_image : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_shadow : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_sizing : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_flex : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_ordinal_group : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_orient : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_direction : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_align : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_pack : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex_direction : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex_wrap : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex_flow : bool = true ; pub const SERVO_PREF_ENABLED__webkit_order : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex_grow : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex_shrink : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex_basis : bool = true ; pub const SERVO_PREF_ENABLED__webkit_justify_content : bool = true ; pub const SERVO_PREF_ENABLED__webkit_align_items : bool = true ; pub const SERVO_PREF_ENABLED__webkit_align_self : bool = true ; pub const SERVO_PREF_ENABLED__webkit_align_content : bool = true ; pub const SERVO_PREF_ENABLED__webkit_user_select : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_clip : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_composite : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_image : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_origin : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_position : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_position_x : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_position_y : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_repeat : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_size : bool = true ; 
+ # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct UniquePtr < T > { pub mPtr : * mut T , pub _phantom_0 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < T > > , } pub const SERVO_PREF_ENABLED_align_content : bool = false ; pub const SERVO_PREF_ENABLED_align_items : bool = false ; pub const SERVO_PREF_ENABLED_align_self : bool = false ; pub const SERVO_PREF_ENABLED_all : bool = true ; pub const SERVO_PREF_ENABLED_animation : bool = false ; pub const SERVO_PREF_ENABLED_animation_delay : bool = false ; pub const SERVO_PREF_ENABLED_animation_direction : bool = false ; pub const SERVO_PREF_ENABLED_animation_duration : bool = false ; pub const SERVO_PREF_ENABLED_animation_fill_mode : bool = false ; pub const SERVO_PREF_ENABLED_animation_iteration_count : bool = false ; pub const SERVO_PREF_ENABLED_animation_name : bool = false ; pub const SERVO_PREF_ENABLED_animation_play_state : bool = false ; pub const SERVO_PREF_ENABLED_animation_timing_function : bool = false ; pub const SERVO_PREF_ENABLED__moz_appearance : bool = false ; pub const SERVO_PREF_ENABLED_backface_visibility : bool = false ; pub const SERVO_PREF_ENABLED_background : bool = false ; pub const SERVO_PREF_ENABLED_background_attachment : bool = false ; pub const SERVO_PREF_ENABLED_background_blend_mode : bool = true ; pub const SERVO_PREF_ENABLED_background_clip : bool = false ; pub const SERVO_PREF_ENABLED_background_color : bool = false ; pub const SERVO_PREF_ENABLED_background_image : bool = false ; pub const SERVO_PREF_ENABLED_background_origin : bool = false ; pub const SERVO_PREF_ENABLED_background_position : bool = false ; pub const SERVO_PREF_ENABLED_background_position_x : bool = false ; pub const SERVO_PREF_ENABLED_background_position_y : bool = false ; pub const SERVO_PREF_ENABLED_background_repeat : bool = false ; pub const SERVO_PREF_ENABLED_background_size : bool = false ; pub const SERVO_PREF_ENABLED__moz_binding : bool = false ; pub const SERVO_PREF_ENABLED_block_size : bool = false ; pub const SERVO_PREF_ENABLED_border : bool = false ; pub const SERVO_PREF_ENABLED_border_block_end : bool = false ; pub const SERVO_PREF_ENABLED_border_block_end_color : bool = false ; pub const SERVO_PREF_ENABLED_border_block_end_style : bool = false ; pub const SERVO_PREF_ENABLED_border_block_end_width : bool = false ; pub const SERVO_PREF_ENABLED_border_block_start : bool = false ; pub const SERVO_PREF_ENABLED_border_block_start_color : bool = false ; pub const SERVO_PREF_ENABLED_border_block_start_style : bool = false ; pub const SERVO_PREF_ENABLED_border_block_start_width : bool = false ; pub const SERVO_PREF_ENABLED_border_bottom : bool = false ; pub const SERVO_PREF_ENABLED_border_bottom_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_bottom_colors : bool = false ; pub const SERVO_PREF_ENABLED_border_bottom_left_radius : bool = false ; pub const SERVO_PREF_ENABLED_border_bottom_right_radius : bool = false ; pub const SERVO_PREF_ENABLED_border_bottom_style : bool = false ; pub const SERVO_PREF_ENABLED_border_bottom_width : bool = false ; pub const SERVO_PREF_ENABLED_border_collapse : bool = false ; pub const SERVO_PREF_ENABLED_border_color : bool = false ; pub const SERVO_PREF_ENABLED_border_image : bool = false ; pub const SERVO_PREF_ENABLED_border_image_outset : bool = false ; pub const SERVO_PREF_ENABLED_border_image_repeat : bool = false ; pub const SERVO_PREF_ENABLED_border_image_slice : bool = false ; pub const SERVO_PREF_ENABLED_border_image_source : bool = false ; pub const SERVO_PREF_ENABLED_border_image_width : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_end : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_end_color : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_end_style : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_end_width : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_start : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_start_color : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_start_style : bool = false ; pub const SERVO_PREF_ENABLED_border_inline_start_width : bool = false ; pub const SERVO_PREF_ENABLED_border_left : bool = false ; pub const SERVO_PREF_ENABLED_border_left_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_left_colors : bool = false ; pub const SERVO_PREF_ENABLED_border_left_style : bool = false ; pub const SERVO_PREF_ENABLED_border_left_width : bool = false ; pub const SERVO_PREF_ENABLED_border_radius : bool = false ; pub const SERVO_PREF_ENABLED_border_right : bool = false ; pub const SERVO_PREF_ENABLED_border_right_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_right_colors : bool = false ; pub const SERVO_PREF_ENABLED_border_right_style : bool = false ; pub const SERVO_PREF_ENABLED_border_right_width : bool = false ; pub const SERVO_PREF_ENABLED_border_spacing : bool = false ; pub const SERVO_PREF_ENABLED_border_style : bool = false ; pub const SERVO_PREF_ENABLED_border_top : bool = false ; pub const SERVO_PREF_ENABLED_border_top_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_top_colors : bool = false ; pub const SERVO_PREF_ENABLED_border_top_left_radius : bool = false ; pub const SERVO_PREF_ENABLED_border_top_right_radius : bool = false ; pub const SERVO_PREF_ENABLED_border_top_style : bool = false ; pub const SERVO_PREF_ENABLED_border_top_width : bool = false ; pub const SERVO_PREF_ENABLED_border_width : bool = false ; pub const SERVO_PREF_ENABLED_bottom : bool = false ; pub const SERVO_PREF_ENABLED__moz_box_align : bool = false ; pub const SERVO_PREF_ENABLED_box_decoration_break : bool = true ; pub const SERVO_PREF_ENABLED__moz_box_direction : bool = false ; pub const SERVO_PREF_ENABLED__moz_box_flex : bool = false ; pub const SERVO_PREF_ENABLED__moz_box_ordinal_group : bool = false ; pub const SERVO_PREF_ENABLED__moz_box_orient : bool = false ; pub const SERVO_PREF_ENABLED__moz_box_pack : bool = false ; pub const SERVO_PREF_ENABLED_box_shadow : bool = false ; pub const SERVO_PREF_ENABLED_box_sizing : bool = false ; pub const SERVO_PREF_ENABLED_caption_side : bool = false ; pub const SERVO_PREF_ENABLED_caret_color : bool = false ; pub const SERVO_PREF_ENABLED_clear : bool = false ; pub const SERVO_PREF_ENABLED_clip : bool = false ; pub const SERVO_PREF_ENABLED_clip_path : bool = false ; pub const SERVO_PREF_ENABLED_clip_rule : bool = false ; pub const SERVO_PREF_ENABLED_color : bool = false ; pub const SERVO_PREF_ENABLED_color_adjust : bool = true ; pub const SERVO_PREF_ENABLED_color_interpolation : bool = false ; pub const SERVO_PREF_ENABLED_color_interpolation_filters : bool = false ; pub const SERVO_PREF_ENABLED_column_count : bool = false ; pub const SERVO_PREF_ENABLED_column_fill : bool = false ; pub const SERVO_PREF_ENABLED_column_gap : bool = false ; pub const SERVO_PREF_ENABLED_column_rule : bool = false ; pub const SERVO_PREF_ENABLED_column_rule_color : bool = false ; pub const SERVO_PREF_ENABLED_column_rule_style : bool = false ; pub const SERVO_PREF_ENABLED_column_rule_width : bool = false ; pub const SERVO_PREF_ENABLED_column_span : bool = true ; pub const SERVO_PREF_ENABLED_column_width : bool = false ; pub const SERVO_PREF_ENABLED_columns : bool = false ; pub const SERVO_PREF_ENABLED_contain : bool = true ; pub const SERVO_PREF_ENABLED_content : bool = false ; pub const SERVO_PREF_ENABLED__moz_context_properties : bool = false ; pub const SERVO_PREF_ENABLED__moz_control_character_visibility : bool = false ; pub const SERVO_PREF_ENABLED_counter_increment : bool = false ; pub const SERVO_PREF_ENABLED_counter_reset : bool = false ; pub const SERVO_PREF_ENABLED_cursor : bool = false ; pub const SERVO_PREF_ENABLED_direction : bool = false ; pub const SERVO_PREF_ENABLED_display : bool = false ; pub const SERVO_PREF_ENABLED_dominant_baseline : bool = false ; pub const SERVO_PREF_ENABLED_empty_cells : bool = false ; pub const SERVO_PREF_ENABLED_fill : bool = false ; pub const SERVO_PREF_ENABLED_fill_opacity : bool = false ; pub const SERVO_PREF_ENABLED_fill_rule : bool = false ; pub const SERVO_PREF_ENABLED_filter : bool = false ; pub const SERVO_PREF_ENABLED_flex : bool = false ; pub const SERVO_PREF_ENABLED_flex_basis : bool = false ; pub const SERVO_PREF_ENABLED_flex_direction : bool = false ; pub const SERVO_PREF_ENABLED_flex_flow : bool = false ; pub const SERVO_PREF_ENABLED_flex_grow : bool = false ; pub const SERVO_PREF_ENABLED_flex_shrink : bool = false ; pub const SERVO_PREF_ENABLED_flex_wrap : bool = false ; pub const SERVO_PREF_ENABLED_float_ : bool = false ; pub const SERVO_PREF_ENABLED__moz_float_edge : bool = false ; pub const SERVO_PREF_ENABLED_flood_color : bool = false ; pub const SERVO_PREF_ENABLED_flood_opacity : bool = false ; pub const SERVO_PREF_ENABLED_font : bool = false ; pub const SERVO_PREF_ENABLED_font_family : bool = false ; pub const SERVO_PREF_ENABLED_font_feature_settings : bool = false ; pub const SERVO_PREF_ENABLED_font_kerning : bool = false ; pub const SERVO_PREF_ENABLED_font_language_override : bool = false ; pub const SERVO_PREF_ENABLED_font_size : bool = false ; pub const SERVO_PREF_ENABLED_font_size_adjust : bool = false ; pub const SERVO_PREF_ENABLED__moz_font_smoothing_background_color : bool = false ; pub const SERVO_PREF_ENABLED_font_stretch : bool = false ; pub const SERVO_PREF_ENABLED_font_style : bool = false ; pub const SERVO_PREF_ENABLED_font_synthesis : bool = false ; pub const SERVO_PREF_ENABLED_font_variant : bool = false ; pub const SERVO_PREF_ENABLED_font_variant_alternates : bool = false ; pub const SERVO_PREF_ENABLED_font_variant_caps : bool = false ; pub const SERVO_PREF_ENABLED_font_variant_east_asian : bool = false ; pub const SERVO_PREF_ENABLED_font_variant_ligatures : bool = false ; pub const SERVO_PREF_ENABLED_font_variant_numeric : bool = false ; pub const SERVO_PREF_ENABLED_font_variant_position : bool = false ; pub const SERVO_PREF_ENABLED_font_variation_settings : bool = true ; pub const SERVO_PREF_ENABLED_font_weight : bool = false ; pub const SERVO_PREF_ENABLED__moz_force_broken_image_icon : bool = false ; pub const SERVO_PREF_ENABLED_grid : bool = true ; pub const SERVO_PREF_ENABLED_grid_area : bool = true ; pub const SERVO_PREF_ENABLED_grid_auto_columns : bool = true ; pub const SERVO_PREF_ENABLED_grid_auto_flow : bool = true ; pub const SERVO_PREF_ENABLED_grid_auto_rows : bool = true ; pub const SERVO_PREF_ENABLED_grid_column : bool = true ; pub const SERVO_PREF_ENABLED_grid_column_end : bool = true ; pub const SERVO_PREF_ENABLED_grid_column_gap : bool = true ; pub const SERVO_PREF_ENABLED_grid_column_start : bool = true ; pub const SERVO_PREF_ENABLED_grid_gap : bool = true ; pub const SERVO_PREF_ENABLED_grid_row : bool = true ; pub const SERVO_PREF_ENABLED_grid_row_end : bool = true ; pub const SERVO_PREF_ENABLED_grid_row_gap : bool = true ; pub const SERVO_PREF_ENABLED_grid_row_start : bool = true ; pub const SERVO_PREF_ENABLED_grid_template : bool = true ; pub const SERVO_PREF_ENABLED_grid_template_areas : bool = true ; pub const SERVO_PREF_ENABLED_grid_template_columns : bool = true ; pub const SERVO_PREF_ENABLED_grid_template_rows : bool = true ; pub const SERVO_PREF_ENABLED_height : bool = false ; pub const SERVO_PREF_ENABLED_hyphens : bool = false ; pub const SERVO_PREF_ENABLED_initial_letter : bool = true ; pub const SERVO_PREF_ENABLED_image_orientation : bool = true ; pub const SERVO_PREF_ENABLED__moz_image_region : bool = false ; pub const SERVO_PREF_ENABLED_image_rendering : bool = false ; pub const SERVO_PREF_ENABLED_ime_mode : bool = false ; pub const SERVO_PREF_ENABLED_inline_size : bool = false ; pub const SERVO_PREF_ENABLED_isolation : bool = true ; pub const SERVO_PREF_ENABLED_justify_content : bool = false ; pub const SERVO_PREF_ENABLED_justify_items : bool = false ; pub const SERVO_PREF_ENABLED_justify_self : bool = false ; pub const SERVO_PREF_ENABLED__x_lang : bool = false ; pub const SERVO_PREF_ENABLED_left : bool = false ; pub const SERVO_PREF_ENABLED_letter_spacing : bool = false ; pub const SERVO_PREF_ENABLED_lighting_color : bool = false ; pub const SERVO_PREF_ENABLED_line_height : bool = false ; pub const SERVO_PREF_ENABLED_list_style : bool = false ; pub const SERVO_PREF_ENABLED_list_style_image : bool = false ; pub const SERVO_PREF_ENABLED_list_style_position : bool = false ; pub const SERVO_PREF_ENABLED_list_style_type : bool = false ; pub const SERVO_PREF_ENABLED_margin : bool = false ; pub const SERVO_PREF_ENABLED_margin_block_end : bool = false ; pub const SERVO_PREF_ENABLED_margin_block_start : bool = false ; pub const SERVO_PREF_ENABLED_margin_bottom : bool = false ; pub const SERVO_PREF_ENABLED_margin_inline_end : bool = false ; pub const SERVO_PREF_ENABLED_margin_inline_start : bool = false ; pub const SERVO_PREF_ENABLED_margin_left : bool = false ; pub const SERVO_PREF_ENABLED_margin_right : bool = false ; pub const SERVO_PREF_ENABLED_margin_top : bool = false ; pub const SERVO_PREF_ENABLED_marker : bool = false ; pub const SERVO_PREF_ENABLED_marker_end : bool = false ; pub const SERVO_PREF_ENABLED_marker_mid : bool = false ; pub const SERVO_PREF_ENABLED_marker_start : bool = false ; pub const SERVO_PREF_ENABLED_mask : bool = false ; pub const SERVO_PREF_ENABLED_mask_clip : bool = false ; pub const SERVO_PREF_ENABLED_mask_composite : bool = false ; pub const SERVO_PREF_ENABLED_mask_image : bool = false ; pub const SERVO_PREF_ENABLED_mask_mode : bool = false ; pub const SERVO_PREF_ENABLED_mask_origin : bool = false ; pub const SERVO_PREF_ENABLED_mask_position : bool = false ; pub const SERVO_PREF_ENABLED_mask_position_x : bool = false ; pub const SERVO_PREF_ENABLED_mask_position_y : bool = false ; pub const SERVO_PREF_ENABLED_mask_repeat : bool = false ; pub const SERVO_PREF_ENABLED_mask_size : bool = false ; pub const SERVO_PREF_ENABLED_mask_type : bool = false ; pub const SERVO_PREF_ENABLED__moz_math_display : bool = false ; pub const SERVO_PREF_ENABLED__moz_math_variant : bool = false ; pub const SERVO_PREF_ENABLED_max_block_size : bool = false ; pub const SERVO_PREF_ENABLED_max_height : bool = false ; pub const SERVO_PREF_ENABLED_max_inline_size : bool = false ; pub const SERVO_PREF_ENABLED_max_width : bool = false ; pub const SERVO_PREF_ENABLED_min_block_size : bool = false ; pub const SERVO_PREF_ENABLED__moz_min_font_size_ratio : bool = false ; pub const SERVO_PREF_ENABLED_min_height : bool = false ; pub const SERVO_PREF_ENABLED_min_inline_size : bool = false ; pub const SERVO_PREF_ENABLED_min_width : bool = false ; pub const SERVO_PREF_ENABLED_mix_blend_mode : bool = true ; pub const SERVO_PREF_ENABLED_object_fit : bool = false ; pub const SERVO_PREF_ENABLED_object_position : bool = false ; pub const SERVO_PREF_ENABLED_offset_block_end : bool = false ; pub const SERVO_PREF_ENABLED_offset_block_start : bool = false ; pub const SERVO_PREF_ENABLED_offset_inline_end : bool = false ; pub const SERVO_PREF_ENABLED_offset_inline_start : bool = false ; pub const SERVO_PREF_ENABLED_opacity : bool = false ; pub const SERVO_PREF_ENABLED_order : bool = false ; pub const SERVO_PREF_ENABLED__moz_orient : bool = false ; pub const SERVO_PREF_ENABLED__moz_osx_font_smoothing : bool = true ; pub const SERVO_PREF_ENABLED_outline : bool = false ; pub const SERVO_PREF_ENABLED_outline_color : bool = false ; pub const SERVO_PREF_ENABLED_outline_offset : bool = false ; pub const SERVO_PREF_ENABLED__moz_outline_radius : bool = false ; pub const SERVO_PREF_ENABLED__moz_outline_radius_bottomleft : bool = false ; pub const SERVO_PREF_ENABLED__moz_outline_radius_bottomright : bool = false ; pub const SERVO_PREF_ENABLED__moz_outline_radius_topleft : bool = false ; pub const SERVO_PREF_ENABLED__moz_outline_radius_topright : bool = false ; pub const SERVO_PREF_ENABLED_outline_style : bool = false ; pub const SERVO_PREF_ENABLED_outline_width : bool = false ; pub const SERVO_PREF_ENABLED_overflow : bool = false ; pub const SERVO_PREF_ENABLED_overflow_clip_box : bool = true ; pub const SERVO_PREF_ENABLED_overflow_x : bool = false ; pub const SERVO_PREF_ENABLED_overflow_y : bool = false ; pub const SERVO_PREF_ENABLED_padding : bool = false ; pub const SERVO_PREF_ENABLED_padding_block_end : bool = false ; pub const SERVO_PREF_ENABLED_padding_block_start : bool = false ; pub const SERVO_PREF_ENABLED_padding_bottom : bool = false ; pub const SERVO_PREF_ENABLED_padding_inline_end : bool = false ; pub const SERVO_PREF_ENABLED_padding_inline_start : bool = false ; pub const SERVO_PREF_ENABLED_padding_left : bool = false ; pub const SERVO_PREF_ENABLED_padding_right : bool = false ; pub const SERVO_PREF_ENABLED_padding_top : bool = false ; pub const SERVO_PREF_ENABLED_page_break_after : bool = false ; pub const SERVO_PREF_ENABLED_page_break_before : bool = false ; pub const SERVO_PREF_ENABLED_page_break_inside : bool = false ; pub const SERVO_PREF_ENABLED_paint_order : bool = true ; pub const SERVO_PREF_ENABLED_perspective : bool = false ; pub const SERVO_PREF_ENABLED_perspective_origin : bool = false ; pub const SERVO_PREF_ENABLED_place_content : bool = false ; pub const SERVO_PREF_ENABLED_place_items : bool = false ; pub const SERVO_PREF_ENABLED_place_self : bool = false ; pub const SERVO_PREF_ENABLED_pointer_events : bool = false ; pub const SERVO_PREF_ENABLED_position : bool = false ; pub const SERVO_PREF_ENABLED_quotes : bool = false ; pub const SERVO_PREF_ENABLED_resize : bool = false ; pub const SERVO_PREF_ENABLED_right : bool = false ; pub const SERVO_PREF_ENABLED_ruby_align : bool = false ; pub const SERVO_PREF_ENABLED_ruby_position : bool = false ; pub const SERVO_PREF_ENABLED__moz_script_level : bool = false ; pub const SERVO_PREF_ENABLED__moz_script_min_size : bool = false ; pub const SERVO_PREF_ENABLED__moz_script_size_multiplier : bool = false ; pub const SERVO_PREF_ENABLED_scroll_behavior : bool = true ; pub const SERVO_PREF_ENABLED_overscroll_behavior : bool = true ; pub const SERVO_PREF_ENABLED_overscroll_behavior_x : bool = true ; pub const SERVO_PREF_ENABLED_overscroll_behavior_y : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_coordinate : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_destination : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_points_x : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_points_y : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_type : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_type_x : bool = true ; pub const SERVO_PREF_ENABLED_scroll_snap_type_y : bool = true ; pub const SERVO_PREF_ENABLED_shape_image_threshold : bool = true ; pub const SERVO_PREF_ENABLED_shape_outside : bool = true ; pub const SERVO_PREF_ENABLED_shape_rendering : bool = false ; pub const SERVO_PREF_ENABLED__x_span : bool = false ; pub const SERVO_PREF_ENABLED__moz_stack_sizing : bool = false ; pub const SERVO_PREF_ENABLED_stop_color : bool = false ; pub const SERVO_PREF_ENABLED_stop_opacity : bool = false ; pub const SERVO_PREF_ENABLED_stroke : bool = false ; pub const SERVO_PREF_ENABLED_stroke_dasharray : bool = false ; pub const SERVO_PREF_ENABLED_stroke_dashoffset : bool = false ; pub const SERVO_PREF_ENABLED_stroke_linecap : bool = false ; pub const SERVO_PREF_ENABLED_stroke_linejoin : bool = false ; pub const SERVO_PREF_ENABLED_stroke_miterlimit : bool = false ; pub const SERVO_PREF_ENABLED_stroke_opacity : bool = false ; pub const SERVO_PREF_ENABLED_stroke_width : bool = false ; pub const SERVO_PREF_ENABLED__x_system_font : bool = false ; pub const SERVO_PREF_ENABLED__moz_tab_size : bool = false ; pub const SERVO_PREF_ENABLED_table_layout : bool = false ; pub const SERVO_PREF_ENABLED_text_align : bool = false ; pub const SERVO_PREF_ENABLED_text_align_last : bool = false ; pub const SERVO_PREF_ENABLED_text_anchor : bool = false ; pub const SERVO_PREF_ENABLED_text_combine_upright : bool = true ; pub const SERVO_PREF_ENABLED_text_decoration : bool = false ; pub const SERVO_PREF_ENABLED_text_decoration_color : bool = false ; pub const SERVO_PREF_ENABLED_text_decoration_line : bool = false ; pub const SERVO_PREF_ENABLED_text_decoration_style : bool = false ; pub const SERVO_PREF_ENABLED_text_emphasis : bool = false ; pub const SERVO_PREF_ENABLED_text_emphasis_color : bool = false ; pub const SERVO_PREF_ENABLED_text_emphasis_position : bool = false ; pub const SERVO_PREF_ENABLED_text_emphasis_style : bool = false ; pub const SERVO_PREF_ENABLED__webkit_text_fill_color : bool = true ; pub const SERVO_PREF_ENABLED_text_indent : bool = false ; pub const SERVO_PREF_ENABLED_text_justify : bool = true ; pub const SERVO_PREF_ENABLED_text_orientation : bool = false ; pub const SERVO_PREF_ENABLED_text_overflow : bool = false ; pub const SERVO_PREF_ENABLED_text_rendering : bool = false ; pub const SERVO_PREF_ENABLED_text_shadow : bool = false ; pub const SERVO_PREF_ENABLED__moz_text_size_adjust : bool = false ; pub const SERVO_PREF_ENABLED__webkit_text_stroke : bool = true ; pub const SERVO_PREF_ENABLED__webkit_text_stroke_color : bool = true ; pub const SERVO_PREF_ENABLED__webkit_text_stroke_width : bool = true ; pub const SERVO_PREF_ENABLED_text_transform : bool = false ; pub const SERVO_PREF_ENABLED__x_text_zoom : bool = false ; pub const SERVO_PREF_ENABLED_top : bool = false ; pub const SERVO_PREF_ENABLED__moz_top_layer : bool = false ; pub const SERVO_PREF_ENABLED_touch_action : bool = true ; pub const SERVO_PREF_ENABLED_transform : bool = false ; pub const SERVO_PREF_ENABLED__moz_transform : bool = true ; pub const SERVO_PREF_ENABLED_transform_box : bool = true ; pub const SERVO_PREF_ENABLED_transform_origin : bool = false ; pub const SERVO_PREF_ENABLED_transform_style : bool = false ; pub const SERVO_PREF_ENABLED_transition : bool = false ; pub const SERVO_PREF_ENABLED_transition_delay : bool = false ; pub const SERVO_PREF_ENABLED_transition_duration : bool = false ; pub const SERVO_PREF_ENABLED_transition_property : bool = false ; pub const SERVO_PREF_ENABLED_transition_timing_function : bool = false ; pub const SERVO_PREF_ENABLED_unicode_bidi : bool = false ; pub const SERVO_PREF_ENABLED__moz_user_focus : bool = false ; pub const SERVO_PREF_ENABLED__moz_user_input : bool = false ; pub const SERVO_PREF_ENABLED__moz_user_modify : bool = false ; pub const SERVO_PREF_ENABLED__moz_user_select : bool = false ; pub const SERVO_PREF_ENABLED_vector_effect : bool = false ; pub const SERVO_PREF_ENABLED_vertical_align : bool = false ; pub const SERVO_PREF_ENABLED_visibility : bool = false ; pub const SERVO_PREF_ENABLED_white_space : bool = false ; pub const SERVO_PREF_ENABLED_width : bool = false ; pub const SERVO_PREF_ENABLED_will_change : bool = false ; pub const SERVO_PREF_ENABLED__moz_window_dragging : bool = false ; pub const SERVO_PREF_ENABLED__moz_window_shadow : bool = false ; pub const SERVO_PREF_ENABLED__moz_window_opacity : bool = false ; pub const SERVO_PREF_ENABLED__moz_window_transform : bool = false ; pub const SERVO_PREF_ENABLED__moz_window_transform_origin : bool = false ; pub const SERVO_PREF_ENABLED_word_break : bool = false ; pub const SERVO_PREF_ENABLED_word_spacing : bool = false ; pub const SERVO_PREF_ENABLED_overflow_wrap : bool = false ; pub const SERVO_PREF_ENABLED_writing_mode : bool = false ; pub const SERVO_PREF_ENABLED_z_index : bool = false ; pub const SERVO_PREF_ENABLED_word_wrap : bool = false ; pub const SERVO_PREF_ENABLED__moz_transform_origin : bool = true ; pub const SERVO_PREF_ENABLED__moz_perspective_origin : bool = true ; pub const SERVO_PREF_ENABLED__moz_perspective : bool = true ; pub const SERVO_PREF_ENABLED__moz_transform_style : bool = true ; pub const SERVO_PREF_ENABLED__moz_backface_visibility : bool = true ; pub const SERVO_PREF_ENABLED__moz_border_image : bool = true ; pub const SERVO_PREF_ENABLED__moz_transition : bool = true ; pub const SERVO_PREF_ENABLED__moz_transition_delay : bool = true ; pub const SERVO_PREF_ENABLED__moz_transition_duration : bool = true ; pub const SERVO_PREF_ENABLED__moz_transition_property : bool = true ; pub const SERVO_PREF_ENABLED__moz_transition_timing_function : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_delay : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_direction : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_duration : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_fill_mode : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_iteration_count : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_name : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_play_state : bool = true ; pub const SERVO_PREF_ENABLED__moz_animation_timing_function : bool = true ; pub const SERVO_PREF_ENABLED__moz_box_sizing : bool = true ; pub const SERVO_PREF_ENABLED__moz_font_feature_settings : bool = true ; pub const SERVO_PREF_ENABLED__moz_font_language_override : bool = true ; pub const SERVO_PREF_ENABLED__moz_padding_end : bool = false ; pub const SERVO_PREF_ENABLED__moz_padding_start : bool = false ; pub const SERVO_PREF_ENABLED__moz_margin_end : bool = false ; pub const SERVO_PREF_ENABLED__moz_margin_start : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_end : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_end_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_end_style : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_end_width : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_start : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_start_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_start_style : bool = false ; pub const SERVO_PREF_ENABLED__moz_border_start_width : bool = false ; pub const SERVO_PREF_ENABLED__moz_hyphens : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_count : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_fill : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_gap : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_rule : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_rule_color : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_rule_style : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_rule_width : bool = false ; pub const SERVO_PREF_ENABLED__moz_column_width : bool = false ; pub const SERVO_PREF_ENABLED__moz_columns : bool = false ; pub const SERVO_PREF_ENABLED__webkit_animation : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_delay : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_direction : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_duration : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_fill_mode : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_iteration_count : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_name : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_play_state : bool = true ; pub const SERVO_PREF_ENABLED__webkit_animation_timing_function : bool = true ; pub const SERVO_PREF_ENABLED__webkit_filter : bool = true ; pub const SERVO_PREF_ENABLED__webkit_text_size_adjust : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transform : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transform_origin : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transform_style : bool = true ; pub const SERVO_PREF_ENABLED__webkit_backface_visibility : bool = true ; pub const SERVO_PREF_ENABLED__webkit_perspective : bool = true ; pub const SERVO_PREF_ENABLED__webkit_perspective_origin : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transition : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transition_delay : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transition_duration : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transition_property : bool = true ; pub const SERVO_PREF_ENABLED__webkit_transition_timing_function : bool = true ; pub const SERVO_PREF_ENABLED__webkit_border_radius : bool = true ; pub const SERVO_PREF_ENABLED__webkit_border_top_left_radius : bool = true ; pub const SERVO_PREF_ENABLED__webkit_border_top_right_radius : bool = true ; pub const SERVO_PREF_ENABLED__webkit_border_bottom_left_radius : bool = true ; pub const SERVO_PREF_ENABLED__webkit_border_bottom_right_radius : bool = true ; pub const SERVO_PREF_ENABLED__webkit_background_clip : bool = true ; pub const SERVO_PREF_ENABLED__webkit_background_origin : bool = true ; pub const SERVO_PREF_ENABLED__webkit_background_size : bool = true ; pub const SERVO_PREF_ENABLED__webkit_border_image : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_shadow : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_sizing : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_flex : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_ordinal_group : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_orient : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_direction : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_align : bool = true ; pub const SERVO_PREF_ENABLED__webkit_box_pack : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex_direction : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex_wrap : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex_flow : bool = true ; pub const SERVO_PREF_ENABLED__webkit_order : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex_grow : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex_shrink : bool = true ; pub const SERVO_PREF_ENABLED__webkit_flex_basis : bool = true ; pub const SERVO_PREF_ENABLED__webkit_justify_content : bool = true ; pub const SERVO_PREF_ENABLED__webkit_align_items : bool = true ; pub const SERVO_PREF_ENABLED__webkit_align_self : bool = true ; pub const SERVO_PREF_ENABLED__webkit_align_content : bool = true ; pub const SERVO_PREF_ENABLED__webkit_user_select : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_clip : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_composite : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_image : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_origin : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_position : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_position_x : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_position_y : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_repeat : bool = true ; pub const SERVO_PREF_ENABLED__webkit_mask_size : bool = true ; 
  /// Utility class to handle animated style values 
  # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct StyleAnimationValue { pub _bindgen_opaque_blob : [ u64 ; 2usize ] , } pub const StyleAnimationValue_Unit_eUnit_Null : root :: mozilla :: StyleAnimationValue_Unit = 0 ; pub const StyleAnimationValue_Unit_eUnit_Normal : root :: mozilla :: StyleAnimationValue_Unit = 1 ; pub const StyleAnimationValue_Unit_eUnit_Auto : root :: mozilla :: StyleAnimationValue_Unit = 2 ; pub const StyleAnimationValue_Unit_eUnit_None : root :: mozilla :: StyleAnimationValue_Unit = 3 ; pub const StyleAnimationValue_Unit_eUnit_Enumerated : root :: mozilla :: StyleAnimationValue_Unit = 4 ; pub const StyleAnimationValue_Unit_eUnit_Visibility : root :: mozilla :: StyleAnimationValue_Unit = 5 ; pub const StyleAnimationValue_Unit_eUnit_Integer : root :: mozilla :: StyleAnimationValue_Unit = 6 ; pub const StyleAnimationValue_Unit_eUnit_Coord : root :: mozilla :: StyleAnimationValue_Unit = 7 ; pub const StyleAnimationValue_Unit_eUnit_Percent : root :: mozilla :: StyleAnimationValue_Unit = 8 ; pub const StyleAnimationValue_Unit_eUnit_Float : root :: mozilla :: StyleAnimationValue_Unit = 9 ; pub const StyleAnimationValue_Unit_eUnit_Color : root :: mozilla :: StyleAnimationValue_Unit = 10 ; pub const StyleAnimationValue_Unit_eUnit_CurrentColor : root :: mozilla :: StyleAnimationValue_Unit = 11 ; pub const StyleAnimationValue_Unit_eUnit_ComplexColor : root :: mozilla :: StyleAnimationValue_Unit = 12 ; pub const StyleAnimationValue_Unit_eUnit_Calc : root :: mozilla :: StyleAnimationValue_Unit = 13 ; pub const StyleAnimationValue_Unit_eUnit_ObjectPosition : root :: mozilla :: StyleAnimationValue_Unit = 14 ; pub const StyleAnimationValue_Unit_eUnit_URL : root :: mozilla :: StyleAnimationValue_Unit = 15 ; pub const StyleAnimationValue_Unit_eUnit_DiscreteCSSValue : root :: mozilla :: StyleAnimationValue_Unit = 16 ; pub const StyleAnimationValue_Unit_eUnit_CSSValuePair : root :: mozilla :: StyleAnimationValue_Unit = 17 ; pub const StyleAnimationValue_Unit_eUnit_CSSValueTriplet : root :: mozilla :: StyleAnimationValue_Unit = 18 ; pub const StyleAnimationValue_Unit_eUnit_CSSRect : root :: mozilla :: StyleAnimationValue_Unit = 19 ; pub const StyleAnimationValue_Unit_eUnit_Dasharray : root :: mozilla :: StyleAnimationValue_Unit = 20 ; pub const StyleAnimationValue_Unit_eUnit_Shadow : root :: mozilla :: StyleAnimationValue_Unit = 21 ; pub const StyleAnimationValue_Unit_eUnit_Shape : root :: mozilla :: StyleAnimationValue_Unit = 22 ; pub const StyleAnimationValue_Unit_eUnit_Filter : root :: mozilla :: StyleAnimationValue_Unit = 23 ; pub const StyleAnimationValue_Unit_eUnit_Transform : root :: mozilla :: StyleAnimationValue_Unit = 24 ; pub const StyleAnimationValue_Unit_eUnit_BackgroundPositionCoord : root :: mozilla :: StyleAnimationValue_Unit = 25 ; pub const StyleAnimationValue_Unit_eUnit_CSSValuePairList : root :: mozilla :: StyleAnimationValue_Unit = 26 ; pub const StyleAnimationValue_Unit_eUnit_UnparsedString : root :: mozilla :: StyleAnimationValue_Unit = 27 ; pub type StyleAnimationValue_Unit = :: std :: os :: raw :: c_uint ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct StyleAnimationValue__bindgen_ty_1 { pub mInt : root :: __BindgenUnionField < i32 > , pub mCoord : root :: __BindgenUnionField < root :: nscoord > , pub mFloat : root :: __BindgenUnionField < f32 > , pub mCSSValue : root :: __BindgenUnionField < * mut root :: nsCSSValue > , pub mCSSValuePair : root :: __BindgenUnionField < * mut root :: nsCSSValuePair > , pub mCSSValueTriplet : root :: __BindgenUnionField < * mut root :: nsCSSValueTriplet > , pub mCSSRect : root :: __BindgenUnionField < * mut root :: nsCSSRect > , pub mCSSValueArray : root :: __BindgenUnionField < * mut root :: nsCSSValue_Array > , pub mCSSValueList : root :: __BindgenUnionField < * mut root :: nsCSSValueList > , pub mCSSValueSharedList : root :: __BindgenUnionField < * mut root :: nsCSSValueSharedList > , pub mCSSValuePairList : root :: __BindgenUnionField < * mut root :: nsCSSValuePairList > , pub mString : root :: __BindgenUnionField < * mut root :: nsStringBuffer > , pub mComplexColor : root :: __BindgenUnionField < * mut root :: mozilla :: css :: ComplexColorValue > , pub bindgen_union_field : u64 , } # [ test ] fn bindgen_test_layout_StyleAnimationValue__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleAnimationValue__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleAnimationValue__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mInt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mInt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mCoord as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mCoord ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mFloat as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mFloat ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mCSSValue as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mCSSValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mCSSValuePair as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mCSSValuePair ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mCSSValueTriplet as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mCSSValueTriplet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mCSSRect as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mCSSRect ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mCSSValueArray as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mCSSValueArray ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mCSSValueList as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mCSSValueList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mCSSValueSharedList as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mCSSValueSharedList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mCSSValuePairList as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mCSSValuePairList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mString as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleAnimationValue__bindgen_ty_1 ) ) . mComplexColor as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( StyleAnimationValue__bindgen_ty_1 ) , "::" , stringify ! ( mComplexColor ) ) ) ; } impl Clone for StyleAnimationValue__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } pub const StyleAnimationValue_IntegerConstructorType_IntegerConstructor : root :: mozilla :: StyleAnimationValue_IntegerConstructorType = 0 ; pub type StyleAnimationValue_IntegerConstructorType = :: std :: os :: raw :: c_uint ; pub const StyleAnimationValue_CoordConstructorType_CoordConstructor : root :: mozilla :: StyleAnimationValue_CoordConstructorType = 0 ; pub type StyleAnimationValue_CoordConstructorType = :: std :: os :: raw :: c_uint ; pub const StyleAnimationValue_PercentConstructorType_PercentConstructor : root :: mozilla :: StyleAnimationValue_PercentConstructorType = 0 ; pub type StyleAnimationValue_PercentConstructorType = :: std :: os :: raw :: c_uint ; pub const StyleAnimationValue_FloatConstructorType_FloatConstructor : root :: mozilla :: StyleAnimationValue_FloatConstructorType = 0 ; pub type StyleAnimationValue_FloatConstructorType = :: std :: os :: raw :: c_uint ; pub const StyleAnimationValue_ColorConstructorType_ColorConstructor : root :: mozilla :: StyleAnimationValue_ColorConstructorType = 0 ; pub type StyleAnimationValue_ColorConstructorType = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_StyleAnimationValue ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleAnimationValue > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( StyleAnimationValue ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleAnimationValue > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleAnimationValue ) ) ) ; } impl Clone for StyleAnimationValue { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct AnimationValue { pub mGecko : root :: mozilla :: StyleAnimationValue , pub mServo : root :: RefPtr < root :: RawServoAnimationValue > , } # [ test ] fn bindgen_test_layout_AnimationValue ( ) { assert_eq ! ( :: std :: mem :: size_of :: < AnimationValue > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( AnimationValue ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < AnimationValue > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( AnimationValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnimationValue ) ) . mGecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( AnimationValue ) , "::" , stringify ! ( mGecko ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnimationValue ) ) . mServo as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( AnimationValue ) , "::" , stringify ! ( mServo ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct PropertyStyleAnimationValuePair { pub mProperty : root :: nsCSSPropertyID , pub mValue : root :: mozilla :: AnimationValue , } # [ test ] fn bindgen_test_layout_PropertyStyleAnimationValuePair ( ) { assert_eq ! ( :: std :: mem :: size_of :: < PropertyStyleAnimationValuePair > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( PropertyStyleAnimationValuePair ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < PropertyStyleAnimationValuePair > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( PropertyStyleAnimationValuePair ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const PropertyStyleAnimationValuePair ) ) . mProperty as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( PropertyStyleAnimationValuePair ) , "::" , stringify ! ( mProperty ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const PropertyStyleAnimationValuePair ) ) . mValue as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( PropertyStyleAnimationValuePair ) , "::" , stringify ! ( mValue ) ) ) ; } # [ repr ( C ) ] pub struct StyleSheetInfo__bindgen_vtable ( :: std :: os :: raw :: c_void ) ; 
  /// Struct for data common to CSSStyleSheetInner and ServoStyleSheet. 
  # [ repr ( C ) ] pub struct StyleSheetInfo { pub vtable_ : * const StyleSheetInfo__bindgen_vtable , pub mSheetURI : root :: nsCOMPtr , pub mOriginalSheetURI : root :: nsCOMPtr , pub mBaseURI : root :: nsCOMPtr , pub mPrincipal : root :: nsCOMPtr , pub mCORSMode : root :: mozilla :: CORSMode , pub mReferrerPolicy : root :: mozilla :: StyleSheetInfo_ReferrerPolicy , pub mIntegrity : root :: mozilla :: dom :: SRIMetadata , pub mComplete : bool , pub mFirstChild : root :: RefPtr < root :: mozilla :: StyleSheet > , pub mSheets : [ u64 ; 10usize ] , pub mSourceMapURL : ::nsstring::nsStringRepr , pub mSourceMapURLFromComment : ::nsstring::nsStringRepr , pub mSourceURL : ::nsstring::nsStringRepr , } pub use self :: super :: super :: root :: mozilla :: net :: ReferrerPolicy as StyleSheetInfo_ReferrerPolicy ; # [ test ] fn bindgen_test_layout_StyleSheetInfo ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StyleSheetInfo > ( ) , 240usize , concat ! ( "Size of: " , stringify ! ( StyleSheetInfo ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StyleSheetInfo > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleSheetInfo ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mSheetURI as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mSheetURI ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mOriginalSheetURI as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mOriginalSheetURI ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mBaseURI as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mBaseURI ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mPrincipal as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mPrincipal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mCORSMode as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mCORSMode ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mReferrerPolicy as * const _ as usize } , 44usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mReferrerPolicy ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mIntegrity as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mIntegrity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mComplete as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mComplete ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mFirstChild as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mFirstChild ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mSheets as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mSheets ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mSourceMapURL as * const _ as usize } , 192usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mSourceMapURL ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mSourceMapURLFromComment as * const _ as usize } , 208usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mSourceMapURLFromComment ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const StyleSheetInfo ) ) . mSourceURL as * const _ as usize } , 224usize , concat ! ( "Alignment of field: " , stringify ! ( StyleSheetInfo ) , "::" , stringify ! ( mSourceURL ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ServoCSSRuleList { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] pub struct ServoStyleSheetInner { pub _base : root :: mozilla :: StyleSheetInfo , pub mContents : root :: RefPtr < root :: RawServoStyleSheetContents > , pub mURLData : root :: RefPtr < root :: mozilla :: URLExtraData > , } # [ test ] fn bindgen_test_layout_ServoStyleSheetInner ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ServoStyleSheetInner > ( ) , 256usize , concat ! ( "Size of: " , stringify ! ( ServoStyleSheetInner ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ServoStyleSheetInner > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ServoStyleSheetInner ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSheetInner ) ) . mContents as * const _ as usize } , 240usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSheetInner ) , "::" , stringify ! ( mContents ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSheetInner ) ) . mURLData as * const _ as usize } , 248usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSheetInner ) , "::" , stringify ! ( mURLData ) ) ) ; } # [ repr ( C ) ] pub struct ServoStyleSheet { pub _base : root :: mozilla :: StyleSheet , pub mRuleList : root :: RefPtr < root :: mozilla :: ServoCSSRuleList > , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct ServoStyleSheet_cycleCollection { pub _base : root :: mozilla :: StyleSheet_cycleCollection , } # [ test ] fn bindgen_test_layout_ServoStyleSheet_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ServoStyleSheet_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( ServoStyleSheet_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ServoStyleSheet_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ServoStyleSheet_cycleCollection ) ) ) ; } impl Clone for ServoStyleSheet_cycleCollection { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ServoStyleSheet_COMTypeInfo { pub _address : u8 , } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla15ServoStyleSheet21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla15ServoStyleSheet21_cycleCollectorGlobalE" ] 
  pub static mut  ServoStyleSheet__cycleCollectorGlobal  :  root :: mozilla :: ServoStyleSheet_cycleCollection ;
 } # [ test ] fn bindgen_test_layout_ServoStyleSheet ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ServoStyleSheet > ( ) , 144usize , concat ! ( "Size of: " , stringify ! ( ServoStyleSheet ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ServoStyleSheet > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ServoStyleSheet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSheet ) ) . mRuleList as * const _ as usize } , 136usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSheet ) , "::" , stringify ! ( mRuleList ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct URIPrincipalReferrerPolicyAndCORSModeHashKey { pub _base : root :: nsURIHashKey , pub mPrincipal : root :: nsCOMPtr , pub mCORSMode : root :: mozilla :: CORSMode , pub mReferrerPolicy : root :: mozilla :: URIPrincipalReferrerPolicyAndCORSModeHashKey_ReferrerPolicy , } pub type URIPrincipalReferrerPolicyAndCORSModeHashKey_KeyType = * mut root :: mozilla :: URIPrincipalReferrerPolicyAndCORSModeHashKey ; pub type URIPrincipalReferrerPolicyAndCORSModeHashKey_KeyTypePointer = * const root :: mozilla :: URIPrincipalReferrerPolicyAndCORSModeHashKey ; pub use self :: super :: super :: root :: mozilla :: net :: ReferrerPolicy as URIPrincipalReferrerPolicyAndCORSModeHashKey_ReferrerPolicy ; pub const URIPrincipalReferrerPolicyAndCORSModeHashKey_ALLOW_MEMMOVE : root :: mozilla :: URIPrincipalReferrerPolicyAndCORSModeHashKey__bindgen_ty_1 = 1 ; pub type URIPrincipalReferrerPolicyAndCORSModeHashKey__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_URIPrincipalReferrerPolicyAndCORSModeHashKey ( ) { assert_eq ! ( :: std :: mem :: size_of :: < URIPrincipalReferrerPolicyAndCORSModeHashKey > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( URIPrincipalReferrerPolicyAndCORSModeHashKey ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < URIPrincipalReferrerPolicyAndCORSModeHashKey > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( URIPrincipalReferrerPolicyAndCORSModeHashKey ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URIPrincipalReferrerPolicyAndCORSModeHashKey ) ) . mPrincipal as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( URIPrincipalReferrerPolicyAndCORSModeHashKey ) , "::" , stringify ! ( mPrincipal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URIPrincipalReferrerPolicyAndCORSModeHashKey ) ) . mCORSMode as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( URIPrincipalReferrerPolicyAndCORSModeHashKey ) , "::" , stringify ! ( mCORSMode ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const URIPrincipalReferrerPolicyAndCORSModeHashKey ) ) . mReferrerPolicy as * const _ as usize } , 28usize , concat ! ( "Alignment of field: " , stringify ! ( URIPrincipalReferrerPolicyAndCORSModeHashKey ) , "::" , stringify ! ( mReferrerPolicy ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct ComputedTimingFunction { pub mType : root :: nsTimingFunction_Type , pub mTimingFunction : root :: nsSMILKeySpline , pub mStepsOrFrames : u32 , } pub const ComputedTimingFunction_BeforeFlag_Unset : root :: mozilla :: ComputedTimingFunction_BeforeFlag = 0 ; pub const ComputedTimingFunction_BeforeFlag_Set : root :: mozilla :: ComputedTimingFunction_BeforeFlag = 1 ; pub type ComputedTimingFunction_BeforeFlag = :: std :: os :: raw :: c_int ; # [ test ] fn bindgen_test_layout_ComputedTimingFunction ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ComputedTimingFunction > ( ) , 136usize , concat ! ( "Size of: " , stringify ! ( ComputedTimingFunction ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ComputedTimingFunction > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ComputedTimingFunction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ComputedTimingFunction ) ) . mType as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( ComputedTimingFunction ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ComputedTimingFunction ) ) . mTimingFunction as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( ComputedTimingFunction ) , "::" , stringify ! ( mTimingFunction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ComputedTimingFunction ) ) . mStepsOrFrames as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( ComputedTimingFunction ) , "::" , stringify ! ( mStepsOrFrames ) ) ) ; } impl Clone for ComputedTimingFunction { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct AnimationPropertySegment { pub mFromKey : f32 , pub mToKey : f32 , pub mFromValue : root :: mozilla :: AnimationValue , pub mToValue : root :: mozilla :: AnimationValue , pub mTimingFunction : [ u64 ; 18usize ] , pub mFromComposite : root :: mozilla :: dom :: CompositeOperation , pub mToComposite : root :: mozilla :: dom :: CompositeOperation , } # [ test ] fn bindgen_test_layout_AnimationPropertySegment ( ) { assert_eq ! ( :: std :: mem :: size_of :: < AnimationPropertySegment > ( ) , 208usize , concat ! ( "Size of: " , stringify ! ( AnimationPropertySegment ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < AnimationPropertySegment > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( AnimationPropertySegment ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnimationPropertySegment ) ) . mFromKey as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( AnimationPropertySegment ) , "::" , stringify ! ( mFromKey ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnimationPropertySegment ) ) . mToKey as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( AnimationPropertySegment ) , "::" , stringify ! ( mToKey ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnimationPropertySegment ) ) . mFromValue as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( AnimationPropertySegment ) , "::" , stringify ! ( mFromValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnimationPropertySegment ) ) . mToValue as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( AnimationPropertySegment ) , "::" , stringify ! ( mToValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnimationPropertySegment ) ) . mTimingFunction as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( AnimationPropertySegment ) , "::" , stringify ! ( mTimingFunction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnimationPropertySegment ) ) . mFromComposite as * const _ as usize } , 200usize , concat ! ( "Alignment of field: " , stringify ! ( AnimationPropertySegment ) , "::" , stringify ! ( mFromComposite ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const AnimationPropertySegment ) ) . mToComposite as * const _ as usize } , 201usize , concat ! ( "Alignment of field: " , stringify ! ( AnimationPropertySegment ) , "::" , stringify ! ( mToComposite ) ) ) ; } 
  /// A ValueCalculator class that performs additional checks before performing
@@ -384,39 +387,39 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
         /// This means the attributes, and the element state, such as :hover, :active,
         /// etc... 
  # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct ServoElementSnapshot { pub mAttrs : root :: nsTArray < root :: mozilla :: ServoAttrSnapshot > , pub mClass : root :: nsAttrValue , pub mState : root :: mozilla :: ServoElementSnapshot_ServoStateType , pub mContains : root :: mozilla :: ServoElementSnapshot_Flags , pub _bitfield_1 : u8 , pub __bindgen_padding_0 : [ u16 ; 3usize ] , } pub type ServoElementSnapshot_BorrowedAttrInfo = root :: mozilla :: dom :: BorrowedAttrInfo ; pub type ServoElementSnapshot_Element = root :: mozilla :: dom :: Element ; pub type ServoElementSnapshot_ServoStateType = root :: mozilla :: EventStates_ServoType ; pub use self :: super :: super :: root :: mozilla :: ServoElementSnapshotFlags as ServoElementSnapshot_Flags ; # [ test ] fn bindgen_test_layout_ServoElementSnapshot ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ServoElementSnapshot > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( ServoElementSnapshot ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ServoElementSnapshot > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ServoElementSnapshot ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoElementSnapshot ) ) . mAttrs as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( ServoElementSnapshot ) , "::" , stringify ! ( mAttrs ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoElementSnapshot ) ) . mClass as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( ServoElementSnapshot ) , "::" , stringify ! ( mClass ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoElementSnapshot ) ) . mState as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( ServoElementSnapshot ) , "::" , stringify ! ( mState ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoElementSnapshot ) ) . mContains as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( ServoElementSnapshot ) , "::" , stringify ! ( mContains ) ) ) ; } impl ServoElementSnapshot { # [ inline ] pub fn mIsHTMLElementInHTMLDocument ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x1 as u8 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsHTMLElementInHTMLDocument ( & mut self , val : bool ) { let mask = 0x1 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mIsInChromeDocument ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x2 as u8 ; let val = ( unit_field_val & mask ) >> 1usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsInChromeDocument ( & mut self , val : bool ) { let mask = 0x2 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 1usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mSupportsLangAttr ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x4 as u8 ; let val = ( unit_field_val & mask ) >> 2usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mSupportsLangAttr ( & mut self , val : bool ) { let mask = 0x4 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 2usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mIsTableBorderNonzero ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x8 as u8 ; let val = ( unit_field_val & mask ) >> 3usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsTableBorderNonzero ( & mut self , val : bool ) { let mask = 0x8 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 3usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mIsMozBrowserFrame ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x10 as u8 ; let val = ( unit_field_val & mask ) >> 4usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsMozBrowserFrame ( & mut self , val : bool ) { let mask = 0x10 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 4usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mClassAttributeChanged ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x20 as u8 ; let val = ( unit_field_val & mask ) >> 5usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mClassAttributeChanged ( & mut self , val : bool ) { let mask = 0x20 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 5usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mIdAttributeChanged ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x40 as u8 ; let val = ( unit_field_val & mask ) >> 6usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIdAttributeChanged ( & mut self , val : bool ) { let mask = 0x40 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 6usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mOtherAttributeChanged ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x80 as u8 ; let val = ( unit_field_val & mask ) >> 7usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mOtherAttributeChanged ( & mut self , val : bool ) { let mask = 0x80 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 7usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mIsHTMLElementInHTMLDocument : bool , mIsInChromeDocument : bool , mSupportsLangAttr : bool , mIsTableBorderNonzero : bool , mIsMozBrowserFrame : bool , mClassAttributeChanged : bool , mIdAttributeChanged : bool , mOtherAttributeChanged : bool ) -> u8 { ( ( ( ( ( ( ( ( 0 | ( ( mIsHTMLElementInHTMLDocument as u8 as u8 ) << 0usize ) & ( 0x1 as u8 ) ) | ( ( mIsInChromeDocument as u8 as u8 ) << 1usize ) & ( 0x2 as u8 ) ) | ( ( mSupportsLangAttr as u8 as u8 ) << 2usize ) & ( 0x4 as u8 ) ) | ( ( mIsTableBorderNonzero as u8 as u8 ) << 3usize ) & ( 0x8 as u8 ) ) | ( ( mIsMozBrowserFrame as u8 as u8 ) << 4usize ) & ( 0x10 as u8 ) ) | ( ( mClassAttributeChanged as u8 as u8 ) << 5usize ) & ( 0x20 as u8 ) ) | ( ( mIdAttributeChanged as u8 as u8 ) << 6usize ) & ( 0x40 as u8 ) ) | ( ( mOtherAttributeChanged as u8 as u8 ) << 7usize ) & ( 0x80 as u8 ) ) } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct ServoElementSnapshotTable { pub _base : [ u64 ; 4usize ] , } # [ test ] fn bindgen_test_layout_ServoElementSnapshotTable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ServoElementSnapshotTable > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( ServoElementSnapshotTable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ServoElementSnapshotTable > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ServoElementSnapshotTable ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct LookAndFeel { pub _address : u8 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum LookAndFeel_ColorID { eColorID_WindowBackground = 0 , eColorID_WindowForeground = 1 , eColorID_WidgetBackground = 2 , eColorID_WidgetForeground = 3 , eColorID_WidgetSelectBackground = 4 , eColorID_WidgetSelectForeground = 5 , eColorID_Widget3DHighlight = 6 , eColorID_Widget3DShadow = 7 , eColorID_TextBackground = 8 , eColorID_TextForeground = 9 , eColorID_TextSelectBackground = 10 , eColorID_TextSelectForeground = 11 , eColorID_TextSelectForegroundCustom = 12 , eColorID_TextSelectBackgroundDisabled = 13 , eColorID_TextSelectBackgroundAttention = 14 , eColorID_TextHighlightBackground = 15 , eColorID_TextHighlightForeground = 16 , eColorID_IMERawInputBackground = 17 , eColorID_IMERawInputForeground = 18 , eColorID_IMERawInputUnderline = 19 , eColorID_IMESelectedRawTextBackground = 20 , eColorID_IMESelectedRawTextForeground = 21 , eColorID_IMESelectedRawTextUnderline = 22 , eColorID_IMEConvertedTextBackground = 23 , eColorID_IMEConvertedTextForeground = 24 , eColorID_IMEConvertedTextUnderline = 25 , eColorID_IMESelectedConvertedTextBackground = 26 , eColorID_IMESelectedConvertedTextForeground = 27 , eColorID_IMESelectedConvertedTextUnderline = 28 , eColorID_SpellCheckerUnderline = 29 , eColorID_activeborder = 30 , eColorID_activecaption = 31 , eColorID_appworkspace = 32 , eColorID_background = 33 , eColorID_buttonface = 34 , eColorID_buttonhighlight = 35 , eColorID_buttonshadow = 36 , eColorID_buttontext = 37 , eColorID_captiontext = 38 , eColorID_graytext = 39 , eColorID_highlight = 40 , eColorID_highlighttext = 41 , eColorID_inactiveborder = 42 , eColorID_inactivecaption = 43 , eColorID_inactivecaptiontext = 44 , eColorID_infobackground = 45 , eColorID_infotext = 46 , eColorID_menu = 47 , eColorID_menutext = 48 , eColorID_scrollbar = 49 , eColorID_threeddarkshadow = 50 , eColorID_threedface = 51 , eColorID_threedhighlight = 52 , eColorID_threedlightshadow = 53 , eColorID_threedshadow = 54 , eColorID_window = 55 , eColorID_windowframe = 56 , eColorID_windowtext = 57 , eColorID__moz_buttondefault = 58 , eColorID__moz_field = 59 , eColorID__moz_fieldtext = 60 , eColorID__moz_dialog = 61 , eColorID__moz_dialogtext = 62 , eColorID__moz_dragtargetzone = 63 , eColorID__moz_cellhighlight = 64 , eColorID__moz_cellhighlighttext = 65 , eColorID__moz_html_cellhighlight = 66 , eColorID__moz_html_cellhighlighttext = 67 , eColorID__moz_buttonhoverface = 68 , eColorID__moz_buttonhovertext = 69 , eColorID__moz_menuhover = 70 , eColorID__moz_menuhovertext = 71 , eColorID__moz_menubartext = 72 , eColorID__moz_menubarhovertext = 73 , eColorID__moz_eventreerow = 74 , eColorID__moz_oddtreerow = 75 , eColorID__moz_mac_buttonactivetext = 76 , eColorID__moz_mac_chrome_active = 77 , eColorID__moz_mac_chrome_inactive = 78 , eColorID__moz_mac_defaultbuttontext = 79 , eColorID__moz_mac_focusring = 80 , eColorID__moz_mac_menuselect = 81 , eColorID__moz_mac_menushadow = 82 , eColorID__moz_mac_menutextdisable = 83 , eColorID__moz_mac_menutextselect = 84 , eColorID__moz_mac_disabledtoolbartext = 85 , eColorID__moz_mac_secondaryhighlight = 86 , eColorID__moz_mac_vibrancy_light = 87 , eColorID__moz_mac_vibrancy_dark = 88 , eColorID__moz_mac_vibrant_titlebar_light = 89 , eColorID__moz_mac_vibrant_titlebar_dark = 90 , eColorID__moz_mac_menupopup = 91 , eColorID__moz_mac_menuitem = 92 , eColorID__moz_mac_active_menuitem = 93 , eColorID__moz_mac_source_list = 94 , eColorID__moz_mac_source_list_selection = 95 , eColorID__moz_mac_active_source_list_selection = 96 , eColorID__moz_mac_tooltip = 97 , eColorID__moz_win_accentcolor = 98 , eColorID__moz_win_accentcolortext = 99 , eColorID__moz_win_mediatext = 100 , eColorID__moz_win_communicationstext = 101 , eColorID__moz_nativehyperlinktext = 102 , eColorID__moz_comboboxtext = 103 , eColorID__moz_combobox = 104 , eColorID__moz_gtk_info_bar_text = 105 , eColorID_LAST_COLOR = 106 , } pub const LookAndFeel_IntID_eIntID_CaretBlinkTime : root :: mozilla :: LookAndFeel_IntID = 0 ; pub const LookAndFeel_IntID_eIntID_CaretWidth : root :: mozilla :: LookAndFeel_IntID = 1 ; pub const LookAndFeel_IntID_eIntID_ShowCaretDuringSelection : root :: mozilla :: LookAndFeel_IntID = 2 ; pub const LookAndFeel_IntID_eIntID_SelectTextfieldsOnKeyFocus : root :: mozilla :: LookAndFeel_IntID = 3 ; pub const LookAndFeel_IntID_eIntID_SubmenuDelay : root :: mozilla :: LookAndFeel_IntID = 4 ; pub const LookAndFeel_IntID_eIntID_MenusCanOverlapOSBar : root :: mozilla :: LookAndFeel_IntID = 5 ; pub const LookAndFeel_IntID_eIntID_UseOverlayScrollbars : root :: mozilla :: LookAndFeel_IntID = 6 ; pub const LookAndFeel_IntID_eIntID_AllowOverlayScrollbarsOverlap : root :: mozilla :: LookAndFeel_IntID = 7 ; pub const LookAndFeel_IntID_eIntID_ShowHideScrollbars : root :: mozilla :: LookAndFeel_IntID = 8 ; pub const LookAndFeel_IntID_eIntID_SkipNavigatingDisabledMenuItem : root :: mozilla :: LookAndFeel_IntID = 9 ; pub const LookAndFeel_IntID_eIntID_DragThresholdX : root :: mozilla :: LookAndFeel_IntID = 10 ; pub const LookAndFeel_IntID_eIntID_DragThresholdY : root :: mozilla :: LookAndFeel_IntID = 11 ; pub const LookAndFeel_IntID_eIntID_UseAccessibilityTheme : root :: mozilla :: LookAndFeel_IntID = 12 ; pub const LookAndFeel_IntID_eIntID_ScrollArrowStyle : root :: mozilla :: LookAndFeel_IntID = 13 ; pub const LookAndFeel_IntID_eIntID_ScrollSliderStyle : root :: mozilla :: LookAndFeel_IntID = 14 ; pub const LookAndFeel_IntID_eIntID_ScrollButtonLeftMouseButtonAction : root :: mozilla :: LookAndFeel_IntID = 15 ; pub const LookAndFeel_IntID_eIntID_ScrollButtonMiddleMouseButtonAction : root :: mozilla :: LookAndFeel_IntID = 16 ; pub const LookAndFeel_IntID_eIntID_ScrollButtonRightMouseButtonAction : root :: mozilla :: LookAndFeel_IntID = 17 ; pub const LookAndFeel_IntID_eIntID_TreeOpenDelay : root :: mozilla :: LookAndFeel_IntID = 18 ; pub const LookAndFeel_IntID_eIntID_TreeCloseDelay : root :: mozilla :: LookAndFeel_IntID = 19 ; pub const LookAndFeel_IntID_eIntID_TreeLazyScrollDelay : root :: mozilla :: LookAndFeel_IntID = 20 ; pub const LookAndFeel_IntID_eIntID_TreeScrollDelay : root :: mozilla :: LookAndFeel_IntID = 21 ; pub const LookAndFeel_IntID_eIntID_TreeScrollLinesMax : root :: mozilla :: LookAndFeel_IntID = 22 ; pub const LookAndFeel_IntID_eIntID_TabFocusModel : root :: mozilla :: LookAndFeel_IntID = 23 ; pub const LookAndFeel_IntID_eIntID_ChosenMenuItemsShouldBlink : root :: mozilla :: LookAndFeel_IntID = 24 ; pub const LookAndFeel_IntID_eIntID_WindowsAccentColorInTitlebar : root :: mozilla :: LookAndFeel_IntID = 25 ; pub const LookAndFeel_IntID_eIntID_WindowsDefaultTheme : root :: mozilla :: LookAndFeel_IntID = 26 ; pub const LookAndFeel_IntID_eIntID_DWMCompositor : root :: mozilla :: LookAndFeel_IntID = 27 ; pub const LookAndFeel_IntID_eIntID_WindowsClassic : root :: mozilla :: LookAndFeel_IntID = 28 ; pub const LookAndFeel_IntID_eIntID_WindowsGlass : root :: mozilla :: LookAndFeel_IntID = 29 ; pub const LookAndFeel_IntID_eIntID_TouchEnabled : root :: mozilla :: LookAndFeel_IntID = 30 ; pub const LookAndFeel_IntID_eIntID_MacGraphiteTheme : root :: mozilla :: LookAndFeel_IntID = 31 ; pub const LookAndFeel_IntID_eIntID_MacYosemiteTheme : root :: mozilla :: LookAndFeel_IntID = 32 ; pub const LookAndFeel_IntID_eIntID_AlertNotificationOrigin : root :: mozilla :: LookAndFeel_IntID = 33 ; pub const LookAndFeel_IntID_eIntID_ScrollToClick : root :: mozilla :: LookAndFeel_IntID = 34 ; pub const LookAndFeel_IntID_eIntID_IMERawInputUnderlineStyle : root :: mozilla :: LookAndFeel_IntID = 35 ; pub const LookAndFeel_IntID_eIntID_IMESelectedRawTextUnderlineStyle : root :: mozilla :: LookAndFeel_IntID = 36 ; pub const LookAndFeel_IntID_eIntID_IMEConvertedTextUnderlineStyle : root :: mozilla :: LookAndFeel_IntID = 37 ; pub const LookAndFeel_IntID_eIntID_IMESelectedConvertedTextUnderline : root :: mozilla :: LookAndFeel_IntID = 38 ; pub const LookAndFeel_IntID_eIntID_SpellCheckerUnderlineStyle : root :: mozilla :: LookAndFeel_IntID = 39 ; pub const LookAndFeel_IntID_eIntID_MenuBarDrag : root :: mozilla :: LookAndFeel_IntID = 40 ; pub const LookAndFeel_IntID_eIntID_WindowsThemeIdentifier : root :: mozilla :: LookAndFeel_IntID = 41 ; pub const LookAndFeel_IntID_eIntID_OperatingSystemVersionIdentifier : root :: mozilla :: LookAndFeel_IntID = 42 ; pub const LookAndFeel_IntID_eIntID_ScrollbarButtonAutoRepeatBehavior : root :: mozilla :: LookAndFeel_IntID = 43 ; pub const LookAndFeel_IntID_eIntID_TooltipDelay : root :: mozilla :: LookAndFeel_IntID = 44 ; pub const LookAndFeel_IntID_eIntID_SwipeAnimationEnabled : root :: mozilla :: LookAndFeel_IntID = 45 ; pub const LookAndFeel_IntID_eIntID_ScrollbarDisplayOnMouseMove : root :: mozilla :: LookAndFeel_IntID = 46 ; pub const LookAndFeel_IntID_eIntID_ScrollbarFadeBeginDelay : root :: mozilla :: LookAndFeel_IntID = 47 ; pub const LookAndFeel_IntID_eIntID_ScrollbarFadeDuration : root :: mozilla :: LookAndFeel_IntID = 48 ; pub const LookAndFeel_IntID_eIntID_ContextMenuOffsetVertical : root :: mozilla :: LookAndFeel_IntID = 49 ; pub const LookAndFeel_IntID_eIntID_ContextMenuOffsetHorizontal : root :: mozilla :: LookAndFeel_IntID = 50 ; pub const LookAndFeel_IntID_eIntID_GTKCSDAvailable : root :: mozilla :: LookAndFeel_IntID = 51 ; pub const LookAndFeel_IntID_eIntID_GTKCSDMinimizeButton : root :: mozilla :: LookAndFeel_IntID = 52 ; pub const LookAndFeel_IntID_eIntID_GTKCSDMaximizeButton : root :: mozilla :: LookAndFeel_IntID = 53 ; pub const LookAndFeel_IntID_eIntID_GTKCSDCloseButton : root :: mozilla :: LookAndFeel_IntID = 54 ; pub type LookAndFeel_IntID = :: std :: os :: raw :: c_uint ; pub const LookAndFeel_WindowsTheme_eWindowsTheme_Generic : root :: mozilla :: LookAndFeel_WindowsTheme = 0 ; pub const LookAndFeel_WindowsTheme_eWindowsTheme_Classic : root :: mozilla :: LookAndFeel_WindowsTheme = 1 ; pub const LookAndFeel_WindowsTheme_eWindowsTheme_Aero : root :: mozilla :: LookAndFeel_WindowsTheme = 2 ; pub const LookAndFeel_WindowsTheme_eWindowsTheme_LunaBlue : root :: mozilla :: LookAndFeel_WindowsTheme = 3 ; pub const LookAndFeel_WindowsTheme_eWindowsTheme_LunaOlive : root :: mozilla :: LookAndFeel_WindowsTheme = 4 ; pub const LookAndFeel_WindowsTheme_eWindowsTheme_LunaSilver : root :: mozilla :: LookAndFeel_WindowsTheme = 5 ; pub const LookAndFeel_WindowsTheme_eWindowsTheme_Royale : root :: mozilla :: LookAndFeel_WindowsTheme = 6 ; pub const LookAndFeel_WindowsTheme_eWindowsTheme_Zune : root :: mozilla :: LookAndFeel_WindowsTheme = 7 ; pub const LookAndFeel_WindowsTheme_eWindowsTheme_AeroLite : root :: mozilla :: LookAndFeel_WindowsTheme = 8 ; pub type LookAndFeel_WindowsTheme = :: std :: os :: raw :: c_uint ; pub const LookAndFeel_OperatingSystemVersion_eOperatingSystemVersion_Windows7 : root :: mozilla :: LookAndFeel_OperatingSystemVersion = 2 ; pub const LookAndFeel_OperatingSystemVersion_eOperatingSystemVersion_Windows8 : root :: mozilla :: LookAndFeel_OperatingSystemVersion = 3 ; pub const LookAndFeel_OperatingSystemVersion_eOperatingSystemVersion_Windows10 : root :: mozilla :: LookAndFeel_OperatingSystemVersion = 4 ; pub const LookAndFeel_OperatingSystemVersion_eOperatingSystemVersion_Unknown : root :: mozilla :: LookAndFeel_OperatingSystemVersion = 5 ; pub type LookAndFeel_OperatingSystemVersion = :: std :: os :: raw :: c_uint ; pub const LookAndFeel_eScrollArrow_None : root :: mozilla :: LookAndFeel__bindgen_ty_1 = 0 ; pub const LookAndFeel_eScrollArrow_StartBackward : root :: mozilla :: LookAndFeel__bindgen_ty_1 = 4096 ; pub const LookAndFeel_eScrollArrow_StartForward : root :: mozilla :: LookAndFeel__bindgen_ty_1 = 256 ; pub const LookAndFeel_eScrollArrow_EndBackward : root :: mozilla :: LookAndFeel__bindgen_ty_1 = 16 ; pub const LookAndFeel_eScrollArrow_EndForward : root :: mozilla :: LookAndFeel__bindgen_ty_1 = 1 ; pub type LookAndFeel__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; pub const LookAndFeel_eScrollArrowStyle_Single : root :: mozilla :: LookAndFeel__bindgen_ty_2 = 4097 ; pub const LookAndFeel_eScrollArrowStyle_BothAtBottom : root :: mozilla :: LookAndFeel__bindgen_ty_2 = 17 ; pub const LookAndFeel_eScrollArrowStyle_BothAtEachEnd : root :: mozilla :: LookAndFeel__bindgen_ty_2 = 4369 ; pub const LookAndFeel_eScrollArrowStyle_BothAtTop : root :: mozilla :: LookAndFeel__bindgen_ty_2 = 4352 ; pub type LookAndFeel__bindgen_ty_2 = :: std :: os :: raw :: c_uint ; pub const LookAndFeel_eScrollThumbStyle_Normal : root :: mozilla :: LookAndFeel__bindgen_ty_3 = 0 ; pub const LookAndFeel_eScrollThumbStyle_Proportional : root :: mozilla :: LookAndFeel__bindgen_ty_3 = 1 ; pub type LookAndFeel__bindgen_ty_3 = :: std :: os :: raw :: c_uint ; pub const LookAndFeel_FloatID_eFloatID_IMEUnderlineRelativeSize : root :: mozilla :: LookAndFeel_FloatID = 0 ; pub const LookAndFeel_FloatID_eFloatID_SpellCheckerUnderlineRelativeSize : root :: mozilla :: LookAndFeel_FloatID = 1 ; pub const LookAndFeel_FloatID_eFloatID_CaretAspectRatio : root :: mozilla :: LookAndFeel_FloatID = 2 ; pub type LookAndFeel_FloatID = :: std :: os :: raw :: c_uint ; pub const LookAndFeel_FontID_FontID_MINIMUM : root :: mozilla :: LookAndFeel_FontID = LookAndFeel_FontID :: eFont_Caption ; pub const LookAndFeel_FontID_FontID_MAXIMUM : root :: mozilla :: LookAndFeel_FontID = LookAndFeel_FontID :: eFont_Widget ; # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum LookAndFeel_FontID { eFont_Caption = 1 , eFont_Icon = 2 , eFont_Menu = 3 , eFont_MessageBox = 4 , eFont_SmallCaption = 5 , eFont_StatusBar = 6 , eFont_Window = 7 , eFont_Document = 8 , eFont_Workspace = 9 , eFont_Desktop = 10 , eFont_Info = 11 , eFont_Dialog = 12 , eFont_Button = 13 , eFont_PullDownMenu = 14 , eFont_List = 15 , eFont_Field = 16 , eFont_Tooltips = 17 , eFont_Widget = 18 , } # [ test ] fn bindgen_test_layout_LookAndFeel ( ) { assert_eq ! ( :: std :: mem :: size_of :: < LookAndFeel > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( LookAndFeel ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < LookAndFeel > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( LookAndFeel ) ) ) ; } impl Clone for LookAndFeel { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct StylePrefs { pub _address : u8 , } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla10StylePrefs19sFontDisplayEnabledE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla10StylePrefs19sFontDisplayEnabledE" ] 
  pub static mut  StylePrefs_sFontDisplayEnabled  :  bool ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla10StylePrefs19sOpentypeSVGEnabledE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla10StylePrefs19sOpentypeSVGEnabledE" ] 
  pub static mut  StylePrefs_sOpentypeSVGEnabled  :  bool ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla10StylePrefs29sWebkitPrefixedAliasesEnabledE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla10StylePrefs29sWebkitPrefixedAliasesEnabledE" ] 
  pub static mut  StylePrefs_sWebkitPrefixedAliasesEnabled  :  bool ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla10StylePrefs30sWebkitDevicePixelRatioEnabledE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla10StylePrefs30sWebkitDevicePixelRatioEnabledE" ] 
  pub static mut  StylePrefs_sWebkitDevicePixelRatioEnabled  :  bool ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla10StylePrefs20sMozGradientsEnabledE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla10StylePrefs20sMozGradientsEnabledE" ] 
  pub static mut  StylePrefs_sMozGradientsEnabled  :  bool ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla10StylePrefs22sControlCharVisibilityE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla10StylePrefs22sControlCharVisibilityE" ] 
  pub static mut  StylePrefs_sControlCharVisibility  :  bool ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla10StylePrefs28sFramesTimingFunctionEnabledE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla10StylePrefs28sFramesTimingFunctionEnabledE" ] 
  pub static mut  StylePrefs_sFramesTimingFunctionEnabled  :  bool ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla10StylePrefs31sUnprefixedFullscreenApiEnabledE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla10StylePrefs31sUnprefixedFullscreenApiEnabledE" ] 
  pub static mut  StylePrefs_sUnprefixedFullscreenApiEnabled  :  bool ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla10StylePrefs20sVisitedLinksEnabledE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla10StylePrefs20sVisitedLinksEnabledE" ] 
  pub static mut  StylePrefs_sVisitedLinksEnabled  :  bool ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla10StylePrefs20sMozDocumentEnabledInContentE" ] 
- pub static mut  StylePrefs_sMozDocumentEnabledInContent :  bool ;
+ # [ link_name = "\u{1}__ZN7mozilla10StylePrefs28sMozDocumentEnabledInContentE" ] 
+ pub static mut  StylePrefs_sMozDocumentEnabledInContent  :  bool ;
 } # [ test ] fn bindgen_test_layout_StylePrefs ( ) { assert_eq ! ( :: std :: mem :: size_of :: < StylePrefs > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( StylePrefs ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < StylePrefs > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( StylePrefs ) ) ) ; } impl Clone for StylePrefs { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct NonOwningAnimationTarget { pub mElement : * mut root :: mozilla :: dom :: Element , pub mPseudoType : root :: mozilla :: CSSPseudoElementType , } # [ test ] fn bindgen_test_layout_NonOwningAnimationTarget ( ) { assert_eq ! ( :: std :: mem :: size_of :: < NonOwningAnimationTarget > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( NonOwningAnimationTarget ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < NonOwningAnimationTarget > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( NonOwningAnimationTarget ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NonOwningAnimationTarget ) ) . mElement as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( NonOwningAnimationTarget ) , "::" , stringify ! ( mElement ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const NonOwningAnimationTarget ) ) . mPseudoType as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( NonOwningAnimationTarget ) , "::" , stringify ! ( mPseudoType ) ) ) ; } impl Clone for NonOwningAnimationTarget { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] pub struct PseudoElementHashEntry { pub _base : root :: PLDHashEntryHdr , pub mElement : root :: RefPtr < root :: mozilla :: dom :: Element > , pub mPseudoType : root :: mozilla :: CSSPseudoElementType , } pub type PseudoElementHashEntry_KeyType = root :: mozilla :: NonOwningAnimationTarget ; pub type PseudoElementHashEntry_KeyTypePointer = * const root :: mozilla :: NonOwningAnimationTarget ; pub const PseudoElementHashEntry_ALLOW_MEMMOVE : root :: mozilla :: PseudoElementHashEntry__bindgen_ty_1 = 1 ; pub type PseudoElementHashEntry__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_PseudoElementHashEntry ( ) { assert_eq ! ( :: std :: mem :: size_of :: < PseudoElementHashEntry > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( PseudoElementHashEntry ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < PseudoElementHashEntry > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( PseudoElementHashEntry ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const PseudoElementHashEntry ) ) . mElement as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( PseudoElementHashEntry ) , "::" , stringify ! ( mElement ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const PseudoElementHashEntry ) ) . mPseudoType as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( PseudoElementHashEntry ) , "::" , stringify ! ( mPseudoType ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct EffectCompositor { pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mPresContext : * mut root :: nsPresContext , pub mElementsToRestyle : [ u64 ; 8usize ] , pub mIsInPreTraverse : bool , pub mRuleProcessors : [ u64 ; 2usize ] , } pub type EffectCompositor_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct EffectCompositor_cycleCollection { pub _base : root :: nsCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_EffectCompositor_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < EffectCompositor_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( EffectCompositor_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < EffectCompositor_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( EffectCompositor_cycleCollection ) ) ) ; } impl Clone for EffectCompositor_cycleCollection { fn clone ( & self ) -> Self { * self } } # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum EffectCompositor_CascadeLevel { Animations = 0 , Transitions = 1 , } pub const EffectCompositor_RestyleType_Throttled : root :: mozilla :: EffectCompositor_RestyleType = 0 ; pub const EffectCompositor_RestyleType_Standard : root :: mozilla :: EffectCompositor_RestyleType = 1 ; pub const EffectCompositor_RestyleType_Layer : root :: mozilla :: EffectCompositor_RestyleType = 2 ; pub type EffectCompositor_RestyleType = :: std :: os :: raw :: c_int ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct EffectCompositor_AnimationStyleRuleProcessor { pub _base : root :: nsIStyleRuleProcessor , pub mRefCnt : root :: nsAutoRefCnt , pub mCompositor : * mut root :: mozilla :: EffectCompositor , pub mCascadeLevel : root :: mozilla :: EffectCompositor_CascadeLevel , } pub type EffectCompositor_AnimationStyleRuleProcessor_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_EffectCompositor_AnimationStyleRuleProcessor ( ) { assert_eq ! ( :: std :: mem :: size_of :: < EffectCompositor_AnimationStyleRuleProcessor > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( EffectCompositor_AnimationStyleRuleProcessor ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < EffectCompositor_AnimationStyleRuleProcessor > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( EffectCompositor_AnimationStyleRuleProcessor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor_AnimationStyleRuleProcessor ) ) . mRefCnt as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor_AnimationStyleRuleProcessor ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor_AnimationStyleRuleProcessor ) ) . mCompositor as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor_AnimationStyleRuleProcessor ) , "::" , stringify ! ( mCompositor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor_AnimationStyleRuleProcessor ) ) . mCascadeLevel as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor_AnimationStyleRuleProcessor ) , "::" , stringify ! ( mCascadeLevel ) ) ) ; } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla16EffectCompositor21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla16EffectCompositor21_cycleCollectorGlobalE" ] 
  pub static mut  EffectCompositor__cycleCollectorGlobal  :  root :: mozilla :: EffectCompositor_cycleCollection ;
-} pub const EffectCompositor_kCascadeLevelCount : usize = 2 ; # [ test ] fn bindgen_test_layout_EffectCompositor ( ) { assert_eq ! ( :: std :: mem :: size_of :: < EffectCompositor > ( ) , 104usize , concat ! ( "Size of: " , stringify ! ( EffectCompositor ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < EffectCompositor > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( EffectCompositor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor ) ) . mPresContext as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor ) , "::" , stringify ! ( mPresContext ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor ) ) . mElementsToRestyle as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor ) , "::" , stringify ! ( mElementsToRestyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor ) ) . mIsInPreTraverse as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor ) , "::" , stringify ! ( mIsInPreTraverse ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor ) ) . mRuleProcessors as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor ) , "::" , stringify ! ( mRuleProcessors ) ) ) ; } pub type CSSPseudoClassTypeBase = u8 ; # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum CSSPseudoClassType { empty = 0 , mozOnlyWhitespace = 1 , lang = 2 , root = 3 , any = 4 , firstChild = 5 , firstNode = 6 , lastChild = 7 , lastNode = 8 , onlyChild = 9 , firstOfType = 10 , lastOfType = 11 , onlyOfType = 12 , nthChild = 13 , nthLastChild = 14 , nthOfType = 15 , nthLastOfType = 16 , mozIsHTML = 17 , unresolved = 18 , mozNativeAnonymous = 19 , mozUseShadowTreeRoot = 20 , mozLocaleDir = 21 , mozLWTheme = 22 , mozLWThemeBrightText = 23 , mozLWThemeDarkText = 24 , mozWindowInactive = 25 , mozTableBorderNonzero = 26 , mozBrowserFrame = 27 , scope = 28 , negation = 29 , dir = 30 , link = 31 , mozAnyLink = 32 , anyLink = 33 , visited = 34 , active = 35 , checked = 36 , disabled = 37 , enabled = 38 , focus = 39 , focusWithin = 40 , hover = 41 , mozDragOver = 42 , target = 43 , indeterminate = 44 , mozDevtoolsHighlighted = 45 , mozStyleeditorTransitioning = 46 , fullscreen = 47 , mozFullScreen = 48 , mozFocusRing = 49 , mozBroken = 50 , mozLoading = 51 , mozUserDisabled = 52 , mozSuppressed = 53 , mozHandlerClickToPlay = 54 , mozHandlerVulnerableUpdatable = 55 , mozHandlerVulnerableNoUpdate = 56 , mozHandlerDisabled = 57 , mozHandlerBlocked = 58 , mozHandlerCrashed = 59 , mozMathIncrementScriptLevel = 60 , mozHasDirAttr = 61 , mozDirAttrLTR = 62 , mozDirAttrRTL = 63 , mozDirAttrLikeAuto = 64 , mozAutofill = 65 , mozAutofillPreview = 66 , required = 67 , optional = 68 , valid = 69 , invalid = 70 , inRange = 71 , outOfRange = 72 , defaultPseudo = 73 , placeholderShown = 74 , mozReadOnly = 75 , mozReadWrite = 76 , mozSubmitInvalid = 77 , mozUIInvalid = 78 , mozUIValid = 79 , mozMeterOptimum = 80 , mozMeterSubOptimum = 81 , mozMeterSubSubOptimum = 82 , mozPlaceholder = 83 , Count = 84 , NotPseudo = 85 , MAX = 86 , } # [ repr ( C ) ] pub struct GeckoFont { pub gecko : root :: nsStyleFont , } # [ test ] fn bindgen_test_layout_GeckoFont ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoFont > ( ) , 136usize , concat ! ( "Size of: " , stringify ! ( GeckoFont ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoFont > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoFont ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoFont ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoColor { pub gecko : root :: nsStyleColor , } # [ test ] fn bindgen_test_layout_GeckoColor ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoColor > ( ) , 4usize , concat ! ( "Size of: " , stringify ! ( GeckoColor ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoColor > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( GeckoColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoColor ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoColor ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoList { pub gecko : root :: nsStyleList , } # [ test ] fn bindgen_test_layout_GeckoList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoList > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( GeckoList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoList ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoList ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] pub struct GeckoText { pub gecko : root :: nsStyleText , } # [ test ] fn bindgen_test_layout_GeckoText ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoText > ( ) , 160usize , concat ! ( "Size of: " , stringify ! ( GeckoText ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoText > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoText ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoText ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoText ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoVisibility { pub gecko : root :: nsStyleVisibility , } # [ test ] fn bindgen_test_layout_GeckoVisibility ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoVisibility > ( ) , 7usize , concat ! ( "Size of: " , stringify ! ( GeckoVisibility ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoVisibility > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( GeckoVisibility ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoVisibility ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoVisibility ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoUserInterface { pub gecko : root :: nsStyleUserInterface , } # [ test ] fn bindgen_test_layout_GeckoUserInterface ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoUserInterface > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( GeckoUserInterface ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoUserInterface > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoUserInterface ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoUserInterface ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoUserInterface ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoTableBorder { pub gecko : root :: nsStyleTableBorder , } # [ test ] fn bindgen_test_layout_GeckoTableBorder ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoTableBorder > ( ) , 12usize , concat ! ( "Size of: " , stringify ! ( GeckoTableBorder ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoTableBorder > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( GeckoTableBorder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoTableBorder ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoTableBorder ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoSVG { pub gecko : root :: nsStyleSVG , } # [ test ] fn bindgen_test_layout_GeckoSVG ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoSVG > ( ) , 128usize , concat ! ( "Size of: " , stringify ! ( GeckoSVG ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoSVG > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoSVG ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoSVG ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoSVG ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoBackground { pub gecko : root :: nsStyleBackground , } # [ test ] fn bindgen_test_layout_GeckoBackground ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoBackground > ( ) , 160usize , concat ! ( "Size of: " , stringify ! ( GeckoBackground ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoBackground > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoBackground ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoBackground ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoBackground ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] pub struct GeckoPosition { pub gecko : root :: nsStylePosition , } # [ test ] fn bindgen_test_layout_GeckoPosition ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoPosition > ( ) , 440usize , concat ! ( "Size of: " , stringify ! ( GeckoPosition ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoPosition > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoPosition ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoPosition ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] pub struct GeckoTextReset { pub gecko : root :: nsStyleTextReset , } # [ test ] fn bindgen_test_layout_GeckoTextReset ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoTextReset > ( ) , 80usize , concat ! ( "Size of: " , stringify ! ( GeckoTextReset ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoTextReset > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoTextReset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoTextReset ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoTextReset ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoDisplay { pub gecko : root :: nsStyleDisplay , } # [ test ] fn bindgen_test_layout_GeckoDisplay ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoDisplay > ( ) , 416usize , concat ! ( "Size of: " , stringify ! ( GeckoDisplay ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoDisplay > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoDisplay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoDisplay ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoDisplay ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] pub struct GeckoContent { pub gecko : root :: nsStyleContent , } # [ test ] fn bindgen_test_layout_GeckoContent ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoContent > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( GeckoContent ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoContent > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoContent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoContent ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoContent ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoUIReset { pub gecko : root :: nsStyleUIReset , } # [ test ] fn bindgen_test_layout_GeckoUIReset ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoUIReset > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( GeckoUIReset ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoUIReset > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoUIReset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoUIReset ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoUIReset ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoTable { pub gecko : root :: nsStyleTable , } # [ test ] fn bindgen_test_layout_GeckoTable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoTable > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( GeckoTable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoTable > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( GeckoTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoTable ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoTable ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoMargin { pub gecko : root :: nsStyleMargin , } # [ test ] fn bindgen_test_layout_GeckoMargin ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoMargin > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( GeckoMargin ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoMargin > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoMargin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoMargin ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoMargin ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoPadding { pub gecko : root :: nsStylePadding , } # [ test ] fn bindgen_test_layout_GeckoPadding ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoPadding > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( GeckoPadding ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoPadding > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoPadding ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoPadding ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoPadding ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoBorder { pub gecko : root :: nsStyleBorder , } # [ test ] fn bindgen_test_layout_GeckoBorder ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoBorder > ( ) , 312usize , concat ! ( "Size of: " , stringify ! ( GeckoBorder ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoBorder > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoBorder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoBorder ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoBorder ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoOutline { pub gecko : root :: nsStyleOutline , } # [ test ] fn bindgen_test_layout_GeckoOutline ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoOutline > ( ) , 104usize , concat ! ( "Size of: " , stringify ! ( GeckoOutline ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoOutline > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoOutline ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoOutline ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoOutline ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoXUL { pub gecko : root :: nsStyleXUL , } # [ test ] fn bindgen_test_layout_GeckoXUL ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoXUL > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( GeckoXUL ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoXUL > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( GeckoXUL ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoXUL ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoXUL ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoSVGReset { pub gecko : root :: nsStyleSVGReset , } # [ test ] fn bindgen_test_layout_GeckoSVGReset ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoSVGReset > ( ) , 200usize , concat ! ( "Size of: " , stringify ! ( GeckoSVGReset ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoSVGReset > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoSVGReset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoSVGReset ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoSVGReset ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoColumn { pub gecko : root :: nsStyleColumn , } # [ test ] fn bindgen_test_layout_GeckoColumn ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoColumn > ( ) , 64usize , concat ! ( "Size of: " , stringify ! ( GeckoColumn ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoColumn > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoColumn ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoColumn ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoColumn ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoEffects { pub gecko : root :: nsStyleEffects , } # [ test ] fn bindgen_test_layout_GeckoEffects ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoEffects > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( GeckoEffects ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoEffects > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoEffects ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoEffects ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoEffects ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct ServoMediaList { pub _base : root :: mozilla :: dom :: MediaList , pub mRawList : root :: RefPtr < root :: RawServoMediaList > , } # [ test ] fn bindgen_test_layout_ServoMediaList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ServoMediaList > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( ServoMediaList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ServoMediaList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ServoMediaList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoMediaList ) ) . mRawList as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( ServoMediaList ) , "::" , stringify ! ( mRawList ) ) ) ; } 
+} pub const EffectCompositor_kCascadeLevelCount : usize = 2 ; # [ test ] fn bindgen_test_layout_EffectCompositor ( ) { assert_eq ! ( :: std :: mem :: size_of :: < EffectCompositor > ( ) , 104usize , concat ! ( "Size of: " , stringify ! ( EffectCompositor ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < EffectCompositor > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( EffectCompositor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor ) ) . mPresContext as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor ) , "::" , stringify ! ( mPresContext ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor ) ) . mElementsToRestyle as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor ) , "::" , stringify ! ( mElementsToRestyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor ) ) . mIsInPreTraverse as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor ) , "::" , stringify ! ( mIsInPreTraverse ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const EffectCompositor ) ) . mRuleProcessors as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( EffectCompositor ) , "::" , stringify ! ( mRuleProcessors ) ) ) ; } pub type CSSPseudoClassTypeBase = u8 ; # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum CSSPseudoClassType { empty = 0 , mozOnlyWhitespace = 1 , lang = 2 , root = 3 , any = 4 , firstChild = 5 , firstNode = 6 , lastChild = 7 , lastNode = 8 , onlyChild = 9 , firstOfType = 10 , lastOfType = 11 , onlyOfType = 12 , nthChild = 13 , nthLastChild = 14 , nthOfType = 15 , nthLastOfType = 16 , mozIsHTML = 17 , unresolved = 18 , mozNativeAnonymous = 19 , mozUseShadowTreeRoot = 20 , mozLocaleDir = 21 , mozLWTheme = 22 , mozLWThemeBrightText = 23 , mozLWThemeDarkText = 24 , mozWindowInactive = 25 , mozTableBorderNonzero = 26 , mozBrowserFrame = 27 , scope = 28 , negation = 29 , dir = 30 , link = 31 , mozAnyLink = 32 , anyLink = 33 , visited = 34 , active = 35 , checked = 36 , disabled = 37 , enabled = 38 , focus = 39 , focusWithin = 40 , hover = 41 , mozDragOver = 42 , target = 43 , indeterminate = 44 , mozDevtoolsHighlighted = 45 , mozStyleeditorTransitioning = 46 , fullscreen = 47 , mozFullScreen = 48 , mozFocusRing = 49 , mozBroken = 50 , mozLoading = 51 , mozUserDisabled = 52 , mozSuppressed = 53 , mozHandlerClickToPlay = 54 , mozHandlerVulnerableUpdatable = 55 , mozHandlerVulnerableNoUpdate = 56 , mozHandlerDisabled = 57 , mozHandlerBlocked = 58 , mozHandlerCrashed = 59 , mozMathIncrementScriptLevel = 60 , mozHasDirAttr = 61 , mozDirAttrLTR = 62 , mozDirAttrRTL = 63 , mozDirAttrLikeAuto = 64 , mozAutofill = 65 , mozAutofillPreview = 66 , required = 67 , optional = 68 , valid = 69 , invalid = 70 , inRange = 71 , outOfRange = 72 , defaultPseudo = 73 , placeholderShown = 74 , mozReadOnly = 75 , mozReadWrite = 76 , mozSubmitInvalid = 77 , mozUIInvalid = 78 , mozUIValid = 79 , mozMeterOptimum = 80 , mozMeterSubOptimum = 81 , mozMeterSubSubOptimum = 82 , mozPlaceholder = 83 , Count = 84 , NotPseudo = 85 , MAX = 86 , } # [ repr ( C ) ] pub struct GeckoFont { pub gecko : root :: nsStyleFont , } # [ test ] fn bindgen_test_layout_GeckoFont ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoFont > ( ) , 136usize , concat ! ( "Size of: " , stringify ! ( GeckoFont ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoFont > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoFont ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoFont ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoColor { pub gecko : root :: nsStyleColor , } # [ test ] fn bindgen_test_layout_GeckoColor ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoColor > ( ) , 4usize , concat ! ( "Size of: " , stringify ! ( GeckoColor ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoColor > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( GeckoColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoColor ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoColor ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] pub struct GeckoList { pub gecko : root :: nsStyleList , } # [ test ] fn bindgen_test_layout_GeckoList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoList > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( GeckoList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoList ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoList ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] pub struct GeckoText { pub gecko : root :: nsStyleText , } # [ test ] fn bindgen_test_layout_GeckoText ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoText > ( ) , 160usize , concat ! ( "Size of: " , stringify ! ( GeckoText ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoText > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoText ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoText ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoText ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoVisibility { pub gecko : root :: nsStyleVisibility , } # [ test ] fn bindgen_test_layout_GeckoVisibility ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoVisibility > ( ) , 7usize , concat ! ( "Size of: " , stringify ! ( GeckoVisibility ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoVisibility > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( GeckoVisibility ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoVisibility ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoVisibility ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoUserInterface { pub gecko : root :: nsStyleUserInterface , } # [ test ] fn bindgen_test_layout_GeckoUserInterface ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoUserInterface > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( GeckoUserInterface ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoUserInterface > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoUserInterface ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoUserInterface ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoUserInterface ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoTableBorder { pub gecko : root :: nsStyleTableBorder , } # [ test ] fn bindgen_test_layout_GeckoTableBorder ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoTableBorder > ( ) , 12usize , concat ! ( "Size of: " , stringify ! ( GeckoTableBorder ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoTableBorder > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( GeckoTableBorder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoTableBorder ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoTableBorder ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoSVG { pub gecko : root :: nsStyleSVG , } # [ test ] fn bindgen_test_layout_GeckoSVG ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoSVG > ( ) , 128usize , concat ! ( "Size of: " , stringify ! ( GeckoSVG ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoSVG > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoSVG ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoSVG ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoSVG ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoBackground { pub gecko : root :: nsStyleBackground , } # [ test ] fn bindgen_test_layout_GeckoBackground ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoBackground > ( ) , 160usize , concat ! ( "Size of: " , stringify ! ( GeckoBackground ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoBackground > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoBackground ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoBackground ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoBackground ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] pub struct GeckoPosition { pub gecko : root :: nsStylePosition , } # [ test ] fn bindgen_test_layout_GeckoPosition ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoPosition > ( ) , 440usize , concat ! ( "Size of: " , stringify ! ( GeckoPosition ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoPosition > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoPosition ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoPosition ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] pub struct GeckoTextReset { pub gecko : root :: nsStyleTextReset , } # [ test ] fn bindgen_test_layout_GeckoTextReset ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoTextReset > ( ) , 80usize , concat ! ( "Size of: " , stringify ! ( GeckoTextReset ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoTextReset > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoTextReset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoTextReset ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoTextReset ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoDisplay { pub gecko : root :: nsStyleDisplay , } # [ test ] fn bindgen_test_layout_GeckoDisplay ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoDisplay > ( ) , 424usize , concat ! ( "Size of: " , stringify ! ( GeckoDisplay ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoDisplay > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoDisplay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoDisplay ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoDisplay ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] pub struct GeckoContent { pub gecko : root :: nsStyleContent , } # [ test ] fn bindgen_test_layout_GeckoContent ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoContent > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( GeckoContent ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoContent > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoContent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoContent ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoContent ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoUIReset { pub gecko : root :: nsStyleUIReset , } # [ test ] fn bindgen_test_layout_GeckoUIReset ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoUIReset > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( GeckoUIReset ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoUIReset > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoUIReset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoUIReset ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoUIReset ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoTable { pub gecko : root :: nsStyleTable , } # [ test ] fn bindgen_test_layout_GeckoTable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoTable > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( GeckoTable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoTable > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( GeckoTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoTable ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoTable ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoMargin { pub gecko : root :: nsStyleMargin , } # [ test ] fn bindgen_test_layout_GeckoMargin ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoMargin > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( GeckoMargin ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoMargin > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoMargin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoMargin ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoMargin ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoPadding { pub gecko : root :: nsStylePadding , } # [ test ] fn bindgen_test_layout_GeckoPadding ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoPadding > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( GeckoPadding ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoPadding > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoPadding ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoPadding ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoPadding ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoBorder { pub gecko : root :: nsStyleBorder , } # [ test ] fn bindgen_test_layout_GeckoBorder ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoBorder > ( ) , 312usize , concat ! ( "Size of: " , stringify ! ( GeckoBorder ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoBorder > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoBorder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoBorder ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoBorder ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoOutline { pub gecko : root :: nsStyleOutline , } # [ test ] fn bindgen_test_layout_GeckoOutline ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoOutline > ( ) , 104usize , concat ! ( "Size of: " , stringify ! ( GeckoOutline ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoOutline > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoOutline ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoOutline ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoOutline ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoXUL { pub gecko : root :: nsStyleXUL , } # [ test ] fn bindgen_test_layout_GeckoXUL ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoXUL > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( GeckoXUL ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoXUL > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( GeckoXUL ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoXUL ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoXUL ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoSVGReset { pub gecko : root :: nsStyleSVGReset , } # [ test ] fn bindgen_test_layout_GeckoSVGReset ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoSVGReset > ( ) , 200usize , concat ! ( "Size of: " , stringify ! ( GeckoSVGReset ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoSVGReset > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoSVGReset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoSVGReset ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoSVGReset ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoColumn { pub gecko : root :: nsStyleColumn , } # [ test ] fn bindgen_test_layout_GeckoColumn ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoColumn > ( ) , 64usize , concat ! ( "Size of: " , stringify ! ( GeckoColumn ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoColumn > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoColumn ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoColumn ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoColumn ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct GeckoEffects { pub gecko : root :: nsStyleEffects , } # [ test ] fn bindgen_test_layout_GeckoEffects ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoEffects > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( GeckoEffects ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoEffects > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( GeckoEffects ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoEffects ) ) . gecko as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoEffects ) , "::" , stringify ! ( gecko ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct ServoMediaList { pub _base : root :: mozilla :: dom :: MediaList , pub mRawList : root :: RefPtr < root :: RawServoMediaList > , } # [ test ] fn bindgen_test_layout_ServoMediaList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ServoMediaList > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( ServoMediaList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ServoMediaList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ServoMediaList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoMediaList ) ) . mRawList as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( ServoMediaList ) , "::" , stringify ! ( mRawList ) ) ) ; } 
  /// A PostTraversalTask is a task to be performed immediately after a Servo
         /// traversal.  There are just a few tasks we need to perform, so we use this
         /// class rather than Runnables, to avoid virtual calls and some allocations.
@@ -427,10 +430,10 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
  /// The set of style sheets that apply to a document, backed by a Servo
         /// Stylist.  A ServoStyleSet contains ServoStyleSheets. 
  # [ repr ( C ) ] pub struct ServoStyleSet { pub mKind : root :: mozilla :: ServoStyleSet_Kind , pub mPresContext : * mut root :: nsPresContext , pub mLastPresContextUsesXBLStyleSet : * mut :: std :: os :: raw :: c_void , pub mRawSet : root :: mozilla :: UniquePtr < root :: RawServoStyleSet > , pub mSheets : [ u64 ; 9usize ] , pub mAuthorStyleDisabled : bool , pub mStylistState : root :: mozilla :: StylistState , pub mUserFontSetUpdateGeneration : u64 , pub mUserFontCacheUpdateGeneration : u32 , pub mNeedsRestyleAfterEnsureUniqueInner : bool , pub mNonInheritingStyleContexts : [ u64 ; 7usize ] , pub mPostTraversalTasks : root :: nsTArray < root :: mozilla :: PostTraversalTask > , pub mStyleRuleMap : root :: RefPtr < root :: mozilla :: ServoStyleRuleMap > , pub mBindingManager : root :: RefPtr < root :: nsBindingManager > , } pub type ServoStyleSet_SnapshotTable = root :: mozilla :: ServoElementSnapshotTable ; pub const ServoStyleSet_Kind_Master : root :: mozilla :: ServoStyleSet_Kind = 0 ; pub const ServoStyleSet_Kind_ForXBL : root :: mozilla :: ServoStyleSet_Kind = 1 ; pub type ServoStyleSet_Kind = u8 ; extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla13ServoStyleSet17sInServoTraversalE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla13ServoStyleSet17sInServoTraversalE" ] 
  pub static mut  ServoStyleSet_sInServoTraversal  :  * mut root :: mozilla :: ServoStyleSet ;
 } # [ test ] fn bindgen_test_layout_ServoStyleSet ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ServoStyleSet > ( ) , 208usize , concat ! ( "Size of: " , stringify ! ( ServoStyleSet ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ServoStyleSet > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ServoStyleSet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mKind as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mKind ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mPresContext as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mPresContext ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mLastPresContextUsesXBLStyleSet as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mLastPresContextUsesXBLStyleSet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mRawSet as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mRawSet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mSheets as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mSheets ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mAuthorStyleDisabled as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mAuthorStyleDisabled ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mStylistState as * const _ as usize } , 105usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mStylistState ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mUserFontSetUpdateGeneration as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mUserFontSetUpdateGeneration ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mUserFontCacheUpdateGeneration as * const _ as usize } , 120usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mUserFontCacheUpdateGeneration ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mNeedsRestyleAfterEnsureUniqueInner as * const _ as usize } , 124usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mNeedsRestyleAfterEnsureUniqueInner ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mNonInheritingStyleContexts as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mNonInheritingStyleContexts ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mPostTraversalTasks as * const _ as usize } , 184usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mPostTraversalTasks ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mStyleRuleMap as * const _ as usize } , 192usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mStyleRuleMap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleSet ) ) . mBindingManager as * const _ as usize } , 200usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleSet ) , "::" , stringify ! ( mBindingManager ) ) ) ; } # [ repr ( C ) ] pub struct ServoStyleContext { pub _base : root :: nsStyleContext , pub mPresContext : * mut root :: nsPresContext , pub mSource : root :: ServoComputedData , pub mNextInheritingAnonBoxStyle : root :: RefPtr < root :: mozilla :: ServoStyleContext > , pub mNextLazyPseudoStyle : root :: RefPtr < root :: mozilla :: ServoStyleContext > , } # [ test ] fn bindgen_test_layout_ServoStyleContext ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ServoStyleContext > ( ) , 256usize , concat ! ( "Size of: " , stringify ! ( ServoStyleContext ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ServoStyleContext > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ServoStyleContext ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleContext ) ) . mPresContext as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleContext ) , "::" , stringify ! ( mPresContext ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleContext ) ) . mSource as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleContext ) , "::" , stringify ! ( mSource ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleContext ) ) . mNextInheritingAnonBoxStyle as * const _ as usize } , 240usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleContext ) , "::" , stringify ! ( mNextInheritingAnonBoxStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoStyleContext ) ) . mNextLazyPseudoStyle as * const _ as usize } , 248usize , concat ! ( "Alignment of field: " , stringify ! ( ServoStyleContext ) , "::" , stringify ! ( mNextLazyPseudoStyle ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct CSSFontFaceDescriptors { pub mFamily : root :: nsCSSValue , pub mStyle : root :: nsCSSValue , pub mWeight : root :: nsCSSValue , pub mStretch : root :: nsCSSValue , pub mSrc : root :: nsCSSValue , pub mUnicodeRange : root :: nsCSSValue , pub mFontFeatureSettings : root :: nsCSSValue , pub mFontLanguageOverride : root :: nsCSSValue , pub mDisplay : root :: nsCSSValue , } extern "C" {
- # [ link_name = "\u{1}_ZN7mozilla22CSSFontFaceDescriptors6FieldsE" ] 
+ # [ link_name = "\u{1}__ZN7mozilla22CSSFontFaceDescriptors6FieldsE" ] 
  pub static mut  CSSFontFaceDescriptors_Fields  :  [ * const root :: nsCSSValue ; 0usize ] ;
 } # [ test ] fn bindgen_test_layout_CSSFontFaceDescriptors ( ) { assert_eq ! ( :: std :: mem :: size_of :: < CSSFontFaceDescriptors > ( ) , 144usize , concat ! ( "Size of: " , stringify ! ( CSSFontFaceDescriptors ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < CSSFontFaceDescriptors > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( CSSFontFaceDescriptors ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CSSFontFaceDescriptors ) ) . mFamily as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( CSSFontFaceDescriptors ) , "::" , stringify ! ( mFamily ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CSSFontFaceDescriptors ) ) . mStyle as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( CSSFontFaceDescriptors ) , "::" , stringify ! ( mStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CSSFontFaceDescriptors ) ) . mWeight as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( CSSFontFaceDescriptors ) , "::" , stringify ! ( mWeight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CSSFontFaceDescriptors ) ) . mStretch as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( CSSFontFaceDescriptors ) , "::" , stringify ! ( mStretch ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CSSFontFaceDescriptors ) ) . mSrc as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( CSSFontFaceDescriptors ) , "::" , stringify ! ( mSrc ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CSSFontFaceDescriptors ) ) . mUnicodeRange as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( CSSFontFaceDescriptors ) , "::" , stringify ! ( mUnicodeRange ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CSSFontFaceDescriptors ) ) . mFontFeatureSettings as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( CSSFontFaceDescriptors ) , "::" , stringify ! ( mFontFeatureSettings ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CSSFontFaceDescriptors ) ) . mFontLanguageOverride as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( CSSFontFaceDescriptors ) , "::" , stringify ! ( mFontLanguageOverride ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const CSSFontFaceDescriptors ) ) . mDisplay as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( CSSFontFaceDescriptors ) , "::" , stringify ! ( mDisplay ) ) ) ; } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct InfallibleAllocPolicy { pub _address : u8 , } # [ test ] fn bindgen_test_layout_InfallibleAllocPolicy ( ) { assert_eq ! ( :: std :: mem :: size_of :: < InfallibleAllocPolicy > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( InfallibleAllocPolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < InfallibleAllocPolicy > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( InfallibleAllocPolicy ) ) ) ; } impl Clone for InfallibleAllocPolicy { fn clone ( & self ) -> Self { * self } } 
  /// MozRefCountType is Mozilla's reference count type.
@@ -618,9 +621,9 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
     /// @param DataType the simple datatype being wrapped
     /// @see nsInterfaceHashtable, nsClassHashtable 
  # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsDataHashtable { pub _address : u8 , } pub type nsDataHashtable_BaseClass = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsTArrayHeader { pub mLength : u32 , pub _bitfield_1 : u32 , } extern "C" {
- # [ link_name = "\u{1}_ZN14nsTArrayHeader9sEmptyHdrE" ] 
+ # [ link_name = "\u{1}__ZN14nsTArrayHeader9sEmptyHdrE" ] 
  pub static mut  nsTArrayHeader_sEmptyHdr  :  root :: nsTArrayHeader ;
-} # [ test ] fn bindgen_test_layout_nsTArrayHeader ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsTArrayHeader > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsTArrayHeader ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsTArrayHeader > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsTArrayHeader ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTArrayHeader ) ) . mLength as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsTArrayHeader ) , "::" , stringify ! ( mLength ) ) ) ; } impl Clone for nsTArrayHeader { fn clone ( & self ) -> Self { * self } } impl nsTArrayHeader { # [ inline ] pub fn mCapacity ( & self ) -> u32 { let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; let mask = 0x7fffffff as u32 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mCapacity ( & mut self , val : u32 ) { let mask = 0x7fffffff as u32 ; let val = val as u32 as u32 ; let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) ; } } # [ inline ] pub fn mIsAutoArray ( & self ) -> u32 { let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; let mask = 0x80000000 as u32 ; let val = ( unit_field_val & mask ) >> 31usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mIsAutoArray ( & mut self , val : u32 ) { let mask = 0x80000000 as u32 ; let val = val as u32 as u32 ; let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 31usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mCapacity : u32 , mIsAutoArray : u32 ) -> u32 { ( ( 0 | ( ( mCapacity as u32 as u32 ) << 0usize ) & ( 0x7fffffff as u32 ) ) | ( ( mIsAutoArray as u32 as u32 ) << 31usize ) & ( 0x80000000 as u32 ) ) } } pub type AutoTArray_self_type = u8 ; pub type AutoTArray_base_type < E > = root :: nsTArray < E > ; pub type AutoTArray_Header < E > = root :: AutoTArray_base_type < E > ; pub type AutoTArray_elem_type < E > = root :: AutoTArray_base_type < E > ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct AutoTArray__bindgen_ty_1 { pub mAutoBuf : root :: __BindgenUnionField < * mut :: std :: os :: raw :: c_char > , pub mAlign : root :: __BindgenUnionField < u8 > , pub bindgen_union_field : u64 , } pub type nscoord = i32 ; pub type nscolor = u32 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct gfxFontFeature { pub mTag : u32 , pub mValue : u32 , } # [ test ] fn bindgen_test_layout_gfxFontFeature ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxFontFeature > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeature ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxFontFeature > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( gfxFontFeature ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeature ) ) . mTag as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeature ) , "::" , stringify ! ( mTag ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeature ) ) . mValue as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeature ) , "::" , stringify ! ( mValue ) ) ) ; } impl Clone for gfxFontFeature { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] pub struct gfxAlternateValue { pub alternate : u32 , pub value : ::nsstring::nsStringRepr , } # [ test ] fn bindgen_test_layout_gfxAlternateValue ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxAlternateValue > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( gfxAlternateValue ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxAlternateValue > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( gfxAlternateValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxAlternateValue ) ) . alternate as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( gfxAlternateValue ) , "::" , stringify ! ( alternate ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxAlternateValue ) ) . value as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( gfxAlternateValue ) , "::" , stringify ! ( value ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct gfxFontFeatureValueSet { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mFontFeatureValues : [ u64 ; 4usize ] , } pub type gfxFontFeatureValueSet_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ repr ( C ) ] pub struct gfxFontFeatureValueSet_ValueList { pub name : ::nsstring::nsStringRepr , pub featureSelectors : root :: nsTArray < :: std :: os :: raw :: c_uint > , } # [ test ] fn bindgen_test_layout_gfxFontFeatureValueSet_ValueList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxFontFeatureValueSet_ValueList > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeatureValueSet_ValueList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxFontFeatureValueSet_ValueList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( gfxFontFeatureValueSet_ValueList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_ValueList ) ) . name as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_ValueList ) , "::" , stringify ! ( name ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_ValueList ) ) . featureSelectors as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_ValueList ) , "::" , stringify ! ( featureSelectors ) ) ) ; } # [ repr ( C ) ] pub struct gfxFontFeatureValueSet_FeatureValues { pub alternate : u32 , pub valuelist : root :: nsTArray < root :: gfxFontFeatureValueSet_ValueList > , } # [ test ] fn bindgen_test_layout_gfxFontFeatureValueSet_FeatureValues ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxFontFeatureValueSet_FeatureValues > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeatureValueSet_FeatureValues ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxFontFeatureValueSet_FeatureValues > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( gfxFontFeatureValueSet_FeatureValues ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValues ) ) . alternate as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValues ) , "::" , stringify ! ( alternate ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValues ) ) . valuelist as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValues ) , "::" , stringify ! ( valuelist ) ) ) ; } # [ repr ( C ) ] pub struct gfxFontFeatureValueSet_FeatureValueHashKey { pub mFamily : ::nsstring::nsStringRepr , pub mPropVal : u32 , pub mName : ::nsstring::nsStringRepr , } # [ test ] fn bindgen_test_layout_gfxFontFeatureValueSet_FeatureValueHashKey ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxFontFeatureValueSet_FeatureValueHashKey > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashKey ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxFontFeatureValueSet_FeatureValueHashKey > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashKey ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValueHashKey ) ) . mFamily as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashKey ) , "::" , stringify ! ( mFamily ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValueHashKey ) ) . mPropVal as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashKey ) , "::" , stringify ! ( mPropVal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValueHashKey ) ) . mName as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashKey ) , "::" , stringify ! ( mName ) ) ) ; } # [ repr ( C ) ] pub struct gfxFontFeatureValueSet_FeatureValueHashEntry { pub _base : root :: PLDHashEntryHdr , pub mKey : root :: gfxFontFeatureValueSet_FeatureValueHashKey , pub mValues : root :: nsTArray < :: std :: os :: raw :: c_uint > , } pub type gfxFontFeatureValueSet_FeatureValueHashEntry_KeyType = * const root :: gfxFontFeatureValueSet_FeatureValueHashKey ; pub type gfxFontFeatureValueSet_FeatureValueHashEntry_KeyTypePointer = * const root :: gfxFontFeatureValueSet_FeatureValueHashKey ; pub const gfxFontFeatureValueSet_FeatureValueHashEntry_ALLOW_MEMMOVE : root :: gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_1 = 1 ; pub type gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_gfxFontFeatureValueSet_FeatureValueHashEntry ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxFontFeatureValueSet_FeatureValueHashEntry > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashEntry ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxFontFeatureValueSet_FeatureValueHashEntry > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashEntry ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValueHashEntry ) ) . mKey as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashEntry ) , "::" , stringify ! ( mKey ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValueHashEntry ) ) . mValues as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashEntry ) , "::" , stringify ! ( mValues ) ) ) ; } # [ test ] fn bindgen_test_layout_gfxFontFeatureValueSet ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxFontFeatureValueSet > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeatureValueSet ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxFontFeatureValueSet > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( gfxFontFeatureValueSet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet ) ) . mFontFeatureValues as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet ) , "::" , stringify ! ( mFontFeatureValues ) ) ) ; } pub type gfxFontVariation = root :: mozilla :: gfx :: FontVariation ; pub const kGenericFont_NONE : u8 = 0 ; pub const kGenericFont_moz_variable : u8 = 0 ; pub const kGenericFont_moz_fixed : u8 = 1 ; pub const kGenericFont_serif : u8 = 2 ; pub const kGenericFont_sans_serif : u8 = 4 ; pub const kGenericFont_monospace : u8 = 8 ; pub const kGenericFont_cursive : u8 = 16 ; pub const kGenericFont_fantasy : u8 = 32 ; # [ repr ( C ) ] pub struct nsFont { pub fontlist : root :: mozilla :: FontFamilyList , pub style : u8 , pub systemFont : bool , pub variantCaps : u8 , pub variantNumeric : u8 , pub variantPosition : u8 , pub variantWidth : u8 , pub variantLigatures : u16 , pub variantEastAsian : u16 , pub variantAlternates : u16 , pub smoothing : u8 , pub fontSmoothingBackgroundColor : root :: nscolor , pub weight : u16 , pub stretch : i16 , pub kerning : u8 , pub synthesis : u8 , pub size : root :: nscoord , pub sizeAdjust : f32 , pub alternateValues : root :: nsTArray < root :: gfxAlternateValue > , pub featureValueLookup : root :: RefPtr < root :: gfxFontFeatureValueSet > , pub fontFeatureSettings : root :: nsTArray < root :: gfxFontFeature > , pub fontVariationSettings : root :: nsTArray < root :: mozilla :: gfx :: FontVariation > , pub languageOverride : u32 , } pub const nsFont_MaxDifference_eNone : root :: nsFont_MaxDifference = 0 ; pub const nsFont_MaxDifference_eVisual : root :: nsFont_MaxDifference = 1 ; pub const nsFont_MaxDifference_eLayoutAffecting : root :: nsFont_MaxDifference = 2 ; pub type nsFont_MaxDifference = u8 ; # [ test ] fn bindgen_test_layout_nsFont ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsFont > ( ) , 96usize , concat ! ( "Size of: " , stringify ! ( nsFont ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsFont > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . fontlist as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( fontlist ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . style as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( style ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . systemFont as * const _ as usize } , 17usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( systemFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantCaps as * const _ as usize } , 18usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantCaps ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantNumeric as * const _ as usize } , 19usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantNumeric ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantPosition as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantWidth as * const _ as usize } , 21usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantLigatures as * const _ as usize } , 22usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantLigatures ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantEastAsian as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantEastAsian ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantAlternates as * const _ as usize } , 26usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantAlternates ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . smoothing as * const _ as usize } , 28usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( smoothing ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . fontSmoothingBackgroundColor as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( fontSmoothingBackgroundColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . weight as * const _ as usize } , 36usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( weight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . stretch as * const _ as usize } , 38usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( stretch ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . kerning as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( kerning ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . synthesis as * const _ as usize } , 41usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( synthesis ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . size as * const _ as usize } , 44usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( size ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . sizeAdjust as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( sizeAdjust ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . alternateValues as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( alternateValues ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . featureValueLookup as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( featureValueLookup ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . fontFeatureSettings as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( fontFeatureSettings ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . fontVariationSettings as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( fontVariationSettings ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . languageOverride as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( languageOverride ) ) ) ; } 
+} # [ test ] fn bindgen_test_layout_nsTArrayHeader ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsTArrayHeader > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsTArrayHeader ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsTArrayHeader > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsTArrayHeader ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTArrayHeader ) ) . mLength as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsTArrayHeader ) , "::" , stringify ! ( mLength ) ) ) ; } impl Clone for nsTArrayHeader { fn clone ( & self ) -> Self { * self } } impl nsTArrayHeader { # [ inline ] pub fn mCapacity ( & self ) -> u32 { let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; let mask = 0x7fffffff as u32 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mCapacity ( & mut self , val : u32 ) { let mask = 0x7fffffff as u32 ; let val = val as u32 as u32 ; let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) ; } } # [ inline ] pub fn mIsAutoArray ( & self ) -> u32 { let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; let mask = 0x80000000 as u32 ; let val = ( unit_field_val & mask ) >> 31usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mIsAutoArray ( & mut self , val : u32 ) { let mask = 0x80000000 as u32 ; let val = val as u32 as u32 ; let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 31usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mCapacity : u32 , mIsAutoArray : u32 ) -> u32 { ( ( 0 | ( ( mCapacity as u32 as u32 ) << 0usize ) & ( 0x7fffffff as u32 ) ) | ( ( mIsAutoArray as u32 as u32 ) << 31usize ) & ( 0x80000000 as u32 ) ) } } pub type AutoTArray_self_type = u8 ; pub type AutoTArray_base_type < E > = root :: nsTArray < E > ; pub type AutoTArray_Header < E > = root :: AutoTArray_base_type < E > ; pub type AutoTArray_elem_type < E > = root :: AutoTArray_base_type < E > ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct AutoTArray__bindgen_ty_1 { pub mAutoBuf : root :: __BindgenUnionField < * mut :: std :: os :: raw :: c_char > , pub mAlign : root :: __BindgenUnionField < u8 > , pub bindgen_union_field : u64 , } pub type nscoord = i32 ; pub type nscolor = u32 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct gfxFontFeature { pub mTag : u32 , pub mValue : u32 , } # [ test ] fn bindgen_test_layout_gfxFontFeature ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxFontFeature > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeature ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxFontFeature > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( gfxFontFeature ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeature ) ) . mTag as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeature ) , "::" , stringify ! ( mTag ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeature ) ) . mValue as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeature ) , "::" , stringify ! ( mValue ) ) ) ; } impl Clone for gfxFontFeature { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] pub struct gfxAlternateValue { pub alternate : u32 , pub value : ::nsstring::nsStringRepr , } # [ test ] fn bindgen_test_layout_gfxAlternateValue ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxAlternateValue > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( gfxAlternateValue ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxAlternateValue > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( gfxAlternateValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxAlternateValue ) ) . alternate as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( gfxAlternateValue ) , "::" , stringify ! ( alternate ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxAlternateValue ) ) . value as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( gfxAlternateValue ) , "::" , stringify ! ( value ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct gfxFontFeatureValueSet { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mFontFeatureValues : [ u64 ; 4usize ] , } pub type gfxFontFeatureValueSet_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ repr ( C ) ] pub struct gfxFontFeatureValueSet_ValueList { pub name : ::nsstring::nsStringRepr , pub featureSelectors : root :: nsTArray < u32 > , } # [ test ] fn bindgen_test_layout_gfxFontFeatureValueSet_ValueList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxFontFeatureValueSet_ValueList > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeatureValueSet_ValueList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxFontFeatureValueSet_ValueList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( gfxFontFeatureValueSet_ValueList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_ValueList ) ) . name as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_ValueList ) , "::" , stringify ! ( name ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_ValueList ) ) . featureSelectors as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_ValueList ) , "::" , stringify ! ( featureSelectors ) ) ) ; } # [ repr ( C ) ] pub struct gfxFontFeatureValueSet_FeatureValues { pub alternate : u32 , pub valuelist : root :: nsTArray < root :: gfxFontFeatureValueSet_ValueList > , } # [ test ] fn bindgen_test_layout_gfxFontFeatureValueSet_FeatureValues ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxFontFeatureValueSet_FeatureValues > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeatureValueSet_FeatureValues ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxFontFeatureValueSet_FeatureValues > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( gfxFontFeatureValueSet_FeatureValues ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValues ) ) . alternate as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValues ) , "::" , stringify ! ( alternate ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValues ) ) . valuelist as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValues ) , "::" , stringify ! ( valuelist ) ) ) ; } # [ repr ( C ) ] pub struct gfxFontFeatureValueSet_FeatureValueHashKey { pub mFamily : ::nsstring::nsStringRepr , pub mPropVal : u32 , pub mName : ::nsstring::nsStringRepr , } # [ test ] fn bindgen_test_layout_gfxFontFeatureValueSet_FeatureValueHashKey ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxFontFeatureValueSet_FeatureValueHashKey > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashKey ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxFontFeatureValueSet_FeatureValueHashKey > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashKey ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValueHashKey ) ) . mFamily as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashKey ) , "::" , stringify ! ( mFamily ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValueHashKey ) ) . mPropVal as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashKey ) , "::" , stringify ! ( mPropVal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValueHashKey ) ) . mName as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashKey ) , "::" , stringify ! ( mName ) ) ) ; } # [ repr ( C ) ] pub struct gfxFontFeatureValueSet_FeatureValueHashEntry { pub _base : root :: PLDHashEntryHdr , pub mKey : root :: gfxFontFeatureValueSet_FeatureValueHashKey , pub mValues : root :: nsTArray < u32 > , } pub type gfxFontFeatureValueSet_FeatureValueHashEntry_KeyType = * const root :: gfxFontFeatureValueSet_FeatureValueHashKey ; pub type gfxFontFeatureValueSet_FeatureValueHashEntry_KeyTypePointer = * const root :: gfxFontFeatureValueSet_FeatureValueHashKey ; pub const gfxFontFeatureValueSet_FeatureValueHashEntry_ALLOW_MEMMOVE : root :: gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_1 = 1 ; pub type gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_gfxFontFeatureValueSet_FeatureValueHashEntry ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxFontFeatureValueSet_FeatureValueHashEntry > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashEntry ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxFontFeatureValueSet_FeatureValueHashEntry > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashEntry ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValueHashEntry ) ) . mKey as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashEntry ) , "::" , stringify ! ( mKey ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet_FeatureValueHashEntry ) ) . mValues as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet_FeatureValueHashEntry ) , "::" , stringify ! ( mValues ) ) ) ; } # [ test ] fn bindgen_test_layout_gfxFontFeatureValueSet ( ) { assert_eq ! ( :: std :: mem :: size_of :: < gfxFontFeatureValueSet > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeatureValueSet ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < gfxFontFeatureValueSet > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( gfxFontFeatureValueSet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet ) ) . mFontFeatureValues as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet ) , "::" , stringify ! ( mFontFeatureValues ) ) ) ; } pub type gfxFontVariation = root :: mozilla :: gfx :: FontVariation ; pub const kGenericFont_NONE : u8 = 0 ; pub const kGenericFont_moz_variable : u8 = 0 ; pub const kGenericFont_moz_fixed : u8 = 1 ; pub const kGenericFont_serif : u8 = 2 ; pub const kGenericFont_sans_serif : u8 = 4 ; pub const kGenericFont_monospace : u8 = 8 ; pub const kGenericFont_cursive : u8 = 16 ; pub const kGenericFont_fantasy : u8 = 32 ; # [ repr ( C ) ] pub struct nsFont { pub fontlist : root :: mozilla :: FontFamilyList , pub style : u8 , pub systemFont : bool , pub variantCaps : u8 , pub variantNumeric : u8 , pub variantPosition : u8 , pub variantWidth : u8 , pub variantLigatures : u16 , pub variantEastAsian : u16 , pub variantAlternates : u16 , pub smoothing : u8 , pub fontSmoothingBackgroundColor : root :: nscolor , pub weight : u16 , pub stretch : i16 , pub kerning : u8 , pub synthesis : u8 , pub size : root :: nscoord , pub sizeAdjust : f32 , pub alternateValues : root :: nsTArray < root :: gfxAlternateValue > , pub featureValueLookup : root :: RefPtr < root :: gfxFontFeatureValueSet > , pub fontFeatureSettings : root :: nsTArray < root :: gfxFontFeature > , pub fontVariationSettings : root :: nsTArray < root :: gfxFontVariation > , pub languageOverride : u32 , } pub const nsFont_MaxDifference_eNone : root :: nsFont_MaxDifference = 0 ; pub const nsFont_MaxDifference_eVisual : root :: nsFont_MaxDifference = 1 ; pub const nsFont_MaxDifference_eLayoutAffecting : root :: nsFont_MaxDifference = 2 ; pub type nsFont_MaxDifference = u8 ; # [ test ] fn bindgen_test_layout_nsFont ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsFont > ( ) , 96usize , concat ! ( "Size of: " , stringify ! ( nsFont ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsFont > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . fontlist as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( fontlist ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . style as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( style ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . systemFont as * const _ as usize } , 17usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( systemFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantCaps as * const _ as usize } , 18usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantCaps ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantNumeric as * const _ as usize } , 19usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantNumeric ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantPosition as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantWidth as * const _ as usize } , 21usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantLigatures as * const _ as usize } , 22usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantLigatures ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantEastAsian as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantEastAsian ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . variantAlternates as * const _ as usize } , 26usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( variantAlternates ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . smoothing as * const _ as usize } , 28usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( smoothing ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . fontSmoothingBackgroundColor as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( fontSmoothingBackgroundColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . weight as * const _ as usize } , 36usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( weight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . stretch as * const _ as usize } , 38usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( stretch ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . kerning as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( kerning ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . synthesis as * const _ as usize } , 41usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( synthesis ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . size as * const _ as usize } , 44usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( size ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . sizeAdjust as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( sizeAdjust ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . alternateValues as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( alternateValues ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . featureValueLookup as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( featureValueLookup ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . fontFeatureSettings as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( fontFeatureSettings ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . fontVariationSettings as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( fontVariationSettings ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFont ) ) . languageOverride as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( nsFont ) , "::" , stringify ! ( languageOverride ) ) ) ; } 
  /// An array of objects, similar to AutoTArray<T,1> but which is memmovable. It
     /// always has length >= 1. 
  # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleAutoArray < T > { pub mFirstElement : T , pub mOtherElements : root :: nsTArray < T > , pub _phantom_0 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < T > > , } pub const nsStyleAutoArray_WithSingleInitialElement_WITH_SINGLE_INITIAL_ELEMENT : root :: nsStyleAutoArray_WithSingleInitialElement = 0 ; pub type nsStyleAutoArray_WithSingleInitialElement = i32 ; pub const nsStyleUnit_eStyleUnit_MAX : root :: nsStyleUnit = nsStyleUnit :: eStyleUnit_Calc ; # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleUnit { eStyleUnit_Null = 0 , eStyleUnit_Normal = 1 , eStyleUnit_Auto = 2 , eStyleUnit_None = 3 , eStyleUnit_Percent = 10 , eStyleUnit_Factor = 11 , eStyleUnit_Degree = 12 , eStyleUnit_Grad = 13 , eStyleUnit_Radian = 14 , eStyleUnit_Turn = 15 , eStyleUnit_FlexFraction = 16 , eStyleUnit_Coord = 20 , eStyleUnit_Integer = 30 , eStyleUnit_Enumerated = 32 , eStyleUnit_Calc = 40 , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleUnion { pub mInt : root :: __BindgenUnionField < i32 > , pub mFloat : root :: __BindgenUnionField < f32 > , pub mPointer : root :: __BindgenUnionField < * mut :: std :: os :: raw :: c_void > , pub bindgen_union_field : u64 , } # [ test ] fn bindgen_test_layout_nsStyleUnion ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleUnion > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsStyleUnion ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleUnion > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleUnion ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUnion ) ) . mInt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUnion ) , "::" , stringify ! ( mInt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUnion ) ) . mFloat as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUnion ) , "::" , stringify ! ( mFloat ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUnion ) ) . mPointer as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUnion ) , "::" , stringify ! ( mPointer ) ) ) ; } impl Clone for nsStyleUnion { fn clone ( & self ) -> Self { * self } } 
@@ -681,7 +684,7 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
     /// When this header is in use, it enables reference counting, and capacity
     /// tracking.  NOTE: A string buffer can be modified only if its reference
     /// count is 1. 
- # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStringBuffer { pub mRefCount : u32 , pub mStorageSize : u32 , pub mCanary : u32 , } # [ test ] fn bindgen_test_layout_nsStringBuffer ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStringBuffer > ( ) , 12usize , concat ! ( "Size of: " , stringify ! ( nsStringBuffer ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStringBuffer > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStringBuffer ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStringBuffer ) ) . mRefCount as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStringBuffer ) , "::" , stringify ! ( mRefCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStringBuffer ) ) . mStorageSize as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStringBuffer ) , "::" , stringify ! ( mStorageSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStringBuffer ) ) . mCanary as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStringBuffer ) , "::" , stringify ! ( mCanary ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAtom { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub _bitfield_1 : u32 , pub mHash : u32 , pub mString : * mut u16 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsAtom_AtomKind { DynamicAtom = 0 , StaticAtom = 1 , HTML5Atom = 2 , } pub type nsAtom_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_nsAtom ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsAtom > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsAtom ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsAtom > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsAtom ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAtom ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsAtom ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAtom ) ) . mHash as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsAtom ) , "::" , stringify ! ( mHash ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAtom ) ) . mString as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsAtom ) , "::" , stringify ! ( mString ) ) ) ; } impl nsAtom { # [ inline ] pub fn mLength ( & self ) -> u32 { let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; let mask = 0x3fffffff as u32 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mLength ( & mut self , val : u32 ) { let mask = 0x3fffffff as u32 ; let val = val as u32 as u32 ; let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) ; } } # [ inline ] pub fn mKind ( & self ) -> u32 { let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; let mask = 0xc0000000 as u32 ; let val = ( unit_field_val & mask ) >> 30usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mKind ( & mut self , val : u32 ) { let mask = 0xc0000000 as u32 ; let val = val as u32 as u32 ; let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 30usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mLength : u32 , mKind : u32 ) -> u32 { ( ( 0 | ( ( mLength as u32 as u32 ) << 0usize ) & ( 0x3fffffff as u32 ) ) | ( ( mKind as u32 as u32 ) << 30usize ) & ( 0xc0000000 as u32 ) ) } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStaticAtom { pub _base : root :: nsAtom , } # [ test ] fn bindgen_test_layout_nsStaticAtom ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStaticAtom > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStaticAtom ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStaticAtom > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStaticAtom ) ) ) ; } pub type nsLoadFlags = u32 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIRequest { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIRequest_COMTypeInfo { pub _address : u8 , } pub const nsIRequest_LOAD_REQUESTMASK : root :: nsIRequest__bindgen_ty_1 = 65535 ; pub const nsIRequest_LOAD_NORMAL : root :: nsIRequest__bindgen_ty_1 = 0 ; pub const nsIRequest_LOAD_BACKGROUND : root :: nsIRequest__bindgen_ty_1 = 1 ; pub const nsIRequest_LOAD_HTML_OBJECT_DATA : root :: nsIRequest__bindgen_ty_1 = 2 ; pub const nsIRequest_LOAD_DOCUMENT_NEEDS_COOKIE : root :: nsIRequest__bindgen_ty_1 = 4 ; pub const nsIRequest_INHIBIT_CACHING : root :: nsIRequest__bindgen_ty_1 = 128 ; pub const nsIRequest_INHIBIT_PERSISTENT_CACHING : root :: nsIRequest__bindgen_ty_1 = 256 ; pub const nsIRequest_LOAD_BYPASS_CACHE : root :: nsIRequest__bindgen_ty_1 = 512 ; pub const nsIRequest_LOAD_FROM_CACHE : root :: nsIRequest__bindgen_ty_1 = 1024 ; pub const nsIRequest_VALIDATE_ALWAYS : root :: nsIRequest__bindgen_ty_1 = 2048 ; pub const nsIRequest_VALIDATE_NEVER : root :: nsIRequest__bindgen_ty_1 = 4096 ; pub const nsIRequest_VALIDATE_ONCE_PER_SESSION : root :: nsIRequest__bindgen_ty_1 = 8192 ; pub const nsIRequest_LOAD_ANONYMOUS : root :: nsIRequest__bindgen_ty_1 = 16384 ; pub const nsIRequest_LOAD_FRESH_CONNECTION : root :: nsIRequest__bindgen_ty_1 = 32768 ; pub type nsIRequest__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_nsIRequest ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIRequest > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIRequest ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIRequest > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIRequest ) ) ) ; } impl Clone for nsIRequest { fn clone ( & self ) -> Self { * self } } 
+ # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStringBuffer { pub mRefCount : u32 , pub mStorageSize : u32 , pub mCanary : u32 , } # [ test ] fn bindgen_test_layout_nsStringBuffer ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStringBuffer > ( ) , 12usize , concat ! ( "Size of: " , stringify ! ( nsStringBuffer ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStringBuffer > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStringBuffer ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStringBuffer ) ) . mRefCount as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStringBuffer ) , "::" , stringify ! ( mRefCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStringBuffer ) ) . mStorageSize as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStringBuffer ) , "::" , stringify ! ( mStorageSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStringBuffer ) ) . mCanary as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStringBuffer ) , "::" , stringify ! ( mCanary ) ) ) ; } impl Clone for nsStringBuffer { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAtom { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub _bitfield_1 : u32 , pub mHash : u32 , pub mString : * mut u16 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsAtom_AtomKind { DynamicAtom = 0 , StaticAtom = 1 , HTML5Atom = 2 , } pub type nsAtom_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_nsAtom ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsAtom > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsAtom ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsAtom > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsAtom ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAtom ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsAtom ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAtom ) ) . mHash as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsAtom ) , "::" , stringify ! ( mHash ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAtom ) ) . mString as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsAtom ) , "::" , stringify ! ( mString ) ) ) ; } impl nsAtom { # [ inline ] pub fn mLength ( & self ) -> u32 { let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; let mask = 0x3fffffff as u32 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mLength ( & mut self , val : u32 ) { let mask = 0x3fffffff as u32 ; let val = val as u32 as u32 ; let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) ; } } # [ inline ] pub fn mKind ( & self ) -> u32 { let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; let mask = 0xc0000000 as u32 ; let val = ( unit_field_val & mask ) >> 30usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mKind ( & mut self , val : u32 ) { let mask = 0xc0000000 as u32 ; let val = val as u32 as u32 ; let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 30usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mLength : u32 , mKind : u32 ) -> u32 { ( ( 0 | ( ( mLength as u32 as u32 ) << 0usize ) & ( 0x3fffffff as u32 ) ) | ( ( mKind as u32 as u32 ) << 30usize ) & ( 0xc0000000 as u32 ) ) } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStaticAtom { pub _base : root :: nsAtom , } # [ test ] fn bindgen_test_layout_nsStaticAtom ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStaticAtom > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStaticAtom ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStaticAtom > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStaticAtom ) ) ) ; } pub type nsLoadFlags = u32 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIRequest { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIRequest_COMTypeInfo { pub _address : u8 , } pub const nsIRequest_LOAD_REQUESTMASK : root :: nsIRequest__bindgen_ty_1 = 65535 ; pub const nsIRequest_LOAD_NORMAL : root :: nsIRequest__bindgen_ty_1 = 0 ; pub const nsIRequest_LOAD_BACKGROUND : root :: nsIRequest__bindgen_ty_1 = 1 ; pub const nsIRequest_LOAD_HTML_OBJECT_DATA : root :: nsIRequest__bindgen_ty_1 = 2 ; pub const nsIRequest_LOAD_DOCUMENT_NEEDS_COOKIE : root :: nsIRequest__bindgen_ty_1 = 4 ; pub const nsIRequest_INHIBIT_CACHING : root :: nsIRequest__bindgen_ty_1 = 128 ; pub const nsIRequest_INHIBIT_PERSISTENT_CACHING : root :: nsIRequest__bindgen_ty_1 = 256 ; pub const nsIRequest_LOAD_BYPASS_CACHE : root :: nsIRequest__bindgen_ty_1 = 512 ; pub const nsIRequest_LOAD_FROM_CACHE : root :: nsIRequest__bindgen_ty_1 = 1024 ; pub const nsIRequest_VALIDATE_ALWAYS : root :: nsIRequest__bindgen_ty_1 = 2048 ; pub const nsIRequest_VALIDATE_NEVER : root :: nsIRequest__bindgen_ty_1 = 4096 ; pub const nsIRequest_VALIDATE_ONCE_PER_SESSION : root :: nsIRequest__bindgen_ty_1 = 8192 ; pub const nsIRequest_LOAD_ANONYMOUS : root :: nsIRequest__bindgen_ty_1 = 16384 ; pub const nsIRequest_LOAD_FRESH_CONNECTION : root :: nsIRequest__bindgen_ty_1 = 32768 ; pub type nsIRequest__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_nsIRequest ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIRequest > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIRequest ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIRequest > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIRequest ) ) ) ; } impl Clone for nsIRequest { fn clone ( & self ) -> Self { * self } } 
  /// Base class that implements parts shared by JSErrorReport and
     /// JSErrorNotes::Note. 
  # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct JSErrorBase { pub message_ : root :: JS :: ConstUTF8CharsZ , pub filename : * const :: std :: os :: raw :: c_char , pub lineno : :: std :: os :: raw :: c_uint , pub column : :: std :: os :: raw :: c_uint , pub errorNumber : :: std :: os :: raw :: c_uint , pub _bitfield_1 : u8 , pub __bindgen_padding_0 : [ u8 ; 3usize ] , } # [ test ] fn bindgen_test_layout_JSErrorBase ( ) { assert_eq ! ( :: std :: mem :: size_of :: < JSErrorBase > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( JSErrorBase ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < JSErrorBase > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( JSErrorBase ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const JSErrorBase ) ) . message_ as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( JSErrorBase ) , "::" , stringify ! ( message_ ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const JSErrorBase ) ) . filename as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( JSErrorBase ) , "::" , stringify ! ( filename ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const JSErrorBase ) ) . lineno as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( JSErrorBase ) , "::" , stringify ! ( lineno ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const JSErrorBase ) ) . column as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( JSErrorBase ) , "::" , stringify ! ( column ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const JSErrorBase ) ) . errorNumber as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( JSErrorBase ) , "::" , stringify ! ( errorNumber ) ) ) ; } impl JSErrorBase { # [ inline ] pub fn ownsMessage_ ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x1 as u8 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_ownsMessage_ ( & mut self , val : bool ) { let mask = 0x1 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( ownsMessage_ : bool ) -> u8 { ( 0 | ( ( ownsMessage_ as u8 as u8 ) << 0usize ) & ( 0x1 as u8 ) ) } } 
@@ -725,9 +728,9 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
     /// have to include some JS headers that don't play nicely with the rest of the
     /// codebase. Include nsWrapperCacheInlines.h if you need to call those methods. 
  # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsWrapperCache { pub vtable_ : * const nsWrapperCache__bindgen_vtable , pub mWrapper : * mut root :: JSObject , pub mFlags : root :: nsWrapperCache_FlagsType , pub mBoolFlags : u32 , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsWrapperCache_COMTypeInfo { pub _address : u8 , } pub type nsWrapperCache_FlagsType = u32 ; pub const nsWrapperCache_WRAPPER_BIT_PRESERVED : root :: nsWrapperCache__bindgen_ty_1 = 1 ; pub type nsWrapperCache__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; pub const nsWrapperCache_WRAPPER_IS_NOT_DOM_BINDING : root :: nsWrapperCache__bindgen_ty_2 = 2 ; pub type nsWrapperCache__bindgen_ty_2 = :: std :: os :: raw :: c_uint ; pub const nsWrapperCache_kWrapperFlagsMask : root :: nsWrapperCache__bindgen_ty_3 = 3 ; pub type nsWrapperCache__bindgen_ty_3 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_nsWrapperCache ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsWrapperCache > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsWrapperCache ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsWrapperCache > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsWrapperCache ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsWrapperCache ) ) . mWrapper as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsWrapperCache ) , "::" , stringify ! ( mWrapper ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsWrapperCache ) ) . mFlags as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsWrapperCache ) , "::" , stringify ! ( mFlags ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsWrapperCache ) ) . mBoolFlags as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsWrapperCache ) , "::" , stringify ! ( mBoolFlags ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ProfilerBacktrace { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ProfilerMarkerPayload { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct ProfilerBacktraceDestructor { pub _address : u8 , } # [ test ] fn bindgen_test_layout_ProfilerBacktraceDestructor ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ProfilerBacktraceDestructor > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( ProfilerBacktraceDestructor ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ProfilerBacktraceDestructor > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( ProfilerBacktraceDestructor ) ) ) ; } impl Clone for ProfilerBacktraceDestructor { fn clone ( & self ) -> Self { * self } } pub type UniqueProfilerBacktrace = root :: mozilla :: UniquePtr < root :: ProfilerBacktrace > ; pub type gfxSize = [ u64 ; 2usize ] ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIDOMNode { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDOMNode_COMTypeInfo { pub _address : u8 , } pub const nsIDOMNode_ELEMENT_NODE : root :: nsIDOMNode__bindgen_ty_1 = 1 ; pub const nsIDOMNode_ATTRIBUTE_NODE : root :: nsIDOMNode__bindgen_ty_1 = 2 ; pub const nsIDOMNode_TEXT_NODE : root :: nsIDOMNode__bindgen_ty_1 = 3 ; pub const nsIDOMNode_CDATA_SECTION_NODE : root :: nsIDOMNode__bindgen_ty_1 = 4 ; pub const nsIDOMNode_ENTITY_REFERENCE_NODE : root :: nsIDOMNode__bindgen_ty_1 = 5 ; pub const nsIDOMNode_ENTITY_NODE : root :: nsIDOMNode__bindgen_ty_1 = 6 ; pub const nsIDOMNode_PROCESSING_INSTRUCTION_NODE : root :: nsIDOMNode__bindgen_ty_1 = 7 ; pub const nsIDOMNode_COMMENT_NODE : root :: nsIDOMNode__bindgen_ty_1 = 8 ; pub const nsIDOMNode_DOCUMENT_NODE : root :: nsIDOMNode__bindgen_ty_1 = 9 ; pub const nsIDOMNode_DOCUMENT_TYPE_NODE : root :: nsIDOMNode__bindgen_ty_1 = 10 ; pub const nsIDOMNode_DOCUMENT_FRAGMENT_NODE : root :: nsIDOMNode__bindgen_ty_1 = 11 ; pub const nsIDOMNode_NOTATION_NODE : root :: nsIDOMNode__bindgen_ty_1 = 12 ; pub type nsIDOMNode__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; pub const nsIDOMNode_DOCUMENT_POSITION_DISCONNECTED : root :: nsIDOMNode__bindgen_ty_2 = 1 ; pub const nsIDOMNode_DOCUMENT_POSITION_PRECEDING : root :: nsIDOMNode__bindgen_ty_2 = 2 ; pub const nsIDOMNode_DOCUMENT_POSITION_FOLLOWING : root :: nsIDOMNode__bindgen_ty_2 = 4 ; pub const nsIDOMNode_DOCUMENT_POSITION_CONTAINS : root :: nsIDOMNode__bindgen_ty_2 = 8 ; pub const nsIDOMNode_DOCUMENT_POSITION_CONTAINED_BY : root :: nsIDOMNode__bindgen_ty_2 = 16 ; pub const nsIDOMNode_DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC : root :: nsIDOMNode__bindgen_ty_2 = 32 ; pub type nsIDOMNode__bindgen_ty_2 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_nsIDOMNode ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDOMNode > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIDOMNode ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDOMNode > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDOMNode ) ) ) ; } impl Clone for nsIDOMNode { fn clone ( & self ) -> Self { * self } } pub const kNameSpaceID_None : i32 = 0 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIVariant { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIVariant_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIVariant ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIVariant > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIVariant ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIVariant > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIVariant ) ) ) ; } impl Clone for nsIVariant { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] pub struct nsNodeInfoManager { pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mNodeInfoHash : * mut root :: PLHashTable , pub mDocument : * mut root :: nsIDocument , pub mNonDocumentNodeInfos : u32 , pub mPrincipal : root :: nsCOMPtr , pub mDefaultPrincipal : root :: nsCOMPtr , pub mTextNodeInfo : * mut root :: mozilla :: dom :: NodeInfo , pub mCommentNodeInfo : * mut root :: mozilla :: dom :: NodeInfo , pub mDocumentNodeInfo : * mut root :: mozilla :: dom :: NodeInfo , pub mBindingManager : root :: RefPtr < root :: nsBindingManager > , pub mRecentlyUsedNodeInfos : [ * mut root :: mozilla :: dom :: NodeInfo ; 31usize ] , pub mSVGEnabled : root :: nsNodeInfoManager_Tri , pub mMathMLEnabled : root :: nsNodeInfoManager_Tri , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsNodeInfoManager_cycleCollection { pub _base : root :: nsCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_nsNodeInfoManager_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsNodeInfoManager_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsNodeInfoManager_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsNodeInfoManager_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsNodeInfoManager_cycleCollection ) ) ) ; } impl Clone for nsNodeInfoManager_cycleCollection { fn clone ( & self ) -> Self { * self } } pub type nsNodeInfoManager_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; pub const nsNodeInfoManager_Tri_eTriUnset : root :: nsNodeInfoManager_Tri = 0 ; pub const nsNodeInfoManager_Tri_eTriFalse : root :: nsNodeInfoManager_Tri = 1 ; pub const nsNodeInfoManager_Tri_eTriTrue : root :: nsNodeInfoManager_Tri = 2 ; pub type nsNodeInfoManager_Tri = :: std :: os :: raw :: c_uint ; extern "C" {
- # [ link_name = "\u{1}_ZN17nsNodeInfoManager21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN17nsNodeInfoManager21_cycleCollectorGlobalE" ] 
  pub static mut  nsNodeInfoManager__cycleCollectorGlobal  :  root :: nsNodeInfoManager_cycleCollection ;
-} # [ test ] fn bindgen_test_layout_nsNodeInfoManager ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsNodeInfoManager > ( ) , 336usize , concat ! ( "Size of: " , stringify ! ( nsNodeInfoManager ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsNodeInfoManager > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsNodeInfoManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mNodeInfoHash as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mNodeInfoHash ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mDocument as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mDocument ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mNonDocumentNodeInfos as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mNonDocumentNodeInfos ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mPrincipal as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mPrincipal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mDefaultPrincipal as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mDefaultPrincipal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mTextNodeInfo as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mTextNodeInfo ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mCommentNodeInfo as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mCommentNodeInfo ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mDocumentNodeInfo as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mDocumentNodeInfo ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mBindingManager as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mBindingManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mRecentlyUsedNodeInfos as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mRecentlyUsedNodeInfos ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mSVGEnabled as * const _ as usize } , 328usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mSVGEnabled ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mMathMLEnabled as * const _ as usize } , 332usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mMathMLEnabled ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsPropertyTable { pub mPropertyList : * mut root :: nsPropertyTable_PropertyList , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsPropertyTable_PropertyList { _unused : [ u8 ; 0 ] } # [ test ] fn bindgen_test_layout_nsPropertyTable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsPropertyTable > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsPropertyTable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsPropertyTable > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsPropertyTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPropertyTable ) ) . mPropertyList as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsPropertyTable ) , "::" , stringify ! ( mPropertyList ) ) ) ; } pub type nsTObserverArray_base_index_type = usize ; pub type nsTObserverArray_base_size_type = usize ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsTObserverArray_base_Iterator_base { pub mPosition : root :: nsTObserverArray_base_index_type , pub mNext : * mut root :: nsTObserverArray_base_Iterator_base , } # [ test ] fn bindgen_test_layout_nsTObserverArray_base_Iterator_base ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsTObserverArray_base_Iterator_base > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsTObserverArray_base_Iterator_base ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsTObserverArray_base_Iterator_base > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsTObserverArray_base_Iterator_base ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTObserverArray_base_Iterator_base ) ) . mPosition as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsTObserverArray_base_Iterator_base ) , "::" , stringify ! ( mPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTObserverArray_base_Iterator_base ) ) . mNext as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsTObserverArray_base_Iterator_base ) , "::" , stringify ! ( mNext ) ) ) ; } impl Clone for nsTObserverArray_base_Iterator_base { fn clone ( & self ) -> Self { * self } } pub type nsAutoTObserverArray_elem_type < T > = T ; pub type nsAutoTObserverArray_array_type < T > = root :: nsTArray < T > ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAutoTObserverArray_Iterator { pub _base : root :: nsTObserverArray_base_Iterator_base , pub mArray : * mut root :: nsAutoTObserverArray_Iterator_array_type , } pub type nsAutoTObserverArray_Iterator_array_type = u8 ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAutoTObserverArray_ForwardIterator { pub _base : root :: nsAutoTObserverArray_Iterator , } pub type nsAutoTObserverArray_ForwardIterator_array_type = u8 ; pub type nsAutoTObserverArray_ForwardIterator_base_type = root :: nsAutoTObserverArray_Iterator ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAutoTObserverArray_EndLimitedIterator { pub _base : root :: nsAutoTObserverArray_ForwardIterator , pub mEnd : root :: nsAutoTObserverArray_ForwardIterator , } pub type nsAutoTObserverArray_EndLimitedIterator_array_type = u8 ; pub type nsAutoTObserverArray_EndLimitedIterator_base_type = root :: nsAutoTObserverArray_Iterator ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAutoTObserverArray_BackwardIterator { pub _base : root :: nsAutoTObserverArray_Iterator , } pub type nsAutoTObserverArray_BackwardIterator_array_type = u8 ; pub type nsAutoTObserverArray_BackwardIterator_base_type = root :: nsAutoTObserverArray_Iterator ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsTObserverArray { pub _address : u8 , } pub type nsTObserverArray_base_type = u8 ; pub type nsTObserverArray_size_type = root :: nsTObserverArray_base_size_type ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIDOMEventTarget { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDOMEventTarget_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIDOMEventTarget ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDOMEventTarget > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIDOMEventTarget ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDOMEventTarget > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDOMEventTarget ) ) ) ; } impl Clone for nsIDOMEventTarget { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsAttrChildContentList { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsCSSSelectorList { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsRange { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoSelectorList { _unused : [ u8 ; 0 ] } pub const NODE_HAS_LISTENERMANAGER : root :: _bindgen_ty_84 = 4 ; pub const NODE_HAS_PROPERTIES : root :: _bindgen_ty_84 = 8 ; pub const NODE_IS_ANONYMOUS_ROOT : root :: _bindgen_ty_84 = 16 ; pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE : root :: _bindgen_ty_84 = 32 ; pub const NODE_IS_NATIVE_ANONYMOUS_ROOT : root :: _bindgen_ty_84 = 64 ; pub const NODE_FORCE_XBL_BINDINGS : root :: _bindgen_ty_84 = 128 ; pub const NODE_MAY_BE_IN_BINDING_MNGR : root :: _bindgen_ty_84 = 256 ; pub const NODE_IS_EDITABLE : root :: _bindgen_ty_84 = 512 ; pub const NODE_IS_NATIVE_ANONYMOUS : root :: _bindgen_ty_84 = 1024 ; pub const NODE_IS_IN_SHADOW_TREE : root :: _bindgen_ty_84 = 2048 ; pub const NODE_HAS_EMPTY_SELECTOR : root :: _bindgen_ty_84 = 4096 ; pub const NODE_HAS_SLOW_SELECTOR : root :: _bindgen_ty_84 = 8192 ; pub const NODE_HAS_EDGE_CHILD_SELECTOR : root :: _bindgen_ty_84 = 16384 ; pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS : root :: _bindgen_ty_84 = 32768 ; pub const NODE_ALL_SELECTOR_FLAGS : root :: _bindgen_ty_84 = 61440 ; pub const NODE_NEEDS_FRAME : root :: _bindgen_ty_84 = 65536 ; pub const NODE_DESCENDANTS_NEED_FRAMES : root :: _bindgen_ty_84 = 131072 ; pub const NODE_HAS_ACCESSKEY : root :: _bindgen_ty_84 = 262144 ; pub const NODE_HAS_DIRECTION_RTL : root :: _bindgen_ty_84 = 524288 ; pub const NODE_HAS_DIRECTION_LTR : root :: _bindgen_ty_84 = 1048576 ; pub const NODE_ALL_DIRECTION_FLAGS : root :: _bindgen_ty_84 = 1572864 ; pub const NODE_CHROME_ONLY_ACCESS : root :: _bindgen_ty_84 = 2097152 ; pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS : root :: _bindgen_ty_84 = 4194304 ; pub const NODE_TYPE_SPECIFIC_BITS_OFFSET : root :: _bindgen_ty_84 = 21 ; pub type _bindgen_ty_84 = :: std :: os :: raw :: c_uint ; 
+} # [ test ] fn bindgen_test_layout_nsNodeInfoManager ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsNodeInfoManager > ( ) , 336usize , concat ! ( "Size of: " , stringify ! ( nsNodeInfoManager ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsNodeInfoManager > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsNodeInfoManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mNodeInfoHash as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mNodeInfoHash ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mDocument as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mDocument ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mNonDocumentNodeInfos as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mNonDocumentNodeInfos ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mPrincipal as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mPrincipal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mDefaultPrincipal as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mDefaultPrincipal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mTextNodeInfo as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mTextNodeInfo ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mCommentNodeInfo as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mCommentNodeInfo ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mDocumentNodeInfo as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mDocumentNodeInfo ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mBindingManager as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mBindingManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mRecentlyUsedNodeInfos as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mRecentlyUsedNodeInfos ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mSVGEnabled as * const _ as usize } , 328usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mSVGEnabled ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsNodeInfoManager ) ) . mMathMLEnabled as * const _ as usize } , 332usize , concat ! ( "Alignment of field: " , stringify ! ( nsNodeInfoManager ) , "::" , stringify ! ( mMathMLEnabled ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsPropertyTable { pub mPropertyList : * mut root :: nsPropertyTable_PropertyList , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsPropertyTable_PropertyList { _unused : [ u8 ; 0 ] } # [ test ] fn bindgen_test_layout_nsPropertyTable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsPropertyTable > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsPropertyTable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsPropertyTable > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsPropertyTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPropertyTable ) ) . mPropertyList as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsPropertyTable ) , "::" , stringify ! ( mPropertyList ) ) ) ; } pub type nsTObserverArray_base_index_type = usize ; pub type nsTObserverArray_base_size_type = usize ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsTObserverArray_base_Iterator_base { pub mPosition : root :: nsTObserverArray_base_index_type , pub mNext : * mut root :: nsTObserverArray_base_Iterator_base , } # [ test ] fn bindgen_test_layout_nsTObserverArray_base_Iterator_base ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsTObserverArray_base_Iterator_base > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsTObserverArray_base_Iterator_base ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsTObserverArray_base_Iterator_base > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsTObserverArray_base_Iterator_base ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTObserverArray_base_Iterator_base ) ) . mPosition as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsTObserverArray_base_Iterator_base ) , "::" , stringify ! ( mPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTObserverArray_base_Iterator_base ) ) . mNext as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsTObserverArray_base_Iterator_base ) , "::" , stringify ! ( mNext ) ) ) ; } impl Clone for nsTObserverArray_base_Iterator_base { fn clone ( & self ) -> Self { * self } } pub type nsAutoTObserverArray_elem_type < T > = T ; pub type nsAutoTObserverArray_array_type < T > = root :: nsTArray < T > ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAutoTObserverArray_Iterator { pub _base : root :: nsTObserverArray_base_Iterator_base , pub mArray : * mut root :: nsAutoTObserverArray_Iterator_array_type , } pub type nsAutoTObserverArray_Iterator_array_type = u8 ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAutoTObserverArray_ForwardIterator { pub _base : root :: nsAutoTObserverArray_Iterator , } pub type nsAutoTObserverArray_ForwardIterator_array_type = u8 ; pub type nsAutoTObserverArray_ForwardIterator_base_type = root :: nsAutoTObserverArray_Iterator ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAutoTObserverArray_EndLimitedIterator { pub _base : root :: nsAutoTObserverArray_ForwardIterator , pub mEnd : root :: nsAutoTObserverArray_ForwardIterator , } pub type nsAutoTObserverArray_EndLimitedIterator_array_type = u8 ; pub type nsAutoTObserverArray_EndLimitedIterator_base_type = root :: nsAutoTObserverArray_Iterator ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAutoTObserverArray_BackwardIterator { pub _base : root :: nsAutoTObserverArray_Iterator , } pub type nsAutoTObserverArray_BackwardIterator_array_type = u8 ; pub type nsAutoTObserverArray_BackwardIterator_base_type = root :: nsAutoTObserverArray_Iterator ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsTObserverArray { pub _address : u8 , } pub type nsTObserverArray_base_type = u8 ; pub type nsTObserverArray_size_type = root :: nsTObserverArray_base_size_type ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIDOMEventTarget { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDOMEventTarget_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIDOMEventTarget ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDOMEventTarget > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIDOMEventTarget ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDOMEventTarget > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDOMEventTarget ) ) ) ; } impl Clone for nsIDOMEventTarget { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsAttrChildContentList { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsCSSSelectorList { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsRange { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoSelectorList { _unused : [ u8 ; 0 ] } pub const NODE_HAS_LISTENERMANAGER : root :: _bindgen_ty_18 = 4 ; pub const NODE_HAS_PROPERTIES : root :: _bindgen_ty_18 = 8 ; pub const NODE_IS_ANONYMOUS_ROOT : root :: _bindgen_ty_18 = 16 ; pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE : root :: _bindgen_ty_18 = 32 ; pub const NODE_IS_NATIVE_ANONYMOUS_ROOT : root :: _bindgen_ty_18 = 64 ; pub const NODE_FORCE_XBL_BINDINGS : root :: _bindgen_ty_18 = 128 ; pub const NODE_MAY_BE_IN_BINDING_MNGR : root :: _bindgen_ty_18 = 256 ; pub const NODE_IS_EDITABLE : root :: _bindgen_ty_18 = 512 ; pub const NODE_IS_NATIVE_ANONYMOUS : root :: _bindgen_ty_18 = 1024 ; pub const NODE_IS_IN_SHADOW_TREE : root :: _bindgen_ty_18 = 2048 ; pub const NODE_HAS_EMPTY_SELECTOR : root :: _bindgen_ty_18 = 4096 ; pub const NODE_HAS_SLOW_SELECTOR : root :: _bindgen_ty_18 = 8192 ; pub const NODE_HAS_EDGE_CHILD_SELECTOR : root :: _bindgen_ty_18 = 16384 ; pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS : root :: _bindgen_ty_18 = 32768 ; pub const NODE_ALL_SELECTOR_FLAGS : root :: _bindgen_ty_18 = 61440 ; pub const NODE_NEEDS_FRAME : root :: _bindgen_ty_18 = 65536 ; pub const NODE_DESCENDANTS_NEED_FRAMES : root :: _bindgen_ty_18 = 131072 ; pub const NODE_HAS_ACCESSKEY : root :: _bindgen_ty_18 = 262144 ; pub const NODE_HAS_DIRECTION_RTL : root :: _bindgen_ty_18 = 524288 ; pub const NODE_HAS_DIRECTION_LTR : root :: _bindgen_ty_18 = 1048576 ; pub const NODE_ALL_DIRECTION_FLAGS : root :: _bindgen_ty_18 = 1572864 ; pub const NODE_CHROME_ONLY_ACCESS : root :: _bindgen_ty_18 = 2097152 ; pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS : root :: _bindgen_ty_18 = 4194304 ; pub const NODE_TYPE_SPECIFIC_BITS_OFFSET : root :: _bindgen_ty_18 = 21 ; pub type _bindgen_ty_18 = :: std :: os :: raw :: c_uint ; 
  /// An internal interface that abstracts some DOMNode-related parts that both
     /// nsIContent and nsIDocument share.  An instance of this interface has a list
     /// of nsIContent children and provides access to them. 
@@ -770,10 +773,10 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
     /// @return ATTR_MISSING, ATTR_VALUE_NO_MATCH or the non-negative index
     /// indicating the first value of aValues that matched 
  pub type nsIContent_AttrValuesArray = * const * const root :: nsStaticAtom ; pub const nsIContent_FlattenedParentType_eNotForStyle : root :: nsIContent_FlattenedParentType = 0 ; pub const nsIContent_FlattenedParentType_eForStyle : root :: nsIContent_FlattenedParentType = 1 ; pub type nsIContent_FlattenedParentType = :: std :: os :: raw :: c_uint ; pub const nsIContent_ETabFocusType_eTabFocus_textControlsMask : root :: nsIContent_ETabFocusType = 1 ; pub const nsIContent_ETabFocusType_eTabFocus_formElementsMask : root :: nsIContent_ETabFocusType = 2 ; pub const nsIContent_ETabFocusType_eTabFocus_linksMask : root :: nsIContent_ETabFocusType = 4 ; pub const nsIContent_ETabFocusType_eTabFocus_any : root :: nsIContent_ETabFocusType = 7 ; pub type nsIContent_ETabFocusType = :: std :: os :: raw :: c_uint ; extern "C" {
- # [ link_name = "\u{1}_ZN10nsIContent14sTabFocusModelE" ] 
+ # [ link_name = "\u{1}__ZN10nsIContent14sTabFocusModelE" ] 
  pub static mut  nsIContent_sTabFocusModel  :  i32 ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsIContent26sTabFocusModelAppliesToXULE" ] 
+ # [ link_name = "\u{1}__ZN10nsIContent26sTabFocusModelAppliesToXULE" ] 
  pub static mut  nsIContent_sTabFocusModelAppliesToXUL  :  bool ;
 } # [ test ] fn bindgen_test_layout_nsIContent ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIContent > ( ) , 88usize , concat ! ( "Size of: " , stringify ! ( nsIContent ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIContent > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIContent ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsFrameManagerBase { pub mPresShell : * mut root :: nsIPresShell , pub mRootFrame : * mut root :: nsIFrame , pub mDisplayNoneMap : * mut root :: nsFrameManagerBase_UndisplayedMap , pub mDisplayContentsMap : * mut root :: nsFrameManagerBase_UndisplayedMap , pub mIsDestroyingFrames : bool , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsFrameManagerBase_UndisplayedMap { _unused : [ u8 ; 0 ] } # [ test ] fn bindgen_test_layout_nsFrameManagerBase ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsFrameManagerBase > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsFrameManagerBase ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsFrameManagerBase > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsFrameManagerBase ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFrameManagerBase ) ) . mPresShell as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsFrameManagerBase ) , "::" , stringify ! ( mPresShell ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFrameManagerBase ) ) . mRootFrame as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsFrameManagerBase ) , "::" , stringify ! ( mRootFrame ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFrameManagerBase ) ) . mDisplayNoneMap as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsFrameManagerBase ) , "::" , stringify ! ( mDisplayNoneMap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFrameManagerBase ) ) . mDisplayContentsMap as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsFrameManagerBase ) , "::" , stringify ! ( mDisplayContentsMap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFrameManagerBase ) ) . mIsDestroyingFrames as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsFrameManagerBase ) , "::" , stringify ! ( mIsDestroyingFrames ) ) ) ; } impl Clone for nsFrameManagerBase { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIWeakReference { pub _base : root :: nsISupports , pub mObject : * mut root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIWeakReference_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIWeakReference ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIWeakReference > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsIWeakReference ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIWeakReference > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIWeakReference ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIWeakReference ) ) . mObject as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsIWeakReference ) , "::" , stringify ! ( mObject ) ) ) ; } impl Clone for nsIWeakReference { fn clone ( & self ) -> Self { * self } } pub type nsWeakPtr = root :: nsCOMPtr ; 
  /// templated hashtable class maps keys to reference pointers.
@@ -800,10 +803,10 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
     /// presentation context, the style manager, the style set and the root
     /// frame. 
  # [ repr ( C ) ] pub struct nsIPresShell { pub _base : root :: nsISupports , pub mDocument : root :: nsCOMPtr , pub mPresContext : root :: RefPtr < root :: nsPresContext > , pub mStyleSet : root :: mozilla :: StyleSetHandle , pub mFrameConstructor : * mut root :: nsCSSFrameConstructor , pub mViewManager : * mut root :: nsViewManager , pub mFrameArena : root :: nsPresArena , pub mSelection : root :: RefPtr < root :: nsFrameSelection > , pub mFrameManager : * mut root :: nsFrameManagerBase , pub mForwardingContainer : u64 , pub mDocAccessible : * mut root :: mozilla :: a11y :: DocAccessible , pub mReflowContinueTimer : root :: nsCOMPtr , pub mPaintCount : u64 , pub mScrollPositionClampingScrollPortSize : root :: nsSize , pub mAutoWeakFrames : * mut root :: AutoWeakFrame , pub mWeakFrames : [ u64 ; 4usize ] , pub mStyleCause : root :: UniqueProfilerBacktrace , pub mReflowCause : root :: UniqueProfilerBacktrace , pub mCanvasBackgroundColor : root :: nscolor , pub mResolution : [ u32 ; 2usize ] , pub mSelectionFlags : i16 , pub mChangeNestCount : u16 , pub mRenderFlags : root :: nsIPresShell_RenderFlags , pub _bitfield_1 : [ u8 ; 2usize ] , pub mPresShellId : u32 , pub mFontSizeInflationEmPerLine : u32 , pub mFontSizeInflationMinTwips : u32 , pub mFontSizeInflationLineThreshold : u32 , pub mFontSizeInflationForceEnabled : bool , pub mFontSizeInflationDisabledInMasterProcess : bool , pub mFontSizeInflationEnabled : bool , pub mFontSizeInflationEnabledIsDirty : bool , pub mPaintingIsFrozen : bool , pub mIsNeverPainting : bool , pub mInFlush : bool , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIPresShell_COMTypeInfo { pub _address : u8 , } pub type nsIPresShell_LayerManager = root :: mozilla :: layers :: LayerManager ; pub type nsIPresShell_SourceSurface = root :: mozilla :: gfx :: SourceSurface ; pub const nsIPresShell_eRenderFlag_STATE_IGNORING_VIEWPORT_SCROLLING : root :: nsIPresShell_eRenderFlag = 1 ; pub const nsIPresShell_eRenderFlag_STATE_DRAWWINDOW_NOT_FLUSHING : root :: nsIPresShell_eRenderFlag = 2 ; pub type nsIPresShell_eRenderFlag = :: std :: os :: raw :: c_uint ; pub type nsIPresShell_RenderFlags = u8 ; pub const nsIPresShell_ResizeReflowOptions_eBSizeExact : root :: nsIPresShell_ResizeReflowOptions = 0 ; pub const nsIPresShell_ResizeReflowOptions_eBSizeLimit : root :: nsIPresShell_ResizeReflowOptions = 1 ; pub type nsIPresShell_ResizeReflowOptions = u32 ; pub const nsIPresShell_ScrollDirection_eHorizontal : root :: nsIPresShell_ScrollDirection = 0 ; pub const nsIPresShell_ScrollDirection_eVertical : root :: nsIPresShell_ScrollDirection = 1 ; pub const nsIPresShell_ScrollDirection_eEither : root :: nsIPresShell_ScrollDirection = 2 ; pub type nsIPresShell_ScrollDirection = :: std :: os :: raw :: c_uint ; pub const nsIPresShell_IntrinsicDirty_eResize : root :: nsIPresShell_IntrinsicDirty = 0 ; pub const nsIPresShell_IntrinsicDirty_eTreeChange : root :: nsIPresShell_IntrinsicDirty = 1 ; pub const nsIPresShell_IntrinsicDirty_eStyleChange : root :: nsIPresShell_IntrinsicDirty = 2 ; pub type nsIPresShell_IntrinsicDirty = :: std :: os :: raw :: c_uint ; pub const nsIPresShell_ReflowRootHandling_ePositionOrSizeChange : root :: nsIPresShell_ReflowRootHandling = 0 ; pub const nsIPresShell_ReflowRootHandling_eNoPositionOrSizeChange : root :: nsIPresShell_ReflowRootHandling = 1 ; pub const nsIPresShell_ReflowRootHandling_eInferFromBitToAdd : root :: nsIPresShell_ReflowRootHandling = 2 ; pub type nsIPresShell_ReflowRootHandling = :: std :: os :: raw :: c_uint ; pub const nsIPresShell_SCROLL_TOP : root :: nsIPresShell__bindgen_ty_1 = 0 ; pub const nsIPresShell_SCROLL_BOTTOM : root :: nsIPresShell__bindgen_ty_1 = 100 ; pub const nsIPresShell_SCROLL_LEFT : root :: nsIPresShell__bindgen_ty_1 = 0 ; pub const nsIPresShell_SCROLL_RIGHT : root :: nsIPresShell__bindgen_ty_1 = 100 ; pub const nsIPresShell_SCROLL_CENTER : root :: nsIPresShell__bindgen_ty_1 = 50 ; pub const nsIPresShell_SCROLL_MINIMUM : root :: nsIPresShell__bindgen_ty_1 = -1 ; pub type nsIPresShell__bindgen_ty_1 = :: std :: os :: raw :: c_int ; pub const nsIPresShell_WhenToScroll_SCROLL_ALWAYS : root :: nsIPresShell_WhenToScroll = 0 ; pub const nsIPresShell_WhenToScroll_SCROLL_IF_NOT_VISIBLE : root :: nsIPresShell_WhenToScroll = 1 ; pub const nsIPresShell_WhenToScroll_SCROLL_IF_NOT_FULLY_VISIBLE : root :: nsIPresShell_WhenToScroll = 2 ; pub type nsIPresShell_WhenToScroll = :: std :: os :: raw :: c_uint ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIPresShell_ScrollAxis { pub _bindgen_opaque_blob : u32 , } # [ test ] fn bindgen_test_layout_nsIPresShell_ScrollAxis ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIPresShell_ScrollAxis > ( ) , 4usize , concat ! ( "Size of: " , stringify ! ( nsIPresShell_ScrollAxis ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIPresShell_ScrollAxis > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsIPresShell_ScrollAxis ) ) ) ; } impl Clone for nsIPresShell_ScrollAxis { fn clone ( & self ) -> Self { * self } } pub const nsIPresShell_SCROLL_FIRST_ANCESTOR_ONLY : root :: nsIPresShell__bindgen_ty_2 = 1 ; pub const nsIPresShell_SCROLL_OVERFLOW_HIDDEN : root :: nsIPresShell__bindgen_ty_2 = 2 ; pub const nsIPresShell_SCROLL_NO_PARENT_FRAMES : root :: nsIPresShell__bindgen_ty_2 = 4 ; pub const nsIPresShell_SCROLL_SMOOTH : root :: nsIPresShell__bindgen_ty_2 = 8 ; pub const nsIPresShell_SCROLL_SMOOTH_AUTO : root :: nsIPresShell__bindgen_ty_2 = 16 ; pub type nsIPresShell__bindgen_ty_2 = :: std :: os :: raw :: c_uint ; pub const nsIPresShell_RENDER_IS_UNTRUSTED : root :: nsIPresShell__bindgen_ty_3 = 1 ; pub const nsIPresShell_RENDER_IGNORE_VIEWPORT_SCROLLING : root :: nsIPresShell__bindgen_ty_3 = 2 ; pub const nsIPresShell_RENDER_CARET : root :: nsIPresShell__bindgen_ty_3 = 4 ; pub const nsIPresShell_RENDER_USE_WIDGET_LAYERS : root :: nsIPresShell__bindgen_ty_3 = 8 ; pub const nsIPresShell_RENDER_ASYNC_DECODE_IMAGES : root :: nsIPresShell__bindgen_ty_3 = 16 ; pub const nsIPresShell_RENDER_DOCUMENT_RELATIVE : root :: nsIPresShell__bindgen_ty_3 = 32 ; pub const nsIPresShell_RENDER_DRAWWINDOW_NOT_FLUSHING : root :: nsIPresShell__bindgen_ty_3 = 64 ; pub type nsIPresShell__bindgen_ty_3 = :: std :: os :: raw :: c_uint ; pub const nsIPresShell_RENDER_IS_IMAGE : root :: nsIPresShell__bindgen_ty_4 = 256 ; pub const nsIPresShell_RENDER_AUTO_SCALE : root :: nsIPresShell__bindgen_ty_4 = 128 ; pub type nsIPresShell__bindgen_ty_4 = :: std :: os :: raw :: c_uint ; pub const nsIPresShell_FORCE_DRAW : root :: nsIPresShell__bindgen_ty_5 = 1 ; pub const nsIPresShell_ADD_FOR_SUBDOC : root :: nsIPresShell__bindgen_ty_5 = 2 ; pub const nsIPresShell_APPEND_UNSCROLLED_ONLY : root :: nsIPresShell__bindgen_ty_5 = 4 ; pub type nsIPresShell__bindgen_ty_5 = :: std :: os :: raw :: c_uint ; pub const nsIPresShell_PaintFlags_PAINT_LAYERS : root :: nsIPresShell_PaintFlags = 1 ; pub const nsIPresShell_PaintFlags_PAINT_COMPOSITE : root :: nsIPresShell_PaintFlags = 2 ; pub const nsIPresShell_PaintFlags_PAINT_SYNC_DECODE_IMAGES : root :: nsIPresShell_PaintFlags = 4 ; pub type nsIPresShell_PaintFlags = :: std :: os :: raw :: c_uint ; pub const nsIPresShell_PaintType_PAINT_DEFAULT : root :: nsIPresShell_PaintType = 0 ; pub const nsIPresShell_PaintType_PAINT_DELAYED_COMPRESS : root :: nsIPresShell_PaintType = 1 ; pub type nsIPresShell_PaintType = :: std :: os :: raw :: c_uint ; extern "C" {
- # [ link_name = "\u{1}_ZN12nsIPresShell12gCaptureInfoE" ] 
+ # [ link_name = "\u{1}__ZN12nsIPresShell12gCaptureInfoE" ] 
  pub static mut  nsIPresShell_gCaptureInfo  :  root :: CapturingContentInfo ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN12nsIPresShell14gKeyDownTargetE" ] 
+ # [ link_name = "\u{1}__ZN12nsIPresShell14gKeyDownTargetE" ] 
  pub static mut  nsIPresShell_gKeyDownTarget  :  * mut root :: nsIContent ;
 } # [ test ] fn bindgen_test_layout_nsIPresShell ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIPresShell > ( ) , 5344usize , concat ! ( "Size of: " , stringify ! ( nsIPresShell ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIPresShell > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIPresShell ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mDocument as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mDocument ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mPresContext as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mPresContext ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mStyleSet as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mStyleSet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mFrameConstructor as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFrameConstructor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mViewManager as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mViewManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mFrameArena as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFrameArena ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mSelection as * const _ as usize } , 5184usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mSelection ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mFrameManager as * const _ as usize } , 5192usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFrameManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mForwardingContainer as * const _ as usize } , 5200usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mForwardingContainer ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mDocAccessible as * const _ as usize } , 5208usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mDocAccessible ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mReflowContinueTimer as * const _ as usize } , 5216usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mReflowContinueTimer ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mPaintCount as * const _ as usize } , 5224usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mPaintCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mScrollPositionClampingScrollPortSize as * const _ as usize } , 5232usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mScrollPositionClampingScrollPortSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mAutoWeakFrames as * const _ as usize } , 5240usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mAutoWeakFrames ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mWeakFrames as * const _ as usize } , 5248usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mWeakFrames ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mStyleCause as * const _ as usize } , 5280usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mStyleCause ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mReflowCause as * const _ as usize } , 5288usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mReflowCause ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mCanvasBackgroundColor as * const _ as usize } , 5296usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mCanvasBackgroundColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mResolution as * const _ as usize } , 5300usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mResolution ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mSelectionFlags as * const _ as usize } , 5308usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mSelectionFlags ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mChangeNestCount as * const _ as usize } , 5310usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mChangeNestCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mRenderFlags as * const _ as usize } , 5312usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mRenderFlags ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mPresShellId as * const _ as usize } , 5316usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mPresShellId ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mFontSizeInflationEmPerLine as * const _ as usize } , 5320usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFontSizeInflationEmPerLine ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mFontSizeInflationMinTwips as * const _ as usize } , 5324usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFontSizeInflationMinTwips ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mFontSizeInflationLineThreshold as * const _ as usize } , 5328usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFontSizeInflationLineThreshold ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mFontSizeInflationForceEnabled as * const _ as usize } , 5332usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFontSizeInflationForceEnabled ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mFontSizeInflationDisabledInMasterProcess as * const _ as usize } , 5333usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFontSizeInflationDisabledInMasterProcess ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mFontSizeInflationEnabled as * const _ as usize } , 5334usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFontSizeInflationEnabled ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mFontSizeInflationEnabledIsDirty as * const _ as usize } , 5335usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFontSizeInflationEnabledIsDirty ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mPaintingIsFrozen as * const _ as usize } , 5336usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mPaintingIsFrozen ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mIsNeverPainting as * const _ as usize } , 5337usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mIsNeverPainting ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mInFlush as * const _ as usize } , 5338usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mInFlush ) ) ) ; } impl nsIPresShell { # [ inline ] pub fn mDidInitialize ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x1 as u16 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mDidInitialize ( & mut self , val : bool ) { let mask = 0x1 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mIsDestroying ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x2 as u16 ; let val = ( unit_field_val & mask ) >> 1usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsDestroying ( & mut self , val : bool ) { let mask = 0x2 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 1usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mIsReflowing ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x4 as u16 ; let val = ( unit_field_val & mask ) >> 2usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsReflowing ( & mut self , val : bool ) { let mask = 0x4 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 2usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mPaintingSuppressed ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x8 as u16 ; let val = ( unit_field_val & mask ) >> 3usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mPaintingSuppressed ( & mut self , val : bool ) { let mask = 0x8 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 3usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mIsActive ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x10 as u16 ; let val = ( unit_field_val & mask ) >> 4usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsActive ( & mut self , val : bool ) { let mask = 0x10 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 4usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mFrozen ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x20 as u16 ; let val = ( unit_field_val & mask ) >> 5usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mFrozen ( & mut self , val : bool ) { let mask = 0x20 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 5usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mIsFirstPaint ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x40 as u16 ; let val = ( unit_field_val & mask ) >> 6usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsFirstPaint ( & mut self , val : bool ) { let mask = 0x40 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 6usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mObservesMutationsForPrint ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x80 as u16 ; let val = ( unit_field_val & mask ) >> 7usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mObservesMutationsForPrint ( & mut self , val : bool ) { let mask = 0x80 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 7usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mWasLastReflowInterrupted ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x100 as u16 ; let val = ( unit_field_val & mask ) >> 8usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mWasLastReflowInterrupted ( & mut self , val : bool ) { let mask = 0x100 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 8usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mScrollPositionClampingScrollPortSizeSet ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x200 as u16 ; let val = ( unit_field_val & mask ) >> 9usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mScrollPositionClampingScrollPortSizeSet ( & mut self , val : bool ) { let mask = 0x200 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 9usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mNeedLayoutFlush ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x400 as u16 ; let val = ( unit_field_val & mask ) >> 10usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mNeedLayoutFlush ( & mut self , val : bool ) { let mask = 0x400 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 10usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mNeedStyleFlush ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x800 as u16 ; let val = ( unit_field_val & mask ) >> 11usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mNeedStyleFlush ( & mut self , val : bool ) { let mask = 0x800 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 11usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mObservingStyleFlushes ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x1000 as u16 ; let val = ( unit_field_val & mask ) >> 12usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mObservingStyleFlushes ( & mut self , val : bool ) { let mask = 0x1000 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 12usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mObservingLayoutFlushes ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x2000 as u16 ; let val = ( unit_field_val & mask ) >> 13usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mObservingLayoutFlushes ( & mut self , val : bool ) { let mask = 0x2000 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 13usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn mNeedThrottledAnimationFlush ( & self ) -> bool { let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; let mask = 0x4000 as u16 ; let val = ( unit_field_val & mask ) >> 14usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mNeedThrottledAnimationFlush ( & mut self , val : bool ) { let mask = 0x4000 as u16 ; let val = val as u8 as u16 ; let mut unit_field_val : u16 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u16 as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 14usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u16 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mDidInitialize : bool , mIsDestroying : bool , mIsReflowing : bool , mPaintingSuppressed : bool , mIsActive : bool , mFrozen : bool , mIsFirstPaint : bool , mObservesMutationsForPrint : bool , mWasLastReflowInterrupted : bool , mScrollPositionClampingScrollPortSizeSet : bool , mNeedLayoutFlush : bool , mNeedStyleFlush : bool , mObservingStyleFlushes : bool , mObservingLayoutFlushes : bool , mNeedThrottledAnimationFlush : bool ) -> u16 { ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( 0 | ( ( mDidInitialize as u8 as u16 ) << 0usize ) & ( 0x1 as u16 ) ) | ( ( mIsDestroying as u8 as u16 ) << 1usize ) & ( 0x2 as u16 ) ) | ( ( mIsReflowing as u8 as u16 ) << 2usize ) & ( 0x4 as u16 ) ) | ( ( mPaintingSuppressed as u8 as u16 ) << 3usize ) & ( 0x8 as u16 ) ) | ( ( mIsActive as u8 as u16 ) << 4usize ) & ( 0x10 as u16 ) ) | ( ( mFrozen as u8 as u16 ) << 5usize ) & ( 0x20 as u16 ) ) | ( ( mIsFirstPaint as u8 as u16 ) << 6usize ) & ( 0x40 as u16 ) ) | ( ( mObservesMutationsForPrint as u8 as u16 ) << 7usize ) & ( 0x80 as u16 ) ) | ( ( mWasLastReflowInterrupted as u8 as u16 ) << 8usize ) & ( 0x100 as u16 ) ) | ( ( mScrollPositionClampingScrollPortSizeSet as u8 as u16 ) << 9usize ) & ( 0x200 as u16 ) ) | ( ( mNeedLayoutFlush as u8 as u16 ) << 10usize ) & ( 0x400 as u16 ) ) | ( ( mNeedStyleFlush as u8 as u16 ) << 11usize ) & ( 0x800 as u16 ) ) | ( ( mObservingStyleFlushes as u8 as u16 ) << 12usize ) & ( 0x1000 as u16 ) ) | ( ( mObservingLayoutFlushes as u8 as u16 ) << 13usize ) & ( 0x2000 as u16 ) ) | ( ( mNeedThrottledAnimationFlush as u8 as u16 ) << 14usize ) & ( 0x4000 as u16 ) ) } } 
  /// The signature of the timer callback function passed to initWithFuncCallback.
@@ -812,7 +815,7 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
     ///
     /// @param aTimer the timer which has expired
     /// @param aClosure opaque parameter passed to initWithFuncCallback 
- # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsITimer { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsITimer_COMTypeInfo { pub _address : u8 , } pub const nsITimer_TYPE_ONE_SHOT : root :: nsITimer__bindgen_ty_1 = 0 ; pub const nsITimer_TYPE_REPEATING_SLACK : root :: nsITimer__bindgen_ty_1 = 1 ; pub const nsITimer_TYPE_REPEATING_PRECISE : root :: nsITimer__bindgen_ty_1 = 2 ; pub const nsITimer_TYPE_REPEATING_PRECISE_CAN_SKIP : root :: nsITimer__bindgen_ty_1 = 3 ; pub const nsITimer_TYPE_REPEATING_SLACK_LOW_PRIORITY : root :: nsITimer__bindgen_ty_1 = 4 ; pub const nsITimer_TYPE_ONE_SHOT_LOW_PRIORITY : root :: nsITimer__bindgen_ty_1 = 5 ; pub type nsITimer__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_nsITimer ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsITimer > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsITimer ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsITimer > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsITimer ) ) ) ; } impl Clone for nsITimer { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsLanguageAtomService { pub mLangToGroup : [ u64 ; 4usize ] , pub mLocaleLanguage : root :: RefPtr < root :: nsAtom > , } pub type nsLanguageAtomService_Encoding = root :: mozilla :: Encoding ; pub type nsLanguageAtomService_NotNull < T > = root :: mozilla :: NotNull < T > ; # [ test ] fn bindgen_test_layout_nsLanguageAtomService ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsLanguageAtomService > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsLanguageAtomService ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsLanguageAtomService > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsLanguageAtomService ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsLanguageAtomService ) ) . mLangToGroup as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsLanguageAtomService ) , "::" , stringify ! ( mLangToGroup ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsLanguageAtomService ) ) . mLocaleLanguage as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsLanguageAtomService ) , "::" , stringify ! ( mLocaleLanguage ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsINamed { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsINamed_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsINamed ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsINamed > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsINamed ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsINamed > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsINamed ) ) ) ; } impl Clone for nsINamed { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIRunnable { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIRunnable_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIRunnable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIRunnable > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIRunnable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIRunnable > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIRunnable ) ) ) ; } impl Clone for nsIRunnable { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIEventTarget { pub _base : root :: nsISupports , pub mVirtualThread : * mut root :: PRThread , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIEventTarget_COMTypeInfo { pub _address : u8 , } pub const nsIEventTarget_DISPATCH_NORMAL : root :: nsIEventTarget__bindgen_ty_1 = 0 ; pub const nsIEventTarget_DISPATCH_SYNC : root :: nsIEventTarget__bindgen_ty_1 = 1 ; pub const nsIEventTarget_DISPATCH_AT_END : root :: nsIEventTarget__bindgen_ty_1 = 2 ; pub type nsIEventTarget__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_nsIEventTarget ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIEventTarget > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsIEventTarget ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIEventTarget > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIEventTarget ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIEventTarget ) ) . mVirtualThread as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsIEventTarget ) , "::" , stringify ! ( mVirtualThread ) ) ) ; } impl Clone for nsIEventTarget { fn clone ( & self ) -> Self { * self } } pub type nsRunnableMethod_BaseType = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsRunnableMethod_ReturnTypeEnforcer { pub _address : u8 , } pub type nsRunnableMethod_ReturnTypeEnforcer_ReturnTypeIsSafe = :: std :: os :: raw :: c_int ; pub type nsRunnableMethod_check = root :: nsRunnableMethod_ReturnTypeEnforcer ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsIGlobalObject { pub _base : root :: nsISupports , pub _base_1 : root :: mozilla :: dom :: DispatcherTrait , pub mHostObjectURIs : root :: nsTArray < root :: nsTString < :: std :: os :: raw :: c_char > > , pub mIsDying : bool , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIGlobalObject_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIGlobalObject ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIGlobalObject > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsIGlobalObject ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIGlobalObject > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIGlobalObject ) ) ) ; } 
+ # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsITimer { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsITimer_COMTypeInfo { pub _address : u8 , } pub const nsITimer_TYPE_ONE_SHOT : root :: nsITimer__bindgen_ty_1 = 0 ; pub const nsITimer_TYPE_REPEATING_SLACK : root :: nsITimer__bindgen_ty_1 = 1 ; pub const nsITimer_TYPE_REPEATING_PRECISE : root :: nsITimer__bindgen_ty_1 = 2 ; pub const nsITimer_TYPE_REPEATING_PRECISE_CAN_SKIP : root :: nsITimer__bindgen_ty_1 = 3 ; pub const nsITimer_TYPE_REPEATING_SLACK_LOW_PRIORITY : root :: nsITimer__bindgen_ty_1 = 4 ; pub const nsITimer_TYPE_ONE_SHOT_LOW_PRIORITY : root :: nsITimer__bindgen_ty_1 = 5 ; pub type nsITimer__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_nsITimer ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsITimer > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsITimer ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsITimer > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsITimer ) ) ) ; } impl Clone for nsITimer { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsLanguageAtomService { pub mLangToGroup : [ u64 ; 4usize ] , pub mLocaleLanguage : root :: RefPtr < root :: nsAtom > , } pub type nsLanguageAtomService_Encoding = root :: mozilla :: Encoding ; pub type nsLanguageAtomService_NotNull < T > = root :: mozilla :: NotNull < T > ; # [ test ] fn bindgen_test_layout_nsLanguageAtomService ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsLanguageAtomService > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsLanguageAtomService ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsLanguageAtomService > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsLanguageAtomService ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsLanguageAtomService ) ) . mLangToGroup as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsLanguageAtomService ) , "::" , stringify ! ( mLangToGroup ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsLanguageAtomService ) ) . mLocaleLanguage as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsLanguageAtomService ) , "::" , stringify ! ( mLocaleLanguage ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsINamed { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsINamed_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsINamed ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsINamed > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsINamed ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsINamed > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsINamed ) ) ) ; } impl Clone for nsINamed { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIRunnable { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIRunnable_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIRunnable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIRunnable > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIRunnable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIRunnable > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIRunnable ) ) ) ; } impl Clone for nsIRunnable { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIEventTarget { pub _base : root :: nsISupports , pub mVirtualThread : * mut root :: PRThread , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIEventTarget_COMTypeInfo { pub _address : u8 , } pub const nsIEventTarget_DISPATCH_NORMAL : root :: nsIEventTarget__bindgen_ty_1 = 0 ; pub const nsIEventTarget_DISPATCH_SYNC : root :: nsIEventTarget__bindgen_ty_1 = 1 ; pub const nsIEventTarget_DISPATCH_AT_END : root :: nsIEventTarget__bindgen_ty_1 = 2 ; pub type nsIEventTarget__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_nsIEventTarget ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIEventTarget > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsIEventTarget ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIEventTarget > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIEventTarget ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIEventTarget ) ) . mVirtualThread as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsIEventTarget ) , "::" , stringify ! ( mVirtualThread ) ) ) ; } impl Clone for nsIEventTarget { fn clone ( & self ) -> Self { * self } } pub type nsRunnableMethod_BaseType = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsRunnableMethod_ReturnTypeEnforcer { pub _address : u8 , } pub type nsRunnableMethod_ReturnTypeEnforcer_ReturnTypeIsSafe = :: std :: os :: raw :: c_int ; pub type nsRunnableMethod_check = root :: nsRunnableMethod_ReturnTypeEnforcer ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsIGlobalObject { pub _base : root :: nsISupports , pub _base_1 : root :: mozilla :: dom :: DispatcherTrait , pub mHostObjectURIs : root :: nsTArray < root :: nsCString > , pub mIsDying : bool , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIGlobalObject_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIGlobalObject ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIGlobalObject > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsIGlobalObject ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIGlobalObject > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIGlobalObject ) ) ) ; } 
  /// The global object which keeps a script context for each supported script
     /// language. This often used to store per-window global state.
     /// This is a heavyweight interface implemented only by DOM globals, and
@@ -846,11 +849,11 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
  /// Data used to track the expiration state of an object. We promise that this
     /// is 32 bits so that objects that includes this as a field can pad and align
     /// efficiently. 
- # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsExpirationState { pub _bitfield_1 : u32 , pub __bindgen_align : [ u32 ; 0usize ] , } pub const nsExpirationState_NOT_TRACKED : root :: nsExpirationState__bindgen_ty_1 = 15 ; pub const nsExpirationState_MAX_INDEX_IN_GENERATION : root :: nsExpirationState__bindgen_ty_1 = 268435455 ; pub type nsExpirationState__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_nsExpirationState ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsExpirationState > ( ) , 4usize , concat ! ( "Size of: " , stringify ! ( nsExpirationState ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsExpirationState > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsExpirationState ) ) ) ; } impl Clone for nsExpirationState { fn clone ( & self ) -> Self { * self } } impl nsExpirationState { # [ inline ] pub fn mGeneration ( & self ) -> u32 { let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; let mask = 0xf as u32 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mGeneration ( & mut self , val : u32 ) { let mask = 0xf as u32 ; let val = val as u32 as u32 ; let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) ; } } # [ inline ] pub fn mIndexInGeneration ( & self ) -> u32 { let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; let mask = 0xfffffff0 as u32 ; let val = ( unit_field_val & mask ) >> 4usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mIndexInGeneration ( & mut self , val : u32 ) { let mask = 0xfffffff0 as u32 ; let val = val as u32 as u32 ; let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 4usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mGeneration : u32 , mIndexInGeneration : u32 ) -> u32 { ( ( 0 | ( ( mGeneration as u32 as u32 ) << 0usize ) & ( 0xf as u32 ) ) | ( ( mIndexInGeneration as u32 as u32 ) << 4usize ) & ( 0xfffffff0 as u32 ) ) } } pub const nsCSSPropertyID_eCSSProperty_COUNT_no_shorthands : root :: nsCSSPropertyID = nsCSSPropertyID :: eCSSProperty_all ; pub const nsCSSPropertyID_eCSSProperty_COUNT_DUMMY : root :: nsCSSPropertyID = nsCSSPropertyID :: eCSSProperty_z_index ; pub const nsCSSPropertyID_eCSSProperty_COUNT : root :: nsCSSPropertyID = nsCSSPropertyID :: eCSSPropertyAlias_WordWrap ; pub const nsCSSPropertyID_eCSSProperty_COUNT_DUMMY2 : root :: nsCSSPropertyID = nsCSSPropertyID :: eCSSProperty_transition ; pub const nsCSSPropertyID_eCSSProperty_COUNT_with_aliases : root :: nsCSSPropertyID = nsCSSPropertyID :: eCSSPropertyExtra_no_properties ; pub const nsCSSPropertyID_eCSSProperty_COUNT_DUMMY3 : root :: nsCSSPropertyID = nsCSSPropertyID :: eCSSPropertyAlias_WebkitMaskSize ; # [ repr ( i32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsCSSPropertyID { eCSSProperty_UNKNOWN = -1 , eCSSProperty_align_content = 0 , eCSSProperty_align_items = 1 , eCSSProperty_align_self = 2 , eCSSProperty_animation_delay = 3 , eCSSProperty_animation_direction = 4 , eCSSProperty_animation_duration = 5 , eCSSProperty_animation_fill_mode = 6 , eCSSProperty_animation_iteration_count = 7 , eCSSProperty_animation_name = 8 , eCSSProperty_animation_play_state = 9 , eCSSProperty_animation_timing_function = 10 , eCSSProperty__moz_appearance = 11 , eCSSProperty_backface_visibility = 12 , eCSSProperty_background_attachment = 13 , eCSSProperty_background_blend_mode = 14 , eCSSProperty_background_clip = 15 , eCSSProperty_background_color = 16 , eCSSProperty_background_image = 17 , eCSSProperty_background_origin = 18 , eCSSProperty_background_position_x = 19 , eCSSProperty_background_position_y = 20 , eCSSProperty_background_repeat = 21 , eCSSProperty_background_size = 22 , eCSSProperty__moz_binding = 23 , eCSSProperty_block_size = 24 , eCSSProperty_border_block_end_color = 25 , eCSSProperty_border_block_end_style = 26 , eCSSProperty_border_block_end_width = 27 , eCSSProperty_border_block_start_color = 28 , eCSSProperty_border_block_start_style = 29 , eCSSProperty_border_block_start_width = 30 , eCSSProperty_border_bottom_color = 31 , eCSSProperty__moz_border_bottom_colors = 32 , eCSSProperty_border_bottom_left_radius = 33 , eCSSProperty_border_bottom_right_radius = 34 , eCSSProperty_border_bottom_style = 35 , eCSSProperty_border_bottom_width = 36 , eCSSProperty_border_collapse = 37 , eCSSProperty_border_image_outset = 38 , eCSSProperty_border_image_repeat = 39 , eCSSProperty_border_image_slice = 40 , eCSSProperty_border_image_source = 41 , eCSSProperty_border_image_width = 42 , eCSSProperty_border_inline_end_color = 43 , eCSSProperty_border_inline_end_style = 44 , eCSSProperty_border_inline_end_width = 45 , eCSSProperty_border_inline_start_color = 46 , eCSSProperty_border_inline_start_style = 47 , eCSSProperty_border_inline_start_width = 48 , eCSSProperty_border_left_color = 49 , eCSSProperty__moz_border_left_colors = 50 , eCSSProperty_border_left_style = 51 , eCSSProperty_border_left_width = 52 , eCSSProperty_border_right_color = 53 , eCSSProperty__moz_border_right_colors = 54 , eCSSProperty_border_right_style = 55 , eCSSProperty_border_right_width = 56 , eCSSProperty_border_spacing = 57 , eCSSProperty_border_top_color = 58 , eCSSProperty__moz_border_top_colors = 59 , eCSSProperty_border_top_left_radius = 60 , eCSSProperty_border_top_right_radius = 61 , eCSSProperty_border_top_style = 62 , eCSSProperty_border_top_width = 63 , eCSSProperty_bottom = 64 , eCSSProperty__moz_box_align = 65 , eCSSProperty_box_decoration_break = 66 , eCSSProperty__moz_box_direction = 67 , eCSSProperty__moz_box_flex = 68 , eCSSProperty__moz_box_ordinal_group = 69 , eCSSProperty__moz_box_orient = 70 , eCSSProperty__moz_box_pack = 71 , eCSSProperty_box_shadow = 72 , eCSSProperty_box_sizing = 73 , eCSSProperty_caption_side = 74 , eCSSProperty_caret_color = 75 , eCSSProperty_clear = 76 , eCSSProperty_clip = 77 , eCSSProperty_clip_path = 78 , eCSSProperty_clip_rule = 79 , eCSSProperty_color = 80 , eCSSProperty_color_adjust = 81 , eCSSProperty_color_interpolation = 82 , eCSSProperty_color_interpolation_filters = 83 , eCSSProperty_column_count = 84 , eCSSProperty_column_fill = 85 , eCSSProperty_column_gap = 86 , eCSSProperty_column_rule_color = 87 , eCSSProperty_column_rule_style = 88 , eCSSProperty_column_rule_width = 89 , eCSSProperty_column_span = 90 , eCSSProperty_column_width = 91 , eCSSProperty_contain = 92 , eCSSProperty_content = 93 , eCSSProperty__moz_context_properties = 94 , eCSSProperty__moz_control_character_visibility = 95 , eCSSProperty_counter_increment = 96 , eCSSProperty_counter_reset = 97 , eCSSProperty_cursor = 98 , eCSSProperty_direction = 99 , eCSSProperty_display = 100 , eCSSProperty_dominant_baseline = 101 , eCSSProperty_empty_cells = 102 , eCSSProperty_fill = 103 , eCSSProperty_fill_opacity = 104 , eCSSProperty_fill_rule = 105 , eCSSProperty_filter = 106 , eCSSProperty_flex_basis = 107 , eCSSProperty_flex_direction = 108 , eCSSProperty_flex_grow = 109 , eCSSProperty_flex_shrink = 110 , eCSSProperty_flex_wrap = 111 , eCSSProperty_float_ = 112 , eCSSProperty__moz_float_edge = 113 , eCSSProperty_flood_color = 114 , eCSSProperty_flood_opacity = 115 , eCSSProperty_font_family = 116 , eCSSProperty_font_feature_settings = 117 , eCSSProperty_font_kerning = 118 , eCSSProperty_font_language_override = 119 , eCSSProperty_font_size = 120 , eCSSProperty_font_size_adjust = 121 , eCSSProperty__moz_font_smoothing_background_color = 122 , eCSSProperty_font_stretch = 123 , eCSSProperty_font_style = 124 , eCSSProperty_font_synthesis = 125 , eCSSProperty_font_variant_alternates = 126 , eCSSProperty_font_variant_caps = 127 , eCSSProperty_font_variant_east_asian = 128 , eCSSProperty_font_variant_ligatures = 129 , eCSSProperty_font_variant_numeric = 130 , eCSSProperty_font_variant_position = 131 , eCSSProperty_font_variation_settings = 132 , eCSSProperty_font_weight = 133 , eCSSProperty__moz_force_broken_image_icon = 134 , eCSSProperty_grid_auto_columns = 135 , eCSSProperty_grid_auto_flow = 136 , eCSSProperty_grid_auto_rows = 137 , eCSSProperty_grid_column_end = 138 , eCSSProperty_grid_column_gap = 139 , eCSSProperty_grid_column_start = 140 , eCSSProperty_grid_row_end = 141 , eCSSProperty_grid_row_gap = 142 , eCSSProperty_grid_row_start = 143 , eCSSProperty_grid_template_areas = 144 , eCSSProperty_grid_template_columns = 145 , eCSSProperty_grid_template_rows = 146 , eCSSProperty_height = 147 , eCSSProperty_hyphens = 148 , eCSSProperty_initial_letter = 149 , eCSSProperty_image_orientation = 150 , eCSSProperty__moz_image_region = 151 , eCSSProperty_image_rendering = 152 , eCSSProperty_ime_mode = 153 , eCSSProperty_inline_size = 154 , eCSSProperty_isolation = 155 , eCSSProperty_justify_content = 156 , eCSSProperty_justify_items = 157 , eCSSProperty_justify_self = 158 , eCSSProperty__x_lang = 159 , eCSSProperty_left = 160 , eCSSProperty_letter_spacing = 161 , eCSSProperty_lighting_color = 162 , eCSSProperty_line_height = 163 , eCSSProperty_list_style_image = 164 , eCSSProperty_list_style_position = 165 , eCSSProperty_list_style_type = 166 , eCSSProperty_margin_block_end = 167 , eCSSProperty_margin_block_start = 168 , eCSSProperty_margin_bottom = 169 , eCSSProperty_margin_inline_end = 170 , eCSSProperty_margin_inline_start = 171 , eCSSProperty_margin_left = 172 , eCSSProperty_margin_right = 173 , eCSSProperty_margin_top = 174 , eCSSProperty_marker_end = 175 , eCSSProperty_marker_mid = 176 , eCSSProperty_marker_start = 177 , eCSSProperty_mask_clip = 178 , eCSSProperty_mask_composite = 179 , eCSSProperty_mask_image = 180 , eCSSProperty_mask_mode = 181 , eCSSProperty_mask_origin = 182 , eCSSProperty_mask_position_x = 183 , eCSSProperty_mask_position_y = 184 , eCSSProperty_mask_repeat = 185 , eCSSProperty_mask_size = 186 , eCSSProperty_mask_type = 187 , eCSSProperty__moz_math_display = 188 , eCSSProperty__moz_math_variant = 189 , eCSSProperty_max_block_size = 190 , eCSSProperty_max_height = 191 , eCSSProperty_max_inline_size = 192 , eCSSProperty_max_width = 193 , eCSSProperty_min_block_size = 194 , eCSSProperty__moz_min_font_size_ratio = 195 , eCSSProperty_min_height = 196 , eCSSProperty_min_inline_size = 197 , eCSSProperty_min_width = 198 , eCSSProperty_mix_blend_mode = 199 , eCSSProperty_object_fit = 200 , eCSSProperty_object_position = 201 , eCSSProperty_offset_block_end = 202 , eCSSProperty_offset_block_start = 203 , eCSSProperty_offset_inline_end = 204 , eCSSProperty_offset_inline_start = 205 , eCSSProperty_opacity = 206 , eCSSProperty_order = 207 , eCSSProperty__moz_orient = 208 , eCSSProperty__moz_osx_font_smoothing = 209 , eCSSProperty_outline_color = 210 , eCSSProperty_outline_offset = 211 , eCSSProperty__moz_outline_radius_bottomleft = 212 , eCSSProperty__moz_outline_radius_bottomright = 213 , eCSSProperty__moz_outline_radius_topleft = 214 , eCSSProperty__moz_outline_radius_topright = 215 , eCSSProperty_outline_style = 216 , eCSSProperty_outline_width = 217 , eCSSProperty_overflow_clip_box = 218 , eCSSProperty_overflow_x = 219 , eCSSProperty_overflow_y = 220 , eCSSProperty_padding_block_end = 221 , eCSSProperty_padding_block_start = 222 , eCSSProperty_padding_bottom = 223 , eCSSProperty_padding_inline_end = 224 , eCSSProperty_padding_inline_start = 225 , eCSSProperty_padding_left = 226 , eCSSProperty_padding_right = 227 , eCSSProperty_padding_top = 228 , eCSSProperty_page_break_after = 229 , eCSSProperty_page_break_before = 230 , eCSSProperty_page_break_inside = 231 , eCSSProperty_paint_order = 232 , eCSSProperty_perspective = 233 , eCSSProperty_perspective_origin = 234 , eCSSProperty_pointer_events = 235 , eCSSProperty_position = 236 , eCSSProperty_quotes = 237 , eCSSProperty_resize = 238 , eCSSProperty_right = 239 , eCSSProperty_ruby_align = 240 , eCSSProperty_ruby_position = 241 , eCSSProperty__moz_script_level = 242 , eCSSProperty__moz_script_min_size = 243 , eCSSProperty__moz_script_size_multiplier = 244 , eCSSProperty_scroll_behavior = 245 , eCSSProperty_overscroll_behavior_x = 246 , eCSSProperty_overscroll_behavior_y = 247 , eCSSProperty_scroll_snap_coordinate = 248 , eCSSProperty_scroll_snap_destination = 249 , eCSSProperty_scroll_snap_points_x = 250 , eCSSProperty_scroll_snap_points_y = 251 , eCSSProperty_scroll_snap_type_x = 252 , eCSSProperty_scroll_snap_type_y = 253 , eCSSProperty_shape_outside = 254 , eCSSProperty_shape_rendering = 255 , eCSSProperty__x_span = 256 , eCSSProperty__moz_stack_sizing = 257 , eCSSProperty_stop_color = 258 , eCSSProperty_stop_opacity = 259 , eCSSProperty_stroke = 260 , eCSSProperty_stroke_dasharray = 261 , eCSSProperty_stroke_dashoffset = 262 , eCSSProperty_stroke_linecap = 263 , eCSSProperty_stroke_linejoin = 264 , eCSSProperty_stroke_miterlimit = 265 , eCSSProperty_stroke_opacity = 266 , eCSSProperty_stroke_width = 267 , eCSSProperty__x_system_font = 268 , eCSSProperty__moz_tab_size = 269 , eCSSProperty_table_layout = 270 , eCSSProperty_text_align = 271 , eCSSProperty_text_align_last = 272 , eCSSProperty_text_anchor = 273 , eCSSProperty_text_combine_upright = 274 , eCSSProperty_text_decoration_color = 275 , eCSSProperty_text_decoration_line = 276 , eCSSProperty_text_decoration_style = 277 , eCSSProperty_text_emphasis_color = 278 , eCSSProperty_text_emphasis_position = 279 , eCSSProperty_text_emphasis_style = 280 , eCSSProperty__webkit_text_fill_color = 281 , eCSSProperty_text_indent = 282 , eCSSProperty_text_justify = 283 , eCSSProperty_text_orientation = 284 , eCSSProperty_text_overflow = 285 , eCSSProperty_text_rendering = 286 , eCSSProperty_text_shadow = 287 , eCSSProperty__moz_text_size_adjust = 288 , eCSSProperty__webkit_text_stroke_color = 289 , eCSSProperty__webkit_text_stroke_width = 290 , eCSSProperty_text_transform = 291 , eCSSProperty__x_text_zoom = 292 , eCSSProperty_top = 293 , eCSSProperty__moz_top_layer = 294 , eCSSProperty_touch_action = 295 , eCSSProperty_transform = 296 , eCSSProperty_transform_box = 297 , eCSSProperty_transform_origin = 298 , eCSSProperty_transform_style = 299 , eCSSProperty_transition_delay = 300 , eCSSProperty_transition_duration = 301 , eCSSProperty_transition_property = 302 , eCSSProperty_transition_timing_function = 303 , eCSSProperty_unicode_bidi = 304 , eCSSProperty__moz_user_focus = 305 , eCSSProperty__moz_user_input = 306 , eCSSProperty__moz_user_modify = 307 , eCSSProperty__moz_user_select = 308 , eCSSProperty_vector_effect = 309 , eCSSProperty_vertical_align = 310 , eCSSProperty_visibility = 311 , eCSSProperty_white_space = 312 , eCSSProperty_width = 313 , eCSSProperty_will_change = 314 , eCSSProperty__moz_window_dragging = 315 , eCSSProperty__moz_window_shadow = 316 , eCSSProperty__moz_window_opacity = 317 , eCSSProperty__moz_window_transform = 318 , eCSSProperty__moz_window_transform_origin = 319 , eCSSProperty_word_break = 320 , eCSSProperty_word_spacing = 321 , eCSSProperty_overflow_wrap = 322 , eCSSProperty_writing_mode = 323 , eCSSProperty_z_index = 324 , eCSSProperty_all = 325 , eCSSProperty_animation = 326 , eCSSProperty_background = 327 , eCSSProperty_background_position = 328 , eCSSProperty_border = 329 , eCSSProperty_border_block_end = 330 , eCSSProperty_border_block_start = 331 , eCSSProperty_border_bottom = 332 , eCSSProperty_border_color = 333 , eCSSProperty_border_image = 334 , eCSSProperty_border_inline_end = 335 , eCSSProperty_border_inline_start = 336 , eCSSProperty_border_left = 337 , eCSSProperty_border_radius = 338 , eCSSProperty_border_right = 339 , eCSSProperty_border_style = 340 , eCSSProperty_border_top = 341 , eCSSProperty_border_width = 342 , eCSSProperty_column_rule = 343 , eCSSProperty_columns = 344 , eCSSProperty_flex = 345 , eCSSProperty_flex_flow = 346 , eCSSProperty_font = 347 , eCSSProperty_font_variant = 348 , eCSSProperty_grid = 349 , eCSSProperty_grid_area = 350 , eCSSProperty_grid_column = 351 , eCSSProperty_grid_gap = 352 , eCSSProperty_grid_row = 353 , eCSSProperty_grid_template = 354 , eCSSProperty_list_style = 355 , eCSSProperty_margin = 356 , eCSSProperty_marker = 357 , eCSSProperty_mask = 358 , eCSSProperty_mask_position = 359 , eCSSProperty_outline = 360 , eCSSProperty__moz_outline_radius = 361 , eCSSProperty_overflow = 362 , eCSSProperty_padding = 363 , eCSSProperty_place_content = 364 , eCSSProperty_place_items = 365 , eCSSProperty_place_self = 366 , eCSSProperty_overscroll_behavior = 367 , eCSSProperty_scroll_snap_type = 368 , eCSSProperty_text_decoration = 369 , eCSSProperty_text_emphasis = 370 , eCSSProperty__webkit_text_stroke = 371 , eCSSProperty__moz_transform = 372 , eCSSProperty_transition = 373 , eCSSPropertyAlias_WordWrap = 374 , eCSSPropertyAlias_MozTransformOrigin = 375 , eCSSPropertyAlias_MozPerspectiveOrigin = 376 , eCSSPropertyAlias_MozPerspective = 377 , eCSSPropertyAlias_MozTransformStyle = 378 , eCSSPropertyAlias_MozBackfaceVisibility = 379 , eCSSPropertyAlias_MozBorderImage = 380 , eCSSPropertyAlias_MozTransition = 381 , eCSSPropertyAlias_MozTransitionDelay = 382 , eCSSPropertyAlias_MozTransitionDuration = 383 , eCSSPropertyAlias_MozTransitionProperty = 384 , eCSSPropertyAlias_MozTransitionTimingFunction = 385 , eCSSPropertyAlias_MozAnimation = 386 , eCSSPropertyAlias_MozAnimationDelay = 387 , eCSSPropertyAlias_MozAnimationDirection = 388 , eCSSPropertyAlias_MozAnimationDuration = 389 , eCSSPropertyAlias_MozAnimationFillMode = 390 , eCSSPropertyAlias_MozAnimationIterationCount = 391 , eCSSPropertyAlias_MozAnimationName = 392 , eCSSPropertyAlias_MozAnimationPlayState = 393 , eCSSPropertyAlias_MozAnimationTimingFunction = 394 , eCSSPropertyAlias_MozBoxSizing = 395 , eCSSPropertyAlias_MozFontFeatureSettings = 396 , eCSSPropertyAlias_MozFontLanguageOverride = 397 , eCSSPropertyAlias_MozPaddingEnd = 398 , eCSSPropertyAlias_MozPaddingStart = 399 , eCSSPropertyAlias_MozMarginEnd = 400 , eCSSPropertyAlias_MozMarginStart = 401 , eCSSPropertyAlias_MozBorderEnd = 402 , eCSSPropertyAlias_MozBorderEndColor = 403 , eCSSPropertyAlias_MozBorderEndStyle = 404 , eCSSPropertyAlias_MozBorderEndWidth = 405 , eCSSPropertyAlias_MozBorderStart = 406 , eCSSPropertyAlias_MozBorderStartColor = 407 , eCSSPropertyAlias_MozBorderStartStyle = 408 , eCSSPropertyAlias_MozBorderStartWidth = 409 , eCSSPropertyAlias_MozHyphens = 410 , eCSSPropertyAlias_MozColumnCount = 411 , eCSSPropertyAlias_MozColumnFill = 412 , eCSSPropertyAlias_MozColumnGap = 413 , eCSSPropertyAlias_MozColumnRule = 414 , eCSSPropertyAlias_MozColumnRuleColor = 415 , eCSSPropertyAlias_MozColumnRuleStyle = 416 , eCSSPropertyAlias_MozColumnRuleWidth = 417 , eCSSPropertyAlias_MozColumnWidth = 418 , eCSSPropertyAlias_MozColumns = 419 , eCSSPropertyAlias_WebkitAnimation = 420 , eCSSPropertyAlias_WebkitAnimationDelay = 421 , eCSSPropertyAlias_WebkitAnimationDirection = 422 , eCSSPropertyAlias_WebkitAnimationDuration = 423 , eCSSPropertyAlias_WebkitAnimationFillMode = 424 , eCSSPropertyAlias_WebkitAnimationIterationCount = 425 , eCSSPropertyAlias_WebkitAnimationName = 426 , eCSSPropertyAlias_WebkitAnimationPlayState = 427 , eCSSPropertyAlias_WebkitAnimationTimingFunction = 428 , eCSSPropertyAlias_WebkitFilter = 429 , eCSSPropertyAlias_WebkitTextSizeAdjust = 430 , eCSSPropertyAlias_WebkitTransform = 431 , eCSSPropertyAlias_WebkitTransformOrigin = 432 , eCSSPropertyAlias_WebkitTransformStyle = 433 , eCSSPropertyAlias_WebkitBackfaceVisibility = 434 , eCSSPropertyAlias_WebkitPerspective = 435 , eCSSPropertyAlias_WebkitPerspectiveOrigin = 436 , eCSSPropertyAlias_WebkitTransition = 437 , eCSSPropertyAlias_WebkitTransitionDelay = 438 , eCSSPropertyAlias_WebkitTransitionDuration = 439 , eCSSPropertyAlias_WebkitTransitionProperty = 440 , eCSSPropertyAlias_WebkitTransitionTimingFunction = 441 , eCSSPropertyAlias_WebkitBorderRadius = 442 , eCSSPropertyAlias_WebkitBorderTopLeftRadius = 443 , eCSSPropertyAlias_WebkitBorderTopRightRadius = 444 , eCSSPropertyAlias_WebkitBorderBottomLeftRadius = 445 , eCSSPropertyAlias_WebkitBorderBottomRightRadius = 446 , eCSSPropertyAlias_WebkitBackgroundClip = 447 , eCSSPropertyAlias_WebkitBackgroundOrigin = 448 , eCSSPropertyAlias_WebkitBackgroundSize = 449 , eCSSPropertyAlias_WebkitBorderImage = 450 , eCSSPropertyAlias_WebkitBoxShadow = 451 , eCSSPropertyAlias_WebkitBoxSizing = 452 , eCSSPropertyAlias_WebkitBoxFlex = 453 , eCSSPropertyAlias_WebkitBoxOrdinalGroup = 454 , eCSSPropertyAlias_WebkitBoxOrient = 455 , eCSSPropertyAlias_WebkitBoxDirection = 456 , eCSSPropertyAlias_WebkitBoxAlign = 457 , eCSSPropertyAlias_WebkitBoxPack = 458 , eCSSPropertyAlias_WebkitFlexDirection = 459 , eCSSPropertyAlias_WebkitFlexWrap = 460 , eCSSPropertyAlias_WebkitFlexFlow = 461 , eCSSPropertyAlias_WebkitOrder = 462 , eCSSPropertyAlias_WebkitFlex = 463 , eCSSPropertyAlias_WebkitFlexGrow = 464 , eCSSPropertyAlias_WebkitFlexShrink = 465 , eCSSPropertyAlias_WebkitFlexBasis = 466 , eCSSPropertyAlias_WebkitJustifyContent = 467 , eCSSPropertyAlias_WebkitAlignItems = 468 , eCSSPropertyAlias_WebkitAlignSelf = 469 , eCSSPropertyAlias_WebkitAlignContent = 470 , eCSSPropertyAlias_WebkitUserSelect = 471 , eCSSPropertyAlias_WebkitMask = 472 , eCSSPropertyAlias_WebkitMaskClip = 473 , eCSSPropertyAlias_WebkitMaskComposite = 474 , eCSSPropertyAlias_WebkitMaskImage = 475 , eCSSPropertyAlias_WebkitMaskOrigin = 476 , eCSSPropertyAlias_WebkitMaskPosition = 477 , eCSSPropertyAlias_WebkitMaskPositionX = 478 , eCSSPropertyAlias_WebkitMaskPositionY = 479 , eCSSPropertyAlias_WebkitMaskRepeat = 480 , eCSSPropertyAlias_WebkitMaskSize = 481 , eCSSPropertyExtra_no_properties = 482 , eCSSPropertyExtra_all_properties = 483 , eCSSPropertyExtra_x_none_value = 484 , eCSSPropertyExtra_x_auto_value = 485 , eCSSPropertyExtra_variable = 486 , eCSSProperty_DOM = 487 , } # [ repr ( i32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsCSSCounterDesc { eCSSCounterDesc_UNKNOWN = -1 , eCSSCounterDesc_System = 0 , eCSSCounterDesc_Symbols = 1 , eCSSCounterDesc_AdditiveSymbols = 2 , eCSSCounterDesc_Negative = 3 , eCSSCounterDesc_Prefix = 4 , eCSSCounterDesc_Suffix = 5 , eCSSCounterDesc_Range = 6 , eCSSCounterDesc_Pad = 7 , eCSSCounterDesc_Fallback = 8 , eCSSCounterDesc_SpeakAs = 9 , eCSSCounterDesc_COUNT = 10 , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoStyleSet { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoSourceSizeList { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RustString { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoStyleSheetContents { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoDeclarationBlock { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoStyleRule { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoAnimationValue { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoMediaList { _unused : [ u8 ; 0 ] } pub mod nsStyleTransformMatrix { # [ allow ( unused_imports ) ] use self :: super :: super :: root ; # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum MatrixTransformOperator { Interpolate = 0 , Accumulate = 1 , } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsCSSPropertyIDSet { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsSimpleContentList { _unused : [ u8 ; 0 ] } pub type RawGeckoNode = root :: nsINode ; pub type RawGeckoElement = root :: mozilla :: dom :: Element ; pub type RawGeckoDocument = root :: nsIDocument ; pub type RawGeckoPresContext = root :: nsPresContext ; pub type RawGeckoXBLBinding = root :: nsXBLBinding ; pub type RawGeckoURLExtraData = root :: mozilla :: URLExtraData ; pub type RawGeckoServoAnimationValueList = root :: nsTArray < root :: RefPtr < root :: RawServoAnimationValue > > ; pub type RawGeckoKeyframeList = root :: nsTArray < root :: mozilla :: Keyframe > ; pub type RawGeckoPropertyValuePairList = root :: nsTArray < root :: mozilla :: PropertyValuePair > ; pub type RawGeckoComputedKeyframeValuesList = root :: nsTArray < root :: nsTArray < root :: mozilla :: PropertyStyleAnimationValuePair > > ; pub type RawGeckoStyleAnimationList = root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > ; pub type RawGeckoFontFaceRuleList = root :: nsTArray < root :: nsFontFaceRuleContainer > ; pub type RawGeckoAnimationPropertySegment = root :: mozilla :: AnimationPropertySegment ; pub type RawGeckoComputedTiming = root :: mozilla :: ComputedTiming ; pub type RawGeckoServoStyleRuleList = root :: nsTArray < * const root :: RawServoStyleRule > ; pub type RawGeckoCSSPropertyIDList = root :: nsTArray < root :: nsCSSPropertyID > ; pub type RawGeckoGfxMatrix4x4 = [ root :: mozilla :: gfx :: Float ; 16usize ] ; pub type RawGeckoStyleChildrenIterator = root :: mozilla :: dom :: StyleChildrenIterator ; pub type ServoStyleContextBorrowed = * const root :: mozilla :: ServoStyleContext ; pub type ServoStyleContextBorrowedOrNull = * const root :: mozilla :: ServoStyleContext ; pub type ServoComputedDataBorrowed = * const root :: ServoComputedData ; pub type RawGeckoNodeBorrowed = * const root :: RawGeckoNode ; pub type RawGeckoNodeBorrowedOrNull = * const root :: RawGeckoNode ; pub type RawGeckoElementBorrowed = * const root :: RawGeckoElement ; pub type RawGeckoElementBorrowedOrNull = * const root :: RawGeckoElement ; pub type RawGeckoDocumentBorrowed = * const root :: RawGeckoDocument ; pub type RawGeckoDocumentBorrowedOrNull = * const root :: RawGeckoDocument ; pub type RawGeckoXBLBindingBorrowed = * const root :: RawGeckoXBLBinding ; pub type RawGeckoXBLBindingBorrowedOrNull = * const root :: RawGeckoXBLBinding ; pub type RawGeckoPresContextOwned = * mut root :: RawGeckoPresContext ; pub type RawGeckoPresContextBorrowed = * const root :: RawGeckoPresContext ; pub type RawGeckoPresContextBorrowedMut = * mut root :: RawGeckoPresContext ; pub type RawGeckoServoAnimationValueListBorrowedMut = * mut root :: RawGeckoServoAnimationValueList ; pub type RawGeckoServoAnimationValueListBorrowed = * const root :: RawGeckoServoAnimationValueList ; pub type RawGeckoKeyframeListBorrowedMut = * mut root :: RawGeckoKeyframeList ; pub type RawGeckoKeyframeListBorrowed = * const root :: RawGeckoKeyframeList ; pub type RawGeckoPropertyValuePairListBorrowedMut = * mut root :: RawGeckoPropertyValuePairList ; pub type RawGeckoPropertyValuePairListBorrowed = * const root :: RawGeckoPropertyValuePairList ; pub type RawGeckoComputedKeyframeValuesListBorrowedMut = * mut root :: RawGeckoComputedKeyframeValuesList ; pub type RawGeckoStyleAnimationListBorrowedMut = * mut root :: RawGeckoStyleAnimationList ; pub type RawGeckoStyleAnimationListBorrowed = * const root :: RawGeckoStyleAnimationList ; pub type RawGeckoFontFaceRuleListBorrowedMut = * mut root :: RawGeckoFontFaceRuleList ; pub type RawGeckoAnimationPropertySegmentBorrowed = * const root :: RawGeckoAnimationPropertySegment ; pub type RawGeckoComputedTimingBorrowed = * const root :: RawGeckoComputedTiming ; pub type RawGeckoServoStyleRuleListBorrowedMut = * mut root :: RawGeckoServoStyleRuleList ; pub type RawGeckoCSSPropertyIDListBorrowed = * const root :: RawGeckoCSSPropertyIDList ; pub type RawGeckoStyleChildrenIteratorBorrowedMut = * mut root :: RawGeckoStyleChildrenIterator ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsHTMLCSSStyleSheet { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsHTMLStyleSheet { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIBFCacheEntry { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDocumentEncoder { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIStructuredCloneContainer { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsSMILAnimationController { _unused : [ u8 ; 0 ] } pub const HSTSPrimingState_eNO_HSTS_PRIMING : root :: HSTSPrimingState = 0 ; pub const HSTSPrimingState_eHSTS_PRIMING_ALLOW : root :: HSTSPrimingState = 1 ; pub const HSTSPrimingState_eHSTS_PRIMING_BLOCK : root :: HSTSPrimingState = 2 ; pub type HSTSPrimingState = :: std :: os :: raw :: c_int ; # [ repr ( C ) ] pub struct nsIDocument { pub _base : root :: nsINode , pub _base_1 : root :: mozilla :: dom :: DispatcherTrait , pub mDeprecationWarnedAbout : u64 , pub mDocWarningWarnedAbout : u64 , pub mServoSelectorCache : root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > , pub mGeckoSelectorCache : root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > , pub mReferrer : root :: nsCString , pub mLastModified : ::nsstring::nsStringRepr , pub mDocumentURI : root :: nsCOMPtr , pub mOriginalURI : root :: nsCOMPtr , pub mChromeXHRDocURI : root :: nsCOMPtr , pub mDocumentBaseURI : root :: nsCOMPtr , pub mChromeXHRDocBaseURI : root :: nsCOMPtr , pub mCachedURLData : root :: RefPtr < root :: mozilla :: URLExtraData > , pub mDocumentLoadGroup : root :: nsWeakPtr , pub mReferrerPolicySet : bool , pub mReferrerPolicy : root :: nsIDocument_ReferrerPolicyEnum , pub mBlockAllMixedContent : bool , pub mBlockAllMixedContentPreloads : bool , pub mUpgradeInsecureRequests : bool , pub mUpgradeInsecurePreloads : bool , pub mHSTSPrimingURIList : [ u64 ; 4usize ] , pub mDocumentContainer : u64 , pub mCharacterSet : root :: mozilla :: NotNull < * const root :: mozilla :: Encoding > , pub mCharacterSetSource : i32 , pub mParentDocument : * mut root :: nsIDocument , pub mCachedRootElement : * mut root :: mozilla :: dom :: Element , pub mNodeInfoManager : * mut root :: nsNodeInfoManager , pub mCSSLoader : root :: RefPtr < root :: mozilla :: css :: Loader > , pub mStyleImageLoader : root :: RefPtr < root :: mozilla :: css :: ImageLoader > , pub mAttrStyleSheet : root :: RefPtr < root :: nsHTMLStyleSheet > , pub mStyleAttrStyleSheet : root :: RefPtr < root :: nsHTMLCSSStyleSheet > , pub mImageTracker : root :: RefPtr < root :: mozilla :: dom :: ImageTracker > , pub mActivityObservers : u64 , pub mLinksToUpdate : [ u64 ; 3usize ] , pub mAnimationController : root :: RefPtr < root :: nsSMILAnimationController > , pub mPropertyTable : root :: nsPropertyTable , pub mExtraPropertyTables : root :: nsTArray < root :: nsAutoPtr < root :: nsPropertyTable > > , pub mChildrenCollection : root :: nsCOMPtr , pub mFontFaceSet : root :: RefPtr < root :: mozilla :: dom :: FontFaceSet > , pub mLastFocusTime : root :: mozilla :: TimeStamp , pub _bitfield_1 : [ u8 ; 7usize ] , pub mCompatMode : root :: nsCompatibility , pub mReadyState : root :: nsIDocument_ReadyState , pub mStyleBackendType : root :: mozilla :: StyleBackendType , pub mVisibilityState : root :: mozilla :: dom :: VisibilityState , pub mType : root :: nsIDocument_Type , pub mDefaultElementType : u8 , pub mAllowXULXBL : root :: nsIDocument_Tri , pub mScriptGlobalObject : root :: nsCOMPtr , pub mOriginalDocument : root :: nsCOMPtr , pub mBidiOptions : u32 , pub mSandboxFlags : u32 , pub mContentLanguage : root :: nsCString , pub mChannel : root :: nsCOMPtr , pub mContentType : root :: nsCString , pub mId : ::nsstring::nsStringRepr , pub mSecurityInfo : root :: nsCOMPtr , pub mFailedChannel : root :: nsCOMPtr , pub mPartID : u32 , pub mMarkedCCGeneration : u32 , pub mPresShell : * mut root :: nsIPresShell , pub mSubtreeModifiedTargets : root :: nsCOMArray , pub mSubtreeModifiedDepth : u32 , pub mDisplayDocument : root :: nsCOMPtr , pub mEventsSuppressed : u32 , 
+ # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsExpirationState { pub _bitfield_1 : u32 , pub __bindgen_align : [ u32 ; 0usize ] , } pub const nsExpirationState_NOT_TRACKED : root :: nsExpirationState__bindgen_ty_1 = 15 ; pub const nsExpirationState_MAX_INDEX_IN_GENERATION : root :: nsExpirationState__bindgen_ty_1 = 268435455 ; pub type nsExpirationState__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_nsExpirationState ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsExpirationState > ( ) , 4usize , concat ! ( "Size of: " , stringify ! ( nsExpirationState ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsExpirationState > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsExpirationState ) ) ) ; } impl Clone for nsExpirationState { fn clone ( & self ) -> Self { * self } } impl nsExpirationState { # [ inline ] pub fn mGeneration ( & self ) -> u32 { let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; let mask = 0xf as u32 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mGeneration ( & mut self , val : u32 ) { let mask = 0xf as u32 ; let val = val as u32 as u32 ; let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) ; } } # [ inline ] pub fn mIndexInGeneration ( & self ) -> u32 { let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; let mask = 0xfffffff0 as u32 ; let val = ( unit_field_val & mask ) >> 4usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mIndexInGeneration ( & mut self , val : u32 ) { let mask = 0xfffffff0 as u32 ; let val = val as u32 as u32 ; let mut unit_field_val : u32 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u32 as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 4usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u32 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mGeneration : u32 , mIndexInGeneration : u32 ) -> u32 { ( ( 0 | ( ( mGeneration as u32 as u32 ) << 0usize ) & ( 0xf as u32 ) ) | ( ( mIndexInGeneration as u32 as u32 ) << 4usize ) & ( 0xfffffff0 as u32 ) ) } } pub const nsCSSPropertyID_eCSSProperty_COUNT_no_shorthands : root :: nsCSSPropertyID = nsCSSPropertyID :: eCSSProperty_all ; pub const nsCSSPropertyID_eCSSProperty_COUNT_DUMMY : root :: nsCSSPropertyID = nsCSSPropertyID :: eCSSProperty_z_index ; pub const nsCSSPropertyID_eCSSProperty_COUNT : root :: nsCSSPropertyID = nsCSSPropertyID :: eCSSPropertyAlias_WordWrap ; pub const nsCSSPropertyID_eCSSProperty_COUNT_DUMMY2 : root :: nsCSSPropertyID = nsCSSPropertyID :: eCSSProperty_transition ; pub const nsCSSPropertyID_eCSSProperty_COUNT_with_aliases : root :: nsCSSPropertyID = nsCSSPropertyID :: eCSSPropertyExtra_no_properties ; pub const nsCSSPropertyID_eCSSProperty_COUNT_DUMMY3 : root :: nsCSSPropertyID = nsCSSPropertyID :: eCSSPropertyAlias_WebkitMaskSize ; # [ repr ( i32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsCSSPropertyID { eCSSProperty_UNKNOWN = -1 , eCSSProperty_align_content = 0 , eCSSProperty_align_items = 1 , eCSSProperty_align_self = 2 , eCSSProperty_animation_delay = 3 , eCSSProperty_animation_direction = 4 , eCSSProperty_animation_duration = 5 , eCSSProperty_animation_fill_mode = 6 , eCSSProperty_animation_iteration_count = 7 , eCSSProperty_animation_name = 8 , eCSSProperty_animation_play_state = 9 , eCSSProperty_animation_timing_function = 10 , eCSSProperty__moz_appearance = 11 , eCSSProperty_backface_visibility = 12 , eCSSProperty_background_attachment = 13 , eCSSProperty_background_blend_mode = 14 , eCSSProperty_background_clip = 15 , eCSSProperty_background_color = 16 , eCSSProperty_background_image = 17 , eCSSProperty_background_origin = 18 , eCSSProperty_background_position_x = 19 , eCSSProperty_background_position_y = 20 , eCSSProperty_background_repeat = 21 , eCSSProperty_background_size = 22 , eCSSProperty__moz_binding = 23 , eCSSProperty_block_size = 24 , eCSSProperty_border_block_end_color = 25 , eCSSProperty_border_block_end_style = 26 , eCSSProperty_border_block_end_width = 27 , eCSSProperty_border_block_start_color = 28 , eCSSProperty_border_block_start_style = 29 , eCSSProperty_border_block_start_width = 30 , eCSSProperty_border_bottom_color = 31 , eCSSProperty__moz_border_bottom_colors = 32 , eCSSProperty_border_bottom_left_radius = 33 , eCSSProperty_border_bottom_right_radius = 34 , eCSSProperty_border_bottom_style = 35 , eCSSProperty_border_bottom_width = 36 , eCSSProperty_border_collapse = 37 , eCSSProperty_border_image_outset = 38 , eCSSProperty_border_image_repeat = 39 , eCSSProperty_border_image_slice = 40 , eCSSProperty_border_image_source = 41 , eCSSProperty_border_image_width = 42 , eCSSProperty_border_inline_end_color = 43 , eCSSProperty_border_inline_end_style = 44 , eCSSProperty_border_inline_end_width = 45 , eCSSProperty_border_inline_start_color = 46 , eCSSProperty_border_inline_start_style = 47 , eCSSProperty_border_inline_start_width = 48 , eCSSProperty_border_left_color = 49 , eCSSProperty__moz_border_left_colors = 50 , eCSSProperty_border_left_style = 51 , eCSSProperty_border_left_width = 52 , eCSSProperty_border_right_color = 53 , eCSSProperty__moz_border_right_colors = 54 , eCSSProperty_border_right_style = 55 , eCSSProperty_border_right_width = 56 , eCSSProperty_border_spacing = 57 , eCSSProperty_border_top_color = 58 , eCSSProperty__moz_border_top_colors = 59 , eCSSProperty_border_top_left_radius = 60 , eCSSProperty_border_top_right_radius = 61 , eCSSProperty_border_top_style = 62 , eCSSProperty_border_top_width = 63 , eCSSProperty_bottom = 64 , eCSSProperty__moz_box_align = 65 , eCSSProperty_box_decoration_break = 66 , eCSSProperty__moz_box_direction = 67 , eCSSProperty__moz_box_flex = 68 , eCSSProperty__moz_box_ordinal_group = 69 , eCSSProperty__moz_box_orient = 70 , eCSSProperty__moz_box_pack = 71 , eCSSProperty_box_shadow = 72 , eCSSProperty_box_sizing = 73 , eCSSProperty_caption_side = 74 , eCSSProperty_caret_color = 75 , eCSSProperty_clear = 76 , eCSSProperty_clip = 77 , eCSSProperty_clip_path = 78 , eCSSProperty_clip_rule = 79 , eCSSProperty_color = 80 , eCSSProperty_color_adjust = 81 , eCSSProperty_color_interpolation = 82 , eCSSProperty_color_interpolation_filters = 83 , eCSSProperty_column_count = 84 , eCSSProperty_column_fill = 85 , eCSSProperty_column_gap = 86 , eCSSProperty_column_rule_color = 87 , eCSSProperty_column_rule_style = 88 , eCSSProperty_column_rule_width = 89 , eCSSProperty_column_span = 90 , eCSSProperty_column_width = 91 , eCSSProperty_contain = 92 , eCSSProperty_content = 93 , eCSSProperty__moz_context_properties = 94 , eCSSProperty__moz_control_character_visibility = 95 , eCSSProperty_counter_increment = 96 , eCSSProperty_counter_reset = 97 , eCSSProperty_cursor = 98 , eCSSProperty_direction = 99 , eCSSProperty_display = 100 , eCSSProperty_dominant_baseline = 101 , eCSSProperty_empty_cells = 102 , eCSSProperty_fill = 103 , eCSSProperty_fill_opacity = 104 , eCSSProperty_fill_rule = 105 , eCSSProperty_filter = 106 , eCSSProperty_flex_basis = 107 , eCSSProperty_flex_direction = 108 , eCSSProperty_flex_grow = 109 , eCSSProperty_flex_shrink = 110 , eCSSProperty_flex_wrap = 111 , eCSSProperty_float_ = 112 , eCSSProperty__moz_float_edge = 113 , eCSSProperty_flood_color = 114 , eCSSProperty_flood_opacity = 115 , eCSSProperty_font_family = 116 , eCSSProperty_font_feature_settings = 117 , eCSSProperty_font_kerning = 118 , eCSSProperty_font_language_override = 119 , eCSSProperty_font_size = 120 , eCSSProperty_font_size_adjust = 121 , eCSSProperty__moz_font_smoothing_background_color = 122 , eCSSProperty_font_stretch = 123 , eCSSProperty_font_style = 124 , eCSSProperty_font_synthesis = 125 , eCSSProperty_font_variant_alternates = 126 , eCSSProperty_font_variant_caps = 127 , eCSSProperty_font_variant_east_asian = 128 , eCSSProperty_font_variant_ligatures = 129 , eCSSProperty_font_variant_numeric = 130 , eCSSProperty_font_variant_position = 131 , eCSSProperty_font_variation_settings = 132 , eCSSProperty_font_weight = 133 , eCSSProperty__moz_force_broken_image_icon = 134 , eCSSProperty_grid_auto_columns = 135 , eCSSProperty_grid_auto_flow = 136 , eCSSProperty_grid_auto_rows = 137 , eCSSProperty_grid_column_end = 138 , eCSSProperty_grid_column_gap = 139 , eCSSProperty_grid_column_start = 140 , eCSSProperty_grid_row_end = 141 , eCSSProperty_grid_row_gap = 142 , eCSSProperty_grid_row_start = 143 , eCSSProperty_grid_template_areas = 144 , eCSSProperty_grid_template_columns = 145 , eCSSProperty_grid_template_rows = 146 , eCSSProperty_height = 147 , eCSSProperty_hyphens = 148 , eCSSProperty_initial_letter = 149 , eCSSProperty_image_orientation = 150 , eCSSProperty__moz_image_region = 151 , eCSSProperty_image_rendering = 152 , eCSSProperty_ime_mode = 153 , eCSSProperty_inline_size = 154 , eCSSProperty_isolation = 155 , eCSSProperty_justify_content = 156 , eCSSProperty_justify_items = 157 , eCSSProperty_justify_self = 158 , eCSSProperty__x_lang = 159 , eCSSProperty_left = 160 , eCSSProperty_letter_spacing = 161 , eCSSProperty_lighting_color = 162 , eCSSProperty_line_height = 163 , eCSSProperty_list_style_image = 164 , eCSSProperty_list_style_position = 165 , eCSSProperty_list_style_type = 166 , eCSSProperty_margin_block_end = 167 , eCSSProperty_margin_block_start = 168 , eCSSProperty_margin_bottom = 169 , eCSSProperty_margin_inline_end = 170 , eCSSProperty_margin_inline_start = 171 , eCSSProperty_margin_left = 172 , eCSSProperty_margin_right = 173 , eCSSProperty_margin_top = 174 , eCSSProperty_marker_end = 175 , eCSSProperty_marker_mid = 176 , eCSSProperty_marker_start = 177 , eCSSProperty_mask_clip = 178 , eCSSProperty_mask_composite = 179 , eCSSProperty_mask_image = 180 , eCSSProperty_mask_mode = 181 , eCSSProperty_mask_origin = 182 , eCSSProperty_mask_position_x = 183 , eCSSProperty_mask_position_y = 184 , eCSSProperty_mask_repeat = 185 , eCSSProperty_mask_size = 186 , eCSSProperty_mask_type = 187 , eCSSProperty__moz_math_display = 188 , eCSSProperty__moz_math_variant = 189 , eCSSProperty_max_block_size = 190 , eCSSProperty_max_height = 191 , eCSSProperty_max_inline_size = 192 , eCSSProperty_max_width = 193 , eCSSProperty_min_block_size = 194 , eCSSProperty__moz_min_font_size_ratio = 195 , eCSSProperty_min_height = 196 , eCSSProperty_min_inline_size = 197 , eCSSProperty_min_width = 198 , eCSSProperty_mix_blend_mode = 199 , eCSSProperty_object_fit = 200 , eCSSProperty_object_position = 201 , eCSSProperty_offset_block_end = 202 , eCSSProperty_offset_block_start = 203 , eCSSProperty_offset_inline_end = 204 , eCSSProperty_offset_inline_start = 205 , eCSSProperty_opacity = 206 , eCSSProperty_order = 207 , eCSSProperty__moz_orient = 208 , eCSSProperty__moz_osx_font_smoothing = 209 , eCSSProperty_outline_color = 210 , eCSSProperty_outline_offset = 211 , eCSSProperty__moz_outline_radius_bottomleft = 212 , eCSSProperty__moz_outline_radius_bottomright = 213 , eCSSProperty__moz_outline_radius_topleft = 214 , eCSSProperty__moz_outline_radius_topright = 215 , eCSSProperty_outline_style = 216 , eCSSProperty_outline_width = 217 , eCSSProperty_overflow_clip_box = 218 , eCSSProperty_overflow_x = 219 , eCSSProperty_overflow_y = 220 , eCSSProperty_padding_block_end = 221 , eCSSProperty_padding_block_start = 222 , eCSSProperty_padding_bottom = 223 , eCSSProperty_padding_inline_end = 224 , eCSSProperty_padding_inline_start = 225 , eCSSProperty_padding_left = 226 , eCSSProperty_padding_right = 227 , eCSSProperty_padding_top = 228 , eCSSProperty_page_break_after = 229 , eCSSProperty_page_break_before = 230 , eCSSProperty_page_break_inside = 231 , eCSSProperty_paint_order = 232 , eCSSProperty_perspective = 233 , eCSSProperty_perspective_origin = 234 , eCSSProperty_pointer_events = 235 , eCSSProperty_position = 236 , eCSSProperty_quotes = 237 , eCSSProperty_resize = 238 , eCSSProperty_right = 239 , eCSSProperty_ruby_align = 240 , eCSSProperty_ruby_position = 241 , eCSSProperty__moz_script_level = 242 , eCSSProperty__moz_script_min_size = 243 , eCSSProperty__moz_script_size_multiplier = 244 , eCSSProperty_scroll_behavior = 245 , eCSSProperty_overscroll_behavior_x = 246 , eCSSProperty_overscroll_behavior_y = 247 , eCSSProperty_scroll_snap_coordinate = 248 , eCSSProperty_scroll_snap_destination = 249 , eCSSProperty_scroll_snap_points_x = 250 , eCSSProperty_scroll_snap_points_y = 251 , eCSSProperty_scroll_snap_type_x = 252 , eCSSProperty_scroll_snap_type_y = 253 , eCSSProperty_shape_image_threshold = 254 , eCSSProperty_shape_outside = 255 , eCSSProperty_shape_rendering = 256 , eCSSProperty__x_span = 257 , eCSSProperty__moz_stack_sizing = 258 , eCSSProperty_stop_color = 259 , eCSSProperty_stop_opacity = 260 , eCSSProperty_stroke = 261 , eCSSProperty_stroke_dasharray = 262 , eCSSProperty_stroke_dashoffset = 263 , eCSSProperty_stroke_linecap = 264 , eCSSProperty_stroke_linejoin = 265 , eCSSProperty_stroke_miterlimit = 266 , eCSSProperty_stroke_opacity = 267 , eCSSProperty_stroke_width = 268 , eCSSProperty__x_system_font = 269 , eCSSProperty__moz_tab_size = 270 , eCSSProperty_table_layout = 271 , eCSSProperty_text_align = 272 , eCSSProperty_text_align_last = 273 , eCSSProperty_text_anchor = 274 , eCSSProperty_text_combine_upright = 275 , eCSSProperty_text_decoration_color = 276 , eCSSProperty_text_decoration_line = 277 , eCSSProperty_text_decoration_style = 278 , eCSSProperty_text_emphasis_color = 279 , eCSSProperty_text_emphasis_position = 280 , eCSSProperty_text_emphasis_style = 281 , eCSSProperty__webkit_text_fill_color = 282 , eCSSProperty_text_indent = 283 , eCSSProperty_text_justify = 284 , eCSSProperty_text_orientation = 285 , eCSSProperty_text_overflow = 286 , eCSSProperty_text_rendering = 287 , eCSSProperty_text_shadow = 288 , eCSSProperty__moz_text_size_adjust = 289 , eCSSProperty__webkit_text_stroke_color = 290 , eCSSProperty__webkit_text_stroke_width = 291 , eCSSProperty_text_transform = 292 , eCSSProperty__x_text_zoom = 293 , eCSSProperty_top = 294 , eCSSProperty__moz_top_layer = 295 , eCSSProperty_touch_action = 296 , eCSSProperty_transform = 297 , eCSSProperty_transform_box = 298 , eCSSProperty_transform_origin = 299 , eCSSProperty_transform_style = 300 , eCSSProperty_transition_delay = 301 , eCSSProperty_transition_duration = 302 , eCSSProperty_transition_property = 303 , eCSSProperty_transition_timing_function = 304 , eCSSProperty_unicode_bidi = 305 , eCSSProperty__moz_user_focus = 306 , eCSSProperty__moz_user_input = 307 , eCSSProperty__moz_user_modify = 308 , eCSSProperty__moz_user_select = 309 , eCSSProperty_vector_effect = 310 , eCSSProperty_vertical_align = 311 , eCSSProperty_visibility = 312 , eCSSProperty_white_space = 313 , eCSSProperty_width = 314 , eCSSProperty_will_change = 315 , eCSSProperty__moz_window_dragging = 316 , eCSSProperty__moz_window_shadow = 317 , eCSSProperty__moz_window_opacity = 318 , eCSSProperty__moz_window_transform = 319 , eCSSProperty__moz_window_transform_origin = 320 , eCSSProperty_word_break = 321 , eCSSProperty_word_spacing = 322 , eCSSProperty_overflow_wrap = 323 , eCSSProperty_writing_mode = 324 , eCSSProperty_z_index = 325 , eCSSProperty_all = 326 , eCSSProperty_animation = 327 , eCSSProperty_background = 328 , eCSSProperty_background_position = 329 , eCSSProperty_border = 330 , eCSSProperty_border_block_end = 331 , eCSSProperty_border_block_start = 332 , eCSSProperty_border_bottom = 333 , eCSSProperty_border_color = 334 , eCSSProperty_border_image = 335 , eCSSProperty_border_inline_end = 336 , eCSSProperty_border_inline_start = 337 , eCSSProperty_border_left = 338 , eCSSProperty_border_radius = 339 , eCSSProperty_border_right = 340 , eCSSProperty_border_style = 341 , eCSSProperty_border_top = 342 , eCSSProperty_border_width = 343 , eCSSProperty_column_rule = 344 , eCSSProperty_columns = 345 , eCSSProperty_flex = 346 , eCSSProperty_flex_flow = 347 , eCSSProperty_font = 348 , eCSSProperty_font_variant = 349 , eCSSProperty_grid = 350 , eCSSProperty_grid_area = 351 , eCSSProperty_grid_column = 352 , eCSSProperty_grid_gap = 353 , eCSSProperty_grid_row = 354 , eCSSProperty_grid_template = 355 , eCSSProperty_list_style = 356 , eCSSProperty_margin = 357 , eCSSProperty_marker = 358 , eCSSProperty_mask = 359 , eCSSProperty_mask_position = 360 , eCSSProperty_outline = 361 , eCSSProperty__moz_outline_radius = 362 , eCSSProperty_overflow = 363 , eCSSProperty_padding = 364 , eCSSProperty_place_content = 365 , eCSSProperty_place_items = 366 , eCSSProperty_place_self = 367 , eCSSProperty_overscroll_behavior = 368 , eCSSProperty_scroll_snap_type = 369 , eCSSProperty_text_decoration = 370 , eCSSProperty_text_emphasis = 371 , eCSSProperty__webkit_text_stroke = 372 , eCSSProperty__moz_transform = 373 , eCSSProperty_transition = 374 , eCSSPropertyAlias_WordWrap = 375 , eCSSPropertyAlias_MozTransformOrigin = 376 , eCSSPropertyAlias_MozPerspectiveOrigin = 377 , eCSSPropertyAlias_MozPerspective = 378 , eCSSPropertyAlias_MozTransformStyle = 379 , eCSSPropertyAlias_MozBackfaceVisibility = 380 , eCSSPropertyAlias_MozBorderImage = 381 , eCSSPropertyAlias_MozTransition = 382 , eCSSPropertyAlias_MozTransitionDelay = 383 , eCSSPropertyAlias_MozTransitionDuration = 384 , eCSSPropertyAlias_MozTransitionProperty = 385 , eCSSPropertyAlias_MozTransitionTimingFunction = 386 , eCSSPropertyAlias_MozAnimation = 387 , eCSSPropertyAlias_MozAnimationDelay = 388 , eCSSPropertyAlias_MozAnimationDirection = 389 , eCSSPropertyAlias_MozAnimationDuration = 390 , eCSSPropertyAlias_MozAnimationFillMode = 391 , eCSSPropertyAlias_MozAnimationIterationCount = 392 , eCSSPropertyAlias_MozAnimationName = 393 , eCSSPropertyAlias_MozAnimationPlayState = 394 , eCSSPropertyAlias_MozAnimationTimingFunction = 395 , eCSSPropertyAlias_MozBoxSizing = 396 , eCSSPropertyAlias_MozFontFeatureSettings = 397 , eCSSPropertyAlias_MozFontLanguageOverride = 398 , eCSSPropertyAlias_MozPaddingEnd = 399 , eCSSPropertyAlias_MozPaddingStart = 400 , eCSSPropertyAlias_MozMarginEnd = 401 , eCSSPropertyAlias_MozMarginStart = 402 , eCSSPropertyAlias_MozBorderEnd = 403 , eCSSPropertyAlias_MozBorderEndColor = 404 , eCSSPropertyAlias_MozBorderEndStyle = 405 , eCSSPropertyAlias_MozBorderEndWidth = 406 , eCSSPropertyAlias_MozBorderStart = 407 , eCSSPropertyAlias_MozBorderStartColor = 408 , eCSSPropertyAlias_MozBorderStartStyle = 409 , eCSSPropertyAlias_MozBorderStartWidth = 410 , eCSSPropertyAlias_MozHyphens = 411 , eCSSPropertyAlias_MozColumnCount = 412 , eCSSPropertyAlias_MozColumnFill = 413 , eCSSPropertyAlias_MozColumnGap = 414 , eCSSPropertyAlias_MozColumnRule = 415 , eCSSPropertyAlias_MozColumnRuleColor = 416 , eCSSPropertyAlias_MozColumnRuleStyle = 417 , eCSSPropertyAlias_MozColumnRuleWidth = 418 , eCSSPropertyAlias_MozColumnWidth = 419 , eCSSPropertyAlias_MozColumns = 420 , eCSSPropertyAlias_WebkitAnimation = 421 , eCSSPropertyAlias_WebkitAnimationDelay = 422 , eCSSPropertyAlias_WebkitAnimationDirection = 423 , eCSSPropertyAlias_WebkitAnimationDuration = 424 , eCSSPropertyAlias_WebkitAnimationFillMode = 425 , eCSSPropertyAlias_WebkitAnimationIterationCount = 426 , eCSSPropertyAlias_WebkitAnimationName = 427 , eCSSPropertyAlias_WebkitAnimationPlayState = 428 , eCSSPropertyAlias_WebkitAnimationTimingFunction = 429 , eCSSPropertyAlias_WebkitFilter = 430 , eCSSPropertyAlias_WebkitTextSizeAdjust = 431 , eCSSPropertyAlias_WebkitTransform = 432 , eCSSPropertyAlias_WebkitTransformOrigin = 433 , eCSSPropertyAlias_WebkitTransformStyle = 434 , eCSSPropertyAlias_WebkitBackfaceVisibility = 435 , eCSSPropertyAlias_WebkitPerspective = 436 , eCSSPropertyAlias_WebkitPerspectiveOrigin = 437 , eCSSPropertyAlias_WebkitTransition = 438 , eCSSPropertyAlias_WebkitTransitionDelay = 439 , eCSSPropertyAlias_WebkitTransitionDuration = 440 , eCSSPropertyAlias_WebkitTransitionProperty = 441 , eCSSPropertyAlias_WebkitTransitionTimingFunction = 442 , eCSSPropertyAlias_WebkitBorderRadius = 443 , eCSSPropertyAlias_WebkitBorderTopLeftRadius = 444 , eCSSPropertyAlias_WebkitBorderTopRightRadius = 445 , eCSSPropertyAlias_WebkitBorderBottomLeftRadius = 446 , eCSSPropertyAlias_WebkitBorderBottomRightRadius = 447 , eCSSPropertyAlias_WebkitBackgroundClip = 448 , eCSSPropertyAlias_WebkitBackgroundOrigin = 449 , eCSSPropertyAlias_WebkitBackgroundSize = 450 , eCSSPropertyAlias_WebkitBorderImage = 451 , eCSSPropertyAlias_WebkitBoxShadow = 452 , eCSSPropertyAlias_WebkitBoxSizing = 453 , eCSSPropertyAlias_WebkitBoxFlex = 454 , eCSSPropertyAlias_WebkitBoxOrdinalGroup = 455 , eCSSPropertyAlias_WebkitBoxOrient = 456 , eCSSPropertyAlias_WebkitBoxDirection = 457 , eCSSPropertyAlias_WebkitBoxAlign = 458 , eCSSPropertyAlias_WebkitBoxPack = 459 , eCSSPropertyAlias_WebkitFlexDirection = 460 , eCSSPropertyAlias_WebkitFlexWrap = 461 , eCSSPropertyAlias_WebkitFlexFlow = 462 , eCSSPropertyAlias_WebkitOrder = 463 , eCSSPropertyAlias_WebkitFlex = 464 , eCSSPropertyAlias_WebkitFlexGrow = 465 , eCSSPropertyAlias_WebkitFlexShrink = 466 , eCSSPropertyAlias_WebkitFlexBasis = 467 , eCSSPropertyAlias_WebkitJustifyContent = 468 , eCSSPropertyAlias_WebkitAlignItems = 469 , eCSSPropertyAlias_WebkitAlignSelf = 470 , eCSSPropertyAlias_WebkitAlignContent = 471 , eCSSPropertyAlias_WebkitUserSelect = 472 , eCSSPropertyAlias_WebkitMask = 473 , eCSSPropertyAlias_WebkitMaskClip = 474 , eCSSPropertyAlias_WebkitMaskComposite = 475 , eCSSPropertyAlias_WebkitMaskImage = 476 , eCSSPropertyAlias_WebkitMaskOrigin = 477 , eCSSPropertyAlias_WebkitMaskPosition = 478 , eCSSPropertyAlias_WebkitMaskPositionX = 479 , eCSSPropertyAlias_WebkitMaskPositionY = 480 , eCSSPropertyAlias_WebkitMaskRepeat = 481 , eCSSPropertyAlias_WebkitMaskSize = 482 , eCSSPropertyExtra_no_properties = 483 , eCSSPropertyExtra_all_properties = 484 , eCSSPropertyExtra_x_none_value = 485 , eCSSPropertyExtra_x_auto_value = 486 , eCSSPropertyExtra_variable = 487 , eCSSProperty_DOM = 488 , } # [ repr ( i32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsCSSCounterDesc { eCSSCounterDesc_UNKNOWN = -1 , eCSSCounterDesc_System = 0 , eCSSCounterDesc_Symbols = 1 , eCSSCounterDesc_AdditiveSymbols = 2 , eCSSCounterDesc_Negative = 3 , eCSSCounterDesc_Prefix = 4 , eCSSCounterDesc_Suffix = 5 , eCSSCounterDesc_Range = 6 , eCSSCounterDesc_Pad = 7 , eCSSCounterDesc_Fallback = 8 , eCSSCounterDesc_SpeakAs = 9 , eCSSCounterDesc_COUNT = 10 , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoStyleSet { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoSourceSizeList { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RustString { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoStyleSheetContents { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoDeclarationBlock { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoStyleRule { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoAnimationValue { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct RawServoMediaList { _unused : [ u8 ; 0 ] } pub mod nsStyleTransformMatrix { # [ allow ( unused_imports ) ] use self :: super :: super :: root ; # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum MatrixTransformOperator { Interpolate = 0 , Accumulate = 1 , } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsCSSPropertyIDSet { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsSimpleContentList { _unused : [ u8 ; 0 ] } pub type RawGeckoNode = root :: nsINode ; pub type RawGeckoElement = root :: mozilla :: dom :: Element ; pub type RawGeckoDocument = root :: nsIDocument ; pub type RawGeckoPresContext = root :: nsPresContext ; pub type RawGeckoXBLBinding = root :: nsXBLBinding ; pub type RawGeckoURLExtraData = root :: mozilla :: URLExtraData ; pub type RawGeckoServoAnimationValueList = root :: nsTArray < root :: RefPtr < root :: RawServoAnimationValue > > ; pub type RawGeckoKeyframeList = root :: nsTArray < root :: mozilla :: Keyframe > ; pub type RawGeckoPropertyValuePairList = root :: nsTArray < root :: mozilla :: PropertyValuePair > ; pub type RawGeckoComputedKeyframeValuesList = root :: nsTArray < root :: mozilla :: ComputedKeyframeValues > ; pub type RawGeckoStyleAnimationList = root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > ; pub type RawGeckoFontFaceRuleList = root :: nsTArray < root :: nsFontFaceRuleContainer > ; pub type RawGeckoAnimationPropertySegment = root :: mozilla :: AnimationPropertySegment ; pub type RawGeckoComputedTiming = root :: mozilla :: ComputedTiming ; pub type RawGeckoServoStyleRuleList = root :: nsTArray < * const root :: RawServoStyleRule > ; pub type RawGeckoCSSPropertyIDList = root :: nsTArray < root :: nsCSSPropertyID > ; pub type RawGeckoGfxMatrix4x4 = [ root :: mozilla :: gfx :: Float ; 16usize ] ; pub type RawGeckoStyleChildrenIterator = root :: mozilla :: dom :: StyleChildrenIterator ; pub type ServoStyleContextBorrowed = * const root :: mozilla :: ServoStyleContext ; pub type ServoStyleContextBorrowedOrNull = * const root :: mozilla :: ServoStyleContext ; pub type ServoComputedDataBorrowed = * const root :: ServoComputedData ; pub type RawGeckoNodeBorrowed = * const root :: RawGeckoNode ; pub type RawGeckoNodeBorrowedOrNull = * const root :: RawGeckoNode ; pub type RawGeckoElementBorrowed = * const root :: RawGeckoElement ; pub type RawGeckoElementBorrowedOrNull = * const root :: RawGeckoElement ; pub type RawGeckoDocumentBorrowed = * const root :: RawGeckoDocument ; pub type RawGeckoDocumentBorrowedOrNull = * const root :: RawGeckoDocument ; pub type RawGeckoXBLBindingBorrowed = * const root :: RawGeckoXBLBinding ; pub type RawGeckoXBLBindingBorrowedOrNull = * const root :: RawGeckoXBLBinding ; pub type RawGeckoPresContextOwned = * mut root :: RawGeckoPresContext ; pub type RawGeckoPresContextBorrowed = * const root :: RawGeckoPresContext ; pub type RawGeckoPresContextBorrowedMut = * mut root :: RawGeckoPresContext ; pub type RawGeckoServoAnimationValueListBorrowedMut = * mut root :: RawGeckoServoAnimationValueList ; pub type RawGeckoServoAnimationValueListBorrowed = * const root :: RawGeckoServoAnimationValueList ; pub type RawGeckoKeyframeListBorrowedMut = * mut root :: RawGeckoKeyframeList ; pub type RawGeckoKeyframeListBorrowed = * const root :: RawGeckoKeyframeList ; pub type RawGeckoPropertyValuePairListBorrowedMut = * mut root :: RawGeckoPropertyValuePairList ; pub type RawGeckoPropertyValuePairListBorrowed = * const root :: RawGeckoPropertyValuePairList ; pub type RawGeckoComputedKeyframeValuesListBorrowedMut = * mut root :: RawGeckoComputedKeyframeValuesList ; pub type RawGeckoStyleAnimationListBorrowedMut = * mut root :: RawGeckoStyleAnimationList ; pub type RawGeckoStyleAnimationListBorrowed = * const root :: RawGeckoStyleAnimationList ; pub type RawGeckoFontFaceRuleListBorrowedMut = * mut root :: RawGeckoFontFaceRuleList ; pub type RawGeckoAnimationPropertySegmentBorrowed = * const root :: RawGeckoAnimationPropertySegment ; pub type RawGeckoComputedTimingBorrowed = * const root :: RawGeckoComputedTiming ; pub type RawGeckoServoStyleRuleListBorrowedMut = * mut root :: RawGeckoServoStyleRuleList ; pub type RawGeckoCSSPropertyIDListBorrowed = * const root :: RawGeckoCSSPropertyIDList ; pub type RawGeckoStyleChildrenIteratorBorrowedMut = * mut root :: RawGeckoStyleChildrenIterator ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsHTMLCSSStyleSheet { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsHTMLStyleSheet { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIBFCacheEntry { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDocumentEncoder { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIStructuredCloneContainer { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsSMILAnimationController { _unused : [ u8 ; 0 ] } pub const HSTSPrimingState_eNO_HSTS_PRIMING : root :: HSTSPrimingState = 0 ; pub const HSTSPrimingState_eHSTS_PRIMING_ALLOW : root :: HSTSPrimingState = 1 ; pub const HSTSPrimingState_eHSTS_PRIMING_BLOCK : root :: HSTSPrimingState = 2 ; pub type HSTSPrimingState = :: std :: os :: raw :: c_int ; # [ repr ( C ) ] pub struct nsIDocument { pub _base : root :: nsINode , pub _base_1 : root :: mozilla :: dom :: DispatcherTrait , pub mDeprecationWarnedAbout : u64 , pub mDocWarningWarnedAbout : u64 , pub mServoSelectorCache : root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > , pub mGeckoSelectorCache : root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > , pub mReferrer : root :: nsCString , pub mLastModified : ::nsstring::nsStringRepr , pub mDocumentURI : root :: nsCOMPtr , pub mOriginalURI : root :: nsCOMPtr , pub mChromeXHRDocURI : root :: nsCOMPtr , pub mDocumentBaseURI : root :: nsCOMPtr , pub mChromeXHRDocBaseURI : root :: nsCOMPtr , pub mCachedURLData : root :: RefPtr < root :: mozilla :: URLExtraData > , pub mDocumentLoadGroup : root :: nsWeakPtr , pub mReferrerPolicySet : bool , pub mReferrerPolicy : root :: nsIDocument_ReferrerPolicyEnum , pub mBlockAllMixedContent : bool , pub mBlockAllMixedContentPreloads : bool , pub mUpgradeInsecureRequests : bool , pub mUpgradeInsecurePreloads : bool , pub mHSTSPrimingURIList : [ u64 ; 4usize ] , pub mDocumentContainer : u64 , pub mCharacterSet : root :: mozilla :: NotNull < * const root :: nsIDocument_Encoding > , pub mCharacterSetSource : i32 , pub mParentDocument : * mut root :: nsIDocument , pub mCachedRootElement : * mut root :: mozilla :: dom :: Element , pub mNodeInfoManager : * mut root :: nsNodeInfoManager , pub mCSSLoader : root :: RefPtr < root :: mozilla :: css :: Loader > , pub mStyleImageLoader : root :: RefPtr < root :: mozilla :: css :: ImageLoader > , pub mAttrStyleSheet : root :: RefPtr < root :: nsHTMLStyleSheet > , pub mStyleAttrStyleSheet : root :: RefPtr < root :: nsHTMLCSSStyleSheet > , pub mImageTracker : root :: RefPtr < root :: mozilla :: dom :: ImageTracker > , pub mActivityObservers : u64 , pub mLinksToUpdate : [ u64 ; 3usize ] , pub mAnimationController : root :: RefPtr < root :: nsSMILAnimationController > , pub mPropertyTable : root :: nsPropertyTable , pub mExtraPropertyTables : root :: nsTArray < root :: nsAutoPtr < root :: nsPropertyTable > > , pub mChildrenCollection : root :: nsCOMPtr , pub mFontFaceSet : root :: RefPtr < root :: mozilla :: dom :: FontFaceSet > , pub mLastFocusTime : root :: mozilla :: TimeStamp , pub _bitfield_1 : [ u8 ; 7usize ] , pub mCompatMode : root :: nsCompatibility , pub mReadyState : root :: nsIDocument_ReadyState , pub mStyleBackendType : root :: mozilla :: StyleBackendType , pub mVisibilityState : root :: mozilla :: dom :: VisibilityState , pub mType : root :: nsIDocument_Type , pub mDefaultElementType : u8 , pub mAllowXULXBL : root :: nsIDocument_Tri , pub mScriptGlobalObject : root :: nsCOMPtr , pub mOriginalDocument : root :: nsCOMPtr , pub mBidiOptions : u32 , pub mSandboxFlags : u32 , pub mContentLanguage : root :: nsCString , pub mChannel : root :: nsCOMPtr , pub mContentType : root :: nsCString , pub mId : ::nsstring::nsStringRepr , pub mSecurityInfo : root :: nsCOMPtr , pub mFailedChannel : root :: nsCOMPtr , pub mPartID : u32 , pub mMarkedCCGeneration : u32 , pub mPresShell : * mut root :: nsIPresShell , pub mSubtreeModifiedTargets : root :: nsCOMArray , pub mSubtreeModifiedDepth : u32 , pub mDisplayDocument : root :: nsCOMPtr , pub mEventsSuppressed : u32 , 
  /// https://html.spec.whatwg.org/#ignore-destructive-writes-counter 
  pub mIgnoreDestructiveWritesCounter : u32 , 
  /// The current frame request callback handle 
- pub mFrameRequestCallbackCounter : i32 , pub mStaticCloneCount : u32 , pub mBlockedTrackingNodes : root :: nsTArray < root :: nsCOMPtr > , pub mWindow : * mut root :: nsPIDOMWindowInner , pub mCachedEncoder : root :: nsCOMPtr , pub mFrameRequestCallbacks : root :: nsTArray < root :: nsIDocument_FrameRequest > , pub mBFCacheEntry : * mut root :: nsIBFCacheEntry , pub mBaseTarget : ::nsstring::nsStringRepr , pub mStateObjectContainer : root :: nsCOMPtr , pub mStateObjectCached : root :: nsCOMPtr , pub mInSyncOperationCount : u32 , pub mXPathEvaluator : root :: RefPtr < root :: mozilla :: dom :: XPathEvaluator > , pub mAnonymousContents : root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: AnonymousContent > > , pub mBlockDOMContentLoaded : u32 , pub mDOMMediaQueryLists : root :: mozilla :: LinkedList , pub mUseCounters : [ u64 ; 2usize ] , pub mChildDocumentUseCounters : [ u64 ; 2usize ] , pub mNotifiedPageForUseCounter : [ u64 ; 2usize ] , pub mIncCounters : u16 , pub mUserHasInteracted : bool , pub mUserHasActivatedInteraction : bool , pub mPageUnloadingEventTimeStamp : root :: mozilla :: TimeStamp , pub mDocGroup : root :: RefPtr < root :: mozilla :: dom :: DocGroup > , pub mTrackingScripts : [ u64 ; 4usize ] , pub mBufferedCSPViolations : root :: nsTArray < root :: nsCOMPtr > , pub mAncestorPrincipals : root :: nsTArray < root :: nsCOMPtr > , pub mAncestorOuterWindowIDs : root :: nsTArray < :: std :: os :: raw :: c_ulong > , pub mServoRestyleRoot : root :: nsCOMPtr , pub mServoRestyleRootDirtyBits : u32 , pub mThrowOnDynamicMarkupInsertionCounter : u32 , pub mIgnoreOpensDuringUnloadCounter : u32 , } pub type nsIDocument_GlobalObject = root :: mozilla :: dom :: GlobalObject ; pub type nsIDocument_Encoding = root :: mozilla :: Encoding ; pub type nsIDocument_NotNull < T > = root :: mozilla :: NotNull < T > ; pub use self :: super :: root :: mozilla :: net :: ReferrerPolicy as nsIDocument_ReferrerPolicyEnum ; pub type nsIDocument_Element = root :: mozilla :: dom :: Element ; pub type nsIDocument_FullscreenRequest = root :: mozilla :: dom :: FullscreenRequest ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDocument_COMTypeInfo { pub _address : u8 , } # [ repr ( C ) ] pub struct nsIDocument_PageUnloadingEventTimeStamp { pub mDocument : root :: nsCOMPtr , pub mSet : bool , } # [ test ] fn bindgen_test_layout_nsIDocument_PageUnloadingEventTimeStamp ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDocument_PageUnloadingEventTimeStamp > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsIDocument_PageUnloadingEventTimeStamp ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDocument_PageUnloadingEventTimeStamp > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDocument_PageUnloadingEventTimeStamp ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIDocument_PageUnloadingEventTimeStamp ) ) . mDocument as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsIDocument_PageUnloadingEventTimeStamp ) , "::" , stringify ! ( mDocument ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIDocument_PageUnloadingEventTimeStamp ) ) . mSet as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsIDocument_PageUnloadingEventTimeStamp ) , "::" , stringify ! ( mSet ) ) ) ; } 
+ pub mFrameRequestCallbackCounter : i32 , pub mStaticCloneCount : u32 , pub mBlockedTrackingNodes : root :: nsTArray < root :: nsWeakPtr > , pub mWindow : * mut root :: nsPIDOMWindowInner , pub mCachedEncoder : root :: nsCOMPtr , pub mFrameRequestCallbacks : root :: nsTArray < root :: nsIDocument_FrameRequest > , pub mBFCacheEntry : * mut root :: nsIBFCacheEntry , pub mBaseTarget : ::nsstring::nsStringRepr , pub mStateObjectContainer : root :: nsCOMPtr , pub mStateObjectCached : root :: nsCOMPtr , pub mInSyncOperationCount : u32 , pub mXPathEvaluator : root :: RefPtr < root :: mozilla :: dom :: XPathEvaluator > , pub mAnonymousContents : root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: AnonymousContent > > , pub mBlockDOMContentLoaded : u32 , pub mDOMMediaQueryLists : root :: mozilla :: LinkedList , pub mUseCounters : [ u64 ; 2usize ] , pub mChildDocumentUseCounters : [ u64 ; 2usize ] , pub mNotifiedPageForUseCounter : [ u64 ; 2usize ] , pub mIncCounters : u16 , pub mUserHasInteracted : bool , pub mUserHasActivatedInteraction : bool , pub mPageUnloadingEventTimeStamp : root :: mozilla :: TimeStamp , pub mDocGroup : root :: RefPtr < root :: mozilla :: dom :: DocGroup > , pub mTrackingScripts : [ u64 ; 4usize ] , pub mBufferedCSPViolations : root :: nsTArray < root :: nsCOMPtr > , pub mAncestorPrincipals : root :: nsTArray < root :: nsCOMPtr > , pub mAncestorOuterWindowIDs : root :: nsTArray < u64 > , pub mServoRestyleRoot : root :: nsCOMPtr , pub mServoRestyleRootDirtyBits : u32 , pub mThrowOnDynamicMarkupInsertionCounter : u32 , pub mIgnoreOpensDuringUnloadCounter : u32 , } pub type nsIDocument_GlobalObject = root :: mozilla :: dom :: GlobalObject ; pub type nsIDocument_Encoding = root :: mozilla :: Encoding ; pub type nsIDocument_NotNull < T > = root :: mozilla :: NotNull < T > ; pub use self :: super :: root :: mozilla :: net :: ReferrerPolicy as nsIDocument_ReferrerPolicyEnum ; pub type nsIDocument_Element = root :: mozilla :: dom :: Element ; pub type nsIDocument_FullscreenRequest = root :: mozilla :: dom :: FullscreenRequest ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDocument_COMTypeInfo { pub _address : u8 , } # [ repr ( C ) ] pub struct nsIDocument_PageUnloadingEventTimeStamp { pub mDocument : root :: nsCOMPtr , pub mSet : bool , } # [ test ] fn bindgen_test_layout_nsIDocument_PageUnloadingEventTimeStamp ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDocument_PageUnloadingEventTimeStamp > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsIDocument_PageUnloadingEventTimeStamp ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDocument_PageUnloadingEventTimeStamp > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDocument_PageUnloadingEventTimeStamp ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIDocument_PageUnloadingEventTimeStamp ) ) . mDocument as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsIDocument_PageUnloadingEventTimeStamp ) , "::" , stringify ! ( mDocument ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIDocument_PageUnloadingEventTimeStamp ) ) . mSet as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsIDocument_PageUnloadingEventTimeStamp ) , "::" , stringify ! ( mSet ) ) ) ; } 
  /// This gets fired when the element that an id refers to changes.
     /// This fires at difficult times. It is generally not safe to do anything
     /// which could modify the DOM in any way. Use
@@ -873,583 +876,583 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
  # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsIDocument_ExternalResourceLoad { pub _base : root :: nsISupports , pub mObservers : [ u64 ; 10usize ] , } # [ test ] fn bindgen_test_layout_nsIDocument_ExternalResourceLoad ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDocument_ExternalResourceLoad > ( ) , 88usize , concat ! ( "Size of: " , stringify ! ( nsIDocument_ExternalResourceLoad ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDocument_ExternalResourceLoad > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDocument_ExternalResourceLoad ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsIDocument_ExternalResourceLoad ) ) . mObservers as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsIDocument_ExternalResourceLoad ) , "::" , stringify ! ( mObservers ) ) ) ; } pub type nsIDocument_ActivityObserverEnumerator = :: std :: option :: Option < unsafe extern "C" fn ( arg1 : * mut root :: nsISupports , arg2 : * mut :: std :: os :: raw :: c_void ) > ; # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsIDocument_DocumentTheme { Doc_Theme_Uninitialized = 0 , Doc_Theme_None = 1 , Doc_Theme_Neutral = 2 , Doc_Theme_Dark = 3 , Doc_Theme_Bright = 4 , } pub type nsIDocument_FrameRequestCallbackList = root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: FrameRequestCallback > > ; pub const nsIDocument_DeprecatedOperations_eEnablePrivilege : root :: nsIDocument_DeprecatedOperations = 0 ; pub const nsIDocument_DeprecatedOperations_eDOMExceptionCode : root :: nsIDocument_DeprecatedOperations = 1 ; pub const nsIDocument_DeprecatedOperations_eMutationEvent : root :: nsIDocument_DeprecatedOperations = 2 ; pub const nsIDocument_DeprecatedOperations_eComponents : root :: nsIDocument_DeprecatedOperations = 3 ; pub const nsIDocument_DeprecatedOperations_ePrefixedVisibilityAPI : root :: nsIDocument_DeprecatedOperations = 4 ; pub const nsIDocument_DeprecatedOperations_eNodeIteratorDetach : root :: nsIDocument_DeprecatedOperations = 5 ; pub const nsIDocument_DeprecatedOperations_eLenientThis : root :: nsIDocument_DeprecatedOperations = 6 ; pub const nsIDocument_DeprecatedOperations_eGetPreventDefault : root :: nsIDocument_DeprecatedOperations = 7 ; pub const nsIDocument_DeprecatedOperations_eGetSetUserData : root :: nsIDocument_DeprecatedOperations = 8 ; pub const nsIDocument_DeprecatedOperations_eMozGetAsFile : root :: nsIDocument_DeprecatedOperations = 9 ; pub const nsIDocument_DeprecatedOperations_eUseOfCaptureEvents : root :: nsIDocument_DeprecatedOperations = 10 ; pub const nsIDocument_DeprecatedOperations_eUseOfReleaseEvents : root :: nsIDocument_DeprecatedOperations = 11 ; pub const nsIDocument_DeprecatedOperations_eUseOfDOM3LoadMethod : root :: nsIDocument_DeprecatedOperations = 12 ; pub const nsIDocument_DeprecatedOperations_eChromeUseOfDOM3LoadMethod : root :: nsIDocument_DeprecatedOperations = 13 ; pub const nsIDocument_DeprecatedOperations_eShowModalDialog : root :: nsIDocument_DeprecatedOperations = 14 ; pub const nsIDocument_DeprecatedOperations_eSyncXMLHttpRequest : root :: nsIDocument_DeprecatedOperations = 15 ; pub const nsIDocument_DeprecatedOperations_eWindow_Cc_ontrollers : root :: nsIDocument_DeprecatedOperations = 16 ; pub const nsIDocument_DeprecatedOperations_eImportXULIntoContent : root :: nsIDocument_DeprecatedOperations = 17 ; pub const nsIDocument_DeprecatedOperations_ePannerNodeDoppler : root :: nsIDocument_DeprecatedOperations = 18 ; pub const nsIDocument_DeprecatedOperations_eNavigatorGetUserMedia : root :: nsIDocument_DeprecatedOperations = 19 ; pub const nsIDocument_DeprecatedOperations_eWebrtcDeprecatedPrefix : root :: nsIDocument_DeprecatedOperations = 20 ; pub const nsIDocument_DeprecatedOperations_eRTCPeerConnectionGetStreams : root :: nsIDocument_DeprecatedOperations = 21 ; pub const nsIDocument_DeprecatedOperations_eAppCache : root :: nsIDocument_DeprecatedOperations = 22 ; pub const nsIDocument_DeprecatedOperations_ePrefixedImageSmoothingEnabled : root :: nsIDocument_DeprecatedOperations = 23 ; pub const nsIDocument_DeprecatedOperations_ePrefixedFullscreenAPI : root :: nsIDocument_DeprecatedOperations = 24 ; pub const nsIDocument_DeprecatedOperations_eLenientSetter : root :: nsIDocument_DeprecatedOperations = 25 ; pub const nsIDocument_DeprecatedOperations_eFileLastModifiedDate : root :: nsIDocument_DeprecatedOperations = 26 ; pub const nsIDocument_DeprecatedOperations_eImageBitmapRenderingContext_TransferImageBitmap : root :: nsIDocument_DeprecatedOperations = 27 ; pub const nsIDocument_DeprecatedOperations_eURLCreateObjectURL_MediaStream : root :: nsIDocument_DeprecatedOperations = 28 ; pub const nsIDocument_DeprecatedOperations_eXMLBaseAttribute : root :: nsIDocument_DeprecatedOperations = 29 ; pub const nsIDocument_DeprecatedOperations_eWindowContentUntrusted : root :: nsIDocument_DeprecatedOperations = 30 ; pub const nsIDocument_DeprecatedOperations_eDeprecatedOperationCount : root :: nsIDocument_DeprecatedOperations = 31 ; pub type nsIDocument_DeprecatedOperations = :: std :: os :: raw :: c_uint ; pub const nsIDocument_DocumentWarnings_eIgnoringWillChangeOverBudget : root :: nsIDocument_DocumentWarnings = 0 ; pub const nsIDocument_DocumentWarnings_ePreventDefaultFromPassiveListener : root :: nsIDocument_DocumentWarnings = 1 ; pub const nsIDocument_DocumentWarnings_eSVGRefLoop : root :: nsIDocument_DocumentWarnings = 2 ; pub const nsIDocument_DocumentWarnings_eSVGRefChainLengthExceeded : root :: nsIDocument_DocumentWarnings = 3 ; pub const nsIDocument_DocumentWarnings_eDocumentWarningCount : root :: nsIDocument_DocumentWarnings = 4 ; pub type nsIDocument_DocumentWarnings = :: std :: os :: raw :: c_uint ; pub const nsIDocument_ElementCallbackType_eConnected : root :: nsIDocument_ElementCallbackType = 0 ; pub const nsIDocument_ElementCallbackType_eDisconnected : root :: nsIDocument_ElementCallbackType = 1 ; pub const nsIDocument_ElementCallbackType_eAdopted : root :: nsIDocument_ElementCallbackType = 2 ; pub const nsIDocument_ElementCallbackType_eAttributeChanged : root :: nsIDocument_ElementCallbackType = 3 ; pub type nsIDocument_ElementCallbackType = :: std :: os :: raw :: c_uint ; pub const nsIDocument_eScopedStyle_Unknown : root :: nsIDocument__bindgen_ty_1 = 0 ; pub const nsIDocument_eScopedStyle_Disabled : root :: nsIDocument__bindgen_ty_1 = 1 ; pub const nsIDocument_eScopedStyle_Enabled : root :: nsIDocument__bindgen_ty_1 = 2 ; pub type nsIDocument__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsIDocument_Type { eUnknown = 0 , eHTML = 1 , eXHTML = 2 , eGenericXML = 3 , eSVG = 4 , eXUL = 5 , } pub const nsIDocument_Tri_eTriUnset : root :: nsIDocument_Tri = 0 ; pub const nsIDocument_Tri_eTriFalse : root :: nsIDocument_Tri = 1 ; pub const nsIDocument_Tri_eTriTrue : root :: nsIDocument_Tri = 2 ; pub type nsIDocument_Tri = :: std :: os :: raw :: c_uint ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDocument_FrameRequest { _unused : [ u8 ; 0 ] } pub const nsIDocument_kSegmentSize : usize = 128 ; # [ test ] fn bindgen_test_layout_nsIDocument ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDocument > ( ) , 896usize , concat ! ( "Size of: " , stringify ! ( nsIDocument ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDocument > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDocument ) ) ) ; } impl nsIDocument { # [ inline ] pub fn mBidiEnabled ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x1 as u64 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mBidiEnabled ( & mut self , val : bool ) { let mask = 0x1 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mMathMLEnabled ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x2 as u64 ; let val = ( unit_field_val & mask ) >> 1usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mMathMLEnabled ( & mut self , val : bool ) { let mask = 0x2 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 1usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsInitialDocumentInWindow ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x4 as u64 ; let val = ( unit_field_val & mask ) >> 2usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsInitialDocumentInWindow ( & mut self , val : bool ) { let mask = 0x4 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 2usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIgnoreDocGroupMismatches ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x8 as u64 ; let val = ( unit_field_val & mask ) >> 3usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIgnoreDocGroupMismatches ( & mut self , val : bool ) { let mask = 0x8 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 3usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mLoadedAsData ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x10 as u64 ; let val = ( unit_field_val & mask ) >> 4usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mLoadedAsData ( & mut self , val : bool ) { let mask = 0x10 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 4usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mLoadedAsInteractiveData ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x20 as u64 ; let val = ( unit_field_val & mask ) >> 5usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mLoadedAsInteractiveData ( & mut self , val : bool ) { let mask = 0x20 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 5usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mMayStartLayout ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x40 as u64 ; let val = ( unit_field_val & mask ) >> 6usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mMayStartLayout ( & mut self , val : bool ) { let mask = 0x40 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 6usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHaveFiredTitleChange ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x80 as u64 ; let val = ( unit_field_val & mask ) >> 7usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHaveFiredTitleChange ( & mut self , val : bool ) { let mask = 0x80 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 7usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsShowing ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x100 as u64 ; let val = ( unit_field_val & mask ) >> 8usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsShowing ( & mut self , val : bool ) { let mask = 0x100 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 8usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mVisible ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x200 as u64 ; let val = ( unit_field_val & mask ) >> 9usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mVisible ( & mut self , val : bool ) { let mask = 0x200 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 9usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasReferrerPolicyCSP ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x400 as u64 ; let val = ( unit_field_val & mask ) >> 10usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasReferrerPolicyCSP ( & mut self , val : bool ) { let mask = 0x400 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 10usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mRemovedFromDocShell ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x800 as u64 ; let val = ( unit_field_val & mask ) >> 11usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mRemovedFromDocShell ( & mut self , val : bool ) { let mask = 0x800 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 11usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mAllowDNSPrefetch ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x1000 as u64 ; let val = ( unit_field_val & mask ) >> 12usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mAllowDNSPrefetch ( & mut self , val : bool ) { let mask = 0x1000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 12usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsStaticDocument ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x2000 as u64 ; let val = ( unit_field_val & mask ) >> 13usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsStaticDocument ( & mut self , val : bool ) { let mask = 0x2000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 13usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mCreatingStaticClone ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x4000 as u64 ; let val = ( unit_field_val & mask ) >> 14usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mCreatingStaticClone ( & mut self , val : bool ) { let mask = 0x4000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 14usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mInUnlinkOrDeletion ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x8000 as u64 ; let val = ( unit_field_val & mask ) >> 15usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mInUnlinkOrDeletion ( & mut self , val : bool ) { let mask = 0x8000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 15usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasHadScriptHandlingObject ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x10000 as u64 ; let val = ( unit_field_val & mask ) >> 16usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasHadScriptHandlingObject ( & mut self , val : bool ) { let mask = 0x10000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 16usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsBeingUsedAsImage ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x20000 as u64 ; let val = ( unit_field_val & mask ) >> 17usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsBeingUsedAsImage ( & mut self , val : bool ) { let mask = 0x20000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 17usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsSyntheticDocument ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x40000 as u64 ; let val = ( unit_field_val & mask ) >> 18usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsSyntheticDocument ( & mut self , val : bool ) { let mask = 0x40000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 18usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasLinksToUpdate ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x80000 as u64 ; let val = ( unit_field_val & mask ) >> 19usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasLinksToUpdate ( & mut self , val : bool ) { let mask = 0x80000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 19usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasLinksToUpdateRunnable ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x100000 as u64 ; let val = ( unit_field_val & mask ) >> 20usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasLinksToUpdateRunnable ( & mut self , val : bool ) { let mask = 0x100000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 20usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mMayHaveDOMMutationObservers ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x200000 as u64 ; let val = ( unit_field_val & mask ) >> 21usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mMayHaveDOMMutationObservers ( & mut self , val : bool ) { let mask = 0x200000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 21usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mMayHaveAnimationObservers ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x400000 as u64 ; let val = ( unit_field_val & mask ) >> 22usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mMayHaveAnimationObservers ( & mut self , val : bool ) { let mask = 0x400000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 22usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasMixedActiveContentLoaded ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x800000 as u64 ; let val = ( unit_field_val & mask ) >> 23usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasMixedActiveContentLoaded ( & mut self , val : bool ) { let mask = 0x800000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 23usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasMixedActiveContentBlocked ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x1000000 as u64 ; let val = ( unit_field_val & mask ) >> 24usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasMixedActiveContentBlocked ( & mut self , val : bool ) { let mask = 0x1000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 24usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasMixedDisplayContentLoaded ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x2000000 as u64 ; let val = ( unit_field_val & mask ) >> 25usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasMixedDisplayContentLoaded ( & mut self , val : bool ) { let mask = 0x2000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 25usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasMixedDisplayContentBlocked ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x4000000 as u64 ; let val = ( unit_field_val & mask ) >> 26usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasMixedDisplayContentBlocked ( & mut self , val : bool ) { let mask = 0x4000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 26usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasMixedContentObjectSubrequest ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x8000000 as u64 ; let val = ( unit_field_val & mask ) >> 27usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasMixedContentObjectSubrequest ( & mut self , val : bool ) { let mask = 0x8000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 27usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasCSP ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x10000000 as u64 ; let val = ( unit_field_val & mask ) >> 28usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasCSP ( & mut self , val : bool ) { let mask = 0x10000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 28usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasUnsafeEvalCSP ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x20000000 as u64 ; let val = ( unit_field_val & mask ) >> 29usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasUnsafeEvalCSP ( & mut self , val : bool ) { let mask = 0x20000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 29usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasUnsafeInlineCSP ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x40000000 as u64 ; let val = ( unit_field_val & mask ) >> 30usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasUnsafeInlineCSP ( & mut self , val : bool ) { let mask = 0x40000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 30usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasTrackingContentBlocked ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x80000000 as u64 ; let val = ( unit_field_val & mask ) >> 31usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasTrackingContentBlocked ( & mut self , val : bool ) { let mask = 0x80000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 31usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasTrackingContentLoaded ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x100000000 as u64 ; let val = ( unit_field_val & mask ) >> 32usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasTrackingContentLoaded ( & mut self , val : bool ) { let mask = 0x100000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 32usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mBFCacheDisallowed ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x200000000 as u64 ; let val = ( unit_field_val & mask ) >> 33usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mBFCacheDisallowed ( & mut self , val : bool ) { let mask = 0x200000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 33usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasHadDefaultView ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x400000000 as u64 ; let val = ( unit_field_val & mask ) >> 34usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasHadDefaultView ( & mut self , val : bool ) { let mask = 0x400000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 34usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mStyleSheetChangeEventsEnabled ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x800000000 as u64 ; let val = ( unit_field_val & mask ) >> 35usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mStyleSheetChangeEventsEnabled ( & mut self , val : bool ) { let mask = 0x800000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 35usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsSrcdocDocument ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x1000000000 as u64 ; let val = ( unit_field_val & mask ) >> 36usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsSrcdocDocument ( & mut self , val : bool ) { let mask = 0x1000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 36usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mDidDocumentOpen ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x2000000000 as u64 ; let val = ( unit_field_val & mask ) >> 37usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mDidDocumentOpen ( & mut self , val : bool ) { let mask = 0x2000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 37usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasDisplayDocument ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x4000000000 as u64 ; let val = ( unit_field_val & mask ) >> 38usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasDisplayDocument ( & mut self , val : bool ) { let mask = 0x4000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 38usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mFontFaceSetDirty ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x8000000000 as u64 ; let val = ( unit_field_val & mask ) >> 39usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mFontFaceSetDirty ( & mut self , val : bool ) { let mask = 0x8000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 39usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mGetUserFontSetCalled ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x10000000000 as u64 ; let val = ( unit_field_val & mask ) >> 40usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mGetUserFontSetCalled ( & mut self , val : bool ) { let mask = 0x10000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 40usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPostedFlushUserFontSet ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x20000000000 as u64 ; let val = ( unit_field_val & mask ) >> 41usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mPostedFlushUserFontSet ( & mut self , val : bool ) { let mask = 0x20000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 41usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mDidFireDOMContentLoaded ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x40000000000 as u64 ; let val = ( unit_field_val & mask ) >> 42usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mDidFireDOMContentLoaded ( & mut self , val : bool ) { let mask = 0x40000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 42usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasScrollLinkedEffect ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x80000000000 as u64 ; let val = ( unit_field_val & mask ) >> 43usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHasScrollLinkedEffect ( & mut self , val : bool ) { let mask = 0x80000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 43usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mFrameRequestCallbacksScheduled ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x100000000000 as u64 ; let val = ( unit_field_val & mask ) >> 44usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mFrameRequestCallbacksScheduled ( & mut self , val : bool ) { let mask = 0x100000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 44usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsTopLevelContentDocument ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x200000000000 as u64 ; let val = ( unit_field_val & mask ) >> 45usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsTopLevelContentDocument ( & mut self , val : bool ) { let mask = 0x200000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 45usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsContentDocument ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x400000000000 as u64 ; let val = ( unit_field_val & mask ) >> 46usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsContentDocument ( & mut self , val : bool ) { let mask = 0x400000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 46usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mDidCallBeginLoad ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x800000000000 as u64 ; let val = ( unit_field_val & mask ) >> 47usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mDidCallBeginLoad ( & mut self , val : bool ) { let mask = 0x800000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 47usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mBufferingCSPViolations ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x1000000000000 as u64 ; let val = ( unit_field_val & mask ) >> 48usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mBufferingCSPViolations ( & mut self , val : bool ) { let mask = 0x1000000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 48usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mAllowPaymentRequest ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x2000000000000 as u64 ; let val = ( unit_field_val & mask ) >> 49usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mAllowPaymentRequest ( & mut self , val : bool ) { let mask = 0x2000000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 49usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mEncodingMenuDisabled ( & self ) -> bool { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x4000000000000 as u64 ; let val = ( unit_field_val & mask ) >> 50usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mEncodingMenuDisabled ( & mut self , val : bool ) { let mask = 0x4000000000000 as u64 ; let val = val as u8 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 50usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsScopedStyleEnabled ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x18000000000000 as u64 ; let val = ( unit_field_val & mask ) >> 51usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mIsScopedStyleEnabled ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x18000000000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 51usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mBidiEnabled : bool , mMathMLEnabled : bool , mIsInitialDocumentInWindow : bool , mIgnoreDocGroupMismatches : bool , mLoadedAsData : bool , mLoadedAsInteractiveData : bool , mMayStartLayout : bool , mHaveFiredTitleChange : bool , mIsShowing : bool , mVisible : bool , mHasReferrerPolicyCSP : bool , mRemovedFromDocShell : bool , mAllowDNSPrefetch : bool , mIsStaticDocument : bool , mCreatingStaticClone : bool , mInUnlinkOrDeletion : bool , mHasHadScriptHandlingObject : bool , mIsBeingUsedAsImage : bool , mIsSyntheticDocument : bool , mHasLinksToUpdate : bool , mHasLinksToUpdateRunnable : bool , mMayHaveDOMMutationObservers : bool , mMayHaveAnimationObservers : bool , mHasMixedActiveContentLoaded : bool , mHasMixedActiveContentBlocked : bool , mHasMixedDisplayContentLoaded : bool , mHasMixedDisplayContentBlocked : bool , mHasMixedContentObjectSubrequest : bool , mHasCSP : bool , mHasUnsafeEvalCSP : bool , mHasUnsafeInlineCSP : bool , mHasTrackingContentBlocked : bool , mHasTrackingContentLoaded : bool , mBFCacheDisallowed : bool , mHasHadDefaultView : bool , mStyleSheetChangeEventsEnabled : bool , mIsSrcdocDocument : bool , mDidDocumentOpen : bool , mHasDisplayDocument : bool , mFontFaceSetDirty : bool , mGetUserFontSetCalled : bool , mPostedFlushUserFontSet : bool , mDidFireDOMContentLoaded : bool , mHasScrollLinkedEffect : bool , mFrameRequestCallbacksScheduled : bool , mIsTopLevelContentDocument : bool , mIsContentDocument : bool , mDidCallBeginLoad : bool , mBufferingCSPViolations : bool , mAllowPaymentRequest : bool , mEncodingMenuDisabled : bool , mIsScopedStyleEnabled : :: std :: os :: raw :: c_uint ) -> u64 { ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( 0 | ( ( mBidiEnabled as u8 as u64 ) << 0usize ) & ( 0x1 as u64 ) ) | ( ( mMathMLEnabled as u8 as u64 ) << 1usize ) & ( 0x2 as u64 ) ) | ( ( mIsInitialDocumentInWindow as u8 as u64 ) << 2usize ) & ( 0x4 as u64 ) ) | ( ( mIgnoreDocGroupMismatches as u8 as u64 ) << 3usize ) & ( 0x8 as u64 ) ) | ( ( mLoadedAsData as u8 as u64 ) << 4usize ) & ( 0x10 as u64 ) ) | ( ( mLoadedAsInteractiveData as u8 as u64 ) << 5usize ) & ( 0x20 as u64 ) ) | ( ( mMayStartLayout as u8 as u64 ) << 6usize ) & ( 0x40 as u64 ) ) | ( ( mHaveFiredTitleChange as u8 as u64 ) << 7usize ) & ( 0x80 as u64 ) ) | ( ( mIsShowing as u8 as u64 ) << 8usize ) & ( 0x100 as u64 ) ) | ( ( mVisible as u8 as u64 ) << 9usize ) & ( 0x200 as u64 ) ) | ( ( mHasReferrerPolicyCSP as u8 as u64 ) << 10usize ) & ( 0x400 as u64 ) ) | ( ( mRemovedFromDocShell as u8 as u64 ) << 11usize ) & ( 0x800 as u64 ) ) | ( ( mAllowDNSPrefetch as u8 as u64 ) << 12usize ) & ( 0x1000 as u64 ) ) | ( ( mIsStaticDocument as u8 as u64 ) << 13usize ) & ( 0x2000 as u64 ) ) | ( ( mCreatingStaticClone as u8 as u64 ) << 14usize ) & ( 0x4000 as u64 ) ) | ( ( mInUnlinkOrDeletion as u8 as u64 ) << 15usize ) & ( 0x8000 as u64 ) ) | ( ( mHasHadScriptHandlingObject as u8 as u64 ) << 16usize ) & ( 0x10000 as u64 ) ) | ( ( mIsBeingUsedAsImage as u8 as u64 ) << 17usize ) & ( 0x20000 as u64 ) ) | ( ( mIsSyntheticDocument as u8 as u64 ) << 18usize ) & ( 0x40000 as u64 ) ) | ( ( mHasLinksToUpdate as u8 as u64 ) << 19usize ) & ( 0x80000 as u64 ) ) | ( ( mHasLinksToUpdateRunnable as u8 as u64 ) << 20usize ) & ( 0x100000 as u64 ) ) | ( ( mMayHaveDOMMutationObservers as u8 as u64 ) << 21usize ) & ( 0x200000 as u64 ) ) | ( ( mMayHaveAnimationObservers as u8 as u64 ) << 22usize ) & ( 0x400000 as u64 ) ) | ( ( mHasMixedActiveContentLoaded as u8 as u64 ) << 23usize ) & ( 0x800000 as u64 ) ) | ( ( mHasMixedActiveContentBlocked as u8 as u64 ) << 24usize ) & ( 0x1000000 as u64 ) ) | ( ( mHasMixedDisplayContentLoaded as u8 as u64 ) << 25usize ) & ( 0x2000000 as u64 ) ) | ( ( mHasMixedDisplayContentBlocked as u8 as u64 ) << 26usize ) & ( 0x4000000 as u64 ) ) | ( ( mHasMixedContentObjectSubrequest as u8 as u64 ) << 27usize ) & ( 0x8000000 as u64 ) ) | ( ( mHasCSP as u8 as u64 ) << 28usize ) & ( 0x10000000 as u64 ) ) | ( ( mHasUnsafeEvalCSP as u8 as u64 ) << 29usize ) & ( 0x20000000 as u64 ) ) | ( ( mHasUnsafeInlineCSP as u8 as u64 ) << 30usize ) & ( 0x40000000 as u64 ) ) | ( ( mHasTrackingContentBlocked as u8 as u64 ) << 31usize ) & ( 0x80000000 as u64 ) ) | ( ( mHasTrackingContentLoaded as u8 as u64 ) << 32usize ) & ( 0x100000000 as u64 ) ) | ( ( mBFCacheDisallowed as u8 as u64 ) << 33usize ) & ( 0x200000000 as u64 ) ) | ( ( mHasHadDefaultView as u8 as u64 ) << 34usize ) & ( 0x400000000 as u64 ) ) | ( ( mStyleSheetChangeEventsEnabled as u8 as u64 ) << 35usize ) & ( 0x800000000 as u64 ) ) | ( ( mIsSrcdocDocument as u8 as u64 ) << 36usize ) & ( 0x1000000000 as u64 ) ) | ( ( mDidDocumentOpen as u8 as u64 ) << 37usize ) & ( 0x2000000000 as u64 ) ) | ( ( mHasDisplayDocument as u8 as u64 ) << 38usize ) & ( 0x4000000000 as u64 ) ) | ( ( mFontFaceSetDirty as u8 as u64 ) << 39usize ) & ( 0x8000000000 as u64 ) ) | ( ( mGetUserFontSetCalled as u8 as u64 ) << 40usize ) & ( 0x10000000000 as u64 ) ) | ( ( mPostedFlushUserFontSet as u8 as u64 ) << 41usize ) & ( 0x20000000000 as u64 ) ) | ( ( mDidFireDOMContentLoaded as u8 as u64 ) << 42usize ) & ( 0x40000000000 as u64 ) ) | ( ( mHasScrollLinkedEffect as u8 as u64 ) << 43usize ) & ( 0x80000000000 as u64 ) ) | ( ( mFrameRequestCallbacksScheduled as u8 as u64 ) << 44usize ) & ( 0x100000000000 as u64 ) ) | ( ( mIsTopLevelContentDocument as u8 as u64 ) << 45usize ) & ( 0x200000000000 as u64 ) ) | ( ( mIsContentDocument as u8 as u64 ) << 46usize ) & ( 0x400000000000 as u64 ) ) | ( ( mDidCallBeginLoad as u8 as u64 ) << 47usize ) & ( 0x800000000000 as u64 ) ) | ( ( mBufferingCSPViolations as u8 as u64 ) << 48usize ) & ( 0x1000000000000 as u64 ) ) | ( ( mAllowPaymentRequest as u8 as u64 ) << 49usize ) & ( 0x2000000000000 as u64 ) ) | ( ( mEncodingMenuDisabled as u8 as u64 ) << 50usize ) & ( 0x4000000000000 as u64 ) ) | ( ( mIsScopedStyleEnabled as u32 as u64 ) << 51usize ) & ( 0x18000000000000 as u64 ) ) } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsBidi { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIPrintSettings { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsITheme { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct gfxTextPerfMetrics { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsTransitionManager { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsAnimationManager { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsDeviceContext { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct gfxMissingFontRecorder { _unused : [ u8 ; 0 ] } pub const kPresContext_DefaultVariableFont_ID : u8 = 0 ; pub const kPresContext_DefaultFixedFont_ID : u8 = 1 ; # [ repr ( C ) ] pub struct nsPresContext { pub _base : root :: nsISupports , pub _base_1 : u64 , pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mType : root :: nsPresContext_nsPresContextType , pub mShell : * mut root :: nsIPresShell , pub mDocument : root :: nsCOMPtr , pub mDeviceContext : root :: RefPtr < root :: nsDeviceContext > , pub mEventManager : root :: RefPtr < root :: mozilla :: EventStateManager > , pub mRefreshDriver : root :: RefPtr < root :: nsRefreshDriver > , pub mEffectCompositor : root :: RefPtr < root :: mozilla :: EffectCompositor > , pub mTransitionManager : root :: RefPtr < root :: nsTransitionManager > , pub mAnimationManager : root :: RefPtr < root :: nsAnimationManager > , pub mRestyleManager : root :: RefPtr < root :: mozilla :: RestyleManager > , pub mCounterStyleManager : root :: RefPtr < root :: mozilla :: CounterStyleManager > , pub mMedium : * mut root :: nsAtom , pub mMediaEmulated : root :: RefPtr < root :: nsAtom > , pub mFontFeatureValuesLookup : root :: RefPtr < root :: gfxFontFeatureValueSet > , pub mLinkHandler : * mut root :: nsILinkHandler , pub mLanguage : root :: RefPtr < root :: nsAtom > , pub mInflationDisabledForShrinkWrap : bool , pub mContainer : u64 , pub mBaseMinFontSize : i32 , pub mSystemFontScale : f32 , pub mTextZoom : f32 , pub mEffectiveTextZoom : f32 , pub mFullZoom : f32 , pub mOverrideDPPX : f32 , pub mLastFontInflationScreenSize : root :: gfxSize , pub mCurAppUnitsPerDevPixel : i32 , pub mAutoQualityMinFontSizePixelsPref : i32 , pub mTheme : root :: nsCOMPtr , pub mLangService : * mut root :: nsLanguageAtomService , pub mPrintSettings : root :: nsCOMPtr , pub mPrefChangedTimer : root :: nsCOMPtr , pub mBidiEngine : root :: mozilla :: UniquePtr < root :: nsBidi > , pub mTransactions : [ u64 ; 10usize ] , pub mTextPerf : root :: nsAutoPtr < root :: gfxTextPerfMetrics > , pub mMissingFonts : root :: nsAutoPtr < root :: gfxMissingFontRecorder > , pub mVisibleArea : root :: nsRect , pub mLastResizeEventVisibleArea : root :: nsRect , pub mPageSize : root :: nsSize , pub mPageScale : f32 , pub mPPScale : f32 , pub mDefaultColor : root :: nscolor , pub mBackgroundColor : root :: nscolor , pub mLinkColor : root :: nscolor , pub mActiveLinkColor : root :: nscolor , pub mVisitedLinkColor : root :: nscolor , pub mFocusBackgroundColor : root :: nscolor , pub mFocusTextColor : root :: nscolor , pub mBodyTextColor : root :: nscolor , pub mViewportScrollbarOverrideElement : * mut root :: mozilla :: dom :: Element , pub mViewportStyleScrollbar : root :: nsPresContext_ScrollbarStyles , pub mFocusRingWidth : u8 , pub mExistThrottledUpdates : bool , pub mImageAnimationMode : u16 , pub mImageAnimationModePref : u16 , pub mLangGroupFontPrefs : root :: nsPresContext_LangGroupFontPrefs , pub mFontGroupCacheDirty : bool , pub mLanguagesUsed : [ u64 ; 4usize ] , pub mBorderWidthTable : [ root :: nscoord ; 3usize ] , pub mInterruptChecksToSkip : u32 , pub mElementsRestyled : u64 , pub mFramesConstructed : u64 , pub mFramesReflowed : u64 , pub mReflowStartTime : root :: mozilla :: TimeStamp , pub mFirstNonBlankPaintTime : root :: mozilla :: TimeStamp , pub mFirstClickTime : root :: mozilla :: TimeStamp , pub mFirstKeyTime : root :: mozilla :: TimeStamp , pub mFirstMouseMoveTime : root :: mozilla :: TimeStamp , pub mFirstScrollTime : root :: mozilla :: TimeStamp , pub mInteractionTimeEnabled : bool , pub mLastStyleUpdateForAllAnimations : root :: mozilla :: TimeStamp , pub mTelemetryScrollLastY : root :: nscoord , pub mTelemetryScrollMaxY : root :: nscoord , pub mTelemetryScrollTotalY : root :: nscoord , pub _bitfield_1 : [ u8 ; 6usize ] , pub __bindgen_padding_0 : [ u16 ; 3usize ] , } pub type nsPresContext_Encoding = root :: mozilla :: Encoding ; pub type nsPresContext_NotNull < T > = root :: mozilla :: NotNull < T > ; pub type nsPresContext_LangGroupFontPrefs = root :: mozilla :: LangGroupFontPrefs ; pub type nsPresContext_ScrollbarStyles = root :: mozilla :: ScrollbarStyles ; pub type nsPresContext_StaticPresData = root :: mozilla :: StaticPresData ; pub type nsPresContext_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsPresContext_cycleCollection { pub _base : root :: nsXPCOMCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_nsPresContext_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsPresContext_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsPresContext_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsPresContext_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsPresContext_cycleCollection ) ) ) ; } impl Clone for nsPresContext_cycleCollection { fn clone ( & self ) -> Self { * self } } pub const nsPresContext_nsPresContextType_eContext_Galley : root :: nsPresContext_nsPresContextType = 0 ; pub const nsPresContext_nsPresContextType_eContext_PrintPreview : root :: nsPresContext_nsPresContextType = 1 ; pub const nsPresContext_nsPresContextType_eContext_Print : root :: nsPresContext_nsPresContextType = 2 ; pub const nsPresContext_nsPresContextType_eContext_PageLayout : root :: nsPresContext_nsPresContextType = 3 ; pub type nsPresContext_nsPresContextType = :: std :: os :: raw :: c_uint ; pub const nsPresContext_InteractionType_eClickInteraction : root :: nsPresContext_InteractionType = 0 ; pub const nsPresContext_InteractionType_eKeyInteraction : root :: nsPresContext_InteractionType = 1 ; pub const nsPresContext_InteractionType_eMouseMoveInteraction : root :: nsPresContext_InteractionType = 2 ; pub const nsPresContext_InteractionType_eScrollInteraction : root :: nsPresContext_InteractionType = 3 ; pub type nsPresContext_InteractionType = u32 ; 
  /// A class that can be used to temporarily disable reflow interruption. 
  # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsPresContext_InterruptPreventer { pub mCtx : * mut root :: nsPresContext , pub mInterruptsEnabled : bool , pub mHasPendingInterrupt : bool , } # [ test ] fn bindgen_test_layout_nsPresContext_InterruptPreventer ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsPresContext_InterruptPreventer > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsPresContext_InterruptPreventer ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsPresContext_InterruptPreventer > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsPresContext_InterruptPreventer ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext_InterruptPreventer ) ) . mCtx as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext_InterruptPreventer ) , "::" , stringify ! ( mCtx ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext_InterruptPreventer ) ) . mInterruptsEnabled as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext_InterruptPreventer ) , "::" , stringify ! ( mInterruptsEnabled ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext_InterruptPreventer ) ) . mHasPendingInterrupt as * const _ as usize } , 9usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext_InterruptPreventer ) , "::" , stringify ! ( mHasPendingInterrupt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsPresContext_TransactionInvalidations { pub mTransactionId : u64 , pub mInvalidations : root :: nsTArray < root :: nsRect > , } # [ test ] fn bindgen_test_layout_nsPresContext_TransactionInvalidations ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsPresContext_TransactionInvalidations > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsPresContext_TransactionInvalidations ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsPresContext_TransactionInvalidations > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsPresContext_TransactionInvalidations ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext_TransactionInvalidations ) ) . mTransactionId as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext_TransactionInvalidations ) , "::" , stringify ! ( mTransactionId ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext_TransactionInvalidations ) ) . mInvalidations as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext_TransactionInvalidations ) , "::" , stringify ! ( mInvalidations ) ) ) ; } extern "C" {
- # [ link_name = "\u{1}_ZN13nsPresContext21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN13nsPresContext21_cycleCollectorGlobalE" ] 
  pub static mut  nsPresContext__cycleCollectorGlobal  :  root :: nsPresContext_cycleCollection ;
 } # [ test ] fn bindgen_test_layout_nsPresContext ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsPresContext > ( ) , 1376usize , concat ! ( "Size of: " , stringify ! ( nsPresContext ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsPresContext > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsPresContext ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mRefCnt as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mType as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mShell as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mShell ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mDocument as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mDocument ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mDeviceContext as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mDeviceContext ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mEventManager as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mEventManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mRefreshDriver as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mRefreshDriver ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mEffectCompositor as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mEffectCompositor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTransitionManager as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTransitionManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mAnimationManager as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mAnimationManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mRestyleManager as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mRestyleManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mCounterStyleManager as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mCounterStyleManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mMedium as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mMedium ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mMediaEmulated as * const _ as usize } , 120usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mMediaEmulated ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFontFeatureValuesLookup as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFontFeatureValuesLookup ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLinkHandler as * const _ as usize } , 136usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLinkHandler ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLanguage as * const _ as usize } , 144usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLanguage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mInflationDisabledForShrinkWrap as * const _ as usize } , 152usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInflationDisabledForShrinkWrap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mContainer as * const _ as usize } , 160usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mContainer ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBaseMinFontSize as * const _ as usize } , 168usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBaseMinFontSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mSystemFontScale as * const _ as usize } , 172usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mSystemFontScale ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTextZoom as * const _ as usize } , 176usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTextZoom ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mEffectiveTextZoom as * const _ as usize } , 180usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mEffectiveTextZoom ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFullZoom as * const _ as usize } , 184usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFullZoom ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mOverrideDPPX as * const _ as usize } , 188usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mOverrideDPPX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLastFontInflationScreenSize as * const _ as usize } , 192usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLastFontInflationScreenSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mCurAppUnitsPerDevPixel as * const _ as usize } , 208usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mCurAppUnitsPerDevPixel ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mAutoQualityMinFontSizePixelsPref as * const _ as usize } , 212usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mAutoQualityMinFontSizePixelsPref ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTheme as * const _ as usize } , 216usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTheme ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLangService as * const _ as usize } , 224usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLangService ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPrintSettings as * const _ as usize } , 232usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPrintSettings ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPrefChangedTimer as * const _ as usize } , 240usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPrefChangedTimer ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBidiEngine as * const _ as usize } , 248usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBidiEngine ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTransactions as * const _ as usize } , 256usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTransactions ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTextPerf as * const _ as usize } , 336usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTextPerf ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mMissingFonts as * const _ as usize } , 344usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mMissingFonts ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mVisibleArea as * const _ as usize } , 352usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mVisibleArea ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLastResizeEventVisibleArea as * const _ as usize } , 368usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLastResizeEventVisibleArea ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPageSize as * const _ as usize } , 384usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPageSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPageScale as * const _ as usize } , 392usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPageScale ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPPScale as * const _ as usize } , 396usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPPScale ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mDefaultColor as * const _ as usize } , 400usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mDefaultColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBackgroundColor as * const _ as usize } , 404usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBackgroundColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLinkColor as * const _ as usize } , 408usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLinkColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mActiveLinkColor as * const _ as usize } , 412usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mActiveLinkColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mVisitedLinkColor as * const _ as usize } , 416usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mVisitedLinkColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFocusBackgroundColor as * const _ as usize } , 420usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusBackgroundColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFocusTextColor as * const _ as usize } , 424usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusTextColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBodyTextColor as * const _ as usize } , 428usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBodyTextColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mViewportScrollbarOverrideElement as * const _ as usize } , 432usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mViewportScrollbarOverrideElement ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mViewportStyleScrollbar as * const _ as usize } , 440usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mViewportStyleScrollbar ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFocusRingWidth as * const _ as usize } , 504usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusRingWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mExistThrottledUpdates as * const _ as usize } , 505usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mExistThrottledUpdates ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mImageAnimationMode as * const _ as usize } , 506usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mImageAnimationMode ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mImageAnimationModePref as * const _ as usize } , 508usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mImageAnimationModePref ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLangGroupFontPrefs as * const _ as usize } , 512usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLangGroupFontPrefs ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFontGroupCacheDirty as * const _ as usize } , 1208usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFontGroupCacheDirty ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLanguagesUsed as * const _ as usize } , 1216usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLanguagesUsed ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBorderWidthTable as * const _ as usize } , 1248usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBorderWidthTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mInterruptChecksToSkip as * const _ as usize } , 1260usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInterruptChecksToSkip ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mElementsRestyled as * const _ as usize } , 1264usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mElementsRestyled ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFramesConstructed as * const _ as usize } , 1272usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFramesConstructed ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFramesReflowed as * const _ as usize } , 1280usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFramesReflowed ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mReflowStartTime as * const _ as usize } , 1288usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mReflowStartTime ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstNonBlankPaintTime as * const _ as usize } , 1296usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstNonBlankPaintTime ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstClickTime as * const _ as usize } , 1304usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstClickTime ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstKeyTime as * const _ as usize } , 1312usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstKeyTime ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstMouseMoveTime as * const _ as usize } , 1320usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstMouseMoveTime ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstScrollTime as * const _ as usize } , 1328usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstScrollTime ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mInteractionTimeEnabled as * const _ as usize } , 1336usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInteractionTimeEnabled ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLastStyleUpdateForAllAnimations as * const _ as usize } , 1344usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLastStyleUpdateForAllAnimations ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTelemetryScrollLastY as * const _ as usize } , 1352usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollLastY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTelemetryScrollMaxY as * const _ as usize } , 1356usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollMaxY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTelemetryScrollTotalY as * const _ as usize } , 1360usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollTotalY ) ) ) ; } impl nsPresContext { # [ inline ] pub fn mHasPendingInterrupt ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x1 as u64 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mHasPendingInterrupt ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x1 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPendingInterruptFromTest ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x2 as u64 ; let val = ( unit_field_val & mask ) >> 1usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPendingInterruptFromTest ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x2 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 1usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mInterruptsEnabled ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x4 as u64 ; let val = ( unit_field_val & mask ) >> 2usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mInterruptsEnabled ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x4 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 2usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mUseDocumentFonts ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x8 as u64 ; let val = ( unit_field_val & mask ) >> 3usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mUseDocumentFonts ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x8 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 3usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mUseDocumentColors ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x10 as u64 ; let val = ( unit_field_val & mask ) >> 4usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mUseDocumentColors ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x10 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 4usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mUnderlineLinks ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x20 as u64 ; let val = ( unit_field_val & mask ) >> 5usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mUnderlineLinks ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x20 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 5usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mSendAfterPaintToContent ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x40 as u64 ; let val = ( unit_field_val & mask ) >> 6usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mSendAfterPaintToContent ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x40 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 6usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mUseFocusColors ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x80 as u64 ; let val = ( unit_field_val & mask ) >> 7usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mUseFocusColors ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x80 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 7usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mFocusRingOnAnything ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x100 as u64 ; let val = ( unit_field_val & mask ) >> 8usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mFocusRingOnAnything ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x100 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 8usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mFocusRingStyle ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x200 as u64 ; let val = ( unit_field_val & mask ) >> 9usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mFocusRingStyle ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x200 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 9usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mDrawImageBackground ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x400 as u64 ; let val = ( unit_field_val & mask ) >> 10usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mDrawImageBackground ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x400 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 10usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mDrawColorBackground ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x800 as u64 ; let val = ( unit_field_val & mask ) >> 11usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mDrawColorBackground ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x800 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 11usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mNeverAnimate ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x1000 as u64 ; let val = ( unit_field_val & mask ) >> 12usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mNeverAnimate ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x1000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 12usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsRenderingOnlySelection ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x2000 as u64 ; let val = ( unit_field_val & mask ) >> 13usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mIsRenderingOnlySelection ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x2000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 13usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPaginated ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x4000 as u64 ; let val = ( unit_field_val & mask ) >> 14usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPaginated ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x4000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 14usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mCanPaginatedScroll ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x8000 as u64 ; let val = ( unit_field_val & mask ) >> 15usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mCanPaginatedScroll ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x8000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 15usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mDoScaledTwips ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x10000 as u64 ; let val = ( unit_field_val & mask ) >> 16usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mDoScaledTwips ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x10000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 16usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsRootPaginatedDocument ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x20000 as u64 ; let val = ( unit_field_val & mask ) >> 17usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mIsRootPaginatedDocument ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x20000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 17usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPrefBidiDirection ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x40000 as u64 ; let val = ( unit_field_val & mask ) >> 18usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPrefBidiDirection ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x40000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 18usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPrefScrollbarSide ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x180000 as u64 ; let val = ( unit_field_val & mask ) >> 19usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPrefScrollbarSide ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x180000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 19usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPendingSysColorChanged ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x200000 as u64 ; let val = ( unit_field_val & mask ) >> 21usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPendingSysColorChanged ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x200000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 21usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPendingThemeChanged ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x400000 as u64 ; let val = ( unit_field_val & mask ) >> 22usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPendingThemeChanged ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x400000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 22usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPendingUIResolutionChanged ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x800000 as u64 ; let val = ( unit_field_val & mask ) >> 23usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPendingUIResolutionChanged ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x800000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 23usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPendingMediaFeatureValuesChanged ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x1000000 as u64 ; let val = ( unit_field_val & mask ) >> 24usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPendingMediaFeatureValuesChanged ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x1000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 24usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPrefChangePendingNeedsReflow ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x2000000 as u64 ; let val = ( unit_field_val & mask ) >> 25usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPrefChangePendingNeedsReflow ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x2000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 25usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsEmulatingMedia ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x4000000 as u64 ; let val = ( unit_field_val & mask ) >> 26usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mIsEmulatingMedia ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x4000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 26usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsGlyph ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x8000000 as u64 ; let val = ( unit_field_val & mask ) >> 27usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mIsGlyph ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x8000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 27usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mUsesRootEMUnits ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x10000000 as u64 ; let val = ( unit_field_val & mask ) >> 28usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mUsesRootEMUnits ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x10000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 28usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mUsesExChUnits ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x20000000 as u64 ; let val = ( unit_field_val & mask ) >> 29usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mUsesExChUnits ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x20000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 29usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPendingViewportChange ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x40000000 as u64 ; let val = ( unit_field_val & mask ) >> 30usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPendingViewportChange ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x40000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 30usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mCounterStylesDirty ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x80000000 as u64 ; let val = ( unit_field_val & mask ) >> 31usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mCounterStylesDirty ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x80000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 31usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPostedFlushCounterStyles ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x100000000 as u64 ; let val = ( unit_field_val & mask ) >> 32usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPostedFlushCounterStyles ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x100000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 32usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mFontFeatureValuesDirty ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x200000000 as u64 ; let val = ( unit_field_val & mask ) >> 33usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mFontFeatureValuesDirty ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x200000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 33usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPostedFlushFontFeatureValues ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x400000000 as u64 ; let val = ( unit_field_val & mask ) >> 34usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPostedFlushFontFeatureValues ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x400000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 34usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mSuppressResizeReflow ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x800000000 as u64 ; let val = ( unit_field_val & mask ) >> 35usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mSuppressResizeReflow ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x800000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 35usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsVisual ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x1000000000 as u64 ; let val = ( unit_field_val & mask ) >> 36usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mIsVisual ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x1000000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 36usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mFireAfterPaintEvents ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x2000000000 as u64 ; let val = ( unit_field_val & mask ) >> 37usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mFireAfterPaintEvents ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x2000000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 37usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsChrome ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x4000000000 as u64 ; let val = ( unit_field_val & mask ) >> 38usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mIsChrome ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x4000000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 38usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mIsChromeOriginImage ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x8000000000 as u64 ; let val = ( unit_field_val & mask ) >> 39usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mIsChromeOriginImage ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x8000000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 39usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPaintFlashing ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x10000000000 as u64 ; let val = ( unit_field_val & mask ) >> 40usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPaintFlashing ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x10000000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 40usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mPaintFlashingInitialized ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x20000000000 as u64 ; let val = ( unit_field_val & mask ) >> 41usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mPaintFlashingInitialized ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x20000000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 41usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasWarnedAboutPositionedTableParts ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x40000000000 as u64 ; let val = ( unit_field_val & mask ) >> 42usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mHasWarnedAboutPositionedTableParts ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x40000000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 42usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHasWarnedAboutTooLargeDashedOrDottedRadius ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x80000000000 as u64 ; let val = ( unit_field_val & mask ) >> 43usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mHasWarnedAboutTooLargeDashedOrDottedRadius ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x80000000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 43usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mQuirkSheetAdded ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x100000000000 as u64 ; let val = ( unit_field_val & mask ) >> 44usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mQuirkSheetAdded ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x100000000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 44usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mNeedsPrefUpdate ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x200000000000 as u64 ; let val = ( unit_field_val & mask ) >> 45usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mNeedsPrefUpdate ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x200000000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 45usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn mHadNonBlankPaint ( & self ) -> :: std :: os :: raw :: c_uint { let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; let mask = 0x400000000000 as u64 ; let val = ( unit_field_val & mask ) >> 46usize ; unsafe { :: std :: mem :: transmute ( val as u32 ) } } # [ inline ] pub fn set_mHadNonBlankPaint ( & mut self , val : :: std :: os :: raw :: c_uint ) { let mask = 0x400000000000 as u64 ; let val = val as u32 as u64 ; let mut unit_field_val : u64 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u64 as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 46usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u64 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mHasPendingInterrupt : :: std :: os :: raw :: c_uint , mPendingInterruptFromTest : :: std :: os :: raw :: c_uint , mInterruptsEnabled : :: std :: os :: raw :: c_uint , mUseDocumentFonts : :: std :: os :: raw :: c_uint , mUseDocumentColors : :: std :: os :: raw :: c_uint , mUnderlineLinks : :: std :: os :: raw :: c_uint , mSendAfterPaintToContent : :: std :: os :: raw :: c_uint , mUseFocusColors : :: std :: os :: raw :: c_uint , mFocusRingOnAnything : :: std :: os :: raw :: c_uint , mFocusRingStyle : :: std :: os :: raw :: c_uint , mDrawImageBackground : :: std :: os :: raw :: c_uint , mDrawColorBackground : :: std :: os :: raw :: c_uint , mNeverAnimate : :: std :: os :: raw :: c_uint , mIsRenderingOnlySelection : :: std :: os :: raw :: c_uint , mPaginated : :: std :: os :: raw :: c_uint , mCanPaginatedScroll : :: std :: os :: raw :: c_uint , mDoScaledTwips : :: std :: os :: raw :: c_uint , mIsRootPaginatedDocument : :: std :: os :: raw :: c_uint , mPrefBidiDirection : :: std :: os :: raw :: c_uint , mPrefScrollbarSide : :: std :: os :: raw :: c_uint , mPendingSysColorChanged : :: std :: os :: raw :: c_uint , mPendingThemeChanged : :: std :: os :: raw :: c_uint , mPendingUIResolutionChanged : :: std :: os :: raw :: c_uint , mPendingMediaFeatureValuesChanged : :: std :: os :: raw :: c_uint , mPrefChangePendingNeedsReflow : :: std :: os :: raw :: c_uint , mIsEmulatingMedia : :: std :: os :: raw :: c_uint , mIsGlyph : :: std :: os :: raw :: c_uint , mUsesRootEMUnits : :: std :: os :: raw :: c_uint , mUsesExChUnits : :: std :: os :: raw :: c_uint , mPendingViewportChange : :: std :: os :: raw :: c_uint , mCounterStylesDirty : :: std :: os :: raw :: c_uint , mPostedFlushCounterStyles : :: std :: os :: raw :: c_uint , mFontFeatureValuesDirty : :: std :: os :: raw :: c_uint , mPostedFlushFontFeatureValues : :: std :: os :: raw :: c_uint , mSuppressResizeReflow : :: std :: os :: raw :: c_uint , mIsVisual : :: std :: os :: raw :: c_uint , mFireAfterPaintEvents : :: std :: os :: raw :: c_uint , mIsChrome : :: std :: os :: raw :: c_uint , mIsChromeOriginImage : :: std :: os :: raw :: c_uint , mPaintFlashing : :: std :: os :: raw :: c_uint , mPaintFlashingInitialized : :: std :: os :: raw :: c_uint , mHasWarnedAboutPositionedTableParts : :: std :: os :: raw :: c_uint , mHasWarnedAboutTooLargeDashedOrDottedRadius : :: std :: os :: raw :: c_uint , mQuirkSheetAdded : :: std :: os :: raw :: c_uint , mNeedsPrefUpdate : :: std :: os :: raw :: c_uint , mHadNonBlankPaint : :: std :: os :: raw :: c_uint ) -> u64 { ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( 0 | ( ( mHasPendingInterrupt as u32 as u64 ) << 0usize ) & ( 0x1 as u64 ) ) | ( ( mPendingInterruptFromTest as u32 as u64 ) << 1usize ) & ( 0x2 as u64 ) ) | ( ( mInterruptsEnabled as u32 as u64 ) << 2usize ) & ( 0x4 as u64 ) ) | ( ( mUseDocumentFonts as u32 as u64 ) << 3usize ) & ( 0x8 as u64 ) ) | ( ( mUseDocumentColors as u32 as u64 ) << 4usize ) & ( 0x10 as u64 ) ) | ( ( mUnderlineLinks as u32 as u64 ) << 5usize ) & ( 0x20 as u64 ) ) | ( ( mSendAfterPaintToContent as u32 as u64 ) << 6usize ) & ( 0x40 as u64 ) ) | ( ( mUseFocusColors as u32 as u64 ) << 7usize ) & ( 0x80 as u64 ) ) | ( ( mFocusRingOnAnything as u32 as u64 ) << 8usize ) & ( 0x100 as u64 ) ) | ( ( mFocusRingStyle as u32 as u64 ) << 9usize ) & ( 0x200 as u64 ) ) | ( ( mDrawImageBackground as u32 as u64 ) << 10usize ) & ( 0x400 as u64 ) ) | ( ( mDrawColorBackground as u32 as u64 ) << 11usize ) & ( 0x800 as u64 ) ) | ( ( mNeverAnimate as u32 as u64 ) << 12usize ) & ( 0x1000 as u64 ) ) | ( ( mIsRenderingOnlySelection as u32 as u64 ) << 13usize ) & ( 0x2000 as u64 ) ) | ( ( mPaginated as u32 as u64 ) << 14usize ) & ( 0x4000 as u64 ) ) | ( ( mCanPaginatedScroll as u32 as u64 ) << 15usize ) & ( 0x8000 as u64 ) ) | ( ( mDoScaledTwips as u32 as u64 ) << 16usize ) & ( 0x10000 as u64 ) ) | ( ( mIsRootPaginatedDocument as u32 as u64 ) << 17usize ) & ( 0x20000 as u64 ) ) | ( ( mPrefBidiDirection as u32 as u64 ) << 18usize ) & ( 0x40000 as u64 ) ) | ( ( mPrefScrollbarSide as u32 as u64 ) << 19usize ) & ( 0x180000 as u64 ) ) | ( ( mPendingSysColorChanged as u32 as u64 ) << 21usize ) & ( 0x200000 as u64 ) ) | ( ( mPendingThemeChanged as u32 as u64 ) << 22usize ) & ( 0x400000 as u64 ) ) | ( ( mPendingUIResolutionChanged as u32 as u64 ) << 23usize ) & ( 0x800000 as u64 ) ) | ( ( mPendingMediaFeatureValuesChanged as u32 as u64 ) << 24usize ) & ( 0x1000000 as u64 ) ) | ( ( mPrefChangePendingNeedsReflow as u32 as u64 ) << 25usize ) & ( 0x2000000 as u64 ) ) | ( ( mIsEmulatingMedia as u32 as u64 ) << 26usize ) & ( 0x4000000 as u64 ) ) | ( ( mIsGlyph as u32 as u64 ) << 27usize ) & ( 0x8000000 as u64 ) ) | ( ( mUsesRootEMUnits as u32 as u64 ) << 28usize ) & ( 0x10000000 as u64 ) ) | ( ( mUsesExChUnits as u32 as u64 ) << 29usize ) & ( 0x20000000 as u64 ) ) | ( ( mPendingViewportChange as u32 as u64 ) << 30usize ) & ( 0x40000000 as u64 ) ) | ( ( mCounterStylesDirty as u32 as u64 ) << 31usize ) & ( 0x80000000 as u64 ) ) | ( ( mPostedFlushCounterStyles as u32 as u64 ) << 32usize ) & ( 0x100000000 as u64 ) ) | ( ( mFontFeatureValuesDirty as u32 as u64 ) << 33usize ) & ( 0x200000000 as u64 ) ) | ( ( mPostedFlushFontFeatureValues as u32 as u64 ) << 34usize ) & ( 0x400000000 as u64 ) ) | ( ( mSuppressResizeReflow as u32 as u64 ) << 35usize ) & ( 0x800000000 as u64 ) ) | ( ( mIsVisual as u32 as u64 ) << 36usize ) & ( 0x1000000000 as u64 ) ) | ( ( mFireAfterPaintEvents as u32 as u64 ) << 37usize ) & ( 0x2000000000 as u64 ) ) | ( ( mIsChrome as u32 as u64 ) << 38usize ) & ( 0x4000000000 as u64 ) ) | ( ( mIsChromeOriginImage as u32 as u64 ) << 39usize ) & ( 0x8000000000 as u64 ) ) | ( ( mPaintFlashing as u32 as u64 ) << 40usize ) & ( 0x10000000000 as u64 ) ) | ( ( mPaintFlashingInitialized as u32 as u64 ) << 41usize ) & ( 0x20000000000 as u64 ) ) | ( ( mHasWarnedAboutPositionedTableParts as u32 as u64 ) << 42usize ) & ( 0x40000000000 as u64 ) ) | ( ( mHasWarnedAboutTooLargeDashedOrDottedRadius as u32 as u64 ) << 43usize ) & ( 0x80000000000 as u64 ) ) | ( ( mQuirkSheetAdded as u32 as u64 ) << 44usize ) & ( 0x100000000000 as u64 ) ) | ( ( mNeedsPrefUpdate as u32 as u64 ) << 45usize ) & ( 0x200000000000 as u64 ) ) | ( ( mHadNonBlankPaint as u32 as u64 ) << 46usize ) & ( 0x400000000000 as u64 ) ) } } # [ repr ( i16 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsCSSKeyword { eCSSKeyword_UNKNOWN = -1 , eCSSKeyword__moz_activehyperlinktext = 0 , eCSSKeyword__moz_all = 1 , eCSSKeyword__moz_alt_content = 2 , eCSSKeyword__moz_available = 3 , eCSSKeyword__moz_box = 4 , eCSSKeyword__moz_button = 5 , eCSSKeyword__moz_buttondefault = 6 , eCSSKeyword__moz_buttonhoverface = 7 , eCSSKeyword__moz_buttonhovertext = 8 , eCSSKeyword__moz_cellhighlight = 9 , eCSSKeyword__moz_cellhighlighttext = 10 , eCSSKeyword__moz_center = 11 , eCSSKeyword__moz_combobox = 12 , eCSSKeyword__moz_comboboxtext = 13 , eCSSKeyword__moz_context_properties = 14 , eCSSKeyword__moz_block_height = 15 , eCSSKeyword__moz_deck = 16 , eCSSKeyword__moz_default_background_color = 17 , eCSSKeyword__moz_default_color = 18 , eCSSKeyword__moz_desktop = 19 , eCSSKeyword__moz_dialog = 20 , eCSSKeyword__moz_dialogtext = 21 , eCSSKeyword__moz_document = 22 , eCSSKeyword__moz_dragtargetzone = 23 , eCSSKeyword__moz_element = 24 , eCSSKeyword__moz_eventreerow = 25 , eCSSKeyword__moz_field = 26 , eCSSKeyword__moz_fieldtext = 27 , eCSSKeyword__moz_fit_content = 28 , eCSSKeyword__moz_fixed = 29 , eCSSKeyword__moz_grabbing = 30 , eCSSKeyword__moz_grab = 31 , eCSSKeyword__moz_grid_group = 32 , eCSSKeyword__moz_grid_line = 33 , eCSSKeyword__moz_grid = 34 , eCSSKeyword__moz_groupbox = 35 , eCSSKeyword__moz_gtk_info_bar = 36 , eCSSKeyword__moz_gtk_info_bar_text = 37 , eCSSKeyword__moz_hidden_unscrollable = 38 , eCSSKeyword__moz_hyperlinktext = 39 , eCSSKeyword__moz_html_cellhighlight = 40 , eCSSKeyword__moz_html_cellhighlighttext = 41 , eCSSKeyword__moz_image_rect = 42 , eCSSKeyword__moz_info = 43 , eCSSKeyword__moz_inline_box = 44 , eCSSKeyword__moz_inline_grid = 45 , eCSSKeyword__moz_inline_stack = 46 , eCSSKeyword__moz_left = 47 , eCSSKeyword__moz_list = 48 , eCSSKeyword__moz_mac_buttonactivetext = 49 , eCSSKeyword__moz_mac_chrome_active = 50 , eCSSKeyword__moz_mac_chrome_inactive = 51 , eCSSKeyword__moz_mac_defaultbuttontext = 52 , eCSSKeyword__moz_mac_focusring = 53 , eCSSKeyword__moz_mac_fullscreen_button = 54 , eCSSKeyword__moz_mac_menuselect = 55 , eCSSKeyword__moz_mac_menushadow = 56 , eCSSKeyword__moz_mac_menutextdisable = 57 , eCSSKeyword__moz_mac_menutextselect = 58 , eCSSKeyword__moz_mac_disabledtoolbartext = 59 , eCSSKeyword__moz_mac_secondaryhighlight = 60 , eCSSKeyword__moz_mac_menuitem = 61 , eCSSKeyword__moz_mac_active_menuitem = 62 , eCSSKeyword__moz_mac_menupopup = 63 , eCSSKeyword__moz_mac_tooltip = 64 , eCSSKeyword__moz_max_content = 65 , eCSSKeyword__moz_menuhover = 66 , eCSSKeyword__moz_menuhovertext = 67 , eCSSKeyword__moz_menubartext = 68 , eCSSKeyword__moz_menubarhovertext = 69 , eCSSKeyword__moz_middle_with_baseline = 70 , eCSSKeyword__moz_min_content = 71 , eCSSKeyword__moz_nativehyperlinktext = 72 , eCSSKeyword__moz_none = 73 , eCSSKeyword__moz_oddtreerow = 74 , eCSSKeyword__moz_popup = 75 , eCSSKeyword__moz_pre_space = 76 , eCSSKeyword__moz_pull_down_menu = 77 , eCSSKeyword__moz_right = 78 , eCSSKeyword__moz_scrollbars_horizontal = 79 , eCSSKeyword__moz_scrollbars_none = 80 , eCSSKeyword__moz_scrollbars_vertical = 81 , eCSSKeyword__moz_stack = 82 , eCSSKeyword__moz_text = 83 , eCSSKeyword__moz_use_system_font = 84 , eCSSKeyword__moz_visitedhyperlinktext = 85 , eCSSKeyword__moz_window = 86 , eCSSKeyword__moz_workspace = 87 , eCSSKeyword__moz_zoom_in = 88 , eCSSKeyword__moz_zoom_out = 89 , eCSSKeyword__webkit_box = 90 , eCSSKeyword__webkit_flex = 91 , eCSSKeyword__webkit_inline_box = 92 , eCSSKeyword__webkit_inline_flex = 93 , eCSSKeyword_absolute = 94 , eCSSKeyword_active = 95 , eCSSKeyword_activeborder = 96 , eCSSKeyword_activecaption = 97 , eCSSKeyword_add = 98 , eCSSKeyword_additive = 99 , eCSSKeyword_alias = 100 , eCSSKeyword_all = 101 , eCSSKeyword_all_petite_caps = 102 , eCSSKeyword_all_scroll = 103 , eCSSKeyword_all_small_caps = 104 , eCSSKeyword_alpha = 105 , eCSSKeyword_alternate = 106 , eCSSKeyword_alternate_reverse = 107 , eCSSKeyword_always = 108 , eCSSKeyword_annotation = 109 , eCSSKeyword_appworkspace = 110 , eCSSKeyword_auto = 111 , eCSSKeyword_auto_fill = 112 , eCSSKeyword_auto_fit = 113 , eCSSKeyword_auto_flow = 114 , eCSSKeyword_avoid = 115 , eCSSKeyword_background = 116 , eCSSKeyword_backwards = 117 , eCSSKeyword_balance = 118 , eCSSKeyword_baseline = 119 , eCSSKeyword_bidi_override = 120 , eCSSKeyword_blink = 121 , eCSSKeyword_block = 122 , eCSSKeyword_block_axis = 123 , eCSSKeyword_blur = 124 , eCSSKeyword_bold = 125 , eCSSKeyword_bold_fraktur = 126 , eCSSKeyword_bold_italic = 127 , eCSSKeyword_bold_sans_serif = 128 , eCSSKeyword_bold_script = 129 , eCSSKeyword_bolder = 130 , eCSSKeyword_border_box = 131 , eCSSKeyword_both = 132 , eCSSKeyword_bottom = 133 , eCSSKeyword_bottom_outside = 134 , eCSSKeyword_break_all = 135 , eCSSKeyword_break_word = 136 , eCSSKeyword_brightness = 137 , eCSSKeyword_browser = 138 , eCSSKeyword_bullets = 139 , eCSSKeyword_button = 140 , eCSSKeyword_buttonface = 141 , eCSSKeyword_buttonhighlight = 142 , eCSSKeyword_buttonshadow = 143 , eCSSKeyword_buttontext = 144 , eCSSKeyword_capitalize = 145 , eCSSKeyword_caption = 146 , eCSSKeyword_captiontext = 147 , eCSSKeyword_cell = 148 , eCSSKeyword_center = 149 , eCSSKeyword_ch = 150 , eCSSKeyword_character_variant = 151 , eCSSKeyword_circle = 152 , eCSSKeyword_cjk_decimal = 153 , eCSSKeyword_clip = 154 , eCSSKeyword_clone = 155 , eCSSKeyword_close_quote = 156 , eCSSKeyword_closest_corner = 157 , eCSSKeyword_closest_side = 158 , eCSSKeyword_cm = 159 , eCSSKeyword_col_resize = 160 , eCSSKeyword_collapse = 161 , eCSSKeyword_color = 162 , eCSSKeyword_color_burn = 163 , eCSSKeyword_color_dodge = 164 , eCSSKeyword_common_ligatures = 165 , eCSSKeyword_column = 166 , eCSSKeyword_column_reverse = 167 , eCSSKeyword_condensed = 168 , eCSSKeyword_contain = 169 , eCSSKeyword_content_box = 170 , eCSSKeyword_contents = 171 , eCSSKeyword_context_fill = 172 , eCSSKeyword_context_fill_opacity = 173 , eCSSKeyword_context_menu = 174 , eCSSKeyword_context_stroke = 175 , eCSSKeyword_context_stroke_opacity = 176 , eCSSKeyword_context_value = 177 , eCSSKeyword_continuous = 178 , eCSSKeyword_contrast = 179 , eCSSKeyword_copy = 180 , eCSSKeyword_contextual = 181 , eCSSKeyword_cover = 182 , eCSSKeyword_crop = 183 , eCSSKeyword_cross = 184 , eCSSKeyword_crosshair = 185 , eCSSKeyword_currentcolor = 186 , eCSSKeyword_cursive = 187 , eCSSKeyword_cyclic = 188 , eCSSKeyword_darken = 189 , eCSSKeyword_dashed = 190 , eCSSKeyword_dense = 191 , eCSSKeyword_decimal = 192 , eCSSKeyword_default = 193 , eCSSKeyword_deg = 194 , eCSSKeyword_diagonal_fractions = 195 , eCSSKeyword_dialog = 196 , eCSSKeyword_difference = 197 , eCSSKeyword_digits = 198 , eCSSKeyword_disabled = 199 , eCSSKeyword_disc = 200 , eCSSKeyword_discretionary_ligatures = 201 , eCSSKeyword_distribute = 202 , eCSSKeyword_dot = 203 , eCSSKeyword_dotted = 204 , eCSSKeyword_double = 205 , eCSSKeyword_double_circle = 206 , eCSSKeyword_double_struck = 207 , eCSSKeyword_drag = 208 , eCSSKeyword_drop_shadow = 209 , eCSSKeyword_e_resize = 210 , eCSSKeyword_ease = 211 , eCSSKeyword_ease_in = 212 , eCSSKeyword_ease_in_out = 213 , eCSSKeyword_ease_out = 214 , eCSSKeyword_economy = 215 , eCSSKeyword_element = 216 , eCSSKeyword_elements = 217 , eCSSKeyword_ellipse = 218 , eCSSKeyword_ellipsis = 219 , eCSSKeyword_em = 220 , eCSSKeyword_embed = 221 , eCSSKeyword_enabled = 222 , eCSSKeyword_end = 223 , eCSSKeyword_ex = 224 , eCSSKeyword_exact = 225 , eCSSKeyword_exclude = 226 , eCSSKeyword_exclusion = 227 , eCSSKeyword_expanded = 228 , eCSSKeyword_extends = 229 , eCSSKeyword_extra_condensed = 230 , eCSSKeyword_extra_expanded = 231 , eCSSKeyword_ew_resize = 232 , eCSSKeyword_fallback = 233 , eCSSKeyword_fantasy = 234 , eCSSKeyword_farthest_side = 235 , eCSSKeyword_farthest_corner = 236 , eCSSKeyword_fill = 237 , eCSSKeyword_filled = 238 , eCSSKeyword_fill_box = 239 , eCSSKeyword_first = 240 , eCSSKeyword_fit_content = 241 , eCSSKeyword_fixed = 242 , eCSSKeyword_flat = 243 , eCSSKeyword_flex = 244 , eCSSKeyword_flex_end = 245 , eCSSKeyword_flex_start = 246 , eCSSKeyword_flip = 247 , eCSSKeyword_flow_root = 248 , eCSSKeyword_forwards = 249 , eCSSKeyword_fraktur = 250 , eCSSKeyword_frames = 251 , eCSSKeyword_from_image = 252 , eCSSKeyword_full_width = 253 , eCSSKeyword_fullscreen = 254 , eCSSKeyword_grab = 255 , eCSSKeyword_grabbing = 256 , eCSSKeyword_grad = 257 , eCSSKeyword_grayscale = 258 , eCSSKeyword_graytext = 259 , eCSSKeyword_grid = 260 , eCSSKeyword_groove = 261 , eCSSKeyword_hard_light = 262 , eCSSKeyword_help = 263 , eCSSKeyword_hidden = 264 , eCSSKeyword_hide = 265 , eCSSKeyword_highlight = 266 , eCSSKeyword_highlighttext = 267 , eCSSKeyword_historical_forms = 268 , eCSSKeyword_historical_ligatures = 269 , eCSSKeyword_horizontal = 270 , eCSSKeyword_horizontal_tb = 271 , eCSSKeyword_hue = 272 , eCSSKeyword_hue_rotate = 273 , eCSSKeyword_hz = 274 , eCSSKeyword_icon = 275 , eCSSKeyword_ignore = 276 , eCSSKeyword_ignore_horizontal = 277 , eCSSKeyword_ignore_vertical = 278 , eCSSKeyword_in = 279 , eCSSKeyword_interlace = 280 , eCSSKeyword_inactive = 281 , eCSSKeyword_inactiveborder = 282 , eCSSKeyword_inactivecaption = 283 , eCSSKeyword_inactivecaptiontext = 284 , eCSSKeyword_infinite = 285 , eCSSKeyword_infobackground = 286 , eCSSKeyword_infotext = 287 , eCSSKeyword_inherit = 288 , eCSSKeyword_initial = 289 , eCSSKeyword_inline = 290 , eCSSKeyword_inline_axis = 291 , eCSSKeyword_inline_block = 292 , eCSSKeyword_inline_end = 293 , eCSSKeyword_inline_flex = 294 , eCSSKeyword_inline_grid = 295 , eCSSKeyword_inline_start = 296 , eCSSKeyword_inline_table = 297 , eCSSKeyword_inset = 298 , eCSSKeyword_inside = 299 , eCSSKeyword_inter_character = 300 , eCSSKeyword_inter_word = 301 , eCSSKeyword_interpolatematrix = 302 , eCSSKeyword_accumulatematrix = 303 , eCSSKeyword_intersect = 304 , eCSSKeyword_isolate = 305 , eCSSKeyword_isolate_override = 306 , eCSSKeyword_invert = 307 , eCSSKeyword_italic = 308 , eCSSKeyword_jis78 = 309 , eCSSKeyword_jis83 = 310 , eCSSKeyword_jis90 = 311 , eCSSKeyword_jis04 = 312 , eCSSKeyword_justify = 313 , eCSSKeyword_keep_all = 314 , eCSSKeyword_khz = 315 , eCSSKeyword_landscape = 316 , eCSSKeyword_large = 317 , eCSSKeyword_larger = 318 , eCSSKeyword_last = 319 , eCSSKeyword_last_baseline = 320 , eCSSKeyword_layout = 321 , eCSSKeyword_left = 322 , eCSSKeyword_legacy = 323 , eCSSKeyword_lighten = 324 , eCSSKeyword_lighter = 325 , eCSSKeyword_line_through = 326 , eCSSKeyword_linear = 327 , eCSSKeyword_lining_nums = 328 , eCSSKeyword_list_item = 329 , eCSSKeyword_local = 330 , eCSSKeyword_logical = 331 , eCSSKeyword_looped = 332 , eCSSKeyword_lowercase = 333 , eCSSKeyword_lr = 334 , eCSSKeyword_lr_tb = 335 , eCSSKeyword_ltr = 336 , eCSSKeyword_luminance = 337 , eCSSKeyword_luminosity = 338 , eCSSKeyword_mandatory = 339 , eCSSKeyword_manipulation = 340 , eCSSKeyword_manual = 341 , eCSSKeyword_margin_box = 342 , eCSSKeyword_markers = 343 , eCSSKeyword_match_parent = 344 , eCSSKeyword_match_source = 345 , eCSSKeyword_matrix = 346 , eCSSKeyword_matrix3d = 347 , eCSSKeyword_max_content = 348 , eCSSKeyword_medium = 349 , eCSSKeyword_menu = 350 , eCSSKeyword_menutext = 351 , eCSSKeyword_message_box = 352 , eCSSKeyword_middle = 353 , eCSSKeyword_min_content = 354 , eCSSKeyword_minmax = 355 , eCSSKeyword_mix = 356 , eCSSKeyword_mixed = 357 , eCSSKeyword_mm = 358 , eCSSKeyword_monospace = 359 , eCSSKeyword_move = 360 , eCSSKeyword_ms = 361 , eCSSKeyword_multiply = 362 , eCSSKeyword_n_resize = 363 , eCSSKeyword_narrower = 364 , eCSSKeyword_ne_resize = 365 , eCSSKeyword_nesw_resize = 366 , eCSSKeyword_no_clip = 367 , eCSSKeyword_no_close_quote = 368 , eCSSKeyword_no_common_ligatures = 369 , eCSSKeyword_no_contextual = 370 , eCSSKeyword_no_discretionary_ligatures = 371 , eCSSKeyword_no_drag = 372 , eCSSKeyword_no_drop = 373 , eCSSKeyword_no_historical_ligatures = 374 , eCSSKeyword_no_open_quote = 375 , eCSSKeyword_no_repeat = 376 , eCSSKeyword_none = 377 , eCSSKeyword_normal = 378 , eCSSKeyword_not_allowed = 379 , eCSSKeyword_nowrap = 380 , eCSSKeyword_numeric = 381 , eCSSKeyword_ns_resize = 382 , eCSSKeyword_nw_resize = 383 , eCSSKeyword_nwse_resize = 384 , eCSSKeyword_oblique = 385 , eCSSKeyword_oldstyle_nums = 386 , eCSSKeyword_opacity = 387 , eCSSKeyword_open = 388 , eCSSKeyword_open_quote = 389 , eCSSKeyword_optional = 390 , eCSSKeyword_ordinal = 391 , eCSSKeyword_ornaments = 392 , eCSSKeyword_outset = 393 , eCSSKeyword_outside = 394 , eCSSKeyword_over = 395 , eCSSKeyword_overlay = 396 , eCSSKeyword_overline = 397 , eCSSKeyword_paint = 398 , eCSSKeyword_padding_box = 399 , eCSSKeyword_painted = 400 , eCSSKeyword_pan_x = 401 , eCSSKeyword_pan_y = 402 , eCSSKeyword_paused = 403 , eCSSKeyword_pc = 404 , eCSSKeyword_perspective = 405 , eCSSKeyword_petite_caps = 406 , eCSSKeyword_physical = 407 , eCSSKeyword_plaintext = 408 , eCSSKeyword_pointer = 409 , eCSSKeyword_polygon = 410 , eCSSKeyword_portrait = 411 , eCSSKeyword_pre = 412 , eCSSKeyword_pre_wrap = 413 , eCSSKeyword_pre_line = 414 , eCSSKeyword_preserve_3d = 415 , eCSSKeyword_progress = 416 , eCSSKeyword_progressive = 417 , eCSSKeyword_proportional_nums = 418 , eCSSKeyword_proportional_width = 419 , eCSSKeyword_proximity = 420 , eCSSKeyword_pt = 421 , eCSSKeyword_px = 422 , eCSSKeyword_rad = 423 , eCSSKeyword_read_only = 424 , eCSSKeyword_read_write = 425 , eCSSKeyword_relative = 426 , eCSSKeyword_repeat = 427 , eCSSKeyword_repeat_x = 428 , eCSSKeyword_repeat_y = 429 , eCSSKeyword_reverse = 430 , eCSSKeyword_ridge = 431 , eCSSKeyword_right = 432 , eCSSKeyword_rl = 433 , eCSSKeyword_rl_tb = 434 , eCSSKeyword_rotate = 435 , eCSSKeyword_rotate3d = 436 , eCSSKeyword_rotatex = 437 , eCSSKeyword_rotatey = 438 , eCSSKeyword_rotatez = 439 , eCSSKeyword_round = 440 , eCSSKeyword_row = 441 , eCSSKeyword_row_resize = 442 , eCSSKeyword_row_reverse = 443 , eCSSKeyword_rtl = 444 , eCSSKeyword_ruby = 445 , eCSSKeyword_ruby_base = 446 , eCSSKeyword_ruby_base_container = 447 , eCSSKeyword_ruby_text = 448 , eCSSKeyword_ruby_text_container = 449 , eCSSKeyword_running = 450 , eCSSKeyword_s = 451 , eCSSKeyword_s_resize = 452 , eCSSKeyword_safe = 453 , eCSSKeyword_saturate = 454 , eCSSKeyword_saturation = 455 , eCSSKeyword_scale = 456 , eCSSKeyword_scale_down = 457 , eCSSKeyword_scale3d = 458 , eCSSKeyword_scalex = 459 , eCSSKeyword_scaley = 460 , eCSSKeyword_scalez = 461 , eCSSKeyword_screen = 462 , eCSSKeyword_script = 463 , eCSSKeyword_scroll = 464 , eCSSKeyword_scrollbar = 465 , eCSSKeyword_scrollbar_small = 466 , eCSSKeyword_scrollbar_horizontal = 467 , eCSSKeyword_scrollbar_vertical = 468 , eCSSKeyword_se_resize = 469 , eCSSKeyword_select_after = 470 , eCSSKeyword_select_all = 471 , eCSSKeyword_select_before = 472 , eCSSKeyword_select_menu = 473 , eCSSKeyword_select_same = 474 , eCSSKeyword_self_end = 475 , eCSSKeyword_self_start = 476 , eCSSKeyword_semi_condensed = 477 , eCSSKeyword_semi_expanded = 478 , eCSSKeyword_separate = 479 , eCSSKeyword_sepia = 480 , eCSSKeyword_serif = 481 , eCSSKeyword_sesame = 482 , eCSSKeyword_show = 483 , eCSSKeyword_sideways = 484 , eCSSKeyword_sideways_lr = 485 , eCSSKeyword_sideways_right = 486 , eCSSKeyword_sideways_rl = 487 , eCSSKeyword_simplified = 488 , eCSSKeyword_skew = 489 , eCSSKeyword_skewx = 490 , eCSSKeyword_skewy = 491 , eCSSKeyword_slashed_zero = 492 , eCSSKeyword_slice = 493 , eCSSKeyword_small = 494 , eCSSKeyword_small_caps = 495 , eCSSKeyword_small_caption = 496 , eCSSKeyword_smaller = 497 , eCSSKeyword_smooth = 498 , eCSSKeyword_soft = 499 , eCSSKeyword_soft_light = 500 , eCSSKeyword_solid = 501 , eCSSKeyword_space_around = 502 , eCSSKeyword_space_between = 503 , eCSSKeyword_space_evenly = 504 , eCSSKeyword_span = 505 , eCSSKeyword_spell_out = 506 , eCSSKeyword_square = 507 , eCSSKeyword_stacked_fractions = 508 , eCSSKeyword_start = 509 , eCSSKeyword_static = 510 , eCSSKeyword_standalone = 511 , eCSSKeyword_status_bar = 512 , eCSSKeyword_step_end = 513 , eCSSKeyword_step_start = 514 , eCSSKeyword_sticky = 515 , eCSSKeyword_stretch = 516 , eCSSKeyword_stretch_to_fit = 517 , eCSSKeyword_stretched = 518 , eCSSKeyword_strict = 519 , eCSSKeyword_stroke = 520 , eCSSKeyword_stroke_box = 521 , eCSSKeyword_style = 522 , eCSSKeyword_styleset = 523 , eCSSKeyword_stylistic = 524 , eCSSKeyword_sub = 525 , eCSSKeyword_subgrid = 526 , eCSSKeyword_subtract = 527 , eCSSKeyword_super = 528 , eCSSKeyword_sw_resize = 529 , eCSSKeyword_swash = 530 , eCSSKeyword_swap = 531 , eCSSKeyword_table = 532 , eCSSKeyword_table_caption = 533 , eCSSKeyword_table_cell = 534 , eCSSKeyword_table_column = 535 , eCSSKeyword_table_column_group = 536 , eCSSKeyword_table_footer_group = 537 , eCSSKeyword_table_header_group = 538 , eCSSKeyword_table_row = 539 , eCSSKeyword_table_row_group = 540 , eCSSKeyword_tabular_nums = 541 , eCSSKeyword_tailed = 542 , eCSSKeyword_tb = 543 , eCSSKeyword_tb_rl = 544 , eCSSKeyword_text = 545 , eCSSKeyword_text_bottom = 546 , eCSSKeyword_text_top = 547 , eCSSKeyword_thick = 548 , eCSSKeyword_thin = 549 , eCSSKeyword_threeddarkshadow = 550 , eCSSKeyword_threedface = 551 , eCSSKeyword_threedhighlight = 552 , eCSSKeyword_threedlightshadow = 553 , eCSSKeyword_threedshadow = 554 , eCSSKeyword_titling_caps = 555 , eCSSKeyword_toggle = 556 , eCSSKeyword_top = 557 , eCSSKeyword_top_outside = 558 , eCSSKeyword_traditional = 559 , eCSSKeyword_translate = 560 , eCSSKeyword_translate3d = 561 , eCSSKeyword_translatex = 562 , eCSSKeyword_translatey = 563 , eCSSKeyword_translatez = 564 , eCSSKeyword_transparent = 565 , eCSSKeyword_triangle = 566 , eCSSKeyword_tri_state = 567 , eCSSKeyword_ultra_condensed = 568 , eCSSKeyword_ultra_expanded = 569 , eCSSKeyword_under = 570 , eCSSKeyword_underline = 571 , eCSSKeyword_unicase = 572 , eCSSKeyword_unsafe = 573 , eCSSKeyword_unset = 574 , eCSSKeyword_uppercase = 575 , eCSSKeyword_upright = 576 , eCSSKeyword_vertical = 577 , eCSSKeyword_vertical_lr = 578 , eCSSKeyword_vertical_rl = 579 , eCSSKeyword_vertical_text = 580 , eCSSKeyword_view_box = 581 , eCSSKeyword_visible = 582 , eCSSKeyword_visiblefill = 583 , eCSSKeyword_visiblepainted = 584 , eCSSKeyword_visiblestroke = 585 , eCSSKeyword_w_resize = 586 , eCSSKeyword_wait = 587 , eCSSKeyword_wavy = 588 , eCSSKeyword_weight = 589 , eCSSKeyword_wider = 590 , eCSSKeyword_window = 591 , eCSSKeyword_windowframe = 592 , eCSSKeyword_windowtext = 593 , eCSSKeyword_words = 594 , eCSSKeyword_wrap = 595 , eCSSKeyword_wrap_reverse = 596 , eCSSKeyword_write_only = 597 , eCSSKeyword_x_large = 598 , eCSSKeyword_x_small = 599 , eCSSKeyword_xx_large = 600 , eCSSKeyword_xx_small = 601 , eCSSKeyword_zoom_in = 602 , eCSSKeyword_zoom_out = 603 , eCSSKeyword_radio = 604 , eCSSKeyword_checkbox = 605 , eCSSKeyword_button_bevel = 606 , eCSSKeyword_toolbox = 607 , eCSSKeyword_toolbar = 608 , eCSSKeyword_toolbarbutton = 609 , eCSSKeyword_toolbargripper = 610 , eCSSKeyword_dualbutton = 611 , eCSSKeyword_toolbarbutton_dropdown = 612 , eCSSKeyword_button_arrow_up = 613 , eCSSKeyword_button_arrow_down = 614 , eCSSKeyword_button_arrow_next = 615 , eCSSKeyword_button_arrow_previous = 616 , eCSSKeyword_separator = 617 , eCSSKeyword_splitter = 618 , eCSSKeyword_statusbar = 619 , eCSSKeyword_statusbarpanel = 620 , eCSSKeyword_resizerpanel = 621 , eCSSKeyword_resizer = 622 , eCSSKeyword_listbox = 623 , eCSSKeyword_listitem = 624 , eCSSKeyword_numbers = 625 , eCSSKeyword_number_input = 626 , eCSSKeyword_treeview = 627 , eCSSKeyword_treeitem = 628 , eCSSKeyword_treetwisty = 629 , eCSSKeyword_treetwistyopen = 630 , eCSSKeyword_treeline = 631 , eCSSKeyword_treeheader = 632 , eCSSKeyword_treeheadercell = 633 , eCSSKeyword_treeheadersortarrow = 634 , eCSSKeyword_progressbar = 635 , eCSSKeyword_progressbar_vertical = 636 , eCSSKeyword_progresschunk = 637 , eCSSKeyword_progresschunk_vertical = 638 , eCSSKeyword_tab = 639 , eCSSKeyword_tabpanels = 640 , eCSSKeyword_tabpanel = 641 , eCSSKeyword_tab_scroll_arrow_back = 642 , eCSSKeyword_tab_scroll_arrow_forward = 643 , eCSSKeyword_tooltip = 644 , eCSSKeyword_inner_spin_button = 645 , eCSSKeyword_spinner = 646 , eCSSKeyword_spinner_upbutton = 647 , eCSSKeyword_spinner_downbutton = 648 , eCSSKeyword_spinner_textfield = 649 , eCSSKeyword_scrollbarbutton_up = 650 , eCSSKeyword_scrollbarbutton_down = 651 , eCSSKeyword_scrollbarbutton_left = 652 , eCSSKeyword_scrollbarbutton_right = 653 , eCSSKeyword_scrollbartrack_horizontal = 654 , eCSSKeyword_scrollbartrack_vertical = 655 , eCSSKeyword_scrollbarthumb_horizontal = 656 , eCSSKeyword_scrollbarthumb_vertical = 657 , eCSSKeyword_sheet = 658 , eCSSKeyword_textfield = 659 , eCSSKeyword_textfield_multiline = 660 , eCSSKeyword_caret = 661 , eCSSKeyword_searchfield = 662 , eCSSKeyword_menubar = 663 , eCSSKeyword_menupopup = 664 , eCSSKeyword_menuitem = 665 , eCSSKeyword_checkmenuitem = 666 , eCSSKeyword_radiomenuitem = 667 , eCSSKeyword_menucheckbox = 668 , eCSSKeyword_menuradio = 669 , eCSSKeyword_menuseparator = 670 , eCSSKeyword_menuarrow = 671 , eCSSKeyword_menuimage = 672 , eCSSKeyword_menuitemtext = 673 , eCSSKeyword_menulist = 674 , eCSSKeyword_menulist_button = 675 , eCSSKeyword_menulist_text = 676 , eCSSKeyword_menulist_textfield = 677 , eCSSKeyword_meterbar = 678 , eCSSKeyword_meterchunk = 679 , eCSSKeyword_minimal_ui = 680 , eCSSKeyword_range = 681 , eCSSKeyword_range_thumb = 682 , eCSSKeyword_sans_serif = 683 , eCSSKeyword_sans_serif_bold_italic = 684 , eCSSKeyword_sans_serif_italic = 685 , eCSSKeyword_scale_horizontal = 686 , eCSSKeyword_scale_vertical = 687 , eCSSKeyword_scalethumb_horizontal = 688 , eCSSKeyword_scalethumb_vertical = 689 , eCSSKeyword_scalethumbstart = 690 , eCSSKeyword_scalethumbend = 691 , eCSSKeyword_scalethumbtick = 692 , eCSSKeyword_groupbox = 693 , eCSSKeyword_checkbox_container = 694 , eCSSKeyword_radio_container = 695 , eCSSKeyword_checkbox_label = 696 , eCSSKeyword_radio_label = 697 , eCSSKeyword_button_focus = 698 , eCSSKeyword__moz_win_media_toolbox = 699 , eCSSKeyword__moz_win_communications_toolbox = 700 , eCSSKeyword__moz_win_browsertabbar_toolbox = 701 , eCSSKeyword__moz_win_accentcolor = 702 , eCSSKeyword__moz_win_accentcolortext = 703 , eCSSKeyword__moz_win_mediatext = 704 , eCSSKeyword__moz_win_communicationstext = 705 , eCSSKeyword__moz_win_glass = 706 , eCSSKeyword__moz_win_borderless_glass = 707 , eCSSKeyword__moz_window_titlebar = 708 , eCSSKeyword__moz_window_titlebar_maximized = 709 , eCSSKeyword__moz_window_frame_left = 710 , eCSSKeyword__moz_window_frame_right = 711 , eCSSKeyword__moz_window_frame_bottom = 712 , eCSSKeyword__moz_window_button_close = 713 , eCSSKeyword__moz_window_button_minimize = 714 , eCSSKeyword__moz_window_button_maximize = 715 , eCSSKeyword__moz_window_button_restore = 716 , eCSSKeyword__moz_window_button_box = 717 , eCSSKeyword__moz_window_button_box_maximized = 718 , eCSSKeyword__moz_mac_help_button = 719 , eCSSKeyword__moz_win_exclude_glass = 720 , eCSSKeyword__moz_mac_vibrancy_light = 721 , eCSSKeyword__moz_mac_vibrancy_dark = 722 , eCSSKeyword__moz_mac_vibrant_titlebar_light = 723 , eCSSKeyword__moz_mac_vibrant_titlebar_dark = 724 , eCSSKeyword__moz_mac_disclosure_button_closed = 725 , eCSSKeyword__moz_mac_disclosure_button_open = 726 , eCSSKeyword__moz_mac_source_list = 727 , eCSSKeyword__moz_mac_source_list_selection = 728 , eCSSKeyword__moz_mac_active_source_list_selection = 729 , eCSSKeyword_alphabetic = 730 , eCSSKeyword_bevel = 731 , eCSSKeyword_butt = 732 , eCSSKeyword_central = 733 , eCSSKeyword_crispedges = 734 , eCSSKeyword_evenodd = 735 , eCSSKeyword_geometricprecision = 736 , eCSSKeyword_hanging = 737 , eCSSKeyword_ideographic = 738 , eCSSKeyword_linearrgb = 739 , eCSSKeyword_mathematical = 740 , eCSSKeyword_miter = 741 , eCSSKeyword_no_change = 742 , eCSSKeyword_non_scaling_stroke = 743 , eCSSKeyword_nonzero = 744 , eCSSKeyword_optimizelegibility = 745 , eCSSKeyword_optimizequality = 746 , eCSSKeyword_optimizespeed = 747 , eCSSKeyword_reset_size = 748 , eCSSKeyword_srgb = 749 , eCSSKeyword_symbolic = 750 , eCSSKeyword_symbols = 751 , eCSSKeyword_text_after_edge = 752 , eCSSKeyword_text_before_edge = 753 , eCSSKeyword_use_script = 754 , eCSSKeyword__moz_crisp_edges = 755 , eCSSKeyword_space = 756 , eCSSKeyword_COUNT = 757 , } pub const nsStyleStructID_nsStyleStructID_None : root :: nsStyleStructID = -1 ; pub const nsStyleStructID_nsStyleStructID_Inherited_Start : root :: nsStyleStructID = 0 ; pub const nsStyleStructID_nsStyleStructID_DUMMY1 : root :: nsStyleStructID = -1 ; pub const nsStyleStructID_eStyleStruct_Font : root :: nsStyleStructID = 0 ; pub const nsStyleStructID_eStyleStruct_Color : root :: nsStyleStructID = 1 ; pub const nsStyleStructID_eStyleStruct_List : root :: nsStyleStructID = 2 ; pub const nsStyleStructID_eStyleStruct_Text : root :: nsStyleStructID = 3 ; pub const nsStyleStructID_eStyleStruct_Visibility : root :: nsStyleStructID = 4 ; pub const nsStyleStructID_eStyleStruct_UserInterface : root :: nsStyleStructID = 5 ; pub const nsStyleStructID_eStyleStruct_TableBorder : root :: nsStyleStructID = 6 ; pub const nsStyleStructID_eStyleStruct_SVG : root :: nsStyleStructID = 7 ; pub const nsStyleStructID_eStyleStruct_Variables : root :: nsStyleStructID = 8 ; pub const nsStyleStructID_nsStyleStructID_Reset_Start : root :: nsStyleStructID = 9 ; pub const nsStyleStructID_nsStyleStructID_DUMMY2 : root :: nsStyleStructID = 8 ; pub const nsStyleStructID_eStyleStruct_Background : root :: nsStyleStructID = 9 ; pub const nsStyleStructID_eStyleStruct_Position : root :: nsStyleStructID = 10 ; pub const nsStyleStructID_eStyleStruct_TextReset : root :: nsStyleStructID = 11 ; pub const nsStyleStructID_eStyleStruct_Display : root :: nsStyleStructID = 12 ; pub const nsStyleStructID_eStyleStruct_Content : root :: nsStyleStructID = 13 ; pub const nsStyleStructID_eStyleStruct_UIReset : root :: nsStyleStructID = 14 ; pub const nsStyleStructID_eStyleStruct_Table : root :: nsStyleStructID = 15 ; pub const nsStyleStructID_eStyleStruct_Margin : root :: nsStyleStructID = 16 ; pub const nsStyleStructID_eStyleStruct_Padding : root :: nsStyleStructID = 17 ; pub const nsStyleStructID_eStyleStruct_Border : root :: nsStyleStructID = 18 ; pub const nsStyleStructID_eStyleStruct_Outline : root :: nsStyleStructID = 19 ; pub const nsStyleStructID_eStyleStruct_XUL : root :: nsStyleStructID = 20 ; pub const nsStyleStructID_eStyleStruct_SVGReset : root :: nsStyleStructID = 21 ; pub const nsStyleStructID_eStyleStruct_Column : root :: nsStyleStructID = 22 ; pub const nsStyleStructID_eStyleStruct_Effects : root :: nsStyleStructID = 23 ; pub const nsStyleStructID_nsStyleStructID_Length : root :: nsStyleStructID = 24 ; pub const nsStyleStructID_nsStyleStructID_Inherited_Count : root :: nsStyleStructID = 9 ; pub const nsStyleStructID_nsStyleStructID_Reset_Count : root :: nsStyleStructID = 15 ; pub type nsStyleStructID = :: std :: os :: raw :: c_int ; pub const nsStyleAnimType_eStyleAnimType_Custom : root :: nsStyleAnimType = 0 ; pub const nsStyleAnimType_eStyleAnimType_Coord : root :: nsStyleAnimType = 1 ; pub const nsStyleAnimType_eStyleAnimType_Sides_Top : root :: nsStyleAnimType = 2 ; pub const nsStyleAnimType_eStyleAnimType_Sides_Right : root :: nsStyleAnimType = 3 ; pub const nsStyleAnimType_eStyleAnimType_Sides_Bottom : root :: nsStyleAnimType = 4 ; pub const nsStyleAnimType_eStyleAnimType_Sides_Left : root :: nsStyleAnimType = 5 ; pub const nsStyleAnimType_eStyleAnimType_Corner_TopLeft : root :: nsStyleAnimType = 6 ; pub const nsStyleAnimType_eStyleAnimType_Corner_TopRight : root :: nsStyleAnimType = 7 ; pub const nsStyleAnimType_eStyleAnimType_Corner_BottomRight : root :: nsStyleAnimType = 8 ; pub const nsStyleAnimType_eStyleAnimType_Corner_BottomLeft : root :: nsStyleAnimType = 9 ; pub const nsStyleAnimType_eStyleAnimType_nscoord : root :: nsStyleAnimType = 10 ; pub const nsStyleAnimType_eStyleAnimType_float : root :: nsStyleAnimType = 11 ; pub const nsStyleAnimType_eStyleAnimType_Color : root :: nsStyleAnimType = 12 ; pub const nsStyleAnimType_eStyleAnimType_ComplexColor : root :: nsStyleAnimType = 13 ; pub const nsStyleAnimType_eStyleAnimType_PaintServer : root :: nsStyleAnimType = 14 ; pub const nsStyleAnimType_eStyleAnimType_Shadow : root :: nsStyleAnimType = 15 ; pub const nsStyleAnimType_eStyleAnimType_Discrete : root :: nsStyleAnimType = 16 ; pub const nsStyleAnimType_eStyleAnimType_None : root :: nsStyleAnimType = 17 ; pub type nsStyleAnimType = :: std :: os :: raw :: c_uint ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsCSSProps { pub _address : u8 , } pub use self :: super :: root :: mozilla :: CSSEnabledState as nsCSSProps_EnabledState ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsCSSProps_KTableEntry { pub mKeyword : root :: nsCSSKeyword , pub mValue : i16 , } # [ test ] fn bindgen_test_layout_nsCSSProps_KTableEntry ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSProps_KTableEntry > ( ) , 4usize , concat ! ( "Size of: " , stringify ! ( nsCSSProps_KTableEntry ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSProps_KTableEntry > ( ) , 2usize , concat ! ( "Alignment of " , stringify ! ( nsCSSProps_KTableEntry ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSProps_KTableEntry ) ) . mKeyword as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSProps_KTableEntry ) , "::" , stringify ! ( mKeyword ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSProps_KTableEntry ) ) . mValue as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSProps_KTableEntry ) , "::" , stringify ! ( mValue ) ) ) ; } impl Clone for nsCSSProps_KTableEntry { fn clone ( & self ) -> Self { * self } } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps9kSIDTableE" ] 
- pub static mut  nsCSSProps_kSIDTable  :  [ root :: nsStyleStructID ; 325usize ] ;
+ # [ link_name = "\u{1}__ZN10nsCSSProps9kSIDTableE" ] 
+ pub static mut  nsCSSProps_kSIDTable  :  [ root :: nsStyleStructID ; 326usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kKeywordTableTableE" ] 
- pub static mut  nsCSSProps_kKeywordTableTable  :  [ * const root :: nsCSSProps_KTableEntry ; 325usize ] ;
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kKeywordTableTableE" ] 
+ pub static mut  nsCSSProps_kKeywordTableTable  :  [ * const root :: nsCSSProps_KTableEntry ; 326usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps14kAnimTypeTableE" ] 
- pub static mut  nsCSSProps_kAnimTypeTable  :  [ root :: nsStyleAnimType ; 325usize ] ;
+ # [ link_name = "\u{1}__ZN10nsCSSProps14kAnimTypeTableE" ] 
+ pub static mut  nsCSSProps_kAnimTypeTable  :  [ root :: nsStyleAnimType ; 326usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps23kStyleStructOffsetTableE" ] 
- pub static mut  nsCSSProps_kStyleStructOffsetTable  :  [ isize ; 325usize ] ;
+ # [ link_name = "\u{1}__ZN10nsCSSProps23kStyleStructOffsetTableE" ] 
+ pub static mut  nsCSSProps_kStyleStructOffsetTable  :  [ isize ; 326usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps11kFlagsTableE" ] 
- pub static mut  nsCSSProps_kFlagsTable  :  [ u32 ; 374usize ] ;
+ # [ link_name = "\u{1}__ZN10nsCSSProps11kFlagsTableE" ] 
+ pub static mut  nsCSSProps_kFlagsTable  :  [ u32 ; 375usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19kParserVariantTableE" ] 
- pub static mut  nsCSSProps_kParserVariantTable  :  [ u32 ; 325usize ] ;
+ # [ link_name = "\u{1}__ZN10nsCSSProps19kParserVariantTableE" ] 
+ pub static mut  nsCSSProps_kParserVariantTable  :  [ u32 ; 326usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kSubpropertyTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kSubpropertyTableE" ] 
  pub static mut  nsCSSProps_kSubpropertyTable  :  [ * const root :: nsCSSPropertyID ; 49usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps26gShorthandsContainingTableE" ] 
- pub static mut  nsCSSProps_gShorthandsContainingTable  :  [ * mut root :: nsCSSPropertyID ; 325usize ] ;
+ # [ link_name = "\u{1}__ZN10nsCSSProps26gShorthandsContainingTableE" ] 
+ pub static mut  nsCSSProps_gShorthandsContainingTable  :  [ * mut root :: nsCSSPropertyID ; 326usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25gShorthandsContainingPoolE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25gShorthandsContainingPoolE" ] 
  pub static mut  nsCSSProps_gShorthandsContainingPool  :  * mut root :: nsCSSPropertyID ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps22gPropertyCountInStructE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps22gPropertyCountInStructE" ] 
  pub static mut  nsCSSProps_gPropertyCountInStruct  :  [ usize ; 24usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps22gPropertyIndexInStructE" ] 
- pub static mut  nsCSSProps_gPropertyIndexInStruct  :  [ usize ; 325usize ] ;
+ # [ link_name = "\u{1}__ZN10nsCSSProps22gPropertyIndexInStructE" ] 
+ pub static mut  nsCSSProps_gPropertyIndexInStruct  :  [ usize ; 326usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kLogicalGroupTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kLogicalGroupTableE" ] 
  pub static mut  nsCSSProps_kLogicalGroupTable  :  [ * const root :: nsCSSPropertyID ; 9usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16gPropertyEnabledE" ] 
- pub static mut  nsCSSProps_gPropertyEnabled  :  [ bool ; 482usize ] ;
+ # [ link_name = "\u{1}__ZN10nsCSSProps16gPropertyEnabledE" ] 
+ pub static mut  nsCSSProps_gPropertyEnabled  :  [ bool ; 483usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps13kIDLNameTableE" ] 
- pub static mut  nsCSSProps_kIDLNameTable  :  [ * const :: std :: os :: raw :: c_char ; 374usize ] ;
+ # [ link_name = "\u{1}__ZN10nsCSSProps13kIDLNameTableE" ] 
+ pub static mut  nsCSSProps_kIDLNameTable  :  [ * const :: std :: os :: raw :: c_char ; 375usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kIDLNameSortPositionTableE" ] 
- pub static mut  nsCSSProps_kIDLNameSortPositionTable  :  [ i32 ; 374usize ] ;
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kIDLNameSortPositionTableE" ] 
+ pub static mut  nsCSSProps_kIDLNameSortPositionTable  :  [ i32 ; 375usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19gPropertyUseCounterE" ] 
- pub static mut  nsCSSProps_gPropertyUseCounter  :  [ root :: mozilla :: UseCounter ; 325usize ] ;
+ # [ link_name = "\u{1}__ZN10nsCSSProps19gPropertyUseCounterE" ] 
+ pub static mut  nsCSSProps_gPropertyUseCounter  :  [ root :: mozilla :: UseCounter ; 326usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kAnimationDirectionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kAnimationDirectionKTableE" ] 
  pub static mut  nsCSSProps_kAnimationDirectionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps24kAnimationFillModeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps24kAnimationFillModeKTableE" ] 
  pub static mut  nsCSSProps_kAnimationFillModeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps30kAnimationIterationCountKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps30kAnimationIterationCountKTableE" ] 
  pub static mut  nsCSSProps_kAnimationIterationCountKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kAnimationPlayStateKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kAnimationPlayStateKTableE" ] 
  pub static mut  nsCSSProps_kAnimationPlayStateKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps30kAnimationTimingFunctionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps30kAnimationTimingFunctionKTableE" ] 
  pub static mut  nsCSSProps_kAnimationTimingFunctionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kAppearanceKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kAppearanceKTableE" ] 
  pub static mut  nsCSSProps_kAppearanceKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps14kAzimuthKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps14kAzimuthKTableE" ] 
  pub static mut  nsCSSProps_kAzimuthKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kBackfaceVisibilityKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kBackfaceVisibilityKTableE" ] 
  pub static mut  nsCSSProps_kBackfaceVisibilityKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kTransformStyleKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kTransformStyleKTableE" ] 
  pub static mut  nsCSSProps_kTransformStyleKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps27kImageLayerAttachmentKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps27kImageLayerAttachmentKTableE" ] 
  pub static mut  nsCSSProps_kImageLayerAttachmentKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps23kBackgroundOriginKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps23kBackgroundOriginKTableE" ] 
  pub static mut  nsCSSProps_kBackgroundOriginKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kMaskOriginKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kMaskOriginKTableE" ] 
  pub static mut  nsCSSProps_kMaskOriginKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kImageLayerPositionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kImageLayerPositionKTableE" ] 
  pub static mut  nsCSSProps_kImageLayerPositionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps23kImageLayerRepeatKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps23kImageLayerRepeatKTableE" ] 
  pub static mut  nsCSSProps_kImageLayerRepeatKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps27kImageLayerRepeatPartKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps27kImageLayerRepeatPartKTableE" ] 
  pub static mut  nsCSSProps_kImageLayerRepeatPartKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kImageLayerSizeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kImageLayerSizeKTableE" ] 
  pub static mut  nsCSSProps_kImageLayerSizeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps26kImageLayerCompositeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps26kImageLayerCompositeKTableE" ] 
  pub static mut  nsCSSProps_kImageLayerCompositeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kImageLayerModeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kImageLayerModeKTableE" ] 
  pub static mut  nsCSSProps_kImageLayerModeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kBackgroundClipKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kBackgroundClipKTableE" ] 
  pub static mut  nsCSSProps_kBackgroundClipKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps15kMaskClipKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps15kMaskClipKTableE" ] 
  pub static mut  nsCSSProps_kMaskClipKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kBlendModeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kBlendModeKTableE" ] 
  pub static mut  nsCSSProps_kBlendModeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kBorderCollapseKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kBorderCollapseKTableE" ] 
  pub static mut  nsCSSProps_kBorderCollapseKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps24kBorderImageRepeatKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps24kBorderImageRepeatKTableE" ] 
  pub static mut  nsCSSProps_kBorderImageRepeatKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps23kBorderImageSliceKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps23kBorderImageSliceKTableE" ] 
  pub static mut  nsCSSProps_kBorderImageSliceKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kBorderStyleKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kBorderStyleKTableE" ] 
  pub static mut  nsCSSProps_kBorderStyleKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kBorderWidthKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kBorderWidthKTableE" ] 
  pub static mut  nsCSSProps_kBorderWidthKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps15kBoxAlignKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps15kBoxAlignKTableE" ] 
  pub static mut  nsCSSProps_kBoxAlignKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kBoxDecorationBreakKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kBoxDecorationBreakKTableE" ] 
  pub static mut  nsCSSProps_kBoxDecorationBreakKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19kBoxDirectionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps19kBoxDirectionKTableE" ] 
  pub static mut  nsCSSProps_kBoxDirectionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kBoxOrientKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kBoxOrientKTableE" ] 
  pub static mut  nsCSSProps_kBoxOrientKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps14kBoxPackKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps14kBoxPackKTableE" ] 
  pub static mut  nsCSSProps_kBoxPackKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps26kClipPathGeometryBoxKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps26kClipPathGeometryBoxKTableE" ] 
  pub static mut  nsCSSProps_kClipPathGeometryBoxKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19kCounterRangeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps19kCounterRangeKTableE" ] 
  pub static mut  nsCSSProps_kCounterRangeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kCounterSpeakAsKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kCounterSpeakAsKTableE" ] 
  pub static mut  nsCSSProps_kCounterSpeakAsKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps27kCounterSymbolsSystemKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps27kCounterSymbolsSystemKTableE" ] 
  pub static mut  nsCSSProps_kCounterSymbolsSystemKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kCounterSystemKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kCounterSystemKTableE" ] 
  pub static mut  nsCSSProps_kCounterSystemKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps23kDominantBaselineKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps23kDominantBaselineKTableE" ] 
  pub static mut  nsCSSProps_kDominantBaselineKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kShapeRadiusKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kShapeRadiusKTableE" ] 
  pub static mut  nsCSSProps_kShapeRadiusKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps15kFillRuleKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps15kFillRuleKTableE" ] 
  pub static mut  nsCSSProps_kFillRuleKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kFilterFunctionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kFilterFunctionKTableE" ] 
  pub static mut  nsCSSProps_kFilterFunctionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kImageRenderingKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kImageRenderingKTableE" ] 
  pub static mut  nsCSSProps_kImageRenderingKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps27kShapeOutsideShapeBoxKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps27kShapeOutsideShapeBoxKTableE" ] 
  pub static mut  nsCSSProps_kShapeOutsideShapeBoxKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kShapeRenderingKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kShapeRenderingKTableE" ] 
  pub static mut  nsCSSProps_kShapeRenderingKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kStrokeLinecapKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kStrokeLinecapKTableE" ] 
  pub static mut  nsCSSProps_kStrokeLinecapKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kStrokeLinejoinKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kStrokeLinejoinKTableE" ] 
  pub static mut  nsCSSProps_kStrokeLinejoinKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kStrokeContextValueKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kStrokeContextValueKTableE" ] 
  pub static mut  nsCSSProps_kStrokeContextValueKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19kVectorEffectKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps19kVectorEffectKTableE" ] 
  pub static mut  nsCSSProps_kVectorEffectKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kTextAnchorKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kTextAnchorKTableE" ] 
  pub static mut  nsCSSProps_kTextAnchorKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kTextRenderingKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kTextRenderingKTableE" ] 
  pub static mut  nsCSSProps_kTextRenderingKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kColorAdjustKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kColorAdjustKTableE" ] 
  pub static mut  nsCSSProps_kColorAdjustKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kColorInterpolationKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kColorInterpolationKTableE" ] 
  pub static mut  nsCSSProps_kColorInterpolationKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kColumnFillKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kColumnFillKTableE" ] 
  pub static mut  nsCSSProps_kColumnFillKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kColumnSpanKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kColumnSpanKTableE" ] 
  pub static mut  nsCSSProps_kColumnSpanKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kBoxPropSourceKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kBoxPropSourceKTableE" ] 
  pub static mut  nsCSSProps_kBoxPropSourceKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kBoxShadowTypeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kBoxShadowTypeKTableE" ] 
  pub static mut  nsCSSProps_kBoxShadowTypeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kBoxSizingKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kBoxSizingKTableE" ] 
  pub static mut  nsCSSProps_kBoxSizingKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kCaptionSideKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kCaptionSideKTableE" ] 
  pub static mut  nsCSSProps_kCaptionSideKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps12kClearKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps12kClearKTableE" ] 
  pub static mut  nsCSSProps_kClearKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps12kColorKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps12kColorKTableE" ] 
  pub static mut  nsCSSProps_kColorKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps14kContentKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps14kContentKTableE" ] 
  pub static mut  nsCSSProps_kContentKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps33kControlCharacterVisibilityKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps33kControlCharacterVisibilityKTableE" ] 
  pub static mut  nsCSSProps_kControlCharacterVisibilityKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps13kCursorKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps13kCursorKTableE" ] 
  pub static mut  nsCSSProps_kCursorKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kDirectionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kDirectionKTableE" ] 
  pub static mut  nsCSSProps_kDirectionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps14kDisplayKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps14kDisplayKTableE" ] 
  pub static mut  nsCSSProps_kDisplayKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kElevationKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kElevationKTableE" ] 
  pub static mut  nsCSSProps_kElevationKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kEmptyCellsKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kEmptyCellsKTableE" ] 
  pub static mut  nsCSSProps_kEmptyCellsKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kAlignAllKeywordsE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kAlignAllKeywordsE" ] 
  pub static mut  nsCSSProps_kAlignAllKeywords  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps22kAlignOverflowPositionE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps22kAlignOverflowPositionE" ] 
  pub static mut  nsCSSProps_kAlignOverflowPosition  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kAlignSelfPositionE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kAlignSelfPositionE" ] 
  pub static mut  nsCSSProps_kAlignSelfPosition  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps12kAlignLegacyE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps12kAlignLegacyE" ] 
  pub static mut  nsCSSProps_kAlignLegacy  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kAlignLegacyPositionE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kAlignLegacyPositionE" ] 
  pub static mut  nsCSSProps_kAlignLegacyPosition  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps31kAlignAutoNormalStretchBaselineE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps31kAlignAutoNormalStretchBaselineE" ] 
  pub static mut  nsCSSProps_kAlignAutoNormalStretchBaseline  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps27kAlignNormalStretchBaselineE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps27kAlignNormalStretchBaselineE" ] 
  pub static mut  nsCSSProps_kAlignNormalStretchBaseline  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kAlignNormalBaselineE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kAlignNormalBaselineE" ] 
  pub static mut  nsCSSProps_kAlignNormalBaseline  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kAlignContentDistributionE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kAlignContentDistributionE" ] 
  pub static mut  nsCSSProps_kAlignContentDistribution  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kAlignContentPositionE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kAlignContentPositionE" ] 
  pub static mut  nsCSSProps_kAlignContentPosition  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps31kAutoCompletionAlignJustifySelfE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps31kAutoCompletionAlignJustifySelfE" ] 
  pub static mut  nsCSSProps_kAutoCompletionAlignJustifySelf  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kAutoCompletionAlignItemsE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kAutoCompletionAlignItemsE" ] 
  pub static mut  nsCSSProps_kAutoCompletionAlignItems  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps34kAutoCompletionAlignJustifyContentE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps34kAutoCompletionAlignJustifyContentE" ] 
  pub static mut  nsCSSProps_kAutoCompletionAlignJustifyContent  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kFlexDirectionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kFlexDirectionKTableE" ] 
  pub static mut  nsCSSProps_kFlexDirectionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps15kFlexWrapKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps15kFlexWrapKTableE" ] 
  pub static mut  nsCSSProps_kFlexWrapKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps12kFloatKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps12kFloatKTableE" ] 
  pub static mut  nsCSSProps_kFloatKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kFloatEdgeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kFloatEdgeKTableE" ] 
  pub static mut  nsCSSProps_kFloatEdgeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kFontDisplayKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kFontDisplayKTableE" ] 
  pub static mut  nsCSSProps_kFontDisplayKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps11kFontKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps11kFontKTableE" ] 
  pub static mut  nsCSSProps_kFontKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kFontKerningKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kFontKerningKTableE" ] 
  pub static mut  nsCSSProps_kFontKerningKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps15kFontSizeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps15kFontSizeKTableE" ] 
  pub static mut  nsCSSProps_kFontSizeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kFontSmoothingKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kFontSmoothingKTableE" ] 
  pub static mut  nsCSSProps_kFontSmoothingKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kFontStretchKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kFontStretchKTableE" ] 
  pub static mut  nsCSSProps_kFontStretchKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kFontStyleKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kFontStyleKTableE" ] 
  pub static mut  nsCSSProps_kFontStyleKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kFontSynthesisKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kFontSynthesisKTableE" ] 
  pub static mut  nsCSSProps_kFontSynthesisKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kFontVariantKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kFontVariantKTableE" ] 
  pub static mut  nsCSSProps_kFontVariantKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps28kFontVariantAlternatesKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps28kFontVariantAlternatesKTableE" ] 
  pub static mut  nsCSSProps_kFontVariantAlternatesKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps33kFontVariantAlternatesFuncsKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps33kFontVariantAlternatesFuncsKTableE" ] 
  pub static mut  nsCSSProps_kFontVariantAlternatesFuncsKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps22kFontVariantCapsKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps22kFontVariantCapsKTableE" ] 
  pub static mut  nsCSSProps_kFontVariantCapsKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps27kFontVariantEastAsianKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps27kFontVariantEastAsianKTableE" ] 
  pub static mut  nsCSSProps_kFontVariantEastAsianKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps27kFontVariantLigaturesKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps27kFontVariantLigaturesKTableE" ] 
  pub static mut  nsCSSProps_kFontVariantLigaturesKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kFontVariantNumericKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kFontVariantNumericKTableE" ] 
  pub static mut  nsCSSProps_kFontVariantNumericKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps26kFontVariantPositionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps26kFontVariantPositionKTableE" ] 
  pub static mut  nsCSSProps_kFontVariantPositionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kFontWeightKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kFontWeightKTableE" ] 
  pub static mut  nsCSSProps_kFontWeightKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19kGridAutoFlowKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps19kGridAutoFlowKTableE" ] 
  pub static mut  nsCSSProps_kGridAutoFlowKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps23kGridTrackBreadthKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps23kGridTrackBreadthKTableE" ] 
  pub static mut  nsCSSProps_kGridTrackBreadthKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps14kHyphensKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps14kHyphensKTableE" ] 
  pub static mut  nsCSSProps_kHyphensKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps23kImageOrientationKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps23kImageOrientationKTableE" ] 
  pub static mut  nsCSSProps_kImageOrientationKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps27kImageOrientationFlipKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps27kImageOrientationFlipKTableE" ] 
  pub static mut  nsCSSProps_kImageOrientationFlipKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kIsolationKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kIsolationKTableE" ] 
  pub static mut  nsCSSProps_kIsolationKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps14kIMEModeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps14kIMEModeKTableE" ] 
  pub static mut  nsCSSProps_kIMEModeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kLineHeightKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kLineHeightKTableE" ] 
  pub static mut  nsCSSProps_kLineHeightKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps24kListStylePositionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps24kListStylePositionKTableE" ] 
  pub static mut  nsCSSProps_kListStylePositionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps15kMaskTypeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps15kMaskTypeKTableE" ] 
  pub static mut  nsCSSProps_kMaskTypeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kMathVariantKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kMathVariantKTableE" ] 
  pub static mut  nsCSSProps_kMathVariantKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kMathDisplayKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kMathDisplayKTableE" ] 
  pub static mut  nsCSSProps_kMathDisplayKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps14kContainKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps14kContainKTableE" ] 
  pub static mut  nsCSSProps_kContainKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kContextOpacityKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kContextOpacityKTableE" ] 
  pub static mut  nsCSSProps_kContextOpacityKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kContextPatternKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kContextPatternKTableE" ] 
  pub static mut  nsCSSProps_kContextPatternKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kObjectFitKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kObjectFitKTableE" ] 
  pub static mut  nsCSSProps_kObjectFitKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps13kOrientKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps13kOrientKTableE" ] 
  pub static mut  nsCSSProps_kOrientKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19kOutlineStyleKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps19kOutlineStyleKTableE" ] 
  pub static mut  nsCSSProps_kOutlineStyleKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps15kOverflowKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps15kOverflowKTableE" ] 
  pub static mut  nsCSSProps_kOverflowKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kOverflowSubKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kOverflowSubKTableE" ] 
  pub static mut  nsCSSProps_kOverflowSubKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps22kOverflowClipBoxKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps22kOverflowClipBoxKTableE" ] 
  pub static mut  nsCSSProps_kOverflowClipBoxKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19kOverflowWrapKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps19kOverflowWrapKTableE" ] 
  pub static mut  nsCSSProps_kOverflowWrapKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kPageBreakKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kPageBreakKTableE" ] 
  pub static mut  nsCSSProps_kPageBreakKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps22kPageBreakInsideKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps22kPageBreakInsideKTableE" ] 
  pub static mut  nsCSSProps_kPageBreakInsideKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kPageMarksKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kPageMarksKTableE" ] 
  pub static mut  nsCSSProps_kPageMarksKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps15kPageSizeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps15kPageSizeKTableE" ] 
  pub static mut  nsCSSProps_kPageSizeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps12kPitchKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps12kPitchKTableE" ] 
  pub static mut  nsCSSProps_kPitchKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kPointerEventsKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kPointerEventsKTableE" ] 
  pub static mut  nsCSSProps_kPointerEventsKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps15kPositionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps15kPositionKTableE" ] 
  pub static mut  nsCSSProps_kPositionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps26kRadialGradientShapeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps26kRadialGradientShapeKTableE" ] 
  pub static mut  nsCSSProps_kRadialGradientShapeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kRadialGradientSizeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kRadialGradientSizeKTableE" ] 
  pub static mut  nsCSSProps_kRadialGradientSizeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps31kRadialGradientLegacySizeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps31kRadialGradientLegacySizeKTableE" ] 
  pub static mut  nsCSSProps_kRadialGradientLegacySizeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps13kResizeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps13kResizeKTableE" ] 
  pub static mut  nsCSSProps_kResizeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kRubyAlignKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kRubyAlignKTableE" ] 
  pub static mut  nsCSSProps_kRubyAlignKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19kRubyPositionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps19kRubyPositionKTableE" ] 
  pub static mut  nsCSSProps_kRubyPositionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kScrollBehaviorKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kScrollBehaviorKTableE" ] 
  pub static mut  nsCSSProps_kScrollBehaviorKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kOverscrollBehaviorKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kOverscrollBehaviorKTableE" ] 
  pub static mut  nsCSSProps_kOverscrollBehaviorKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kScrollSnapTypeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kScrollSnapTypeKTableE" ] 
  pub static mut  nsCSSProps_kScrollSnapTypeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps12kSpeakKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps12kSpeakKTableE" ] 
  pub static mut  nsCSSProps_kSpeakKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kSpeakHeaderKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kSpeakHeaderKTableE" ] 
  pub static mut  nsCSSProps_kSpeakHeaderKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19kSpeakNumeralKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps19kSpeakNumeralKTableE" ] 
  pub static mut  nsCSSProps_kSpeakNumeralKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps23kSpeakPunctuationKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps23kSpeakPunctuationKTableE" ] 
  pub static mut  nsCSSProps_kSpeakPunctuationKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kSpeechRateKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kSpeechRateKTableE" ] 
  pub static mut  nsCSSProps_kSpeechRateKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kStackSizingKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kStackSizingKTableE" ] 
  pub static mut  nsCSSProps_kStackSizingKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kTableLayoutKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kTableLayoutKTableE" ] 
  pub static mut  nsCSSProps_kTableLayoutKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kTextAlignKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kTextAlignKTableE" ] 
  pub static mut  nsCSSProps_kTextAlignKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kTextAlignLastKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kTextAlignLastKTableE" ] 
  pub static mut  nsCSSProps_kTextAlignLastKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kTextCombineUprightKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kTextCombineUprightKTableE" ] 
  pub static mut  nsCSSProps_kTextCombineUprightKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps25kTextDecorationLineKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps25kTextDecorationLineKTableE" ] 
  pub static mut  nsCSSProps_kTextDecorationLineKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps26kTextDecorationStyleKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps26kTextDecorationStyleKTableE" ] 
  pub static mut  nsCSSProps_kTextDecorationStyleKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps27kTextEmphasisPositionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps27kTextEmphasisPositionKTableE" ] 
  pub static mut  nsCSSProps_kTextEmphasisPositionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps28kTextEmphasisStyleFillKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps28kTextEmphasisStyleFillKTableE" ] 
  pub static mut  nsCSSProps_kTextEmphasisStyleFillKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps29kTextEmphasisStyleShapeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps29kTextEmphasisStyleShapeKTableE" ] 
  pub static mut  nsCSSProps_kTextEmphasisStyleShapeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kTextJustifyKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kTextJustifyKTableE" ] 
  pub static mut  nsCSSProps_kTextJustifyKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps22kTextOrientationKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps22kTextOrientationKTableE" ] 
  pub static mut  nsCSSProps_kTextOrientationKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19kTextOverflowKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps19kTextOverflowKTableE" ] 
  pub static mut  nsCSSProps_kTextOverflowKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kTextSizeAdjustKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kTextSizeAdjustKTableE" ] 
  pub static mut  nsCSSProps_kTextSizeAdjustKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kTextTransformKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kTextTransformKTableE" ] 
  pub static mut  nsCSSProps_kTextTransformKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kTouchActionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kTouchActionKTableE" ] 
  pub static mut  nsCSSProps_kTouchActionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps15kTopLayerKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps15kTopLayerKTableE" ] 
  pub static mut  nsCSSProps_kTopLayerKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19kTransformBoxKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps19kTransformBoxKTableE" ] 
  pub static mut  nsCSSProps_kTransformBoxKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps31kTransitionTimingFunctionKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps31kTransitionTimingFunctionKTableE" ] 
  pub static mut  nsCSSProps_kTransitionTimingFunctionKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kUnicodeBidiKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kUnicodeBidiKTableE" ] 
  pub static mut  nsCSSProps_kUnicodeBidiKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kUserFocusKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kUserFocusKTableE" ] 
  pub static mut  nsCSSProps_kUserFocusKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kUserInputKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kUserInputKTableE" ] 
  pub static mut  nsCSSProps_kUserInputKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kUserModifyKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kUserModifyKTableE" ] 
  pub static mut  nsCSSProps_kUserModifyKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kUserSelectKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kUserSelectKTableE" ] 
  pub static mut  nsCSSProps_kUserSelectKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps20kVerticalAlignKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps20kVerticalAlignKTableE" ] 
  pub static mut  nsCSSProps_kVerticalAlignKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kVisibilityKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kVisibilityKTableE" ] 
  pub static mut  nsCSSProps_kVisibilityKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps13kVolumeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps13kVolumeKTableE" ] 
  pub static mut  nsCSSProps_kVolumeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps17kWhitespaceKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps17kWhitespaceKTableE" ] 
  pub static mut  nsCSSProps_kWhitespaceKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps12kWidthKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps12kWidthKTableE" ] 
  pub static mut  nsCSSProps_kWidthKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps21kWindowDraggingKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps21kWindowDraggingKTableE" ] 
  pub static mut  nsCSSProps_kWindowDraggingKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps19kWindowShadowKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps19kWindowShadowKTableE" ] 
  pub static mut  nsCSSProps_kWindowShadowKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps16kWordBreakKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps16kWordBreakKTableE" ] 
  pub static mut  nsCSSProps_kWordBreakKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN10nsCSSProps18kWritingModeKTableE" ] 
+ # [ link_name = "\u{1}__ZN10nsCSSProps18kWritingModeKTableE" ] 
  pub static mut  nsCSSProps_kWritingModeKTable  :  [ root :: nsCSSProps_KTableEntry ; 0usize ] ;
 } # [ test ] fn bindgen_test_layout_nsCSSProps ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSProps > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( nsCSSProps ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSProps > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( nsCSSProps ) ) ) ; } impl Clone for nsCSSProps { fn clone ( & self ) -> Self { * self } } 
  /// Class to safely handle main-thread-only pointers off the main thread.
@@ -1489,9 +1492,9 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
     /// All structs and classes that might be accessed on other threads should store
     /// an nsMainThreadPtrHandle<T> rather than an nsCOMPtr<T>. 
  # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsMainThreadPtrHolder < T > { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mRawPtr : * mut T , pub mStrict : bool , pub mMainThreadEventTarget : root :: nsCOMPtr , pub mName : * const :: std :: os :: raw :: c_char , pub _phantom_0 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < T > > , } pub type nsMainThreadPtrHolder_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsMainThreadPtrHandle < T > { pub mPtr : root :: RefPtr < root :: nsMainThreadPtrHolder < T > > , pub _phantom_0 : :: std :: marker :: PhantomData < :: std :: cell :: UnsafeCell < T > > , } # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsCSSUnit { eCSSUnit_Null = 0 , eCSSUnit_Auto = 1 , eCSSUnit_Inherit = 2 , eCSSUnit_Initial = 3 , eCSSUnit_Unset = 4 , eCSSUnit_None = 5 , eCSSUnit_Normal = 6 , eCSSUnit_System_Font = 7 , eCSSUnit_All = 8 , eCSSUnit_Dummy = 9 , eCSSUnit_DummyInherit = 10 , eCSSUnit_String = 11 , eCSSUnit_Ident = 12 , eCSSUnit_Attr = 14 , eCSSUnit_Local_Font = 15 , eCSSUnit_Font_Format = 16 , eCSSUnit_Element = 17 , eCSSUnit_Array = 20 , eCSSUnit_Counter = 21 , eCSSUnit_Counters = 22 , eCSSUnit_Cubic_Bezier = 23 , eCSSUnit_Steps = 24 , eCSSUnit_Symbols = 25 , eCSSUnit_Function = 26 , eCSSUnit_Calc = 30 , eCSSUnit_Calc_Plus = 31 , eCSSUnit_Calc_Minus = 32 , eCSSUnit_Calc_Times_L = 33 , eCSSUnit_Calc_Times_R = 34 , eCSSUnit_Calc_Divided = 35 , eCSSUnit_URL = 40 , eCSSUnit_Image = 41 , eCSSUnit_Gradient = 42 , eCSSUnit_TokenStream = 43 , eCSSUnit_GridTemplateAreas = 44 , eCSSUnit_Pair = 50 , eCSSUnit_Triplet = 51 , eCSSUnit_Rect = 52 , eCSSUnit_List = 53 , eCSSUnit_ListDep = 54 , eCSSUnit_SharedList = 55 , eCSSUnit_PairList = 56 , eCSSUnit_PairListDep = 57 , eCSSUnit_FontFamilyList = 58 , eCSSUnit_AtomIdent = 60 , eCSSUnit_Integer = 70 , eCSSUnit_Enumerated = 71 , eCSSUnit_EnumColor = 80 , eCSSUnit_RGBColor = 81 , eCSSUnit_RGBAColor = 82 , eCSSUnit_HexColor = 83 , eCSSUnit_ShortHexColor = 84 , eCSSUnit_HexColorAlpha = 85 , eCSSUnit_ShortHexColorAlpha = 86 , eCSSUnit_PercentageRGBColor = 87 , eCSSUnit_PercentageRGBAColor = 88 , eCSSUnit_HSLColor = 89 , eCSSUnit_HSLAColor = 90 , eCSSUnit_ComplexColor = 91 , eCSSUnit_Percent = 100 , eCSSUnit_Number = 101 , eCSSUnit_ViewportWidth = 700 , eCSSUnit_ViewportHeight = 701 , eCSSUnit_ViewportMin = 702 , eCSSUnit_ViewportMax = 703 , eCSSUnit_EM = 800 , eCSSUnit_XHeight = 801 , eCSSUnit_Char = 802 , eCSSUnit_RootEM = 803 , eCSSUnit_Point = 900 , eCSSUnit_Inch = 901 , eCSSUnit_Millimeter = 902 , eCSSUnit_Centimeter = 903 , eCSSUnit_Pica = 904 , eCSSUnit_Quarter = 905 , eCSSUnit_Pixel = 906 , eCSSUnit_Degree = 1000 , eCSSUnit_Grad = 1001 , eCSSUnit_Radian = 1002 , eCSSUnit_Turn = 1003 , eCSSUnit_Hertz = 2000 , eCSSUnit_Kilohertz = 2001 , eCSSUnit_Seconds = 3000 , eCSSUnit_Milliseconds = 3001 , eCSSUnit_FlexFraction = 4000 , } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValue { pub mUnit : root :: nsCSSUnit , pub mValue : root :: nsCSSValue__bindgen_ty_1 , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsCSSValue__bindgen_ty_1 { pub mInt : root :: __BindgenUnionField < i32 > , pub mFloat : root :: __BindgenUnionField < f32 > , pub mString : root :: __BindgenUnionField < * mut root :: nsStringBuffer > , pub mColor : root :: __BindgenUnionField < root :: nscolor > , pub mAtom : root :: __BindgenUnionField < * mut root :: nsAtom > , pub mArray : root :: __BindgenUnionField < * mut root :: nsCSSValue_Array > , pub mURL : root :: __BindgenUnionField < * mut root :: mozilla :: css :: URLValue > , pub mImage : root :: __BindgenUnionField < * mut root :: mozilla :: css :: ImageValue > , pub mGridTemplateAreas : root :: __BindgenUnionField < * mut root :: mozilla :: css :: GridTemplateAreasValue > , pub mGradient : root :: __BindgenUnionField < * mut root :: nsCSSValueGradient > , pub mTokenStream : root :: __BindgenUnionField < * mut root :: nsCSSValueTokenStream > , pub mPair : root :: __BindgenUnionField < * mut root :: nsCSSValuePair_heap > , pub mRect : root :: __BindgenUnionField < * mut root :: nsCSSRect_heap > , pub mTriplet : root :: __BindgenUnionField < * mut root :: nsCSSValueTriplet_heap > , pub mList : root :: __BindgenUnionField < * mut root :: nsCSSValueList_heap > , pub mListDependent : root :: __BindgenUnionField < * mut root :: nsCSSValueList > , pub mSharedList : root :: __BindgenUnionField < * mut root :: nsCSSValueSharedList > , pub mPairList : root :: __BindgenUnionField < * mut root :: nsCSSValuePairList_heap > , pub mPairListDependent : root :: __BindgenUnionField < * mut root :: nsCSSValuePairList > , pub mFloatColor : root :: __BindgenUnionField < * mut root :: nsCSSValueFloatColor > , pub mFontFamilyList : root :: __BindgenUnionField < * mut root :: mozilla :: SharedFontList > , pub mComplexColor : root :: __BindgenUnionField < * mut root :: mozilla :: css :: ComplexColorValue > , pub bindgen_union_field : u64 , } # [ test ] fn bindgen_test_layout_nsCSSValue__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValue__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValue__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValue__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mInt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mInt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mFloat as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mFloat ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mString as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mColor as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mAtom as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mAtom ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mArray as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mArray ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mURL as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mURL ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mImage as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mGridTemplateAreas as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mGridTemplateAreas ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mGradient as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mGradient ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mTokenStream as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mTokenStream ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mPair as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mPair ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mRect as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mRect ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mTriplet as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mTriplet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mList as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mListDependent as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mListDependent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mSharedList as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mSharedList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mPairList as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mPairList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mPairListDependent as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mPairListDependent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mFloatColor as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mFloatColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mFontFamilyList as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mFontFamilyList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue__bindgen_ty_1 ) ) . mComplexColor as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue__bindgen_ty_1 ) , "::" , stringify ! ( mComplexColor ) ) ) ; } impl Clone for nsCSSValue__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsCSSValue ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValue > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsCSSValue ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValue > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue ) ) . mUnit as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue ) , "::" , stringify ! ( mUnit ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue ) ) . mValue as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue ) , "::" , stringify ! ( mValue ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValue_Array { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mCount : usize , pub mArray : [ root :: nsCSSValue ; 1usize ] , } pub type nsCSSValue_Array_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_nsCSSValue_Array ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValue_Array > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsCSSValue_Array ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValue_Array > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValue_Array ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue_Array ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue_Array ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue_Array ) ) . mCount as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue_Array ) , "::" , stringify ! ( mCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValue_Array ) ) . mArray as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValue_Array ) , "::" , stringify ! ( mArray ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueList { pub mValue : root :: nsCSSValue , pub mNext : * mut root :: nsCSSValueList , } # [ test ] fn bindgen_test_layout_nsCSSValueList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueList > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueList ) ) . mValue as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueList ) , "::" , stringify ! ( mValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueList ) ) . mNext as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueList ) , "::" , stringify ! ( mNext ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueList_heap { pub _base : root :: nsCSSValueList , pub mRefCnt : root :: nsAutoRefCnt , } pub type nsCSSValueList_heap_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValueList_heap ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueList_heap > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueList_heap ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueList_heap > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueList_heap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueList_heap ) ) . mRefCnt as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueList_heap ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueSharedList { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mHead : * mut root :: nsCSSValueList , } pub type nsCSSValueSharedList_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_nsCSSValueSharedList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueSharedList > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueSharedList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueSharedList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueSharedList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueSharedList ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueSharedList ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueSharedList ) ) . mHead as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueSharedList ) , "::" , stringify ! ( mHead ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSRect { pub mTop : root :: nsCSSValue , pub mRight : root :: nsCSSValue , pub mBottom : root :: nsCSSValue , pub mLeft : root :: nsCSSValue , } pub type nsCSSRect_side_type = * mut root :: nsCSSValue ; extern "C" {
- # [ link_name = "\u{1}_ZN9nsCSSRect5sidesE" ] 
+ # [ link_name = "\u{1}__ZN9nsCSSRect5sidesE" ] 
  pub static mut  nsCSSRect_sides  :  [ root :: nsCSSRect_side_type ; 4usize ] ;
-} # [ test ] fn bindgen_test_layout_nsCSSRect ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSRect > ( ) , 64usize , concat ! ( "Size of: " , stringify ! ( nsCSSRect ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSRect > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSRect ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSRect ) ) . mTop as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSRect ) , "::" , stringify ! ( mTop ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSRect ) ) . mRight as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSRect ) , "::" , stringify ! ( mRight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSRect ) ) . mBottom as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSRect ) , "::" , stringify ! ( mBottom ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSRect ) ) . mLeft as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSRect ) , "::" , stringify ! ( mLeft ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSRect_heap { pub _base : root :: nsCSSRect , pub mRefCnt : root :: nsAutoRefCnt , } pub type nsCSSRect_heap_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSRect_heap ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSRect_heap > ( ) , 72usize , concat ! ( "Size of: " , stringify ! ( nsCSSRect_heap ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSRect_heap > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSRect_heap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSRect_heap ) ) . mRefCnt as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSRect_heap ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValuePair { pub mXValue : root :: nsCSSValue , pub mYValue : root :: nsCSSValue , } # [ test ] fn bindgen_test_layout_nsCSSValuePair ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValuePair > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsCSSValuePair ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValuePair > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValuePair ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePair ) ) . mXValue as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePair ) , "::" , stringify ! ( mXValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePair ) ) . mYValue as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePair ) , "::" , stringify ! ( mYValue ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValuePair_heap { pub _base : root :: nsCSSValuePair , pub mRefCnt : root :: nsAutoRefCnt , } pub type nsCSSValuePair_heap_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValuePair_heap ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValuePair_heap > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsCSSValuePair_heap ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValuePair_heap > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValuePair_heap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePair_heap ) ) . mRefCnt as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePair_heap ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueTriplet { pub mXValue : root :: nsCSSValue , pub mYValue : root :: nsCSSValue , pub mZValue : root :: nsCSSValue , } # [ test ] fn bindgen_test_layout_nsCSSValueTriplet ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueTriplet > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueTriplet ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueTriplet > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueTriplet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTriplet ) ) . mXValue as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTriplet ) , "::" , stringify ! ( mXValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTriplet ) ) . mYValue as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTriplet ) , "::" , stringify ! ( mYValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTriplet ) ) . mZValue as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTriplet ) , "::" , stringify ! ( mZValue ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueTriplet_heap { pub _base : root :: nsCSSValueTriplet , pub mRefCnt : root :: nsAutoRefCnt , } pub type nsCSSValueTriplet_heap_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValueTriplet_heap ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueTriplet_heap > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueTriplet_heap ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueTriplet_heap > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueTriplet_heap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTriplet_heap ) ) . mRefCnt as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTriplet_heap ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValuePairList { pub mXValue : root :: nsCSSValue , pub mYValue : root :: nsCSSValue , pub mNext : * mut root :: nsCSSValuePairList , } # [ test ] fn bindgen_test_layout_nsCSSValuePairList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValuePairList > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsCSSValuePairList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValuePairList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValuePairList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePairList ) ) . mXValue as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePairList ) , "::" , stringify ! ( mXValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePairList ) ) . mYValue as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePairList ) , "::" , stringify ! ( mYValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePairList ) ) . mNext as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePairList ) , "::" , stringify ! ( mNext ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValuePairList_heap { pub _base : root :: nsCSSValuePairList , pub mRefCnt : root :: nsAutoRefCnt , } pub type nsCSSValuePairList_heap_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValuePairList_heap ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValuePairList_heap > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( nsCSSValuePairList_heap ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValuePairList_heap > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValuePairList_heap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePairList_heap ) ) . mRefCnt as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePairList_heap ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueGradientStop { pub mLocation : root :: nsCSSValue , pub mColor : root :: nsCSSValue , pub mIsInterpolationHint : bool , } # [ test ] fn bindgen_test_layout_nsCSSValueGradientStop ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueGradientStop > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueGradientStop ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueGradientStop > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueGradientStop ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradientStop ) ) . mLocation as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradientStop ) , "::" , stringify ! ( mLocation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradientStop ) ) . mColor as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradientStop ) , "::" , stringify ! ( mColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradientStop ) ) . mIsInterpolationHint as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradientStop ) , "::" , stringify ! ( mIsInterpolationHint ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueGradient { pub mIsRadial : bool , pub mIsRepeating : bool , pub mIsLegacySyntax : bool , pub mIsMozLegacySyntax : bool , pub mIsExplicitSize : bool , pub mBgPos : root :: nsCSSValuePair , pub mAngle : root :: nsCSSValue , pub mRadialValues : [ root :: nsCSSValue ; 2usize ] , pub mStops : root :: nsTArray < root :: nsCSSValueGradientStop > , pub mRefCnt : root :: nsAutoRefCnt , } pub type nsCSSValueGradient_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValueGradient ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueGradient > ( ) , 104usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueGradient ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueGradient > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueGradient ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mIsRadial as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mIsRadial ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mIsRepeating as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mIsRepeating ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mIsLegacySyntax as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mIsLegacySyntax ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mIsMozLegacySyntax as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mIsMozLegacySyntax ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mIsExplicitSize as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mIsExplicitSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mBgPos as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mBgPos ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mAngle as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mAngle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mRadialValues as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mRadialValues ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mStops as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mStops ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mRefCnt as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] pub struct nsCSSValueTokenStream { pub mRefCnt : root :: nsAutoRefCnt , pub mPropertyID : root :: nsCSSPropertyID , pub mShorthandPropertyID : root :: nsCSSPropertyID , pub mTokenStream : ::nsstring::nsStringRepr , pub mBaseURI : root :: nsCOMPtr , pub mSheetURI : root :: nsCOMPtr , pub mSheetPrincipal : root :: nsCOMPtr , pub mLineNumber : u32 , pub mLineOffset : u32 , pub mLevel : root :: mozilla :: SheetType , } pub type nsCSSValueTokenStream_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValueTokenStream ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueTokenStream > ( ) , 72usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueTokenStream ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueTokenStream > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueTokenStream ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mPropertyID as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mPropertyID ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mShorthandPropertyID as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mShorthandPropertyID ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mTokenStream as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mTokenStream ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mBaseURI as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mBaseURI ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mSheetURI as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mSheetURI ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mSheetPrincipal as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mSheetPrincipal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mLineNumber as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mLineNumber ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mLineOffset as * const _ as usize } , 60usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mLineOffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mLevel as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mLevel ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueFloatColor { pub mRefCnt : root :: nsAutoRefCnt , pub mComponent1 : f32 , pub mComponent2 : f32 , pub mComponent3 : f32 , pub mAlpha : f32 , } pub type nsCSSValueFloatColor_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValueFloatColor ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueFloatColor > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueFloatColor ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueFloatColor > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueFloatColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueFloatColor ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueFloatColor ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueFloatColor ) ) . mComponent1 as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueFloatColor ) , "::" , stringify ! ( mComponent1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueFloatColor ) ) . mComponent2 as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueFloatColor ) , "::" , stringify ! ( mComponent2 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueFloatColor ) ) . mComponent3 as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueFloatColor ) , "::" , stringify ! ( mComponent3 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueFloatColor ) ) . mAlpha as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueFloatColor ) , "::" , stringify ! ( mAlpha ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct imgIContainer { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct imgIRequest { pub _base : root :: nsIRequest , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct imgIRequest_COMTypeInfo { pub _address : u8 , } pub const imgIRequest_STATUS_NONE : root :: imgIRequest__bindgen_ty_1 = 0 ; pub const imgIRequest_STATUS_SIZE_AVAILABLE : root :: imgIRequest__bindgen_ty_1 = 1 ; pub const imgIRequest_STATUS_LOAD_COMPLETE : root :: imgIRequest__bindgen_ty_1 = 2 ; pub const imgIRequest_STATUS_ERROR : root :: imgIRequest__bindgen_ty_1 = 4 ; pub const imgIRequest_STATUS_FRAME_COMPLETE : root :: imgIRequest__bindgen_ty_1 = 8 ; pub const imgIRequest_STATUS_DECODE_COMPLETE : root :: imgIRequest__bindgen_ty_1 = 16 ; pub const imgIRequest_STATUS_IS_ANIMATED : root :: imgIRequest__bindgen_ty_1 = 32 ; pub const imgIRequest_STATUS_HAS_TRANSPARENCY : root :: imgIRequest__bindgen_ty_1 = 64 ; pub type imgIRequest__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; pub const imgIRequest_CORS_NONE : root :: imgIRequest__bindgen_ty_2 = 1 ; pub const imgIRequest_CORS_ANONYMOUS : root :: imgIRequest__bindgen_ty_2 = 2 ; pub const imgIRequest_CORS_USE_CREDENTIALS : root :: imgIRequest__bindgen_ty_2 = 3 ; pub type imgIRequest__bindgen_ty_2 = :: std :: os :: raw :: c_uint ; pub const imgIRequest_CATEGORY_FRAME_INIT : root :: imgIRequest__bindgen_ty_3 = 1 ; pub const imgIRequest_CATEGORY_SIZE_QUERY : root :: imgIRequest__bindgen_ty_3 = 2 ; pub const imgIRequest_CATEGORY_DISPLAY : root :: imgIRequest__bindgen_ty_3 = 4 ; pub type imgIRequest__bindgen_ty_3 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_imgIRequest ( ) { assert_eq ! ( :: std :: mem :: size_of :: < imgIRequest > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( imgIRequest ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < imgIRequest > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( imgIRequest ) ) ) ; } impl Clone for imgIRequest { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsISecurityInfoProvider { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsISecurityInfoProvider_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsISecurityInfoProvider ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsISecurityInfoProvider > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsISecurityInfoProvider ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsISecurityInfoProvider > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsISecurityInfoProvider ) ) ) ; } impl Clone for nsISecurityInfoProvider { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsISupportsPriority { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsISupportsPriority_COMTypeInfo { pub _address : u8 , } pub const nsISupportsPriority_PRIORITY_HIGHEST : root :: nsISupportsPriority__bindgen_ty_1 = -20 ; pub const nsISupportsPriority_PRIORITY_HIGH : root :: nsISupportsPriority__bindgen_ty_1 = -10 ; pub const nsISupportsPriority_PRIORITY_NORMAL : root :: nsISupportsPriority__bindgen_ty_1 = 0 ; pub const nsISupportsPriority_PRIORITY_LOW : root :: nsISupportsPriority__bindgen_ty_1 = 10 ; pub const nsISupportsPriority_PRIORITY_LOWEST : root :: nsISupportsPriority__bindgen_ty_1 = 20 ; pub type nsISupportsPriority__bindgen_ty_1 = :: std :: os :: raw :: c_int ; # [ test ] fn bindgen_test_layout_nsISupportsPriority ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsISupportsPriority > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsISupportsPriority ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsISupportsPriority > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsISupportsPriority ) ) ) ; } impl Clone for nsISupportsPriority { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsITimedChannel { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsITimedChannel_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsITimedChannel ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsITimedChannel > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsITimedChannel ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsITimedChannel > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsITimedChannel ) ) ) ; } impl Clone for nsITimedChannel { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ProxyBehaviour { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct imgRequestProxy { pub _base : root :: imgIRequest , pub _base_1 : root :: mozilla :: image :: IProgressObserver , pub _base_2 : root :: nsISupportsPriority , pub _base_3 : root :: nsISecurityInfoProvider , pub _base_4 : root :: nsITimedChannel , pub mRefCnt : root :: nsAutoRefCnt , pub mBehaviour : root :: mozilla :: UniquePtr < root :: ProxyBehaviour > , pub mURI : root :: RefPtr < root :: mozilla :: image :: ImageURL > , pub mListener : * mut root :: imgINotificationObserver , pub mLoadGroup : root :: nsCOMPtr , pub mTabGroup : root :: RefPtr < root :: mozilla :: dom :: TabGroup > , pub mEventTarget : root :: nsCOMPtr , pub mLoadFlags : root :: nsLoadFlags , pub mLockCount : u32 , pub mAnimationConsumers : u32 , pub _bitfield_1 : u8 , pub __bindgen_padding_0 : [ u8 ; 3usize ] , } pub type imgRequestProxy_Image = root :: mozilla :: image :: Image ; pub type imgRequestProxy_ImageURL = root :: mozilla :: image :: ImageURL ; pub type imgRequestProxy_ProgressTracker = root :: mozilla :: image :: ProgressTracker ; pub type imgRequestProxy_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct imgRequestProxy_imgCancelRunnable { pub _base : root :: mozilla :: Runnable , pub mOwner : root :: RefPtr < root :: imgRequestProxy > , pub mStatus : root :: nsresult , } # [ test ] fn bindgen_test_layout_imgRequestProxy_imgCancelRunnable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < imgRequestProxy_imgCancelRunnable > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( imgRequestProxy_imgCancelRunnable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < imgRequestProxy_imgCancelRunnable > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( imgRequestProxy_imgCancelRunnable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const imgRequestProxy_imgCancelRunnable ) ) . mOwner as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( imgRequestProxy_imgCancelRunnable ) , "::" , stringify ! ( mOwner ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const imgRequestProxy_imgCancelRunnable ) ) . mStatus as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( imgRequestProxy_imgCancelRunnable ) , "::" , stringify ! ( mStatus ) ) ) ; } # [ test ] fn bindgen_test_layout_imgRequestProxy ( ) { assert_eq ! ( :: std :: mem :: size_of :: < imgRequestProxy > ( ) , 120usize , concat ! ( "Size of: " , stringify ! ( imgRequestProxy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < imgRequestProxy > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( imgRequestProxy ) ) ) ; } impl imgRequestProxy { # [ inline ] pub fn mCanceled ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x1 as u8 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mCanceled ( & mut self , val : bool ) { let mask = 0x1 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mIsInLoadGroup ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x2 as u8 ; let val = ( unit_field_val & mask ) >> 1usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsInLoadGroup ( & mut self , val : bool ) { let mask = 0x2 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 1usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mForceDispatchLoadGroup ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x4 as u8 ; let val = ( unit_field_val & mask ) >> 2usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mForceDispatchLoadGroup ( & mut self , val : bool ) { let mask = 0x4 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 2usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mListenerIsStrongRef ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x8 as u8 ; let val = ( unit_field_val & mask ) >> 3usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mListenerIsStrongRef ( & mut self , val : bool ) { let mask = 0x8 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 3usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mDecodeRequested ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x10 as u8 ; let val = ( unit_field_val & mask ) >> 4usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mDecodeRequested ( & mut self , val : bool ) { let mask = 0x10 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 4usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mDeferNotifications ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x20 as u8 ; let val = ( unit_field_val & mask ) >> 5usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mDeferNotifications ( & mut self , val : bool ) { let mask = 0x20 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 5usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mHadListener ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x40 as u8 ; let val = ( unit_field_val & mask ) >> 6usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHadListener ( & mut self , val : bool ) { let mask = 0x40 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 6usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mHadDispatch ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x80 as u8 ; let val = ( unit_field_val & mask ) >> 7usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHadDispatch ( & mut self , val : bool ) { let mask = 0x80 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 7usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mCanceled : bool , mIsInLoadGroup : bool , mForceDispatchLoadGroup : bool , mListenerIsStrongRef : bool , mDecodeRequested : bool , mDeferNotifications : bool , mHadListener : bool , mHadDispatch : bool ) -> u8 { ( ( ( ( ( ( ( ( 0 | ( ( mCanceled as u8 as u8 ) << 0usize ) & ( 0x1 as u8 ) ) | ( ( mIsInLoadGroup as u8 as u8 ) << 1usize ) & ( 0x2 as u8 ) ) | ( ( mForceDispatchLoadGroup as u8 as u8 ) << 2usize ) & ( 0x4 as u8 ) ) | ( ( mListenerIsStrongRef as u8 as u8 ) << 3usize ) & ( 0x8 as u8 ) ) | ( ( mDecodeRequested as u8 as u8 ) << 4usize ) & ( 0x10 as u8 ) ) | ( ( mDeferNotifications as u8 as u8 ) << 5usize ) & ( 0x20 as u8 ) ) | ( ( mHadListener as u8 as u8 ) << 6usize ) & ( 0x40 as u8 ) ) | ( ( mHadDispatch as u8 as u8 ) << 7usize ) & ( 0x80 as u8 ) ) } } # [ repr ( C ) ] pub struct nsStyleFont { pub mFont : root :: nsFont , pub mSize : root :: nscoord , pub mFontSizeFactor : f32 , pub mFontSizeOffset : root :: nscoord , pub mFontSizeKeyword : u8 , pub mGenericID : u8 , pub mScriptLevel : i8 , pub mMathVariant : u8 , pub mMathDisplay : u8 , pub mMinFontSizeRatio : u8 , pub mExplicitLanguage : bool , pub mAllowZoom : bool , pub mScriptUnconstrainedSize : root :: nscoord , pub mScriptMinSize : root :: nscoord , pub mScriptSizeMultiplier : f32 , pub mLanguage : root :: RefPtr < root :: nsAtom > , } pub const nsStyleFont_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleFont ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleFont > ( ) , 136usize , concat ! ( "Size of: " , stringify ! ( nsStyleFont ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleFont > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mFont as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mSize as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mFontSizeFactor as * const _ as usize } , 100usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mFontSizeFactor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mFontSizeOffset as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mFontSizeOffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mFontSizeKeyword as * const _ as usize } , 108usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mFontSizeKeyword ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mGenericID as * const _ as usize } , 109usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mGenericID ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mScriptLevel as * const _ as usize } , 110usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mScriptLevel ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mMathVariant as * const _ as usize } , 111usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mMathVariant ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mMathDisplay as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mMathDisplay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mMinFontSizeRatio as * const _ as usize } , 113usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mMinFontSizeRatio ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mExplicitLanguage as * const _ as usize } , 114usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mExplicitLanguage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mAllowZoom as * const _ as usize } , 115usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mAllowZoom ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mScriptUnconstrainedSize as * const _ as usize } , 116usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mScriptUnconstrainedSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mScriptMinSize as * const _ as usize } , 120usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mScriptMinSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mScriptSizeMultiplier as * const _ as usize } , 124usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mScriptSizeMultiplier ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mLanguage as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mLanguage ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleGradientStop { pub mLocation : root :: nsStyleCoord , pub mColor : root :: nscolor , pub mIsInterpolationHint : bool , } # [ test ] fn bindgen_test_layout_nsStyleGradientStop ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleGradientStop > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStyleGradientStop ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleGradientStop > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleGradientStop ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradientStop ) ) . mLocation as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradientStop ) , "::" , stringify ! ( mLocation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradientStop ) ) . mColor as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradientStop ) , "::" , stringify ! ( mColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradientStop ) ) . mIsInterpolationHint as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradientStop ) , "::" , stringify ! ( mIsInterpolationHint ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleGradient { pub mShape : u8 , pub mSize : u8 , pub mRepeating : bool , pub mLegacySyntax : bool , pub mMozLegacySyntax : bool , pub mBgPosX : root :: nsStyleCoord , pub mBgPosY : root :: nsStyleCoord , pub mAngle : root :: nsStyleCoord , pub mRadiusX : root :: nsStyleCoord , pub mRadiusY : root :: nsStyleCoord , pub mStops : root :: nsTArray < root :: nsStyleGradientStop > , pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , } pub type nsStyleGradient_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_nsStyleGradient ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleGradient > ( ) , 104usize , concat ! ( "Size of: " , stringify ! ( nsStyleGradient ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleGradient > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleGradient ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mShape as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mShape ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mSize as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mRepeating as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mRepeating ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mLegacySyntax as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mLegacySyntax ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mMozLegacySyntax as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mMozLegacySyntax ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mBgPosX as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mBgPosX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mBgPosY as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mBgPosY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mAngle as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mAngle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mRadiusX as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mRadiusX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mRadiusY as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mRadiusY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mStops as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mStops ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mRefCnt as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mRefCnt ) ) ) ; } 
+} # [ test ] fn bindgen_test_layout_nsCSSRect ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSRect > ( ) , 64usize , concat ! ( "Size of: " , stringify ! ( nsCSSRect ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSRect > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSRect ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSRect ) ) . mTop as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSRect ) , "::" , stringify ! ( mTop ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSRect ) ) . mRight as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSRect ) , "::" , stringify ! ( mRight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSRect ) ) . mBottom as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSRect ) , "::" , stringify ! ( mBottom ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSRect ) ) . mLeft as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSRect ) , "::" , stringify ! ( mLeft ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSRect_heap { pub _base : root :: nsCSSRect , pub mRefCnt : root :: nsAutoRefCnt , } pub type nsCSSRect_heap_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSRect_heap ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSRect_heap > ( ) , 72usize , concat ! ( "Size of: " , stringify ! ( nsCSSRect_heap ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSRect_heap > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSRect_heap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSRect_heap ) ) . mRefCnt as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSRect_heap ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValuePair { pub mXValue : root :: nsCSSValue , pub mYValue : root :: nsCSSValue , } # [ test ] fn bindgen_test_layout_nsCSSValuePair ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValuePair > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsCSSValuePair ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValuePair > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValuePair ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePair ) ) . mXValue as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePair ) , "::" , stringify ! ( mXValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePair ) ) . mYValue as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePair ) , "::" , stringify ! ( mYValue ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValuePair_heap { pub _base : root :: nsCSSValuePair , pub mRefCnt : root :: nsAutoRefCnt , } pub type nsCSSValuePair_heap_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValuePair_heap ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValuePair_heap > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsCSSValuePair_heap ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValuePair_heap > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValuePair_heap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePair_heap ) ) . mRefCnt as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePair_heap ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueTriplet { pub mXValue : root :: nsCSSValue , pub mYValue : root :: nsCSSValue , pub mZValue : root :: nsCSSValue , } # [ test ] fn bindgen_test_layout_nsCSSValueTriplet ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueTriplet > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueTriplet ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueTriplet > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueTriplet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTriplet ) ) . mXValue as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTriplet ) , "::" , stringify ! ( mXValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTriplet ) ) . mYValue as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTriplet ) , "::" , stringify ! ( mYValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTriplet ) ) . mZValue as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTriplet ) , "::" , stringify ! ( mZValue ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueTriplet_heap { pub _base : root :: nsCSSValueTriplet , pub mRefCnt : root :: nsAutoRefCnt , } pub type nsCSSValueTriplet_heap_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValueTriplet_heap ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueTriplet_heap > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueTriplet_heap ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueTriplet_heap > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueTriplet_heap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTriplet_heap ) ) . mRefCnt as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTriplet_heap ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValuePairList { pub mXValue : root :: nsCSSValue , pub mYValue : root :: nsCSSValue , pub mNext : * mut root :: nsCSSValuePairList , } # [ test ] fn bindgen_test_layout_nsCSSValuePairList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValuePairList > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsCSSValuePairList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValuePairList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValuePairList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePairList ) ) . mXValue as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePairList ) , "::" , stringify ! ( mXValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePairList ) ) . mYValue as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePairList ) , "::" , stringify ! ( mYValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePairList ) ) . mNext as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePairList ) , "::" , stringify ! ( mNext ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValuePairList_heap { pub _base : root :: nsCSSValuePairList , pub mRefCnt : root :: nsAutoRefCnt , } pub type nsCSSValuePairList_heap_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValuePairList_heap ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValuePairList_heap > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( nsCSSValuePairList_heap ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValuePairList_heap > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValuePairList_heap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValuePairList_heap ) ) . mRefCnt as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValuePairList_heap ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueGradientStop { pub mLocation : root :: nsCSSValue , pub mColor : root :: nsCSSValue , pub mIsInterpolationHint : bool , } # [ test ] fn bindgen_test_layout_nsCSSValueGradientStop ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueGradientStop > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueGradientStop ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueGradientStop > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueGradientStop ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradientStop ) ) . mLocation as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradientStop ) , "::" , stringify ! ( mLocation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradientStop ) ) . mColor as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradientStop ) , "::" , stringify ! ( mColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradientStop ) ) . mIsInterpolationHint as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradientStop ) , "::" , stringify ! ( mIsInterpolationHint ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueGradient { pub mIsRadial : bool , pub mIsRepeating : bool , pub mIsLegacySyntax : bool , pub mIsMozLegacySyntax : bool , pub mIsExplicitSize : bool , pub mBgPos : root :: nsCSSValuePair , pub mAngle : root :: nsCSSValue , pub mRadialValues : [ root :: nsCSSValue ; 2usize ] , pub mStops : root :: nsTArray < root :: nsCSSValueGradientStop > , pub mRefCnt : root :: nsAutoRefCnt , } pub type nsCSSValueGradient_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValueGradient ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueGradient > ( ) , 104usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueGradient ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueGradient > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueGradient ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mIsRadial as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mIsRadial ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mIsRepeating as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mIsRepeating ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mIsLegacySyntax as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mIsLegacySyntax ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mIsMozLegacySyntax as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mIsMozLegacySyntax ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mIsExplicitSize as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mIsExplicitSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mBgPos as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mBgPos ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mAngle as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mAngle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mRadialValues as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mRadialValues ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mStops as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mStops ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueGradient ) ) . mRefCnt as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueGradient ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] pub struct nsCSSValueTokenStream { pub mRefCnt : root :: nsAutoRefCnt , pub mPropertyID : root :: nsCSSPropertyID , pub mShorthandPropertyID : root :: nsCSSPropertyID , pub mTokenStream : ::nsstring::nsStringRepr , pub mBaseURI : root :: nsCOMPtr , pub mSheetURI : root :: nsCOMPtr , pub mSheetPrincipal : root :: nsCOMPtr , pub mLineNumber : u32 , pub mLineOffset : u32 , pub mLevel : root :: mozilla :: SheetType , } pub type nsCSSValueTokenStream_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValueTokenStream ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueTokenStream > ( ) , 72usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueTokenStream ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueTokenStream > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueTokenStream ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mPropertyID as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mPropertyID ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mShorthandPropertyID as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mShorthandPropertyID ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mTokenStream as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mTokenStream ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mBaseURI as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mBaseURI ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mSheetURI as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mSheetURI ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mSheetPrincipal as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mSheetPrincipal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mLineNumber as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mLineNumber ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mLineOffset as * const _ as usize } , 60usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mLineOffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueTokenStream ) ) . mLevel as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueTokenStream ) , "::" , stringify ! ( mLevel ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSValueFloatColor { pub mRefCnt : root :: nsAutoRefCnt , pub mComponent1 : f32 , pub mComponent2 : f32 , pub mComponent3 : f32 , pub mAlpha : f32 , } pub type nsCSSValueFloatColor_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ test ] fn bindgen_test_layout_nsCSSValueFloatColor ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSValueFloatColor > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsCSSValueFloatColor ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSValueFloatColor > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSValueFloatColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueFloatColor ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueFloatColor ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueFloatColor ) ) . mComponent1 as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueFloatColor ) , "::" , stringify ! ( mComponent1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueFloatColor ) ) . mComponent2 as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueFloatColor ) , "::" , stringify ! ( mComponent2 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueFloatColor ) ) . mComponent3 as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueFloatColor ) , "::" , stringify ! ( mComponent3 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSValueFloatColor ) ) . mAlpha as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSValueFloatColor ) , "::" , stringify ! ( mAlpha ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct imgIContainer { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct imgIRequest { pub _base : root :: nsIRequest , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct imgIRequest_COMTypeInfo { pub _address : u8 , } pub const imgIRequest_STATUS_NONE : root :: imgIRequest__bindgen_ty_1 = 0 ; pub const imgIRequest_STATUS_SIZE_AVAILABLE : root :: imgIRequest__bindgen_ty_1 = 1 ; pub const imgIRequest_STATUS_LOAD_COMPLETE : root :: imgIRequest__bindgen_ty_1 = 2 ; pub const imgIRequest_STATUS_ERROR : root :: imgIRequest__bindgen_ty_1 = 4 ; pub const imgIRequest_STATUS_FRAME_COMPLETE : root :: imgIRequest__bindgen_ty_1 = 8 ; pub const imgIRequest_STATUS_DECODE_COMPLETE : root :: imgIRequest__bindgen_ty_1 = 16 ; pub const imgIRequest_STATUS_IS_ANIMATED : root :: imgIRequest__bindgen_ty_1 = 32 ; pub const imgIRequest_STATUS_HAS_TRANSPARENCY : root :: imgIRequest__bindgen_ty_1 = 64 ; pub type imgIRequest__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; pub const imgIRequest_CORS_NONE : root :: imgIRequest__bindgen_ty_2 = 1 ; pub const imgIRequest_CORS_ANONYMOUS : root :: imgIRequest__bindgen_ty_2 = 2 ; pub const imgIRequest_CORS_USE_CREDENTIALS : root :: imgIRequest__bindgen_ty_2 = 3 ; pub type imgIRequest__bindgen_ty_2 = :: std :: os :: raw :: c_uint ; pub const imgIRequest_CATEGORY_FRAME_INIT : root :: imgIRequest__bindgen_ty_3 = 1 ; pub const imgIRequest_CATEGORY_SIZE_QUERY : root :: imgIRequest__bindgen_ty_3 = 2 ; pub const imgIRequest_CATEGORY_DISPLAY : root :: imgIRequest__bindgen_ty_3 = 4 ; pub type imgIRequest__bindgen_ty_3 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_imgIRequest ( ) { assert_eq ! ( :: std :: mem :: size_of :: < imgIRequest > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( imgIRequest ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < imgIRequest > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( imgIRequest ) ) ) ; } impl Clone for imgIRequest { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsISecurityInfoProvider { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsISecurityInfoProvider_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsISecurityInfoProvider ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsISecurityInfoProvider > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsISecurityInfoProvider ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsISecurityInfoProvider > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsISecurityInfoProvider ) ) ) ; } impl Clone for nsISecurityInfoProvider { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsISupportsPriority { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsISupportsPriority_COMTypeInfo { pub _address : u8 , } pub const nsISupportsPriority_PRIORITY_HIGHEST : root :: nsISupportsPriority__bindgen_ty_1 = -20 ; pub const nsISupportsPriority_PRIORITY_HIGH : root :: nsISupportsPriority__bindgen_ty_1 = -10 ; pub const nsISupportsPriority_PRIORITY_NORMAL : root :: nsISupportsPriority__bindgen_ty_1 = 0 ; pub const nsISupportsPriority_PRIORITY_LOW : root :: nsISupportsPriority__bindgen_ty_1 = 10 ; pub const nsISupportsPriority_PRIORITY_LOWEST : root :: nsISupportsPriority__bindgen_ty_1 = 20 ; pub type nsISupportsPriority__bindgen_ty_1 = :: std :: os :: raw :: c_int ; # [ test ] fn bindgen_test_layout_nsISupportsPriority ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsISupportsPriority > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsISupportsPriority ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsISupportsPriority > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsISupportsPriority ) ) ) ; } impl Clone for nsISupportsPriority { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsITimedChannel { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsITimedChannel_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsITimedChannel ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsITimedChannel > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsITimedChannel ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsITimedChannel > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsITimedChannel ) ) ) ; } impl Clone for nsITimedChannel { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct ProxyBehaviour { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct imgRequestProxy { pub _base : root :: imgIRequest , pub _base_1 : root :: mozilla :: image :: IProgressObserver , pub _base_2 : root :: nsISupportsPriority , pub _base_3 : root :: nsISecurityInfoProvider , pub _base_4 : root :: nsITimedChannel , pub mRefCnt : root :: nsAutoRefCnt , pub mBehaviour : root :: mozilla :: UniquePtr < root :: ProxyBehaviour > , pub mURI : root :: RefPtr < root :: imgRequestProxy_ImageURL > , pub mListener : * mut root :: imgINotificationObserver , pub mLoadGroup : root :: nsCOMPtr , pub mTabGroup : root :: RefPtr < root :: mozilla :: dom :: TabGroup > , pub mEventTarget : root :: nsCOMPtr , pub mLoadFlags : root :: nsLoadFlags , pub mLockCount : u32 , pub mAnimationConsumers : u32 , pub _bitfield_1 : u8 , pub __bindgen_padding_0 : [ u8 ; 3usize ] , } pub type imgRequestProxy_Image = root :: mozilla :: image :: Image ; pub type imgRequestProxy_ImageURL = root :: mozilla :: image :: ImageURL ; pub type imgRequestProxy_ProgressTracker = root :: mozilla :: image :: ProgressTracker ; pub type imgRequestProxy_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct imgRequestProxy_imgCancelRunnable { pub _base : root :: mozilla :: Runnable , pub mOwner : root :: RefPtr < root :: imgRequestProxy > , pub mStatus : root :: nsresult , } # [ test ] fn bindgen_test_layout_imgRequestProxy_imgCancelRunnable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < imgRequestProxy_imgCancelRunnable > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( imgRequestProxy_imgCancelRunnable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < imgRequestProxy_imgCancelRunnable > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( imgRequestProxy_imgCancelRunnable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const imgRequestProxy_imgCancelRunnable ) ) . mOwner as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( imgRequestProxy_imgCancelRunnable ) , "::" , stringify ! ( mOwner ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const imgRequestProxy_imgCancelRunnable ) ) . mStatus as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( imgRequestProxy_imgCancelRunnable ) , "::" , stringify ! ( mStatus ) ) ) ; } # [ test ] fn bindgen_test_layout_imgRequestProxy ( ) { assert_eq ! ( :: std :: mem :: size_of :: < imgRequestProxy > ( ) , 120usize , concat ! ( "Size of: " , stringify ! ( imgRequestProxy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < imgRequestProxy > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( imgRequestProxy ) ) ) ; } impl imgRequestProxy { # [ inline ] pub fn mCanceled ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x1 as u8 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mCanceled ( & mut self , val : bool ) { let mask = 0x1 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mIsInLoadGroup ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x2 as u8 ; let val = ( unit_field_val & mask ) >> 1usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsInLoadGroup ( & mut self , val : bool ) { let mask = 0x2 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 1usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mForceDispatchLoadGroup ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x4 as u8 ; let val = ( unit_field_val & mask ) >> 2usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mForceDispatchLoadGroup ( & mut self , val : bool ) { let mask = 0x4 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 2usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mListenerIsStrongRef ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x8 as u8 ; let val = ( unit_field_val & mask ) >> 3usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mListenerIsStrongRef ( & mut self , val : bool ) { let mask = 0x8 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 3usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mDecodeRequested ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x10 as u8 ; let val = ( unit_field_val & mask ) >> 4usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mDecodeRequested ( & mut self , val : bool ) { let mask = 0x10 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 4usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mDeferNotifications ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x20 as u8 ; let val = ( unit_field_val & mask ) >> 5usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mDeferNotifications ( & mut self , val : bool ) { let mask = 0x20 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 5usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mHadListener ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x40 as u8 ; let val = ( unit_field_val & mask ) >> 6usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHadListener ( & mut self , val : bool ) { let mask = 0x40 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 6usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mHadDispatch ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x80 as u8 ; let val = ( unit_field_val & mask ) >> 7usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mHadDispatch ( & mut self , val : bool ) { let mask = 0x80 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 7usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mCanceled : bool , mIsInLoadGroup : bool , mForceDispatchLoadGroup : bool , mListenerIsStrongRef : bool , mDecodeRequested : bool , mDeferNotifications : bool , mHadListener : bool , mHadDispatch : bool ) -> u8 { ( ( ( ( ( ( ( ( 0 | ( ( mCanceled as u8 as u8 ) << 0usize ) & ( 0x1 as u8 ) ) | ( ( mIsInLoadGroup as u8 as u8 ) << 1usize ) & ( 0x2 as u8 ) ) | ( ( mForceDispatchLoadGroup as u8 as u8 ) << 2usize ) & ( 0x4 as u8 ) ) | ( ( mListenerIsStrongRef as u8 as u8 ) << 3usize ) & ( 0x8 as u8 ) ) | ( ( mDecodeRequested as u8 as u8 ) << 4usize ) & ( 0x10 as u8 ) ) | ( ( mDeferNotifications as u8 as u8 ) << 5usize ) & ( 0x20 as u8 ) ) | ( ( mHadListener as u8 as u8 ) << 6usize ) & ( 0x40 as u8 ) ) | ( ( mHadDispatch as u8 as u8 ) << 7usize ) & ( 0x80 as u8 ) ) } } # [ repr ( C ) ] pub struct nsStyleFont { pub mFont : root :: nsFont , pub mSize : root :: nscoord , pub mFontSizeFactor : f32 , pub mFontSizeOffset : root :: nscoord , pub mFontSizeKeyword : u8 , pub mGenericID : u8 , pub mScriptLevel : i8 , pub mMathVariant : u8 , pub mMathDisplay : u8 , pub mMinFontSizeRatio : u8 , pub mExplicitLanguage : bool , pub mAllowZoom : bool , pub mScriptUnconstrainedSize : root :: nscoord , pub mScriptMinSize : root :: nscoord , pub mScriptSizeMultiplier : f32 , pub mLanguage : root :: RefPtr < root :: nsAtom > , } pub const nsStyleFont_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleFont ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleFont > ( ) , 136usize , concat ! ( "Size of: " , stringify ! ( nsStyleFont ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleFont > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mFont as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mFont ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mSize as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mFontSizeFactor as * const _ as usize } , 100usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mFontSizeFactor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mFontSizeOffset as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mFontSizeOffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mFontSizeKeyword as * const _ as usize } , 108usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mFontSizeKeyword ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mGenericID as * const _ as usize } , 109usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mGenericID ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mScriptLevel as * const _ as usize } , 110usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mScriptLevel ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mMathVariant as * const _ as usize } , 111usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mMathVariant ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mMathDisplay as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mMathDisplay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mMinFontSizeRatio as * const _ as usize } , 113usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mMinFontSizeRatio ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mExplicitLanguage as * const _ as usize } , 114usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mExplicitLanguage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mAllowZoom as * const _ as usize } , 115usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mAllowZoom ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mScriptUnconstrainedSize as * const _ as usize } , 116usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mScriptUnconstrainedSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mScriptMinSize as * const _ as usize } , 120usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mScriptMinSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mScriptSizeMultiplier as * const _ as usize } , 124usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mScriptSizeMultiplier ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFont ) ) . mLanguage as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFont ) , "::" , stringify ! ( mLanguage ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleGradientStop { pub mLocation : root :: nsStyleCoord , pub mColor : root :: nscolor , pub mIsInterpolationHint : bool , } # [ test ] fn bindgen_test_layout_nsStyleGradientStop ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleGradientStop > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStyleGradientStop ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleGradientStop > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleGradientStop ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradientStop ) ) . mLocation as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradientStop ) , "::" , stringify ! ( mLocation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradientStop ) ) . mColor as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradientStop ) , "::" , stringify ! ( mColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradientStop ) ) . mIsInterpolationHint as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradientStop ) , "::" , stringify ! ( mIsInterpolationHint ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleGradient { pub mShape : u8 , pub mSize : u8 , pub mRepeating : bool , pub mLegacySyntax : bool , pub mMozLegacySyntax : bool , pub mBgPosX : root :: nsStyleCoord , pub mBgPosY : root :: nsStyleCoord , pub mAngle : root :: nsStyleCoord , pub mRadiusX : root :: nsStyleCoord , pub mRadiusY : root :: nsStyleCoord , pub mStops : root :: nsTArray < root :: nsStyleGradientStop > , pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , } pub type nsStyleGradient_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_nsStyleGradient ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleGradient > ( ) , 104usize , concat ! ( "Size of: " , stringify ! ( nsStyleGradient ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleGradient > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleGradient ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mShape as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mShape ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mSize as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mRepeating as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mRepeating ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mLegacySyntax as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mLegacySyntax ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mMozLegacySyntax as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mMozLegacySyntax ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mBgPosX as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mBgPosX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mBgPosY as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mBgPosY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mAngle as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mAngle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mRadiusX as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mRadiusX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mRadiusY as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mRadiusY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mStops as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mStops ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGradient ) ) . mRefCnt as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGradient ) , "::" , stringify ! ( mRefCnt ) ) ) ; } 
  /// A wrapper for an imgRequestProxy that supports off-main-thread creation
     /// and equality comparison.
     ///
@@ -1529,22 +1532,22 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
     /// region of an image. (Currently, this feature is only supported with an
     /// image of type (1)). 
  # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleImage { pub mCachedBIData : root :: mozilla :: UniquePtr < root :: CachedBorderImageData > , pub mType : root :: nsStyleImageType , pub __bindgen_anon_1 : root :: nsStyleImage__bindgen_ty_1 , pub mCropRect : root :: mozilla :: UniquePtr < root :: nsStyleSides > , } pub type nsStyleImage_URLValue = root :: mozilla :: css :: URLValue ; pub type nsStyleImage_URLValueData = root :: mozilla :: css :: URLValueData ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleImage__bindgen_ty_1 { pub mImage : root :: __BindgenUnionField < * mut root :: nsStyleImageRequest > , pub mGradient : root :: __BindgenUnionField < * mut root :: nsStyleGradient > , pub mURLValue : root :: __BindgenUnionField < * mut root :: nsStyleImage_URLValue > , pub mElementId : root :: __BindgenUnionField < * mut root :: nsAtom > , pub bindgen_union_field : u64 , } # [ test ] fn bindgen_test_layout_nsStyleImage__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleImage__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsStyleImage__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleImage__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleImage__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImage__bindgen_ty_1 ) ) . mImage as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImage__bindgen_ty_1 ) , "::" , stringify ! ( mImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImage__bindgen_ty_1 ) ) . mGradient as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImage__bindgen_ty_1 ) , "::" , stringify ! ( mGradient ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImage__bindgen_ty_1 ) ) . mURLValue as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImage__bindgen_ty_1 ) , "::" , stringify ! ( mURLValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImage__bindgen_ty_1 ) ) . mElementId as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImage__bindgen_ty_1 ) , "::" , stringify ! ( mElementId ) ) ) ; } impl Clone for nsStyleImage__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsStyleImage ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleImage > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsStyleImage ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleImage > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImage ) ) . mCachedBIData as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImage ) , "::" , stringify ! ( mCachedBIData ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImage ) ) . mType as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImage ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImage ) ) . mCropRect as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImage ) , "::" , stringify ! ( mCropRect ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleColor { pub mColor : root :: nscolor , } pub const nsStyleColor_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleColor ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleColor > ( ) , 4usize , concat ! ( "Size of: " , stringify ! ( nsStyleColor ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleColor > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColor ) ) . mColor as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColor ) , "::" , stringify ! ( mColor ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleImageLayers { pub mAttachmentCount : u32 , pub mClipCount : u32 , pub mOriginCount : u32 , pub mRepeatCount : u32 , pub mPositionXCount : u32 , pub mPositionYCount : u32 , pub mImageCount : u32 , pub mSizeCount : u32 , pub mMaskModeCount : u32 , pub mBlendModeCount : u32 , pub mCompositeCount : u32 , pub mLayers : root :: nsStyleAutoArray < root :: nsStyleImageLayers_Layer > , } pub const nsStyleImageLayers_shorthand : root :: nsStyleImageLayers__bindgen_ty_1 = 0 ; pub const nsStyleImageLayers_color : root :: nsStyleImageLayers__bindgen_ty_1 = 1 ; pub const nsStyleImageLayers_image : root :: nsStyleImageLayers__bindgen_ty_1 = 2 ; pub const nsStyleImageLayers_repeat : root :: nsStyleImageLayers__bindgen_ty_1 = 3 ; pub const nsStyleImageLayers_positionX : root :: nsStyleImageLayers__bindgen_ty_1 = 4 ; pub const nsStyleImageLayers_positionY : root :: nsStyleImageLayers__bindgen_ty_1 = 5 ; pub const nsStyleImageLayers_clip : root :: nsStyleImageLayers__bindgen_ty_1 = 6 ; pub const nsStyleImageLayers_origin : root :: nsStyleImageLayers__bindgen_ty_1 = 7 ; pub const nsStyleImageLayers_size : root :: nsStyleImageLayers__bindgen_ty_1 = 8 ; pub const nsStyleImageLayers_attachment : root :: nsStyleImageLayers__bindgen_ty_1 = 9 ; pub const nsStyleImageLayers_maskMode : root :: nsStyleImageLayers__bindgen_ty_1 = 10 ; pub const nsStyleImageLayers_composite : root :: nsStyleImageLayers__bindgen_ty_1 = 11 ; pub type nsStyleImageLayers__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleImageLayers_LayerType { Background = 0 , Mask = 1 , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleImageLayers_Size { pub mWidth : root :: nsStyleImageLayers_Size_Dimension , pub mHeight : root :: nsStyleImageLayers_Size_Dimension , pub mWidthType : u8 , pub mHeightType : u8 , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleImageLayers_Size_Dimension { pub _base : root :: nsStyleCoord_CalcValue , } # [ test ] fn bindgen_test_layout_nsStyleImageLayers_Size_Dimension ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleImageLayers_Size_Dimension > ( ) , 12usize , concat ! ( "Size of: " , stringify ! ( nsStyleImageLayers_Size_Dimension ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleImageLayers_Size_Dimension > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleImageLayers_Size_Dimension ) ) ) ; } impl Clone for nsStyleImageLayers_Size_Dimension { fn clone ( & self ) -> Self { * self } } # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleImageLayers_Size_DimensionType { eContain = 0 , eCover = 1 , eAuto = 2 , eLengthPercentage = 3 , eDimensionType_COUNT = 4 , } # [ test ] fn bindgen_test_layout_nsStyleImageLayers_Size ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleImageLayers_Size > ( ) , 28usize , concat ! ( "Size of: " , stringify ! ( nsStyleImageLayers_Size ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleImageLayers_Size > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleImageLayers_Size ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Size ) ) . mWidth as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Size ) , "::" , stringify ! ( mWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Size ) ) . mHeight as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Size ) , "::" , stringify ! ( mHeight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Size ) ) . mWidthType as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Size ) , "::" , stringify ! ( mWidthType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Size ) ) . mHeightType as * const _ as usize } , 25usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Size ) , "::" , stringify ! ( mHeightType ) ) ) ; } impl Clone for nsStyleImageLayers_Size { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleImageLayers_Repeat { pub mXRepeat : root :: mozilla :: StyleImageLayerRepeat , pub mYRepeat : root :: mozilla :: StyleImageLayerRepeat , } # [ test ] fn bindgen_test_layout_nsStyleImageLayers_Repeat ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleImageLayers_Repeat > ( ) , 2usize , concat ! ( "Size of: " , stringify ! ( nsStyleImageLayers_Repeat ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleImageLayers_Repeat > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( nsStyleImageLayers_Repeat ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Repeat ) ) . mXRepeat as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Repeat ) , "::" , stringify ! ( mXRepeat ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Repeat ) ) . mYRepeat as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Repeat ) , "::" , stringify ! ( mYRepeat ) ) ) ; } impl Clone for nsStyleImageLayers_Repeat { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleImageLayers_Layer { pub mImage : root :: nsStyleImage , pub mPosition : root :: mozilla :: Position , pub mSize : root :: nsStyleImageLayers_Size , pub mClip : root :: nsStyleImageLayers_Layer_StyleGeometryBox , pub mOrigin : root :: nsStyleImageLayers_Layer_StyleGeometryBox , pub mAttachment : u8 , pub mBlendMode : u8 , pub mComposite : u8 , pub mMaskMode : u8 , pub mRepeat : root :: nsStyleImageLayers_Repeat , } pub use self :: super :: root :: mozilla :: StyleGeometryBox as nsStyleImageLayers_Layer_StyleGeometryBox ; # [ test ] fn bindgen_test_layout_nsStyleImageLayers_Layer ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleImageLayers_Layer > ( ) , 96usize , concat ! ( "Size of: " , stringify ! ( nsStyleImageLayers_Layer ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleImageLayers_Layer > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleImageLayers_Layer ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Layer ) ) . mImage as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Layer ) , "::" , stringify ! ( mImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Layer ) ) . mPosition as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Layer ) , "::" , stringify ! ( mPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Layer ) ) . mSize as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Layer ) , "::" , stringify ! ( mSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Layer ) ) . mClip as * const _ as usize } , 84usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Layer ) , "::" , stringify ! ( mClip ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Layer ) ) . mOrigin as * const _ as usize } , 85usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Layer ) , "::" , stringify ! ( mOrigin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Layer ) ) . mAttachment as * const _ as usize } , 86usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Layer ) , "::" , stringify ! ( mAttachment ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Layer ) ) . mBlendMode as * const _ as usize } , 87usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Layer ) , "::" , stringify ! ( mBlendMode ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Layer ) ) . mComposite as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Layer ) , "::" , stringify ! ( mComposite ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Layer ) ) . mMaskMode as * const _ as usize } , 89usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Layer ) , "::" , stringify ! ( mMaskMode ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers_Layer ) ) . mRepeat as * const _ as usize } , 90usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers_Layer ) , "::" , stringify ! ( mRepeat ) ) ) ; } extern "C" {
- # [ link_name = "\u{1}_ZN18nsStyleImageLayers21kBackgroundLayerTableE" ] 
+ # [ link_name = "\u{1}__ZN18nsStyleImageLayers21kBackgroundLayerTableE" ] 
  pub static mut  nsStyleImageLayers_kBackgroundLayerTable  :  [ root :: nsCSSPropertyID ; 0usize ] ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN18nsStyleImageLayers15kMaskLayerTableE" ] 
+ # [ link_name = "\u{1}__ZN18nsStyleImageLayers15kMaskLayerTableE" ] 
  pub static mut  nsStyleImageLayers_kMaskLayerTable  :  [ root :: nsCSSPropertyID ; 0usize ] ;
-} # [ test ] fn bindgen_test_layout_nsStyleImageLayers ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleImageLayers > ( ) , 152usize , concat ! ( "Size of: " , stringify ! ( nsStyleImageLayers ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleImageLayers > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleImageLayers ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mAttachmentCount as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mAttachmentCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mClipCount as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mClipCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mOriginCount as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mOriginCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mRepeatCount as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mRepeatCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mPositionXCount as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mPositionXCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mPositionYCount as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mPositionYCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mImageCount as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mImageCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mSizeCount as * const _ as usize } , 28usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mSizeCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mMaskModeCount as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mMaskModeCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mBlendModeCount as * const _ as usize } , 36usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mBlendModeCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mCompositeCount as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mCompositeCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mLayers as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mLayers ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleBackground { pub mImage : root :: nsStyleImageLayers , pub mBackgroundColor : root :: mozilla :: StyleComplexColor , } pub const nsStyleBackground_kHasFinishStyle : bool = true ; # [ test ] fn bindgen_test_layout_nsStyleBackground ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleBackground > ( ) , 160usize , concat ! ( "Size of: " , stringify ! ( nsStyleBackground ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleBackground > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleBackground ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBackground ) ) . mImage as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBackground ) , "::" , stringify ! ( mImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBackground ) ) . mBackgroundColor as * const _ as usize } , 152usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBackground ) , "::" , stringify ! ( mBackgroundColor ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleMargin { pub mMargin : root :: nsStyleSides , } pub const nsStyleMargin_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleMargin ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleMargin > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsStyleMargin ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleMargin > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleMargin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleMargin ) ) . mMargin as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleMargin ) , "::" , stringify ! ( mMargin ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStylePadding { pub mPadding : root :: nsStyleSides , } pub const nsStylePadding_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStylePadding ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStylePadding > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsStylePadding ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStylePadding > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStylePadding ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePadding ) ) . mPadding as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePadding ) , "::" , stringify ! ( mPadding ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSShadowItem { pub mXOffset : root :: nscoord , pub mYOffset : root :: nscoord , pub mRadius : root :: nscoord , pub mSpread : root :: nscoord , pub mColor : root :: nscolor , pub mHasColor : bool , pub mInset : bool , } # [ test ] fn bindgen_test_layout_nsCSSShadowItem ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSShadowItem > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsCSSShadowItem ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSShadowItem > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsCSSShadowItem ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mXOffset as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mXOffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mYOffset as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mYOffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mRadius as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mRadius ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mSpread as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mSpread ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mColor as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mHasColor as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mHasColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mInset as * const _ as usize } , 21usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mInset ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSShadowArray { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mLength : u32 , pub mArray : [ root :: nsCSSShadowItem ; 1usize ] , } pub type nsCSSShadowArray_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_nsCSSShadowArray ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSShadowArray > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsCSSShadowArray ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSShadowArray > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSShadowArray ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowArray ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowArray ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowArray ) ) . mLength as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowArray ) , "::" , stringify ! ( mLength ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowArray ) ) . mArray as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowArray ) , "::" , stringify ! ( mArray ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsBorderColors { pub mColors : [ root :: nsTArray < :: std :: os :: raw :: c_uint > ; 4usize ] , } # [ test ] fn bindgen_test_layout_nsBorderColors ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsBorderColors > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsBorderColors ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsBorderColors > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsBorderColors ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBorderColors ) ) . mColors as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsBorderColors ) , "::" , stringify ! ( mColors ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleBorder { pub mBorderColors : root :: mozilla :: UniquePtr < root :: nsBorderColors > , pub mBorderRadius : root :: nsStyleCorners , pub mBorderImageSource : root :: nsStyleImage , pub mBorderImageSlice : root :: nsStyleSides , pub mBorderImageWidth : root :: nsStyleSides , pub mBorderImageOutset : root :: nsStyleSides , pub mBorderImageFill : u8 , pub mBorderImageRepeatH : u8 , pub mBorderImageRepeatV : u8 , pub mFloatEdge : root :: mozilla :: StyleFloatEdge , pub mBoxDecorationBreak : root :: mozilla :: StyleBoxDecorationBreak , pub mBorderStyle : [ u8 ; 4usize ] , pub __bindgen_anon_1 : root :: nsStyleBorder__bindgen_ty_1 , pub mComputedBorder : root :: nsMargin , pub mBorder : root :: nsMargin , pub mTwipsPerPixel : root :: nscoord , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleBorder__bindgen_ty_1 { pub __bindgen_anon_1 : root :: __BindgenUnionField < root :: nsStyleBorder__bindgen_ty_1__bindgen_ty_1 > , pub mBorderColor : root :: __BindgenUnionField < [ root :: mozilla :: StyleComplexColor ; 4usize ] > , pub bindgen_union_field : [ u32 ; 8usize ] , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleBorder__bindgen_ty_1__bindgen_ty_1 { pub mBorderTopColor : root :: mozilla :: StyleComplexColor , pub mBorderRightColor : root :: mozilla :: StyleComplexColor , pub mBorderBottomColor : root :: mozilla :: StyleComplexColor , pub mBorderLeftColor : root :: mozilla :: StyleComplexColor , } # [ test ] fn bindgen_test_layout_nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleBorder__bindgen_ty_1__bindgen_ty_1 > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleBorder__bindgen_ty_1__bindgen_ty_1 > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) ) . mBorderTopColor as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mBorderTopColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) ) . mBorderRightColor as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mBorderRightColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) ) . mBorderBottomColor as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mBorderBottomColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) ) . mBorderLeftColor as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mBorderLeftColor ) ) ) ; } impl Clone for nsStyleBorder__bindgen_ty_1__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsStyleBorder__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleBorder__bindgen_ty_1 > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsStyleBorder__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleBorder__bindgen_ty_1 > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleBorder__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder__bindgen_ty_1 ) ) . mBorderColor as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder__bindgen_ty_1 ) , "::" , stringify ! ( mBorderColor ) ) ) ; } impl Clone for nsStyleBorder__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } pub const nsStyleBorder_kHasFinishStyle : bool = true ; # [ test ] fn bindgen_test_layout_nsStyleBorder ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleBorder > ( ) , 312usize , concat ! ( "Size of: " , stringify ! ( nsStyleBorder ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleBorder > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleBorder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderColors as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderColors ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderRadius as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderRadius ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageSource as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageSource ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageSlice as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageSlice ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageWidth as * const _ as usize } , 152usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageOutset as * const _ as usize } , 192usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageOutset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageFill as * const _ as usize } , 232usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageFill ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageRepeatH as * const _ as usize } , 233usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageRepeatH ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageRepeatV as * const _ as usize } , 234usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageRepeatV ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mFloatEdge as * const _ as usize } , 235usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mFloatEdge ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBoxDecorationBreak as * const _ as usize } , 236usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBoxDecorationBreak ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderStyle as * const _ as usize } , 237usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mComputedBorder as * const _ as usize } , 276usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mComputedBorder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorder as * const _ as usize } , 292usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mTwipsPerPixel as * const _ as usize } , 308usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mTwipsPerPixel ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleOutline { pub mOutlineRadius : root :: nsStyleCorners , pub mOutlineWidth : root :: nscoord , pub mOutlineOffset : root :: nscoord , pub mOutlineColor : root :: mozilla :: StyleComplexColor , pub mOutlineStyle : u8 , pub mActualOutlineWidth : root :: nscoord , pub mTwipsPerPixel : root :: nscoord , } pub const nsStyleOutline_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleOutline ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleOutline > ( ) , 104usize , concat ! ( "Size of: " , stringify ! ( nsStyleOutline ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleOutline > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleOutline ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mOutlineRadius as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mOutlineRadius ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mOutlineWidth as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mOutlineWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mOutlineOffset as * const _ as usize } , 76usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mOutlineOffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mOutlineColor as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mOutlineColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mOutlineStyle as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mOutlineStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mActualOutlineWidth as * const _ as usize } , 92usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mActualOutlineWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mTwipsPerPixel as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mTwipsPerPixel ) ) ) ; } 
+} # [ test ] fn bindgen_test_layout_nsStyleImageLayers ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleImageLayers > ( ) , 152usize , concat ! ( "Size of: " , stringify ! ( nsStyleImageLayers ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleImageLayers > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleImageLayers ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mAttachmentCount as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mAttachmentCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mClipCount as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mClipCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mOriginCount as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mOriginCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mRepeatCount as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mRepeatCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mPositionXCount as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mPositionXCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mPositionYCount as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mPositionYCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mImageCount as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mImageCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mSizeCount as * const _ as usize } , 28usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mSizeCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mMaskModeCount as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mMaskModeCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mBlendModeCount as * const _ as usize } , 36usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mBlendModeCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mCompositeCount as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mCompositeCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageLayers ) ) . mLayers as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageLayers ) , "::" , stringify ! ( mLayers ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleBackground { pub mImage : root :: nsStyleImageLayers , pub mBackgroundColor : root :: mozilla :: StyleComplexColor , } pub const nsStyleBackground_kHasFinishStyle : bool = true ; # [ test ] fn bindgen_test_layout_nsStyleBackground ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleBackground > ( ) , 160usize , concat ! ( "Size of: " , stringify ! ( nsStyleBackground ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleBackground > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleBackground ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBackground ) ) . mImage as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBackground ) , "::" , stringify ! ( mImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBackground ) ) . mBackgroundColor as * const _ as usize } , 152usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBackground ) , "::" , stringify ! ( mBackgroundColor ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleMargin { pub mMargin : root :: nsStyleSides , } pub const nsStyleMargin_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleMargin ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleMargin > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsStyleMargin ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleMargin > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleMargin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleMargin ) ) . mMargin as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleMargin ) , "::" , stringify ! ( mMargin ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStylePadding { pub mPadding : root :: nsStyleSides , } pub const nsStylePadding_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStylePadding ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStylePadding > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsStylePadding ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStylePadding > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStylePadding ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePadding ) ) . mPadding as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePadding ) , "::" , stringify ! ( mPadding ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSShadowItem { pub mXOffset : root :: nscoord , pub mYOffset : root :: nscoord , pub mRadius : root :: nscoord , pub mSpread : root :: nscoord , pub mColor : root :: nscolor , pub mHasColor : bool , pub mInset : bool , } # [ test ] fn bindgen_test_layout_nsCSSShadowItem ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSShadowItem > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsCSSShadowItem ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSShadowItem > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsCSSShadowItem ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mXOffset as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mXOffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mYOffset as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mYOffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mRadius as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mRadius ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mSpread as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mSpread ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mColor as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mHasColor as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mHasColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowItem ) ) . mInset as * const _ as usize } , 21usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowItem ) , "::" , stringify ! ( mInset ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSShadowArray { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mLength : u32 , pub mArray : [ root :: nsCSSShadowItem ; 1usize ] , } pub type nsCSSShadowArray_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_nsCSSShadowArray ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSShadowArray > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsCSSShadowArray ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSShadowArray > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSShadowArray ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowArray ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowArray ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowArray ) ) . mLength as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowArray ) , "::" , stringify ! ( mLength ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSShadowArray ) ) . mArray as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSShadowArray ) , "::" , stringify ! ( mArray ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsBorderColors { pub mColors : [ root :: nsTArray < root :: nscolor > ; 4usize ] , } # [ test ] fn bindgen_test_layout_nsBorderColors ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsBorderColors > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsBorderColors ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsBorderColors > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsBorderColors ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBorderColors ) ) . mColors as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsBorderColors ) , "::" , stringify ! ( mColors ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleBorder { pub mBorderColors : root :: mozilla :: UniquePtr < root :: nsBorderColors > , pub mBorderRadius : root :: nsStyleCorners , pub mBorderImageSource : root :: nsStyleImage , pub mBorderImageSlice : root :: nsStyleSides , pub mBorderImageWidth : root :: nsStyleSides , pub mBorderImageOutset : root :: nsStyleSides , pub mBorderImageFill : u8 , pub mBorderImageRepeatH : u8 , pub mBorderImageRepeatV : u8 , pub mFloatEdge : root :: mozilla :: StyleFloatEdge , pub mBoxDecorationBreak : root :: mozilla :: StyleBoxDecorationBreak , pub mBorderStyle : [ u8 ; 4usize ] , pub __bindgen_anon_1 : root :: nsStyleBorder__bindgen_ty_1 , pub mComputedBorder : root :: nsMargin , pub mBorder : root :: nsMargin , pub mTwipsPerPixel : root :: nscoord , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleBorder__bindgen_ty_1 { pub __bindgen_anon_1 : root :: __BindgenUnionField < root :: nsStyleBorder__bindgen_ty_1__bindgen_ty_1 > , pub mBorderColor : root :: __BindgenUnionField < [ root :: mozilla :: StyleComplexColor ; 4usize ] > , pub bindgen_union_field : [ u32 ; 8usize ] , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleBorder__bindgen_ty_1__bindgen_ty_1 { pub mBorderTopColor : root :: mozilla :: StyleComplexColor , pub mBorderRightColor : root :: mozilla :: StyleComplexColor , pub mBorderBottomColor : root :: mozilla :: StyleComplexColor , pub mBorderLeftColor : root :: mozilla :: StyleComplexColor , } # [ test ] fn bindgen_test_layout_nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleBorder__bindgen_ty_1__bindgen_ty_1 > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleBorder__bindgen_ty_1__bindgen_ty_1 > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) ) . mBorderTopColor as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mBorderTopColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) ) . mBorderRightColor as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mBorderRightColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) ) . mBorderBottomColor as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mBorderBottomColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) ) . mBorderLeftColor as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mBorderLeftColor ) ) ) ; } impl Clone for nsStyleBorder__bindgen_ty_1__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsStyleBorder__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleBorder__bindgen_ty_1 > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsStyleBorder__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleBorder__bindgen_ty_1 > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleBorder__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder__bindgen_ty_1 ) ) . mBorderColor as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder__bindgen_ty_1 ) , "::" , stringify ! ( mBorderColor ) ) ) ; } impl Clone for nsStyleBorder__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } pub const nsStyleBorder_kHasFinishStyle : bool = true ; # [ test ] fn bindgen_test_layout_nsStyleBorder ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleBorder > ( ) , 312usize , concat ! ( "Size of: " , stringify ! ( nsStyleBorder ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleBorder > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleBorder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderColors as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderColors ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderRadius as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderRadius ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageSource as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageSource ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageSlice as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageSlice ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageWidth as * const _ as usize } , 152usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageOutset as * const _ as usize } , 192usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageOutset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageFill as * const _ as usize } , 232usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageFill ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageRepeatH as * const _ as usize } , 233usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageRepeatH ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderImageRepeatV as * const _ as usize } , 234usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderImageRepeatV ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mFloatEdge as * const _ as usize } , 235usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mFloatEdge ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBoxDecorationBreak as * const _ as usize } , 236usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBoxDecorationBreak ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorderStyle as * const _ as usize } , 237usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorderStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mComputedBorder as * const _ as usize } , 276usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mComputedBorder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mBorder as * const _ as usize } , 292usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mBorder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleBorder ) ) . mTwipsPerPixel as * const _ as usize } , 308usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleBorder ) , "::" , stringify ! ( mTwipsPerPixel ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleOutline { pub mOutlineRadius : root :: nsStyleCorners , pub mOutlineWidth : root :: nscoord , pub mOutlineOffset : root :: nscoord , pub mOutlineColor : root :: mozilla :: StyleComplexColor , pub mOutlineStyle : u8 , pub mActualOutlineWidth : root :: nscoord , pub mTwipsPerPixel : root :: nscoord , } pub const nsStyleOutline_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleOutline ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleOutline > ( ) , 104usize , concat ! ( "Size of: " , stringify ! ( nsStyleOutline ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleOutline > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleOutline ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mOutlineRadius as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mOutlineRadius ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mOutlineWidth as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mOutlineWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mOutlineOffset as * const _ as usize } , 76usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mOutlineOffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mOutlineColor as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mOutlineColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mOutlineStyle as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mOutlineStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mActualOutlineWidth as * const _ as usize } , 92usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mActualOutlineWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleOutline ) ) . mTwipsPerPixel as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleOutline ) , "::" , stringify ! ( mTwipsPerPixel ) ) ) ; } 
  /// An object that allows sharing of arrays that store 'quotes' property
     /// values.  This is particularly important for inheritance, where we want
     /// to share the same 'quotes' value with a parent style context. 
- # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleQuoteValues { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mQuotePairs : root :: nsStyleQuoteValues_QuotePairArray , } pub type nsStyleQuoteValues_QuotePairArray = root :: nsTArray < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > ; pub type nsStyleQuoteValues_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_nsStyleQuoteValues ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleQuoteValues > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsStyleQuoteValues ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleQuoteValues > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleQuoteValues ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleQuoteValues ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleQuoteValues ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleQuoteValues ) ) . mQuotePairs as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleQuoteValues ) , "::" , stringify ! ( mQuotePairs ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleList { pub mListStylePosition : u8 , pub mListStyleImage : root :: RefPtr < root :: nsStyleImageRequest > , pub mCounterStyle : root :: mozilla :: CounterStylePtr , pub mQuotes : root :: RefPtr < root :: nsStyleQuoteValues > , pub mImageRegion : root :: nsRect , } pub const nsStyleList_kHasFinishStyle : bool = true ; extern "C" {
- # [ link_name = "\u{1}_ZN11nsStyleList14sInitialQuotesE" ] 
+ # [ repr ( C ) ] pub struct nsStyleQuoteValues { pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , pub mQuotePairs : root :: nsStyleQuoteValues_QuotePairArray , } pub type nsStyleQuoteValues_QuotePairArray = root :: nsTArray < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > ; pub type nsStyleQuoteValues_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_nsStyleQuoteValues ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleQuoteValues > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsStyleQuoteValues ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleQuoteValues > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleQuoteValues ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleQuoteValues ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleQuoteValues ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleQuoteValues ) ) . mQuotePairs as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleQuoteValues ) , "::" , stringify ! ( mQuotePairs ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleList { pub mListStylePosition : u8 , pub mListStyleImage : root :: RefPtr < root :: nsStyleImageRequest > , pub mCounterStyle : root :: mozilla :: CounterStylePtr , pub mQuotes : root :: RefPtr < root :: nsStyleQuoteValues > , pub mImageRegion : root :: nsRect , } pub const nsStyleList_kHasFinishStyle : bool = true ; extern "C" {
+ # [ link_name = "\u{1}__ZN11nsStyleList14sInitialQuotesE" ] 
  pub static mut  nsStyleList_sInitialQuotes  :  root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > ;
 } extern "C" {
- # [ link_name = "\u{1}_ZN11nsStyleList11sNoneQuotesE" ] 
+ # [ link_name = "\u{1}__ZN11nsStyleList11sNoneQuotesE" ] 
  pub static mut  nsStyleList_sNoneQuotes  :  root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > ;
-} # [ test ] fn bindgen_test_layout_nsStyleList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleList > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( nsStyleList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleList ) ) . mListStylePosition as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleList ) , "::" , stringify ! ( mListStylePosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleList ) ) . mListStyleImage as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleList ) , "::" , stringify ! ( mListStyleImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleList ) ) . mCounterStyle as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleList ) , "::" , stringify ! ( mCounterStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleList ) ) . mQuotes as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleList ) , "::" , stringify ! ( mQuotes ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleList ) ) . mImageRegion as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleList ) , "::" , stringify ! ( mImageRegion ) ) ) ; } # [ test ] fn __bindgen_test_layout_StaticRefPtr_open0_nsStyleQuoteValues_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > ) ) ) ; } # [ test ] fn __bindgen_test_layout_StaticRefPtr_open0_nsStyleQuoteValues_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleGridLine { pub mHasSpan : bool , pub mInteger : i32 , pub mLineName : ::nsstring::nsStringRepr , } pub const nsStyleGridLine_kMinLine : i32 = -10000 ; pub const nsStyleGridLine_kMaxLine : i32 = 10000 ; # [ test ] fn bindgen_test_layout_nsStyleGridLine ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleGridLine > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStyleGridLine ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleGridLine > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleGridLine ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridLine ) ) . mHasSpan as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridLine ) , "::" , stringify ! ( mHasSpan ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridLine ) ) . mInteger as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridLine ) , "::" , stringify ! ( mInteger ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridLine ) ) . mLineName as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridLine ) , "::" , stringify ! ( mLineName ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleGridTemplate { pub mLineNameLists : root :: nsTArray < root :: nsTArray < ::nsstring::nsStringRepr > > , pub mMinTrackSizingFunctions : root :: nsTArray < root :: nsStyleCoord > , pub mMaxTrackSizingFunctions : root :: nsTArray < root :: nsStyleCoord > , pub mRepeatAutoLineNameListBefore : root :: nsTArray < ::nsstring::nsStringRepr > , pub mRepeatAutoLineNameListAfter : root :: nsTArray < ::nsstring::nsStringRepr > , pub mRepeatAutoIndex : i16 , pub _bitfield_1 : u8 , pub __bindgen_padding_0 : [ u8 ; 5usize ] , } # [ test ] fn bindgen_test_layout_nsStyleGridTemplate ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleGridTemplate > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( nsStyleGridTemplate ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleGridTemplate > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleGridTemplate ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridTemplate ) ) . mLineNameLists as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridTemplate ) , "::" , stringify ! ( mLineNameLists ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridTemplate ) ) . mMinTrackSizingFunctions as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridTemplate ) , "::" , stringify ! ( mMinTrackSizingFunctions ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridTemplate ) ) . mMaxTrackSizingFunctions as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridTemplate ) , "::" , stringify ! ( mMaxTrackSizingFunctions ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridTemplate ) ) . mRepeatAutoLineNameListBefore as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridTemplate ) , "::" , stringify ! ( mRepeatAutoLineNameListBefore ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridTemplate ) ) . mRepeatAutoLineNameListAfter as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridTemplate ) , "::" , stringify ! ( mRepeatAutoLineNameListAfter ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridTemplate ) ) . mRepeatAutoIndex as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridTemplate ) , "::" , stringify ! ( mRepeatAutoIndex ) ) ) ; } impl nsStyleGridTemplate { # [ inline ] pub fn mIsAutoFill ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x1 as u8 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsAutoFill ( & mut self , val : bool ) { let mask = 0x1 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mIsSubgrid ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x2 as u8 ; let val = ( unit_field_val & mask ) >> 1usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsSubgrid ( & mut self , val : bool ) { let mask = 0x2 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 1usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mIsAutoFill : bool , mIsSubgrid : bool ) -> u8 { ( ( 0 | ( ( mIsAutoFill as u8 as u8 ) << 0usize ) & ( 0x1 as u8 ) ) | ( ( mIsSubgrid as u8 as u8 ) << 1usize ) & ( 0x2 as u8 ) ) } } # [ repr ( C ) ] pub struct nsStylePosition { pub mObjectPosition : root :: mozilla :: Position , pub mOffset : root :: nsStyleSides , pub mWidth : root :: nsStyleCoord , pub mMinWidth : root :: nsStyleCoord , pub mMaxWidth : root :: nsStyleCoord , pub mHeight : root :: nsStyleCoord , pub mMinHeight : root :: nsStyleCoord , pub mMaxHeight : root :: nsStyleCoord , pub mFlexBasis : root :: nsStyleCoord , pub mGridAutoColumnsMin : root :: nsStyleCoord , pub mGridAutoColumnsMax : root :: nsStyleCoord , pub mGridAutoRowsMin : root :: nsStyleCoord , pub mGridAutoRowsMax : root :: nsStyleCoord , pub mGridAutoFlow : u8 , pub mBoxSizing : root :: mozilla :: StyleBoxSizing , pub mAlignContent : u16 , pub mAlignItems : u8 , pub mAlignSelf : u8 , pub mJustifyContent : u16 , pub mSpecifiedJustifyItems : u8 , pub mJustifyItems : u8 , pub mJustifySelf : u8 , pub mFlexDirection : u8 , pub mFlexWrap : u8 , pub mObjectFit : u8 , pub mOrder : i32 , pub mFlexGrow : f32 , pub mFlexShrink : f32 , pub mZIndex : root :: nsStyleCoord , pub mGridTemplateColumns : root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > , pub mGridTemplateRows : root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > , pub mGridTemplateAreas : root :: RefPtr < root :: mozilla :: css :: GridTemplateAreasValue > , pub mGridColumnStart : root :: nsStyleGridLine , pub mGridColumnEnd : root :: nsStyleGridLine , pub mGridRowStart : root :: nsStyleGridLine , pub mGridRowEnd : root :: nsStyleGridLine , pub mGridColumnGap : root :: nsStyleCoord , pub mGridRowGap : root :: nsStyleCoord , } pub const nsStylePosition_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStylePosition ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStylePosition > ( ) , 440usize , concat ! ( "Size of: " , stringify ! ( nsStylePosition ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStylePosition > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStylePosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mObjectPosition as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mObjectPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mOffset as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mOffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mWidth as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mMinWidth as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mMinWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mMaxWidth as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mMaxWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mHeight as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mHeight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mMinHeight as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mMinHeight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mMaxHeight as * const _ as usize } , 144usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mMaxHeight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mFlexBasis as * const _ as usize } , 160usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mFlexBasis ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridAutoColumnsMin as * const _ as usize } , 176usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridAutoColumnsMin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridAutoColumnsMax as * const _ as usize } , 192usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridAutoColumnsMax ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridAutoRowsMin as * const _ as usize } , 208usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridAutoRowsMin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridAutoRowsMax as * const _ as usize } , 224usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridAutoRowsMax ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridAutoFlow as * const _ as usize } , 240usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridAutoFlow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mBoxSizing as * const _ as usize } , 241usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mBoxSizing ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mAlignContent as * const _ as usize } , 242usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mAlignContent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mAlignItems as * const _ as usize } , 244usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mAlignItems ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mAlignSelf as * const _ as usize } , 245usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mAlignSelf ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mJustifyContent as * const _ as usize } , 246usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mJustifyContent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mSpecifiedJustifyItems as * const _ as usize } , 248usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mSpecifiedJustifyItems ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mJustifyItems as * const _ as usize } , 249usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mJustifyItems ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mJustifySelf as * const _ as usize } , 250usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mJustifySelf ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mFlexDirection as * const _ as usize } , 251usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mFlexDirection ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mFlexWrap as * const _ as usize } , 252usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mFlexWrap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mObjectFit as * const _ as usize } , 253usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mObjectFit ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mOrder as * const _ as usize } , 256usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mOrder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mFlexGrow as * const _ as usize } , 260usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mFlexGrow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mFlexShrink as * const _ as usize } , 264usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mFlexShrink ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mZIndex as * const _ as usize } , 272usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mZIndex ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridTemplateColumns as * const _ as usize } , 288usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridTemplateColumns ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridTemplateRows as * const _ as usize } , 296usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridTemplateRows ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridTemplateAreas as * const _ as usize } , 304usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridTemplateAreas ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridColumnStart as * const _ as usize } , 312usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridColumnStart ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridColumnEnd as * const _ as usize } , 336usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridColumnEnd ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridRowStart as * const _ as usize } , 360usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridRowStart ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridRowEnd as * const _ as usize } , 384usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridRowEnd ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridColumnGap as * const _ as usize } , 408usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridColumnGap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridRowGap as * const _ as usize } , 424usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridRowGap ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleTextOverflowSide { pub mString : ::nsstring::nsStringRepr , pub mType : u8 , } # [ test ] fn bindgen_test_layout_nsStyleTextOverflowSide ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleTextOverflowSide > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStyleTextOverflowSide ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleTextOverflowSide > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleTextOverflowSide ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextOverflowSide ) ) . mString as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextOverflowSide ) , "::" , stringify ! ( mString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextOverflowSide ) ) . mType as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextOverflowSide ) , "::" , stringify ! ( mType ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleTextOverflow { pub mLeft : root :: nsStyleTextOverflowSide , pub mRight : root :: nsStyleTextOverflowSide , pub mLogicalDirections : bool , } # [ test ] fn bindgen_test_layout_nsStyleTextOverflow ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleTextOverflow > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( nsStyleTextOverflow ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleTextOverflow > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleTextOverflow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextOverflow ) ) . mLeft as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextOverflow ) , "::" , stringify ! ( mLeft ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextOverflow ) ) . mRight as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextOverflow ) , "::" , stringify ! ( mRight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextOverflow ) ) . mLogicalDirections as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextOverflow ) , "::" , stringify ! ( mLogicalDirections ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleTextReset { pub mTextOverflow : root :: nsStyleTextOverflow , pub mTextDecorationLine : u8 , pub mTextDecorationStyle : u8 , pub mUnicodeBidi : u8 , pub mInitialLetterSink : root :: nscoord , pub mInitialLetterSize : f32 , pub mTextDecorationColor : root :: mozilla :: StyleComplexColor , } pub const nsStyleTextReset_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleTextReset ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleTextReset > ( ) , 80usize , concat ! ( "Size of: " , stringify ! ( nsStyleTextReset ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleTextReset > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleTextReset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mTextOverflow as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mTextOverflow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mTextDecorationLine as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mTextDecorationLine ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mTextDecorationStyle as * const _ as usize } , 57usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mTextDecorationStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mUnicodeBidi as * const _ as usize } , 58usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mUnicodeBidi ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mInitialLetterSink as * const _ as usize } , 60usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mInitialLetterSink ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mInitialLetterSize as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mInitialLetterSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mTextDecorationColor as * const _ as usize } , 68usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mTextDecorationColor ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleText { pub mTextAlign : u8 , pub mTextAlignLast : u8 , pub _bitfield_1 : u8 , pub mTextJustify : root :: mozilla :: StyleTextJustify , pub mTextTransform : u8 , pub mWhiteSpace : root :: mozilla :: StyleWhiteSpace , pub mWordBreak : u8 , pub mOverflowWrap : u8 , pub mHyphens : root :: mozilla :: StyleHyphens , pub mRubyAlign : u8 , pub mRubyPosition : u8 , pub mTextSizeAdjust : u8 , pub mTextCombineUpright : u8 , pub mControlCharacterVisibility : u8 , pub mTextEmphasisPosition : u8 , pub mTextEmphasisStyle : u8 , pub mTextRendering : u8 , pub mTextEmphasisColor : root :: mozilla :: StyleComplexColor , pub mWebkitTextFillColor : root :: mozilla :: StyleComplexColor , pub mWebkitTextStrokeColor : root :: mozilla :: StyleComplexColor , pub mTabSize : root :: nsStyleCoord , pub mWordSpacing : root :: nsStyleCoord , pub mLetterSpacing : root :: nsStyleCoord , pub mLineHeight : root :: nsStyleCoord , pub mTextIndent : root :: nsStyleCoord , pub mWebkitTextStrokeWidth : root :: nscoord , pub mTextShadow : root :: RefPtr < root :: nsCSSShadowArray > , pub mTextEmphasisStyleString : ::nsstring::nsStringRepr , } pub const nsStyleText_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleText ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleText > ( ) , 160usize , concat ! ( "Size of: " , stringify ! ( nsStyleText ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleText > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleText ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextAlign as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextAlign ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextAlignLast as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextAlignLast ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextJustify as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextJustify ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextTransform as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextTransform ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mWhiteSpace as * const _ as usize } , 5usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mWhiteSpace ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mWordBreak as * const _ as usize } , 6usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mWordBreak ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mOverflowWrap as * const _ as usize } , 7usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mOverflowWrap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mHyphens as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mHyphens ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mRubyAlign as * const _ as usize } , 9usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mRubyAlign ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mRubyPosition as * const _ as usize } , 10usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mRubyPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextSizeAdjust as * const _ as usize } , 11usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextSizeAdjust ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextCombineUpright as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextCombineUpright ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mControlCharacterVisibility as * const _ as usize } , 13usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mControlCharacterVisibility ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextEmphasisPosition as * const _ as usize } , 14usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextEmphasisPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextEmphasisStyle as * const _ as usize } , 15usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextEmphasisStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextRendering as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextRendering ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextEmphasisColor as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextEmphasisColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mWebkitTextFillColor as * const _ as usize } , 28usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mWebkitTextFillColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mWebkitTextStrokeColor as * const _ as usize } , 36usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mWebkitTextStrokeColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTabSize as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTabSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mWordSpacing as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mWordSpacing ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mLetterSpacing as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mLetterSpacing ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mLineHeight as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mLineHeight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextIndent as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextIndent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mWebkitTextStrokeWidth as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mWebkitTextStrokeWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextShadow as * const _ as usize } , 136usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextShadow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextEmphasisStyleString as * const _ as usize } , 144usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextEmphasisStyleString ) ) ) ; } impl nsStyleText { # [ inline ] pub fn mTextAlignTrue ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x1 as u8 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mTextAlignTrue ( & mut self , val : bool ) { let mask = 0x1 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mTextAlignLastTrue ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x2 as u8 ; let val = ( unit_field_val & mask ) >> 1usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mTextAlignLastTrue ( & mut self , val : bool ) { let mask = 0x2 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 1usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mTextAlignTrue : bool , mTextAlignLastTrue : bool ) -> u8 { ( ( 0 | ( ( mTextAlignTrue as u8 as u8 ) << 0usize ) & ( 0x1 as u8 ) ) | ( ( mTextAlignLastTrue as u8 as u8 ) << 1usize ) & ( 0x2 as u8 ) ) } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleImageOrientation { pub mOrientation : u8 , } pub const nsStyleImageOrientation_Bits_ORIENTATION_MASK : root :: nsStyleImageOrientation_Bits = 3 ; pub const nsStyleImageOrientation_Bits_FLIP_MASK : root :: nsStyleImageOrientation_Bits = 4 ; pub const nsStyleImageOrientation_Bits_FROM_IMAGE_MASK : root :: nsStyleImageOrientation_Bits = 8 ; pub type nsStyleImageOrientation_Bits = :: std :: os :: raw :: c_uint ; # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleImageOrientation_Angles { ANGLE_0 = 0 , ANGLE_90 = 1 , ANGLE_180 = 2 , ANGLE_270 = 3 , } # [ test ] fn bindgen_test_layout_nsStyleImageOrientation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleImageOrientation > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( nsStyleImageOrientation ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleImageOrientation > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( nsStyleImageOrientation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageOrientation ) ) . mOrientation as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageOrientation ) , "::" , stringify ! ( mOrientation ) ) ) ; } impl Clone for nsStyleImageOrientation { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleVisibility { pub mImageOrientation : root :: nsStyleImageOrientation , pub mDirection : u8 , pub mVisible : u8 , pub mImageRendering : u8 , pub mWritingMode : u8 , pub mTextOrientation : u8 , pub mColorAdjust : u8 , } pub const nsStyleVisibility_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleVisibility ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleVisibility > ( ) , 7usize , concat ! ( "Size of: " , stringify ! ( nsStyleVisibility ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleVisibility > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( nsStyleVisibility ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mImageOrientation as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mImageOrientation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mDirection as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mDirection ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mVisible as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mVisible ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mImageRendering as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mImageRendering ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mWritingMode as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mWritingMode ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mTextOrientation as * const _ as usize } , 5usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mTextOrientation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mColorAdjust as * const _ as usize } , 6usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mColorAdjust ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsTimingFunction { pub mType : root :: nsTimingFunction_Type , pub __bindgen_anon_1 : root :: nsTimingFunction__bindgen_ty_1 , } # [ repr ( i32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsTimingFunction_Type { Ease = 0 , Linear = 1 , EaseIn = 2 , EaseOut = 3 , EaseInOut = 4 , StepStart = 5 , StepEnd = 6 , CubicBezier = 7 , Frames = 8 , } pub const nsTimingFunction_Keyword_Implicit : root :: nsTimingFunction_Keyword = 0 ; pub const nsTimingFunction_Keyword_Explicit : root :: nsTimingFunction_Keyword = 1 ; pub type nsTimingFunction_Keyword = :: std :: os :: raw :: c_int ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsTimingFunction__bindgen_ty_1 { pub mFunc : root :: __BindgenUnionField < root :: nsTimingFunction__bindgen_ty_1__bindgen_ty_1 > , pub __bindgen_anon_1 : root :: __BindgenUnionField < root :: nsTimingFunction__bindgen_ty_1__bindgen_ty_2 > , pub bindgen_union_field : [ u32 ; 4usize ] , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsTimingFunction__bindgen_ty_1__bindgen_ty_1 { pub mX1 : f32 , pub mY1 : f32 , pub mX2 : f32 , pub mY2 : f32 , } # [ test ] fn bindgen_test_layout_nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsTimingFunction__bindgen_ty_1__bindgen_ty_1 > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsTimingFunction__bindgen_ty_1__bindgen_ty_1 > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) ) . mX1 as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mX1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) ) . mY1 as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mY1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) ) . mX2 as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mX2 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) ) . mY2 as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mY2 ) ) ) ; } impl Clone for nsTimingFunction__bindgen_ty_1__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsTimingFunction__bindgen_ty_1__bindgen_ty_2 { pub mStepsOrFrames : u32 , } # [ test ] fn bindgen_test_layout_nsTimingFunction__bindgen_ty_1__bindgen_ty_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsTimingFunction__bindgen_ty_1__bindgen_ty_2 > ( ) , 4usize , concat ! ( "Size of: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_2 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsTimingFunction__bindgen_ty_1__bindgen_ty_2 > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_2 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction__bindgen_ty_1__bindgen_ty_2 ) ) . mStepsOrFrames as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_2 ) , "::" , stringify ! ( mStepsOrFrames ) ) ) ; } impl Clone for nsTimingFunction__bindgen_ty_1__bindgen_ty_2 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsTimingFunction__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsTimingFunction__bindgen_ty_1 > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsTimingFunction__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsTimingFunction__bindgen_ty_1 > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsTimingFunction__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction__bindgen_ty_1 ) ) . mFunc as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction__bindgen_ty_1 ) , "::" , stringify ! ( mFunc ) ) ) ; } impl Clone for nsTimingFunction__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsTimingFunction ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsTimingFunction > ( ) , 20usize , concat ! ( "Size of: " , stringify ! ( nsTimingFunction ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsTimingFunction > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsTimingFunction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction ) ) . mType as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction ) , "::" , stringify ! ( mType ) ) ) ; } impl Clone for nsTimingFunction { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleDisplay { pub mBinding : root :: RefPtr < root :: mozilla :: css :: URLValue > , pub mDisplay : root :: mozilla :: StyleDisplay , pub mOriginalDisplay : root :: mozilla :: StyleDisplay , pub mContain : u8 , pub mAppearance : u8 , pub mPosition : u8 , pub mFloat : root :: mozilla :: StyleFloat , pub mOriginalFloat : root :: mozilla :: StyleFloat , pub mBreakType : root :: mozilla :: StyleClear , pub mBreakInside : u8 , pub mBreakBefore : bool , pub mBreakAfter : bool , pub mOverflowX : u8 , pub mOverflowY : u8 , pub mOverflowClipBox : u8 , pub mResize : u8 , pub mOrient : root :: mozilla :: StyleOrient , pub mIsolation : u8 , pub mTopLayer : u8 , pub mWillChangeBitField : u8 , pub mWillChange : root :: nsTArray < root :: RefPtr < root :: nsAtom > > , pub mTouchAction : u8 , pub mScrollBehavior : u8 , pub mOverscrollBehaviorX : root :: mozilla :: StyleOverscrollBehavior , pub mOverscrollBehaviorY : root :: mozilla :: StyleOverscrollBehavior , pub mScrollSnapTypeX : u8 , pub mScrollSnapTypeY : u8 , pub mScrollSnapPointsX : root :: nsStyleCoord , pub mScrollSnapPointsY : root :: nsStyleCoord , pub mScrollSnapDestination : root :: mozilla :: Position , pub mScrollSnapCoordinate : root :: nsTArray < root :: mozilla :: Position > , pub mBackfaceVisibility : u8 , pub mTransformStyle : u8 , pub mTransformBox : root :: nsStyleDisplay_StyleGeometryBox , pub mSpecifiedTransform : root :: RefPtr < root :: nsCSSValueSharedList > , pub mTransformOrigin : [ root :: nsStyleCoord ; 3usize ] , pub mChildPerspective : root :: nsStyleCoord , pub mPerspectiveOrigin : [ root :: nsStyleCoord ; 2usize ] , pub mVerticalAlign : root :: nsStyleCoord , pub mTransitions : root :: nsStyleAutoArray < root :: mozilla :: StyleTransition > , pub mTransitionTimingFunctionCount : u32 , pub mTransitionDurationCount : u32 , pub mTransitionDelayCount : u32 , pub mTransitionPropertyCount : u32 , pub mAnimations : root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > , pub mAnimationTimingFunctionCount : u32 , pub mAnimationDurationCount : u32 , pub mAnimationDelayCount : u32 , pub mAnimationNameCount : u32 , pub mAnimationDirectionCount : u32 , pub mAnimationFillModeCount : u32 , pub mAnimationPlayStateCount : u32 , pub mAnimationIterationCountCount : u32 , pub mShapeOutside : root :: mozilla :: StyleShapeSource , } pub use self :: super :: root :: mozilla :: StyleGeometryBox as nsStyleDisplay_StyleGeometryBox ; pub const nsStyleDisplay_kHasFinishStyle : bool = true ; # [ test ] fn bindgen_test_layout_nsStyleDisplay ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleDisplay > ( ) , 416usize , concat ! ( "Size of: " , stringify ! ( nsStyleDisplay ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleDisplay > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleDisplay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mBinding as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mBinding ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mDisplay as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mDisplay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOriginalDisplay as * const _ as usize } , 9usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOriginalDisplay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mContain as * const _ as usize } , 10usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mContain ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAppearance as * const _ as usize } , 11usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAppearance ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mPosition as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mFloat as * const _ as usize } , 13usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mFloat ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOriginalFloat as * const _ as usize } , 14usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOriginalFloat ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mBreakType as * const _ as usize } , 15usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mBreakType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mBreakInside as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mBreakInside ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mBreakBefore as * const _ as usize } , 17usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mBreakBefore ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mBreakAfter as * const _ as usize } , 18usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mBreakAfter ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOverflowX as * const _ as usize } , 19usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOverflowX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOverflowY as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOverflowY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOverflowClipBox as * const _ as usize } , 21usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOverflowClipBox ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mResize as * const _ as usize } , 22usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mResize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOrient as * const _ as usize } , 23usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOrient ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mIsolation as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mIsolation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTopLayer as * const _ as usize } , 25usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTopLayer ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mWillChangeBitField as * const _ as usize } , 26usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mWillChangeBitField ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mWillChange as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mWillChange ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTouchAction as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTouchAction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollBehavior as * const _ as usize } , 41usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollBehavior ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOverscrollBehaviorX as * const _ as usize } , 42usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOverscrollBehaviorX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOverscrollBehaviorY as * const _ as usize } , 43usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOverscrollBehaviorY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollSnapTypeX as * const _ as usize } , 44usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollSnapTypeX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollSnapTypeY as * const _ as usize } , 45usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollSnapTypeY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollSnapPointsX as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollSnapPointsX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollSnapPointsY as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollSnapPointsY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollSnapDestination as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollSnapDestination ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollSnapCoordinate as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollSnapCoordinate ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mBackfaceVisibility as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mBackfaceVisibility ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransformStyle as * const _ as usize } , 113usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransformStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransformBox as * const _ as usize } , 114usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransformBox ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mSpecifiedTransform as * const _ as usize } , 120usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mSpecifiedTransform ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransformOrigin as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransformOrigin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mChildPerspective as * const _ as usize } , 176usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mChildPerspective ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mPerspectiveOrigin as * const _ as usize } , 192usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mPerspectiveOrigin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mVerticalAlign as * const _ as usize } , 224usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mVerticalAlign ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransitions as * const _ as usize } , 240usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransitions ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransitionTimingFunctionCount as * const _ as usize } , 288usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransitionTimingFunctionCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransitionDurationCount as * const _ as usize } , 292usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransitionDurationCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransitionDelayCount as * const _ as usize } , 296usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransitionDelayCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransitionPropertyCount as * const _ as usize } , 300usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransitionPropertyCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimations as * const _ as usize } , 304usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimations ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationTimingFunctionCount as * const _ as usize } , 360usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationTimingFunctionCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationDurationCount as * const _ as usize } , 364usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationDurationCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationDelayCount as * const _ as usize } , 368usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationDelayCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationNameCount as * const _ as usize } , 372usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationNameCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationDirectionCount as * const _ as usize } , 376usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationDirectionCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationFillModeCount as * const _ as usize } , 380usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationFillModeCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationPlayStateCount as * const _ as usize } , 384usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationPlayStateCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationIterationCountCount as * const _ as usize } , 388usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationIterationCountCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mShapeOutside as * const _ as usize } , 392usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mShapeOutside ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleTable { pub mLayoutStrategy : u8 , pub mSpan : i32 , } pub const nsStyleTable_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleTable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleTable > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsStyleTable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleTable > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTable ) ) . mLayoutStrategy as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTable ) , "::" , stringify ! ( mLayoutStrategy ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTable ) ) . mSpan as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTable ) , "::" , stringify ! ( mSpan ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleTableBorder { pub mBorderSpacingCol : root :: nscoord , pub mBorderSpacingRow : root :: nscoord , pub mBorderCollapse : u8 , pub mCaptionSide : u8 , pub mEmptyCells : u8 , } pub const nsStyleTableBorder_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleTableBorder ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleTableBorder > ( ) , 12usize , concat ! ( "Size of: " , stringify ! ( nsStyleTableBorder ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleTableBorder > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleTableBorder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTableBorder ) ) . mBorderSpacingCol as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTableBorder ) , "::" , stringify ! ( mBorderSpacingCol ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTableBorder ) ) . mBorderSpacingRow as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTableBorder ) , "::" , stringify ! ( mBorderSpacingRow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTableBorder ) ) . mBorderCollapse as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTableBorder ) , "::" , stringify ! ( mBorderCollapse ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTableBorder ) ) . mCaptionSide as * const _ as usize } , 9usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTableBorder ) , "::" , stringify ! ( mCaptionSide ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTableBorder ) ) . mEmptyCells as * const _ as usize } , 10usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTableBorder ) , "::" , stringify ! ( mEmptyCells ) ) ) ; } # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleContentType { eStyleContentType_String = 1 , eStyleContentType_Image = 10 , eStyleContentType_Attr = 20 , eStyleContentType_Counter = 30 , eStyleContentType_Counters = 31 , eStyleContentType_OpenQuote = 40 , eStyleContentType_CloseQuote = 41 , eStyleContentType_NoOpenQuote = 42 , eStyleContentType_NoCloseQuote = 43 , eStyleContentType_AltContent = 50 , eStyleContentType_Uninitialized = 51 , } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleContentData { pub mType : root :: nsStyleContentType , pub mContent : root :: nsStyleContentData__bindgen_ty_1 , } # [ repr ( C ) ] pub struct nsStyleContentData_CounterFunction { pub mIdent : ::nsstring::nsStringRepr , pub mSeparator : ::nsstring::nsStringRepr , pub mCounterStyle : root :: mozilla :: CounterStylePtr , pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , } pub type nsStyleContentData_CounterFunction_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_nsStyleContentData_CounterFunction ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleContentData_CounterFunction > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( nsStyleContentData_CounterFunction ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleContentData_CounterFunction > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleContentData_CounterFunction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData_CounterFunction ) ) . mIdent as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData_CounterFunction ) , "::" , stringify ! ( mIdent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData_CounterFunction ) ) . mSeparator as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData_CounterFunction ) , "::" , stringify ! ( mSeparator ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData_CounterFunction ) ) . mCounterStyle as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData_CounterFunction ) , "::" , stringify ! ( mCounterStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData_CounterFunction ) ) . mRefCnt as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData_CounterFunction ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleContentData__bindgen_ty_1 { pub mString : root :: __BindgenUnionField < * mut u16 > , pub mImage : root :: __BindgenUnionField < * mut root :: nsStyleImageRequest > , pub mCounters : root :: __BindgenUnionField < * mut root :: nsStyleContentData_CounterFunction > , pub bindgen_union_field : u64 , } # [ test ] fn bindgen_test_layout_nsStyleContentData__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleContentData__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsStyleContentData__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleContentData__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleContentData__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData__bindgen_ty_1 ) ) . mString as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData__bindgen_ty_1 ) , "::" , stringify ! ( mString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData__bindgen_ty_1 ) ) . mImage as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData__bindgen_ty_1 ) , "::" , stringify ! ( mImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData__bindgen_ty_1 ) ) . mCounters as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData__bindgen_ty_1 ) , "::" , stringify ! ( mCounters ) ) ) ; } impl Clone for nsStyleContentData__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsStyleContentData ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleContentData > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsStyleContentData ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleContentData > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleContentData ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData ) ) . mType as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData ) ) . mContent as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData ) , "::" , stringify ! ( mContent ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleCounterData { pub mCounter : ::nsstring::nsStringRepr , pub mValue : i32 , } # [ test ] fn bindgen_test_layout_nsStyleCounterData ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleCounterData > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStyleCounterData ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleCounterData > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleCounterData ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleCounterData ) ) . mCounter as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleCounterData ) , "::" , stringify ! ( mCounter ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleCounterData ) ) . mValue as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleCounterData ) , "::" , stringify ! ( mValue ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleContent { pub mContents : root :: nsTArray < root :: nsStyleContentData > , pub mIncrements : root :: nsTArray < root :: nsStyleCounterData > , pub mResets : root :: nsTArray < root :: nsStyleCounterData > , } pub const nsStyleContent_kHasFinishStyle : bool = true ; # [ test ] fn bindgen_test_layout_nsStyleContent ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleContent > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStyleContent ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleContent > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleContent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContent ) ) . mContents as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContent ) , "::" , stringify ! ( mContents ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContent ) ) . mIncrements as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContent ) , "::" , stringify ! ( mIncrements ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContent ) ) . mResets as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContent ) , "::" , stringify ! ( mResets ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleUIReset { pub mUserSelect : root :: mozilla :: StyleUserSelect , pub mForceBrokenImageIcon : u8 , pub mIMEMode : u8 , pub mWindowDragging : root :: mozilla :: StyleWindowDragging , pub mWindowShadow : u8 , pub mWindowOpacity : f32 , pub mSpecifiedWindowTransform : root :: RefPtr < root :: nsCSSValueSharedList > , pub mWindowTransformOrigin : [ root :: nsStyleCoord ; 2usize ] , } pub const nsStyleUIReset_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleUIReset ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleUIReset > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( nsStyleUIReset ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleUIReset > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleUIReset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mUserSelect as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mUserSelect ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mForceBrokenImageIcon as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mForceBrokenImageIcon ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mIMEMode as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mIMEMode ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mWindowDragging as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mWindowDragging ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mWindowShadow as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mWindowShadow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mWindowOpacity as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mWindowOpacity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mSpecifiedWindowTransform as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mSpecifiedWindowTransform ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mWindowTransformOrigin as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mWindowTransformOrigin ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCursorImage { pub mHaveHotspot : bool , pub mHotspotX : f32 , pub mHotspotY : f32 , pub mImage : root :: RefPtr < root :: nsStyleImageRequest > , } # [ test ] fn bindgen_test_layout_nsCursorImage ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCursorImage > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsCursorImage ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCursorImage > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCursorImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCursorImage ) ) . mHaveHotspot as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCursorImage ) , "::" , stringify ! ( mHaveHotspot ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCursorImage ) ) . mHotspotX as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsCursorImage ) , "::" , stringify ! ( mHotspotX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCursorImage ) ) . mHotspotY as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCursorImage ) , "::" , stringify ! ( mHotspotY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCursorImage ) ) . mImage as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCursorImage ) , "::" , stringify ! ( mImage ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleUserInterface { pub mUserInput : root :: mozilla :: StyleUserInput , pub mUserModify : root :: mozilla :: StyleUserModify , pub mUserFocus : root :: mozilla :: StyleUserFocus , pub mPointerEvents : u8 , pub mCursor : u8 , pub mCursorImages : root :: nsTArray < root :: nsCursorImage > , pub mCaretColor : root :: mozilla :: StyleComplexColor , } pub const nsStyleUserInterface_kHasFinishStyle : bool = true ; # [ test ] fn bindgen_test_layout_nsStyleUserInterface ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleUserInterface > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStyleUserInterface ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleUserInterface > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleUserInterface ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mUserInput as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mUserInput ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mUserModify as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mUserModify ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mUserFocus as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mUserFocus ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mPointerEvents as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mPointerEvents ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mCursor as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mCursor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mCursorImages as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mCursorImages ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mCaretColor as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mCaretColor ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleXUL { pub mBoxFlex : f32 , pub mBoxOrdinal : u32 , pub mBoxAlign : root :: mozilla :: StyleBoxAlign , pub mBoxDirection : root :: mozilla :: StyleBoxDirection , pub mBoxOrient : root :: mozilla :: StyleBoxOrient , pub mBoxPack : root :: mozilla :: StyleBoxPack , pub mStackSizing : root :: mozilla :: StyleStackSizing , } pub const nsStyleXUL_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleXUL ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleXUL > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsStyleXUL ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleXUL > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleXUL ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mBoxFlex as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxFlex ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mBoxOrdinal as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxOrdinal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mBoxAlign as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxAlign ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mBoxDirection as * const _ as usize } , 9usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxDirection ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mBoxOrient as * const _ as usize } , 10usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxOrient ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mBoxPack as * const _ as usize } , 11usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxPack ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mStackSizing as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mStackSizing ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleColumn { pub mColumnCount : u32 , pub mColumnWidth : root :: nsStyleCoord , pub mColumnGap : root :: nsStyleCoord , pub mColumnRuleColor : root :: mozilla :: StyleComplexColor , pub mColumnRuleStyle : u8 , pub mColumnFill : u8 , pub mColumnSpan : u8 , pub mColumnRuleWidth : root :: nscoord , pub mTwipsPerPixel : root :: nscoord , } pub const nsStyleColumn_kHasFinishStyle : bool = false ; pub const nsStyleColumn_kMaxColumnCount : u32 = 1000 ; # [ test ] fn bindgen_test_layout_nsStyleColumn ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleColumn > ( ) , 64usize , concat ! ( "Size of: " , stringify ! ( nsStyleColumn ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleColumn > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleColumn ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnCount as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnWidth as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnGap as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnGap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnRuleColor as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnRuleColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnRuleStyle as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnRuleStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnFill as * const _ as usize } , 49usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnFill ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnSpan as * const _ as usize } , 50usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnSpan ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnRuleWidth as * const _ as usize } , 52usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnRuleWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mTwipsPerPixel as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mTwipsPerPixel ) ) ) ; } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleSVGPaintType { eStyleSVGPaintType_None = 1 , eStyleSVGPaintType_Color = 2 , eStyleSVGPaintType_Server = 3 , eStyleSVGPaintType_ContextFill = 4 , eStyleSVGPaintType_ContextStroke = 5 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleSVGFallbackType { eStyleSVGFallbackType_NotSet = 0 , eStyleSVGFallbackType_None = 1 , eStyleSVGFallbackType_Color = 2 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleSVGOpacitySource { eStyleSVGOpacitySource_Normal = 0 , eStyleSVGOpacitySource_ContextFillOpacity = 1 , eStyleSVGOpacitySource_ContextStrokeOpacity = 2 , } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleSVGPaint { pub mPaint : root :: nsStyleSVGPaint__bindgen_ty_1 , pub mType : root :: nsStyleSVGPaintType , pub mFallbackType : root :: nsStyleSVGFallbackType , pub mFallbackColor : root :: nscolor , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleSVGPaint__bindgen_ty_1 { pub mColor : root :: __BindgenUnionField < root :: nscolor > , pub mPaintServer : root :: __BindgenUnionField < * mut root :: mozilla :: css :: URLValue > , pub bindgen_union_field : u64 , } # [ test ] fn bindgen_test_layout_nsStyleSVGPaint__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleSVGPaint__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsStyleSVGPaint__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleSVGPaint__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleSVGPaint__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGPaint__bindgen_ty_1 ) ) . mColor as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGPaint__bindgen_ty_1 ) , "::" , stringify ! ( mColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGPaint__bindgen_ty_1 ) ) . mPaintServer as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGPaint__bindgen_ty_1 ) , "::" , stringify ! ( mPaintServer ) ) ) ; } impl Clone for nsStyleSVGPaint__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsStyleSVGPaint ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleSVGPaint > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsStyleSVGPaint ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleSVGPaint > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleSVGPaint ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGPaint ) ) . mPaint as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGPaint ) , "::" , stringify ! ( mPaint ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGPaint ) ) . mType as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGPaint ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGPaint ) ) . mFallbackType as * const _ as usize } , 9usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGPaint ) , "::" , stringify ! ( mFallbackType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGPaint ) ) . mFallbackColor as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGPaint ) , "::" , stringify ! ( mFallbackColor ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleSVG { pub mFill : root :: nsStyleSVGPaint , pub mStroke : root :: nsStyleSVGPaint , pub mMarkerEnd : root :: RefPtr < root :: mozilla :: css :: URLValue > , pub mMarkerMid : root :: RefPtr < root :: mozilla :: css :: URLValue > , pub mMarkerStart : root :: RefPtr < root :: mozilla :: css :: URLValue > , pub mStrokeDasharray : root :: nsTArray < root :: nsStyleCoord > , pub mContextProps : root :: nsTArray < root :: RefPtr < root :: nsAtom > > , pub mStrokeDashoffset : root :: nsStyleCoord , pub mStrokeWidth : root :: nsStyleCoord , pub mFillOpacity : f32 , pub mStrokeMiterlimit : f32 , pub mStrokeOpacity : f32 , pub mClipRule : root :: mozilla :: StyleFillRule , pub mColorInterpolation : u8 , pub mColorInterpolationFilters : u8 , pub mFillRule : root :: mozilla :: StyleFillRule , pub mPaintOrder : u8 , pub mShapeRendering : u8 , pub mStrokeLinecap : u8 , pub mStrokeLinejoin : u8 , pub mTextAnchor : u8 , pub mContextPropsBits : u8 , pub mContextFlags : u8 , } pub const nsStyleSVG_kHasFinishStyle : bool = false ; pub const nsStyleSVG_FILL_OPACITY_SOURCE_MASK : u8 = 3 ; pub const nsStyleSVG_STROKE_OPACITY_SOURCE_MASK : u8 = 12 ; pub const nsStyleSVG_STROKE_DASHARRAY_CONTEXT : u8 = 16 ; pub const nsStyleSVG_STROKE_DASHOFFSET_CONTEXT : u8 = 32 ; pub const nsStyleSVG_STROKE_WIDTH_CONTEXT : u8 = 64 ; pub const nsStyleSVG_FILL_OPACITY_SOURCE_SHIFT : u8 = 0 ; pub const nsStyleSVG_STROKE_OPACITY_SOURCE_SHIFT : u8 = 2 ; # [ test ] fn bindgen_test_layout_nsStyleSVG ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleSVG > ( ) , 128usize , concat ! ( "Size of: " , stringify ! ( nsStyleSVG ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleSVG > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleSVG ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mFill as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mFill ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStroke as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStroke ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mMarkerEnd as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mMarkerEnd ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mMarkerMid as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mMarkerMid ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mMarkerStart as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mMarkerStart ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeDasharray as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeDasharray ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mContextProps as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mContextProps ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeDashoffset as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeDashoffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeWidth as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mFillOpacity as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mFillOpacity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeMiterlimit as * const _ as usize } , 108usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeMiterlimit ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeOpacity as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeOpacity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mClipRule as * const _ as usize } , 116usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mClipRule ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mColorInterpolation as * const _ as usize } , 117usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mColorInterpolation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mColorInterpolationFilters as * const _ as usize } , 118usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mColorInterpolationFilters ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mFillRule as * const _ as usize } , 119usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mFillRule ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mPaintOrder as * const _ as usize } , 120usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mPaintOrder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mShapeRendering as * const _ as usize } , 121usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mShapeRendering ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeLinecap as * const _ as usize } , 122usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeLinecap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeLinejoin as * const _ as usize } , 123usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeLinejoin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mTextAnchor as * const _ as usize } , 124usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mTextAnchor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mContextPropsBits as * const _ as usize } , 125usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mContextPropsBits ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mContextFlags as * const _ as usize } , 126usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mContextFlags ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleFilter { pub mType : u32 , pub mFilterParameter : root :: nsStyleCoord , pub __bindgen_anon_1 : root :: nsStyleFilter__bindgen_ty_1 , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleFilter__bindgen_ty_1 { pub mURL : root :: __BindgenUnionField < * mut root :: mozilla :: css :: URLValue > , pub mDropShadow : root :: __BindgenUnionField < * mut root :: nsCSSShadowArray > , pub bindgen_union_field : u64 , } # [ test ] fn bindgen_test_layout_nsStyleFilter__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleFilter__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsStyleFilter__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleFilter__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleFilter__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFilter__bindgen_ty_1 ) ) . mURL as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFilter__bindgen_ty_1 ) , "::" , stringify ! ( mURL ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFilter__bindgen_ty_1 ) ) . mDropShadow as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFilter__bindgen_ty_1 ) , "::" , stringify ! ( mDropShadow ) ) ) ; } impl Clone for nsStyleFilter__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } pub const nsStyleFilter_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleFilter ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleFilter > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsStyleFilter ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleFilter > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleFilter ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFilter ) ) . mType as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFilter ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFilter ) ) . mFilterParameter as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFilter ) , "::" , stringify ! ( mFilterParameter ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleSVGReset { pub mMask : root :: nsStyleImageLayers , pub mClipPath : root :: mozilla :: StyleShapeSource , pub mStopColor : root :: nscolor , pub mFloodColor : root :: nscolor , pub mLightingColor : root :: nscolor , pub mStopOpacity : f32 , pub mFloodOpacity : f32 , pub mDominantBaseline : u8 , pub mVectorEffect : u8 , pub mMaskType : u8 , } pub const nsStyleSVGReset_kHasFinishStyle : bool = true ; # [ test ] fn bindgen_test_layout_nsStyleSVGReset ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleSVGReset > ( ) , 200usize , concat ! ( "Size of: " , stringify ! ( nsStyleSVGReset ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleSVGReset > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleSVGReset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mMask as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mMask ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mClipPath as * const _ as usize } , 152usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mClipPath ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mStopColor as * const _ as usize } , 176usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mStopColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mFloodColor as * const _ as usize } , 180usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mFloodColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mLightingColor as * const _ as usize } , 184usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mLightingColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mStopOpacity as * const _ as usize } , 188usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mStopOpacity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mFloodOpacity as * const _ as usize } , 192usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mFloodOpacity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mDominantBaseline as * const _ as usize } , 196usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mDominantBaseline ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mVectorEffect as * const _ as usize } , 197usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mVectorEffect ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mMaskType as * const _ as usize } , 198usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mMaskType ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleVariables { pub mVariables : root :: mozilla :: CSSVariableValues , } pub const nsStyleVariables_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleVariables ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleVariables > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsStyleVariables ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleVariables > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleVariables ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVariables ) ) . mVariables as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVariables ) , "::" , stringify ! ( mVariables ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleEffects { pub mFilters : root :: nsTArray < root :: nsStyleFilter > , pub mBoxShadow : root :: RefPtr < root :: nsCSSShadowArray > , pub mClip : root :: nsRect , pub mOpacity : f32 , pub mClipFlags : u8 , pub mMixBlendMode : u8 , } pub const nsStyleEffects_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleEffects ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleEffects > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsStyleEffects ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleEffects > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleEffects ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleEffects ) ) . mFilters as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleEffects ) , "::" , stringify ! ( mFilters ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleEffects ) ) . mBoxShadow as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleEffects ) , "::" , stringify ! ( mBoxShadow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleEffects ) ) . mClip as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleEffects ) , "::" , stringify ! ( mClip ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleEffects ) ) . mOpacity as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleEffects ) , "::" , stringify ! ( mOpacity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleEffects ) ) . mClipFlags as * const _ as usize } , 36usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleEffects ) , "::" , stringify ! ( mClipFlags ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleEffects ) ) . mMixBlendMode as * const _ as usize } , 37usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleEffects ) , "::" , stringify ! ( mMixBlendMode ) ) ) ; } 
+} # [ test ] fn bindgen_test_layout_nsStyleList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleList > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( nsStyleList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleList ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleList ) ) . mListStylePosition as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleList ) , "::" , stringify ! ( mListStylePosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleList ) ) . mListStyleImage as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleList ) , "::" , stringify ! ( mListStyleImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleList ) ) . mCounterStyle as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleList ) , "::" , stringify ! ( mCounterStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleList ) ) . mQuotes as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleList ) , "::" , stringify ! ( mQuotes ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleList ) ) . mImageRegion as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleList ) , "::" , stringify ! ( mImageRegion ) ) ) ; } # [ test ] fn __bindgen_test_layout_StaticRefPtr_open0_nsStyleQuoteValues_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > ) ) ) ; } # [ test ] fn __bindgen_test_layout_StaticRefPtr_open0_nsStyleQuoteValues_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: nsStyleQuoteValues > ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleGridLine { pub mHasSpan : bool , pub mInteger : i32 , pub mLineName : ::nsstring::nsStringRepr , } pub const nsStyleGridLine_kMinLine : i32 = -10000 ; pub const nsStyleGridLine_kMaxLine : i32 = 10000 ; # [ test ] fn bindgen_test_layout_nsStyleGridLine ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleGridLine > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStyleGridLine ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleGridLine > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleGridLine ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridLine ) ) . mHasSpan as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridLine ) , "::" , stringify ! ( mHasSpan ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridLine ) ) . mInteger as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridLine ) , "::" , stringify ! ( mInteger ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridLine ) ) . mLineName as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridLine ) , "::" , stringify ! ( mLineName ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleGridTemplate { pub mLineNameLists : root :: nsTArray < root :: nsTArray < ::nsstring::nsStringRepr > > , pub mMinTrackSizingFunctions : root :: nsTArray < root :: nsStyleCoord > , pub mMaxTrackSizingFunctions : root :: nsTArray < root :: nsStyleCoord > , pub mRepeatAutoLineNameListBefore : root :: nsTArray < ::nsstring::nsStringRepr > , pub mRepeatAutoLineNameListAfter : root :: nsTArray < ::nsstring::nsStringRepr > , pub mRepeatAutoIndex : i16 , pub _bitfield_1 : u8 , pub __bindgen_padding_0 : [ u8 ; 5usize ] , } # [ test ] fn bindgen_test_layout_nsStyleGridTemplate ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleGridTemplate > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( nsStyleGridTemplate ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleGridTemplate > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleGridTemplate ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridTemplate ) ) . mLineNameLists as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridTemplate ) , "::" , stringify ! ( mLineNameLists ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridTemplate ) ) . mMinTrackSizingFunctions as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridTemplate ) , "::" , stringify ! ( mMinTrackSizingFunctions ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridTemplate ) ) . mMaxTrackSizingFunctions as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridTemplate ) , "::" , stringify ! ( mMaxTrackSizingFunctions ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridTemplate ) ) . mRepeatAutoLineNameListBefore as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridTemplate ) , "::" , stringify ! ( mRepeatAutoLineNameListBefore ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridTemplate ) ) . mRepeatAutoLineNameListAfter as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridTemplate ) , "::" , stringify ! ( mRepeatAutoLineNameListAfter ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleGridTemplate ) ) . mRepeatAutoIndex as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleGridTemplate ) , "::" , stringify ! ( mRepeatAutoIndex ) ) ) ; } impl nsStyleGridTemplate { # [ inline ] pub fn mIsAutoFill ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x1 as u8 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsAutoFill ( & mut self , val : bool ) { let mask = 0x1 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mIsSubgrid ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x2 as u8 ; let val = ( unit_field_val & mask ) >> 1usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mIsSubgrid ( & mut self , val : bool ) { let mask = 0x2 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 1usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mIsAutoFill : bool , mIsSubgrid : bool ) -> u8 { ( ( 0 | ( ( mIsAutoFill as u8 as u8 ) << 0usize ) & ( 0x1 as u8 ) ) | ( ( mIsSubgrid as u8 as u8 ) << 1usize ) & ( 0x2 as u8 ) ) } } # [ repr ( C ) ] pub struct nsStylePosition { pub mObjectPosition : root :: mozilla :: Position , pub mOffset : root :: nsStyleSides , pub mWidth : root :: nsStyleCoord , pub mMinWidth : root :: nsStyleCoord , pub mMaxWidth : root :: nsStyleCoord , pub mHeight : root :: nsStyleCoord , pub mMinHeight : root :: nsStyleCoord , pub mMaxHeight : root :: nsStyleCoord , pub mFlexBasis : root :: nsStyleCoord , pub mGridAutoColumnsMin : root :: nsStyleCoord , pub mGridAutoColumnsMax : root :: nsStyleCoord , pub mGridAutoRowsMin : root :: nsStyleCoord , pub mGridAutoRowsMax : root :: nsStyleCoord , pub mGridAutoFlow : u8 , pub mBoxSizing : root :: mozilla :: StyleBoxSizing , pub mAlignContent : u16 , pub mAlignItems : u8 , pub mAlignSelf : u8 , pub mJustifyContent : u16 , pub mSpecifiedJustifyItems : u8 , pub mJustifyItems : u8 , pub mJustifySelf : u8 , pub mFlexDirection : u8 , pub mFlexWrap : u8 , pub mObjectFit : u8 , pub mOrder : i32 , pub mFlexGrow : f32 , pub mFlexShrink : f32 , pub mZIndex : root :: nsStyleCoord , pub mGridTemplateColumns : root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > , pub mGridTemplateRows : root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > , pub mGridTemplateAreas : root :: RefPtr < root :: mozilla :: css :: GridTemplateAreasValue > , pub mGridColumnStart : root :: nsStyleGridLine , pub mGridColumnEnd : root :: nsStyleGridLine , pub mGridRowStart : root :: nsStyleGridLine , pub mGridRowEnd : root :: nsStyleGridLine , pub mGridColumnGap : root :: nsStyleCoord , pub mGridRowGap : root :: nsStyleCoord , } pub const nsStylePosition_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStylePosition ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStylePosition > ( ) , 440usize , concat ! ( "Size of: " , stringify ! ( nsStylePosition ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStylePosition > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStylePosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mObjectPosition as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mObjectPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mOffset as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mOffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mWidth as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mMinWidth as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mMinWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mMaxWidth as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mMaxWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mHeight as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mHeight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mMinHeight as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mMinHeight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mMaxHeight as * const _ as usize } , 144usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mMaxHeight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mFlexBasis as * const _ as usize } , 160usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mFlexBasis ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridAutoColumnsMin as * const _ as usize } , 176usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridAutoColumnsMin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridAutoColumnsMax as * const _ as usize } , 192usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridAutoColumnsMax ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridAutoRowsMin as * const _ as usize } , 208usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridAutoRowsMin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridAutoRowsMax as * const _ as usize } , 224usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridAutoRowsMax ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridAutoFlow as * const _ as usize } , 240usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridAutoFlow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mBoxSizing as * const _ as usize } , 241usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mBoxSizing ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mAlignContent as * const _ as usize } , 242usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mAlignContent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mAlignItems as * const _ as usize } , 244usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mAlignItems ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mAlignSelf as * const _ as usize } , 245usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mAlignSelf ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mJustifyContent as * const _ as usize } , 246usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mJustifyContent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mSpecifiedJustifyItems as * const _ as usize } , 248usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mSpecifiedJustifyItems ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mJustifyItems as * const _ as usize } , 249usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mJustifyItems ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mJustifySelf as * const _ as usize } , 250usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mJustifySelf ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mFlexDirection as * const _ as usize } , 251usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mFlexDirection ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mFlexWrap as * const _ as usize } , 252usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mFlexWrap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mObjectFit as * const _ as usize } , 253usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mObjectFit ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mOrder as * const _ as usize } , 256usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mOrder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mFlexGrow as * const _ as usize } , 260usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mFlexGrow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mFlexShrink as * const _ as usize } , 264usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mFlexShrink ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mZIndex as * const _ as usize } , 272usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mZIndex ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridTemplateColumns as * const _ as usize } , 288usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridTemplateColumns ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridTemplateRows as * const _ as usize } , 296usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridTemplateRows ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridTemplateAreas as * const _ as usize } , 304usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridTemplateAreas ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridColumnStart as * const _ as usize } , 312usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridColumnStart ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridColumnEnd as * const _ as usize } , 336usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridColumnEnd ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridRowStart as * const _ as usize } , 360usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridRowStart ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridRowEnd as * const _ as usize } , 384usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridRowEnd ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridColumnGap as * const _ as usize } , 408usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridColumnGap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStylePosition ) ) . mGridRowGap as * const _ as usize } , 424usize , concat ! ( "Alignment of field: " , stringify ! ( nsStylePosition ) , "::" , stringify ! ( mGridRowGap ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleTextOverflowSide { pub mString : ::nsstring::nsStringRepr , pub mType : u8 , } # [ test ] fn bindgen_test_layout_nsStyleTextOverflowSide ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleTextOverflowSide > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStyleTextOverflowSide ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleTextOverflowSide > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleTextOverflowSide ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextOverflowSide ) ) . mString as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextOverflowSide ) , "::" , stringify ! ( mString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextOverflowSide ) ) . mType as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextOverflowSide ) , "::" , stringify ! ( mType ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleTextOverflow { pub mLeft : root :: nsStyleTextOverflowSide , pub mRight : root :: nsStyleTextOverflowSide , pub mLogicalDirections : bool , } # [ test ] fn bindgen_test_layout_nsStyleTextOverflow ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleTextOverflow > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( nsStyleTextOverflow ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleTextOverflow > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleTextOverflow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextOverflow ) ) . mLeft as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextOverflow ) , "::" , stringify ! ( mLeft ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextOverflow ) ) . mRight as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextOverflow ) , "::" , stringify ! ( mRight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextOverflow ) ) . mLogicalDirections as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextOverflow ) , "::" , stringify ! ( mLogicalDirections ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleTextReset { pub mTextOverflow : root :: nsStyleTextOverflow , pub mTextDecorationLine : u8 , pub mTextDecorationStyle : u8 , pub mUnicodeBidi : u8 , pub mInitialLetterSink : root :: nscoord , pub mInitialLetterSize : f32 , pub mTextDecorationColor : root :: mozilla :: StyleComplexColor , } pub const nsStyleTextReset_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleTextReset ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleTextReset > ( ) , 80usize , concat ! ( "Size of: " , stringify ! ( nsStyleTextReset ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleTextReset > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleTextReset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mTextOverflow as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mTextOverflow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mTextDecorationLine as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mTextDecorationLine ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mTextDecorationStyle as * const _ as usize } , 57usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mTextDecorationStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mUnicodeBidi as * const _ as usize } , 58usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mUnicodeBidi ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mInitialLetterSink as * const _ as usize } , 60usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mInitialLetterSink ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mInitialLetterSize as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mInitialLetterSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTextReset ) ) . mTextDecorationColor as * const _ as usize } , 68usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTextReset ) , "::" , stringify ! ( mTextDecorationColor ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleText { pub mTextAlign : u8 , pub mTextAlignLast : u8 , pub _bitfield_1 : u8 , pub mTextJustify : root :: mozilla :: StyleTextJustify , pub mTextTransform : u8 , pub mWhiteSpace : root :: mozilla :: StyleWhiteSpace , pub mWordBreak : u8 , pub mOverflowWrap : u8 , pub mHyphens : root :: mozilla :: StyleHyphens , pub mRubyAlign : u8 , pub mRubyPosition : u8 , pub mTextSizeAdjust : u8 , pub mTextCombineUpright : u8 , pub mControlCharacterVisibility : u8 , pub mTextEmphasisPosition : u8 , pub mTextEmphasisStyle : u8 , pub mTextRendering : u8 , pub mTextEmphasisColor : root :: mozilla :: StyleComplexColor , pub mWebkitTextFillColor : root :: mozilla :: StyleComplexColor , pub mWebkitTextStrokeColor : root :: mozilla :: StyleComplexColor , pub mTabSize : root :: nsStyleCoord , pub mWordSpacing : root :: nsStyleCoord , pub mLetterSpacing : root :: nsStyleCoord , pub mLineHeight : root :: nsStyleCoord , pub mTextIndent : root :: nsStyleCoord , pub mWebkitTextStrokeWidth : root :: nscoord , pub mTextShadow : root :: RefPtr < root :: nsCSSShadowArray > , pub mTextEmphasisStyleString : ::nsstring::nsStringRepr , } pub const nsStyleText_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleText ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleText > ( ) , 160usize , concat ! ( "Size of: " , stringify ! ( nsStyleText ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleText > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleText ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextAlign as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextAlign ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextAlignLast as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextAlignLast ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextJustify as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextJustify ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextTransform as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextTransform ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mWhiteSpace as * const _ as usize } , 5usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mWhiteSpace ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mWordBreak as * const _ as usize } , 6usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mWordBreak ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mOverflowWrap as * const _ as usize } , 7usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mOverflowWrap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mHyphens as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mHyphens ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mRubyAlign as * const _ as usize } , 9usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mRubyAlign ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mRubyPosition as * const _ as usize } , 10usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mRubyPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextSizeAdjust as * const _ as usize } , 11usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextSizeAdjust ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextCombineUpright as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextCombineUpright ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mControlCharacterVisibility as * const _ as usize } , 13usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mControlCharacterVisibility ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextEmphasisPosition as * const _ as usize } , 14usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextEmphasisPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextEmphasisStyle as * const _ as usize } , 15usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextEmphasisStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextRendering as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextRendering ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextEmphasisColor as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextEmphasisColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mWebkitTextFillColor as * const _ as usize } , 28usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mWebkitTextFillColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mWebkitTextStrokeColor as * const _ as usize } , 36usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mWebkitTextStrokeColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTabSize as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTabSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mWordSpacing as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mWordSpacing ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mLetterSpacing as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mLetterSpacing ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mLineHeight as * const _ as usize } , 96usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mLineHeight ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextIndent as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextIndent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mWebkitTextStrokeWidth as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mWebkitTextStrokeWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextShadow as * const _ as usize } , 136usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextShadow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleText ) ) . mTextEmphasisStyleString as * const _ as usize } , 144usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleText ) , "::" , stringify ! ( mTextEmphasisStyleString ) ) ) ; } impl nsStyleText { # [ inline ] pub fn mTextAlignTrue ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x1 as u8 ; let val = ( unit_field_val & mask ) >> 0usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mTextAlignTrue ( & mut self , val : bool ) { let mask = 0x1 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 0usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn mTextAlignLastTrue ( & self ) -> bool { let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; let mask = 0x2 as u8 ; let val = ( unit_field_val & mask ) >> 1usize ; unsafe { :: std :: mem :: transmute ( val as u8 ) } } # [ inline ] pub fn set_mTextAlignLastTrue ( & mut self , val : bool ) { let mask = 0x2 as u8 ; let val = val as u8 as u8 ; let mut unit_field_val : u8 = unsafe { :: std :: mem :: uninitialized ( ) } ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & self . _bitfield_1 as * const _ as * const u8 , & mut unit_field_val as * mut u8 as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) } ; unit_field_val &= ! mask ; unit_field_val |= ( val << 1usize ) & mask ; unsafe { :: std :: ptr :: copy_nonoverlapping ( & unit_field_val as * const _ as * const u8 , & mut self . _bitfield_1 as * mut _ as * mut u8 , :: std :: mem :: size_of :: < u8 > ( ) , ) ; } } # [ inline ] pub fn new_bitfield_1 ( mTextAlignTrue : bool , mTextAlignLastTrue : bool ) -> u8 { ( ( 0 | ( ( mTextAlignTrue as u8 as u8 ) << 0usize ) & ( 0x1 as u8 ) ) | ( ( mTextAlignLastTrue as u8 as u8 ) << 1usize ) & ( 0x2 as u8 ) ) } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleImageOrientation { pub mOrientation : u8 , } pub const nsStyleImageOrientation_Bits_ORIENTATION_MASK : root :: nsStyleImageOrientation_Bits = 3 ; pub const nsStyleImageOrientation_Bits_FLIP_MASK : root :: nsStyleImageOrientation_Bits = 4 ; pub const nsStyleImageOrientation_Bits_FROM_IMAGE_MASK : root :: nsStyleImageOrientation_Bits = 8 ; pub type nsStyleImageOrientation_Bits = :: std :: os :: raw :: c_uint ; # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleImageOrientation_Angles { ANGLE_0 = 0 , ANGLE_90 = 1 , ANGLE_180 = 2 , ANGLE_270 = 3 , } # [ test ] fn bindgen_test_layout_nsStyleImageOrientation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleImageOrientation > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( nsStyleImageOrientation ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleImageOrientation > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( nsStyleImageOrientation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleImageOrientation ) ) . mOrientation as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleImageOrientation ) , "::" , stringify ! ( mOrientation ) ) ) ; } impl Clone for nsStyleImageOrientation { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleVisibility { pub mImageOrientation : root :: nsStyleImageOrientation , pub mDirection : u8 , pub mVisible : u8 , pub mImageRendering : u8 , pub mWritingMode : u8 , pub mTextOrientation : u8 , pub mColorAdjust : u8 , } pub const nsStyleVisibility_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleVisibility ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleVisibility > ( ) , 7usize , concat ! ( "Size of: " , stringify ! ( nsStyleVisibility ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleVisibility > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( nsStyleVisibility ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mImageOrientation as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mImageOrientation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mDirection as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mDirection ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mVisible as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mVisible ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mImageRendering as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mImageRendering ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mWritingMode as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mWritingMode ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mTextOrientation as * const _ as usize } , 5usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mTextOrientation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVisibility ) ) . mColorAdjust as * const _ as usize } , 6usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVisibility ) , "::" , stringify ! ( mColorAdjust ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsTimingFunction { pub mType : root :: nsTimingFunction_Type , pub __bindgen_anon_1 : root :: nsTimingFunction__bindgen_ty_1 , } # [ repr ( i32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsTimingFunction_Type { Ease = 0 , Linear = 1 , EaseIn = 2 , EaseOut = 3 , EaseInOut = 4 , StepStart = 5 , StepEnd = 6 , CubicBezier = 7 , Frames = 8 , } pub const nsTimingFunction_Keyword_Implicit : root :: nsTimingFunction_Keyword = 0 ; pub const nsTimingFunction_Keyword_Explicit : root :: nsTimingFunction_Keyword = 1 ; pub type nsTimingFunction_Keyword = :: std :: os :: raw :: c_int ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsTimingFunction__bindgen_ty_1 { pub mFunc : root :: __BindgenUnionField < root :: nsTimingFunction__bindgen_ty_1__bindgen_ty_1 > , pub __bindgen_anon_1 : root :: __BindgenUnionField < root :: nsTimingFunction__bindgen_ty_1__bindgen_ty_2 > , pub bindgen_union_field : [ u32 ; 4usize ] , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsTimingFunction__bindgen_ty_1__bindgen_ty_1 { pub mX1 : f32 , pub mY1 : f32 , pub mX2 : f32 , pub mY2 : f32 , } # [ test ] fn bindgen_test_layout_nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsTimingFunction__bindgen_ty_1__bindgen_ty_1 > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsTimingFunction__bindgen_ty_1__bindgen_ty_1 > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) ) . mX1 as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mX1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) ) . mY1 as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mY1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) ) . mX2 as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mX2 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) ) . mY2 as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_1 ) , "::" , stringify ! ( mY2 ) ) ) ; } impl Clone for nsTimingFunction__bindgen_ty_1__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsTimingFunction__bindgen_ty_1__bindgen_ty_2 { pub mStepsOrFrames : u32 , } # [ test ] fn bindgen_test_layout_nsTimingFunction__bindgen_ty_1__bindgen_ty_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsTimingFunction__bindgen_ty_1__bindgen_ty_2 > ( ) , 4usize , concat ! ( "Size of: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_2 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsTimingFunction__bindgen_ty_1__bindgen_ty_2 > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_2 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction__bindgen_ty_1__bindgen_ty_2 ) ) . mStepsOrFrames as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction__bindgen_ty_1__bindgen_ty_2 ) , "::" , stringify ! ( mStepsOrFrames ) ) ) ; } impl Clone for nsTimingFunction__bindgen_ty_1__bindgen_ty_2 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsTimingFunction__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsTimingFunction__bindgen_ty_1 > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsTimingFunction__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsTimingFunction__bindgen_ty_1 > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsTimingFunction__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction__bindgen_ty_1 ) ) . mFunc as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction__bindgen_ty_1 ) , "::" , stringify ! ( mFunc ) ) ) ; } impl Clone for nsTimingFunction__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsTimingFunction ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsTimingFunction > ( ) , 20usize , concat ! ( "Size of: " , stringify ! ( nsTimingFunction ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsTimingFunction > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsTimingFunction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsTimingFunction ) ) . mType as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsTimingFunction ) , "::" , stringify ! ( mType ) ) ) ; } impl Clone for nsTimingFunction { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleDisplay { pub mBinding : root :: RefPtr < root :: mozilla :: css :: URLValue > , pub mDisplay : root :: mozilla :: StyleDisplay , pub mOriginalDisplay : root :: mozilla :: StyleDisplay , pub mContain : u8 , pub mAppearance : u8 , pub mPosition : u8 , pub mFloat : root :: mozilla :: StyleFloat , pub mOriginalFloat : root :: mozilla :: StyleFloat , pub mBreakType : root :: mozilla :: StyleClear , pub mBreakInside : u8 , pub mBreakBefore : bool , pub mBreakAfter : bool , pub mOverflowX : u8 , pub mOverflowY : u8 , pub mOverflowClipBox : u8 , pub mResize : u8 , pub mOrient : root :: mozilla :: StyleOrient , pub mIsolation : u8 , pub mTopLayer : u8 , pub mWillChangeBitField : u8 , pub mWillChange : root :: nsTArray < root :: RefPtr < root :: nsAtom > > , pub mTouchAction : u8 , pub mScrollBehavior : u8 , pub mOverscrollBehaviorX : root :: mozilla :: StyleOverscrollBehavior , pub mOverscrollBehaviorY : root :: mozilla :: StyleOverscrollBehavior , pub mScrollSnapTypeX : u8 , pub mScrollSnapTypeY : u8 , pub mScrollSnapPointsX : root :: nsStyleCoord , pub mScrollSnapPointsY : root :: nsStyleCoord , pub mScrollSnapDestination : root :: mozilla :: Position , pub mScrollSnapCoordinate : root :: nsTArray < root :: mozilla :: Position > , pub mBackfaceVisibility : u8 , pub mTransformStyle : u8 , pub mTransformBox : root :: nsStyleDisplay_StyleGeometryBox , pub mSpecifiedTransform : root :: RefPtr < root :: nsCSSValueSharedList > , pub mTransformOrigin : [ root :: nsStyleCoord ; 3usize ] , pub mChildPerspective : root :: nsStyleCoord , pub mPerspectiveOrigin : [ root :: nsStyleCoord ; 2usize ] , pub mVerticalAlign : root :: nsStyleCoord , pub mTransitions : root :: nsStyleAutoArray < root :: mozilla :: StyleTransition > , pub mTransitionTimingFunctionCount : u32 , pub mTransitionDurationCount : u32 , pub mTransitionDelayCount : u32 , pub mTransitionPropertyCount : u32 , pub mAnimations : root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > , pub mAnimationTimingFunctionCount : u32 , pub mAnimationDurationCount : u32 , pub mAnimationDelayCount : u32 , pub mAnimationNameCount : u32 , pub mAnimationDirectionCount : u32 , pub mAnimationFillModeCount : u32 , pub mAnimationPlayStateCount : u32 , pub mAnimationIterationCountCount : u32 , pub mShapeImageThreshold : f32 , pub mShapeOutside : root :: mozilla :: StyleShapeSource , } pub use self :: super :: root :: mozilla :: StyleGeometryBox as nsStyleDisplay_StyleGeometryBox ; pub const nsStyleDisplay_kHasFinishStyle : bool = true ; # [ test ] fn bindgen_test_layout_nsStyleDisplay ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleDisplay > ( ) , 424usize , concat ! ( "Size of: " , stringify ! ( nsStyleDisplay ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleDisplay > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleDisplay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mBinding as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mBinding ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mDisplay as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mDisplay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOriginalDisplay as * const _ as usize } , 9usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOriginalDisplay ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mContain as * const _ as usize } , 10usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mContain ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAppearance as * const _ as usize } , 11usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAppearance ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mPosition as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mPosition ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mFloat as * const _ as usize } , 13usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mFloat ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOriginalFloat as * const _ as usize } , 14usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOriginalFloat ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mBreakType as * const _ as usize } , 15usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mBreakType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mBreakInside as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mBreakInside ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mBreakBefore as * const _ as usize } , 17usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mBreakBefore ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mBreakAfter as * const _ as usize } , 18usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mBreakAfter ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOverflowX as * const _ as usize } , 19usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOverflowX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOverflowY as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOverflowY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOverflowClipBox as * const _ as usize } , 21usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOverflowClipBox ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mResize as * const _ as usize } , 22usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mResize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOrient as * const _ as usize } , 23usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOrient ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mIsolation as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mIsolation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTopLayer as * const _ as usize } , 25usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTopLayer ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mWillChangeBitField as * const _ as usize } , 26usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mWillChangeBitField ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mWillChange as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mWillChange ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTouchAction as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTouchAction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollBehavior as * const _ as usize } , 41usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollBehavior ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOverscrollBehaviorX as * const _ as usize } , 42usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOverscrollBehaviorX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mOverscrollBehaviorY as * const _ as usize } , 43usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mOverscrollBehaviorY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollSnapTypeX as * const _ as usize } , 44usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollSnapTypeX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollSnapTypeY as * const _ as usize } , 45usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollSnapTypeY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollSnapPointsX as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollSnapPointsX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollSnapPointsY as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollSnapPointsY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollSnapDestination as * const _ as usize } , 80usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollSnapDestination ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mScrollSnapCoordinate as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mScrollSnapCoordinate ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mBackfaceVisibility as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mBackfaceVisibility ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransformStyle as * const _ as usize } , 113usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransformStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransformBox as * const _ as usize } , 114usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransformBox ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mSpecifiedTransform as * const _ as usize } , 120usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mSpecifiedTransform ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransformOrigin as * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransformOrigin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mChildPerspective as * const _ as usize } , 176usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mChildPerspective ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mPerspectiveOrigin as * const _ as usize } , 192usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mPerspectiveOrigin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mVerticalAlign as * const _ as usize } , 224usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mVerticalAlign ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransitions as * const _ as usize } , 240usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransitions ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransitionTimingFunctionCount as * const _ as usize } , 288usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransitionTimingFunctionCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransitionDurationCount as * const _ as usize } , 292usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransitionDurationCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransitionDelayCount as * const _ as usize } , 296usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransitionDelayCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mTransitionPropertyCount as * const _ as usize } , 300usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mTransitionPropertyCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimations as * const _ as usize } , 304usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimations ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationTimingFunctionCount as * const _ as usize } , 360usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationTimingFunctionCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationDurationCount as * const _ as usize } , 364usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationDurationCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationDelayCount as * const _ as usize } , 368usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationDelayCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationNameCount as * const _ as usize } , 372usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationNameCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationDirectionCount as * const _ as usize } , 376usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationDirectionCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationFillModeCount as * const _ as usize } , 380usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationFillModeCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationPlayStateCount as * const _ as usize } , 384usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationPlayStateCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mAnimationIterationCountCount as * const _ as usize } , 388usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mAnimationIterationCountCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mShapeImageThreshold as * const _ as usize } , 392usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mShapeImageThreshold ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleDisplay ) ) . mShapeOutside as * const _ as usize } , 400usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleDisplay ) , "::" , stringify ! ( mShapeOutside ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleTable { pub mLayoutStrategy : u8 , pub mSpan : i32 , } pub const nsStyleTable_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleTable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleTable > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsStyleTable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleTable > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTable ) ) . mLayoutStrategy as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTable ) , "::" , stringify ! ( mLayoutStrategy ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTable ) ) . mSpan as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTable ) , "::" , stringify ! ( mSpan ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleTableBorder { pub mBorderSpacingCol : root :: nscoord , pub mBorderSpacingRow : root :: nscoord , pub mBorderCollapse : u8 , pub mCaptionSide : u8 , pub mEmptyCells : u8 , } pub const nsStyleTableBorder_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleTableBorder ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleTableBorder > ( ) , 12usize , concat ! ( "Size of: " , stringify ! ( nsStyleTableBorder ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleTableBorder > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleTableBorder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTableBorder ) ) . mBorderSpacingCol as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTableBorder ) , "::" , stringify ! ( mBorderSpacingCol ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTableBorder ) ) . mBorderSpacingRow as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTableBorder ) , "::" , stringify ! ( mBorderSpacingRow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTableBorder ) ) . mBorderCollapse as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTableBorder ) , "::" , stringify ! ( mBorderCollapse ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTableBorder ) ) . mCaptionSide as * const _ as usize } , 9usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTableBorder ) , "::" , stringify ! ( mCaptionSide ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleTableBorder ) ) . mEmptyCells as * const _ as usize } , 10usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleTableBorder ) , "::" , stringify ! ( mEmptyCells ) ) ) ; } # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleContentType { eStyleContentType_String = 1 , eStyleContentType_Image = 10 , eStyleContentType_Attr = 20 , eStyleContentType_Counter = 30 , eStyleContentType_Counters = 31 , eStyleContentType_OpenQuote = 40 , eStyleContentType_CloseQuote = 41 , eStyleContentType_NoOpenQuote = 42 , eStyleContentType_NoCloseQuote = 43 , eStyleContentType_AltContent = 50 , eStyleContentType_Uninitialized = 51 , } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleContentData { pub mType : root :: nsStyleContentType , pub mContent : root :: nsStyleContentData__bindgen_ty_1 , } # [ repr ( C ) ] pub struct nsStyleContentData_CounterFunction { pub mIdent : ::nsstring::nsStringRepr , pub mSeparator : ::nsstring::nsStringRepr , pub mCounterStyle : root :: mozilla :: CounterStylePtr , pub mRefCnt : root :: mozilla :: ThreadSafeAutoRefCnt , } pub type nsStyleContentData_CounterFunction_HasThreadSafeRefCnt = root :: mozilla :: TrueType ; # [ test ] fn bindgen_test_layout_nsStyleContentData_CounterFunction ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleContentData_CounterFunction > ( ) , 48usize , concat ! ( "Size of: " , stringify ! ( nsStyleContentData_CounterFunction ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleContentData_CounterFunction > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleContentData_CounterFunction ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData_CounterFunction ) ) . mIdent as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData_CounterFunction ) , "::" , stringify ! ( mIdent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData_CounterFunction ) ) . mSeparator as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData_CounterFunction ) , "::" , stringify ! ( mSeparator ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData_CounterFunction ) ) . mCounterStyle as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData_CounterFunction ) , "::" , stringify ! ( mCounterStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData_CounterFunction ) ) . mRefCnt as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData_CounterFunction ) , "::" , stringify ! ( mRefCnt ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleContentData__bindgen_ty_1 { pub mString : root :: __BindgenUnionField < * mut u16 > , pub mImage : root :: __BindgenUnionField < * mut root :: nsStyleImageRequest > , pub mCounters : root :: __BindgenUnionField < * mut root :: nsStyleContentData_CounterFunction > , pub bindgen_union_field : u64 , } # [ test ] fn bindgen_test_layout_nsStyleContentData__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleContentData__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsStyleContentData__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleContentData__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleContentData__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData__bindgen_ty_1 ) ) . mString as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData__bindgen_ty_1 ) , "::" , stringify ! ( mString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData__bindgen_ty_1 ) ) . mImage as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData__bindgen_ty_1 ) , "::" , stringify ! ( mImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData__bindgen_ty_1 ) ) . mCounters as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData__bindgen_ty_1 ) , "::" , stringify ! ( mCounters ) ) ) ; } impl Clone for nsStyleContentData__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsStyleContentData ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleContentData > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsStyleContentData ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleContentData > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleContentData ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData ) ) . mType as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContentData ) ) . mContent as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContentData ) , "::" , stringify ! ( mContent ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleCounterData { pub mCounter : ::nsstring::nsStringRepr , pub mValue : i32 , } # [ test ] fn bindgen_test_layout_nsStyleCounterData ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleCounterData > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStyleCounterData ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleCounterData > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleCounterData ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleCounterData ) ) . mCounter as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleCounterData ) , "::" , stringify ! ( mCounter ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleCounterData ) ) . mValue as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleCounterData ) , "::" , stringify ! ( mValue ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleContent { pub mContents : root :: nsTArray < root :: nsStyleContentData > , pub mIncrements : root :: nsTArray < root :: nsStyleCounterData > , pub mResets : root :: nsTArray < root :: nsStyleCounterData > , } pub const nsStyleContent_kHasFinishStyle : bool = true ; # [ test ] fn bindgen_test_layout_nsStyleContent ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleContent > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStyleContent ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleContent > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleContent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContent ) ) . mContents as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContent ) , "::" , stringify ! ( mContents ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContent ) ) . mIncrements as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContent ) , "::" , stringify ! ( mIncrements ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContent ) ) . mResets as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContent ) , "::" , stringify ! ( mResets ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleUIReset { pub mUserSelect : root :: mozilla :: StyleUserSelect , pub mForceBrokenImageIcon : u8 , pub mIMEMode : u8 , pub mWindowDragging : root :: mozilla :: StyleWindowDragging , pub mWindowShadow : u8 , pub mWindowOpacity : f32 , pub mSpecifiedWindowTransform : root :: RefPtr < root :: nsCSSValueSharedList > , pub mWindowTransformOrigin : [ root :: nsStyleCoord ; 2usize ] , } pub const nsStyleUIReset_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleUIReset ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleUIReset > ( ) , 56usize , concat ! ( "Size of: " , stringify ! ( nsStyleUIReset ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleUIReset > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleUIReset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mUserSelect as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mUserSelect ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mForceBrokenImageIcon as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mForceBrokenImageIcon ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mIMEMode as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mIMEMode ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mWindowDragging as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mWindowDragging ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mWindowShadow as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mWindowShadow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mWindowOpacity as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mWindowOpacity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mSpecifiedWindowTransform as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mSpecifiedWindowTransform ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUIReset ) ) . mWindowTransformOrigin as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUIReset ) , "::" , stringify ! ( mWindowTransformOrigin ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCursorImage { pub mHaveHotspot : bool , pub mHotspotX : f32 , pub mHotspotY : f32 , pub mImage : root :: RefPtr < root :: nsStyleImageRequest > , } # [ test ] fn bindgen_test_layout_nsCursorImage ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCursorImage > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsCursorImage ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCursorImage > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCursorImage ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCursorImage ) ) . mHaveHotspot as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsCursorImage ) , "::" , stringify ! ( mHaveHotspot ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCursorImage ) ) . mHotspotX as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsCursorImage ) , "::" , stringify ! ( mHotspotX ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCursorImage ) ) . mHotspotY as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsCursorImage ) , "::" , stringify ! ( mHotspotY ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCursorImage ) ) . mImage as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsCursorImage ) , "::" , stringify ! ( mImage ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleUserInterface { pub mUserInput : root :: mozilla :: StyleUserInput , pub mUserModify : root :: mozilla :: StyleUserModify , pub mUserFocus : root :: mozilla :: StyleUserFocus , pub mPointerEvents : u8 , pub mCursor : u8 , pub mCursorImages : root :: nsTArray < root :: nsCursorImage > , pub mCaretColor : root :: mozilla :: StyleComplexColor , } pub const nsStyleUserInterface_kHasFinishStyle : bool = true ; # [ test ] fn bindgen_test_layout_nsStyleUserInterface ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleUserInterface > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsStyleUserInterface ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleUserInterface > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleUserInterface ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mUserInput as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mUserInput ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mUserModify as * const _ as usize } , 1usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mUserModify ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mUserFocus as * const _ as usize } , 2usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mUserFocus ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mPointerEvents as * const _ as usize } , 3usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mPointerEvents ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mCursor as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mCursor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mCursorImages as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mCursorImages ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleUserInterface ) ) . mCaretColor as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleUserInterface ) , "::" , stringify ! ( mCaretColor ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleXUL { pub mBoxFlex : f32 , pub mBoxOrdinal : u32 , pub mBoxAlign : root :: mozilla :: StyleBoxAlign , pub mBoxDirection : root :: mozilla :: StyleBoxDirection , pub mBoxOrient : root :: mozilla :: StyleBoxOrient , pub mBoxPack : root :: mozilla :: StyleBoxPack , pub mStackSizing : root :: mozilla :: StyleStackSizing , } pub const nsStyleXUL_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleXUL ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleXUL > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsStyleXUL ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleXUL > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( nsStyleXUL ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mBoxFlex as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxFlex ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mBoxOrdinal as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxOrdinal ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mBoxAlign as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxAlign ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mBoxDirection as * const _ as usize } , 9usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxDirection ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mBoxOrient as * const _ as usize } , 10usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxOrient ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mBoxPack as * const _ as usize } , 11usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxPack ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleXUL ) ) . mStackSizing as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mStackSizing ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleColumn { pub mColumnCount : u32 , pub mColumnWidth : root :: nsStyleCoord , pub mColumnGap : root :: nsStyleCoord , pub mColumnRuleColor : root :: mozilla :: StyleComplexColor , pub mColumnRuleStyle : u8 , pub mColumnFill : u8 , pub mColumnSpan : u8 , pub mColumnRuleWidth : root :: nscoord , pub mTwipsPerPixel : root :: nscoord , } pub const nsStyleColumn_kHasFinishStyle : bool = false ; pub const nsStyleColumn_kMaxColumnCount : u32 = 1000 ; # [ test ] fn bindgen_test_layout_nsStyleColumn ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleColumn > ( ) , 64usize , concat ! ( "Size of: " , stringify ! ( nsStyleColumn ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleColumn > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleColumn ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnCount as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnWidth as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnGap as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnGap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnRuleColor as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnRuleColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnRuleStyle as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnRuleStyle ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnFill as * const _ as usize } , 49usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnFill ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnSpan as * const _ as usize } , 50usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnSpan ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mColumnRuleWidth as * const _ as usize } , 52usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mColumnRuleWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleColumn ) ) . mTwipsPerPixel as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleColumn ) , "::" , stringify ! ( mTwipsPerPixel ) ) ) ; } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleSVGPaintType { eStyleSVGPaintType_None = 1 , eStyleSVGPaintType_Color = 2 , eStyleSVGPaintType_Server = 3 , eStyleSVGPaintType_ContextFill = 4 , eStyleSVGPaintType_ContextStroke = 5 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleSVGFallbackType { eStyleSVGFallbackType_NotSet = 0 , eStyleSVGFallbackType_None = 1 , eStyleSVGFallbackType_Color = 2 , } # [ repr ( u8 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsStyleSVGOpacitySource { eStyleSVGOpacitySource_Normal = 0 , eStyleSVGOpacitySource_ContextFillOpacity = 1 , eStyleSVGOpacitySource_ContextStrokeOpacity = 2 , } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleSVGPaint { pub mPaint : root :: nsStyleSVGPaint__bindgen_ty_1 , pub mType : root :: nsStyleSVGPaintType , pub mFallbackType : root :: nsStyleSVGFallbackType , pub mFallbackColor : root :: nscolor , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleSVGPaint__bindgen_ty_1 { pub mColor : root :: __BindgenUnionField < root :: nscolor > , pub mPaintServer : root :: __BindgenUnionField < * mut root :: mozilla :: css :: URLValue > , pub bindgen_union_field : u64 , } # [ test ] fn bindgen_test_layout_nsStyleSVGPaint__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleSVGPaint__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsStyleSVGPaint__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleSVGPaint__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleSVGPaint__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGPaint__bindgen_ty_1 ) ) . mColor as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGPaint__bindgen_ty_1 ) , "::" , stringify ! ( mColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGPaint__bindgen_ty_1 ) ) . mPaintServer as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGPaint__bindgen_ty_1 ) , "::" , stringify ! ( mPaintServer ) ) ) ; } impl Clone for nsStyleSVGPaint__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsStyleSVGPaint ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleSVGPaint > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsStyleSVGPaint ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleSVGPaint > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleSVGPaint ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGPaint ) ) . mPaint as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGPaint ) , "::" , stringify ! ( mPaint ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGPaint ) ) . mType as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGPaint ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGPaint ) ) . mFallbackType as * const _ as usize } , 9usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGPaint ) , "::" , stringify ! ( mFallbackType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGPaint ) ) . mFallbackColor as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGPaint ) , "::" , stringify ! ( mFallbackColor ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleSVG { pub mFill : root :: nsStyleSVGPaint , pub mStroke : root :: nsStyleSVGPaint , pub mMarkerEnd : root :: RefPtr < root :: mozilla :: css :: URLValue > , pub mMarkerMid : root :: RefPtr < root :: mozilla :: css :: URLValue > , pub mMarkerStart : root :: RefPtr < root :: mozilla :: css :: URLValue > , pub mStrokeDasharray : root :: nsTArray < root :: nsStyleCoord > , pub mContextProps : root :: nsTArray < root :: RefPtr < root :: nsAtom > > , pub mStrokeDashoffset : root :: nsStyleCoord , pub mStrokeWidth : root :: nsStyleCoord , pub mFillOpacity : f32 , pub mStrokeMiterlimit : f32 , pub mStrokeOpacity : f32 , pub mClipRule : root :: mozilla :: StyleFillRule , pub mColorInterpolation : u8 , pub mColorInterpolationFilters : u8 , pub mFillRule : root :: mozilla :: StyleFillRule , pub mPaintOrder : u8 , pub mShapeRendering : u8 , pub mStrokeLinecap : u8 , pub mStrokeLinejoin : u8 , pub mTextAnchor : u8 , pub mContextPropsBits : u8 , pub mContextFlags : u8 , } pub const nsStyleSVG_kHasFinishStyle : bool = false ; pub const nsStyleSVG_FILL_OPACITY_SOURCE_MASK : u8 = 3 ; pub const nsStyleSVG_STROKE_OPACITY_SOURCE_MASK : u8 = 12 ; pub const nsStyleSVG_STROKE_DASHARRAY_CONTEXT : u8 = 16 ; pub const nsStyleSVG_STROKE_DASHOFFSET_CONTEXT : u8 = 32 ; pub const nsStyleSVG_STROKE_WIDTH_CONTEXT : u8 = 64 ; pub const nsStyleSVG_FILL_OPACITY_SOURCE_SHIFT : u8 = 0 ; pub const nsStyleSVG_STROKE_OPACITY_SOURCE_SHIFT : u8 = 2 ; # [ test ] fn bindgen_test_layout_nsStyleSVG ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleSVG > ( ) , 128usize , concat ! ( "Size of: " , stringify ! ( nsStyleSVG ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleSVG > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleSVG ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mFill as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mFill ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStroke as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStroke ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mMarkerEnd as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mMarkerEnd ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mMarkerMid as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mMarkerMid ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mMarkerStart as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mMarkerStart ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeDasharray as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeDasharray ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mContextProps as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mContextProps ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeDashoffset as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeDashoffset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeWidth as * const _ as usize } , 88usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeWidth ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mFillOpacity as * const _ as usize } , 104usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mFillOpacity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeMiterlimit as * const _ as usize } , 108usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeMiterlimit ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeOpacity as * const _ as usize } , 112usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeOpacity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mClipRule as * const _ as usize } , 116usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mClipRule ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mColorInterpolation as * const _ as usize } , 117usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mColorInterpolation ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mColorInterpolationFilters as * const _ as usize } , 118usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mColorInterpolationFilters ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mFillRule as * const _ as usize } , 119usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mFillRule ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mPaintOrder as * const _ as usize } , 120usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mPaintOrder ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mShapeRendering as * const _ as usize } , 121usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mShapeRendering ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeLinecap as * const _ as usize } , 122usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeLinecap ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mStrokeLinejoin as * const _ as usize } , 123usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mStrokeLinejoin ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mTextAnchor as * const _ as usize } , 124usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mTextAnchor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mContextPropsBits as * const _ as usize } , 125usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mContextPropsBits ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVG ) ) . mContextFlags as * const _ as usize } , 126usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVG ) , "::" , stringify ! ( mContextFlags ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleFilter { pub mType : u32 , pub mFilterParameter : root :: nsStyleCoord , pub __bindgen_anon_1 : root :: nsStyleFilter__bindgen_ty_1 , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsStyleFilter__bindgen_ty_1 { pub mURL : root :: __BindgenUnionField < * mut root :: mozilla :: css :: URLValue > , pub mDropShadow : root :: __BindgenUnionField < * mut root :: nsCSSShadowArray > , pub bindgen_union_field : u64 , } # [ test ] fn bindgen_test_layout_nsStyleFilter__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleFilter__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsStyleFilter__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleFilter__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleFilter__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFilter__bindgen_ty_1 ) ) . mURL as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFilter__bindgen_ty_1 ) , "::" , stringify ! ( mURL ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFilter__bindgen_ty_1 ) ) . mDropShadow as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFilter__bindgen_ty_1 ) , "::" , stringify ! ( mDropShadow ) ) ) ; } impl Clone for nsStyleFilter__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } pub const nsStyleFilter_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleFilter ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleFilter > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsStyleFilter ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleFilter > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleFilter ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFilter ) ) . mType as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFilter ) , "::" , stringify ! ( mType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleFilter ) ) . mFilterParameter as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleFilter ) , "::" , stringify ! ( mFilterParameter ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleSVGReset { pub mMask : root :: nsStyleImageLayers , pub mClipPath : root :: mozilla :: StyleShapeSource , pub mStopColor : root :: nscolor , pub mFloodColor : root :: nscolor , pub mLightingColor : root :: nscolor , pub mStopOpacity : f32 , pub mFloodOpacity : f32 , pub mDominantBaseline : u8 , pub mVectorEffect : u8 , pub mMaskType : u8 , } pub const nsStyleSVGReset_kHasFinishStyle : bool = true ; # [ test ] fn bindgen_test_layout_nsStyleSVGReset ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleSVGReset > ( ) , 200usize , concat ! ( "Size of: " , stringify ! ( nsStyleSVGReset ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleSVGReset > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleSVGReset ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mMask as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mMask ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mClipPath as * const _ as usize } , 152usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mClipPath ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mStopColor as * const _ as usize } , 176usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mStopColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mFloodColor as * const _ as usize } , 180usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mFloodColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mLightingColor as * const _ as usize } , 184usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mLightingColor ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mStopOpacity as * const _ as usize } , 188usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mStopOpacity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mFloodOpacity as * const _ as usize } , 192usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mFloodOpacity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mDominantBaseline as * const _ as usize } , 196usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mDominantBaseline ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mVectorEffect as * const _ as usize } , 197usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mVectorEffect ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleSVGReset ) ) . mMaskType as * const _ as usize } , 198usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleSVGReset ) , "::" , stringify ! ( mMaskType ) ) ) ; } # [ repr ( C ) ] pub struct nsStyleVariables { pub mVariables : root :: mozilla :: CSSVariableValues , } pub const nsStyleVariables_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleVariables ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleVariables > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsStyleVariables ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleVariables > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleVariables ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleVariables ) ) . mVariables as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleVariables ) , "::" , stringify ! ( mVariables ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleEffects { pub mFilters : root :: nsTArray < root :: nsStyleFilter > , pub mBoxShadow : root :: RefPtr < root :: nsCSSShadowArray > , pub mClip : root :: nsRect , pub mOpacity : f32 , pub mClipFlags : u8 , pub mMixBlendMode : u8 , } pub const nsStyleEffects_kHasFinishStyle : bool = false ; # [ test ] fn bindgen_test_layout_nsStyleEffects ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleEffects > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsStyleEffects ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleEffects > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleEffects ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleEffects ) ) . mFilters as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleEffects ) , "::" , stringify ! ( mFilters ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleEffects ) ) . mBoxShadow as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleEffects ) , "::" , stringify ! ( mBoxShadow ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleEffects ) ) . mClip as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleEffects ) , "::" , stringify ! ( mClip ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleEffects ) ) . mOpacity as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleEffects ) , "::" , stringify ! ( mOpacity ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleEffects ) ) . mClipFlags as * const _ as usize } , 36usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleEffects ) , "::" , stringify ! ( mClipFlags ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleEffects ) ) . mMixBlendMode as * const _ as usize } , 37usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleEffects ) , "::" , stringify ! ( mMixBlendMode ) ) ) ; } 
  /// These *_Simple types are used to map Gecko types to layout-equivalent but
     /// simpler Rust types, to aid Rust binding generation.
     ///
@@ -1567,7 +1570,7 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
  # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCOMArray { pub mBuffer : root :: nsTArray < * mut root :: nsISupports > , } pub const ThemeWidgetType_NS_THEME_NONE : root :: ThemeWidgetType = 0 ; pub const ThemeWidgetType_NS_THEME_BUTTON : root :: ThemeWidgetType = 1 ; pub const ThemeWidgetType_NS_THEME_RADIO : root :: ThemeWidgetType = 2 ; pub const ThemeWidgetType_NS_THEME_CHECKBOX : root :: ThemeWidgetType = 3 ; pub const ThemeWidgetType_NS_THEME_BUTTON_BEVEL : root :: ThemeWidgetType = 4 ; pub const ThemeWidgetType_NS_THEME_FOCUS_OUTLINE : root :: ThemeWidgetType = 5 ; pub const ThemeWidgetType_NS_THEME_TOOLBOX : root :: ThemeWidgetType = 6 ; pub const ThemeWidgetType_NS_THEME_TOOLBAR : root :: ThemeWidgetType = 7 ; pub const ThemeWidgetType_NS_THEME_TOOLBARBUTTON : root :: ThemeWidgetType = 8 ; pub const ThemeWidgetType_NS_THEME_DUALBUTTON : root :: ThemeWidgetType = 9 ; pub const ThemeWidgetType_NS_THEME_TOOLBARBUTTON_DROPDOWN : root :: ThemeWidgetType = 10 ; pub const ThemeWidgetType_NS_THEME_BUTTON_ARROW_UP : root :: ThemeWidgetType = 11 ; pub const ThemeWidgetType_NS_THEME_BUTTON_ARROW_DOWN : root :: ThemeWidgetType = 12 ; pub const ThemeWidgetType_NS_THEME_BUTTON_ARROW_NEXT : root :: ThemeWidgetType = 13 ; pub const ThemeWidgetType_NS_THEME_BUTTON_ARROW_PREVIOUS : root :: ThemeWidgetType = 14 ; pub const ThemeWidgetType_NS_THEME_SEPARATOR : root :: ThemeWidgetType = 15 ; pub const ThemeWidgetType_NS_THEME_TOOLBARGRIPPER : root :: ThemeWidgetType = 16 ; pub const ThemeWidgetType_NS_THEME_SPLITTER : root :: ThemeWidgetType = 17 ; pub const ThemeWidgetType_NS_THEME_STATUSBAR : root :: ThemeWidgetType = 18 ; pub const ThemeWidgetType_NS_THEME_STATUSBARPANEL : root :: ThemeWidgetType = 19 ; pub const ThemeWidgetType_NS_THEME_RESIZERPANEL : root :: ThemeWidgetType = 20 ; pub const ThemeWidgetType_NS_THEME_RESIZER : root :: ThemeWidgetType = 21 ; pub const ThemeWidgetType_NS_THEME_LISTBOX : root :: ThemeWidgetType = 22 ; pub const ThemeWidgetType_NS_THEME_LISTITEM : root :: ThemeWidgetType = 23 ; pub const ThemeWidgetType_NS_THEME_TREEVIEW : root :: ThemeWidgetType = 24 ; pub const ThemeWidgetType_NS_THEME_TREEITEM : root :: ThemeWidgetType = 25 ; pub const ThemeWidgetType_NS_THEME_TREETWISTY : root :: ThemeWidgetType = 26 ; pub const ThemeWidgetType_NS_THEME_TREELINE : root :: ThemeWidgetType = 27 ; pub const ThemeWidgetType_NS_THEME_TREEHEADER : root :: ThemeWidgetType = 28 ; pub const ThemeWidgetType_NS_THEME_TREEHEADERCELL : root :: ThemeWidgetType = 29 ; pub const ThemeWidgetType_NS_THEME_TREEHEADERSORTARROW : root :: ThemeWidgetType = 30 ; pub const ThemeWidgetType_NS_THEME_TREETWISTYOPEN : root :: ThemeWidgetType = 31 ; pub const ThemeWidgetType_NS_THEME_PROGRESSBAR : root :: ThemeWidgetType = 32 ; pub const ThemeWidgetType_NS_THEME_PROGRESSCHUNK : root :: ThemeWidgetType = 33 ; pub const ThemeWidgetType_NS_THEME_PROGRESSBAR_VERTICAL : root :: ThemeWidgetType = 34 ; pub const ThemeWidgetType_NS_THEME_PROGRESSCHUNK_VERTICAL : root :: ThemeWidgetType = 35 ; pub const ThemeWidgetType_NS_THEME_METERBAR : root :: ThemeWidgetType = 36 ; pub const ThemeWidgetType_NS_THEME_METERCHUNK : root :: ThemeWidgetType = 37 ; pub const ThemeWidgetType_NS_THEME_TAB : root :: ThemeWidgetType = 38 ; pub const ThemeWidgetType_NS_THEME_TABPANEL : root :: ThemeWidgetType = 39 ; pub const ThemeWidgetType_NS_THEME_TABPANELS : root :: ThemeWidgetType = 40 ; pub const ThemeWidgetType_NS_THEME_TAB_SCROLL_ARROW_BACK : root :: ThemeWidgetType = 41 ; pub const ThemeWidgetType_NS_THEME_TAB_SCROLL_ARROW_FORWARD : root :: ThemeWidgetType = 42 ; pub const ThemeWidgetType_NS_THEME_TOOLTIP : root :: ThemeWidgetType = 43 ; pub const ThemeWidgetType_NS_THEME_INNER_SPIN_BUTTON : root :: ThemeWidgetType = 44 ; pub const ThemeWidgetType_NS_THEME_SPINNER : root :: ThemeWidgetType = 45 ; pub const ThemeWidgetType_NS_THEME_SPINNER_UPBUTTON : root :: ThemeWidgetType = 46 ; pub const ThemeWidgetType_NS_THEME_SPINNER_DOWNBUTTON : root :: ThemeWidgetType = 47 ; pub const ThemeWidgetType_NS_THEME_SPINNER_TEXTFIELD : root :: ThemeWidgetType = 48 ; pub const ThemeWidgetType_NS_THEME_NUMBER_INPUT : root :: ThemeWidgetType = 49 ; pub const ThemeWidgetType_NS_THEME_SCROLLBAR : root :: ThemeWidgetType = 50 ; pub const ThemeWidgetType_NS_THEME_SCROLLBAR_SMALL : root :: ThemeWidgetType = 51 ; pub const ThemeWidgetType_NS_THEME_SCROLLBAR_HORIZONTAL : root :: ThemeWidgetType = 52 ; pub const ThemeWidgetType_NS_THEME_SCROLLBAR_VERTICAL : root :: ThemeWidgetType = 53 ; pub const ThemeWidgetType_NS_THEME_SCROLLBARBUTTON_UP : root :: ThemeWidgetType = 54 ; pub const ThemeWidgetType_NS_THEME_SCROLLBARBUTTON_DOWN : root :: ThemeWidgetType = 55 ; pub const ThemeWidgetType_NS_THEME_SCROLLBARBUTTON_LEFT : root :: ThemeWidgetType = 56 ; pub const ThemeWidgetType_NS_THEME_SCROLLBARBUTTON_RIGHT : root :: ThemeWidgetType = 57 ; pub const ThemeWidgetType_NS_THEME_SCROLLBARTRACK_HORIZONTAL : root :: ThemeWidgetType = 58 ; pub const ThemeWidgetType_NS_THEME_SCROLLBARTRACK_VERTICAL : root :: ThemeWidgetType = 59 ; pub const ThemeWidgetType_NS_THEME_SCROLLBARTHUMB_HORIZONTAL : root :: ThemeWidgetType = 60 ; pub const ThemeWidgetType_NS_THEME_SCROLLBARTHUMB_VERTICAL : root :: ThemeWidgetType = 61 ; pub const ThemeWidgetType_NS_THEME_SCROLLBAR_NON_DISAPPEARING : root :: ThemeWidgetType = 62 ; pub const ThemeWidgetType_NS_THEME_TEXTFIELD : root :: ThemeWidgetType = 63 ; pub const ThemeWidgetType_NS_THEME_CARET : root :: ThemeWidgetType = 64 ; pub const ThemeWidgetType_NS_THEME_TEXTFIELD_MULTILINE : root :: ThemeWidgetType = 65 ; pub const ThemeWidgetType_NS_THEME_SEARCHFIELD : root :: ThemeWidgetType = 66 ; pub const ThemeWidgetType_NS_THEME_MENULIST : root :: ThemeWidgetType = 67 ; pub const ThemeWidgetType_NS_THEME_MENULIST_BUTTON : root :: ThemeWidgetType = 68 ; pub const ThemeWidgetType_NS_THEME_MENULIST_TEXT : root :: ThemeWidgetType = 69 ; pub const ThemeWidgetType_NS_THEME_MENULIST_TEXTFIELD : root :: ThemeWidgetType = 70 ; pub const ThemeWidgetType_NS_THEME_SCALE_HORIZONTAL : root :: ThemeWidgetType = 71 ; pub const ThemeWidgetType_NS_THEME_SCALE_VERTICAL : root :: ThemeWidgetType = 72 ; pub const ThemeWidgetType_NS_THEME_SCALETHUMB_HORIZONTAL : root :: ThemeWidgetType = 73 ; pub const ThemeWidgetType_NS_THEME_SCALETHUMB_VERTICAL : root :: ThemeWidgetType = 74 ; pub const ThemeWidgetType_NS_THEME_SCALETHUMBSTART : root :: ThemeWidgetType = 75 ; pub const ThemeWidgetType_NS_THEME_SCALETHUMBEND : root :: ThemeWidgetType = 76 ; pub const ThemeWidgetType_NS_THEME_SCALETHUMBTICK : root :: ThemeWidgetType = 77 ; pub const ThemeWidgetType_NS_THEME_RANGE : root :: ThemeWidgetType = 78 ; pub const ThemeWidgetType_NS_THEME_RANGE_THUMB : root :: ThemeWidgetType = 79 ; pub const ThemeWidgetType_NS_THEME_GROUPBOX : root :: ThemeWidgetType = 80 ; pub const ThemeWidgetType_NS_THEME_CHECKBOX_CONTAINER : root :: ThemeWidgetType = 81 ; pub const ThemeWidgetType_NS_THEME_RADIO_CONTAINER : root :: ThemeWidgetType = 82 ; pub const ThemeWidgetType_NS_THEME_CHECKBOX_LABEL : root :: ThemeWidgetType = 83 ; pub const ThemeWidgetType_NS_THEME_RADIO_LABEL : root :: ThemeWidgetType = 84 ; pub const ThemeWidgetType_NS_THEME_BUTTON_FOCUS : root :: ThemeWidgetType = 85 ; pub const ThemeWidgetType_NS_THEME_WINDOW : root :: ThemeWidgetType = 86 ; pub const ThemeWidgetType_NS_THEME_DIALOG : root :: ThemeWidgetType = 87 ; pub const ThemeWidgetType_NS_THEME_MENUBAR : root :: ThemeWidgetType = 88 ; pub const ThemeWidgetType_NS_THEME_MENUPOPUP : root :: ThemeWidgetType = 89 ; pub const ThemeWidgetType_NS_THEME_MENUITEM : root :: ThemeWidgetType = 90 ; pub const ThemeWidgetType_NS_THEME_CHECKMENUITEM : root :: ThemeWidgetType = 91 ; pub const ThemeWidgetType_NS_THEME_RADIOMENUITEM : root :: ThemeWidgetType = 92 ; pub const ThemeWidgetType_NS_THEME_MENUCHECKBOX : root :: ThemeWidgetType = 93 ; pub const ThemeWidgetType_NS_THEME_MENURADIO : root :: ThemeWidgetType = 94 ; pub const ThemeWidgetType_NS_THEME_MENUSEPARATOR : root :: ThemeWidgetType = 95 ; pub const ThemeWidgetType_NS_THEME_MENUARROW : root :: ThemeWidgetType = 96 ; pub const ThemeWidgetType_NS_THEME_MENUIMAGE : root :: ThemeWidgetType = 97 ; pub const ThemeWidgetType_NS_THEME_MENUITEMTEXT : root :: ThemeWidgetType = 98 ; pub const ThemeWidgetType_NS_THEME_WIN_COMMUNICATIONS_TOOLBOX : root :: ThemeWidgetType = 99 ; pub const ThemeWidgetType_NS_THEME_WIN_MEDIA_TOOLBOX : root :: ThemeWidgetType = 100 ; pub const ThemeWidgetType_NS_THEME_WIN_BROWSERTABBAR_TOOLBOX : root :: ThemeWidgetType = 101 ; pub const ThemeWidgetType_NS_THEME_MAC_FULLSCREEN_BUTTON : root :: ThemeWidgetType = 102 ; pub const ThemeWidgetType_NS_THEME_MAC_HELP_BUTTON : root :: ThemeWidgetType = 103 ; pub const ThemeWidgetType_NS_THEME_WIN_BORDERLESS_GLASS : root :: ThemeWidgetType = 104 ; pub const ThemeWidgetType_NS_THEME_WIN_GLASS : root :: ThemeWidgetType = 105 ; pub const ThemeWidgetType_NS_THEME_WINDOW_TITLEBAR : root :: ThemeWidgetType = 106 ; pub const ThemeWidgetType_NS_THEME_WINDOW_TITLEBAR_MAXIMIZED : root :: ThemeWidgetType = 107 ; pub const ThemeWidgetType_NS_THEME_WINDOW_FRAME_LEFT : root :: ThemeWidgetType = 108 ; pub const ThemeWidgetType_NS_THEME_WINDOW_FRAME_RIGHT : root :: ThemeWidgetType = 109 ; pub const ThemeWidgetType_NS_THEME_WINDOW_FRAME_BOTTOM : root :: ThemeWidgetType = 110 ; pub const ThemeWidgetType_NS_THEME_WINDOW_BUTTON_CLOSE : root :: ThemeWidgetType = 111 ; pub const ThemeWidgetType_NS_THEME_WINDOW_BUTTON_MINIMIZE : root :: ThemeWidgetType = 112 ; pub const ThemeWidgetType_NS_THEME_WINDOW_BUTTON_MAXIMIZE : root :: ThemeWidgetType = 113 ; pub const ThemeWidgetType_NS_THEME_WINDOW_BUTTON_RESTORE : root :: ThemeWidgetType = 114 ; pub const ThemeWidgetType_NS_THEME_WINDOW_BUTTON_BOX : root :: ThemeWidgetType = 115 ; pub const ThemeWidgetType_NS_THEME_WINDOW_BUTTON_BOX_MAXIMIZED : root :: ThemeWidgetType = 116 ; pub const ThemeWidgetType_NS_THEME_WIN_EXCLUDE_GLASS : root :: ThemeWidgetType = 117 ; pub const ThemeWidgetType_NS_THEME_MAC_VIBRANCY_LIGHT : root :: ThemeWidgetType = 118 ; pub const ThemeWidgetType_NS_THEME_MAC_VIBRANCY_DARK : root :: ThemeWidgetType = 119 ; pub const ThemeWidgetType_NS_THEME_MAC_VIBRANT_TITLEBAR_LIGHT : root :: ThemeWidgetType = 120 ; pub const ThemeWidgetType_NS_THEME_MAC_VIBRANT_TITLEBAR_DARK : root :: ThemeWidgetType = 121 ; pub const ThemeWidgetType_NS_THEME_MAC_DISCLOSURE_BUTTON_OPEN : root :: ThemeWidgetType = 122 ; pub const ThemeWidgetType_NS_THEME_MAC_DISCLOSURE_BUTTON_CLOSED : root :: ThemeWidgetType = 123 ; pub const ThemeWidgetType_NS_THEME_GTK_INFO_BAR : root :: ThemeWidgetType = 124 ; pub const ThemeWidgetType_NS_THEME_MAC_SOURCE_LIST : root :: ThemeWidgetType = 125 ; pub const ThemeWidgetType_NS_THEME_MAC_SOURCE_LIST_SELECTION : root :: ThemeWidgetType = 126 ; pub const ThemeWidgetType_NS_THEME_MAC_ACTIVE_SOURCE_LIST_SELECTION : root :: ThemeWidgetType = 127 ; pub const ThemeWidgetType_ThemeWidgetType_COUNT : root :: ThemeWidgetType = 128 ; pub type ThemeWidgetType = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIConsoleReportCollector { _unused : [ u8 ; 0 ] } 
  /// Utility class to provide scaling defined in a keySplines element. 
  # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsSMILKeySpline { pub mX1 : f64 , pub mY1 : f64 , pub mX2 : f64 , pub mY2 : f64 , pub mSampleValues : [ f64 ; 11usize ] , } pub const nsSMILKeySpline_kSplineTableSize : root :: nsSMILKeySpline__bindgen_ty_1 = 11 ; pub type nsSMILKeySpline__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; extern "C" {
- # [ link_name = "\u{1}_ZN15nsSMILKeySpline15kSampleStepSizeE" ] 
+ # [ link_name = "\u{1}__ZN15nsSMILKeySpline15kSampleStepSizeE" ] 
  pub static mut  nsSMILKeySpline_kSampleStepSize  :  f64 ;
 } # [ test ] fn bindgen_test_layout_nsSMILKeySpline ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsSMILKeySpline > ( ) , 120usize , concat ! ( "Size of: " , stringify ! ( nsSMILKeySpline ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsSMILKeySpline > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsSMILKeySpline ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsSMILKeySpline ) ) . mX1 as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsSMILKeySpline ) , "::" , stringify ! ( mX1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsSMILKeySpline ) ) . mY1 as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsSMILKeySpline ) , "::" , stringify ! ( mY1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsSMILKeySpline ) ) . mX2 as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsSMILKeySpline ) , "::" , stringify ! ( mX2 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsSMILKeySpline ) ) . mY2 as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsSMILKeySpline ) , "::" , stringify ! ( mY2 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsSMILKeySpline ) ) . mSampleValues as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsSMILKeySpline ) , "::" , stringify ! ( mSampleValues ) ) ) ; } impl Clone for nsSMILKeySpline { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAttrName { pub mBits : usize , } # [ test ] fn bindgen_test_layout_nsAttrName ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsAttrName > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsAttrName ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsAttrName > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsAttrName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAttrName ) ) . mBits as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsAttrName ) , "::" , stringify ! ( mBits ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAttrValue { pub mBits : usize , } pub const nsAttrValue_ValueType_eString : root :: nsAttrValue_ValueType = 0 ; pub const nsAttrValue_ValueType_eAtom : root :: nsAttrValue_ValueType = 2 ; pub const nsAttrValue_ValueType_eInteger : root :: nsAttrValue_ValueType = 3 ; pub const nsAttrValue_ValueType_eColor : root :: nsAttrValue_ValueType = 7 ; pub const nsAttrValue_ValueType_eEnum : root :: nsAttrValue_ValueType = 11 ; pub const nsAttrValue_ValueType_ePercent : root :: nsAttrValue_ValueType = 15 ; pub const nsAttrValue_ValueType_eCSSDeclaration : root :: nsAttrValue_ValueType = 16 ; pub const nsAttrValue_ValueType_eURL : root :: nsAttrValue_ValueType = 17 ; pub const nsAttrValue_ValueType_eImage : root :: nsAttrValue_ValueType = 18 ; pub const nsAttrValue_ValueType_eAtomArray : root :: nsAttrValue_ValueType = 19 ; pub const nsAttrValue_ValueType_eDoubleValue : root :: nsAttrValue_ValueType = 20 ; pub const nsAttrValue_ValueType_eIntMarginValue : root :: nsAttrValue_ValueType = 21 ; pub const nsAttrValue_ValueType_eSVGAngle : root :: nsAttrValue_ValueType = 22 ; pub const nsAttrValue_ValueType_eSVGTypesBegin : root :: nsAttrValue_ValueType = 22 ; pub const nsAttrValue_ValueType_eSVGIntegerPair : root :: nsAttrValue_ValueType = 23 ; pub const nsAttrValue_ValueType_eSVGLength : root :: nsAttrValue_ValueType = 24 ; pub const nsAttrValue_ValueType_eSVGLengthList : root :: nsAttrValue_ValueType = 25 ; pub const nsAttrValue_ValueType_eSVGNumberList : root :: nsAttrValue_ValueType = 26 ; pub const nsAttrValue_ValueType_eSVGNumberPair : root :: nsAttrValue_ValueType = 27 ; pub const nsAttrValue_ValueType_eSVGPathData : root :: nsAttrValue_ValueType = 28 ; pub const nsAttrValue_ValueType_eSVGPointList : root :: nsAttrValue_ValueType = 29 ; pub const nsAttrValue_ValueType_eSVGPreserveAspectRatio : root :: nsAttrValue_ValueType = 30 ; pub const nsAttrValue_ValueType_eSVGStringList : root :: nsAttrValue_ValueType = 31 ; pub const nsAttrValue_ValueType_eSVGTransformList : root :: nsAttrValue_ValueType = 32 ; pub const nsAttrValue_ValueType_eSVGViewBox : root :: nsAttrValue_ValueType = 33 ; pub const nsAttrValue_ValueType_eSVGTypesEnd : root :: nsAttrValue_ValueType = 33 ; pub type nsAttrValue_ValueType = :: std :: os :: raw :: c_uint ; 
  /// Structure for a mapping from int (enum) values to strings.  When you use
@@ -1583,12 +1586,12 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
  pub tag : * const :: std :: os :: raw :: c_char , 
  /// The enum value that maps to this string 
  pub value : i16 , } # [ test ] fn bindgen_test_layout_nsAttrValue_EnumTable ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsAttrValue_EnumTable > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsAttrValue_EnumTable ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsAttrValue_EnumTable > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsAttrValue_EnumTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAttrValue_EnumTable ) ) . tag as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsAttrValue_EnumTable ) , "::" , stringify ! ( tag ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAttrValue_EnumTable ) ) . value as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsAttrValue_EnumTable ) , "::" , stringify ! ( value ) ) ) ; } impl Clone for nsAttrValue_EnumTable { fn clone ( & self ) -> Self { * self } } pub const nsAttrValue_ValueBaseType_eStringBase : root :: nsAttrValue_ValueBaseType = 0 ; pub const nsAttrValue_ValueBaseType_eOtherBase : root :: nsAttrValue_ValueBaseType = 1 ; pub const nsAttrValue_ValueBaseType_eAtomBase : root :: nsAttrValue_ValueBaseType = 2 ; pub const nsAttrValue_ValueBaseType_eIntegerBase : root :: nsAttrValue_ValueBaseType = 3 ; pub type nsAttrValue_ValueBaseType = :: std :: os :: raw :: c_uint ; extern "C" {
- # [ link_name = "\u{1}_ZN11nsAttrValue15sEnumTableArrayE" ] 
+ # [ link_name = "\u{1}__ZN11nsAttrValue15sEnumTableArrayE" ] 
  pub static mut  nsAttrValue_sEnumTableArray  :  * mut root :: nsTArray < * const root :: nsAttrValue_EnumTable > ;
 } # [ test ] fn bindgen_test_layout_nsAttrValue ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsAttrValue > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsAttrValue ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsAttrValue > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsAttrValue ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAttrValue ) ) . mBits as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsAttrValue ) , "::" , stringify ! ( mBits ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsMappedAttributes { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAttrAndChildArray { pub mImpl : * mut root :: nsAttrAndChildArray_Impl , } pub type nsAttrAndChildArray_BorrowedAttrInfo = root :: mozilla :: dom :: BorrowedAttrInfo ; # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAttrAndChildArray_InternalAttr { pub mName : root :: nsAttrName , pub mValue : root :: nsAttrValue , } # [ test ] fn bindgen_test_layout_nsAttrAndChildArray_InternalAttr ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsAttrAndChildArray_InternalAttr > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsAttrAndChildArray_InternalAttr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsAttrAndChildArray_InternalAttr > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsAttrAndChildArray_InternalAttr ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAttrAndChildArray_InternalAttr ) ) . mName as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsAttrAndChildArray_InternalAttr ) , "::" , stringify ! ( mName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAttrAndChildArray_InternalAttr ) ) . mValue as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsAttrAndChildArray_InternalAttr ) , "::" , stringify ! ( mValue ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsAttrAndChildArray_Impl { pub mAttrAndChildCount : u32 , pub mBufferSize : u32 , pub mMappedAttrs : * mut root :: nsMappedAttributes , pub mBuffer : [ * mut :: std :: os :: raw :: c_void ; 1usize ] , } # [ test ] fn bindgen_test_layout_nsAttrAndChildArray_Impl ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsAttrAndChildArray_Impl > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsAttrAndChildArray_Impl ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsAttrAndChildArray_Impl > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsAttrAndChildArray_Impl ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAttrAndChildArray_Impl ) ) . mAttrAndChildCount as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsAttrAndChildArray_Impl ) , "::" , stringify ! ( mAttrAndChildCount ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAttrAndChildArray_Impl ) ) . mBufferSize as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( nsAttrAndChildArray_Impl ) , "::" , stringify ! ( mBufferSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAttrAndChildArray_Impl ) ) . mMappedAttrs as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsAttrAndChildArray_Impl ) , "::" , stringify ! ( mMappedAttrs ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAttrAndChildArray_Impl ) ) . mBuffer as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsAttrAndChildArray_Impl ) , "::" , stringify ! ( mBuffer ) ) ) ; } impl Clone for nsAttrAndChildArray_Impl { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsAttrAndChildArray ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsAttrAndChildArray > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsAttrAndChildArray ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsAttrAndChildArray > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsAttrAndChildArray ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAttrAndChildArray ) ) . mImpl as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsAttrAndChildArray ) , "::" , stringify ! ( mImpl ) ) ) ; } 
  /// An internal interface 
  # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIHTMLCollection { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIHTMLCollection_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIHTMLCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIHTMLCollection > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIHTMLCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIHTMLCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIHTMLCollection ) ) ) ; } impl Clone for nsIHTMLCollection { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsXBLDocumentInfo { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIStyleRuleProcessor { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIStyleRuleProcessor_COMTypeInfo { pub _address : u8 , } pub type nsIStyleRuleProcessor_EnumFunc = :: std :: option :: Option < unsafe extern "C" fn ( arg1 : * mut root :: nsIStyleRuleProcessor , arg2 : * mut :: std :: os :: raw :: c_void ) -> bool > ; # [ test ] fn bindgen_test_layout_nsIStyleRuleProcessor ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIStyleRuleProcessor > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIStyleRuleProcessor ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIStyleRuleProcessor > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIStyleRuleProcessor ) ) ) ; } impl Clone for nsIStyleRuleProcessor { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsXBLPrototypeBinding { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsAnonymousContentList { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] pub struct nsXBLBinding { pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mMarkedForDeath : bool , pub mUsingContentXBLScope : bool , pub mIsShadowRootBinding : bool , pub mPrototypeBinding : * mut root :: nsXBLPrototypeBinding , pub mContent : root :: nsCOMPtr , pub mNextBinding : root :: RefPtr < root :: nsXBLBinding > , pub mBoundElement : * mut root :: nsIContent , pub mDefaultInsertionPoint : root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > , pub mInsertionPoints : root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > , pub mAnonymousContentList : root :: RefPtr < root :: nsAnonymousContentList > , } pub type nsXBLBinding_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsXBLBinding_cycleCollection { pub _base : root :: nsCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_nsXBLBinding_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsXBLBinding_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsXBLBinding_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsXBLBinding_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsXBLBinding_cycleCollection ) ) ) ; } impl Clone for nsXBLBinding_cycleCollection { fn clone ( & self ) -> Self { * self } } extern "C" {
- # [ link_name = "\u{1}_ZN12nsXBLBinding21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN12nsXBLBinding21_cycleCollectorGlobalE" ] 
  pub static mut  nsXBLBinding__cycleCollectorGlobal  :  root :: nsXBLBinding_cycleCollection ;
 } # [ test ] fn bindgen_test_layout_nsXBLBinding ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsXBLBinding > ( ) , 72usize , concat ! ( "Size of: " , stringify ! ( nsXBLBinding ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsXBLBinding > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsXBLBinding ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsXBLBinding ) ) . mRefCnt as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsXBLBinding ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsXBLBinding ) ) . mMarkedForDeath as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsXBLBinding ) , "::" , stringify ! ( mMarkedForDeath ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsXBLBinding ) ) . mUsingContentXBLScope as * const _ as usize } , 9usize , concat ! ( "Alignment of field: " , stringify ! ( nsXBLBinding ) , "::" , stringify ! ( mUsingContentXBLScope ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsXBLBinding ) ) . mIsShadowRootBinding as * const _ as usize } , 10usize , concat ! ( "Alignment of field: " , stringify ! ( nsXBLBinding ) , "::" , stringify ! ( mIsShadowRootBinding ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsXBLBinding ) ) . mPrototypeBinding as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsXBLBinding ) , "::" , stringify ! ( mPrototypeBinding ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsXBLBinding ) ) . mContent as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsXBLBinding ) , "::" , stringify ! ( mContent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsXBLBinding ) ) . mNextBinding as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsXBLBinding ) , "::" , stringify ! ( mNextBinding ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsXBLBinding ) ) . mBoundElement as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsXBLBinding ) , "::" , stringify ! ( mBoundElement ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsXBLBinding ) ) . mDefaultInsertionPoint as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsXBLBinding ) , "::" , stringify ! ( mDefaultInsertionPoint ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsXBLBinding ) ) . mInsertionPoints as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsXBLBinding ) , "::" , stringify ! ( mInsertionPoints ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsXBLBinding ) ) . mAnonymousContentList as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsXBLBinding ) , "::" , stringify ! ( mAnonymousContentList ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsLabelsNodeList { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsDOMTokenList { _unused : [ u8 ; 0 ] } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsDOMStringMap { _unused : [ u8 ; 0 ] } 
  /// A class that implements nsIWeakReference 
@@ -1616,19 +1619,19 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
  # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsAttrHashKey { pub _base : root :: PLDHashEntryHdr , pub mKey : root :: nsAttrKey , } pub type nsAttrHashKey_KeyType = * const root :: nsAttrKey ; pub type nsAttrHashKey_KeyTypePointer = * const root :: nsAttrKey ; pub const nsAttrHashKey_ALLOW_MEMMOVE : root :: nsAttrHashKey__bindgen_ty_1 = 1 ; pub type nsAttrHashKey__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_nsAttrHashKey ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsAttrHashKey > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( nsAttrHashKey ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsAttrHashKey > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsAttrHashKey ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsAttrHashKey ) ) . mKey as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsAttrHashKey ) , "::" , stringify ! ( mKey ) ) ) ; } # [ repr ( C ) ] pub struct nsDOMAttributeMap { pub _base : root :: nsIDOMMozNamedAttrMap , pub _base_1 : root :: nsWrapperCache , pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mContent : root :: nsCOMPtr , 
  /// Cache of Attrs. 
  pub mAttributeCache : root :: nsDOMAttributeMap_AttrCache , } pub type nsDOMAttributeMap_Attr = root :: mozilla :: dom :: Attr ; pub type nsDOMAttributeMap_Element = root :: mozilla :: dom :: Element ; pub type nsDOMAttributeMap_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsDOMAttributeMap_cycleCollection { pub _base : root :: nsXPCOMCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_nsDOMAttributeMap_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsDOMAttributeMap_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsDOMAttributeMap_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsDOMAttributeMap_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsDOMAttributeMap_cycleCollection ) ) ) ; } impl Clone for nsDOMAttributeMap_cycleCollection { fn clone ( & self ) -> Self { * self } } pub type nsDOMAttributeMap_AttrCache = [ u64 ; 4usize ] ; extern "C" {
- # [ link_name = "\u{1}_ZN17nsDOMAttributeMap21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN17nsDOMAttributeMap21_cycleCollectorGlobalE" ] 
  pub static mut  nsDOMAttributeMap__cycleCollectorGlobal  :  root :: nsDOMAttributeMap_cycleCollection ;
 } # [ test ] fn bindgen_test_layout_nsDOMAttributeMap ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsDOMAttributeMap > ( ) , 80usize , concat ! ( "Size of: " , stringify ! ( nsDOMAttributeMap ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsDOMAttributeMap > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsDOMAttributeMap ) ) ) ; } # [ repr ( C ) ] pub struct nsISMILAttr__bindgen_vtable ( :: std :: os :: raw :: c_void ) ; 
  /// 
- # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsISMILAttr { pub vtable_ : * const nsISMILAttr__bindgen_vtable , } # [ test ] fn bindgen_test_layout_nsISMILAttr ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsISMILAttr > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsISMILAttr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsISMILAttr > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsISMILAttr ) ) ) ; } pub const ELEMENT_SHARED_RESTYLE_BIT_1 : root :: _bindgen_ty_86 = 8388608 ; pub const ELEMENT_SHARED_RESTYLE_BIT_2 : root :: _bindgen_ty_86 = 16777216 ; pub const ELEMENT_SHARED_RESTYLE_BIT_3 : root :: _bindgen_ty_86 = 33554432 ; pub const ELEMENT_SHARED_RESTYLE_BIT_4 : root :: _bindgen_ty_86 = 67108864 ; pub const ELEMENT_SHARED_RESTYLE_BITS : root :: _bindgen_ty_86 = 125829120 ; pub const ELEMENT_HAS_DIRTY_DESCENDANTS_FOR_SERVO : root :: _bindgen_ty_86 = 8388608 ; pub const ELEMENT_HAS_ANIMATION_ONLY_DIRTY_DESCENDANTS_FOR_SERVO : root :: _bindgen_ty_86 = 16777216 ; pub const ELEMENT_HAS_SNAPSHOT : root :: _bindgen_ty_86 = 33554432 ; pub const ELEMENT_HANDLED_SNAPSHOT : root :: _bindgen_ty_86 = 67108864 ; pub const ELEMENT_HAS_PENDING_RESTYLE : root :: _bindgen_ty_86 = 8388608 ; pub const ELEMENT_IS_POTENTIAL_RESTYLE_ROOT : root :: _bindgen_ty_86 = 16777216 ; pub const ELEMENT_HAS_PENDING_ANIMATION_ONLY_RESTYLE : root :: _bindgen_ty_86 = 33554432 ; pub const ELEMENT_IS_POTENTIAL_ANIMATION_ONLY_RESTYLE_ROOT : root :: _bindgen_ty_86 = 67108864 ; pub const ELEMENT_IS_CONDITIONAL_RESTYLE_ANCESTOR : root :: _bindgen_ty_86 = 134217728 ; pub const ELEMENT_HAS_CHILD_WITH_LATER_SIBLINGS_HINT : root :: _bindgen_ty_86 = 268435456 ; pub const ELEMENT_PENDING_RESTYLE_FLAGS : root :: _bindgen_ty_86 = 41943040 ; pub const ELEMENT_POTENTIAL_RESTYLE_ROOT_FLAGS : root :: _bindgen_ty_86 = 83886080 ; pub const ELEMENT_ALL_RESTYLE_FLAGS : root :: _bindgen_ty_86 = 260046848 ; pub const ELEMENT_TYPE_SPECIFIC_BITS_OFFSET : root :: _bindgen_ty_86 = 27 ; pub type _bindgen_ty_86 = :: std :: os :: raw :: c_uint ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct ServoBundledURI { pub mURLString : * const u8 , pub mURLStringLength : u32 , pub mExtraData : * mut root :: mozilla :: URLExtraData , } # [ test ] fn bindgen_test_layout_ServoBundledURI ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ServoBundledURI > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( ServoBundledURI ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ServoBundledURI > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ServoBundledURI ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoBundledURI ) ) . mURLString as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( ServoBundledURI ) , "::" , stringify ! ( mURLString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoBundledURI ) ) . mURLStringLength as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( ServoBundledURI ) , "::" , stringify ! ( mURLStringLength ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoBundledURI ) ) . mExtraData as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( ServoBundledURI ) , "::" , stringify ! ( mExtraData ) ) ) ; } impl Clone for ServoBundledURI { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct FontSizePrefs { pub mDefaultVariableSize : root :: nscoord , pub mDefaultFixedSize : root :: nscoord , pub mDefaultSerifSize : root :: nscoord , pub mDefaultSansSerifSize : root :: nscoord , pub mDefaultMonospaceSize : root :: nscoord , pub mDefaultCursiveSize : root :: nscoord , pub mDefaultFantasySize : root :: nscoord , } # [ test ] fn bindgen_test_layout_FontSizePrefs ( ) { assert_eq ! ( :: std :: mem :: size_of :: < FontSizePrefs > ( ) , 28usize , concat ! ( "Size of: " , stringify ! ( FontSizePrefs ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < FontSizePrefs > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( FontSizePrefs ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultVariableSize as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultVariableSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultFixedSize as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultFixedSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultSerifSize as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultSerifSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultSansSerifSize as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultSansSerifSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultMonospaceSize as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultMonospaceSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultCursiveSize as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultCursiveSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultFantasySize as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultFantasySize ) ) ) ; } impl Clone for FontSizePrefs { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct GeckoFontMetrics { pub mChSize : root :: nscoord , pub mXSize : root :: nscoord , } # [ test ] fn bindgen_test_layout_GeckoFontMetrics ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoFontMetrics > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( GeckoFontMetrics ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoFontMetrics > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( GeckoFontMetrics ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoFontMetrics ) ) . mChSize as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoFontMetrics ) , "::" , stringify ! ( mChSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoFontMetrics ) ) . mXSize as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoFontMetrics ) , "::" , stringify ! ( mXSize ) ) ) ; } impl Clone for GeckoFontMetrics { fn clone ( & self ) -> Self { * self } } pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_after : u32 = 65 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_before : u32 = 65 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_backdrop : u32 = 0 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_cue : u32 = 36 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_firstLetter : u32 = 3 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_firstLine : u32 = 3 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozSelection : u32 = 2 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozFocusInner : u32 = 0 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozFocusOuter : u32 = 0 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozListBullet : u32 = 0 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozListNumber : u32 = 0 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozMathAnonymous : u32 = 0 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozNumberWrapper : u32 = 24 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozNumberText : u32 = 24 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozNumberSpinBox : u32 = 24 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozNumberSpinUp : u32 = 24 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozNumberSpinDown : u32 = 24 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozProgressBar : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozRangeTrack : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozRangeProgress : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozRangeThumb : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozMeterBar : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozPlaceholder : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_placeholder : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozColorSwatch : u32 = 12 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIDOMMediaList { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDOMMediaList_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIDOMMediaList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDOMMediaList > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIDOMMediaList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDOMMediaList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDOMMediaList ) ) ) ; } impl Clone for nsIDOMMediaList { fn clone ( & self ) -> Self { * self } } pub type nsCSSAnonBoxes_NonInheritingBase = u8 ; pub const nsCSSAnonBoxes_NonInheriting_oofPlaceholder : root :: nsCSSAnonBoxes_NonInheriting = 0 ; pub const nsCSSAnonBoxes_NonInheriting_horizontalFramesetBorder : root :: nsCSSAnonBoxes_NonInheriting = 1 ; pub const nsCSSAnonBoxes_NonInheriting_verticalFramesetBorder : root :: nsCSSAnonBoxes_NonInheriting = 2 ; pub const nsCSSAnonBoxes_NonInheriting_framesetBlank : root :: nsCSSAnonBoxes_NonInheriting = 3 ; pub const nsCSSAnonBoxes_NonInheriting_tableColGroup : root :: nsCSSAnonBoxes_NonInheriting = 4 ; pub const nsCSSAnonBoxes_NonInheriting_tableCol : root :: nsCSSAnonBoxes_NonInheriting = 5 ; pub const nsCSSAnonBoxes_NonInheriting_pageBreak : root :: nsCSSAnonBoxes_NonInheriting = 6 ; pub const nsCSSAnonBoxes_NonInheriting__Count : root :: nsCSSAnonBoxes_NonInheriting = 7 ; pub type nsCSSAnonBoxes_NonInheriting = root :: nsCSSAnonBoxes_NonInheritingBase ; 
+ # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsISMILAttr { pub vtable_ : * const nsISMILAttr__bindgen_vtable , } # [ test ] fn bindgen_test_layout_nsISMILAttr ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsISMILAttr > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsISMILAttr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsISMILAttr > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsISMILAttr ) ) ) ; } pub const ELEMENT_SHARED_RESTYLE_BIT_1 : root :: _bindgen_ty_20 = 8388608 ; pub const ELEMENT_SHARED_RESTYLE_BIT_2 : root :: _bindgen_ty_20 = 16777216 ; pub const ELEMENT_SHARED_RESTYLE_BIT_3 : root :: _bindgen_ty_20 = 33554432 ; pub const ELEMENT_SHARED_RESTYLE_BIT_4 : root :: _bindgen_ty_20 = 67108864 ; pub const ELEMENT_SHARED_RESTYLE_BITS : root :: _bindgen_ty_20 = 125829120 ; pub const ELEMENT_HAS_DIRTY_DESCENDANTS_FOR_SERVO : root :: _bindgen_ty_20 = 8388608 ; pub const ELEMENT_HAS_ANIMATION_ONLY_DIRTY_DESCENDANTS_FOR_SERVO : root :: _bindgen_ty_20 = 16777216 ; pub const ELEMENT_HAS_SNAPSHOT : root :: _bindgen_ty_20 = 33554432 ; pub const ELEMENT_HANDLED_SNAPSHOT : root :: _bindgen_ty_20 = 67108864 ; pub const ELEMENT_HAS_PENDING_RESTYLE : root :: _bindgen_ty_20 = 8388608 ; pub const ELEMENT_IS_POTENTIAL_RESTYLE_ROOT : root :: _bindgen_ty_20 = 16777216 ; pub const ELEMENT_HAS_PENDING_ANIMATION_ONLY_RESTYLE : root :: _bindgen_ty_20 = 33554432 ; pub const ELEMENT_IS_POTENTIAL_ANIMATION_ONLY_RESTYLE_ROOT : root :: _bindgen_ty_20 = 67108864 ; pub const ELEMENT_IS_CONDITIONAL_RESTYLE_ANCESTOR : root :: _bindgen_ty_20 = 134217728 ; pub const ELEMENT_HAS_CHILD_WITH_LATER_SIBLINGS_HINT : root :: _bindgen_ty_20 = 268435456 ; pub const ELEMENT_PENDING_RESTYLE_FLAGS : root :: _bindgen_ty_20 = 41943040 ; pub const ELEMENT_POTENTIAL_RESTYLE_ROOT_FLAGS : root :: _bindgen_ty_20 = 83886080 ; pub const ELEMENT_ALL_RESTYLE_FLAGS : root :: _bindgen_ty_20 = 260046848 ; pub const ELEMENT_TYPE_SPECIFIC_BITS_OFFSET : root :: _bindgen_ty_20 = 27 ; pub type _bindgen_ty_20 = :: std :: os :: raw :: c_uint ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct ServoBundledURI { pub mURLString : * const u8 , pub mURLStringLength : u32 , pub mExtraData : * mut root :: mozilla :: URLExtraData , } # [ test ] fn bindgen_test_layout_ServoBundledURI ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ServoBundledURI > ( ) , 24usize , concat ! ( "Size of: " , stringify ! ( ServoBundledURI ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ServoBundledURI > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( ServoBundledURI ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoBundledURI ) ) . mURLString as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( ServoBundledURI ) , "::" , stringify ! ( mURLString ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoBundledURI ) ) . mURLStringLength as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( ServoBundledURI ) , "::" , stringify ! ( mURLStringLength ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const ServoBundledURI ) ) . mExtraData as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( ServoBundledURI ) , "::" , stringify ! ( mExtraData ) ) ) ; } impl Clone for ServoBundledURI { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct FontSizePrefs { pub mDefaultVariableSize : root :: nscoord , pub mDefaultFixedSize : root :: nscoord , pub mDefaultSerifSize : root :: nscoord , pub mDefaultSansSerifSize : root :: nscoord , pub mDefaultMonospaceSize : root :: nscoord , pub mDefaultCursiveSize : root :: nscoord , pub mDefaultFantasySize : root :: nscoord , } # [ test ] fn bindgen_test_layout_FontSizePrefs ( ) { assert_eq ! ( :: std :: mem :: size_of :: < FontSizePrefs > ( ) , 28usize , concat ! ( "Size of: " , stringify ! ( FontSizePrefs ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < FontSizePrefs > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( FontSizePrefs ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultVariableSize as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultVariableSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultFixedSize as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultFixedSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultSerifSize as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultSerifSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultSansSerifSize as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultSansSerifSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultMonospaceSize as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultMonospaceSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultCursiveSize as * const _ as usize } , 20usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultCursiveSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const FontSizePrefs ) ) . mDefaultFantasySize as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( FontSizePrefs ) , "::" , stringify ! ( mDefaultFantasySize ) ) ) ; } impl Clone for FontSizePrefs { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct GeckoFontMetrics { pub mChSize : root :: nscoord , pub mXSize : root :: nscoord , } # [ test ] fn bindgen_test_layout_GeckoFontMetrics ( ) { assert_eq ! ( :: std :: mem :: size_of :: < GeckoFontMetrics > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( GeckoFontMetrics ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < GeckoFontMetrics > ( ) , 4usize , concat ! ( "Alignment of " , stringify ! ( GeckoFontMetrics ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoFontMetrics ) ) . mChSize as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoFontMetrics ) , "::" , stringify ! ( mChSize ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const GeckoFontMetrics ) ) . mXSize as * const _ as usize } , 4usize , concat ! ( "Alignment of field: " , stringify ! ( GeckoFontMetrics ) , "::" , stringify ! ( mXSize ) ) ) ; } impl Clone for GeckoFontMetrics { fn clone ( & self ) -> Self { * self } } pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_after : u32 = 65 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_before : u32 = 65 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_backdrop : u32 = 0 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_cue : u32 = 36 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_firstLetter : u32 = 3 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_firstLine : u32 = 3 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozSelection : u32 = 2 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozFocusInner : u32 = 0 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozFocusOuter : u32 = 0 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozListBullet : u32 = 0 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozListNumber : u32 = 0 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozMathAnonymous : u32 = 0 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozNumberWrapper : u32 = 24 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozNumberText : u32 = 24 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozNumberSpinBox : u32 = 24 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozNumberSpinUp : u32 = 24 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozNumberSpinDown : u32 = 24 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozProgressBar : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozRangeTrack : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozRangeProgress : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozRangeThumb : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozMeterBar : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozPlaceholder : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_placeholder : u32 = 8 ; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozColorSwatch : u32 = 12 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIDOMMediaList { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDOMMediaList_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIDOMMediaList ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDOMMediaList > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIDOMMediaList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDOMMediaList > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDOMMediaList ) ) ) ; } impl Clone for nsIDOMMediaList { fn clone ( & self ) -> Self { * self } } pub type nsCSSAnonBoxes_NonInheritingBase = u8 ; pub const nsCSSAnonBoxes_NonInheriting_oofPlaceholder : root :: nsCSSAnonBoxes_NonInheriting = 0 ; pub const nsCSSAnonBoxes_NonInheriting_horizontalFramesetBorder : root :: nsCSSAnonBoxes_NonInheriting = 1 ; pub const nsCSSAnonBoxes_NonInheriting_verticalFramesetBorder : root :: nsCSSAnonBoxes_NonInheriting = 2 ; pub const nsCSSAnonBoxes_NonInheriting_framesetBlank : root :: nsCSSAnonBoxes_NonInheriting = 3 ; pub const nsCSSAnonBoxes_NonInheriting_tableColGroup : root :: nsCSSAnonBoxes_NonInheriting = 4 ; pub const nsCSSAnonBoxes_NonInheriting_tableCol : root :: nsCSSAnonBoxes_NonInheriting = 5 ; pub const nsCSSAnonBoxes_NonInheriting_pageBreak : root :: nsCSSAnonBoxes_NonInheriting = 6 ; pub const nsCSSAnonBoxes_NonInheriting__Count : root :: nsCSSAnonBoxes_NonInheriting = 7 ; pub type nsCSSAnonBoxes_NonInheriting = root :: nsCSSAnonBoxes_NonInheritingBase ; 
  /// templated hashtable class maps keys to interface pointers.
     /// See nsBaseHashtable for complete declaration.
     /// @param KeyClass a wrapper-class for the hashtable key, see nsHashKeys.h
     /// for a complete specification.
     /// @param Interface the interface-type being wrapped
     /// @see nsDataHashtable, nsClassHashtable 
- # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsInterfaceHashtable { pub _address : u8 , } pub type nsInterfaceHashtable_KeyType = [ u8 ; 0usize ] ; pub type nsInterfaceHashtable_UserDataType < Interface > = * mut Interface ; pub type nsInterfaceHashtable_base_type = u8 ; pub type nsBindingList = root :: nsTArray < root :: RefPtr < root :: nsXBLBinding > > ; # [ repr ( C ) ] pub struct nsBindingManager { pub _base : root :: nsStubMutationObserver , pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mBoundContentSet : u64 , pub mWrapperTable : u64 , pub mDocumentTable : u64 , pub mLoadingDocTable : u64 , pub mAttachedStack : root :: nsBindingList , pub mProcessingAttachedStack : bool , pub mDestroyed : bool , pub mAttachedStackSizeOnOutermost : u32 , pub mProcessAttachedQueueEvent : u64 , pub mDocument : * mut root :: nsIDocument , } pub type nsBindingManager_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; pub const nsBindingManager_DestructorHandling_eRunDtor : root :: nsBindingManager_DestructorHandling = 0 ; pub const nsBindingManager_DestructorHandling_eDoNotRunDtor : root :: nsBindingManager_DestructorHandling = 1 ; pub type nsBindingManager_DestructorHandling = :: std :: os :: raw :: c_uint ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsBindingManager_cycleCollection { pub _base : root :: nsXPCOMCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_nsBindingManager_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsBindingManager_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsBindingManager_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsBindingManager_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsBindingManager_cycleCollection ) ) ) ; } impl Clone for nsBindingManager_cycleCollection { fn clone ( & self ) -> Self { * self } } pub type nsBindingManager_BoundContentBindingCallback = root :: std :: function ; pub type nsBindingManager_WrapperHashtable = u8 ; extern "C" {
- # [ link_name = "\u{1}_ZN16nsBindingManager21_cycleCollectorGlobalE" ] 
+ # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsInterfaceHashtable { pub _address : u8 , } pub type nsInterfaceHashtable_KeyType = [ u8 ; 0usize ] ; pub type nsInterfaceHashtable_UserDataType < Interface > = * mut Interface ; pub type nsInterfaceHashtable_base_type = u8 ; pub type nsBindingList = root :: nsTArray < root :: RefPtr < root :: nsXBLBinding > > ; # [ repr ( C ) ] pub struct nsBindingManager { pub _base : root :: nsStubMutationObserver , pub mRefCnt : root :: nsCycleCollectingAutoRefCnt , pub mBoundContentSet : u64 , pub mWrapperTable : root :: nsAutoPtr < root :: nsBindingManager_WrapperHashtable > , pub mDocumentTable : u64 , pub mLoadingDocTable : u64 , pub mAttachedStack : root :: nsBindingList , pub mProcessingAttachedStack : bool , pub mDestroyed : bool , pub mAttachedStackSizeOnOutermost : u32 , pub mProcessAttachedQueueEvent : u64 , pub mDocument : * mut root :: nsIDocument , } pub type nsBindingManager_HasThreadSafeRefCnt = root :: mozilla :: FalseType ; pub const nsBindingManager_DestructorHandling_eRunDtor : root :: nsBindingManager_DestructorHandling = 0 ; pub const nsBindingManager_DestructorHandling_eDoNotRunDtor : root :: nsBindingManager_DestructorHandling = 1 ; pub type nsBindingManager_DestructorHandling = :: std :: os :: raw :: c_uint ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsBindingManager_cycleCollection { pub _base : root :: nsXPCOMCycleCollectionParticipant , } # [ test ] fn bindgen_test_layout_nsBindingManager_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsBindingManager_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsBindingManager_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsBindingManager_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsBindingManager_cycleCollection ) ) ) ; } impl Clone for nsBindingManager_cycleCollection { fn clone ( & self ) -> Self { * self } } pub type nsBindingManager_BoundContentBindingCallback = root :: std :: function ; pub type nsBindingManager_WrapperHashtable = u8 ; extern "C" {
+ # [ link_name = "\u{1}__ZN16nsBindingManager21_cycleCollectorGlobalE" ] 
  pub static mut  nsBindingManager__cycleCollectorGlobal  :  root :: nsBindingManager_cycleCollection ;
 } # [ test ] fn bindgen_test_layout_nsBindingManager ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsBindingManager > ( ) , 80usize , concat ! ( "Size of: " , stringify ! ( nsBindingManager ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsBindingManager > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsBindingManager ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBindingManager ) ) . mRefCnt as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsBindingManager ) , "::" , stringify ! ( mRefCnt ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBindingManager ) ) . mBoundContentSet as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsBindingManager ) , "::" , stringify ! ( mBoundContentSet ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBindingManager ) ) . mWrapperTable as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsBindingManager ) , "::" , stringify ! ( mWrapperTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBindingManager ) ) . mDocumentTable as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsBindingManager ) , "::" , stringify ! ( mDocumentTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBindingManager ) ) . mLoadingDocTable as * const _ as usize } , 40usize , concat ! ( "Alignment of field: " , stringify ! ( nsBindingManager ) , "::" , stringify ! ( mLoadingDocTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBindingManager ) ) . mAttachedStack as * const _ as usize } , 48usize , concat ! ( "Alignment of field: " , stringify ! ( nsBindingManager ) , "::" , stringify ! ( mAttachedStack ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBindingManager ) ) . mProcessingAttachedStack as * const _ as usize } , 56usize , concat ! ( "Alignment of field: " , stringify ! ( nsBindingManager ) , "::" , stringify ! ( mProcessingAttachedStack ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBindingManager ) ) . mDestroyed as * const _ as usize } , 57usize , concat ! ( "Alignment of field: " , stringify ! ( nsBindingManager ) , "::" , stringify ! ( mDestroyed ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBindingManager ) ) . mAttachedStackSizeOnOutermost as * const _ as usize } , 60usize , concat ! ( "Alignment of field: " , stringify ! ( nsBindingManager ) , "::" , stringify ! ( mAttachedStackSizeOnOutermost ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBindingManager ) ) . mProcessAttachedQueueEvent as * const _ as usize } , 64usize , concat ! ( "Alignment of field: " , stringify ! ( nsBindingManager ) , "::" , stringify ! ( mProcessAttachedQueueEvent ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsBindingManager ) ) . mDocument as * const _ as usize } , 72usize , concat ! ( "Alignment of field: " , stringify ! ( nsBindingManager ) , "::" , stringify ! ( mDocument ) ) ) ; } 
  /// An nsStyleContext represents the computed style data for an element.
@@ -1649,12 +1652,12 @@ pub type ServoStyleContextStrong = ::gecko_bindings::sugar::ownership::Strong<::
     /// 2. any *child* style contexts (this might be the reverse of
     /// expectation, but it makes sense in this case) 
  # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsStyleContext { pub mPseudoTag : root :: RefPtr < root :: nsAtom > , pub mBits : u64 , } # [ test ] fn bindgen_test_layout_nsStyleContext ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsStyleContext > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsStyleContext ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsStyleContext > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsStyleContext ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContext ) ) . mPseudoTag as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContext ) , "::" , stringify ! ( mPseudoTag ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsStyleContext ) ) . mBits as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleContext ) , "::" , stringify ! ( mBits ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIDOMCSSRule { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDOMCSSRule_COMTypeInfo { pub _address : u8 , } pub const nsIDOMCSSRule_UNKNOWN_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 0 ; pub const nsIDOMCSSRule_STYLE_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 1 ; pub const nsIDOMCSSRule_CHARSET_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 2 ; pub const nsIDOMCSSRule_IMPORT_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 3 ; pub const nsIDOMCSSRule_MEDIA_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 4 ; pub const nsIDOMCSSRule_FONT_FACE_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 5 ; pub const nsIDOMCSSRule_PAGE_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 6 ; pub const nsIDOMCSSRule_KEYFRAMES_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 7 ; pub const nsIDOMCSSRule_KEYFRAME_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 8 ; pub const nsIDOMCSSRule_MOZ_KEYFRAMES_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 7 ; pub const nsIDOMCSSRule_MOZ_KEYFRAME_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 8 ; pub const nsIDOMCSSRule_NAMESPACE_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 10 ; pub const nsIDOMCSSRule_COUNTER_STYLE_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 11 ; pub const nsIDOMCSSRule_SUPPORTS_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 12 ; pub const nsIDOMCSSRule_DOCUMENT_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 13 ; pub const nsIDOMCSSRule_FONT_FEATURE_VALUES_RULE : root :: nsIDOMCSSRule__bindgen_ty_1 = 14 ; pub type nsIDOMCSSRule__bindgen_ty_1 = :: std :: os :: raw :: c_uint ; # [ test ] fn bindgen_test_layout_nsIDOMCSSRule ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDOMCSSRule > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIDOMCSSRule ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDOMCSSRule > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDOMCSSRule ) ) ) ; } impl Clone for nsIDOMCSSRule { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIDOMCSSCounterStyleRule { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDOMCSSCounterStyleRule_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIDOMCSSCounterStyleRule ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDOMCSSCounterStyleRule > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIDOMCSSCounterStyleRule ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDOMCSSCounterStyleRule > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDOMCSSCounterStyleRule ) ) ) ; } impl Clone for nsIDOMCSSCounterStyleRule { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSCounterStyleRule { pub _base : root :: mozilla :: css :: Rule , pub _base_1 : root :: nsIDOMCSSCounterStyleRule , pub mName : root :: RefPtr < root :: nsAtom > , pub mValues : [ root :: nsCSSValue ; 10usize ] , pub mGeneration : u32 , } pub type nsCSSCounterStyleRule_Getter = :: std :: option :: Option < unsafe extern "C" fn ( ) -> root :: nsresult > ; extern "C" {
- # [ link_name = "\u{1}_ZN21nsCSSCounterStyleRule8kGettersE" ] 
+ # [ link_name = "\u{1}__ZN21nsCSSCounterStyleRule8kGettersE" ] 
  pub static mut  nsCSSCounterStyleRule_kGetters  :  [ root :: nsCSSCounterStyleRule_Getter ; 0usize ] ;
 } # [ test ] fn bindgen_test_layout_nsCSSCounterStyleRule ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSCounterStyleRule > ( ) , 248usize , concat ! ( "Size of: " , stringify ! ( nsCSSCounterStyleRule ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSCounterStyleRule > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSCounterStyleRule ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIDOMCSSStyleDeclaration { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDOMCSSStyleDeclaration_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIDOMCSSStyleDeclaration ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDOMCSSStyleDeclaration > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIDOMCSSStyleDeclaration ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDOMCSSStyleDeclaration > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDOMCSSStyleDeclaration ) ) ) ; } impl Clone for nsIDOMCSSStyleDeclaration { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsICSSDeclaration { pub _base : root :: nsIDOMCSSStyleDeclaration , pub _base_1 : root :: nsWrapperCache , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsICSSDeclaration_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsICSSDeclaration ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsICSSDeclaration > ( ) , 32usize , concat ! ( "Size of: " , stringify ! ( nsICSSDeclaration ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsICSSDeclaration > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsICSSDeclaration ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsIDOMCSSFontFaceRule { pub _base : root :: nsISupports , } # [ repr ( C ) ] # [ derive ( Debug , Copy , Clone ) ] pub struct nsIDOMCSSFontFaceRule_COMTypeInfo { pub _address : u8 , } # [ test ] fn bindgen_test_layout_nsIDOMCSSFontFaceRule ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsIDOMCSSFontFaceRule > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsIDOMCSSFontFaceRule ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsIDOMCSSFontFaceRule > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsIDOMCSSFontFaceRule ) ) ) ; } impl Clone for nsIDOMCSSFontFaceRule { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSFontFaceStyleDecl { pub _base : root :: nsICSSDeclaration , pub mDescriptors : root :: mozilla :: CSSFontFaceDescriptors , } # [ test ] fn bindgen_test_layout_nsCSSFontFaceStyleDecl ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSFontFaceStyleDecl > ( ) , 176usize , concat ! ( "Size of: " , stringify ! ( nsCSSFontFaceStyleDecl ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSFontFaceStyleDecl > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSFontFaceStyleDecl ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsCSSFontFaceStyleDecl ) ) . mDescriptors as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsCSSFontFaceStyleDecl ) , "::" , stringify ! ( mDescriptors ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsCSSFontFaceRule { pub _base : root :: mozilla :: css :: Rule , pub _base_1 : root :: nsIDOMCSSFontFaceRule , pub mDecl : root :: nsCSSFontFaceStyleDecl , } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsCSSFontFaceRule_cycleCollection { pub _base : root :: mozilla :: css :: Rule_cycleCollection , } # [ test ] fn bindgen_test_layout_nsCSSFontFaceRule_cycleCollection ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSFontFaceRule_cycleCollection > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsCSSFontFaceRule_cycleCollection ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSFontFaceRule_cycleCollection > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSFontFaceRule_cycleCollection ) ) ) ; } impl Clone for nsCSSFontFaceRule_cycleCollection { fn clone ( & self ) -> Self { * self } } extern "C" {
- # [ link_name = "\u{1}_ZN17nsCSSFontFaceRule21_cycleCollectorGlobalE" ] 
+ # [ link_name = "\u{1}__ZN17nsCSSFontFaceRule21_cycleCollectorGlobalE" ] 
  pub static mut  nsCSSFontFaceRule__cycleCollectorGlobal  :  root :: nsCSSFontFaceRule_cycleCollection ;
 } # [ test ] fn bindgen_test_layout_nsCSSFontFaceRule ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsCSSFontFaceRule > ( ) , 248usize , concat ! ( "Size of: " , stringify ! ( nsCSSFontFaceRule ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsCSSFontFaceRule > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsCSSFontFaceRule ) ) ) ; } # [ repr ( C ) ] # [ derive ( Debug ) ] pub struct nsFontFaceRuleContainer { pub mRule : root :: RefPtr < root :: nsCSSFontFaceRule > , pub mSheetType : root :: mozilla :: SheetType , } # [ test ] fn bindgen_test_layout_nsFontFaceRuleContainer ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsFontFaceRuleContainer > ( ) , 16usize , concat ! ( "Size of: " , stringify ! ( nsFontFaceRuleContainer ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsFontFaceRuleContainer > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsFontFaceRuleContainer ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFontFaceRuleContainer ) ) . mRule as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsFontFaceRuleContainer ) , "::" , stringify ! ( mRule ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsFontFaceRuleContainer ) ) . mSheetType as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsFontFaceRuleContainer ) , "::" , stringify ! ( mSheetType ) ) ) ; } pub type nsMediaFeatureValueGetter = :: std :: option :: Option < unsafe extern "C" fn ( aPresContext : * mut root :: nsPresContext , aFeature : * const root :: nsMediaFeature , aResult : * mut root :: nsCSSValue ) > ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsMediaFeature { pub mName : * mut * mut root :: nsStaticAtom , pub mRangeType : root :: nsMediaFeature_RangeType , pub mValueType : root :: nsMediaFeature_ValueType , pub mReqFlags : u8 , pub mData : root :: nsMediaFeature__bindgen_ty_1 , pub mGetter : root :: nsMediaFeatureValueGetter , } # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsMediaFeature_RangeType { eMinMaxAllowed = 0 , eMinMaxNotAllowed = 1 , } # [ repr ( u32 ) ] # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum nsMediaFeature_ValueType { eLength = 0 , eInteger = 1 , eFloat = 2 , eBoolInteger = 3 , eIntRatio = 4 , eResolution = 5 , eEnumerated = 6 , eIdent = 7 , } pub const nsMediaFeature_RequirementFlags_eNoRequirements : root :: nsMediaFeature_RequirementFlags = 0 ; pub const nsMediaFeature_RequirementFlags_eHasWebkitPrefix : root :: nsMediaFeature_RequirementFlags = 1 ; pub const nsMediaFeature_RequirementFlags_eWebkitDevicePixelRatioPrefEnabled : root :: nsMediaFeature_RequirementFlags = 2 ; pub const nsMediaFeature_RequirementFlags_eUserAgentAndChromeOnly : root :: nsMediaFeature_RequirementFlags = 4 ; pub type nsMediaFeature_RequirementFlags = u8 ; # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsMediaFeature__bindgen_ty_1 { pub mInitializer_ : root :: __BindgenUnionField < * const :: std :: os :: raw :: c_void > , pub mKeywordTable : root :: __BindgenUnionField < * const root :: nsCSSProps_KTableEntry > , pub mMetric : root :: __BindgenUnionField < * const * const root :: nsAtom > , pub bindgen_union_field : u64 , } # [ test ] fn bindgen_test_layout_nsMediaFeature__bindgen_ty_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsMediaFeature__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Size of: " , stringify ! ( nsMediaFeature__bindgen_ty_1 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsMediaFeature__bindgen_ty_1 > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsMediaFeature__bindgen_ty_1 ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsMediaFeature__bindgen_ty_1 ) ) . mInitializer_ as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsMediaFeature__bindgen_ty_1 ) , "::" , stringify ! ( mInitializer_ ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsMediaFeature__bindgen_ty_1 ) ) . mKeywordTable as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsMediaFeature__bindgen_ty_1 ) , "::" , stringify ! ( mKeywordTable ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsMediaFeature__bindgen_ty_1 ) ) . mMetric as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsMediaFeature__bindgen_ty_1 ) , "::" , stringify ! ( mMetric ) ) ) ; } impl Clone for nsMediaFeature__bindgen_ty_1 { fn clone ( & self ) -> Self { * self } } # [ test ] fn bindgen_test_layout_nsMediaFeature ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsMediaFeature > ( ) , 40usize , concat ! ( "Size of: " , stringify ! ( nsMediaFeature ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsMediaFeature > ( ) , 8usize , concat ! ( "Alignment of " , stringify ! ( nsMediaFeature ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsMediaFeature ) ) . mName as * const _ as usize } , 0usize , concat ! ( "Alignment of field: " , stringify ! ( nsMediaFeature ) , "::" , stringify ! ( mName ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsMediaFeature ) ) . mRangeType as * const _ as usize } , 8usize , concat ! ( "Alignment of field: " , stringify ! ( nsMediaFeature ) , "::" , stringify ! ( mRangeType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsMediaFeature ) ) . mValueType as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsMediaFeature ) , "::" , stringify ! ( mValueType ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsMediaFeature ) ) . mReqFlags as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( nsMediaFeature ) , "::" , stringify ! ( mReqFlags ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsMediaFeature ) ) . mData as * const _ as usize } , 24usize , concat ! ( "Alignment of field: " , stringify ! ( nsMediaFeature ) , "::" , stringify ! ( mData ) ) ) ; assert_eq ! ( unsafe { & ( * ( 0 as * const nsMediaFeature ) ) . mGetter as * const _ as usize } , 32usize , concat ! ( "Alignment of field: " , stringify ! ( nsMediaFeature ) , "::" , stringify ! ( mGetter ) ) ) ; } impl Clone for nsMediaFeature { fn clone ( & self ) -> Self { * self } } # [ repr ( C ) ] # [ derive ( Debug , Copy ) ] pub struct nsMediaFeatures { pub _address : u8 , } extern "C" {
- # [ link_name = "\u{1}_ZN15nsMediaFeatures8featuresE" ] 
+ # [ link_name = "\u{1}__ZN15nsMediaFeatures8featuresE" ] 
  pub static mut  nsMediaFeatures_features  :  [ root :: nsMediaFeature ; 0usize ] ;
-} # [ test ] fn bindgen_test_layout_nsMediaFeatures ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsMediaFeatures > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( nsMediaFeatures ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsMediaFeatures > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( nsMediaFeatures ) ) ) ; } impl Clone for nsMediaFeatures { fn clone ( & self ) -> Self { * self } } # [ test ] fn __bindgen_test_layout_nsTSubstring_open0_char16_t_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTSubstring < u16 > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTSubstring < u16 > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTSubstring < u16 > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTSubstring < u16 > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char16_t_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ::nsstring::nsStringRepr > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ::nsstring::nsStringRepr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTSubstring_open0_char_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTSubstring < :: std :: os :: raw :: c_char > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTSubstring < :: std :: os :: raw :: c_char > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTSubstring < :: std :: os :: raw :: c_char > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTSubstring < :: std :: os :: raw :: c_char > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTString < :: std :: os :: raw :: c_char > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTString < :: std :: os :: raw :: c_char > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTString < :: std :: os :: raw :: c_char > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTString < :: std :: os :: raw :: c_char > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsISupports_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_CSSVariableValues_Variable_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: CSSVariableValues_Variable > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: CSSVariableValues_Variable > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: CSSVariableValues_Variable > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: CSSVariableValues_Variable > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_FontFamilyName_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: FontFamilyName > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: FontFamilyName > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: FontFamilyName > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: FontFamilyName > ) ) ) ; } # [ test ] fn __bindgen_test_layout_NotNull_open0_RefPtr_open1_SharedFontList_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: NotNull < root :: RefPtr < root :: mozilla :: SharedFontList > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: NotNull < root :: RefPtr < root :: mozilla :: SharedFontList > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: NotNull < root :: RefPtr < root :: mozilla :: SharedFontList > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: NotNull < root :: RefPtr < root :: mozilla :: SharedFontList > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_SharedFontList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: SharedFontList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: SharedFontList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: SharedFontList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: SharedFontList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_unsigned_int_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < :: std :: os :: raw :: c_uint > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < :: std :: os :: raw :: c_uint > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < :: std :: os :: raw :: c_uint > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < :: std :: os :: raw :: c_uint > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_gfxFontFeatureValueSet_ValueList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: gfxFontFeatureValueSet_ValueList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxFontFeatureValueSet_ValueList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: gfxFontFeatureValueSet_ValueList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxFontFeatureValueSet_ValueList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_unsigned_int_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < :: std :: os :: raw :: c_uint > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < :: std :: os :: raw :: c_uint > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < :: std :: os :: raw :: c_uint > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < :: std :: os :: raw :: c_uint > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_gfxAlternateValue_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: gfxAlternateValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxAlternateValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: gfxAlternateValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxAlternateValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_gfxFontFeatureValueSet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: gfxFontFeatureValueSet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: gfxFontFeatureValueSet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: gfxFontFeatureValueSet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: gfxFontFeatureValueSet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_gfxFontFeature_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: gfxFontFeature > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxFontFeature > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: gfxFontFeature > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxFontFeature > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_FontVariation_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: gfx :: FontVariation > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: gfx :: FontVariation > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: gfx :: FontVariation > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: gfx :: FontVariation > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsAtom_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: nsAtom > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsAtom > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: nsAtom > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsAtom > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_Note_DeletePolicy_open1_JSErrorNotes_Note_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_Note_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_DeletePolicy_open1_JSErrorNotes_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_iterator_open0_input_iterator_tag_UniquePtr_open1_JSErrorNotes_Note_DeletePolicy_open2_JSErrorNotes_Note_close2_close1_long_ptr_UniquePtr_ref_UniquePtr_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: std :: iterator > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: std :: iterator ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: std :: iterator > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: std :: iterator ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_Note_DeletePolicy_open1_JSErrorNotes_Note_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_Note_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_Note_DeletePolicy_open1_JSErrorNotes_Note_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_Note_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_Note_DeletePolicy_open1_JSErrorNotes_Note_close1_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_Note_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_Note_DeletePolicy_open1_JSErrorNotes_Note_close1_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_Note_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_Note_DeletePolicy_open1_JSErrorNotes_Note_close1_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_Note_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_DeletePolicy_open1_JSErrorNotes_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_StyleSheet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_MediaList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: MediaList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: MediaList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: MediaList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: MediaList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_StyleSheet_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_StyleSetHandle_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: StyleSetHandle > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: StyleSetHandle > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: StyleSetHandle > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: StyleSetHandle > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_ProfilerBacktrace_ProfilerBacktraceDestructor_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: ProfilerBacktrace > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: ProfilerBacktrace > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: ProfilerBacktrace > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: ProfilerBacktrace > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsNodeInfoManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsNodeInfoManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsNodeInfoManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsNodeInfoManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsNodeInfoManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsBindingManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsBindingManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsBindingManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsBindingManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsBindingManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAttrChildContentList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAttrChildContentList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAttrChildContentList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAttrChildContentList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAttrChildContentList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_LinkedList_open1_nsRange_close1_DefaultDelete_open1_LinkedList_open2_nsRange_close2_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_LinkedList_open1_nsRange_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_LinkedList_open1_nsRange_close1_DefaultDelete_open1_LinkedList_open2_nsRange_close2_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_LinkedList_open1_nsRange_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_NodeInfo_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: NodeInfo > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: NodeInfo > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: NodeInfo > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: NodeInfo > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIWeakReference_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ptr_void_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < * mut :: std :: os :: raw :: c_void > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < * mut :: std :: os :: raw :: c_void > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < * mut :: std :: os :: raw :: c_void > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < * mut :: std :: os :: raw :: c_void > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsPtrHashKey_open0_void_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsPtrHashKey < :: std :: os :: raw :: c_void > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsPtrHashKey < :: std :: os :: raw :: c_void > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsPtrHashKey < :: std :: os :: raw :: c_void > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsPtrHashKey < :: std :: os :: raw :: c_void > ) ) ) ; } # [ test ] fn __bindgen_test_layout_StaticRefPtr_open0_nsIContent_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: StaticRefPtr < root :: nsIContent > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: nsIContent > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: StaticRefPtr < root :: nsIContent > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: nsIContent > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsPresContext_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsPresContext > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsPresContext > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsPresContext > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsPresContext > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsFrameSelection_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsFrameSelection > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsFrameSelection > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsFrameSelection > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsFrameSelection > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsITimer_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsPtrHashKey_open0_WeakFrame_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsPtrHashKey < root :: WeakFrame > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsPtrHashKey < root :: WeakFrame > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsPtrHashKey < root :: WeakFrame > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsPtrHashKey < root :: WeakFrame > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsAtom_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsRefPtrHashKey < root :: nsAtom > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsRefPtrHashKey < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsTString_open1_char_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsTString < :: std :: os :: raw :: c_char > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsTString < :: std :: os :: raw :: c_char > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsTString < :: std :: os :: raw :: c_char > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsTString < :: std :: os :: raw :: c_char > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTString < :: std :: os :: raw :: c_char > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTString < :: std :: os :: raw :: c_char > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTString < :: std :: os :: raw :: c_char > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTString < :: std :: os :: raw :: c_char > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_EventTarget_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_EventTarget_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_Performance_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: Performance > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: Performance > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: Performance > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: Performance > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_TimeoutManager_DefaultDelete_open1_TimeoutManager_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: dom :: TimeoutManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: dom :: TimeoutManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: dom :: TimeoutManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: dom :: TimeoutManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_TimeoutManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsPIDOMWindowOuter_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIContent_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ptr_AudioContext_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < * mut root :: mozilla :: dom :: AudioContext > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: mozilla :: dom :: AudioContext > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < * mut root :: mozilla :: dom :: AudioContext > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: mozilla :: dom :: AudioContext > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_TabGroup_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: TabGroup > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: TabGroup > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: TabGroup > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: TabGroup > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsPIDOMWindowInner_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_EventTarget_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_EventTarget_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_Element_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocShell_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_TabGroup_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: TabGroup > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: TabGroup > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: TabGroup > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: TabGroup > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsPIDOMWindowOuter_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_RawServoAnimationValue_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: RawServoAnimationValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoAnimationValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: RawServoAnimationValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoAnimationValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_PropertyValuePair_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: PropertyValuePair > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: PropertyValuePair > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: PropertyValuePair > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: PropertyValuePair > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsStyleAutoArray_open0_StyleAnimation_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > > ( ) , 56usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_RawServoSelectorList_DefaultDelete_open1_RawServoSelectorList_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: RawServoSelectorList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: RawServoSelectorList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: RawServoSelectorList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: RawServoSelectorList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_RawServoSelectorList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsCSSSelectorList_DefaultDelete_open1_nsCSSSelectorList_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsCSSSelectorList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsCSSSelectorList_DefaultDelete_open1_nsCSSSelectorList_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsCSSSelectorList_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_RawServoSelectorList_DefaultDelete_open1_RawServoSelectorList_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: RawServoSelectorList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: RawServoSelectorList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: RawServoSelectorList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: RawServoSelectorList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_RawServoSelectorList_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIObserver_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsIDocument_SelectorCache_DefaultDelete_open1_nsIDocument_SelectorCache_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsIDocument_SelectorCache_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsIDocument_SelectorCache_DefaultDelete_open1_nsIDocument_SelectorCache_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsIDocument_SelectorCache_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_6 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_7 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_8 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_9 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLExtraData_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: URLExtraData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: URLExtraData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_NotNull_open0_ptr_const_mozilla__Encoding_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: NotNull < * const root :: mozilla :: Encoding > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: NotNull < * const root :: mozilla :: Encoding > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: NotNull < * const root :: mozilla :: Encoding > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: NotNull < * const root :: mozilla :: Encoding > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_Loader_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: Loader > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: Loader > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: Loader > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: Loader > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ImageLoader_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: ImageLoader > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: ImageLoader > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: ImageLoader > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: ImageLoader > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsHTMLStyleSheet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsHTMLStyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsHTMLStyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsHTMLStyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsHTMLStyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsHTMLCSSStyleSheet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsHTMLCSSStyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsHTMLCSSStyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsHTMLCSSStyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsHTMLCSSStyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ImageTracker_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: ImageTracker > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ImageTracker > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: ImageTracker > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ImageTracker > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_nsTHashtable_open1_nsPtrHashKey_open2_nsISupports_close2_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < u64 > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( u64 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < u64 > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( u64 ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_Link_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsSMILAnimationController_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsSMILAnimationController > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsSMILAnimationController > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsSMILAnimationController > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsSMILAnimationController > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsAutoPtr_open1_nsPropertyTable_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsAutoPtr < root :: nsPropertyTable > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsAutoPtr < root :: nsPropertyTable > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsAutoPtr < root :: nsPropertyTable > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsAutoPtr < root :: nsPropertyTable > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIHTMLCollection_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_FontFaceSet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: FontFaceSet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: FontFaceSet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: FontFaceSet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: FontFaceSet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIScriptGlobalObject_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIChannel_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsISupports_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIChannel_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMArray_open0_nsINode_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMArray > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMArray ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMArray > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMArray ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsCOMPtr_open1_nsIWeakReference_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsCOMPtr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCOMPtr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsCOMPtr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCOMPtr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIWeakReference_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocumentEncoder_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsIDocument_FrameRequest_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsIDocument_FrameRequest > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsIDocument_FrameRequest > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsIDocument_FrameRequest > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsIDocument_FrameRequest > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIStructuredCloneContainer_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIVariant_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_XPathEvaluator_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: XPathEvaluator > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: XPathEvaluator > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: XPathEvaluator > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: XPathEvaluator > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_AnonymousContent_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: AnonymousContent > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: AnonymousContent > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: AnonymousContent > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: AnonymousContent > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_LinkedList_open0_MediaQueryList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: LinkedList > ( ) , 24usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: LinkedList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: LinkedList > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: LinkedList ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_DocGroup_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: DocGroup > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: DocGroup > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: DocGroup > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: DocGroup > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsCOMPtr_open1_nsIRunnable_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsCOMPtr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCOMPtr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsCOMPtr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCOMPtr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIRunnable_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsCOMPtr_open1_nsIPrincipal_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsCOMPtr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCOMPtr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsCOMPtr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCOMPtr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_unsigned_long_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < :: std :: os :: raw :: c_ulong > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < :: std :: os :: raw :: c_ulong > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < :: std :: os :: raw :: c_ulong > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < :: std :: os :: raw :: c_ulong > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsINode_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_LangGroupFontPrefs_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsAutoPtr < root :: mozilla :: LangGroupFontPrefs > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: mozilla :: LangGroupFontPrefs > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsAutoPtr < root :: mozilla :: LangGroupFontPrefs > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: mozilla :: LangGroupFontPrefs > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_6 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsDeviceContext_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsDeviceContext > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDeviceContext > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsDeviceContext > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDeviceContext > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_EventStateManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: EventStateManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: EventStateManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: EventStateManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: EventStateManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsRefreshDriver_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsRefreshDriver > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsRefreshDriver > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsRefreshDriver > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsRefreshDriver > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_EffectCompositor_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: EffectCompositor > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: EffectCompositor > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: EffectCompositor > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: EffectCompositor > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsTransitionManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsTransitionManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsTransitionManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsTransitionManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsTransitionManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAnimationManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAnimationManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAnimationManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAnimationManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAnimationManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_RestyleManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: RestyleManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: RestyleManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: RestyleManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: RestyleManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_CounterStyleManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: CounterStyleManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: CounterStyleManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: CounterStyleManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: CounterStyleManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_gfxFontFeatureValueSet_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: gfxFontFeatureValueSet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: gfxFontFeatureValueSet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: gfxFontFeatureValueSet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: gfxFontFeatureValueSet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsITheme_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrintSettings_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsITimer_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsBidi_DefaultDelete_open1_nsBidi_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsBidi > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsBidi > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsBidi > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsBidi > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsBidi_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsRect_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsRect > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsRect > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsRect > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsRect > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_gfxTextPerfMetrics_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsAutoPtr < root :: gfxTextPerfMetrics > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: gfxTextPerfMetrics > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsAutoPtr < root :: gfxTextPerfMetrics > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: gfxTextPerfMetrics > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_gfxMissingFontRecorder_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsAutoPtr < root :: gfxMissingFontRecorder > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: gfxMissingFontRecorder > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsAutoPtr < root :: gfxMissingFontRecorder > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: gfxMissingFontRecorder > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsAtom_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsRefPtrHashKey < root :: nsAtom > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsRefPtrHashKey < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_URLParams_Param_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: dom :: URLParams_Param > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: dom :: URLParams_Param > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: dom :: URLParams_Param > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: dom :: URLParams_Param > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_URLParams_DefaultDelete_open1_URLParams_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: dom :: URLParams > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: dom :: URLParams > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: dom :: URLParams > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: dom :: URLParams > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_URLParams_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_10 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_11 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_const_char_FreePolicy_open1_const_char_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < :: std :: os :: raw :: c_char > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < :: std :: os :: raw :: c_char > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < :: std :: os :: raw :: c_char > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < :: std :: os :: raw :: c_char > ) ) ) ; } # [ test ] fn __bindgen_test_layout_FreePolicy_open0_const_char_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: detail :: FreePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: detail :: FreePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: detail :: FreePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: detail :: FreePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIEventTarget_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsMainThreadPtrHandle_open0_nsIURI_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsMainThreadPtrHandle < root :: nsIURI > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsMainThreadPtrHandle < root :: nsIURI > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsMainThreadPtrHandle < root :: nsIURI > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsMainThreadPtrHandle < root :: nsIURI > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLExtraData_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: URLExtraData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: URLExtraData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsPtrHashKey_open0_nsIDocument_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsPtrHashKey < root :: nsIDocument > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsPtrHashKey < root :: nsIDocument > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsPtrHashKey < root :: nsIDocument > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsPtrHashKey < root :: nsIDocument > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_GridNamedArea_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: css :: GridNamedArea > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: css :: GridNamedArea > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: css :: GridNamedArea > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: css :: GridNamedArea > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsTString_open1_char16_t_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char16_t_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ::nsstring::nsStringRepr > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ::nsstring::nsStringRepr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsCSSValueList_DefaultDelete_open1_nsCSSValueList_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValueList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValueList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValueList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValueList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsCSSValueList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsCSSValuePairList_DefaultDelete_open1_nsCSSValuePairList_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsCSSValuePairList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsCSSValueGradientStop_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsCSSValueGradientStop > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCSSValueGradientStop > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsCSSValueGradientStop > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCSSValueGradientStop > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_12 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_13 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_imgRequestProxy_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: imgRequestProxy > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: imgRequestProxy > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: imgRequestProxy > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: imgRequestProxy > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_ProxyBehaviour_DefaultDelete_open1_ProxyBehaviour_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: ProxyBehaviour > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: ProxyBehaviour > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: ProxyBehaviour > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: ProxyBehaviour > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_ProxyBehaviour_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ImageURL_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: image :: ImageURL > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: image :: ImageURL > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: image :: ImageURL > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: image :: ImageURL > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsILoadGroup_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_TabGroup_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: TabGroup > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: TabGroup > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: TabGroup > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: TabGroup > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIEventTarget_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsTString_open1_char16_t_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char16_t_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ::nsstring::nsStringRepr > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ::nsstring::nsStringRepr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsAtom_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsRefPtrHashKey < root :: nsAtom > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsRefPtrHashKey < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ptr_CounterStyle_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < * mut root :: mozilla :: CounterStyle > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: mozilla :: CounterStyle > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < * mut root :: mozilla :: CounterStyle > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: mozilla :: CounterStyle > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleGradientStop_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleGradientStop > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleGradientStop > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleGradientStop > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleGradientStop > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_imgRequestProxy_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: imgRequestProxy > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: imgRequestProxy > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: imgRequestProxy > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: imgRequestProxy > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ImageValue_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: ImageValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: ImageValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: ImageValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: ImageValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ImageTracker_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: ImageTracker > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ImageTracker > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: ImageTracker > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ImageTracker > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_DocGroup_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: DocGroup > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: DocGroup > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: DocGroup > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: DocGroup > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMArray_open0_imgIContainer_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMArray > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMArray ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMArray > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMArray ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleSides_DefaultDelete_open1_nsStyleSides_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleSides > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleSides > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleSides > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleSides > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleSides_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleSides_DefaultDelete_open1_nsStyleSides_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleSides > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleSides > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleSides > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleSides > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleSides_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_CachedBorderImageData_DefaultDelete_open1_CachedBorderImageData_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: CachedBorderImageData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: CachedBorderImageData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: CachedBorderImageData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: CachedBorderImageData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_CachedBorderImageData_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleSides_DefaultDelete_open1_nsStyleSides_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleSides > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleSides > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleSides > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleSides > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleSides_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsStyleAutoArray_open0_nsStyleImageLayers_Layer_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsStyleAutoArray < root :: nsStyleImageLayers_Layer > > ( ) , 104usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: nsStyleImageLayers_Layer > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsStyleAutoArray < root :: nsStyleImageLayers_Layer > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: nsStyleImageLayers_Layer > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_unsigned_int_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < :: std :: os :: raw :: c_uint > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < :: std :: os :: raw :: c_uint > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < :: std :: os :: raw :: c_uint > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < :: std :: os :: raw :: c_uint > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsBorderColors_DefaultDelete_open1_nsBorderColors_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsBorderColors > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsBorderColors > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsBorderColors > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsBorderColors > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsBorderColors_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_pair_open1_nsTString_open2_char16_t_close2_nsTString_open2_char16_t_close2_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_pair_open0_nsTString_open1_char16_t_close1_nsTString_open1_char16_t_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > ( ) , 32usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char16_t_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ::nsstring::nsStringRepr > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ::nsstring::nsStringRepr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char16_t_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ::nsstring::nsStringRepr > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ::nsstring::nsStringRepr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsStyleImageRequest_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsStyleImageRequest > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsStyleImageRequest > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsStyleImageRequest > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsStyleImageRequest > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsStyleQuoteValues_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsStyleQuoteValues > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsStyleQuoteValues > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsStyleQuoteValues > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsStyleQuoteValues > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsTArray_open1_nsTString_open2_char16_t_close2_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsTArray < ::nsstring::nsStringRepr > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsTArray < ::nsstring::nsStringRepr > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsTArray < ::nsstring::nsStringRepr > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsTArray < ::nsstring::nsStringRepr > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsTString_open1_char16_t_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char16_t_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ::nsstring::nsStringRepr > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ::nsstring::nsStringRepr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleCoord_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleCoord_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsTString_open1_char16_t_close1_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char16_t_close0_instantiation_6 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ::nsstring::nsStringRepr > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ::nsstring::nsStringRepr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsTString_open1_char16_t_close1_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char16_t_close0_instantiation_7 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ::nsstring::nsStringRepr > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ::nsstring::nsStringRepr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleGridTemplate_DefaultDelete_open1_nsStyleGridTemplate_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleGridTemplate_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleGridTemplate_DefaultDelete_open1_nsStyleGridTemplate_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleGridTemplate_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_GridTemplateAreasValue_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: GridTemplateAreasValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: GridTemplateAreasValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: GridTemplateAreasValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: GridTemplateAreasValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsCSSShadowArray_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsCSSShadowArray > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSShadowArray > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsCSSShadowArray > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSShadowArray > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_6 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_7 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleCoord_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleImage_DefaultDelete_open1_nsStyleImage_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleImage > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleImage > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleImage > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleImage > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleImage_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleImage_DefaultDelete_open1_nsStyleImage_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleImage > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleImage > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleImage > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleImage > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleImage_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_StyleBasicShape_DefaultDelete_open1_StyleBasicShape_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_StyleBasicShape_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_StyleBasicShape_DefaultDelete_open1_StyleBasicShape_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_StyleBasicShape_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_StyleBasicShape_DefaultDelete_open1_StyleBasicShape_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_StyleBasicShape_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleImage_DefaultDelete_open1_nsStyleImage_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleImage > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleImage > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleImage > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleImage > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleImage_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLValue_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsAtom_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: nsAtom > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsAtom > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: nsAtom > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsAtom > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_8 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_Position_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: Position > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: Position > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: Position > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: Position > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsCSSValueSharedList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsCSSValueSharedList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSValueSharedList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsCSSValueSharedList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSValueSharedList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsStyleAutoArray_open0_StyleTransition_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsStyleAutoArray < root :: mozilla :: StyleTransition > > ( ) , 48usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: mozilla :: StyleTransition > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsStyleAutoArray < root :: mozilla :: StyleTransition > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: mozilla :: StyleTransition > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsStyleAutoArray_open0_StyleAnimation_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > > ( ) , 56usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleContentData_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleContentData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleContentData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleContentData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleContentData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleCounterData_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleCounterData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCounterData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleCounterData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCounterData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleCounterData_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleCounterData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCounterData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleCounterData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCounterData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsCSSValueSharedList_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsCSSValueSharedList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSValueSharedList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsCSSValueSharedList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSValueSharedList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsStyleImageRequest_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsStyleImageRequest > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsStyleImageRequest > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsStyleImageRequest > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsStyleImageRequest > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsCursorImage_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsCursorImage > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCursorImage > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsCursorImage > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCursorImage > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLValue_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLValue_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLValue_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleCoord_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsAtom_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: nsAtom > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsAtom > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: nsAtom > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsAtom > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_9 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleFilter_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleFilter > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleFilter > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleFilter > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleFilter > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsCSSShadowArray_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsCSSShadowArray > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSShadowArray > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsCSSShadowArray > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSShadowArray > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ptr_nsISupports_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < * mut root :: nsISupports > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: nsISupports > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < * mut root :: nsISupports > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: nsISupports > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsCSSValueList_DefaultDelete_open1_nsCSSValueList_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValueList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValueList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValueList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValueList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsCSSValueList_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsCSSValuePairList_DefaultDelete_open1_nsCSSValuePairList_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsCSSValuePairList_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_RawServoAnimationValue_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: RawServoAnimationValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoAnimationValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: RawServoAnimationValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoAnimationValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsTString_open1_char_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsTString < :: std :: os :: raw :: c_char > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsTString < :: std :: os :: raw :: c_char > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsTString < :: std :: os :: raw :: c_char > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsTString < :: std :: os :: raw :: c_char > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTString < :: std :: os :: raw :: c_char > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTString < :: std :: os :: raw :: c_char > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTString < :: std :: os :: raw :: c_char > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTString < :: std :: os :: raw :: c_char > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_14 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_15 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_16 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_StyleSheet_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_RawServoStyleSheetContents_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: RawServoStyleSheetContents > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoStyleSheetContents > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: RawServoStyleSheetContents > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoStyleSheetContents > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLExtraData_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: URLExtraData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: URLExtraData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ServoCSSRuleList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: ServoCSSRuleList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoCSSRuleList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: ServoCSSRuleList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoCSSRuleList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_6 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_StyleSheet_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: StyleSheet > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: StyleSheet > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: StyleSheet > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: StyleSheet > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_StyleSheet_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_SheetLoadData_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: css :: SheetLoadData > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: css :: SheetLoadData > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: css :: SheetLoadData > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: css :: SheetLoadData > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_StyleSheet_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_Loader_Sheets_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsAutoPtr < root :: mozilla :: css :: Loader_Sheets > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: mozilla :: css :: Loader_Sheets > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsAutoPtr < root :: mozilla :: css :: Loader_Sheets > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: mozilla :: css :: Loader_Sheets > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_DocGroup_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: DocGroup > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: DocGroup > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: DocGroup > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: DocGroup > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIConsoleReportCollector_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_BaseTimeDuration_open0_StickyTimeDurationValueCalculator_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: BaseTimeDuration > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: BaseTimeDuration ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: BaseTimeDuration > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: BaseTimeDuration ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_RawServoDeclarationBlock_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: RawServoDeclarationBlock > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoDeclarationBlock > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: RawServoDeclarationBlock > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoDeclarationBlock > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_PropertyValuePair_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: PropertyValuePair > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: PropertyValuePair > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: PropertyValuePair > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: PropertyValuePair > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ServoAttrSnapshot_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: ServoAttrSnapshot > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: ServoAttrSnapshot > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: ServoAttrSnapshot > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: ServoAttrSnapshot > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIContent_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsXBLBinding_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsXBLBinding > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsXBLBinding > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsXBLBinding > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsXBLBinding > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_XBLChildrenElement_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_XBLChildrenElement_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_XBLChildrenElement_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAnonymousContentList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAnonymousContentList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAnonymousContentList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAnonymousContentList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAnonymousContentList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsICSSDeclaration_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_DeclarationBlock_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: DeclarationBlock > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: DeclarationBlock > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: DeclarationBlock > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: DeclarationBlock > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIControllers_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsLabelsNodeList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsLabelsNodeList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsLabelsNodeList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsLabelsNodeList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsLabelsNodeList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ShadowRoot_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ShadowRoot_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ptr_nsIContent_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < * mut root :: nsIContent > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: nsIContent > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < * mut root :: nsIContent > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: nsIContent > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_HTMLSlotElement_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: HTMLSlotElement > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: HTMLSlotElement > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: HTMLSlotElement > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: HTMLSlotElement > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsXBLBinding_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsXBLBinding > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsXBLBinding > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsXBLBinding > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsXBLBinding > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIContent_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_CustomElementData_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: CustomElementData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: CustomElementData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: CustomElementData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: CustomElementData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsISupports_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsICSSDeclaration_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsDOMAttributeMap_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsDOMAttributeMap > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDOMAttributeMap > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsDOMAttributeMap > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDOMAttributeMap > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsContentList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsContentList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsContentList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsContentList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsContentList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsDOMTokenList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsDOMTokenList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDOMTokenList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsDOMTokenList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDOMTokenList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_FragmentOrElement_nsExtendedDOMSlots_DefaultDelete_open1_FragmentOrElement_nsExtendedDOMSlots_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: dom :: FragmentOrElement_nsExtendedDOMSlots > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: dom :: FragmentOrElement_nsExtendedDOMSlots > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: dom :: FragmentOrElement_nsExtendedDOMSlots > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: dom :: FragmentOrElement_nsExtendedDOMSlots > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_FragmentOrElement_nsExtendedDOMSlots_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsDOMAttributeMap_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsDOMAttributeMap > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDOMAttributeMap > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsDOMAttributeMap > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDOMAttributeMap > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_Element_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsISupports_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsISMILAttr_DefaultDelete_open1_nsISMILAttr_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsISMILAttr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsISMILAttr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsISMILAttr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsISMILAttr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsISMILAttr_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsRefPtrHashKey_open0_Element_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsRefPtrHashKey < root :: mozilla :: dom :: Element > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: mozilla :: dom :: Element > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsRefPtrHashKey < root :: mozilla :: dom :: Element > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: mozilla :: dom :: Element > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ptr_nsIContent_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < * mut root :: nsIContent > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: nsIContent > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < * mut root :: nsIContent > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: nsIContent > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_Element_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: Element > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: Element > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: Element > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: Element > ) ) ) ; } # [ test ] fn __bindgen_test_layout_OwningNonNull_open0_EffectCompositor_AnimationStyleRuleProcessor_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: OwningNonNull < root :: mozilla :: EffectCompositor_AnimationStyleRuleProcessor > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: OwningNonNull < root :: mozilla :: EffectCompositor_AnimationStyleRuleProcessor > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: OwningNonNull < root :: mozilla :: EffectCompositor_AnimationStyleRuleProcessor > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: OwningNonNull < root :: mozilla :: EffectCompositor_AnimationStyleRuleProcessor > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleGridTemplate_DefaultDelete_open1_nsStyleGridTemplate_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleGridTemplate_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleGridTemplate_DefaultDelete_open1_nsStyleGridTemplate_close1_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleGridTemplate_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_RawServoMediaList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: RawServoMediaList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoMediaList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: RawServoMediaList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoMediaList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_RawServoStyleSet_DefaultDelete_open1_RawServoStyleSet_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: RawServoStyleSet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: RawServoStyleSet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: RawServoStyleSet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: RawServoStyleSet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_RawServoStyleSet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_ServoStyleSheet_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: ServoStyleSheet > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: ServoStyleSheet > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: ServoStyleSheet > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: ServoStyleSheet > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ServoStyleContext_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: ServoStyleContext > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleContext > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: ServoStyleContext > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleContext > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_PostTraversalTask_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: PostTraversalTask > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: PostTraversalTask > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: PostTraversalTask > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: PostTraversalTask > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ServoStyleRuleMap_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: ServoStyleRuleMap > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleRuleMap > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: ServoStyleRuleMap > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleRuleMap > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsBindingManager_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsBindingManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsBindingManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsBindingManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsBindingManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsXBLBinding_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: nsXBLBinding > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsXBLBinding > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: nsXBLBinding > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsXBLBinding > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsXBLBinding_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsXBLBinding > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsXBLBinding > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsXBLBinding > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsXBLBinding > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_nsTHashtable_open1_nsRefPtrHashKey_open2_nsIContent_close2_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < u64 > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( u64 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < u64 > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( u64 ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsIContent_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsRefPtrHashKey < root :: nsIContent > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsIContent > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsRefPtrHashKey < root :: nsIContent > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsIContent > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_nsInterfaceHashtable_open1_nsISupportsHashKey_nsIXPConnectWrappedJS_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < u64 > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( u64 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < u64 > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( u64 ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_nsRefPtrHashtable_open1_nsURIHashKey_nsXBLDocumentInfo_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < u64 > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( u64 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < u64 > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( u64 ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_nsInterfaceHashtable_open1_nsURIHashKey_nsIStreamListener_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < u64 > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( u64 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < u64 > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( u64 ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsRunnableMethod_open1_nsBindingManager_void_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < u64 > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( u64 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < u64 > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( u64 ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_10 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ServoStyleContext_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: ServoStyleContext > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleContext > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: ServoStyleContext > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleContext > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ServoStyleContext_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: ServoStyleContext > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleContext > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: ServoStyleContext > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleContext > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_11 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsCSSFontFaceRule_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsCSSFontFaceRule > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSFontFaceRule > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsCSSFontFaceRule > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSFontFaceRule > ) ) ) ; } }
+} # [ test ] fn bindgen_test_layout_nsMediaFeatures ( ) { assert_eq ! ( :: std :: mem :: size_of :: < nsMediaFeatures > ( ) , 1usize , concat ! ( "Size of: " , stringify ! ( nsMediaFeatures ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < nsMediaFeatures > ( ) , 1usize , concat ! ( "Alignment of " , stringify ! ( nsMediaFeatures ) ) ) ; } impl Clone for nsMediaFeatures { fn clone ( & self ) -> Self { * self } } # [ test ] fn __bindgen_test_layout_nsTSubstring_open0_char16_t_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTSubstring < u16 > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTSubstring < u16 > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTSubstring < u16 > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTSubstring < u16 > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char16_t_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < ::nsstring::nsStringRepr > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < ::nsstring::nsStringRepr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( ::nsstring::nsStringRepr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTSubstring_open0_char_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTSubstring < :: std :: os :: raw :: c_char > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTSubstring < :: std :: os :: raw :: c_char > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTSubstring < :: std :: os :: raw :: c_char > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTSubstring < :: std :: os :: raw :: c_char > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTString_open0_char_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTString < :: std :: os :: raw :: c_char > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTString < :: std :: os :: raw :: c_char > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTString < :: std :: os :: raw :: c_char > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTString < :: std :: os :: raw :: c_char > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsISupports_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_CSSVariableValues_Variable_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: CSSVariableValues_Variable > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: CSSVariableValues_Variable > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: CSSVariableValues_Variable > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: CSSVariableValues_Variable > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_FontFamilyName_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: FontFamilyName > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: FontFamilyName > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: FontFamilyName > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: FontFamilyName > ) ) ) ; } # [ test ] fn __bindgen_test_layout_NotNull_open0_RefPtr_open1_SharedFontList_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: NotNull < root :: RefPtr < root :: mozilla :: SharedFontList > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: NotNull < root :: RefPtr < root :: mozilla :: SharedFontList > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: NotNull < root :: RefPtr < root :: mozilla :: SharedFontList > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: NotNull < root :: RefPtr < root :: mozilla :: SharedFontList > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_SharedFontList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: SharedFontList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: SharedFontList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: SharedFontList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: SharedFontList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_uint32_t_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < u32 > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < u32 > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < u32 > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < u32 > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_gfxFontFeatureValueSet_ValueList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: gfxFontFeatureValueSet_ValueList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxFontFeatureValueSet_ValueList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: gfxFontFeatureValueSet_ValueList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxFontFeatureValueSet_ValueList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_uint32_t_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < u32 > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < u32 > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < u32 > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < u32 > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_gfxAlternateValue_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: gfxAlternateValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxAlternateValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: gfxAlternateValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxAlternateValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_gfxFontFeatureValueSet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: gfxFontFeatureValueSet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: gfxFontFeatureValueSet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: gfxFontFeatureValueSet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: gfxFontFeatureValueSet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_gfxFontFeature_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: gfxFontFeature > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxFontFeature > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: gfxFontFeature > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxFontFeature > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_gfxFontVariation_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: gfxFontVariation > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxFontVariation > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: gfxFontVariation > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: gfxFontVariation > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsAtom_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: nsAtom > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsAtom > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: nsAtom > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsAtom > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_Note_DeletePolicy_open1_JSErrorNotes_Note_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_Note_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_DeletePolicy_open1_JSErrorNotes_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_iterator_open0_input_iterator_tag_UniquePtr_open1_JSErrorNotes_Note_DeletePolicy_open2_JSErrorNotes_Note_close2_close1_long_ptr_UniquePtr_ref_UniquePtr_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: std :: iterator > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: std :: iterator ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: std :: iterator > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: std :: iterator ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_Note_DeletePolicy_open1_JSErrorNotes_Note_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_Note_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_Note_DeletePolicy_open1_JSErrorNotes_Note_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_Note_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_Note_DeletePolicy_open1_JSErrorNotes_Note_close1_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_Note_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_Note_DeletePolicy_open1_JSErrorNotes_Note_close1_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_Note_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_Note_DeletePolicy_open1_JSErrorNotes_Note_close1_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes_Note > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_Note_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_JSErrorNotes_DeletePolicy_open1_JSErrorNotes_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: JSErrorNotes > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: JSErrorNotes > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DeletePolicy_open0_JSErrorNotes_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: JS :: DeletePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: JS :: DeletePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_StyleSheet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_MediaList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: MediaList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: MediaList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: MediaList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: MediaList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_StyleSheet_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_StyleSetHandle_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: StyleSetHandle > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: StyleSetHandle > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: StyleSetHandle > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: StyleSetHandle > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_ProfilerBacktrace_ProfilerBacktraceDestructor_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: ProfilerBacktrace > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: ProfilerBacktrace > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: ProfilerBacktrace > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: ProfilerBacktrace > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsNodeInfoManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsNodeInfoManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsNodeInfoManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsNodeInfoManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsNodeInfoManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsBindingManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsBindingManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsBindingManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsBindingManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsBindingManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAttrChildContentList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAttrChildContentList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAttrChildContentList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAttrChildContentList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAttrChildContentList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_LinkedList_open1_nsRange_close1_DefaultDelete_open1_LinkedList_open2_nsRange_close2_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_LinkedList_open1_nsRange_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_LinkedList_open1_nsRange_close1_DefaultDelete_open1_LinkedList_open2_nsRange_close2_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: LinkedList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_LinkedList_open1_nsRange_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_NodeInfo_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: NodeInfo > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: NodeInfo > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: NodeInfo > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: NodeInfo > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIWeakReference_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ptr_void_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < * mut :: std :: os :: raw :: c_void > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < * mut :: std :: os :: raw :: c_void > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < * mut :: std :: os :: raw :: c_void > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < * mut :: std :: os :: raw :: c_void > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsPtrHashKey_open0_void_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsPtrHashKey < :: std :: os :: raw :: c_void > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsPtrHashKey < :: std :: os :: raw :: c_void > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsPtrHashKey < :: std :: os :: raw :: c_void > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsPtrHashKey < :: std :: os :: raw :: c_void > ) ) ) ; } # [ test ] fn __bindgen_test_layout_StaticRefPtr_open0_nsIContent_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: StaticRefPtr < root :: nsIContent > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: nsIContent > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: StaticRefPtr < root :: nsIContent > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: StaticRefPtr < root :: nsIContent > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsPresContext_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsPresContext > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsPresContext > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsPresContext > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsPresContext > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsFrameSelection_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsFrameSelection > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsFrameSelection > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsFrameSelection > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsFrameSelection > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsITimer_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsPtrHashKey_open0_WeakFrame_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsPtrHashKey < root :: WeakFrame > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsPtrHashKey < root :: WeakFrame > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsPtrHashKey < root :: WeakFrame > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsPtrHashKey < root :: WeakFrame > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsAtom_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsRefPtrHashKey < root :: nsAtom > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsRefPtrHashKey < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsCString_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsCString > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCString > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsCString > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCString > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_EventTarget_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_EventTarget_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_Performance_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: Performance > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: Performance > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: Performance > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: Performance > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_TimeoutManager_DefaultDelete_open1_TimeoutManager_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: dom :: TimeoutManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: dom :: TimeoutManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: dom :: TimeoutManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: dom :: TimeoutManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_TimeoutManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsPIDOMWindowOuter_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIContent_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ptr_AudioContext_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < * mut root :: mozilla :: dom :: AudioContext > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: mozilla :: dom :: AudioContext > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < * mut root :: mozilla :: dom :: AudioContext > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: mozilla :: dom :: AudioContext > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_TabGroup_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: TabGroup > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: TabGroup > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: TabGroup > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: TabGroup > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsPIDOMWindowInner_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_EventTarget_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_EventTarget_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_Element_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocShell_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_TabGroup_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: TabGroup > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: TabGroup > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: TabGroup > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: TabGroup > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsPIDOMWindowOuter_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_RawServoAnimationValue_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: RawServoAnimationValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoAnimationValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: RawServoAnimationValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoAnimationValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_PropertyValuePair_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: PropertyValuePair > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: PropertyValuePair > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: PropertyValuePair > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: PropertyValuePair > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsStyleAutoArray_open0_StyleAnimation_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > > ( ) , 56usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_RawServoSelectorList_DefaultDelete_open1_RawServoSelectorList_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: RawServoSelectorList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: RawServoSelectorList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: RawServoSelectorList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: RawServoSelectorList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_RawServoSelectorList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsCSSSelectorList_DefaultDelete_open1_nsCSSSelectorList_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsCSSSelectorList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsCSSSelectorList_DefaultDelete_open1_nsCSSSelectorList_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSSelectorList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsCSSSelectorList_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_RawServoSelectorList_DefaultDelete_open1_RawServoSelectorList_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: RawServoSelectorList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: RawServoSelectorList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: RawServoSelectorList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: RawServoSelectorList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_RawServoSelectorList_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIObserver_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsIDocument_SelectorCache_DefaultDelete_open1_nsIDocument_SelectorCache_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsIDocument_SelectorCache_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsIDocument_SelectorCache_DefaultDelete_open1_nsIDocument_SelectorCache_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsIDocument_SelectorCache > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsIDocument_SelectorCache_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_6 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_7 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_8 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_9 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLExtraData_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: URLExtraData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: URLExtraData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_NotNull_open0_ptr_const_Encoding_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: NotNull < * const root :: nsIDocument_Encoding > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: NotNull < * const root :: nsIDocument_Encoding > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: NotNull < * const root :: nsIDocument_Encoding > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: NotNull < * const root :: nsIDocument_Encoding > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_Loader_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: Loader > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: Loader > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: Loader > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: Loader > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ImageLoader_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: ImageLoader > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: ImageLoader > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: ImageLoader > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: ImageLoader > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsHTMLStyleSheet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsHTMLStyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsHTMLStyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsHTMLStyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsHTMLStyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsHTMLCSSStyleSheet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsHTMLCSSStyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsHTMLCSSStyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsHTMLCSSStyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsHTMLCSSStyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ImageTracker_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: ImageTracker > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ImageTracker > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: ImageTracker > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ImageTracker > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_nsTHashtable_open1_nsPtrHashKey_open2_nsISupports_close2_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < u64 > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( u64 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < u64 > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( u64 ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_Link_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsSMILAnimationController_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsSMILAnimationController > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsSMILAnimationController > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsSMILAnimationController > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsSMILAnimationController > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsAutoPtr_open1_nsPropertyTable_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsAutoPtr < root :: nsPropertyTable > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsAutoPtr < root :: nsPropertyTable > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsAutoPtr < root :: nsPropertyTable > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsAutoPtr < root :: nsPropertyTable > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIHTMLCollection_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_FontFaceSet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: FontFaceSet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: FontFaceSet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: FontFaceSet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: FontFaceSet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIScriptGlobalObject_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIChannel_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsISupports_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIChannel_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMArray_open0_nsINode_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMArray > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMArray ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMArray > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMArray ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsWeakPtr_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsWeakPtr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsWeakPtr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsWeakPtr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsWeakPtr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocumentEncoder_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsIDocument_FrameRequest_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsIDocument_FrameRequest > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsIDocument_FrameRequest > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsIDocument_FrameRequest > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsIDocument_FrameRequest > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIStructuredCloneContainer_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIVariant_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_XPathEvaluator_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: XPathEvaluator > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: XPathEvaluator > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: XPathEvaluator > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: XPathEvaluator > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_AnonymousContent_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: AnonymousContent > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: AnonymousContent > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: AnonymousContent > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: AnonymousContent > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_LinkedList_open0_MediaQueryList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: LinkedList > ( ) , 24usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: LinkedList ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: LinkedList > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: LinkedList ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_DocGroup_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: DocGroup > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: DocGroup > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: DocGroup > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: DocGroup > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsCOMPtr_open1_nsIRunnable_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsCOMPtr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCOMPtr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsCOMPtr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCOMPtr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIRunnable_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsCOMPtr_open1_nsIPrincipal_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsCOMPtr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCOMPtr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsCOMPtr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCOMPtr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_uint64_t_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < u64 > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < u64 > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < u64 > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < u64 > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsINode_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_LangGroupFontPrefs_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsAutoPtr < root :: mozilla :: LangGroupFontPrefs > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: mozilla :: LangGroupFontPrefs > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsAutoPtr < root :: mozilla :: LangGroupFontPrefs > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: mozilla :: LangGroupFontPrefs > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_6 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsDeviceContext_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsDeviceContext > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDeviceContext > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsDeviceContext > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDeviceContext > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_EventStateManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: EventStateManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: EventStateManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: EventStateManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: EventStateManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsRefreshDriver_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsRefreshDriver > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsRefreshDriver > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsRefreshDriver > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsRefreshDriver > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_EffectCompositor_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: EffectCompositor > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: EffectCompositor > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: EffectCompositor > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: EffectCompositor > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsTransitionManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsTransitionManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsTransitionManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsTransitionManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsTransitionManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAnimationManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAnimationManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAnimationManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAnimationManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAnimationManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_RestyleManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: RestyleManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: RestyleManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: RestyleManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: RestyleManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_CounterStyleManager_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: CounterStyleManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: CounterStyleManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: CounterStyleManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: CounterStyleManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_gfxFontFeatureValueSet_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: gfxFontFeatureValueSet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: gfxFontFeatureValueSet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: gfxFontFeatureValueSet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: gfxFontFeatureValueSet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsITheme_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrintSettings_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsITimer_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsBidi_DefaultDelete_open1_nsBidi_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsBidi > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsBidi > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsBidi > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsBidi > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsBidi_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsRect_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsRect > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsRect > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsRect > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsRect > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_gfxTextPerfMetrics_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsAutoPtr < root :: gfxTextPerfMetrics > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: gfxTextPerfMetrics > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsAutoPtr < root :: gfxTextPerfMetrics > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: gfxTextPerfMetrics > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_gfxMissingFontRecorder_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsAutoPtr < root :: gfxMissingFontRecorder > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: gfxMissingFontRecorder > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsAutoPtr < root :: gfxMissingFontRecorder > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: gfxMissingFontRecorder > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsAtom_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsRefPtrHashKey < root :: nsAtom > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsRefPtrHashKey < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_URLParams_Param_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: dom :: URLParams_Param > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: dom :: URLParams_Param > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: dom :: URLParams_Param > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: dom :: URLParams_Param > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_URLParams_DefaultDelete_open1_URLParams_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: dom :: URLParams > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: dom :: URLParams > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: dom :: URLParams > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: dom :: URLParams > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_URLParams_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_10 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_11 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_const_char_FreePolicy_open1_const_char_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < :: std :: os :: raw :: c_char > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < :: std :: os :: raw :: c_char > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < :: std :: os :: raw :: c_char > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < :: std :: os :: raw :: c_char > ) ) ) ; } # [ test ] fn __bindgen_test_layout_FreePolicy_open0_const_char_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: detail :: FreePolicy > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: detail :: FreePolicy ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: detail :: FreePolicy > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: detail :: FreePolicy ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIEventTarget_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsMainThreadPtrHandle_open0_nsIURI_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsMainThreadPtrHandle < root :: nsIURI > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsMainThreadPtrHandle < root :: nsIURI > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsMainThreadPtrHandle < root :: nsIURI > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsMainThreadPtrHandle < root :: nsIURI > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLExtraData_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: URLExtraData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: URLExtraData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsPtrHashKey_open0_nsIDocument_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsPtrHashKey < root :: nsIDocument > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsPtrHashKey < root :: nsIDocument > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsPtrHashKey < root :: nsIDocument > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsPtrHashKey < root :: nsIDocument > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_GridNamedArea_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: css :: GridNamedArea > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: css :: GridNamedArea > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: css :: GridNamedArea > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: css :: GridNamedArea > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsString_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsCSSValueList_DefaultDelete_open1_nsCSSValueList_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValueList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValueList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValueList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValueList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsCSSValueList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsCSSValuePairList_DefaultDelete_open1_nsCSSValuePairList_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsCSSValuePairList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsCSSValueGradientStop_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsCSSValueGradientStop > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCSSValueGradientStop > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsCSSValueGradientStop > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCSSValueGradientStop > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_12 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_13 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_imgRequestProxy_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: imgRequestProxy > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: imgRequestProxy > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: imgRequestProxy > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: imgRequestProxy > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_ProxyBehaviour_DefaultDelete_open1_ProxyBehaviour_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: ProxyBehaviour > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: ProxyBehaviour > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: ProxyBehaviour > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: ProxyBehaviour > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_ProxyBehaviour_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_imgRequestProxy_ImageURL_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: imgRequestProxy_ImageURL > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: imgRequestProxy_ImageURL > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: imgRequestProxy_ImageURL > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: imgRequestProxy_ImageURL > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsILoadGroup_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_TabGroup_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: TabGroup > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: TabGroup > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: TabGroup > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: TabGroup > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIEventTarget_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsString_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsAtom_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsRefPtrHashKey < root :: nsAtom > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsRefPtrHashKey < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ptr_CounterStyle_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < * mut root :: mozilla :: CounterStyle > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: mozilla :: CounterStyle > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < * mut root :: mozilla :: CounterStyle > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: mozilla :: CounterStyle > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleGradientStop_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleGradientStop > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleGradientStop > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleGradientStop > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleGradientStop > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_imgRequestProxy_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: imgRequestProxy > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: imgRequestProxy > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: imgRequestProxy > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: imgRequestProxy > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ImageValue_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: ImageValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: ImageValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: ImageValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: ImageValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ImageTracker_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: ImageTracker > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ImageTracker > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: ImageTracker > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ImageTracker > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_DocGroup_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: DocGroup > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: DocGroup > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: DocGroup > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: DocGroup > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMArray_open0_imgIContainer_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMArray > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMArray ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMArray > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMArray ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleSides_DefaultDelete_open1_nsStyleSides_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleSides > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleSides > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleSides > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleSides > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleSides_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleSides_DefaultDelete_open1_nsStyleSides_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleSides > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleSides > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleSides > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleSides > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleSides_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_CachedBorderImageData_DefaultDelete_open1_CachedBorderImageData_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: CachedBorderImageData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: CachedBorderImageData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: CachedBorderImageData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: CachedBorderImageData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_CachedBorderImageData_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleSides_DefaultDelete_open1_nsStyleSides_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleSides > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleSides > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleSides > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleSides > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleSides_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsStyleAutoArray_open0_nsStyleImageLayers_Layer_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsStyleAutoArray < root :: nsStyleImageLayers_Layer > > ( ) , 104usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: nsStyleImageLayers_Layer > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsStyleAutoArray < root :: nsStyleImageLayers_Layer > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: nsStyleImageLayers_Layer > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nscolor_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nscolor > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nscolor > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nscolor > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nscolor > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsBorderColors_DefaultDelete_open1_nsBorderColors_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsBorderColors > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsBorderColors > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsBorderColors > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsBorderColors > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsBorderColors_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_pair_open1_nsString_nsString_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_pair_open0_nsString_nsString_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > ( ) , 32usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: std :: pair < ::nsstring::nsStringRepr , ::nsstring::nsStringRepr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsStyleImageRequest_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsStyleImageRequest > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsStyleImageRequest > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsStyleImageRequest > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsStyleImageRequest > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsStyleQuoteValues_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsStyleQuoteValues > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsStyleQuoteValues > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsStyleQuoteValues > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsStyleQuoteValues > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsTArray_open1_nsString_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsTArray < ::nsstring::nsStringRepr > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsTArray < ::nsstring::nsStringRepr > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsTArray < ::nsstring::nsStringRepr > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsTArray < ::nsstring::nsStringRepr > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsString_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleCoord_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleCoord_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsString_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsString_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < ::nsstring::nsStringRepr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < ::nsstring::nsStringRepr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleGridTemplate_DefaultDelete_open1_nsStyleGridTemplate_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleGridTemplate_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleGridTemplate_DefaultDelete_open1_nsStyleGridTemplate_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleGridTemplate_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_GridTemplateAreasValue_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: GridTemplateAreasValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: GridTemplateAreasValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: GridTemplateAreasValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: GridTemplateAreasValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsCSSShadowArray_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsCSSShadowArray > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSShadowArray > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsCSSShadowArray > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSShadowArray > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_6 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_7 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleCoord_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleImage_DefaultDelete_open1_nsStyleImage_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleImage > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleImage > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleImage > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleImage > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleImage_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleImage_DefaultDelete_open1_nsStyleImage_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleImage > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleImage > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleImage > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleImage > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleImage_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_StyleBasicShape_DefaultDelete_open1_StyleBasicShape_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_StyleBasicShape_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_StyleBasicShape_DefaultDelete_open1_StyleBasicShape_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_StyleBasicShape_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_StyleBasicShape_DefaultDelete_open1_StyleBasicShape_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: StyleBasicShape > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_StyleBasicShape_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleImage_DefaultDelete_open1_nsStyleImage_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleImage > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleImage > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleImage > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleImage > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleImage_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLValue_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsAtom_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: nsAtom > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsAtom > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: nsAtom > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsAtom > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_8 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_Position_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: Position > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: Position > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: Position > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: Position > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsCSSValueSharedList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsCSSValueSharedList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSValueSharedList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsCSSValueSharedList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSValueSharedList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsStyleAutoArray_open0_StyleTransition_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsStyleAutoArray < root :: mozilla :: StyleTransition > > ( ) , 48usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: mozilla :: StyleTransition > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsStyleAutoArray < root :: mozilla :: StyleTransition > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: mozilla :: StyleTransition > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsStyleAutoArray_open0_StyleAnimation_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > > ( ) , 56usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsStyleAutoArray < root :: mozilla :: StyleAnimation > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleContentData_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleContentData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleContentData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleContentData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleContentData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleCounterData_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleCounterData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCounterData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleCounterData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCounterData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleCounterData_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleCounterData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCounterData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleCounterData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCounterData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsCSSValueSharedList_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsCSSValueSharedList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSValueSharedList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsCSSValueSharedList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSValueSharedList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsStyleImageRequest_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsStyleImageRequest > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsStyleImageRequest > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsStyleImageRequest > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsStyleImageRequest > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsCursorImage_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsCursorImage > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCursorImage > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsCursorImage > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCursorImage > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLValue_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLValue_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLValue_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: css :: URLValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: css :: URLValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleCoord_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleCoord > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleCoord > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsAtom_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: nsAtom > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsAtom > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: nsAtom > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsAtom > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_9 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsStyleFilter_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsStyleFilter > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleFilter > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsStyleFilter > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsStyleFilter > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsCSSShadowArray_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsCSSShadowArray > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSShadowArray > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsCSSShadowArray > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSShadowArray > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ptr_nsISupports_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < * mut root :: nsISupports > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: nsISupports > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < * mut root :: nsISupports > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: nsISupports > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsCSSValueList_DefaultDelete_open1_nsCSSValueList_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValueList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValueList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValueList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValueList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsCSSValueList_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsCSSValuePairList_DefaultDelete_open1_nsCSSValuePairList_close1_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsCSSValuePairList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsCSSValuePairList_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_RawServoAnimationValue_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: RawServoAnimationValue > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoAnimationValue > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: RawServoAnimationValue > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoAnimationValue > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_nsCString_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: nsCString > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCString > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: nsCString > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: nsCString > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_14 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_15 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIURI_close0_instantiation_16 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_5 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_StyleSheet_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_RawServoStyleSheetContents_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: RawServoStyleSheetContents > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoStyleSheetContents > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: RawServoStyleSheetContents > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoStyleSheetContents > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_URLExtraData_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: URLExtraData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: URLExtraData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: URLExtraData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ServoCSSRuleList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: ServoCSSRuleList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoCSSRuleList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: ServoCSSRuleList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoCSSRuleList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_6 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_StyleSheet_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: StyleSheet > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: StyleSheet > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: StyleSheet > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: StyleSheet > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_StyleSheet_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_SheetLoadData_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: css :: SheetLoadData > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: css :: SheetLoadData > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: css :: SheetLoadData > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: css :: SheetLoadData > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_StyleSheet_close0_instantiation_4 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: StyleSheet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: StyleSheet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_Loader_Sheets_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsAutoPtr < root :: mozilla :: css :: Loader_Sheets > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: mozilla :: css :: Loader_Sheets > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsAutoPtr < root :: mozilla :: css :: Loader_Sheets > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: mozilla :: css :: Loader_Sheets > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_DocGroup_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: DocGroup > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: DocGroup > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: DocGroup > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: DocGroup > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIConsoleReportCollector_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_BaseTimeDuration_open0_StickyTimeDurationValueCalculator_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: BaseTimeDuration > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: BaseTimeDuration ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: BaseTimeDuration > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: BaseTimeDuration ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_RawServoDeclarationBlock_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: RawServoDeclarationBlock > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoDeclarationBlock > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: RawServoDeclarationBlock > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoDeclarationBlock > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_PropertyValuePair_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: PropertyValuePair > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: PropertyValuePair > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: PropertyValuePair > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: PropertyValuePair > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ServoAttrSnapshot_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: ServoAttrSnapshot > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: ServoAttrSnapshot > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: ServoAttrSnapshot > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: ServoAttrSnapshot > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIContent_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsXBLBinding_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsXBLBinding > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsXBLBinding > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsXBLBinding > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsXBLBinding > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_XBLChildrenElement_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_XBLChildrenElement_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_XBLChildrenElement_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: XBLChildrenElement > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAnonymousContentList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAnonymousContentList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAnonymousContentList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAnonymousContentList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAnonymousContentList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsICSSDeclaration_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_DeclarationBlock_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: DeclarationBlock > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: DeclarationBlock > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: DeclarationBlock > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: DeclarationBlock > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIControllers_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsLabelsNodeList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsLabelsNodeList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsLabelsNodeList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsLabelsNodeList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsLabelsNodeList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ShadowRoot_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ShadowRoot_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: ShadowRoot > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ptr_nsIContent_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < * mut root :: nsIContent > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: nsIContent > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < * mut root :: nsIContent > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: nsIContent > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_HTMLSlotElement_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: HTMLSlotElement > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: HTMLSlotElement > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: HTMLSlotElement > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: HTMLSlotElement > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsXBLBinding_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsXBLBinding > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsXBLBinding > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsXBLBinding > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsXBLBinding > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsIContent_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_CustomElementData_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: CustomElementData > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: CustomElementData > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: CustomElementData > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: CustomElementData > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsISupports_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsICSSDeclaration_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsDOMAttributeMap_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsDOMAttributeMap > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDOMAttributeMap > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsDOMAttributeMap > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDOMAttributeMap > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsContentList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsContentList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsContentList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsContentList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsContentList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsDOMTokenList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsDOMTokenList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDOMTokenList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsDOMTokenList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDOMTokenList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_FragmentOrElement_nsExtendedDOMSlots_DefaultDelete_open1_FragmentOrElement_nsExtendedDOMSlots_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: dom :: FragmentOrElement_nsExtendedDOMSlots > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: dom :: FragmentOrElement_nsExtendedDOMSlots > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: mozilla :: dom :: FragmentOrElement_nsExtendedDOMSlots > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: mozilla :: dom :: FragmentOrElement_nsExtendedDOMSlots > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_FragmentOrElement_nsExtendedDOMSlots_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsDOMAttributeMap_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsDOMAttributeMap > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDOMAttributeMap > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsDOMAttributeMap > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsDOMAttributeMap > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsDOMAttributeMap_Element_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsCOMPtr_open0_nsISupports_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsCOMPtr > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsCOMPtr ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsISMILAttr_DefaultDelete_open1_nsISMILAttr_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsISMILAttr > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsISMILAttr > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsISMILAttr > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsISMILAttr > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsISMILAttr_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsRefPtrHashKey_open0_Element_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsRefPtrHashKey < root :: mozilla :: dom :: Element > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: mozilla :: dom :: Element > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsRefPtrHashKey < root :: mozilla :: dom :: Element > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: mozilla :: dom :: Element > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_ptr_nsIContent_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < * mut root :: nsIContent > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: nsIContent > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < * mut root :: nsIContent > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < * mut root :: nsIContent > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_Element_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: dom :: Element > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: Element > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: dom :: Element > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: dom :: Element > ) ) ) ; } # [ test ] fn __bindgen_test_layout_OwningNonNull_open0_EffectCompositor_AnimationStyleRuleProcessor_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: OwningNonNull < root :: mozilla :: EffectCompositor_AnimationStyleRuleProcessor > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: OwningNonNull < root :: mozilla :: EffectCompositor_AnimationStyleRuleProcessor > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: OwningNonNull < root :: mozilla :: EffectCompositor_AnimationStyleRuleProcessor > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: OwningNonNull < root :: mozilla :: EffectCompositor_AnimationStyleRuleProcessor > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleGridTemplate_DefaultDelete_open1_nsStyleGridTemplate_close1_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleGridTemplate_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_nsStyleGridTemplate_DefaultDelete_open1_nsStyleGridTemplate_close1_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: nsStyleGridTemplate > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_nsStyleGridTemplate_close0_instantiation_3 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_RawServoMediaList_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: RawServoMediaList > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoMediaList > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: RawServoMediaList > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: RawServoMediaList > ) ) ) ; } # [ test ] fn __bindgen_test_layout_UniquePtr_open0_RawServoStyleSet_DefaultDelete_open1_RawServoStyleSet_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: UniquePtr < root :: RawServoStyleSet > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: RawServoStyleSet > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: UniquePtr < root :: RawServoStyleSet > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: UniquePtr < root :: RawServoStyleSet > ) ) ) ; } # [ test ] fn __bindgen_test_layout_DefaultDelete_open0_RawServoStyleSet_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: mozilla :: DefaultDelete > ( ) , 1usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: mozilla :: DefaultDelete ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_ServoStyleSheet_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: ServoStyleSheet > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: ServoStyleSheet > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: mozilla :: ServoStyleSheet > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: mozilla :: ServoStyleSheet > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ServoStyleContext_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: ServoStyleContext > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleContext > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: ServoStyleContext > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleContext > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_PostTraversalTask_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: mozilla :: PostTraversalTask > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: PostTraversalTask > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: mozilla :: PostTraversalTask > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: mozilla :: PostTraversalTask > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ServoStyleRuleMap_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: ServoStyleRuleMap > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleRuleMap > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: ServoStyleRuleMap > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleRuleMap > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsBindingManager_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsBindingManager > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsBindingManager > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsBindingManager > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsBindingManager > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsXBLBinding_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsTArray < root :: RefPtr < root :: nsXBLBinding > > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsXBLBinding > > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsTArray < root :: RefPtr < root :: nsXBLBinding > > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsTArray < root :: RefPtr < root :: nsXBLBinding > > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsXBLBinding_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsXBLBinding > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsXBLBinding > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsXBLBinding > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsXBLBinding > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_nsTHashtable_open1_nsRefPtrHashKey_open2_nsIContent_close2_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < u64 > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( u64 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < u64 > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( u64 ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsIContent_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsRefPtrHashKey < root :: nsIContent > > ( ) , 16usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsIContent > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsRefPtrHashKey < root :: nsIContent > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsRefPtrHashKey < root :: nsIContent > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_nsBindingManager_WrapperHashtable_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: nsAutoPtr < root :: nsBindingManager_WrapperHashtable > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: nsBindingManager_WrapperHashtable > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: nsAutoPtr < root :: nsBindingManager_WrapperHashtable > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: nsAutoPtr < root :: nsBindingManager_WrapperHashtable > ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_nsRefPtrHashtable_open1_nsURIHashKey_nsXBLDocumentInfo_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < u64 > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( u64 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < u64 > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( u64 ) ) ) ; } # [ test ] fn __bindgen_test_layout_nsAutoPtr_open0_nsInterfaceHashtable_open1_nsURIHashKey_nsIStreamListener_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < u64 > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( u64 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < u64 > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( u64 ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsRunnableMethod_open1_nsBindingManager_void_close1_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < u64 > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( u64 ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < u64 > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( u64 ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_10 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ServoStyleContext_close0_instantiation_1 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: ServoStyleContext > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleContext > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: ServoStyleContext > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleContext > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_ServoStyleContext_close0_instantiation_2 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: mozilla :: ServoStyleContext > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleContext > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: mozilla :: ServoStyleContext > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: mozilla :: ServoStyleContext > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_11 ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsAtom > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsAtom > ) ) ) ; } # [ test ] fn __bindgen_test_layout_RefPtr_open0_nsCSSFontFaceRule_close0_instantiation ( ) { assert_eq ! ( :: std :: mem :: size_of :: < root :: RefPtr < root :: nsCSSFontFaceRule > > ( ) , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSFontFaceRule > ) ) ) ; assert_eq ! ( :: std :: mem :: align_of :: < root :: RefPtr < root :: nsCSSFontFaceRule > > ( ) , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( root :: RefPtr < root :: nsCSSFontFaceRule > ) ) ) ; } }
\ No newline at end of file
diff --git a/servo/components/style/properties/longhand/box.mako.rs b/servo/components/style/properties/longhand/box.mako.rs
index 595f3e2e64ec..838c07d9a48b 100644
--- a/servo/components/style/properties/longhand/box.mako.rs
+++ b/servo/components/style/properties/longhand/box.mako.rs
@@ -911,6 +911,14 @@ ${helpers.single_keyword("-moz-orient",
     }
 </%helpers:longhand>
 
+${helpers.predefined_type(
+    "shape-image-threshold", "Opacity", "0.0",
+    products="gecko",
+    gecko_pref="layout.css.shape-outside.enabled",
+    animation_value_type="ComputedValue",
+    spec="https://drafts.csswg.org/css-shapes/#shape-image-threshold-property",
+)}
+
 ${helpers.predefined_type(
     "shape-outside",
     "basic_shape::FloatAreaShape",

From b1efbfb25a64d8f4ba419e2d034f0df45959592e Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Mon, 27 Nov 2017 15:01:25 +0800
Subject: [PATCH 121/219] Bug 1265343 Part 1 - Add shape-image-threshold to
 style system. r=heycam

devtools/shared/css/generated/properties-db.js is generated by running
"./mach devtools-css-db"

MozReview-Commit-ID: 1U4yoQTDwxi

--HG--
extra : rebase_source : 16049b4253ae9a3f6e24cc30896ed53f65ebaf7a
---
 devtools/shared/css/generated/properties-db.js |  6 ++++++
 layout/style/nsCSSPropList.h                   | 10 ++++++++++
 layout/style/nsComputedDOMStyle.cpp            |  8 ++++++++
 layout/style/nsComputedDOMStyle.h              |  1 +
 layout/style/nsComputedDOMStylePropertyList.h  |  1 +
 layout/style/nsRuleNode.cpp                    |  6 ++++++
 layout/style/nsStyleStruct.cpp                 | 14 +++++++++-----
 layout/style/nsStyleStruct.h                   |  4 ++++
 8 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
index 0ab8b125058b..3492c821b2a0 100644
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -3086,6 +3086,7 @@ exports.CSS_PROPERTIES = {
       "scroll-snap-points-y",
       "scroll-snap-type-x",
       "scroll-snap-type-y",
+      "shape-image-threshold",
       "shape-outside",
       "shape-rendering",
       "-moz-stack-sizing",
@@ -3371,6 +3372,7 @@ exports.CSS_PROPERTIES = {
       "geometricprecision",
       "grab",
       "grabbing",
+      "grayscale",
       "grid",
       "groove",
       "groupbox",
@@ -10000,6 +10002,10 @@ exports.PREFERENCES = [
     "scroll-snap-type-y",
     "layout.css.scroll-snap.enabled"
   ],
+  [
+    "shape-image-threshold",
+    "layout.css.shape-outside.enabled"
+  ],
   [
     "shape-outside",
     "layout.css.shape-outside.enabled"
diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index a7f6a367a039..2814c2e34e3b 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -3774,6 +3774,16 @@ CSS_PROP_DISPLAY(
     kScrollSnapTypeKTable,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_Discrete)
+CSS_PROP_DISPLAY(
+    shape-image-threshold,
+    shape_image_threshold,
+    ShapeImageThreshold,
+    CSS_PROPERTY_PARSE_VALUE,
+    "layout.css.shape-outside.enabled",
+    VARIANT_HN,
+    nullptr,
+    offsetof(nsStyleDisplay, mShapeImageThreshold),
+    eStyleAnimType_float)
 CSS_PROP_DISPLAY(
     shape-outside,
     shape_outside,
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index 172ba2382554..5f53dc038297 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -6569,6 +6569,14 @@ nsComputedDOMStyle::DoGetClipPath()
                         nsCSSProps::kClipPathGeometryBoxKTable);
 }
 
+already_AddRefed<CSSValue>
+nsComputedDOMStyle::DoGetShapeImageThreshold()
+{
+  RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
+  val->SetNumber(StyleDisplay()->mShapeImageThreshold);
+  return val.forget();
+}
+
 already_AddRefed<CSSValue>
 nsComputedDOMStyle::DoGetShapeOutside()
 {
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 489278771fe5..c3632c34cdc8 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -525,6 +525,7 @@ private:
   already_AddRefed<CSSValue> DoGetScrollSnapPointsY();
   already_AddRefed<CSSValue> DoGetScrollSnapDestination();
   already_AddRefed<CSSValue> DoGetScrollSnapCoordinate();
+  already_AddRefed<CSSValue> DoGetShapeImageThreshold();
   already_AddRefed<CSSValue> DoGetShapeOutside();
 
   /* User interface properties */
diff --git a/layout/style/nsComputedDOMStylePropertyList.h b/layout/style/nsComputedDOMStylePropertyList.h
index ea70cc62abe1..c89297eb2789 100644
--- a/layout/style/nsComputedDOMStylePropertyList.h
+++ b/layout/style/nsComputedDOMStylePropertyList.h
@@ -230,6 +230,7 @@ COMPUTED_STYLE_PROP(scroll_snap_points_x,          ScrollSnapPointsX)
 COMPUTED_STYLE_PROP(scroll_snap_points_y,          ScrollSnapPointsY)
 COMPUTED_STYLE_PROP(scroll_snap_type_x,            ScrollSnapTypeX)
 COMPUTED_STYLE_PROP(scroll_snap_type_y,            ScrollSnapTypeY)
+COMPUTED_STYLE_PROP(shape_image_threshold,         ShapeImageThreshold)
 COMPUTED_STYLE_PROP(shape_outside,                 ShapeOutside)
 //// COMPUTED_STYLE_PROP(size,                     Size)
 COMPUTED_STYLE_PROP(table_layout,                  TableLayout)
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index fe1e751a5eea..c92d087b81fb 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -6420,6 +6420,12 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
            parentDisplay->mOrient,
            StyleOrient::Inline);
 
+  // shape-image-threshold: number, inherit, initial
+  SetFactor(*aRuleData->ValueForShapeImageThreshold(),
+            display->mShapeImageThreshold, conditions,
+            parentDisplay->mShapeImageThreshold, 0.0f,
+            SETFCT_OPACITY | SETFCT_UNSET_INITIAL);
+
   // shape-outside: none | [ <basic-shape> || <shape-box> ] | <image>
   const nsCSSValue* shapeOutsideValue = aRuleData->ValueForShapeOutside();
   switch (shapeOutsideValue->GetUnit()) {
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 363199b623c9..be7b9b2a0b98 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -3684,6 +3684,7 @@ nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
   , mAnimationFillModeCount(aSource.mAnimationFillModeCount)
   , mAnimationPlayStateCount(aSource.mAnimationPlayStateCount)
   , mAnimationIterationCountCount(aSource.mAnimationIterationCountCount)
+  , mShapeImageThreshold(aSource.mShapeImageThreshold)
   , mShapeOutside(aSource.mShapeOutside)
 {
   MOZ_COUNT_CTOR(nsStyleDisplay);
@@ -3786,10 +3787,13 @@ nsStyleDisplay::CalcDifference(const nsStyleDisplay& aNewData) const
     hint |= nsChangeHint_ReflowHintsForFloatAreaChange;
   }
 
-  if (mShapeOutside != aNewData.mShapeOutside) {
+  if (mShapeOutside != aNewData.mShapeOutside ||
+      mShapeImageThreshold != aNewData.mShapeImageThreshold) {
     if (aNewData.mFloat != StyleFloat::None) {
-      // If we are floating, and our shape-outside property changes, our
-      // descendants are not impacted, but our ancestor and siblings are.
+      // If we are floating, and our shape-outside or shape-image-threshold
+      // are changed, our descendants are not impacted, but our ancestor and
+      // siblings are.
+      //
       // This is similar to a float-only change, but since the ISize of the
       // float area changes arbitrarily along its block axis, more is required
       // to get the siblings to adjust properly. Hinting overflow change is
@@ -3801,8 +3805,8 @@ nsStyleDisplay::CalcDifference(const nsStyleDisplay& aNewData) const
       hint |= nsChangeHint_ReflowHintsForFloatAreaChange |
               nsChangeHint_CSSOverflowChange;
     } else {
-      // shape-outside changed, but we don't need to reflow because we're not
-      // floating.
+      // shape-outside or shape-image-threshold changed, but we don't need
+      // to reflow because we're not floating.
       hint |= nsChangeHint_NeutralChange;
     }
   }
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index f41e0b470fec..75fe282360c4 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -2622,6 +2622,10 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay
            mAnimationPlayStateCount,
            mAnimationIterationCountCount;
 
+
+  // The threshold used for extracting a shape from shape-outside: <image>.
+  float mShapeImageThreshold = 0.0f; // [reset]
+
   mozilla::StyleShapeSource mShapeOutside; // [reset]
 
   bool IsBlockInsideStyle() const {

From 0afec2466e14bc15fb3bb3c664cf52669d73b23d Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Tue, 28 Nov 2017 16:06:21 +0800
Subject: [PATCH 122/219] Bug 1265343 Part 2 - Fix tests after adding
 'shape-image-threshold' to style system. r=heycam

MozReview-Commit-ID: IJgPOfD33AB

--HG--
extra : rebase_source : be2e9aa67d2b5d41724e9ae9e57a3c5b95de183c
---
 layout/style/test/property_database.js        |  9 ++++++
 .../test/test_transitions_per_property.html   |  6 ++++
 .../values/shape-image-threshold-000.html.ini | 32 -------------------
 .../values/shape-image-threshold-001.html.ini | 12 +++----
 .../values/shape-image-threshold-003.html.ini |  6 ----
 5 files changed, 21 insertions(+), 44 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-image-threshold-000.html.ini

diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index 685cf3e5573f..ec40e2451150 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -6399,6 +6399,15 @@ if (IsCSSPropertyPrefEnabled("svg.transform-box.enabled")) {
 }
 
 if (IsCSSPropertyPrefEnabled("layout.css.shape-outside.enabled")) {
+  gCSSProperties["shape-image-threshold"] = {
+    domProp: "shapeImageThreshold",
+    inherited: false,
+    type: CSS_TYPE_LONGHAND,
+    initial_values: [ "0", "0.0000", "-3", ],
+    other_values: [ "0.4", "1", "17", "397.376", "3e1", "3e+1", "3e-1", "3e0", "3e+0", "3e-0" ],
+    invalid_values: [ "0px", "1px", "20%", "default", "auto" ]
+  };
+
   gCSSProperties["shape-outside"] = {
     domProp: "shapeOutside",
     inherited: false,
diff --git a/layout/style/test/test_transitions_per_property.html b/layout/style/test/test_transitions_per_property.html
index 512a8b79d879..eda160d95716 100644
--- a/layout/style/test/test_transitions_per_property.html
+++ b/layout/style/test/test_transitions_per_property.html
@@ -311,6 +311,12 @@ var supported_properties = {
 };
 
 if (SpecialPowers.getBoolPref("layout.css.shape-outside.enabled")) {
+  supported_properties["shape-image-threshold"] =
+    [ test_float_zeroToOne_transition,
+      // shape-image-threshold (like opacity) is clamped in computed style
+      // (not parsing/interpolation)
+      test_float_zeroToOne_clamped ];
+
   supported_properties["shape-outside"] =
     [ test_basic_shape_or_url_transition ];
 }
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-image-threshold-000.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-image-threshold-000.html.ini
deleted file mode 100644
index 0ccfeb5a4e23..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-image-threshold-000.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[shape-image-threshold-000.html]
-  type: testharness
-  [0.0 - inline]
-    expected: FAIL
-
-  [.2 - inline]
-    expected: FAIL
-
-  [0.333 - inline]
-    expected: FAIL
-
-  [1.0 - inline]
-    expected: FAIL
-
-  [1.5 - inline]
-    expected: FAIL
-
-  [0.0 - computed]
-    expected: FAIL
-
-  [.2 - computed]
-    expected: FAIL
-
-  [0.333 - computed]
-    expected: FAIL
-
-  [1.0 - computed]
-    expected: FAIL
-
-  [1.5 - computed]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-image-threshold-001.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-image-threshold-001.html.ini
index 96df79a7613d..4befd112354c 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-image-threshold-001.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-image-threshold-001.html.ini
@@ -1,14 +1,14 @@
 [shape-image-threshold-001.html]
   type: testharness
   [calc(10/100) - computed]
-    expected: FAIL
+    expected:
+      if not stylo: FAIL
 
   [calc(10/100 + 30/100) - computed]
-    expected: FAIL
+    expected:
+      if not stylo: FAIL
 
   [calc(150/100) - computed]
-    expected: FAIL
-
-  [calc(150/100 - 2) - computed]
-    expected: FAIL
+    expected:
+      if not stylo: FAIL
 
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-image-threshold-003.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-image-threshold-003.html.ini
index 26590fb859e3..c683bf830056 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-image-threshold-003.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-image-threshold-003.html.ini
@@ -1,11 +1,5 @@
 [shape-image-threshold-003.html]
   type: testharness
-  [shape-image-threshold can be assigned 'inherit' value]
-    expected: FAIL
-
   [shape-image-threshold is not inherited and defaults to 0]
     expected: FAIL
 
-  [shape-margin is not inherited]
-    expected: FAIL
-

From 4b8304ef7310d1703c634a7ea84d2f8450fa5f91 Mon Sep 17 00:00:00 2001
From: Daosheng Mu <daoshengmu@gmail.com>
Date: Thu, 30 Nov 2017 19:37:07 +0800
Subject: [PATCH 123/219] Bug 1358247 - Reply VR vibrate promises to the
 individual channels; r=kip

MozReview-Commit-ID: 4NwYNkwKUMR

--HG--
extra : rebase_source : 9e9d8ddcb0f91a3745e6ed5e614bb696b6d950af
---
 gfx/vr/VRManager.cpp           | 11 ++++-----
 gfx/vr/VRManager.h             |  4 +--
 gfx/vr/gfxVR.h                 |  3 ++-
 gfx/vr/gfxVRGVR.cpp            |  2 +-
 gfx/vr/gfxVRGVR.h              |  2 +-
 gfx/vr/gfxVROSVR.cpp           |  2 +-
 gfx/vr/gfxVROSVR.h             |  3 ++-
 gfx/vr/gfxVROculus.cpp         | 43 ++++++++++++++++++--------------
 gfx/vr/gfxVROculus.h           |  8 +++---
 gfx/vr/gfxVROpenVR.cpp         | 45 ++++++++++++++++++----------------
 gfx/vr/gfxVROpenVR.h           |  8 +++---
 gfx/vr/gfxVRPuppet.cpp         |  2 +-
 gfx/vr/gfxVRPuppet.h           |  2 +-
 gfx/vr/ipc/VRManagerChild.h    |  2 +-
 gfx/vr/ipc/VRManagerParent.cpp |  4 ++-
 gfx/vr/ipc/VRManagerParent.h   | 17 +++++++++++++
 16 files changed, 93 insertions(+), 65 deletions(-)

diff --git a/gfx/vr/VRManager.cpp b/gfx/vr/VRManager.cpp
index 123f65ce66d0..47b392c64f1e 100644
--- a/gfx/vr/VRManager.cpp
+++ b/gfx/vr/VRManager.cpp
@@ -461,12 +461,13 @@ VRManager::NotifyGamepadChange(uint32_t aIndex, const T& aInfo)
 
 void
 VRManager::VibrateHaptic(uint32_t aControllerIdx, uint32_t aHapticIndex,
-                         double aIntensity, double aDuration, uint32_t aPromiseID)
+                         double aIntensity, double aDuration,
+                         const VRManagerPromise& aPromise)
 
 {
   for (uint32_t i = 0; i < mManagers.Length(); ++i) {
     mManagers[i]->VibrateHaptic(aControllerIdx, aHapticIndex,
-                                aIntensity, aDuration, aPromiseID);
+                                aIntensity, aDuration, aPromise);
   }
 }
 
@@ -479,11 +480,9 @@ VRManager::StopVibrateHaptic(uint32_t aControllerIdx)
 }
 
 void
-VRManager::NotifyVibrateHapticCompleted(uint32_t aPromiseID)
+VRManager::NotifyVibrateHapticCompleted(const VRManagerPromise& aPromise)
 {
-  for (auto iter = mVRManagerParents.Iter(); !iter.Done(); iter.Next()) {
-    Unused << iter.Get()->GetKey()->SendReplyGamepadVibrateHaptic(aPromiseID);
-  }
+  aPromise.mParent->SendReplyGamepadVibrateHaptic(aPromise.mPromiseID);
 }
 
 void
diff --git a/gfx/vr/VRManager.h b/gfx/vr/VRManager.h
index 7c79922ed442..5d5ccb5af20d 100644
--- a/gfx/vr/VRManager.h
+++ b/gfx/vr/VRManager.h
@@ -48,9 +48,9 @@ public:
   void GetVRControllerInfo(nsTArray<VRControllerInfo>& aControllerInfo);
   void CreateVRTestSystem();
   void VibrateHaptic(uint32_t aControllerIdx, uint32_t aHapticIndex,
-                     double aIntensity, double aDuration, uint32_t aPromiseID);
+                     double aIntensity, double aDuration, const VRManagerPromise& aPromise);
   void StopVibrateHaptic(uint32_t aControllerIdx);
-  void NotifyVibrateHapticCompleted(uint32_t aPromiseID);
+  void NotifyVibrateHapticCompleted(const VRManagerPromise& aPromise);
   void DispatchSubmitFrameResult(uint32_t aDisplayID, const VRSubmitFrameResultInfo& aResult);
 
 protected:
diff --git a/gfx/vr/gfxVR.h b/gfx/vr/gfxVR.h
index 7f71836ba0da..14c1088fb0c2 100644
--- a/gfx/vr/gfxVR.h
+++ b/gfx/vr/gfxVR.h
@@ -30,6 +30,7 @@ namespace gfx {
 class VRLayerParent;
 class VRDisplayHost;
 class VRControllerHost;
+class VRManagerPromise;
 
 enum class VRDeviceType : uint16_t {
   Oculus,
@@ -354,7 +355,7 @@ public:
   virtual void ScanForControllers() = 0;
   virtual void RemoveControllers() = 0;
   virtual void VibrateHaptic(uint32_t aControllerIdx, uint32_t aHapticIndex,
-                             double aIntensity, double aDuration, uint32_t aPromiseID) = 0;
+                             double aIntensity, double aDuration, const VRManagerPromise& aPromise) = 0;
   virtual void StopVibrateHaptic(uint32_t aControllerIdx) = 0;
   void NewButtonEvent(uint32_t aIndex, uint32_t aButton, bool aPressed, bool aTouched,
                       double aValue);
diff --git a/gfx/vr/gfxVRGVR.cpp b/gfx/vr/gfxVRGVR.cpp
index a099947b03e9..c9d00fad6e94 100644
--- a/gfx/vr/gfxVRGVR.cpp
+++ b/gfx/vr/gfxVRGVR.cpp
@@ -775,7 +775,7 @@ VRSystemManagerGVR::VibrateHaptic(uint32_t aControllerIdx,
                                   uint32_t aHapticIndex,
                                   double aIntensity,
                                   double aDuration,
-                                  uint32_t aPromiseID)
+                                  const VRManagerPromise& aPromise)
 {
 
 }
diff --git a/gfx/vr/gfxVRGVR.h b/gfx/vr/gfxVRGVR.h
index 175489db4857..529a17a07537 100644
--- a/gfx/vr/gfxVRGVR.h
+++ b/gfx/vr/gfxVRGVR.h
@@ -116,7 +116,7 @@ public:
                      uint32_t aHapticIndex,
                      double aIntensity,
                      double aDuration,
-                     uint32_t aPromiseID) override;
+                     const VRManagerPromise& aPromise) override;
   void StopVibrateHaptic(uint32_t aControllerIdx) override;
 
 protected:
diff --git a/gfx/vr/gfxVROSVR.cpp b/gfx/vr/gfxVROSVR.cpp
index c76a302c736b..518fbe833973 100644
--- a/gfx/vr/gfxVROSVR.cpp
+++ b/gfx/vr/gfxVROSVR.cpp
@@ -590,7 +590,7 @@ VRSystemManagerOSVR::VibrateHaptic(uint32_t aControllerIdx,
                                    uint32_t aHapticIndex,
                                    double aIntensity,
                                    double aDuration,
-                                   uint32_t aPromiseID)
+                                   const VRManagerPromise& aPromise)
 {
 }
 
diff --git a/gfx/vr/gfxVROSVR.h b/gfx/vr/gfxVROSVR.h
index 3b70622aa39d..9d621275fdfc 100644
--- a/gfx/vr/gfxVROSVR.h
+++ b/gfx/vr/gfxVROSVR.h
@@ -88,7 +88,8 @@ public:
   virtual void ScanForControllers() override;
   virtual void RemoveControllers() override;
   virtual void VibrateHaptic(uint32_t aControllerIdx, uint32_t aHapticIndex,
-                             double aIntensity, double aDuration, uint32_t aPromiseID) override;
+                             double aIntensity, double aDuration,
+                             const VRManagerPromise& aPromise) override;
   virtual void StopVibrateHaptic(uint32_t aControllerIdx) override;
 
 protected:
diff --git a/gfx/vr/gfxVROculus.cpp b/gfx/vr/gfxVROculus.cpp
index caa053d752f9..4a5475b047a1 100644
--- a/gfx/vr/gfxVROculus.cpp
+++ b/gfx/vr/gfxVROculus.cpp
@@ -29,6 +29,7 @@
 #include "TextureD3D11.h"
 
 #include "gfxVROculus.h"
+#include "VRManagerParent.h"
 #include "VRThread.h"
 
 #include "mozilla/dom/GamepadEventTypes.h"
@@ -1343,19 +1344,19 @@ VRControllerOculus::UpdateVibrateHaptic(ovrSession aSession,
                                         double aIntensity,
                                         double aDuration,
                                         uint64_t aVibrateIndex,
-                                        uint32_t aPromiseID)
+                                        const VRManagerPromise& aPromise)
 {
   // UpdateVibrateHaptic() only can be called by mVibrateThread
   MOZ_ASSERT(mVibrateThread == NS_GetCurrentThread());
 
   // It has been interrupted by loss focus.
   if (mIsVibrateStopped) {
-    VibrateHapticComplete(aSession, aPromiseID, true);
+    VibrateHapticComplete(aSession, aPromise, true);
     return;
   }
   // Avoid the previous vibrate event to override the new one.
   if (mVibrateIndex != aVibrateIndex) {
-    VibrateHapticComplete(aSession, aPromiseID, false);
+    VibrateHapticComplete(aSession, aPromise, false);
     return;
   }
 
@@ -1400,19 +1401,20 @@ VRControllerOculus::UpdateVibrateHaptic(ovrSession aSession,
     MOZ_ASSERT(mVibrateThread);
 
     RefPtr<Runnable> runnable =
-      NewRunnableMethod<ovrSession, uint32_t, double, double, uint64_t, uint32_t>(
-        "VRControllerOculus::UpdateVibrateHaptic",
-        this, &VRControllerOculus::UpdateVibrateHaptic, aSession,
-        aHapticIndex, aIntensity, (duration > kVibrateRate) ? remainingTime : 0, aVibrateIndex, aPromiseID);
+      NewRunnableMethod<ovrSession, uint32_t, double, double, uint64_t,
+        StoreCopyPassByConstLRef<VRManagerPromise>>(
+          "VRControllerOculus::UpdateVibrateHaptic",
+          this, &VRControllerOculus::UpdateVibrateHaptic, aSession,
+          aHapticIndex, aIntensity, (duration > kVibrateRate) ? remainingTime : 0, aVibrateIndex, aPromise);
     NS_DelayedDispatchToCurrentThread(runnable.forget(),
                                       (duration > kVibrateRate) ? kVibrateRate : remainingTime);
   } else {
-    VibrateHapticComplete(aSession, aPromiseID, true);
+    VibrateHapticComplete(aSession, aPromise, true);
   }
 }
 
 void
-VRControllerOculus::VibrateHapticComplete(ovrSession aSession, uint32_t aPromiseID,
+VRControllerOculus::VibrateHapticComplete(ovrSession aSession, const VRManagerPromise& aPromise,
                                           bool aStop)
 {
   if (aStop) {
@@ -1440,9 +1442,10 @@ VRControllerOculus::VibrateHapticComplete(ovrSession aSession, uint32_t aPromise
   VRManager *vm = VRManager::Get();
   MOZ_ASSERT(vm);
 
-  VRListenerThreadHolder::Loop()->PostTask(NewRunnableMethod<uint32_t>(
-                                           "VRManager::NotifyVibrateHapticCompleted",
-                                           vm, &VRManager::NotifyVibrateHapticCompleted, aPromiseID));
+  VRListenerThreadHolder::Loop()->PostTask(
+    NewRunnableMethod<StoreCopyPassByConstLRef<VRManagerPromise>>(
+      "VRManager::NotifyVibrateHapticCompleted",
+      vm, &VRManager::NotifyVibrateHapticCompleted, aPromise));
 }
 
 void
@@ -1450,7 +1453,7 @@ VRControllerOculus::VibrateHaptic(ovrSession aSession,
                                   uint32_t aHapticIndex,
                                   double aIntensity,
                                   double aDuration,
-                                  uint32_t aPromiseID)
+                                  const VRManagerPromise& aPromise)
 {
   // Spinning up the haptics thread at the first haptics call.
   if (!mVibrateThread) {
@@ -1465,10 +1468,11 @@ VRControllerOculus::VibrateHaptic(ovrSession aSession,
   mIsVibrateStopped = false;
 
   RefPtr<Runnable> runnable =
-       NewRunnableMethod<ovrSession, uint32_t, double, double, uint64_t, uint32_t>
-         ("VRControllerOculus::UpdateVibrateHaptic",
+       NewRunnableMethod<ovrSession, uint32_t, double, double, uint64_t,
+        StoreCopyPassByConstLRef<VRManagerPromise>>(
+          "VRControllerOculus::UpdateVibrateHaptic",
           this, &VRControllerOculus::UpdateVibrateHaptic, aSession,
-          aHapticIndex, aIntensity, aDuration, mVibrateIndex, aPromiseID);
+          aHapticIndex, aIntensity, aDuration, mVibrateIndex, aPromise);
   mVibrateThread->Dispatch(runnable.forget(), NS_DISPATCH_NORMAL);
 }
 
@@ -1804,18 +1808,19 @@ VRSystemManagerOculus::VibrateHaptic(uint32_t aControllerIdx,
                                      uint32_t aHapticIndex,
                                      double aIntensity,
                                      double aDuration,
-                                     uint32_t aPromiseID)
+                                     const VRManagerPromise& aPromise)
 {
   // The session is available after VRDisplay is created
   // at GetHMDs().
-  if (!mSession || !mSession->IsTrackingReady()) {
+  if (!mSession || !mSession->IsTrackingReady() ||
+      (aControllerIdx >= mOculusController.Length())) {
     return;
   }
 
   RefPtr<impl::VRControllerOculus> controller = mOculusController[aControllerIdx];
   MOZ_ASSERT(controller);
 
-  controller->VibrateHaptic(mSession->Get(), aHapticIndex, aIntensity, aDuration, aPromiseID);
+  controller->VibrateHaptic(mSession->Get(), aHapticIndex, aIntensity, aDuration, aPromise);
 }
 
 void
diff --git a/gfx/vr/gfxVROculus.h b/gfx/vr/gfxVROculus.h
index 8e3f0812a721..d9e886338128 100644
--- a/gfx/vr/gfxVROculus.h
+++ b/gfx/vr/gfxVROculus.h
@@ -145,7 +145,7 @@ public:
                      uint32_t aHapticIndex,
                      double aIntensity,
                      double aDuration,
-                     uint32_t aPromiseID);
+                     const VRManagerPromise& aPromise);
   void StopVibrateHaptic();
 
 protected:
@@ -157,8 +157,8 @@ private:
                            double aIntensity,
                            double aDuration,
                            uint64_t aVibrateIndex,
-                           uint32_t aPromiseID);
-  void VibrateHapticComplete(ovrSession aSession, uint32_t aPromiseID, bool aStop);
+                           const VRManagerPromise& aPromise);
+  void VibrateHapticComplete(ovrSession aSession, const VRManagerPromise& aPromise, bool aStop);
 
   float mAxisMove[static_cast<uint32_t>(
                   OculusControllerAxisType::NumVRControllerAxisType)];
@@ -184,7 +184,7 @@ public:
   virtual void ScanForControllers() override;
   virtual void RemoveControllers() override;
   virtual void VibrateHaptic(uint32_t aControllerIdx, uint32_t aHapticIndex,
-                             double aIntensity, double aDuration, uint32_t aPromiseID) override;
+                             double aIntensity, double aDuration, const VRManagerPromise& aPromise) override;
   virtual void StopVibrateHaptic(uint32_t aControllerIdx) override;
 
 protected:
diff --git a/gfx/vr/gfxVROpenVR.cpp b/gfx/vr/gfxVROpenVR.cpp
index 543bf4af94dd..d0b045c265af 100644
--- a/gfx/vr/gfxVROpenVR.cpp
+++ b/gfx/vr/gfxVROpenVR.cpp
@@ -21,6 +21,7 @@
 #endif
 
 #include "gfxVROpenVR.h"
+#include "VRManagerParent.h"
 #include "VRManager.h"
 #include "VRThread.h"
 
@@ -510,19 +511,19 @@ VRControllerOpenVR::UpdateVibrateHaptic(::vr::IVRSystem* aVRSystem,
                                         double aIntensity,
                                         double aDuration,
                                         uint64_t aVibrateIndex,
-                                        uint32_t aPromiseID)
+                                        const VRManagerPromise& aPromise)
 {
   // UpdateVibrateHaptic() only can be called by mVibrateThread
   MOZ_ASSERT(mVibrateThread == NS_GetCurrentThread());
 
   // It has been interrupted by loss focus.
   if (mIsVibrateStopped) {
-    VibrateHapticComplete(aPromiseID);
+    VibrateHapticComplete(aPromise);
     return;
   }
   // Avoid the previous vibrate event to override the new one.
   if (mVibrateIndex != aVibrateIndex) {
-    VibrateHapticComplete(aPromiseID);
+    VibrateHapticComplete(aPromise);
     return;
   }
 
@@ -541,25 +542,26 @@ VRControllerOpenVR::UpdateVibrateHaptic(::vr::IVRSystem* aVRSystem,
     MOZ_ASSERT(mVibrateThread);
 
     RefPtr<Runnable> runnable =
-      NewRunnableMethod<::vr::IVRSystem*, uint32_t, double, double, uint64_t, uint32_t>
-        ("VRControllerOpenVR::UpdateVibrateHaptic",
-         this, &VRControllerOpenVR::UpdateVibrateHaptic, aVRSystem,
-         aHapticIndex, aIntensity, duration - kVibrateRate, aVibrateIndex, aPromiseID);
+      NewRunnableMethod<::vr::IVRSystem*, uint32_t, double, double, uint64_t,
+        StoreCopyPassByConstLRef<VRManagerPromise>>(
+          "VRControllerOpenVR::UpdateVibrateHaptic",
+          this, &VRControllerOpenVR::UpdateVibrateHaptic, aVRSystem,
+          aHapticIndex, aIntensity, duration - kVibrateRate, aVibrateIndex, aPromise);
     NS_DelayedDispatchToCurrentThread(runnable.forget(), kVibrateRate);
   } else {
     // The pulse has completed
-    VibrateHapticComplete(aPromiseID);
+    VibrateHapticComplete(aPromise);
   }
 }
 
 void
-VRControllerOpenVR::VibrateHapticComplete(uint32_t aPromiseID)
+VRControllerOpenVR::VibrateHapticComplete(const VRManagerPromise& aPromise)
 {
   VRManager *vm = VRManager::Get();
-
-  VRListenerThreadHolder::Loop()->PostTask(NewRunnableMethod<uint32_t>(
-                                           "VRManager::NotifyVibrateHapticCompleted",
-                                           vm, &VRManager::NotifyVibrateHapticCompleted, aPromiseID));
+  VRListenerThreadHolder::Loop()->PostTask(
+    NewRunnableMethod<StoreCopyPassByConstLRef<VRManagerPromise>>(
+      "VRManager::NotifyVibrateHapticCompleted",
+      vm, &VRManager::NotifyVibrateHapticCompleted, aPromise));
 }
 
 void
@@ -567,7 +569,7 @@ VRControllerOpenVR::VibrateHaptic(::vr::IVRSystem* aVRSystem,
                                   uint32_t aHapticIndex,
                                   double aIntensity,
                                   double aDuration,
-                                  uint32_t aPromiseID)
+                                  const VRManagerPromise& aPromise)
 {
   // Spinning up the haptics thread at the first haptics call.
   if (!mVibrateThread) {
@@ -582,10 +584,11 @@ VRControllerOpenVR::VibrateHaptic(::vr::IVRSystem* aVRSystem,
   mIsVibrateStopped = false;
 
   RefPtr<Runnable> runnable =
-      NewRunnableMethod<::vr::IVRSystem*, uint32_t, double, double, uint64_t, uint32_t>
-        ("VRControllerOpenVR::UpdateVibrateHaptic",
-         this, &VRControllerOpenVR::UpdateVibrateHaptic, aVRSystem,
-         aHapticIndex, aIntensity, aDuration, mVibrateIndex, aPromiseID);
+      NewRunnableMethod<::vr::IVRSystem*, uint32_t, double, double, uint64_t,
+        StoreCopyPassByConstLRef<VRManagerPromise>>(
+          "VRControllerOpenVR::UpdateVibrateHaptic",
+          this, &VRControllerOpenVR::UpdateVibrateHaptic, aVRSystem,
+          aHapticIndex, aIntensity, aDuration, mVibrateIndex, aPromise);
   mVibrateThread->Dispatch(runnable.forget(), NS_DISPATCH_NORMAL);
 }
 
@@ -996,18 +999,18 @@ VRSystemManagerOpenVR::VibrateHaptic(uint32_t aControllerIdx,
                                      uint32_t aHapticIndex,
                                      double aIntensity,
                                      double aDuration,
-                                     uint32_t aPromiseID)
+                                     const VRManagerPromise& aPromise)
 {
   // mVRSystem is available after VRDisplay is created
   // at GetHMDs().
-  if (!mVRSystem) {
+  if (!mVRSystem || (aControllerIdx >= mOpenVRController.Length())) {
     return;
   }
 
   RefPtr<impl::VRControllerOpenVR> controller = mOpenVRController[aControllerIdx];
   MOZ_ASSERT(controller);
 
-  controller->VibrateHaptic(mVRSystem, aHapticIndex, aIntensity, aDuration, aPromiseID);
+  controller->VibrateHaptic(mVRSystem, aHapticIndex, aIntensity, aDuration, aPromise);
 }
 
 void
diff --git a/gfx/vr/gfxVROpenVR.h b/gfx/vr/gfxVROpenVR.h
index fc18386b9bd0..85814d53fb67 100644
--- a/gfx/vr/gfxVROpenVR.h
+++ b/gfx/vr/gfxVROpenVR.h
@@ -95,7 +95,7 @@ public:
                      uint32_t aHapticIndex,
                      double aIntensity,
                      double aDuration,
-                     uint32_t aPromiseID);
+                     const VRManagerPromise& aPromise);
   void StopVibrateHaptic();
 
 protected:
@@ -107,8 +107,8 @@ private:
                            double aIntensity,
                            double aDuration,
                            uint64_t aVibrateIndex,
-                           uint32_t aPromiseID);
-  void VibrateHapticComplete(uint32_t aPromiseID);
+                           const VRManagerPromise& aPromise);
+  void VibrateHapticComplete(const VRManagerPromise& aPromise);
 
   // The index of tracked devices from ::vr::IVRSystem.
   uint32_t mTrackedIndex;
@@ -138,7 +138,7 @@ public:
                              uint32_t aHapticIndex,
                              double aIntensity,
                              double aDuration,
-                             uint32_t aPromiseID) override;
+                             const VRManagerPromise& aPromise) override;
   virtual void StopVibrateHaptic(uint32_t aControllerIdx) override;
 
 protected:
diff --git a/gfx/vr/gfxVRPuppet.cpp b/gfx/vr/gfxVRPuppet.cpp
index 6404f2c0ec65..6a4e875af7bc 100644
--- a/gfx/vr/gfxVRPuppet.cpp
+++ b/gfx/vr/gfxVRPuppet.cpp
@@ -801,7 +801,7 @@ VRSystemManagerPuppet::VibrateHaptic(uint32_t aControllerIdx,
                                      uint32_t aHapticIndex,
                                      double aIntensity,
                                      double aDuration,
-                                     uint32_t aPromiseID)
+                                     const VRManagerPromise& aPromise)
 {
 }
 
diff --git a/gfx/vr/gfxVRPuppet.h b/gfx/vr/gfxVRPuppet.h
index 39b4cdc4c610..7d5d1811eda7 100644
--- a/gfx/vr/gfxVRPuppet.h
+++ b/gfx/vr/gfxVRPuppet.h
@@ -121,7 +121,7 @@ public:
                              uint32_t aHapticIndex,
                              double aIntensity,
                              double aDuration,
-                             uint32_t aPromiseID) override;
+                             const VRManagerPromise& aPromise) override;
   virtual void StopVibrateHaptic(uint32_t aControllerIdx) override;
 
 protected:
diff --git a/gfx/vr/ipc/VRManagerChild.h b/gfx/vr/ipc/VRManagerChild.h
index adc43ea4388a..444aeb551a54 100644
--- a/gfx/vr/ipc/VRManagerChild.h
+++ b/gfx/vr/ipc/VRManagerChild.h
@@ -132,7 +132,7 @@ private:
 
   layers::LayersBackend mBackend;
   RefPtr<layers::SyncObjectClient> mSyncObject;
-  nsRefPtrHashtable<nsUint32HashKey, dom::Promise> mGamepadPromiseList; // TODO: check if it can merge into one list?
+  nsRefPtrHashtable<nsUint32HashKey, dom::Promise> mGamepadPromiseList;
   uint32_t mPromiseID;
   nsRefPtrHashtable<nsUint32HashKey, dom::Promise> mPromiseList;
   RefPtr<dom::VRMockDisplay> mVRMockDisplay;
diff --git a/gfx/vr/ipc/VRManagerParent.cpp b/gfx/vr/ipc/VRManagerParent.cpp
index e1a3c820ff9e..fd474df67fde 100644
--- a/gfx/vr/ipc/VRManagerParent.cpp
+++ b/gfx/vr/ipc/VRManagerParent.cpp
@@ -394,8 +394,10 @@ VRManagerParent::RecvVibrateHaptic(const uint32_t& aControllerIdx,
                                    const uint32_t& aPromiseID)
 {
   VRManager* vm = VRManager::Get();
+  VRManagerPromise promise(this, aPromiseID);
+
   vm->VibrateHaptic(aControllerIdx, aHapticIndex, aIntensity,
-                    aDuration, aPromiseID);
+                    aDuration, promise);
   return IPC_OK();
 }
 
diff --git a/gfx/vr/ipc/VRManagerParent.h b/gfx/vr/ipc/VRManagerParent.h
index 9129a3bbbef0..d0220dee5a1d 100644
--- a/gfx/vr/ipc/VRManagerParent.h
+++ b/gfx/vr/ipc/VRManagerParent.h
@@ -100,6 +100,23 @@ private:
   bool mIsContentChild;
 };
 
+class VRManagerPromise final
+{
+  friend class VRManager;
+
+public:
+  explicit VRManagerPromise(RefPtr<VRManagerParent> aParent, uint32_t aPromiseID)
+  : mParent(aParent), mPromiseID(aPromiseID)
+  {}
+  ~VRManagerPromise() {
+    mParent = nullptr;
+  }
+
+private:
+  RefPtr<VRManagerParent> mParent;
+  uint32_t mPromiseID;
+};
+
 } // namespace mozilla
 } // namespace gfx
 

From 32c2be0d45d11ff5fd43fa7009284548e14ea1d8 Mon Sep 17 00:00:00 2001
From: Nevin Chen <cnevinchen@gmail.com>
Date: Wed, 29 Nov 2017 15:53:01 +0800
Subject: [PATCH 124/219] Bug 1420886 - Replace -ads with -analytics. r=maliu

Looking at latest Adjust SDK [1]
compile 'com.google.android.gms:play-services-analytics:10.2.1'
should be enough. And it doesn't have DoubleClick in it (testing with dexdump)	.
Even Adjust has change from -ads to -analytics [2]

I just build/test with below options.

export MOZ_INSTALL_TRACKING=1
ac_add_options --with-adjust-sdk-keyfile=.....

export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1

export MOZ_ANDROID_MMA=1
ac_add_options --with-leanplum-sdk-keyfile=.....

and it works for below places where we have have com.google.android.gms.ads.identifier.AdvertisingIdClient  : Leanplum[3] and Adjust[4]

[1] https://github.com/adjust/android_sdk

[2] https://github.com/adjust/android_sdk/issues/143

[3] https://searchfox.org/mozilla-central/rev/9f3bd430c2b132c86c46126a0548661de876799a/mobile/android/thirdparty/com/leanplum/internal/Util.java#204

[4] https://searchfox.org/mozilla-central/rev/9f3bd430c2b132c86c46126a0548661de876799a/mobile/android/thirdparty/com/adjust/sdk/Reflection.java#97

MozReview-Commit-ID: 6YdQ6NJm4hM

--HG--
extra : rebase_source : 6a26cfd135c72738f086f305c60905a920abace8
---
 mobile/android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 45aec3012bf6..368b7d4f9ee3 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -246,7 +246,7 @@ dependencies {
     }
 
     if (mozconfig.substs.MOZ_INSTALL_TRACKING) {
-        compile "com.google.android.gms:play-services-ads:${mozconfig.substs.ANDROID_GOOGLE_PLAY_SERVICES_VERSION}"
+        compile "com.google.android.gms:play-services-analytics:${mozconfig.substs.ANDROID_GOOGLE_PLAY_SERVICES_VERSION}"
         compile "com.google.android.gms:play-services-basement:${mozconfig.substs.ANDROID_GOOGLE_PLAY_SERVICES_VERSION}"
     }
 

From 6ac9b1e2d92ec2fe7a970ae2a6f1f3b213570876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 3 Dec 2017 06:02:12 -0600
Subject: [PATCH 125/219] servo: Merge #19463 - style: Remove free parsing
 functions, use Integer::parse and Number::parse instead (from
 emilio:bye-parse-functions); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 14f757817e16a873e60035c1946ae82535038641

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ebb08a34ecae53148c89dc1118b7422e21211d94
---
 .../properties/longhand/counters.mako.rs      |  2 +-
 .../components/style/values/specified/mod.rs  | 55 ++++++---------
 .../style/values/specified/transform.rs       | 68 +++++++++----------
 3 files changed, 57 insertions(+), 68 deletions(-)

diff --git a/servo/components/style/properties/longhand/counters.mako.rs b/servo/components/style/properties/longhand/counters.mako.rs
index b7b9cc21f4dc..1ac7422cd242 100644
--- a/servo/components/style/properties/longhand/counters.mako.rs
+++ b/servo/components/style/properties/longhand/counters.mako.rs
@@ -334,7 +334,7 @@
                 Ok(t) => return Err(location.new_unexpected_token_error(t.clone())),
                 Err(_) => break,
             };
-            let counter_delta = input.try(|input| specified::parse_integer(context, input))
+            let counter_delta = input.try(|input| specified::Integer::parse(context, input))
                                      .unwrap_or(specified::Integer::new(default_value));
             counters.push((counter_name, counter_delta))
         }
diff --git a/servo/components/style/values/specified/mod.rs b/servo/components/style/values/specified/mod.rs
index 16401f4ddc06..65796120392c 100644
--- a/servo/components/style/values/specified/mod.rs
+++ b/servo/components/style/values/specified/mod.rs
@@ -109,36 +109,12 @@ impl Parse for SpecifiedUrl {
 impl Eq for SpecifiedUrl {}
 }
 
-/// Parse an `<integer>` value, handling `calc()` correctly.
-pub fn parse_integer<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
-                             -> Result<Integer, ParseError<'i>> {
-    let location = input.current_source_location();
-    // FIXME: remove early returns when lifetimes are non-lexical
-    match *input.next()? {
-        Token::Number { int_value: Some(v), .. } => return Ok(Integer::new(v)),
-        Token::Function(ref name) if name.eq_ignore_ascii_case("calc") => {}
-        ref t => return Err(location.new_unexpected_token_error(t.clone()))
-    }
-
-    let result = input.parse_nested_block(|i| {
-        CalcNode::parse_integer(context, i)
-    })?;
-
-    Ok(Integer::from_calc(result))
-}
-
-/// Parse a `<number>` value, handling `calc()` correctly, and without length
-/// limitations.
-pub fn parse_number<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
-                            -> Result<Number, ParseError<'i>> {
-    parse_number_with_clamping_mode(context, input, AllowedNumericType::All)
-}
-
 /// Parse a `<number>` value, with a given clamping mode.
-pub fn parse_number_with_clamping_mode<'i, 't>(context: &ParserContext,
-                                               input: &mut Parser<'i, 't>,
-                                               clamping_mode: AllowedNumericType)
-                                               -> Result<Number, ParseError<'i>> {
+fn parse_number_with_clamping_mode<'i, 't>(
+    context: &ParserContext,
+    input: &mut Parser<'i, 't>,
+    clamping_mode: AllowedNumericType,
+) -> Result<Number, ParseError<'i>> {
     let location = input.current_source_location();
     // FIXME: remove early returns when lifetimes are non-lexical
     match *input.next()? {
@@ -200,7 +176,7 @@ pub struct Number {
 
 impl Parse for Number {
     fn parse<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i>> {
-        parse_number(context, input)
+        parse_number_with_clamping_mode(context, input, AllowedNumericType::All)
     }
 }
 
@@ -357,7 +333,7 @@ pub struct Opacity(Number);
 
 impl Parse for Opacity {
     fn parse<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i>> {
-        parse_number(context, input).map(Opacity)
+        Number::parse(context, input).map(Opacity)
     }
 }
 
@@ -416,7 +392,20 @@ impl Integer {
 
 impl Parse for Integer {
     fn parse<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i>> {
-        parse_integer(context, input)
+        let location = input.current_source_location();
+
+        // FIXME: remove early returns when lifetimes are non-lexical
+        match *input.next()? {
+            Token::Number { int_value: Some(v), .. } => return Ok(Integer::new(v)),
+            Token::Function(ref name) if name.eq_ignore_ascii_case("calc") => {}
+            ref t => return Err(location.new_unexpected_token_error(t.clone()))
+        }
+
+        let result = input.parse_nested_block(|i| {
+            CalcNode::parse_integer(context, i)
+        })?;
+
+        Ok(Integer::from_calc(result))
     }
 }
 
@@ -427,7 +416,7 @@ impl Integer {
         input: &mut Parser<'i, 't>,
         min: i32
     ) -> Result<Integer, ParseError<'i>> {
-        match parse_integer(context, input) {
+        match Integer::parse(context, input) {
             // FIXME(emilio): The spec asks us to avoid rejecting it at parse
             // time except until computed value time.
             //
diff --git a/servo/components/style/values/specified/transform.rs b/servo/components/style/values/specified/transform.rs
index ca77bd7a723f..4b49d2065d14 100644
--- a/servo/components/style/values/specified/transform.rs
+++ b/servo/components/style/values/specified/transform.rs
@@ -60,19 +60,19 @@ impl Transform {
                 let result =
                     match_ignore_ascii_case! { &function,
                     "matrix" => {
-                        let a = specified::parse_number(context, input)?;
+                        let a = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let b = specified::parse_number(context, input)?;
+                        let b = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let c = specified::parse_number(context, input)?;
+                        let c = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let d = specified::parse_number(context, input)?;
+                        let d = Number::parse(context, input)?;
                         input.expect_comma()?;
                         if !prefixed {
                             // Standard matrix parsing.
-                            let e = specified::parse_number(context, input)?;
+                            let e = Number::parse(context, input)?;
                             input.expect_comma()?;
-                            let f = specified::parse_number(context, input)?;
+                            let f = Number::parse(context, input)?;
                             Ok(GenericTransformOperation::Matrix(Matrix { a, b, c, d, e, f }))
                         } else {
                             // Non-standard prefixed matrix parsing for -moz-transform.
@@ -83,39 +83,39 @@ impl Transform {
                         }
                     },
                     "matrix3d" => {
-                        let m11 = specified::parse_number(context, input)?;
+                        let m11 = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let m12 = specified::parse_number(context, input)?;
+                        let m12 = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let m13 = specified::parse_number(context, input)?;
+                        let m13 = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let m14 = specified::parse_number(context, input)?;
+                        let m14 = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let m21 = specified::parse_number(context, input)?;
+                        let m21 = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let m22 = specified::parse_number(context, input)?;
+                        let m22 = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let m23 = specified::parse_number(context, input)?;
+                        let m23 = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let m24 = specified::parse_number(context, input)?;
+                        let m24 = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let m31 = specified::parse_number(context, input)?;
+                        let m31 = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let m32 = specified::parse_number(context, input)?;
+                        let m32 = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let m33 = specified::parse_number(context, input)?;
+                        let m33 = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let m34 = specified::parse_number(context, input)?;
+                        let m34 = Number::parse(context, input)?;
                         input.expect_comma()?;
                         if !prefixed {
                             // Standard matrix3d parsing.
-                            let m41 = specified::parse_number(context, input)?;
+                            let m41 = Number::parse(context, input)?;
                             input.expect_comma()?;
-                            let m42 = specified::parse_number(context, input)?;
+                            let m42 = Number::parse(context, input)?;
                             input.expect_comma()?;
-                            let m43 = specified::parse_number(context, input)?;
+                            let m43 = Number::parse(context, input)?;
                             input.expect_comma()?;
-                            let m44 = specified::parse_number(context, input)?;
+                            let m44 = Number::parse(context, input)?;
                             Ok(GenericTransformOperation::Matrix3D(Matrix3D {
                                 m11, m12, m13, m14,
                                 m21, m22, m23, m24,
@@ -130,7 +130,7 @@ impl Transform {
                             input.expect_comma()?;
                             let m43 = LengthOrNumber::parse(context, input)?;
                             input.expect_comma()?;
-                            let m44 = specified::parse_number(context, input)?;
+                            let m44 = Number::parse(context, input)?;
                             Ok(GenericTransformOperation::PrefixedMatrix3D(Matrix3D {
                                 m11, m12, m13, m14,
                                 m21, m22, m23, m24,
@@ -169,32 +169,32 @@ impl Transform {
                         Ok(GenericTransformOperation::Translate3D(tx, ty, tz))
                     },
                     "scale" => {
-                        let sx = specified::parse_number(context, input)?;
+                        let sx = Number::parse(context, input)?;
                         if input.try(|input| input.expect_comma()).is_ok() {
-                            let sy = specified::parse_number(context, input)?;
+                            let sy = Number::parse(context, input)?;
                             Ok(GenericTransformOperation::Scale(sx, Some(sy)))
                         } else {
                             Ok(GenericTransformOperation::Scale(sx, None))
                         }
                     },
                     "scalex" => {
-                        let sx = specified::parse_number(context, input)?;
+                        let sx = Number::parse(context, input)?;
                         Ok(GenericTransformOperation::ScaleX(sx))
                     },
                     "scaley" => {
-                        let sy = specified::parse_number(context, input)?;
+                        let sy = Number::parse(context, input)?;
                         Ok(GenericTransformOperation::ScaleY(sy))
                     },
                     "scalez" => {
-                        let sz = specified::parse_number(context, input)?;
+                        let sz = Number::parse(context, input)?;
                         Ok(GenericTransformOperation::ScaleZ(sz))
                     },
                     "scale3d" => {
-                        let sx = specified::parse_number(context, input)?;
+                        let sx = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let sy = specified::parse_number(context, input)?;
+                        let sy = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let sz = specified::parse_number(context, input)?;
+                        let sz = Number::parse(context, input)?;
                         Ok(GenericTransformOperation::Scale3D(sx, sy, sz))
                     },
                     "rotate" => {
@@ -214,11 +214,11 @@ impl Transform {
                         Ok(GenericTransformOperation::RotateZ(theta))
                     },
                     "rotate3d" => {
-                        let ax = specified::parse_number(context, input)?;
+                        let ax = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let ay = specified::parse_number(context, input)?;
+                        let ay = Number::parse(context, input)?;
                         input.expect_comma()?;
-                        let az = specified::parse_number(context, input)?;
+                        let az = Number::parse(context, input)?;
                         input.expect_comma()?;
                         let theta = specified::Angle::parse_with_unitless(context, input)?;
                         // TODO(gw): Check that the axis can be normalized.

From fbf9d655be54b6f8de06563ee667b01dbf3ed582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 3 Dec 2017 09:14:59 -0600
Subject: [PATCH 126/219] servo: Merge #19462 - style: Cleanup Angle parsing
 (from emilio:angle-parsing); r=nox

This PR also contains a functional change, allowing to parse unitless zero angles in hue-rotate().

See the links and the comments for why.

Source-Repo: https://github.com/servo/servo
Source-Revision: e4dba3abef2a4941c5a4d95d58ae0b864ad10961

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ca23c77ffb43f42fc16b8934780f0ce94ce890a0
---
 .../style/values/specified/angle.rs           | 59 +++++++++++--------
 .../style/values/specified/effects.rs         |  6 +-
 .../style/values/specified/image.rs           | 57 ++++++++++--------
 .../style/values/specified/transform.rs       |  6 +-
 4 files changed, 78 insertions(+), 50 deletions(-)

diff --git a/servo/components/style/values/specified/angle.rs b/servo/components/style/values/specified/angle.rs
index 1a89e8235ac5..67f3463a474a 100644
--- a/servo/components/style/values/specified/angle.rs
+++ b/servo/components/style/values/specified/angle.rs
@@ -102,23 +102,25 @@ impl AsRef<ComputedAngle> for Angle {
     }
 }
 
+/// Whether to allow parsing an unitless zero as a valid angle.
+///
+/// This should always be `No`, except for exceptions like:
+///
+///   https://github.com/w3c/fxtf-drafts/issues/228
+///
+/// See also: https://github.com/w3c/csswg-drafts/issues/1162.
+enum AllowUnitlessZeroAngle {
+    Yes,
+    No,
+}
+
 impl Parse for Angle {
     /// Parses an angle according to CSS-VALUES § 6.1.
     fn parse<'i, 't>(
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<Self, ParseError<'i>> {
-        // FIXME: remove clone() when lifetimes are non-lexical
-        let token = input.next()?.clone();
-        match token {
-            Token::Dimension { value, ref unit, .. } => {
-                Angle::parse_dimension(value, unit, /* from_calc = */ false)
-            }
-            Token::Function(ref name) if name.eq_ignore_ascii_case("calc") => {
-                return input.parse_nested_block(|i| CalcNode::parse_angle(context, i))
-            }
-            _ => Err(())
-        }.map_err(|()| input.new_unexpected_token_error(token.clone()))
+        Self::parse_internal(context, input, AllowUnitlessZeroAngle::No)
     }
 }
 
@@ -127,9 +129,8 @@ impl Angle {
     pub fn parse_dimension(
         value: CSSFloat,
         unit: &str,
-        from_calc: bool)
-        -> Result<Angle, ()>
-    {
+        from_calc: bool,
+    ) -> Result<Angle, ()> {
         let angle = match_ignore_ascii_case! { unit,
             "deg" => Angle::from_degrees(value, from_calc),
             "grad" => Angle::from_gradians(value, from_calc),
@@ -140,23 +141,33 @@ impl Angle {
         Ok(angle)
     }
 
-    /// Parse an angle, including unitless 0 degree.
+    /// Parse an `<angle>` allowing unitless zero to represent a zero angle.
     ///
-    /// Note that numbers without any AngleUnit, including unitless 0 angle,
-    /// should be invalid. However, some properties still accept unitless 0
-    /// angle and stores it as '0deg'.
-    ///
-    /// We can remove this and get back to the unified version Angle::parse once
-    /// https://github.com/w3c/csswg-drafts/issues/1162 is resolved.
-    pub fn parse_with_unitless<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
-                                       -> Result<Self, ParseError<'i>> {
+    /// See the comment in `AllowUnitlessZeroAngle` for why.
+    pub fn parse_with_unitless<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Self, ParseError<'i>> {
+        Self::parse_internal(context, input, AllowUnitlessZeroAngle::Yes)
+    }
+
+    fn parse_internal<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+        allow_unitless_zero: AllowUnitlessZeroAngle,
+    ) -> Result<Self, ParseError<'i>> {
         // FIXME: remove clone() when lifetimes are non-lexical
         let token = input.next()?.clone();
         match token {
             Token::Dimension { value, ref unit, .. } => {
                 Angle::parse_dimension(value, unit, /* from_calc = */ false)
             }
-            Token::Number { value, .. } if value == 0. => Ok(Angle::zero()),
+            Token::Number { value, .. } if value == 0. => {
+                match allow_unitless_zero {
+                    AllowUnitlessZeroAngle::Yes => Ok(Angle::zero()),
+                    AllowUnitlessZeroAngle::No => Err(()),
+                }
+            },
             Token::Function(ref name) if name.eq_ignore_ascii_case("calc") => {
                 return input.parse_nested_block(|i| CalcNode::parse_angle(context, i))
             }
diff --git a/servo/components/style/values/specified/effects.rs b/servo/components/style/values/specified/effects.rs
index 7ecb3fce72c9..f4f11717f6ac 100644
--- a/servo/components/style/values/specified/effects.rs
+++ b/servo/components/style/values/specified/effects.rs
@@ -205,7 +205,11 @@ impl Parse for Filter {
                     // https://drafts.fxtf.org/filter-effects/#funcdef-filter-grayscale
                     Ok(GenericFilter::Grayscale(Factor::parse_with_clamping_to_one(context, i)?))
                 },
-                "hue-rotate" => Ok(GenericFilter::HueRotate(Angle::parse(context, i)?)),
+                "hue-rotate" => {
+                    // We allow unitless zero here, see:
+                    // https://github.com/w3c/fxtf-drafts/issues/228
+                    Ok(GenericFilter::HueRotate(Angle::parse_with_unitless(context, i)?))
+                },
                 "invert" => {
                     // Values of amount over 100% are allowed but UAs must clamp the values to 1.
                     // https://drafts.fxtf.org/filter-effects/#funcdef-filter-invert
diff --git a/servo/components/style/values/specified/image.rs b/servo/components/style/values/specified/image.rs
index c6cb2bf0e3d8..188b3239a7eb 100644
--- a/servo/components/style/values/specified/image.rs
+++ b/servo/components/style/values/specified/image.rs
@@ -261,8 +261,10 @@ impl Parse for Gradient {
 }
 
 impl Gradient {
-    fn parse_webkit_gradient_argument<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
-                                              -> Result<Self, ParseError<'i>> {
+    fn parse_webkit_gradient_argument<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Self, ParseError<'i>> {
         type Point = GenericPosition<Component<X>, Component<Y>>;
 
         #[derive(Clone, Copy)]
@@ -518,10 +520,11 @@ impl Gradient {
 impl GradientKind {
     /// Parses a linear gradient.
     /// CompatMode can change during `-moz-` prefixed gradient parsing if it come across a `to` keyword.
-    fn parse_linear<'i, 't>(context: &ParserContext,
-                            input: &mut Parser<'i, 't>,
-                            compat_mode: &mut CompatMode)
-                            -> Result<Self, ParseError<'i>> {
+    fn parse_linear<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+        compat_mode: &mut CompatMode,
+    ) -> Result<Self, ParseError<'i>> {
         let direction = if let Ok(d) = input.try(|i| LineDirection::parse(context, i, compat_mode)) {
             input.expect_comma()?;
             d
@@ -534,10 +537,11 @@ impl GradientKind {
         Ok(GenericGradientKind::Linear(direction))
     }
 
-    fn parse_radial<'i, 't>(context: &ParserContext,
-                            input: &mut Parser<'i, 't>,
-                            compat_mode: &mut CompatMode)
-                            -> Result<Self, ParseError<'i>> {
+    fn parse_radial<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+        compat_mode: &mut CompatMode,
+    ) -> Result<Self, ParseError<'i>> {
         let (shape, position, angle, moz_position) = match *compat_mode {
             CompatMode::Modern => {
                 let shape = input.try(|i| EndingShape::parse(context, i, *compat_mode));
@@ -702,13 +706,16 @@ impl GenericsLineDirection for LineDirection {
 }
 
 impl LineDirection {
-    fn parse<'i, 't>(context: &ParserContext,
-                     input: &mut Parser<'i, 't>,
-                     compat_mode: &mut CompatMode)
-                     -> Result<Self, ParseError<'i>> {
+    fn parse<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+        compat_mode: &mut CompatMode,
+    ) -> Result<Self, ParseError<'i>> {
         let mut _angle = if *compat_mode == CompatMode::Moz {
             input.try(|i| Angle::parse(context, i)).ok()
         } else {
+            // Gradients allow unitless zero angles as an exception, see:
+            // https://github.com/w3c/csswg-drafts/issues/1162
             if let Ok(angle) = input.try(|i| Angle::parse_with_unitless(context, i)) {
                 return Ok(LineDirection::Angle(angle));
             }
@@ -780,10 +787,11 @@ impl ToComputedValue for GradientPosition {
 }
 
 impl EndingShape {
-    fn parse<'i, 't>(context: &ParserContext,
-                     input: &mut Parser<'i, 't>,
-                     compat_mode: CompatMode)
-                     -> Result<Self, ParseError<'i>> {
+    fn parse<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+        compat_mode: CompatMode,
+    ) -> Result<Self, ParseError<'i>> {
         if let Ok(extent) = input.try(|i| ShapeExtent::parse_with_compat_mode(i, compat_mode)) {
             if input.try(|i| i.expect_ident_matching("circle")).is_ok() {
                 return Ok(GenericEndingShape::Circle(Circle::Extent(extent)));
@@ -861,9 +869,10 @@ impl EndingShape {
 }
 
 impl ShapeExtent {
-    fn parse_with_compat_mode<'i, 't>(input: &mut Parser<'i, 't>,
-                                      compat_mode: CompatMode)
-                                      -> Result<Self, ParseError<'i>> {
+    fn parse_with_compat_mode<'i, 't>(
+        input: &mut Parser<'i, 't>,
+        compat_mode: CompatMode,
+    ) -> Result<Self, ParseError<'i>> {
         match Self::parse(input)? {
             ShapeExtent::Contain | ShapeExtent::Cover if compat_mode == CompatMode::Modern => {
                 Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
@@ -876,8 +885,10 @@ impl ShapeExtent {
 }
 
 impl GradientItem {
-    fn parse_comma_separated<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
-                                     -> Result<Vec<Self>, ParseError<'i>> {
+    fn parse_comma_separated<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Vec<Self>, ParseError<'i>> {
         let mut seen_stop = false;
         let items = input.parse_comma_separated(|input| {
             if seen_stop {
diff --git a/servo/components/style/values/specified/transform.rs b/servo/components/style/values/specified/transform.rs
index 4b49d2065d14..a8437d558ccc 100644
--- a/servo/components/style/values/specified/transform.rs
+++ b/servo/components/style/values/specified/transform.rs
@@ -29,16 +29,18 @@ pub type TransformOperation = GenericTransformOperation<
     LengthOrPercentage,
     LengthOrPercentageOrNumber,
 >;
+
 /// A specified CSS `transform`
 pub type Transform = GenericTransform<TransformOperation>;
 
 /// The specified value of a CSS `<transform-origin>`
 pub type TransformOrigin = GenericTransformOrigin<OriginComponent<X>, OriginComponent<Y>, Length>;
 
-
 impl Transform {
     /// Internal parse function for deciding if we wish to accept prefixed values or not
-    // Allow unitless zero angle for rotate() and skew() to align with gecko
+    ///
+    /// `transform` allows unitless zero angles as an exception, see:
+    /// https://github.com/w3c/csswg-drafts/issues/1162
     fn parse_internal<'i, 't>(
         context: &ParserContext,
         input: &mut Parser<'i, 't>,

From 460920cc9001b8336e8bc05cf06bfcc405c4c075 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Fri, 24 Nov 2017 03:24:57 +0000
Subject: [PATCH 127/219] Bug 1420330 - FreeBSD bootstrap: add aarch64 and
 testing dependencies. r=nalexander

- aarch64 has GNU-free toolchain thus /usr/bin/as is N/A by default
  but GNU as is required to build bundled ICU.
- Downstream Python splits sqlite3 C module into a separate package
  to reduce optional dependencies but _sqlite3 is used by mozprofile.

MozReview-Commit-ID: Lh2ktcqh16f

--HG--
extra : rebase_source : bbcbe437132ecfce0f3e6e7b2005d0e8eac65836
---
 python/mozboot/mozboot/freebsd.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/python/mozboot/mozboot/freebsd.py b/python/mozboot/mozboot/freebsd.py
index 564a898fab19..a4ac329861f7 100644
--- a/python/mozboot/mozboot/freebsd.py
+++ b/python/mozboot/mozboot/freebsd.py
@@ -3,6 +3,7 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import absolute_import
+import sys
 
 from mozboot.base import BaseBootstrapper
 
@@ -19,6 +20,7 @@ class FreeBSDBootstrapper(BaseBootstrapper):
             'gtar',
             'mercurial',
             'pkgconf',
+            'py%s%s-sqlite3' % sys.version_info[0:2],
             'rust',
             'watchman',
             'zip',
@@ -35,6 +37,9 @@ class FreeBSDBootstrapper(BaseBootstrapper):
             'yasm',
         ]
 
+        if not self.which('as'):
+            self.packages.append('binutils')
+
         if not self.which('unzip'):
             self.packages.append('unzip')
 

From 99077adb27a1324735d53467cfebb01eb3e1a5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 3 Dec 2017 22:35:57 +0100
Subject: [PATCH 128/219] No bug: Update test expectations for
 servo/servo#19462. r=me

MozReview-Commit-ID: F9aTxF73RmP
---
 layout/style/test/property_database.js                 | 10 +++++++++-
 .../parsing/filter-parsing-valid.html.ini              |  6 ++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index ec40e2451150..e58e98f17a19 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -6624,7 +6624,6 @@ if (IsCSSPropertyPrefEnabled("layout.css.filters.enabled")) {
       "grayscale(-1)",
 
       "hue-rotate()",
-      "hue-rotate(0)",
       "hue-rotate(0.5 0.5)",
       "hue-rotate(0.5,)",
       "hue-rotate(0.5, 0.5)",
@@ -6666,6 +6665,15 @@ if (IsCSSPropertyPrefEnabled("layout.css.filters.enabled")) {
       "sepia(-1)",
     ]
   };
+
+  // See https://github.com/w3c/fxtf-drafts/issues/228.
+  //
+  // This is updated in Stylo but not Gecko.
+  if (SpecialPowers.DOMWindowUtils.isStyledByServo) {
+    gCSSProperties["filter"].other_values.push("hue-rotate(0)");
+  } else {
+    gCSSProperties["filter"].invalid_values.push("hue-rotate(0)");
+  }
 }
 
 if (IsCSSPropertyPrefEnabled("layout.css.grid.enabled")) {
diff --git a/testing/web-platform/meta/css/filter-effects/parsing/filter-parsing-valid.html.ini b/testing/web-platform/meta/css/filter-effects/parsing/filter-parsing-valid.html.ini
index 461dd57b3325..bdc8f47d985e 100644
--- a/testing/web-platform/meta/css/filter-effects/parsing/filter-parsing-valid.html.ini
+++ b/testing/web-platform/meta/css/filter-effects/parsing/filter-parsing-valid.html.ini
@@ -6,8 +6,10 @@
     expected: FAIL
 
   [e.style['filter'\] = "hue-rotate(0)" should set the property value]
-    expected: FAIL
+    expected:
+      if not stylo: FAIL
 
   [Serialization should round-trip after setting e.style['filter'\] = "hue-rotate(0)"]
-    expected: FAIL
+    expected:
+      if not stylo: FAIL
 

From 33546f8acfd1eac6d1721d4e25a2b450ecb606df Mon Sep 17 00:00:00 2001
From: John Lin <jolin@mozilla.com>
Date: Wed, 29 Nov 2017 16:28:11 +0800
Subject: [PATCH 129/219] Bug 1392747 - add debug message to trace media
 shutdown process. r=jwwang

MozReview-Commit-ID: LL19lxlSJem

--HG--
extra : rebase_source : 57ace04484fd3c4f9687e0f79745249358edf56b
---
 dom/media/MediaDecoder.cpp                        |  3 +++
 dom/media/MediaDecoderStateMachine.cpp            |  9 +++++++++
 dom/media/MediaFormatReader.cpp                   | 12 ++++++++++++
 dom/media/MediaShutdownManager.cpp                |  8 ++++++++
 dom/media/platforms/android/RemoteDataDecoder.cpp |  7 +++++++
 5 files changed, 39 insertions(+)

diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index 131dc47b805d..06a57ac74473 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -462,6 +462,9 @@ MediaDecoder::Shutdown()
 
   DiscardOngoingSeekIfExists();
 
+#ifdef NIGHTLY_BUILD
+  DUMP("[DEBUG SHUTDOWN] %s: decoder=%p state machine=%p", __func__, this, mDecoderStateMachine.get());
+#endif
   // This changes the decoder state to SHUTDOWN and does other things
   // necessary to unblock the state machine thread if it's blocked, so
   // the asynchronous shutdown in nsDestroyStateMachine won't deadlock.
diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index 93eea3e80a34..b5029107bfed 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -86,6 +86,12 @@ using namespace mozilla::media;
 #define SLOGW(x, ...) NS_WARNING(nsPrintfCString(SFMT(x, ##__VA_ARGS__)).get())
 #define SLOGE(x, ...) NS_DebugBreak(NS_DEBUG_WARNING, nsPrintfCString(SFMT(x, ##__VA_ARGS__)).get(), nullptr, __FILE__, __LINE__)
 
+#ifdef NIGHTLY_BUILD
+#define DEBUG_SHUTDOWN(fmt, ...) printf_stderr("[DEBUG SHUTDOWN] %s: " fmt "\n", __func__, ##__VA_ARGS__)
+#else
+#define DEBUG_SHUTDOWN(...) do { } while (0)
+#endif
+
 // Certain constants get stored as member variables and then adjusted by various
 // scale factors on a per-decoder basis. We want to make sure to avoid using these
 // constants directly, so we put them in a namespace.
@@ -2639,6 +2645,8 @@ ShutdownState::Enter()
   // Shut down the watch manager to stop further notifications.
   master->mWatchManager.Shutdown();
 
+  DEBUG_SHUTDOWN("state machine=%p reader=%p", this, Reader());
+
   return Reader()->Shutdown()->Then(
     OwnerThread(), __func__, master,
     &MediaDecoderStateMachine::FinishShutdown,
@@ -3463,6 +3471,7 @@ MediaDecoderStateMachine::FinishShutdown()
 {
   MOZ_ASSERT(OnTaskQueue());
   LOG("Shutting down state machine task queue");
+  DEBUG_SHUTDOWN("state machine=%p", this);
   return OwnerThread()->BeginShutdown();
 }
 
diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp
index 215fd3e223fd..7e5578115e03 100644
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -43,6 +43,12 @@ mozilla::LazyLogModule gMediaDemuxerLog("MediaDemuxer");
 
 #define NS_DispatchToMainThread(...) CompileError_UseAbstractMainThreadInstead
 
+#ifdef NIGHTLY_BUILD
+#define DEBUG_SHUTDOWN(fmt, ...) printf_stderr("[DEBUG SHUTDOWN] %s: " fmt "\n", __func__, ##__VA_ARGS__)
+#else
+#define DEBUG_SHUTDOWN(...) do { } while (0)
+#endif
+
 namespace mozilla {
 
 
@@ -446,6 +452,7 @@ MediaFormatReader::ShutdownPromisePool::Shutdown()
 {
   MOZ_DIAGNOSTIC_ASSERT(!mShutdown);
   mShutdown = true;
+  DEBUG_SHUTDOWN("pool=%p count=%d", this, mPromises.Count());
   if (mPromises.Count() == 0) {
     mOnShutdownComplete->Resolve(true, __func__);
   }
@@ -463,6 +470,7 @@ MediaFormatReader::ShutdownPromisePool::Track(RefPtr<ShutdownPromise> aPromise)
     [aPromise, this]() {
       MOZ_DIAGNOSTIC_ASSERT(mPromises.Contains(aPromise));
       mPromises.RemoveEntry(aPromise);
+      DEBUG_SHUTDOWN("pool=%p shutdown=%s count=%d", this, mShutdown ? "true" : "false", mPromises.Count());
       if (mShutdown && mPromises.Count() == 0) {
         mOnShutdownComplete->Resolve(true, __func__);
       }
@@ -479,6 +487,7 @@ MediaFormatReader::DecoderData::ShutdownDecoder()
     return;
   }
 
+  DEBUG_SHUTDOWN("decoder: '%s' (%p) flush:%d", mDecoder->GetDescriptionName().get(), mDecoder.get(), mFlushing);
   if (mFlushing) {
     // Flush is is in action. Shutdown will be initiated after flush completes.
     MOZ_DIAGNOSTIC_ASSERT(mShutdownPromise);
@@ -1274,6 +1283,7 @@ MediaFormatReader::Shutdown()
     ShutdownDecoder(TrackInfo::kVideoTrack);
   }
 
+  DEBUG_SHUTDOWN("reader=%p shutdown demuxer=%p", this, mDemuxer.get());
   mShutdownPromisePool->Track(mDemuxer->Shutdown());
   mDemuxer = nullptr;
 
@@ -1308,11 +1318,13 @@ MediaFormatReader::TearDownDecoders()
     mAudio.mTaskQueue->BeginShutdown();
     mAudio.mTaskQueue->AwaitShutdownAndIdle();
     mAudio.mTaskQueue = nullptr;
+    DEBUG_SHUTDOWN("reader=%p shut down audio task queue", this);
   }
   if (mVideo.mTaskQueue) {
     mVideo.mTaskQueue->BeginShutdown();
     mVideo.mTaskQueue->AwaitShutdownAndIdle();
     mVideo.mTaskQueue = nullptr;
+    DEBUG_SHUTDOWN("reader=%p shut down video task queue", this);
   }
 
   mDecoderFactory = nullptr;
diff --git a/dom/media/MediaShutdownManager.cpp b/dom/media/MediaShutdownManager.cpp
index 829589504d7c..ba3569c62a98 100644
--- a/dom/media/MediaShutdownManager.cpp
+++ b/dom/media/MediaShutdownManager.cpp
@@ -19,6 +19,12 @@ extern LazyLogModule gMediaDecoderLog;
 #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 #define LOGW(...) NS_WARNING(nsPrintfCString(__VA_ARGS__).get())
 
+#ifdef NIGHTLY_BUILD
+#define DEBUG_SHUTDOWN(fmt, ...) printf_stderr("[DEBUG SHUTDOWN] %s: " fmt "\n", __func__, ##__VA_ARGS__)
+#else
+#define DEBUG_SHUTDOWN(...) do { } while (0)
+#endif
+
 NS_IMPL_ISUPPORTS(MediaShutdownManager, nsIAsyncShutdownBlocker)
 
 MediaShutdownManager::MediaShutdownManager()
@@ -118,6 +124,7 @@ MediaShutdownManager::Register(MediaDecoder* aDecoder)
   // that's not going to work.
   MOZ_ASSERT(!mDecoders.Contains(aDecoder));
   mDecoders.PutEntry(aDecoder);
+  DEBUG_SHUTDOWN("decoder=%p, count=%d", aDecoder, mDecoders.Count());
   MOZ_ASSERT(mDecoders.Contains(aDecoder));
   MOZ_ASSERT(mDecoders.Count() > 0);
   return NS_OK;
@@ -131,6 +138,7 @@ MediaShutdownManager::Unregister(MediaDecoder* aDecoder)
     return;
   }
   mDecoders.RemoveEntry(aDecoder);
+  DEBUG_SHUTDOWN("decoder=%p, count=%d", aDecoder, mDecoders.Count());
   if (sInitPhase == XPCOMShutdownStarted && mDecoders.Count() == 0) {
     RemoveBlocker();
   }
diff --git a/dom/media/platforms/android/RemoteDataDecoder.cpp b/dom/media/platforms/android/RemoteDataDecoder.cpp
index edc720c87ba7..7ecbc8534ec3 100644
--- a/dom/media/platforms/android/RemoteDataDecoder.cpp
+++ b/dom/media/platforms/android/RemoteDataDecoder.cpp
@@ -20,6 +20,12 @@
 
 #include <jni.h>
 
+#ifdef NIGHTLY_BUILD
+#define DEBUG_SHUTDOWN(fmt, ...) printf_stderr("[DEBUG SHUTDOWN] %s: " fmt "\n", __func__, ##__VA_ARGS__)
+#else
+#define DEBUG_SHUTDOWN(...) do { } while (0)
+#endif
+
 #undef LOG
 #define LOG(arg, ...)                                                          \
   MOZ_LOG(sAndroidDecoderModuleLog,                                            \
@@ -540,6 +546,7 @@ RemoteDataDecoder::ProcessShutdown()
 
   mFormat = nullptr;
 
+  DEBUG_SHUTDOWN("decoder=%p mime=%s", this, mMimeType.get());
   return ShutdownPromise::CreateAndResolve(true, __func__);
 }
 

From 972cab9021364ece0a2861f19c713b08f50a9fbf Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Fri, 1 Dec 2017 13:53:46 +0800
Subject: [PATCH 130/219] Bug 1422657. P1 - GetStatistics() should pass
 mPlaybackPosition to mResource->GetCachedDataEnd(). r=bechen,gerald

Usually mDecoderPosition and mPlaybackPosition are in the same cached range so
GetCachedDataEnd(mDecoderPosition) and GetCachedDataEnd(mPlaybackPosition) will
give the same result.

It also makes more sense to pass the playback position instead of decoder
position since 'canplaythrough' is about playback instead of decoding.

MozReview-Commit-ID: Kk1uUeSFTCI

--HG--
extra : rebase_source : 354fe5b4a6fb73a477ded40bf5fb91979a2c2a8a
---
 dom/media/ChannelMediaDecoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/media/ChannelMediaDecoder.cpp b/dom/media/ChannelMediaDecoder.cpp
index e554cf646eef..e64a307396da 100644
--- a/dom/media/ChannelMediaDecoder.cpp
+++ b/dom/media/ChannelMediaDecoder.cpp
@@ -445,7 +445,7 @@ ChannelMediaDecoder::GetStatistics()
   MediaStatistics result;
   result.mDownloadRate =
     mResource->GetDownloadRate(&result.mDownloadRateReliable);
-  result.mDownloadPosition = mResource->GetCachedDataEnd(mDecoderPosition);
+  result.mDownloadPosition = mResource->GetCachedDataEnd(mPlaybackPosition);
   result.mTotalBytes = mResource->GetLength();
   result.mPlaybackRate = mPlaybackBytesPerSecond;
   result.mPlaybackRateReliable = mPlaybackRateReliable;

From da8d5c072ec55baa78f542cb21b393a228b0a31a Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Fri, 1 Dec 2017 14:02:44 +0800
Subject: [PATCH 131/219] Bug 1422657. P2 - remove unused mDecoderPosition and
 related code. r=bechen,gerald

MozReview-Commit-ID: 8RobmJKC40i

--HG--
extra : rebase_source : 50037c4dbe422f911819f845548b0ba69ac5d35f
---
 dom/media/BaseMediaResource.cpp    |  9 ------
 dom/media/BaseMediaResource.h      |  4 ---
 dom/media/ChannelMediaDecoder.cpp  | 44 ------------------------------
 dom/media/ChannelMediaDecoder.h    | 11 --------
 dom/media/ChannelMediaResource.cpp |  7 +----
 dom/media/FileMediaResource.cpp    |  3 --
 dom/media/MediaDecoder.h           |  6 ----
 dom/media/MediaResourceCallback.h  |  3 --
 8 files changed, 1 insertion(+), 86 deletions(-)

diff --git a/dom/media/BaseMediaResource.cpp b/dom/media/BaseMediaResource.cpp
index b09e310a39fa..ef993c7149b8 100644
--- a/dom/media/BaseMediaResource.cpp
+++ b/dom/media/BaseMediaResource.cpp
@@ -159,13 +159,4 @@ BaseMediaResource::ModifyLoadFlags(nsLoadFlags aFlags)
   }
 }
 
-void
-BaseMediaResource::DispatchBytesConsumed(int64_t aNumBytes, int64_t aOffset)
-{
-  if (aNumBytes <= 0) {
-    return;
-  }
-  mCallback->NotifyBytesConsumed(aNumBytes, aOffset);
-}
-
 } // namespace mozilla
diff --git a/dom/media/BaseMediaResource.h b/dom/media/BaseMediaResource.h
index ed635356ed42..28a7d9007892 100644
--- a/dom/media/BaseMediaResource.h
+++ b/dom/media/BaseMediaResource.h
@@ -134,10 +134,6 @@ protected:
   // then the request is added back to the load group.
   void ModifyLoadFlags(nsLoadFlags aFlags);
 
-  // Dispatches an event to call MediaDecoder::NotifyBytesConsumed(aNumBytes, aOffset)
-  // on the main thread. This is called automatically after every read.
-  void DispatchBytesConsumed(int64_t aNumBytes, int64_t aOffset);
-
   RefPtr<MediaResourceCallback> mCallback;
 
   // Channel used to download the media data. Must be accessed
diff --git a/dom/media/ChannelMediaDecoder.cpp b/dom/media/ChannelMediaDecoder.cpp
index e64a307396da..cf1497f9ad39 100644
--- a/dom/media/ChannelMediaDecoder.cpp
+++ b/dom/media/ChannelMediaDecoder.cpp
@@ -131,30 +131,11 @@ ChannelMediaDecoder::ResourceCallback::NotifySuspendedStatusChanged(
   }
 }
 
-void
-ChannelMediaDecoder::ResourceCallback::NotifyBytesConsumed(int64_t aBytes,
-                                                           int64_t aOffset)
-{
-  RefPtr<ResourceCallback> self = this;
-  nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction(
-    "ChannelMediaDecoder::ResourceCallback::NotifyBytesConsumed",
-    [=]() {
-    if (self->mDecoder) {
-      self->mDecoder->NotifyBytesConsumed(aBytes, aOffset);
-    }
-  });
-  mAbstractMainThread->Dispatch(r.forget());
-}
-
 ChannelMediaDecoder::ChannelMediaDecoder(MediaDecoderInit& aInit)
   : MediaDecoder(aInit)
   , mResourceCallback(new ResourceCallback(aInit.mOwner->AbstractMainThread()))
-  , mWatchManager(this, aInit.mOwner->AbstractMainThread())
 {
   mResourceCallback->Connect(this);
-
-  // mIgnoreProgressData
-  mWatchManager.Watch(mLogicallySeeking, &ChannelMediaDecoder::SeekingChanged);
 }
 
 /* static */
@@ -221,7 +202,6 @@ MediaDecoderStateMachine* ChannelMediaDecoder::CreateStateMachine()
 void
 ChannelMediaDecoder::Shutdown()
 {
-  mWatchManager.Shutdown();
   mResourceCallback->Disconnect();
   MediaDecoder::Shutdown();
 
@@ -308,30 +288,6 @@ ChannelMediaDecoder::NotifyDownloadEnded(nsresult aStatus)
   }
 }
 
-void
-ChannelMediaDecoder::NotifyBytesConsumed(int64_t aBytes, int64_t aOffset)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_DIAGNOSTIC_ASSERT(!IsShutdown());
-  AbstractThread::AutoEnter context(AbstractMainThread());
-
-  if (mIgnoreProgressData) {
-    return;
-  }
-
-  MOZ_ASSERT(GetStateMachine());
-  mDecoderPosition = aOffset + aBytes;
-}
-
-void
-ChannelMediaDecoder::SeekingChanged()
-{
-  // Stop updating the bytes downloaded for progress notifications when
-  // seeking to prevent wild changes to the progress notification.
-  MOZ_ASSERT(NS_IsMainThread());
-  mIgnoreProgressData = mLogicallySeeking;
-}
-
 bool
 ChannelMediaDecoder::CanPlayThroughImpl()
 {
diff --git a/dom/media/ChannelMediaDecoder.h b/dom/media/ChannelMediaDecoder.h
index 4d43b6051fb0..cb499ef7cacc 100644
--- a/dom/media/ChannelMediaDecoder.h
+++ b/dom/media/ChannelMediaDecoder.h
@@ -44,7 +44,6 @@ class ChannelMediaDecoder : public MediaDecoder
     void NotifyDataEnded(nsresult aStatus) override;
     void NotifyPrincipalChanged() override;
     void NotifySuspendedStatusChanged(bool aSuspendedByCache) override;
-    void NotifyBytesConsumed(int64_t aBytes, int64_t aOffset) override;
 
     static void TimerCallback(nsITimer* aTimer, void* aClosure);
 
@@ -115,8 +114,6 @@ private:
   // by the MediaResource read functions.
   void NotifyBytesConsumed(int64_t aBytes, int64_t aOffset);
 
-  void SeekingChanged();
-
   bool CanPlayThroughImpl() override final;
 
   bool IsLiveStream() override final;
@@ -136,14 +133,6 @@ private:
 
   bool ShouldThrottleDownload();
 
-  WatchManager<ChannelMediaDecoder> mWatchManager;
-
-  // True when seeking or otherwise moving the play position around in
-  // such a manner that progress event data is inaccurate. This is set
-  // during seek and duration operations to prevent the progress indicator
-  // from jumping around. Read/Write on the main thread only.
-  bool mIgnoreProgressData = false;
-
   // Data needed to estimate playback data rate. The timeline used for
   // this estimate is "decode time" (where the "current time" is the
   // time of the last decoded video frame).
diff --git a/dom/media/ChannelMediaResource.cpp b/dom/media/ChannelMediaResource.cpp
index d8be4248497a..a7bb92570d72 100644
--- a/dom/media/ChannelMediaResource.cpp
+++ b/dom/media/ChannelMediaResource.cpp
@@ -621,12 +621,7 @@ nsresult ChannelMediaResource::ReadAt(int64_t aOffset,
                                       uint32_t* aBytes)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Don't call on main thread");
-
-  nsresult rv = mCacheStream.ReadAt(aOffset, aBuffer, aCount, aBytes);
-  if (NS_SUCCEEDED(rv)) {
-    DispatchBytesConsumed(*aBytes, aOffset);
-  }
-  return rv;
+  return mCacheStream.ReadAt(aOffset, aBuffer, aCount, aBytes);
 }
 
 void
diff --git a/dom/media/FileMediaResource.cpp b/dom/media/FileMediaResource.cpp
index fc60c204d003..15de702a0ca5 100644
--- a/dom/media/FileMediaResource.cpp
+++ b/dom/media/FileMediaResource.cpp
@@ -171,9 +171,6 @@ FileMediaResource::ReadAt(int64_t aOffset, char* aBuffer, uint32_t aCount,
     if (NS_FAILED(rv)) return rv;
     rv = UnsafeRead(aBuffer, aCount, aBytes);
   }
-  if (NS_SUCCEEDED(rv)) {
-    DispatchBytesConsumed(*aBytes, aOffset);
-  }
   return rv;
 }
 
diff --git a/dom/media/MediaDecoder.h b/dom/media/MediaDecoder.h
index 2c10aa734120..524b8e3c79dc 100644
--- a/dom/media/MediaDecoder.h
+++ b/dom/media/MediaDecoder.h
@@ -648,12 +648,6 @@ protected:
   // background.
   bool mIsBackgroundVideoDecodingAllowed;
 
-  // Current decoding position in the stream. This is where the decoder
-  // is up to consuming the stream. This is not adjusted during decoder
-  // seek operations, but it's updated at the end when we start playing
-  // back again.
-  int64_t mDecoderPosition = 0;
-
 public:
   AbstractCanonical<double>* CanonicalVolume() { return &mVolume; }
   AbstractCanonical<bool>* CanonicalPreservesPitch()
diff --git a/dom/media/MediaResourceCallback.h b/dom/media/MediaResourceCallback.h
index 8896e6d6d57e..829861613cfd 100644
--- a/dom/media/MediaResourceCallback.h
+++ b/dom/media/MediaResourceCallback.h
@@ -53,9 +53,6 @@ public:
   // Notify that the "cache suspended" status of MediaResource changes.
   virtual void NotifySuspendedStatusChanged(bool aSuspendedByCache) {}
 
-  // Notify the number of bytes read from the resource.
-  virtual void NotifyBytesConsumed(int64_t aBytes, int64_t aOffset) {}
-
 protected:
   virtual ~MediaResourceCallback() {}
 };

From a49417c5ed8357eaf7c1e2084dd46366c3e1213b Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Sat, 2 Dec 2017 13:45:57 -0500
Subject: [PATCH 132/219] Bug 1422466. Drop a copy from
 TextDrawTarget::FillGlyphs. r=Gankro

We try hard to ensure that the glyph buffers are of the same type.

--HG--
extra : rebase_source : b785541c15ee2d715b549e0c306e5e0669d4ad71
---
 gfx/layers/wr/WebRenderBridgeChild.cpp |  4 ++--
 gfx/layers/wr/WebRenderBridgeChild.h   |  2 +-
 layout/generic/TextDrawTarget.h        | 28 +++++++++++++++-----------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/gfx/layers/wr/WebRenderBridgeChild.cpp b/gfx/layers/wr/WebRenderBridgeChild.cpp
index 06fb195b7520..de9664fd1ac3 100644
--- a/gfx/layers/wr/WebRenderBridgeChild.cpp
+++ b/gfx/layers/wr/WebRenderBridgeChild.cpp
@@ -288,7 +288,7 @@ WriteFontDescriptor(const uint8_t* aData, uint32_t aLength, uint32_t aIndex,
 }
 
 void
-WebRenderBridgeChild::PushGlyphs(wr::DisplayListBuilder& aBuilder, const nsTArray<wr::GlyphInstance>& aGlyphs,
+WebRenderBridgeChild::PushGlyphs(wr::DisplayListBuilder& aBuilder, Range<const wr::GlyphInstance> aGlyphs,
                                  gfx::ScaledFont* aFont, const wr::ColorF& aColor, const StackingContextHelper& aSc,
                                  const wr::LayerRect& aBounds, const wr::LayerRect& aClip, bool aBackfaceVisible,
                                  const wr::GlyphOptions* aGlyphOptions)
@@ -304,7 +304,7 @@ WebRenderBridgeChild::PushGlyphs(wr::DisplayListBuilder& aBuilder, const nsTArra
                     aBackfaceVisible,
                     aColor,
                     key,
-                    Range<const wr::GlyphInstance>(aGlyphs.Elements(), aGlyphs.Length()),
+                    aGlyphs,
                     aGlyphOptions);
 }
 
diff --git a/gfx/layers/wr/WebRenderBridgeChild.h b/gfx/layers/wr/WebRenderBridgeChild.h
index 25e5f920f25e..929fd03bb275 100644
--- a/gfx/layers/wr/WebRenderBridgeChild.h
+++ b/gfx/layers/wr/WebRenderBridgeChild.h
@@ -130,7 +130,7 @@ public:
     return wr::WrImageKey{ GetNamespace(), GetNextResourceId() };
   }
 
-  void PushGlyphs(wr::DisplayListBuilder& aBuilder, const nsTArray<wr::GlyphInstance>& aGlyphs,
+  void PushGlyphs(wr::DisplayListBuilder& aBuilder, Range<const wr::GlyphInstance> aGlyphs,
                   gfx::ScaledFont* aFont, const wr::ColorF& aColor,
                   const StackingContextHelper& aSc,
                   const wr::LayerRect& aBounds, const wr::LayerRect& aClip,
diff --git a/layout/generic/TextDrawTarget.h b/layout/generic/TextDrawTarget.h
index 5d0712d57b17..6bb0eeb0b4c4 100644
--- a/layout/generic/TextDrawTarget.h
+++ b/layout/generic/TextDrawTarget.h
@@ -105,8 +105,6 @@ public:
     MOZ_RELEASE_ASSERT(aOptions.mCompositionOp == CompositionOp::OP_OVER);
     MOZ_RELEASE_ASSERT(aOptions.mAlpha == 1.0f);
     MOZ_RELEASE_ASSERT(aPattern.GetType() == PatternType::COLOR);
-    auto* colorPat = static_cast<const ColorPattern*>(&aPattern);
-    auto color = wr::ToColorF(colorPat->mColor);
 
     // Make sure the font exists, and can be serialized
     MOZ_RELEASE_ASSERT(aFont);
@@ -115,17 +113,23 @@ public:
       return;
     }
 
-    // 170 is the maximum size gfxFont is expected to hand us
-    AutoTArray<wr::GlyphInstance, 170> glyphs;
-    glyphs.SetLength(aBuffer.mNumGlyphs);
+    auto* colorPat = static_cast<const ColorPattern*>(&aPattern);
+    auto color = wr::ToColorF(colorPat->mColor);
+    auto glyphs = Range<const wr::GlyphInstance>(reinterpret_cast<const wr::GlyphInstance*>(aBuffer.mGlyphs), aBuffer.mNumGlyphs);
 
-    for (size_t i = 0; i < aBuffer.mNumGlyphs; i++) {
-      wr::GlyphInstance& targetGlyph = glyphs[i];
-      const gfx::Glyph& sourceGlyph = aBuffer.mGlyphs[i];
-      targetGlyph.index = sourceGlyph.mIndex;
-      targetGlyph.point = mSc.ToRelativeLayoutPoint(
-          LayoutDevicePoint::FromUnknownPoint(sourceGlyph.mPosition));
-    }
+    // Compare gfx::Glyph and wr::GlyphInstance to make sure that they are
+    // structurally equivalent to ensure that our cast above was ok
+    static_assert(std::is_same<decltype(aBuffer.mGlyphs[0].mIndex), decltype(glyphs[0].index)>()
+                  && std::is_same<decltype(aBuffer.mGlyphs[0].mPosition.x), decltype(glyphs[0].point.x)>()
+                  && std::is_same<decltype(aBuffer.mGlyphs[0].mPosition.y), decltype(glyphs[0].point.y)>()
+                  && offsetof(std::remove_reference<decltype(aBuffer.mGlyphs[0])>::type, mIndex) == offsetof(wr::GlyphInstance, index)
+                  && offsetof(std::remove_reference<decltype(aBuffer.mGlyphs[0])>::type, mPosition) == offsetof(wr::GlyphInstance, point)
+                  && offsetof(decltype(aBuffer.mGlyphs[0].mPosition), x) == offsetof(decltype(glyphs[0].point), x)
+                  && offsetof(decltype(aBuffer.mGlyphs[0].mPosition), y) == offsetof(decltype(glyphs[0].point), y)
+                  && std::is_standard_layout<decltype(aBuffer.mGlyphs[0])>::value == std::is_standard_layout<decltype(glyphs[0])>::value
+                  && sizeof(aBuffer.mGlyphs[0]) == sizeof(glyphs[0])
+                  && sizeof(aBuffer.mGlyphs[0].mPosition) == sizeof(glyphs[0].point)
+                  , "glyph buf types don't match");
 
     wr::GlyphOptions glyphOptions;
     glyphOptions.render_mode = wr::ToFontRenderMode(aOptions.mAntialiasMode, GetPermitSubpixelAA());

From 44b16ed498ef91e9e083011f3f1aa0ef059413e6 Mon Sep 17 00:00:00 2001
From: Gurzau Raul <rgurzau@mozilla.com>
Date: Mon, 4 Dec 2017 05:34:10 +0200
Subject: [PATCH 133/219] Backed out 1 changesets (bug 1422466) for build
 bustage on a CLOSED TREE

Backed out changeset 719224b9a2dd (bug 1422466)
---
 gfx/layers/wr/WebRenderBridgeChild.cpp |  4 ++--
 gfx/layers/wr/WebRenderBridgeChild.h   |  2 +-
 layout/generic/TextDrawTarget.h        | 28 +++++++++++---------------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/gfx/layers/wr/WebRenderBridgeChild.cpp b/gfx/layers/wr/WebRenderBridgeChild.cpp
index de9664fd1ac3..06fb195b7520 100644
--- a/gfx/layers/wr/WebRenderBridgeChild.cpp
+++ b/gfx/layers/wr/WebRenderBridgeChild.cpp
@@ -288,7 +288,7 @@ WriteFontDescriptor(const uint8_t* aData, uint32_t aLength, uint32_t aIndex,
 }
 
 void
-WebRenderBridgeChild::PushGlyphs(wr::DisplayListBuilder& aBuilder, Range<const wr::GlyphInstance> aGlyphs,
+WebRenderBridgeChild::PushGlyphs(wr::DisplayListBuilder& aBuilder, const nsTArray<wr::GlyphInstance>& aGlyphs,
                                  gfx::ScaledFont* aFont, const wr::ColorF& aColor, const StackingContextHelper& aSc,
                                  const wr::LayerRect& aBounds, const wr::LayerRect& aClip, bool aBackfaceVisible,
                                  const wr::GlyphOptions* aGlyphOptions)
@@ -304,7 +304,7 @@ WebRenderBridgeChild::PushGlyphs(wr::DisplayListBuilder& aBuilder, Range<const w
                     aBackfaceVisible,
                     aColor,
                     key,
-                    aGlyphs,
+                    Range<const wr::GlyphInstance>(aGlyphs.Elements(), aGlyphs.Length()),
                     aGlyphOptions);
 }
 
diff --git a/gfx/layers/wr/WebRenderBridgeChild.h b/gfx/layers/wr/WebRenderBridgeChild.h
index 929fd03bb275..25e5f920f25e 100644
--- a/gfx/layers/wr/WebRenderBridgeChild.h
+++ b/gfx/layers/wr/WebRenderBridgeChild.h
@@ -130,7 +130,7 @@ public:
     return wr::WrImageKey{ GetNamespace(), GetNextResourceId() };
   }
 
-  void PushGlyphs(wr::DisplayListBuilder& aBuilder, Range<const wr::GlyphInstance> aGlyphs,
+  void PushGlyphs(wr::DisplayListBuilder& aBuilder, const nsTArray<wr::GlyphInstance>& aGlyphs,
                   gfx::ScaledFont* aFont, const wr::ColorF& aColor,
                   const StackingContextHelper& aSc,
                   const wr::LayerRect& aBounds, const wr::LayerRect& aClip,
diff --git a/layout/generic/TextDrawTarget.h b/layout/generic/TextDrawTarget.h
index 6bb0eeb0b4c4..5d0712d57b17 100644
--- a/layout/generic/TextDrawTarget.h
+++ b/layout/generic/TextDrawTarget.h
@@ -105,6 +105,8 @@ public:
     MOZ_RELEASE_ASSERT(aOptions.mCompositionOp == CompositionOp::OP_OVER);
     MOZ_RELEASE_ASSERT(aOptions.mAlpha == 1.0f);
     MOZ_RELEASE_ASSERT(aPattern.GetType() == PatternType::COLOR);
+    auto* colorPat = static_cast<const ColorPattern*>(&aPattern);
+    auto color = wr::ToColorF(colorPat->mColor);
 
     // Make sure the font exists, and can be serialized
     MOZ_RELEASE_ASSERT(aFont);
@@ -113,23 +115,17 @@ public:
       return;
     }
 
-    auto* colorPat = static_cast<const ColorPattern*>(&aPattern);
-    auto color = wr::ToColorF(colorPat->mColor);
-    auto glyphs = Range<const wr::GlyphInstance>(reinterpret_cast<const wr::GlyphInstance*>(aBuffer.mGlyphs), aBuffer.mNumGlyphs);
+    // 170 is the maximum size gfxFont is expected to hand us
+    AutoTArray<wr::GlyphInstance, 170> glyphs;
+    glyphs.SetLength(aBuffer.mNumGlyphs);
 
-    // Compare gfx::Glyph and wr::GlyphInstance to make sure that they are
-    // structurally equivalent to ensure that our cast above was ok
-    static_assert(std::is_same<decltype(aBuffer.mGlyphs[0].mIndex), decltype(glyphs[0].index)>()
-                  && std::is_same<decltype(aBuffer.mGlyphs[0].mPosition.x), decltype(glyphs[0].point.x)>()
-                  && std::is_same<decltype(aBuffer.mGlyphs[0].mPosition.y), decltype(glyphs[0].point.y)>()
-                  && offsetof(std::remove_reference<decltype(aBuffer.mGlyphs[0])>::type, mIndex) == offsetof(wr::GlyphInstance, index)
-                  && offsetof(std::remove_reference<decltype(aBuffer.mGlyphs[0])>::type, mPosition) == offsetof(wr::GlyphInstance, point)
-                  && offsetof(decltype(aBuffer.mGlyphs[0].mPosition), x) == offsetof(decltype(glyphs[0].point), x)
-                  && offsetof(decltype(aBuffer.mGlyphs[0].mPosition), y) == offsetof(decltype(glyphs[0].point), y)
-                  && std::is_standard_layout<decltype(aBuffer.mGlyphs[0])>::value == std::is_standard_layout<decltype(glyphs[0])>::value
-                  && sizeof(aBuffer.mGlyphs[0]) == sizeof(glyphs[0])
-                  && sizeof(aBuffer.mGlyphs[0].mPosition) == sizeof(glyphs[0].point)
-                  , "glyph buf types don't match");
+    for (size_t i = 0; i < aBuffer.mNumGlyphs; i++) {
+      wr::GlyphInstance& targetGlyph = glyphs[i];
+      const gfx::Glyph& sourceGlyph = aBuffer.mGlyphs[i];
+      targetGlyph.index = sourceGlyph.mIndex;
+      targetGlyph.point = mSc.ToRelativeLayoutPoint(
+          LayoutDevicePoint::FromUnknownPoint(sourceGlyph.mPosition));
+    }
 
     wr::GlyphOptions glyphOptions;
     glyphOptions.render_mode = wr::ToFontRenderMode(aOptions.mAntialiasMode, GetPermitSubpixelAA());

From 5c35d9705db6f7e41d7e639821f25beac28f7281 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Wed, 29 Nov 2017 17:57:00 +0900
Subject: [PATCH 134/219] Bug 1421504 - EditorBase should move children
 carefully r=m_kato

While moving children of a container to another container, mutation observer
may move children before moving and/or move node immediately after the
insertion point.  Therefore, EditorBase should store all children which
should be moved with a local variable.  Then, move one by one carefully.
E.g., if a child before being moved is moved to different container, it
shouldn't be moved because JS already handles it as expected for the web
app.  If next sibling of the insertion point has been moved, EditorBase
should stop moving the remaining children because it may move children to
odd position and it may cause dataloss.

This patch creates EditorBase::MoveChildren() and it moves children carefully
with above checks.  Additionally, making its callers simpler, this patch also
creates EditorBase::MovePreviousSiblings() and MoveAllChildren().

MozReview-Commit-ID: FJDdSqXIlqD

--HG--
extra : rebase_source : 54bded29dbbd9547339a2c6e1a1264e22fbdc740
---
 editor/libeditor/EditorBase.cpp   | 148 ++++++++++++++++++++++++++----
 editor/libeditor/EditorBase.h     |  56 +++++++++++
 editor/libeditor/EditorDOMPoint.h |   1 +
 3 files changed, 187 insertions(+), 18 deletions(-)

diff --git a/editor/libeditor/EditorBase.cpp b/editor/libeditor/EditorBase.cpp
index 1cce31c8d4b8..c0a2d47dda49 100644
--- a/editor/libeditor/EditorBase.cpp
+++ b/editor/libeditor/EditorBase.cpp
@@ -1869,6 +1869,119 @@ EditorBase::MoveNode(nsIContent* aNode,
   return InsertNode(*aNode, *aParent, aOffset);
 }
 
+void
+EditorBase::MoveAllChildren(nsINode& aContainer,
+                            const EditorRawDOMPoint& aPointToInsert,
+                            ErrorResult& aError)
+{
+  if (!aContainer.HasChildren()) {
+    return;
+  }
+  nsIContent* firstChild = aContainer.GetFirstChild();
+  if (NS_WARN_IF(!firstChild)) {
+    aError.Throw(NS_ERROR_FAILURE);
+    return;
+  }
+  nsIContent* lastChild = aContainer.GetLastChild();
+  if (NS_WARN_IF(!lastChild)) {
+    aError.Throw(NS_ERROR_FAILURE);
+    return;
+  }
+  return MoveChildren(*firstChild, *lastChild, aPointToInsert, aError);
+}
+
+void
+EditorBase::MovePreviousSiblings(nsIContent& aChild,
+                                 const EditorRawDOMPoint& aPointToInsert,
+                                 ErrorResult& aError)
+{
+  if (NS_WARN_IF(!aChild.GetParentNode())) {
+    aError.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+  nsIContent* firstChild = aChild.GetParentNode()->GetFirstChild();
+  if (NS_WARN_IF(!firstChild)) {
+    aError.Throw(NS_ERROR_FAILURE);
+    return;
+  }
+  nsIContent* lastChild =
+    &aChild == firstChild ? firstChild : aChild.GetPreviousSibling();
+  if (NS_WARN_IF(!lastChild)) {
+    aError.Throw(NS_ERROR_FAILURE);
+    return;
+  }
+  return MoveChildren(*firstChild, *lastChild, aPointToInsert, aError);
+}
+
+void
+EditorBase::MoveChildren(nsIContent& aFirstChild,
+                         nsIContent& aLastChild,
+                         const EditorRawDOMPoint& aPointToInsert,
+                         ErrorResult& aError)
+{
+  nsCOMPtr<nsINode> oldContainer = aFirstChild.GetParentNode();
+  if (NS_WARN_IF(oldContainer != aLastChild.GetParentNode()) ||
+      NS_WARN_IF(!aPointToInsert.IsSet()) ||
+      NS_WARN_IF(!aPointToInsert.Container()->IsContainerNode())) {
+    aError.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+
+  // First, store all children which should be moved to the new container.
+  AutoTArray<nsCOMPtr<nsIContent>, 10> children;
+  for (nsIContent* child = &aFirstChild;
+       child;
+       child = child->GetNextSibling()) {
+    children.AppendElement(child);
+    if (child == &aLastChild) {
+      break;
+    }
+  }
+
+  if (NS_WARN_IF(children.LastElement() != &aLastChild)) {
+    aError.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+
+  nsCOMPtr<nsINode> newContainer = aPointToInsert.Container();
+  nsCOMPtr<nsIContent> nextNode = aPointToInsert.GetChildAtOffset();
+  for (size_t i = children.Length(); i > 0; --i) {
+    nsCOMPtr<nsIContent>& child = children[i - 1];
+    if (child->GetParentNode() != oldContainer) {
+      // If the child has been moved to different container, we shouldn't
+      // touch it.
+      continue;
+    }
+    oldContainer->RemoveChild(*child, aError);
+    if (NS_WARN_IF(aError.Failed())) {
+      return;
+    }
+    if (nextNode) {
+      // If we're not appending the children to the new container, we should
+      // check if referring next node of insertion point is still in the new
+      // container.
+      EditorRawDOMPoint pointToInsert(nextNode);
+      if (NS_WARN_IF(!pointToInsert.IsSet()) ||
+          NS_WARN_IF(pointToInsert.Container() != newContainer)) {
+        // The next node of insertion point has been moved by mutation observer.
+        // Let's stop moving the remaining nodes.
+        // XXX Or should we move remaining children after the last moved child?
+        aError.Throw(NS_ERROR_FAILURE);
+        return;
+      }
+    }
+    newContainer->InsertBefore(*child, nextNode, aError);
+    if (NS_WARN_IF(aError.Failed())) {
+      return;
+    }
+    // If the child was inserted or appended properly, the following children
+    // should be inserted before it.  Otherwise, keep using current position.
+    if (child->GetParentNode() == newContainer) {
+      nextNode = child;
+    }
+  }
+}
+
 NS_IMETHODIMP
 EditorBase::AddEditorObserver(nsIEditorObserver* aObserver)
 {
@@ -2980,6 +3093,8 @@ EditorBase::SplitNodeImpl(const EditorDOMPoint& aStartOfRightNode,
     return;
   }
 
+  // Fix the child before mutation observer may touch the DOM tree.
+  nsIContent* firstChildOfRightNode = aStartOfRightNode.GetChildAtOffset();
   parent->InsertBefore(aNewLeftNode, aStartOfRightNode.Container(),
                        aError);
   if (NS_WARN_IF(aError.Failed())) {
@@ -3004,24 +3119,21 @@ EditorBase::SplitNodeImpl(const EditorDOMPoint& aStartOfRightNode,
       MOZ_DIAGNOSTIC_ASSERT(!rightAsText && !leftAsText);
       // Otherwise it's an interior node, so shuffle around the children. Go
       // through list backwards so deletes don't interfere with the iteration.
-      // FYI: It's okay to use raw pointer for caching existing right node since
-      //      it's already grabbed by aStartOfRightNode.
-      nsINode* existingRightNode = aStartOfRightNode.Container();
-      nsCOMPtr<nsINodeList> childNodes = existingRightNode->ChildNodes();
-      // XXX This is wrong loop range if some children has already gone.
-      //     This will be fixed by a later patch.
-      for (int32_t i = aStartOfRightNode.Offset() - 1; i >= 0; i--) {
-        nsCOMPtr<nsIContent> childNode = childNodes->Item(i);
-        MOZ_RELEASE_ASSERT(childNode);
-        existingRightNode->RemoveChild(*childNode, aError);
-        if (NS_WARN_IF(aError.Failed())) {
-          break;
-        }
-        nsCOMPtr<nsIContent> firstChild = aNewLeftNode.GetFirstChild();
-        aNewLeftNode.InsertBefore(*childNode, firstChild, aError);
+      if (!firstChildOfRightNode) {
+        MoveAllChildren(*aStartOfRightNode.Container(),
+                        EditorRawDOMPoint(&aNewLeftNode, 0), aError);
         NS_WARNING_ASSERTION(!aError.Failed(),
-          "Failed to insert a child which is removed from the right node into "
-          "the left node");
+          "Failed to move all children from the right node to the left node");
+      } else if (NS_WARN_IF(aStartOfRightNode.Container() !=
+                              firstChildOfRightNode->GetParentNode())) {
+          // firstChildOfRightNode has been moved by mutation observer.
+          // In this case, we what should we do?  Use offset?  But we cannot
+          // check if the offset is still expected.
+      } else {
+        MovePreviousSiblings(*firstChildOfRightNode,
+                             EditorRawDOMPoint(&aNewLeftNode, 0), aError);
+        NS_WARNING_ASSERTION(!aError.Failed(),
+          "Failed to move some children from the right node to the left node");
       }
     }
   }
@@ -4084,7 +4196,7 @@ EditorBase::SplitNodeDeep(nsIContent& aMostAncestorToSplit,
          !atStartOfRightNode.Container()->GetAsText()) ||
         (!atStartOfRightNode.IsStartOfContainer() &&
          !atStartOfRightNode.IsEndOfContainer())) {
-      ErrorResult error;
+      IgnoredErrorResult error;
       nsCOMPtr<nsIContent> newLeftNode =
         SplitNode(atStartOfRightNode.AsRaw(), error);
       if (NS_WARN_IF(error.Failed())) {
diff --git a/editor/libeditor/EditorBase.h b/editor/libeditor/EditorBase.h
index c45c2c5bb994..76d7a24f77ce 100644
--- a/editor/libeditor/EditorBase.h
+++ b/editor/libeditor/EditorBase.h
@@ -382,6 +382,62 @@ public:
   nsresult JoinNodes(nsINode& aLeftNode, nsINode& aRightNode);
   nsresult MoveNode(nsIContent* aNode, nsINode* aParent, int32_t aOffset);
 
+  /**
+   * MoveAllChildren() moves all children of aContainer to before
+   * aPointToInsert.GetChildAtOffset().
+   * See explanation of MoveChildren() for the detail of the behavior.
+   *
+   * @param aContainer          The container node whose all children should
+   *                            be moved.
+   * @param aPointToInsert      The insertion point.  The container must not
+   *                            be a data node like a text node.
+   * @param aError              The result.  If this succeeds to move children,
+   *                            returns NS_OK.  Otherwise, an error.
+   */
+  void MoveAllChildren(nsINode& aContainer,
+                       const EditorRawDOMPoint& aPointToInsert,
+                       ErrorResult& aError);
+
+  /**
+   * MovePreviousSiblings() moves all siblings before aChild (i.e., aChild
+   * won't be moved) to before aPointToInsert.GetChildAtOffset().
+   * See explanation of MoveChildren() for the detail of the behavior.
+   *
+   * @param aChild              The node which is next sibling of the last
+   *                            node to be moved.
+   * @param aPointToInsert      The insertion point.  The container must not
+   *                            be a data node like a text node.
+   * @param aError              The result.  If this succeeds to move children,
+   *                            returns NS_OK.  Otherwise, an error.
+   */
+  void MovePreviousSiblings(nsIContent& aChild,
+                            const EditorRawDOMPoint& aPointToInsert,
+                            ErrorResult& aError);
+
+  /**
+   * MoveChildren() moves all children between aFirstChild and aLastChild to
+   * before aPointToInsert.GetChildAtOffset().
+   * If some children are moved to different container while this method
+   * moves other children, they are just ignored.
+   * If the child node referred by aPointToInsert is moved to different
+   * container while this method moves children, returns error.
+   *
+   * @param aFirstChild         The first child which should be moved to
+   *                            aPointToInsert.
+   * @param aLastChild          The last child which should be moved.  This
+   *                            must be a sibling of aFirstChild and it should
+   *                            be positioned after aFirstChild in the DOM tree
+   *                            order.
+   * @param aPointToInsert      The insertion point.  The container must not
+   *                            be a data node like a text node.
+   * @param aError              The result.  If this succeeds to move children,
+   *                            returns NS_OK.  Otherwise, an error.
+   */
+  void MoveChildren(nsIContent& aFirstChild,
+                    nsIContent& aLastChild,
+                    const EditorRawDOMPoint& aPointToInsert,
+                    ErrorResult& aError);
+
   nsresult CloneAttribute(nsAtom* aAttribute, Element* aDestElement,
                           Element* aSourceElement);
   nsresult RemoveAttribute(Element* aElement, nsAtom* aAttribute);
diff --git a/editor/libeditor/EditorDOMPoint.h b/editor/libeditor/EditorDOMPoint.h
index d7a9e8c22f1c..c95f95f5109c 100644
--- a/editor/libeditor/EditorDOMPoint.h
+++ b/editor/libeditor/EditorDOMPoint.h
@@ -677,6 +677,7 @@ public:
     : mPoint(aPoint)
   {
     MOZ_ASSERT(aPoint.IsSetAndValid());
+    MOZ_ASSERT(mPoint.Container()->IsContainerNode());
     mChild = mPoint.GetChildAtOffset();
   }
 

From 7c6b57669f35fdd31cab310195458dd8cca7937b Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Tue, 21 Nov 2017 14:38:19 +0900
Subject: [PATCH 135/219] Bug 1408227 - part 1: TextEditor::CreateBRImpl()
 should take |const EditorRawDOMPoint&| for insertion point of new <br>
 element r=m_kato

TextEditor::CreateBRImpl() should take |const EditorRawDOMPoint&| as insertion
point of new <br> element.  Additionally, it doesn't need to have out argument
for the point of after <br> element because callers can get it with
EditorRawDOMPoint(nsINode*) and the new <br> node, and calling AdvanceOffset().
This cost must be enough cheap.

MozReview-Commit-ID: Hxawz3D2dCd

--HG--
extra : rebase_source : 866ff50efd70499ed733da9efcce7399f44bd4a0
---
 editor/libeditor/HTMLAbsPositionEditor.cpp |  12 +-
 editor/libeditor/HTMLEditRules.cpp         |  19 +-
 editor/libeditor/HTMLEditor.cpp            |  33 ++--
 editor/libeditor/HTMLEditor.h              |   4 +
 editor/libeditor/TextEditor.cpp            | 207 ++++++++++-----------
 editor/libeditor/TextEditor.h              |  46 ++++-
 editor/libeditor/WSRunObject.cpp           |  20 +-
 7 files changed, 198 insertions(+), 143 deletions(-)

diff --git a/editor/libeditor/HTMLAbsPositionEditor.cpp b/editor/libeditor/HTMLAbsPositionEditor.cpp
index 56008e3b73eb..2f29c1dd0b9d 100644
--- a/editor/libeditor/HTMLAbsPositionEditor.cpp
+++ b/editor/libeditor/HTMLAbsPositionEditor.cpp
@@ -534,9 +534,15 @@ HTMLEditor::AbsolutelyPositionElement(nsIDOMElement* aElement,
 
     nsINode* parentNode = element->GetParentNode();
     if (parentNode->GetChildCount() == 1) {
-      nsCOMPtr<nsIDOMNode> brNode;
-      nsresult rv = CreateBR(parentNode->AsDOMNode(), 0, address_of(brNode));
-      NS_ENSURE_SUCCESS(rv, rv);
+      RefPtr<Selection> selection = GetSelection();
+      if (NS_WARN_IF(!selection)) {
+        return NS_ERROR_FAILURE;
+      }
+      RefPtr<Element> newBRElement =
+        CreateBRImpl(*selection, EditorRawDOMPoint(parentNode, 0), eNone);
+      if (NS_WARN_IF(!newBRElement)) {
+        return NS_ERROR_FAILURE;
+      }
     }
   }
   else {
diff --git a/editor/libeditor/HTMLEditRules.cpp b/editor/libeditor/HTMLEditRules.cpp
index 80e3231673a3..17fa51e71001 100644
--- a/editor/libeditor/HTMLEditRules.cpp
+++ b/editor/libeditor/HTMLEditRules.cpp
@@ -1438,20 +1438,27 @@ HTMLEditRules::WillInsertText(EditAction aAction,
         // is it a return?
         if (subStr.Equals(newlineStr)) {
           NS_ENSURE_STATE(mHTMLEditor);
-          nsCOMPtr<nsINode> curNode = currentPoint.Container();
-          int32_t curOffset = currentPoint.Offset();
           nsCOMPtr<Element> br =
-            mHTMLEditor->CreateBRImpl(address_of(curNode), &curOffset,
+            mHTMLEditor->CreateBRImpl(*aSelection, currentPoint.AsRaw(),
                                       nsIEditor::eNone);
           NS_ENSURE_STATE(br);
           pos++;
           if (br->GetNextSibling()) {
             pointToInsert.Set(br->GetNextSibling());
           } else {
-            pointToInsert.Set(curNode, curNode->Length());
+            pointToInsert.Set(currentPoint.Container(),
+                              currentPoint.Container()->Length());
           }
-          currentPoint.Set(curNode, curOffset);
-          MOZ_ASSERT(currentPoint == pointToInsert);
+          // XXX In most cases, pointToInsert and currentPoint are same here.
+          //     But if the <br> element has been moved to different point by
+          //     mutation observer, those points become different.
+          currentPoint.Set(br);
+          DebugOnly<bool> advanced = currentPoint.AdvanceOffset();
+          NS_WARNING_ASSERTION(advanced,
+            "Failed to advance offset after the new <br> element");
+          NS_WARNING_ASSERTION(currentPoint == pointToInsert,
+            "Perhaps, <br> element position has been moved to different point "
+            "by mutation observer");
         } else {
           NS_ENSURE_STATE(mHTMLEditor);
           EditorRawDOMPoint pointAfterInsertedString;
diff --git a/editor/libeditor/HTMLEditor.cpp b/editor/libeditor/HTMLEditor.cpp
index 585082e2ee25..5658cb9d740a 100644
--- a/editor/libeditor/HTMLEditor.cpp
+++ b/editor/libeditor/HTMLEditor.cpp
@@ -1049,15 +1049,15 @@ HTMLEditor::InsertBR()
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
-  nsCOMPtr<nsINode> selNode;
-  int32_t selOffset;
-  nsresult rv =
-    GetStartNodeAndOffset(selection, getter_AddRefs(selNode), &selOffset);
-  NS_ENSURE_SUCCESS(rv, rv);
+  EditorRawDOMPoint atStartOfSelection(GetStartPoint(selection));
+  if (NS_WARN_IF(!atStartOfSelection.IsSet())) {
+    return NS_ERROR_FAILURE;
+  }
 
-  // position selection after br
-  RefPtr<Element> br = CreateBR(selNode, selOffset, nsIEditor::eNext);
-  if (NS_WARN_IF(!br)) {
+  // CreateBRImpl() will set selection after the new <br> element.
+  RefPtr<Element> newBRElement =
+    CreateBRImpl(*selection, atStartOfSelection, nsIEditor::eNext);
+  if (NS_WARN_IF(!newBRElement)) {
     return NS_ERROR_FAILURE;
   }
   return NS_OK;
@@ -1508,13 +1508,16 @@ HTMLEditor::InsertElementAtSelection(nsIDOMElement* aElement,
       }
       // check for inserting a whole table at the end of a block. If so insert
       // a br after it.
-      if (HTMLEditUtils::IsTable(node)) {
-        if (IsLastEditableChild(element)) {
-          nsCOMPtr<nsIDOMNode> brNode;
-          rv = CreateBR(parentSelectedDOMNode, offsetForInsert + 1,
-                        address_of(brNode));
-          NS_ENSURE_SUCCESS(rv, rv);
-          selection->Collapse(parentSelectedDOMNode, offsetForInsert+1);
+      if (HTMLEditUtils::IsTable(node) &&
+          IsLastEditableChild(element)) {
+        // Collapse selection to the new <br> element node after creating it.
+        RefPtr<Element> newBRElement =
+          CreateBRImpl(*selection,
+                       EditorRawDOMPoint(parentSelectedDOMNode,
+                                         offsetForInsert + 1),
+                       ePrevious);
+        if (NS_WARN_IF(!newBRElement)) {
+          return NS_ERROR_FAILURE;
         }
       }
     }
diff --git a/editor/libeditor/HTMLEditor.h b/editor/libeditor/HTMLEditor.h
index 133bc98aa788..c3340d325778 100644
--- a/editor/libeditor/HTMLEditor.h
+++ b/editor/libeditor/HTMLEditor.h
@@ -470,6 +470,10 @@ protected:
 
   nsresult TabInTable(bool inIsShift, bool* outHandled);
 
+  /**
+   * InsertBR() inserts a new <br> element at selection.  If there is
+   * non-collapsed selection ranges, the selected ranges is deleted first.
+   */
   nsresult InsertBR();
 
   // Table Editing (implemented in nsTableEditor.cpp)
diff --git a/editor/libeditor/TextEditor.cpp b/editor/libeditor/TextEditor.cpp
index b8782310e60f..a16f23f7a85f 100644
--- a/editor/libeditor/TextEditor.cpp
+++ b/editor/libeditor/TextEditor.cpp
@@ -416,120 +416,113 @@ TextEditor::TypedText(const nsAString& aString, ETypingAction aAction)
   }
 }
 
-already_AddRefed<Element>
-TextEditor::CreateBRImpl(nsCOMPtr<nsINode>* aInOutParent,
-                         int32_t* aInOutOffset,
-                         EDirection aSelect)
-{
-  nsCOMPtr<nsIDOMNode> parent(GetAsDOMNode(*aInOutParent));
-  nsCOMPtr<nsIDOMNode> br;
-  // We ignore the retval, and assume it's fine if the br is non-null
-  CreateBRImpl(address_of(parent), aInOutOffset, address_of(br), aSelect);
-  *aInOutParent = do_QueryInterface(parent);
-  nsCOMPtr<Element> ret(do_QueryInterface(br));
-  return ret.forget();
-}
-
-nsresult
-TextEditor::CreateBRImpl(nsCOMPtr<nsIDOMNode>* aInOutParent,
-                         int32_t* aInOutOffset,
-                         nsCOMPtr<nsIDOMNode>* outBRNode,
-                         EDirection aSelect)
-{
-  NS_ENSURE_TRUE(aInOutParent && *aInOutParent && aInOutOffset && outBRNode, NS_ERROR_NULL_POINTER);
-  *outBRNode = nullptr;
-
-  // we need to insert a br.  unfortunately, we may have to split a text node to do it.
-  nsCOMPtr<nsINode> node = do_QueryInterface(*aInOutParent);
-  int32_t theOffset = *aInOutOffset;
-  RefPtr<Element> brNode;
-  if (IsTextNode(node)) {
-    EditorRawDOMPoint pointToInsertBrNode(node);
-    if (NS_WARN_IF(!pointToInsertBrNode.IsSetAndValid())) {
-      return NS_ERROR_FAILURE;
-    }
-    if (!theOffset) {
-      // we are already set to go
-    } else if (theOffset == static_cast<int32_t>(node->Length())) {
-      // update offset to point AFTER the text node
-      pointToInsertBrNode.AdvanceOffset();
-    } else {
-      MOZ_DIAGNOSTIC_ASSERT(theOffset < static_cast<int32_t>(node->Length()));
-      // split the text node
-      EditorRawDOMPoint atStartOfNewLine(node, theOffset);
-      ErrorResult error;
-      nsCOMPtr<nsIContent> newLeftNode = SplitNode(atStartOfNewLine, error);
-      if (NS_WARN_IF(error.Failed())) {
-        return error.StealNSResult();
-      }
-      // The right node offset in the parent is now changed.  Recompute it.
-      pointToInsertBrNode.Set(node);
-      Unused << newLeftNode;
-    }
-    // Lock the offset of pointToInsertBrNode because it'll be referred after
-    // inserting a new <br> node before it.
-    Unused << pointToInsertBrNode.Offset();
-    // create br
-    brNode = CreateNode(nsGkAtoms::br, pointToInsertBrNode);
-    if (NS_WARN_IF(!brNode)) {
-      return NS_ERROR_FAILURE;
-    }
-    *aInOutParent = GetAsDOMNode(pointToInsertBrNode.Container());
-    *aInOutOffset = pointToInsertBrNode.Offset() + 1;
-  } else {
-    EditorRawDOMPoint pointToInsertBrNode(node, theOffset);
-    brNode = CreateNode(nsGkAtoms::br, pointToInsertBrNode);
-    if (NS_WARN_IF(!brNode)) {
-      return NS_ERROR_FAILURE;
-    }
-    (*aInOutOffset)++;
-  }
-
-  *outBRNode = GetAsDOMNode(brNode);
-  if (*outBRNode && (aSelect != eNone)) {
-    RefPtr<Selection> selection = GetSelection();
-    NS_ENSURE_STATE(selection);
-    if (aSelect == eNext) {
-      selection->SetInterlinePosition(true);
-      // position selection after br
-      EditorRawDOMPoint afterBrNode(brNode);
-      if (NS_WARN_IF(!afterBrNode.AdvanceOffset())) {
-        return NS_OK;
-      }
-      selection->Collapse(afterBrNode);
-    } else if (aSelect == ePrevious) {
-      selection->SetInterlinePosition(true);
-      // position selection before br
-      EditorRawDOMPoint atBrNode(brNode);
-      if (NS_WARN_IF(!atBrNode.IsSetAndValid())) {
-        return NS_OK;
-      }
-      selection->Collapse(atBrNode);
-    }
-  }
-  return NS_OK;
-}
-
-
 already_AddRefed<Element>
 TextEditor::CreateBR(nsINode* aNode,
                      int32_t aOffset,
-                     EDirection aSelect)
+                     EDirection aSelect /* = eNone */)
 {
-  nsCOMPtr<nsINode> parent = aNode;
-  int32_t offset = aOffset;
-  return CreateBRImpl(address_of(parent), &offset, aSelect);
+  RefPtr<Selection> selection = GetSelection();
+  if (NS_WARN_IF(!selection)) {
+    return nullptr;
+  }
+  // We assume everything is fine if newBRElement is not null.
+  return CreateBRImpl(*selection, EditorRawDOMPoint(aNode, aOffset), aSelect);
 }
 
-nsresult
-TextEditor::CreateBR(nsIDOMNode* aNode,
-                     int32_t aOffset,
-                     nsCOMPtr<nsIDOMNode>* outBRNode,
-                     EDirection aSelect)
+already_AddRefed<Element>
+TextEditor::CreateBRImpl(Selection& aSelection,
+                         const EditorRawDOMPoint& aPointToInsert,
+                         EDirection aSelect)
 {
-  nsCOMPtr<nsIDOMNode> parent = aNode;
-  int32_t offset = aOffset;
-  return CreateBRImpl(address_of(parent), &offset, outBRNode, aSelect);
+  if (NS_WARN_IF(!aPointToInsert.IsSet())) {
+    return nullptr;
+  }
+
+  // We need to insert a <br> node.
+  RefPtr<Element> newBRElement;
+  if (IsTextNode(aPointToInsert.Container())) {
+    EditorDOMPoint pointInContainer;
+    if (aPointToInsert.IsStartOfContainer()) {
+      // Insert before the text node.
+      pointInContainer.Set(aPointToInsert.Container());
+      if (NS_WARN_IF(!pointInContainer.IsSet())) {
+        return nullptr;
+      }
+    } else if (aPointToInsert.IsEndOfContainer()) {
+      // Insert after the text node.
+      pointInContainer.Set(aPointToInsert.Container());
+      if (NS_WARN_IF(!pointInContainer.IsSet())) {
+        return nullptr;
+      }
+      DebugOnly<bool> advanced = pointInContainer.AdvanceOffset();
+      NS_WARNING_ASSERTION(advanced,
+        "Failed to advance offset to after the text node");
+    } else {
+      MOZ_DIAGNOSTIC_ASSERT(aPointToInsert.IsSetAndValid());
+      // Unfortunately, we need to split the text node at the offset.
+      ErrorResult error;
+      nsCOMPtr<nsIContent> newLeftNode = SplitNode(aPointToInsert, error);
+      if (NS_WARN_IF(error.Failed())) {
+        error.SuppressException();
+        return nullptr;
+      }
+      Unused << newLeftNode;
+      // Insert new <br> before the right node.
+      pointInContainer.Set(aPointToInsert.Container());
+    }
+    // Create a <br> node.
+    newBRElement = CreateNode(nsGkAtoms::br, pointInContainer.AsRaw());
+    if (NS_WARN_IF(!newBRElement)) {
+      return nullptr;
+    }
+  } else {
+    newBRElement = CreateNode(nsGkAtoms::br, aPointToInsert);
+    if (NS_WARN_IF(!newBRElement)) {
+      return nullptr;
+    }
+  }
+
+  switch (aSelect) {
+    case eNone:
+      break;
+    case eNext: {
+      aSelection.SetInterlinePosition(true);
+      // Collapse selection after the <br> node.
+      EditorRawDOMPoint afterBRElement(newBRElement);
+      if (afterBRElement.IsSet()) {
+        DebugOnly<bool> advanced = afterBRElement.AdvanceOffset();
+        NS_WARNING_ASSERTION(advanced,
+          "Failed to advance offset after the <br> element");
+        ErrorResult error;
+        aSelection.Collapse(afterBRElement, error);
+        NS_WARNING_ASSERTION(!error.Failed(),
+          "Failed to collapse selection after the <br> element");
+      } else {
+        NS_WARNING("The <br> node is not in the DOM tree?");
+      }
+      break;
+    }
+    case ePrevious: {
+      aSelection.SetInterlinePosition(true);
+      // Collapse selection at the <br> node.
+      EditorRawDOMPoint atBRElement(newBRElement);
+      if (atBRElement.IsSet()) {
+        ErrorResult error;
+        aSelection.Collapse(atBRElement, error);
+        NS_WARNING_ASSERTION(!error.Failed(),
+          "Failed to collapse selection at the <br> element");
+      } else {
+        NS_WARNING("The <br> node is not in the DOM tree?");
+      }
+      break;
+    }
+    default:
+      NS_WARNING("aSelect has invalid value, the caller need to set selection "
+                 "by itself");
+      break;
+  }
+
+  return newBRElement.forget();
 }
 
 nsresult
diff --git a/editor/libeditor/TextEditor.h b/editor/libeditor/TextEditor.h
index 6fcf767fa24e..8ab0cfce58e2 100644
--- a/editor/libeditor/TextEditor.h
+++ b/editor/libeditor/TextEditor.h
@@ -187,18 +187,44 @@ protected:
                                          uint32_t aFlags,
                                          const nsACString& aCharset);
 
+  /**
+   * CreateBR() creates new <br> element and inserts it before the point,
+   * aNode - aOffset, and collapse selection if it's necessary.
+   *
+   * @param aNode       The container node to insert new <br> element.
+   * @param aOffset     The offset in aNode to insert new <br> element.
+   * @param aSelect     If eNone, this won't change selection.
+   *                    If eNext, selection will be collapsed after the <br>
+   *                    element.
+   *                    If ePrevious, selection will be collapsed at the <br>
+   *                    element.
+   * @return            The new <br> node.  If failed to create new <br> node,
+   *                    returns nullptr.
+   */
   already_AddRefed<Element> CreateBR(nsINode* aNode, int32_t aOffset,
                                      EDirection aSelect = eNone);
-  nsresult CreateBR(nsIDOMNode* aNode, int32_t aOffset,
-                    nsCOMPtr<nsIDOMNode>* outBRNode,
-                    EDirection aSelect = eNone);
-  already_AddRefed<Element> CreateBRImpl(nsCOMPtr<nsINode>* aInOutParent,
-                                         int32_t* aInOutOffset,
-                                         EDirection aSelect);
-  nsresult CreateBRImpl(nsCOMPtr<nsIDOMNode>* aInOutParent,
-                        int32_t* aInOutOffset,
-                        nsCOMPtr<nsIDOMNode>* outBRNode,
-                        EDirection aSelect);
+
+  /**
+   * CreateBRImpl() creates a <br> element and inserts it before aPointToInsert.
+   * Then, tries to collapse selection at or after the new <br> node if
+   * aSelect is not eNone.
+   * XXX Perhaps, this should be merged with CreateBR().
+   *
+   * @param aSelection          The selection of this editor.
+   * @param aPointToInsert      The DOM point where should be <br> node inserted
+   *                            before.
+   * @param aSelect             If eNone, this won't change selection.
+   *                            If eNext, selection will be collapsed after
+   *                            the <br> element.
+   *                            If ePrevious, selection will be collapsed at
+   *                            the <br> element.
+   * @return                    The new <br> node.  If failed to create new
+   *                            <br> node, returns nullptr.
+   */
+  already_AddRefed<Element>
+  CreateBRImpl(Selection& aSelection,
+               const EditorRawDOMPoint& aPointToInsert,
+               EDirection aSelect);
 
   /**
    * Factored methods for handling insertion of data from transferables
diff --git a/editor/libeditor/WSRunObject.cpp b/editor/libeditor/WSRunObject.cpp
index 5ee0591b02cd..47913ac1bd07 100644
--- a/editor/libeditor/WSRunObject.cpp
+++ b/editor/libeditor/WSRunObject.cpp
@@ -228,8 +228,24 @@ WSRunObject::InsertBreak(nsCOMPtr<nsINode>* aInOutParent,
     }
   }
 
-  // ready, aim, fire!
-  return mHTMLEditor->CreateBRImpl(aInOutParent, aInOutOffset, aSelect);
+  RefPtr<Selection> selection = mHTMLEditor->GetSelection();
+  if (NS_WARN_IF(!selection)) {
+    return nullptr;
+  }
+  RefPtr<Element> newBRElement =
+    mHTMLEditor->CreateBRImpl(*selection,
+                              EditorRawDOMPoint(*aInOutParent, *aInOutOffset),
+                              aSelect);
+  if (NS_WARN_IF(!newBRElement)) {
+    return nullptr;
+  }
+  EditorRawDOMPoint atNewBRElement(newBRElement);
+  DebugOnly<bool> advanced = atNewBRElement.AdvanceOffset();
+  NS_WARNING_ASSERTION(advanced,
+    "Failed to advance offset to after the new <br> element");
+  *aInOutParent = atNewBRElement.Container();
+  *aInOutOffset = atNewBRElement.Offset();
+  return newBRElement.forget();
 }
 
 nsresult

From 3ad91ac0fdac6f6bb0130ab9df3fc1f993e731ca Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Tue, 21 Nov 2017 18:12:12 +0900
Subject: [PATCH 136/219] Bug 1408227 - part 2: WSRunObject::InsertBreak()
 should take |const EditorRawDOMPoint&| as an argument r=m_kato

WSRunObject::InsertBreak() should take |const EditorRawDOMPoint&| instead of
a pair of container node and offset in it.

MozReview-Commit-ID: 38OAn4dvR7x

--HG--
extra : rebase_source : 8e48ba2cec07c1dd4daf3cd9ec44751c860bc3da
---
 editor/libeditor/HTMLEditRules.cpp | 43 ++++++++++++++++---------
 editor/libeditor/WSRunObject.cpp   | 50 ++++++++++++++----------------
 editor/libeditor/WSRunObject.h     | 30 +++++++++++++-----
 3 files changed, 75 insertions(+), 48 deletions(-)

diff --git a/editor/libeditor/HTMLEditRules.cpp b/editor/libeditor/HTMLEditRules.cpp
index 17fa51e71001..cd4885dd8640 100644
--- a/editor/libeditor/HTMLEditRules.cpp
+++ b/editor/libeditor/HTMLEditRules.cpp
@@ -1509,20 +1509,29 @@ HTMLEditRules::WillInsertText(EditAction aAction,
         }
         // is it a return?
         else if (subStr.Equals(newlineStr)) {
-          nsCOMPtr<nsINode> curNode = currentPoint.Container();
-          int32_t curOffset = currentPoint.Offset();
-          nsCOMPtr<Element> br = wsObj.InsertBreak(address_of(curNode),
-                                                   &curOffset,
-                                                   nsIEditor::eNone);
-          NS_ENSURE_TRUE(br, NS_ERROR_FAILURE);
-          pos++;
-          if (br->GetNextSibling()) {
-            pointToInsert.Set(br->GetNextSibling());
-          } else {
-            pointToInsert.Set(curNode, curNode->Length());
+          RefPtr<Element> newBRElement =
+            wsObj.InsertBreak(*aSelection, currentPoint.AsRaw(),
+                              nsIEditor::eNone);
+          if (NS_WARN_IF(!newBRElement)) {
+            return NS_ERROR_FAILURE;
           }
-          currentPoint.Set(curNode, curOffset);
-          MOZ_ASSERT(currentPoint == pointToInsert);
+          pos++;
+          if (newBRElement->GetNextSibling()) {
+            pointToInsert.Set(newBRElement->GetNextSibling());
+          } else {
+            pointToInsert.Set(currentPoint.Container(),
+                              currentPoint.Container()->Length());
+          }
+          currentPoint.Set(newBRElement);
+          DebugOnly<bool> advanced = currentPoint.AdvanceOffset();
+          NS_WARNING_ASSERTION(advanced,
+            "Failed to advance offset to after the new <br> node");
+          // XXX If the newBRElement has been moved or removed by mutation
+          //     observer, we hit this assert.  We need to check if
+          //     newBRElement is in expected point, though, we must have
+          //     a lot of same bugs...
+          NS_WARNING_ASSERTION(currentPoint == pointToInsert,
+            "Perhaps, newBRElement has been moved or removed unexpectedly");
         } else {
           EditorRawDOMPoint pointAfterInsertedString;
           rv = wsObj.InsertText(*doc, subStr, currentPoint.AsRaw(),
@@ -1873,8 +1882,12 @@ HTMLEditRules::StandardBreakImpl(nsINode& aNode,
       node = splitPoint.Container();
       aOffset = splitPoint.Offset();
     }
-    brNode = wsObj.InsertBreak(address_of(node), &aOffset, nsIEditor::eNone);
-    NS_ENSURE_TRUE(brNode, NS_ERROR_FAILURE);
+    brNode =
+      wsObj.InsertBreak(aSelection, EditorRawDOMPoint(node, aOffset),
+                        nsIEditor::eNone);
+    if (NS_WARN_IF(!brNode)) {
+      return NS_ERROR_FAILURE;
+    }
   }
   node = brNode->GetParentNode();
   NS_ENSURE_TRUE(node, NS_ERROR_NULL_POINTER);
diff --git a/editor/libeditor/WSRunObject.cpp b/editor/libeditor/WSRunObject.cpp
index 47913ac1bd07..7361c40ffc2e 100644
--- a/editor/libeditor/WSRunObject.cpp
+++ b/editor/libeditor/WSRunObject.cpp
@@ -168,24 +168,29 @@ WSRunObject::PrepareToSplitAcrossBlocks(HTMLEditor* aHTMLEditor,
 }
 
 already_AddRefed<Element>
-WSRunObject::InsertBreak(nsCOMPtr<nsINode>* aInOutParent,
-                         int32_t* aInOutOffset,
+WSRunObject::InsertBreak(Selection& aSelection,
+                         const EditorRawDOMPoint& aPointToInsert,
                          nsIEditor::EDirection aSelect)
 {
+  if (NS_WARN_IF(!aPointToInsert.IsSet())) {
+    return nullptr;
+  }
+
   // MOOSE: for now, we always assume non-PRE formatting.  Fix this later.
   // meanwhile, the pre case is handled in WillInsertText in
   // HTMLEditRules.cpp
-  NS_ENSURE_TRUE(aInOutParent && aInOutOffset, nullptr);
 
   WSFragment *beforeRun, *afterRun;
-  FindRun(*aInOutParent, *aInOutOffset, &beforeRun, false);
-  FindRun(*aInOutParent, *aInOutOffset, &afterRun, true);
+  FindRun(aPointToInsert.Container(), aPointToInsert.Offset(),
+          &beforeRun, false);
+  FindRun(aPointToInsert.Container(), aPointToInsert.Offset(),
+          &afterRun, true);
 
+  EditorDOMPoint pointToInsert(aPointToInsert);
   {
     // Some scoping for AutoTrackDOMPoint.  This will track our insertion
     // point while we tweak any surrounding whitespace
-    AutoTrackDOMPoint tracker(mHTMLEditor->mRangeUpdater, aInOutParent,
-                              aInOutOffset);
+    AutoTrackDOMPoint tracker(mHTMLEditor->mRangeUpdater, &pointToInsert);
 
     // Handle any changes needed to ws run after inserted br
     if (!afterRun || (afterRun->mType & WSType::trailingWS)) {
@@ -194,13 +199,15 @@ WSRunObject::InsertBreak(nsCOMPtr<nsINode>* aInOutParent,
       // Delete the leading ws that is after insertion point.  We don't
       // have to (it would still not be significant after br), but it's
       // just more aesthetically pleasing to.
-      nsresult rv = DeleteChars(*aInOutParent, *aInOutOffset,
-                                afterRun->mEndNode, afterRun->mEndOffset);
+      nsresult rv =
+        DeleteChars(pointToInsert.Container(), pointToInsert.Offset(),
+                    afterRun->mEndNode, afterRun->mEndOffset);
       NS_ENSURE_SUCCESS(rv, nullptr);
     } else if (afterRun->mType == WSType::normalWS) {
       // Need to determine if break at front of non-nbsp run.  If so, convert
       // run to nbsp.
-      WSPoint thePoint = GetCharAfter(*aInOutParent, *aInOutOffset);
+      WSPoint thePoint =
+        GetCharAfter(pointToInsert.Container(), pointToInsert.Offset());
       if (thePoint.mTextNode && nsCRT::IsAsciiSpace(thePoint.mChar)) {
         WSPoint prevPoint = GetCharBefore(thePoint);
         if (!prevPoint.mTextNode ||
@@ -218,33 +225,24 @@ WSRunObject::InsertBreak(nsCOMPtr<nsINode>* aInOutParent,
     } else if (beforeRun->mType & WSType::trailingWS) {
       // Need to delete the trailing ws that is before insertion point, because it
       // would become significant after break inserted.
-      nsresult rv = DeleteChars(beforeRun->mStartNode, beforeRun->mStartOffset,
-                                *aInOutParent, *aInOutOffset);
+      nsresult rv =
+        DeleteChars(beforeRun->mStartNode, beforeRun->mStartOffset,
+                    pointToInsert.Container(), pointToInsert.Offset());
       NS_ENSURE_SUCCESS(rv, nullptr);
     } else if (beforeRun->mType == WSType::normalWS) {
       // Try to change an nbsp to a space, just to prevent nbsp proliferation
-      nsresult rv = CheckTrailingNBSP(beforeRun, *aInOutParent, *aInOutOffset);
+      nsresult rv =
+        CheckTrailingNBSP(beforeRun, pointToInsert.Container(),
+                          pointToInsert.Offset());
       NS_ENSURE_SUCCESS(rv, nullptr);
     }
   }
 
-  RefPtr<Selection> selection = mHTMLEditor->GetSelection();
-  if (NS_WARN_IF(!selection)) {
-    return nullptr;
-  }
   RefPtr<Element> newBRElement =
-    mHTMLEditor->CreateBRImpl(*selection,
-                              EditorRawDOMPoint(*aInOutParent, *aInOutOffset),
-                              aSelect);
+    mHTMLEditor->CreateBRImpl(aSelection, pointToInsert.AsRaw(), aSelect);
   if (NS_WARN_IF(!newBRElement)) {
     return nullptr;
   }
-  EditorRawDOMPoint atNewBRElement(newBRElement);
-  DebugOnly<bool> advanced = atNewBRElement.AdvanceOffset();
-  NS_WARNING_ASSERTION(advanced,
-    "Failed to advance offset to after the new <br> element");
-  *aInOutParent = atNewBRElement.Container();
-  *aInOutOffset = atNewBRElement.Offset();
   return newBRElement.forget();
 }
 
diff --git a/editor/libeditor/WSRunObject.h b/editor/libeditor/WSRunObject.h
index 27ff7caeecc5..98fbab65dd87 100644
--- a/editor/libeditor/WSRunObject.h
+++ b/editor/libeditor/WSRunObject.h
@@ -211,13 +211,29 @@ public:
                                              nsCOMPtr<nsINode>* aSplitNode,
                                              int32_t* aSplitOffset);
 
-  // InsertBreak inserts a br node at {aInOutParent,aInOutOffset}
-  // and makes any needed adjustments to ws around that point.
-  // example of fixup: normalws after {aInOutParent,aInOutOffset}
-  //                   needs to begin with nbsp.
-  already_AddRefed<dom::Element> InsertBreak(nsCOMPtr<nsINode>* aInOutParent,
-                                             int32_t* aInOutOffset,
-                                             nsIEditor::EDirection aSelect);
+  /**
+   * InsertBreak() inserts a <br> node at (before) aPointToInsert and delete
+   * unnecessary whitespaces around there and/or replaces whitespaces with
+   * non-breaking spaces.  Note that if the point is in a text node, the
+   * text node will be split and insert new <br> node between the left node
+   * and the right node.
+   *
+   * @param aSelection      The selection for the editor.
+   * @param aPointToInsert  The point to insert new <br> element.  Note that
+   *                        it'll be inserted before this point.  I.e., the
+   *                        point will be the point of new <br>.
+   * @param aSelect         If eNone, this won't change selection.
+   *                        If eNext, selection will be collapsed after the
+   *                        <br> element.
+   *                        If ePrevious, selection will be collapsed at the
+   *                        <br> element.
+   * @return                The new <br> node.  If failed to create new <br>
+   *                        node, returns nullptr.
+   */
+  already_AddRefed<dom::Element>
+  InsertBreak(Selection& aSelection,
+              const EditorRawDOMPoint& aPointToInsert,
+              nsIEditor::EDirection aSelect);
 
   /**
    * InsertTextImpl() inserts aStringToInsert to aPointToInsert and makes any

From 304f2a7e0f78cb415afa1f1bc53a33baac38f7da Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Tue, 21 Nov 2017 19:03:03 +0900
Subject: [PATCH 137/219] Bug 1408227 - part 3: Redesign WSRunObject::FindRun()
 with EditorRawDOMPoint r=m_kato

WSRunObject::FindRun() finds the nearest run from aPoint to specified direction.
So, it uses nsContentUtils::ComparePoints() a lot.  Therefore, it should use
an overload which takes RawRangeBoundary.  Although, it's not optimized for
RawRangeBoundary, but if it'd be optimized, this method becomes faster.

And this patch renames it to FindNearestRun().

MozReview-Commit-ID: 2NkR5E1st6d

--HG--
extra : rebase_source : 387ecc9d483c7cd88306197391fc2940b2000e28
---
 editor/libeditor/WSRunObject.cpp | 99 ++++++++++++--------------------
 editor/libeditor/WSRunObject.h   | 48 +++++++++++++++-
 2 files changed, 84 insertions(+), 63 deletions(-)

diff --git a/editor/libeditor/WSRunObject.cpp b/editor/libeditor/WSRunObject.cpp
index 7361c40ffc2e..bfc31829aed9 100644
--- a/editor/libeditor/WSRunObject.cpp
+++ b/editor/libeditor/WSRunObject.cpp
@@ -180,11 +180,8 @@ WSRunObject::InsertBreak(Selection& aSelection,
   // meanwhile, the pre case is handled in WillInsertText in
   // HTMLEditRules.cpp
 
-  WSFragment *beforeRun, *afterRun;
-  FindRun(aPointToInsert.Container(), aPointToInsert.Offset(),
-          &beforeRun, false);
-  FindRun(aPointToInsert.Container(), aPointToInsert.Offset(),
-          &afterRun, true);
+  WSFragment* beforeRun = FindNearestRun(aPointToInsert, false);
+  WSFragment* afterRun = FindNearestRun(aPointToInsert, true);
 
   EditorDOMPoint pointToInsert(aPointToInsert);
   {
@@ -273,15 +270,11 @@ WSRunObject::InsertText(nsIDocument& aDocument,
     return NS_OK;
   }
 
+  WSFragment* beforeRun = FindNearestRun(aPointToInsert, false);
+  WSFragment* afterRun = FindNearestRun(aPointToInsert, true);
+
   EditorDOMPoint pointToInsert(aPointToInsert);
   nsAutoString theString(aStringToInsert);
-
-  WSFragment *beforeRun, *afterRun;
-  FindRun(pointToInsert.Container(), pointToInsert.Offset(),
-          &beforeRun, false);
-  FindRun(pointToInsert.Container(), pointToInsert.Offset(),
-          &afterRun, true);
-
   {
     // Some scoping for AutoTrackDOMPoint.  This will track our insertion
     // point while we tweak any surrounding whitespace
@@ -510,8 +503,7 @@ WSRunObject::PriorVisibleNode(nsINode* aNode,
   // anything return start of ws.
   MOZ_ASSERT(aNode && outVisNode && outVisOffset && outType);
 
-  WSFragment* run;
-  FindRun(aNode, aOffset, &run, false);
+  WSFragment* run = FindNearestRun(EditorRawDOMPoint(aNode, aOffset), false);
 
   // Is there a visible run there or earlier?
   for (; run; run = run->mLeft) {
@@ -552,8 +544,7 @@ WSRunObject::NextVisibleNode(nsINode* aNode,
   // anything return end of ws.
   MOZ_ASSERT(aNode && outVisNode && outVisOffset && outType);
 
-  WSFragment* run;
-  FindRun(aNode, aOffset, &run, true);
+  WSFragment* run = FindNearestRun(EditorRawDOMPoint(aNode, aOffset), true);
 
   // Is there a visible run there or later?
   for (; run; run = run->mRight) {
@@ -1193,9 +1184,8 @@ WSRunObject::PrepareToDeleteRangePriv(WSRunObject* aEndObject)
   NS_ENSURE_TRUE(aEndObject, NS_ERROR_NULL_POINTER);
 
   // get the runs before and after selection
-  WSFragment *beforeRun, *afterRun;
-  FindRun(mNode, mOffset, &beforeRun, false);
-  aEndObject->FindRun(aEndObject->mNode, aEndObject->mOffset, &afterRun, true);
+  WSFragment* beforeRun = FindNearestRun(Point(), false);
+  WSFragment* afterRun = aEndObject->FindNearestRun(aEndObject->Point(), true);
 
   // trim after run of any leading ws
   if (afterRun && (afterRun->mType & WSType::leadingWS)) {
@@ -1253,9 +1243,8 @@ WSRunObject::PrepareToSplitAcrossBlocksPriv()
   // leading or trailing ws after the split.
 
   // get the runs before and after selection
-  WSFragment *beforeRun, *afterRun;
-  FindRun(mNode, mOffset, &beforeRun, false);
-  FindRun(mNode, mOffset, &afterRun, true);
+  WSFragment* beforeRun = FindNearestRun(Point(), false);
+  WSFragment* afterRun = FindNearestRun(Point(), true);
 
   // adjust normal ws in afterRun if needed
   if (afterRun && afterRun->mType == WSType::normalWS) {
@@ -1552,55 +1541,43 @@ WSRunObject::GetAsciiWSBounds(int16_t aDir,
   *outEndOffset = endOffset;
 }
 
-/**
- * Given a dompoint, find the ws run that is before or after it, as caller
- * needs
- */
-void
-WSRunObject::FindRun(nsINode* aNode,
-                     int32_t aOffset,
-                     WSFragment** outRun,
-                     bool after)
+WSRunObject::WSFragment*
+WSRunObject::FindNearestRun(const EditorRawDOMPoint& aPoint,
+                            bool aForward)
 {
-  MOZ_ASSERT(aNode && outRun);
-  *outRun = nullptr;
+  MOZ_ASSERT(aPoint.IsSetAndValid());
 
   for (WSFragment* run = mStartRun; run; run = run->mRight) {
-    int32_t comp = run->mStartNode ? nsContentUtils::ComparePoints(aNode,
-        aOffset, run->mStartNode, run->mStartOffset) : -1;
+    int32_t comp = run->mStartNode ?
+      nsContentUtils::ComparePoints(aPoint, run->StartPoint()) : -1;
     if (comp <= 0) {
-      if (after) {
-        *outRun = run;
-      } else {
-        // before
-        *outRun = nullptr;
-      }
-      return;
+      // aPoint equals or before start of the run.  Return the run if we're
+      // scanning forward, otherwise, nullptr.
+      return aForward ? run : nullptr;
     }
-    comp = run->mEndNode ? nsContentUtils::ComparePoints(aNode, aOffset,
-        run->mEndNode, run->mEndOffset) : -1;
+
+    comp = run->mEndNode ?
+      nsContentUtils::ComparePoints(aPoint, run->EndPoint()) : -1;
     if (comp < 0) {
-      *outRun = run;
-      return;
-    } else if (!comp) {
-      if (after) {
-        *outRun = run->mRight;
-      } else {
-        // before
-        *outRun = run;
-      }
-      return;
+      // If aPoint is in the run, return the run.
+      return run;
     }
+
+    if (!comp) {
+      // If aPoint is at end of the run, return next run if we're scanning
+      // forward, otherwise, return the run.
+      return aForward ? run->mRight : run;
+    }
+
     if (!run->mRight) {
-      if (after) {
-        *outRun = nullptr;
-      } else {
-        // before
-        *outRun = run;
-      }
-      return;
+      // If the run is the last run and aPoint is after end of the last run,
+      // return nullptr if we're scanning forward, otherwise, return this
+      // last run.
+      return aForward ? nullptr : run;
     }
   }
+
+  return nullptr;
 }
 
 char16_t
diff --git a/editor/libeditor/WSRunObject.h b/editor/libeditor/WSRunObject.h
index 98fbab65dd87..12c22d4bc3b1 100644
--- a/editor/libeditor/WSRunObject.h
+++ b/editor/libeditor/WSRunObject.h
@@ -317,6 +317,15 @@ protected:
       , mLeft(nullptr)
       , mRight(nullptr)
     {}
+
+    EditorRawDOMPoint StartPoint() const
+    {
+      return EditorRawDOMPoint(mStartNode, mStartOffset);
+    }
+    EditorRawDOMPoint EndPoint() const
+    {
+      return EditorRawDOMPoint(mEndNode, mEndOffset);
+    }
   };
 
   // A WSPoint struct represents a unique location within the ws run.  It is
@@ -372,8 +381,30 @@ protected:
   void GetAsciiWSBounds(int16_t aDir, nsINode* aNode, int32_t aOffset,
                         dom::Text** outStartNode, int32_t* outStartOffset,
                         dom::Text** outEndNode, int32_t* outEndOffset);
-  void FindRun(nsINode* aNode, int32_t aOffset, WSFragment** outRun,
-               bool after);
+
+  /**
+   * FindNearestRun() looks for a WSFragment which is closest to specified
+   * direction from aPoint.
+   *
+   * @param aPoint      The point to start to look for.
+   * @param aForward    true if caller needs to look for a WSFragment after the
+   *                    point in the DOM tree.  Otherwise, i.e., before the
+   *                    point, false.
+   * @return            Found WSFragment instance.
+   *                    If aForward is true and:
+   *                      if aPoint is end of a run, returns next run.
+   *                      if aPoint is start of a run, returns the run.
+   *                      if aPoint is before the first run, returns the first
+   *                      run.
+   *                      If aPoint is after the last run, returns nullptr.
+   *                    If aForward is false and:
+   *                      if aPoint is end of a run, returns the run.
+   *                      if aPoint is start of a run, returns its next run.
+   *                      if aPoint is before the first run, returns nullptr.
+   *                      if aPoint is after the last run, returns the last run.
+   */
+  WSFragment* FindNearestRun(const EditorRawDOMPoint& aPoint, bool aForward);
+
   char16_t GetCharAt(dom::Text* aTextNode, int32_t aOffset);
   WSPoint GetWSPointAfter(nsINode* aNode, int32_t aOffset);
   WSPoint GetWSPointBefore(nsINode* aNode, int32_t aOffset);
@@ -386,6 +417,19 @@ protected:
   nsresult Scrub();
   bool IsBlockNode(nsINode* aNode);
 
+  EditorRawDOMPoint Point() const
+  {
+    return EditorRawDOMPoint(mNode, mOffset);
+  }
+  EditorRawDOMPoint StartPoint() const
+  {
+    return EditorRawDOMPoint(mStartNode, mStartOffset);
+  }
+  EditorRawDOMPoint EndPoint() const
+  {
+    return EditorRawDOMPoint(mEndNode, mEndOffset);
+  }
+
   // The node passed to our constructor.
   nsCOMPtr<nsINode> mNode;
   // The offset passed to our contructor.

From d5a3f638a398542596c614213fa867ae40355194 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Wed, 22 Nov 2017 01:00:35 +0900
Subject: [PATCH 138/219] Bug 1408227 - part 4: WSRunObject::DeleteChars()
 should take two |const EditorRawDOMPoint&| arguments to specify a range to
 remove r=m_kato

WSRunObject::DeleteChars() should take two |const EditorRawDOMPoint&| arguments
to represent a range to remove.

Additionally, this renames it to DeleteRange() because it also removes any
nodes in the range.  So, "Chars" isn't good word for this method's name.

MozReview-Commit-ID: 5Dmxnia1JPO

--HG--
extra : rebase_source : a4fd44c9354762db0e37fa156790dc20fdbe23a1
---
 editor/libeditor/WSRunObject.cpp | 226 ++++++++++++++++++++-----------
 editor/libeditor/WSRunObject.h   |  15 +-
 2 files changed, 158 insertions(+), 83 deletions(-)

diff --git a/editor/libeditor/WSRunObject.cpp b/editor/libeditor/WSRunObject.cpp
index bfc31829aed9..97642864bd06 100644
--- a/editor/libeditor/WSRunObject.cpp
+++ b/editor/libeditor/WSRunObject.cpp
@@ -196,10 +196,10 @@ WSRunObject::InsertBreak(Selection& aSelection,
       // Delete the leading ws that is after insertion point.  We don't
       // have to (it would still not be significant after br), but it's
       // just more aesthetically pleasing to.
-      nsresult rv =
-        DeleteChars(pointToInsert.Container(), pointToInsert.Offset(),
-                    afterRun->mEndNode, afterRun->mEndOffset);
-      NS_ENSURE_SUCCESS(rv, nullptr);
+      nsresult rv = DeleteRange(pointToInsert.AsRaw(), afterRun->EndPoint());
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return nullptr;
+      }
     } else if (afterRun->mType == WSType::normalWS) {
       // Need to determine if break at front of non-nbsp run.  If so, convert
       // run to nbsp.
@@ -222,10 +222,10 @@ WSRunObject::InsertBreak(Selection& aSelection,
     } else if (beforeRun->mType & WSType::trailingWS) {
       // Need to delete the trailing ws that is before insertion point, because it
       // would become significant after break inserted.
-      nsresult rv =
-        DeleteChars(beforeRun->mStartNode, beforeRun->mStartOffset,
-                    pointToInsert.Container(), pointToInsert.Offset());
-      NS_ENSURE_SUCCESS(rv, nullptr);
+      nsresult rv = DeleteRange(beforeRun->StartPoint(), pointToInsert.AsRaw());
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return nullptr;
+      }
     } else if (beforeRun->mType == WSType::normalWS) {
       // Try to change an nbsp to a space, just to prevent nbsp proliferation
       nsresult rv =
@@ -286,10 +286,10 @@ WSRunObject::InsertText(nsIDocument& aDocument,
     } else if (afterRun->mType & WSType::leadingWS) {
       // Delete the leading ws that is after insertion point, because it
       // would become significant after text inserted.
-      nsresult rv =
-        DeleteChars(pointToInsert.Container(), pointToInsert.Offset(),
-                    afterRun->mEndNode, afterRun->mEndOffset);
-      NS_ENSURE_SUCCESS(rv, rv);
+      nsresult rv = DeleteRange(pointToInsert.AsRaw(), afterRun->EndPoint());
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
     } else if (afterRun->mType == WSType::normalWS) {
       // Try to change an nbsp to a space, if possible, just to prevent nbsp
       // proliferation
@@ -304,10 +304,10 @@ WSRunObject::InsertText(nsIDocument& aDocument,
     } else if (beforeRun->mType & WSType::trailingWS) {
       // Need to delete the trailing ws that is before insertion point, because
       // it would become significant after text inserted.
-      nsresult rv =
-        DeleteChars(beforeRun->mStartNode, beforeRun->mStartOffset,
-                    pointToInsert.Container(), pointToInsert.Offset());
-      NS_ENSURE_SUCCESS(rv, rv);
+      nsresult rv = DeleteRange(beforeRun->StartPoint(), pointToInsert.AsRaw());
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
     } else if (beforeRun->mType == WSType::normalWS) {
       // Try to change an nbsp to a space, if possible, just to prevent nbsp
       // proliferation
@@ -396,8 +396,13 @@ WSRunObject::DeleteWSBackward()
 
   // Easy case, preformatted ws.
   if (mPRE &&  (nsCRT::IsAsciiSpace(point.mChar) || point.mChar == nbsp)) {
-    return DeleteChars(point.mTextNode, point.mOffset,
-                       point.mTextNode, point.mOffset + 1);
+    nsresult rv =
+      DeleteRange(EditorRawDOMPoint(point.mTextNode, point.mOffset),
+                  EditorRawDOMPoint(point.mTextNode, point.mOffset + 1));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+    return NS_OK;
   }
 
   // Caller's job to ensure that previous char is really ws.  If it is normal
@@ -419,7 +424,12 @@ WSRunObject::DeleteWSBackward()
     NS_ENSURE_SUCCESS(rv, rv);
 
     // finally, delete that ws
-    return DeleteChars(startNode, startOffset, endNode, endOffset);
+    rv = DeleteRange(EditorRawDOMPoint(startNode, startOffset),
+                     EditorRawDOMPoint(endNode, endOffset));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+    return NS_OK;
   }
 
   if (point.mChar == nbsp) {
@@ -434,7 +444,12 @@ WSRunObject::DeleteWSBackward()
     NS_ENSURE_SUCCESS(rv, rv);
 
     // finally, delete that ws
-    return DeleteChars(node, startOffset, node, endOffset);
+    rv = DeleteRange(EditorRawDOMPoint(node, startOffset),
+                     EditorRawDOMPoint(node, endOffset));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+    return NS_OK;
   }
 
   return NS_OK;
@@ -448,8 +463,13 @@ WSRunObject::DeleteWSForward()
 
   // Easy case, preformatted ws.
   if (mPRE && (nsCRT::IsAsciiSpace(point.mChar) || point.mChar == nbsp)) {
-    return DeleteChars(point.mTextNode, point.mOffset,
-                       point.mTextNode, point.mOffset + 1);
+    nsresult rv =
+      DeleteRange(EditorRawDOMPoint(point.mTextNode, point.mOffset),
+                  EditorRawDOMPoint(point.mTextNode, point.mOffset + 1));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+    return NS_OK;
   }
 
   // Caller's job to ensure that next char is really ws.  If it is normal ws,
@@ -470,7 +490,12 @@ WSRunObject::DeleteWSForward()
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Finally, delete that ws
-    return DeleteChars(startNode, startOffset, endNode, endOffset);
+    rv = DeleteRange(EditorRawDOMPoint(startNode, startOffset),
+                     EditorRawDOMPoint(endNode, endOffset));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+    return NS_OK;
   }
 
   if (point.mChar == nbsp) {
@@ -485,7 +510,12 @@ WSRunObject::DeleteWSForward()
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Finally, delete that ws
-    return DeleteChars(node, startOffset, node, endOffset);
+    rv = DeleteRange(EditorRawDOMPoint(node, startOffset),
+                     EditorRawDOMPoint(node, endOffset));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+    return NS_OK;
   }
 
   return NS_OK;
@@ -1190,9 +1220,10 @@ WSRunObject::PrepareToDeleteRangePriv(WSRunObject* aEndObject)
   // trim after run of any leading ws
   if (afterRun && (afterRun->mType & WSType::leadingWS)) {
     nsresult rv =
-      aEndObject->DeleteChars(aEndObject->mNode, aEndObject->mOffset,
-                              afterRun->mEndNode, afterRun->mEndOffset);
-    NS_ENSURE_SUCCESS(rv, rv);
+      aEndObject->DeleteRange(aEndObject->Point(), afterRun->EndPoint());
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
   }
   // adjust normal ws in afterRun if needed
   if (afterRun && afterRun->mType == WSType::normalWS && !aEndObject->mPRE) {
@@ -1210,9 +1241,10 @@ WSRunObject::PrepareToDeleteRangePriv(WSRunObject* aEndObject)
   }
   // trim before run of any trailing ws
   if (beforeRun && (beforeRun->mType & WSType::trailingWS)) {
-    nsresult rv = DeleteChars(beforeRun->mStartNode, beforeRun->mStartOffset,
-                              mNode, mOffset);
-    NS_ENSURE_SUCCESS(rv, rv);
+    nsresult rv = DeleteRange(beforeRun->StartPoint(), Point());
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
   } else if (beforeRun && beforeRun->mType == WSType::normalWS && !mPRE) {
     if ((afterRun && (afterRun->mType & WSType::trailingWS)) ||
         (afterRun && afterRun->mType == WSType::normalWS) ||
@@ -1276,73 +1308,85 @@ WSRunObject::PrepareToSplitAcrossBlocksPriv()
 }
 
 nsresult
-WSRunObject::DeleteChars(nsINode* aStartNode,
-                         int32_t aStartOffset,
-                         nsINode* aEndNode,
-                         int32_t aEndOffset)
+WSRunObject::DeleteRange(const EditorRawDOMPoint& aStartPoint,
+                         const EditorRawDOMPoint& aEndPoint)
 {
+  if (NS_WARN_IF(!aStartPoint.IsSet()) ||
+      NS_WARN_IF(!aEndPoint.IsSet())) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  MOZ_ASSERT(aStartPoint.IsSetAndValid());
+  MOZ_ASSERT(aEndPoint.IsSetAndValid());
+
   // MOOSE: this routine needs to be modified to preserve the integrity of the
   // wsFragment info.
-  NS_ENSURE_TRUE(aStartNode && aEndNode, NS_ERROR_NULL_POINTER);
 
-  if (aStartNode == aEndNode && aStartOffset == aEndOffset) {
+  if (aStartPoint == aEndPoint) {
     // Nothing to delete
     return NS_OK;
   }
 
-  int32_t idx = mNodeArray.IndexOf(aStartNode);
-  if (idx == -1) {
-    // If our strarting point wasn't one of our ws text nodes, then just go
-    // through them from the beginning.
-    idx = 0;
-  }
-
-  if (aStartNode == aEndNode && aStartNode->GetAsText()) {
-    return mHTMLEditor->DeleteText(*aStartNode->GetAsText(),
-        static_cast<uint32_t>(aStartOffset),
-        static_cast<uint32_t>(aEndOffset - aStartOffset));
+  if (aStartPoint.Container() == aEndPoint.Container() &&
+      aStartPoint.Container()->GetAsText()) {
+    return mHTMLEditor->DeleteText(*aStartPoint.Container()->GetAsText(),
+                                   aStartPoint.Offset(),
+                                   aEndPoint.Offset() - aStartPoint.Offset());
   }
 
   RefPtr<nsRange> range;
   int32_t count = mNodeArray.Length();
+  int32_t idx = mNodeArray.IndexOf(aStartPoint.Container());
+  if (idx == -1) {
+    // If our starting point wasn't one of our ws text nodes, then just go
+    // through them from the beginning.
+    idx = 0;
+  }
   for (; idx < count; idx++) {
     RefPtr<Text> node = mNodeArray[idx];
     if (!node) {
       // We ran out of ws nodes; must have been deleting to end
       return NS_OK;
     }
-    if (node == aStartNode) {
-      uint32_t len = node->Length();
-      if (uint32_t(aStartOffset) < len) {
+    if (node == aStartPoint.Container()) {
+      if (!aStartPoint.IsEndOfContainer()) {
         nsresult rv =
-          mHTMLEditor->DeleteText(*node, AssertedCast<uint32_t>(aStartOffset),
-                                  len - aStartOffset);
-        NS_ENSURE_SUCCESS(rv, rv);
+          mHTMLEditor->DeleteText(*node, aStartPoint.Offset(),
+                                  aStartPoint.Container()->Length() -
+                                    aStartPoint.Offset());
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          return rv;
+        }
       }
-    } else if (node == aEndNode) {
-      if (aEndOffset) {
-        nsresult rv =
-          mHTMLEditor->DeleteText(*node, 0, AssertedCast<uint32_t>(aEndOffset));
-        NS_ENSURE_SUCCESS(rv, rv);
+    } else if (node == aEndPoint.Container()) {
+      if (!aEndPoint.IsStartOfContainer()) {
+        nsresult rv = mHTMLEditor->DeleteText(*node, 0, aEndPoint.Offset());
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          return rv;
+        }
       }
       break;
     } else {
       if (!range) {
-        range = new nsRange(aStartNode);
-        nsresult rv =
-          range->SetStartAndEnd(aStartNode, aStartOffset, aEndNode, aEndOffset);
-        NS_ENSURE_SUCCESS(rv, rv);
+        range = new nsRange(aStartPoint.Container());
+        nsresult rv = range->SetStartAndEnd(aStartPoint, aEndPoint);
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          return rv;
+        }
       }
       bool nodeBefore, nodeAfter;
       nsresult rv =
         nsRange::CompareNodeToRange(node, range, &nodeBefore, &nodeAfter);
-      NS_ENSURE_SUCCESS(rv, rv);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
       if (nodeAfter) {
         break;
       }
       if (!nodeBefore) {
         rv = mHTMLEditor->DeleteNode(node);
-        NS_ENSURE_SUCCESS(rv, rv);
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          return rv;
+        }
         mNodeArray.RemoveElement(node);
         --count;
         --idx;
@@ -1475,8 +1519,11 @@ WSRunObject::ConvertToNBSP(WSPoint aPoint)
 
   // Finally, delete that replaced ws, if any
   if (startNode) {
-    rv = DeleteChars(startNode, startOffset, endNode, endOffset);
-    NS_ENSURE_SUCCESS(rv, rv);
+    rv = DeleteRange(EditorRawDOMPoint(startNode, startOffset),
+                     EditorRawDOMPoint(endNode, endOffset));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
   }
 
   return NS_OK;
@@ -1778,9 +1825,13 @@ WSRunObject::CheckTrailingNBSPOfRun(WSFragment *aRun)
       NS_ENSURE_SUCCESS(rv, rv);
 
       // Finally, delete that nbsp
-      rv = DeleteChars(thePoint.mTextNode, thePoint.mOffset + 1,
-                       thePoint.mTextNode, thePoint.mOffset + 2);
-      NS_ENSURE_SUCCESS(rv, rv);
+      rv = DeleteRange(EditorRawDOMPoint(thePoint.mTextNode,
+                                         thePoint.mOffset + 1),
+                       EditorRawDOMPoint(thePoint.mTextNode,
+                                         thePoint.mOffset + 2));
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
     } else if (!mPRE && spaceNBSP && rightCheck) {
       // Don't mess with this preformatted for now.  We have a run of ASCII
       // whitespace (which will render as one space) followed by an nbsp (which
@@ -1796,9 +1847,13 @@ WSRunObject::CheckTrailingNBSPOfRun(WSFragment *aRun)
                        getter_AddRefs(endNode), &endOffset);
 
       // Delete that nbsp
-      nsresult rv = DeleteChars(thePoint.mTextNode, thePoint.mOffset,
-                                thePoint.mTextNode, thePoint.mOffset + 1);
-      NS_ENSURE_SUCCESS(rv, rv);
+      nsresult rv = DeleteRange(EditorRawDOMPoint(thePoint.mTextNode,
+                                                  thePoint.mOffset),
+                                EditorRawDOMPoint(thePoint.mTextNode,
+                                                  thePoint.mOffset + 1));
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
 
       // Finally, insert that nbsp before the ASCII ws run
       AutoTransactionsConserveSelection dontChangeMySelection(mHTMLEditor);
@@ -1845,9 +1900,13 @@ WSRunObject::CheckTrailingNBSP(WSFragment* aRun,
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Finally, delete that nbsp
-    rv = DeleteChars(thePoint.mTextNode, thePoint.mOffset + 1,
-                     thePoint.mTextNode, thePoint.mOffset + 2);
-    NS_ENSURE_SUCCESS(rv, rv);
+    rv = DeleteRange(EditorRawDOMPoint(thePoint.mTextNode,
+                                       thePoint.mOffset + 1),
+                     EditorRawDOMPoint(thePoint.mTextNode,
+                                       thePoint.mOffset + 2));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
   }
   return NS_OK;
 }
@@ -1888,9 +1947,13 @@ WSRunObject::CheckLeadingNBSP(WSFragment* aRun,
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Finally, delete that nbsp
-    rv = DeleteChars(thePoint.mTextNode, thePoint.mOffset + 1,
-                     thePoint.mTextNode, thePoint.mOffset + 2);
-    NS_ENSURE_SUCCESS(rv, rv);
+    rv = DeleteRange(EditorRawDOMPoint(thePoint.mTextNode,
+                                       thePoint.mOffset + 1),
+                     EditorRawDOMPoint(thePoint.mTextNode,
+                                       thePoint.mOffset + 2));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
   }
   return NS_OK;
 }
@@ -1902,9 +1965,10 @@ WSRunObject::Scrub()
   WSFragment *run = mStartRun;
   while (run) {
     if (run->mType & (WSType::leadingWS | WSType::trailingWS)) {
-      nsresult rv = DeleteChars(run->mStartNode, run->mStartOffset,
-                                run->mEndNode, run->mEndOffset);
-      NS_ENSURE_SUCCESS(rv, rv);
+      nsresult rv = DeleteRange(run->StartPoint(), run->EndPoint());
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
     }
     run = run->mRight;
   }
diff --git a/editor/libeditor/WSRunObject.h b/editor/libeditor/WSRunObject.h
index 12c22d4bc3b1..6a6c73e15ec1 100644
--- a/editor/libeditor/WSRunObject.h
+++ b/editor/libeditor/WSRunObject.h
@@ -371,8 +371,19 @@ protected:
                             nsINode* aBlockParent);
   nsresult PrepareToDeleteRangePriv(WSRunObject* aEndObject);
   nsresult PrepareToSplitAcrossBlocksPriv();
-  nsresult DeleteChars(nsINode* aStartNode, int32_t aStartOffset,
-                       nsINode* aEndNode, int32_t aEndOffset);
+
+  /**
+   * DeleteRange() removes the range between aStartPoint and aEndPoint.
+   * When aStartPoint and aEndPoint are same point, does nothing.
+   * When aStartPoint and aEndPoint are in same text node, removes characters
+   * between them.
+   * When aStartPoint is in a text node, removes the text data after the point.
+   * When aEndPoint is in a text node, removes the text data before the point.
+   * Removes any nodes between them.
+   */
+  nsresult DeleteRange(const EditorRawDOMPoint& aStartPoint,
+                       const EditorRawDOMPoint& aEndPoint);
+
   WSPoint GetCharAfter(nsINode* aNode, int32_t aOffset);
   WSPoint GetCharBefore(nsINode* aNode, int32_t aOffset);
   WSPoint GetCharAfter(const WSPoint& aPoint);

From b75f048daa66bfe3fadbbb52f747afd942fb3cee Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Wed, 22 Nov 2017 02:12:27 +0900
Subject: [PATCH 139/219] Bug 1408227 - part 5: Redesign GetCharAfter(),
 GetCharBefore(), GetWSPointAfter() and GetWSPointBefore() of WSRunObject
 r=m_kato

WSRunObject::GetChar(After|Before)(nsINode*, int32_t) returns next/previous
character's DOM point as WSPoint.  If the container node is a text node in
mNodeArray, it calls WSRunObject::GetChar(After|Before)(const WSPoint&) which
returns next/previous offset if the point isn't end/start of the text node.
If the point is at end/start of the text node, it returns start/end of
next/previous text node in mNodeArray.  If the container node is not a text
node in mNodeArray, it calls WSRunObject::GetWSPoint(After|Before)().  It looks
for next/previous text node in mNodeArray from the point.  Then, it calls
WSRunObject::GetChar(After|Before)(const WSPoint&) and returns the result.

So, we should rename GetCharAfter() to GetNextCharPoint(), GetCharBefore() to
GetPreviousCharPoint(), GetWSPointAfter() to GetNextCharPointInternal() and
GetWSPointBefore() to GetPreviousCharPointInternal().

Then, they should take |const EditorRawDOMPoint&| instead of a set of container
node and offset in it.

So, looks like that "WS"RunObject is not good name for this class, perhaps,
AutoTextRunManager or something? But I'm still not sure.

MozReview-Commit-ID: 85cX3MdlFwz

--HG--
extra : rebase_source : 217dbb75653bf2a4c593fb9a0498824b1b764cf4
---
 editor/libeditor/WSRunObject.cpp | 146 +++++++++++++++----------------
 editor/libeditor/WSRunObject.h   |  32 +++++--
 2 files changed, 95 insertions(+), 83 deletions(-)

diff --git a/editor/libeditor/WSRunObject.cpp b/editor/libeditor/WSRunObject.cpp
index 97642864bd06..56229b93094d 100644
--- a/editor/libeditor/WSRunObject.cpp
+++ b/editor/libeditor/WSRunObject.cpp
@@ -203,10 +203,9 @@ WSRunObject::InsertBreak(Selection& aSelection,
     } else if (afterRun->mType == WSType::normalWS) {
       // Need to determine if break at front of non-nbsp run.  If so, convert
       // run to nbsp.
-      WSPoint thePoint =
-        GetCharAfter(pointToInsert.Container(), pointToInsert.Offset());
+      WSPoint thePoint = GetNextCharPoint(pointToInsert.AsRaw());
       if (thePoint.mTextNode && nsCRT::IsAsciiSpace(thePoint.mChar)) {
-        WSPoint prevPoint = GetCharBefore(thePoint);
+        WSPoint prevPoint = GetPreviousCharPoint(thePoint);
         if (!prevPoint.mTextNode ||
             (prevPoint.mTextNode && !nsCRT::IsAsciiSpace(prevPoint.mChar))) {
           // We are at start of non-nbsps.  Convert to a single nbsp.
@@ -329,8 +328,7 @@ WSRunObject::InsertText(nsIDocument& aDocument,
       if (beforeRun->mType & WSType::leadingWS) {
         theString.SetCharAt(nbsp, 0);
       } else if (beforeRun->mType & WSType::normalWS) {
-        WSPoint wspoint =
-          GetCharBefore(pointToInsert.Container(), pointToInsert.Offset());
+        WSPoint wspoint = GetPreviousCharPoint(pointToInsert.AsRaw());
         if (wspoint.mTextNode && nsCRT::IsAsciiSpace(wspoint.mChar)) {
           theString.SetCharAt(nbsp, 0);
         }
@@ -349,8 +347,7 @@ WSRunObject::InsertText(nsIDocument& aDocument,
       if (afterRun->mType & WSType::trailingWS) {
         theString.SetCharAt(nbsp, lastCharIndex);
       } else if (afterRun->mType & WSType::normalWS) {
-        WSPoint wspoint =
-          GetCharAfter(pointToInsert.Container(), pointToInsert.Offset());
+        WSPoint wspoint = GetNextCharPoint(pointToInsert.AsRaw());
         if (wspoint.mTextNode && nsCRT::IsAsciiSpace(wspoint.mChar)) {
           theString.SetCharAt(nbsp, lastCharIndex);
         }
@@ -391,7 +388,7 @@ WSRunObject::InsertText(nsIDocument& aDocument,
 nsresult
 WSRunObject::DeleteWSBackward()
 {
-  WSPoint point = GetCharBefore(mNode, mOffset);
+  WSPoint point = GetPreviousCharPoint(Point());
   NS_ENSURE_TRUE(point.mTextNode, NS_OK);  // nothing to delete
 
   // Easy case, preformatted ws.
@@ -458,7 +455,7 @@ WSRunObject::DeleteWSBackward()
 nsresult
 WSRunObject::DeleteWSForward()
 {
-  WSPoint point = GetCharAfter(mNode, mOffset);
+  WSPoint point = GetNextCharPoint(Point());
   NS_ENSURE_TRUE(point.mTextNode, NS_OK); // nothing to delete
 
   // Easy case, preformatted ws.
@@ -538,7 +535,7 @@ WSRunObject::PriorVisibleNode(nsINode* aNode,
   // Is there a visible run there or earlier?
   for (; run; run = run->mLeft) {
     if (run->mType == WSType::normalWS) {
-      WSPoint point = GetCharBefore(aNode, aOffset);
+      WSPoint point = GetPreviousCharPoint(EditorRawDOMPoint(aNode, aOffset));
       // When it's a non-empty text node, return it.
       if (point.mTextNode && point.mTextNode->Length()) {
         *outVisNode = point.mTextNode;
@@ -579,7 +576,7 @@ WSRunObject::NextVisibleNode(nsINode* aNode,
   // Is there a visible run there or later?
   for (; run; run = run->mRight) {
     if (run->mType == WSType::normalWS) {
-      WSPoint point = GetCharAfter(aNode, aOffset);
+      WSPoint point = GetNextCharPoint(EditorRawDOMPoint(aNode, aOffset));
       // When it's a non-empty text node, return it.
       if (point.mTextNode && point.mTextNode->Length()) {
         *outVisNode = point.mTextNode;
@@ -1231,8 +1228,7 @@ WSRunObject::PrepareToDeleteRangePriv(WSRunObject* aEndObject)
         (!beforeRun && ((mStartReason & WSType::block) ||
                         mStartReason == WSType::br))) {
       // make sure leading char of following ws is an nbsp, so that it will show up
-      WSPoint point = aEndObject->GetCharAfter(aEndObject->mNode,
-                                               aEndObject->mOffset);
+      WSPoint point = aEndObject->GetNextCharPoint(aEndObject->Point());
       if (point.mTextNode && nsCRT::IsAsciiSpace(point.mChar)) {
         nsresult rv = aEndObject->ConvertToNBSP(point);
         NS_ENSURE_SUCCESS(rv, rv);
@@ -1250,7 +1246,7 @@ WSRunObject::PrepareToDeleteRangePriv(WSRunObject* aEndObject)
         (afterRun && afterRun->mType == WSType::normalWS) ||
         (!afterRun && (aEndObject->mEndReason & WSType::block))) {
       // make sure trailing char of starting ws is an nbsp, so that it will show up
-      WSPoint point = GetCharBefore(mNode, mOffset);
+      WSPoint point = GetPreviousCharPoint(Point());
       if (point.mTextNode && nsCRT::IsAsciiSpace(point.mChar)) {
         RefPtr<Text> wsStartNode, wsEndNode;
         int32_t wsStartOffset, wsEndOffset;
@@ -1281,7 +1277,7 @@ WSRunObject::PrepareToSplitAcrossBlocksPriv()
   // adjust normal ws in afterRun if needed
   if (afterRun && afterRun->mType == WSType::normalWS) {
     // make sure leading char of following ws is an nbsp, so that it will show up
-    WSPoint point = GetCharAfter(mNode, mOffset);
+    WSPoint point = GetNextCharPoint(Point());
     if (point.mTextNode && nsCRT::IsAsciiSpace(point.mChar)) {
       nsresult rv = ConvertToNBSP(point);
       NS_ENSURE_SUCCESS(rv, rv);
@@ -1291,7 +1287,7 @@ WSRunObject::PrepareToSplitAcrossBlocksPriv()
   // adjust normal ws in beforeRun if needed
   if (beforeRun && beforeRun->mType == WSType::normalWS) {
     // make sure trailing char of starting ws is an nbsp, so that it will show up
-    WSPoint point = GetCharBefore(mNode, mOffset);
+    WSPoint point = GetPreviousCharPoint(Point());
     if (point.mTextNode && nsCRT::IsAsciiSpace(point.mChar)) {
       RefPtr<Text> wsStartNode, wsEndNode;
       int32_t wsStartOffset, wsEndOffset;
@@ -1397,37 +1393,35 @@ WSRunObject::DeleteRange(const EditorRawDOMPoint& aStartPoint,
 }
 
 WSRunObject::WSPoint
-WSRunObject::GetCharAfter(nsINode* aNode,
-                          int32_t aOffset)
+WSRunObject::GetNextCharPoint(const EditorRawDOMPoint& aPoint)
 {
-  MOZ_ASSERT(aNode);
+  MOZ_ASSERT(aPoint.IsSetAndValid());
 
-  int32_t idx = mNodeArray.IndexOf(aNode);
+  int32_t idx = mNodeArray.IndexOf(aPoint.Container());
   if (idx == -1) {
-    // Use range comparisons to get right ws node
-    return GetWSPointAfter(aNode, aOffset);
+    // Use range comparisons to get next text node which is in mNodeArray.
+    return GetNextCharPointInternal(aPoint);
   }
-  // Use WSPoint version of GetCharAfter()
-  return GetCharAfter(WSPoint(mNodeArray[idx], aOffset, 0));
+  // Use WSPoint version of GetNextCharPoint()
+  return GetNextCharPoint(WSPoint(mNodeArray[idx], aPoint.Offset(), 0));
 }
 
 WSRunObject::WSPoint
-WSRunObject::GetCharBefore(nsINode* aNode,
-                           int32_t aOffset)
+WSRunObject::GetPreviousCharPoint(const EditorRawDOMPoint& aPoint)
 {
-  MOZ_ASSERT(aNode);
+  MOZ_ASSERT(aPoint.IsSetAndValid());
 
-  int32_t idx = mNodeArray.IndexOf(aNode);
+  int32_t idx = mNodeArray.IndexOf(aPoint.Container());
   if (idx == -1) {
-    // Use range comparisons to get right ws node
-    return GetWSPointBefore(aNode, aOffset);
+    // Use range comparisons to get previous text node which is in mNodeArray.
+    return GetPreviousCharPointInternal(aPoint);
   }
-  // Use WSPoint version of GetCharBefore()
-  return GetCharBefore(WSPoint(mNodeArray[idx], aOffset, 0));
+  // Use WSPoint version of GetPreviousCharPoint()
+  return GetPreviousCharPoint(WSPoint(mNodeArray[idx], aPoint.Offset(), 0));
 }
 
 WSRunObject::WSPoint
-WSRunObject::GetCharAfter(const WSPoint &aPoint)
+WSRunObject::GetNextCharPoint(const WSPoint &aPoint)
 {
   MOZ_ASSERT(aPoint.mTextNode);
 
@@ -1460,7 +1454,7 @@ WSRunObject::GetCharAfter(const WSPoint &aPoint)
 }
 
 WSRunObject::WSPoint
-WSRunObject::GetCharBefore(const WSPoint &aPoint)
+WSRunObject::GetPreviousCharPoint(const WSPoint &aPoint)
 {
   MOZ_ASSERT(aPoint.mTextNode);
 
@@ -1545,7 +1539,7 @@ WSRunObject::GetAsciiWSBounds(int16_t aDir,
   int32_t startOffset = 0, endOffset = 0;
 
   if (aDir & eAfter) {
-    WSPoint point = GetCharAfter(aNode, aOffset);
+    WSPoint point = GetNextCharPoint(EditorRawDOMPoint(aNode, aOffset));
     if (point.mTextNode) {
       // We found a text node, at least
       startNode = endNode = point.mTextNode;
@@ -1553,7 +1547,7 @@ WSRunObject::GetAsciiWSBounds(int16_t aDir,
 
       // Scan ahead to end of ASCII ws
       for (; nsCRT::IsAsciiSpace(point.mChar) && point.mTextNode;
-           point = GetCharAfter(point)) {
+           point = GetNextCharPoint(point)) {
         endNode = point.mTextNode;
         // endOffset is _after_ ws
         point.mOffset++;
@@ -1563,7 +1557,7 @@ WSRunObject::GetAsciiWSBounds(int16_t aDir,
   }
 
   if (aDir & eBefore) {
-    WSPoint point = GetCharBefore(aNode, aOffset);
+    WSPoint point = GetPreviousCharPoint(EditorRawDOMPoint(aNode, aOffset));
     if (point.mTextNode) {
       // We found a text node, at least
       startNode = point.mTextNode;
@@ -1575,7 +1569,7 @@ WSRunObject::GetAsciiWSBounds(int16_t aDir,
 
       // Scan back to start of ASCII ws
       for (; nsCRT::IsAsciiSpace(point.mChar) && point.mTextNode;
-           point = GetCharBefore(point)) {
+           point = GetPreviousCharPoint(point)) {
         startNode = point.mTextNode;
         startOffset = point.mOffset;
       }
@@ -1642,10 +1636,9 @@ WSRunObject::GetCharAt(Text* aTextNode,
 }
 
 WSRunObject::WSPoint
-WSRunObject::GetWSPointAfter(nsINode* aNode,
-                             int32_t aOffset)
+WSRunObject::GetNextCharPointInternal(const EditorRawDOMPoint& aPoint)
 {
-  // Note: only to be called if aNode is not a ws node.
+  // Note: only to be called if aPoint.Container() is not a ws node.
 
   // Binary search on wsnodes
   uint32_t numNodes = mNodeArray.Length();
@@ -1656,44 +1649,42 @@ WSRunObject::GetWSPointAfter(nsINode* aNode,
     return outPoint;
   }
 
-  uint32_t firstNum = 0, curNum = numNodes/2, lastNum = numNodes;
-  int16_t cmp = 0;
-  RefPtr<Text> curNode;
-
   // Begin binary search.  We do this because we need to minimize calls to
   // ComparePoints(), which is expensive.
+  uint32_t firstNum = 0, curNum = numNodes / 2, lastNum = numNodes;
   while (curNum != lastNum) {
-    curNode = mNodeArray[curNum];
-    cmp = nsContentUtils::ComparePoints(aNode, aOffset, curNode, 0);
+    RefPtr<Text> curNode = mNodeArray[curNum];
+    int16_t cmp =
+      nsContentUtils::ComparePoints(aPoint, EditorRawDOMPoint(curNode, 0));
     if (cmp < 0) {
       lastNum = curNum;
     } else {
       firstNum = curNum + 1;
     }
-    curNum = (lastNum - firstNum)/2 + firstNum;
+    curNum = (lastNum - firstNum) / 2 + firstNum;
     MOZ_ASSERT(firstNum <= curNum && curNum <= lastNum, "Bad binary search");
   }
 
   // When the binary search is complete, we always know that the current node
-  // is the same as the end node, which is always past our range. Therefore,
+  // is the same as the end node, which is always past our range.  Therefore,
   // we've found the node immediately after the point of interest.
   if (curNum == mNodeArray.Length()) {
-    // hey asked for past our range (it's after the last node). GetCharAfter
-    // will do the work for us when we pass it the last index of the last node.
+    // hey asked for past our range (it's after the last node).
+    // GetNextCharPoint() will do the work for us when we pass it the last
+    // index of the last node.
     RefPtr<Text> textNode(mNodeArray[curNum - 1]);
     WSPoint point(textNode, textNode->TextLength(), 0);
-    return GetCharAfter(point);
-  } else {
-    // The char after the point is the first character of our range.
-    RefPtr<Text> textNode(mNodeArray[curNum]);
-    WSPoint point(textNode, 0, 0);
-    return GetCharAfter(point);
+    return GetNextCharPoint(point);
   }
+
+  // The char after the point is the first character of our range.
+  RefPtr<Text> textNode(mNodeArray[curNum]);
+  WSPoint point(textNode, 0, 0);
+  return GetNextCharPoint(point);
 }
 
 WSRunObject::WSPoint
-WSRunObject::GetWSPointBefore(nsINode* aNode,
-                              int32_t aOffset)
+WSRunObject::GetPreviousCharPointInternal(const EditorRawDOMPoint& aPoint)
 {
   // Note: only to be called if aNode is not a ws node.
 
@@ -1714,7 +1705,7 @@ WSRunObject::GetWSPointBefore(nsINode* aNode,
   // ComparePoints(), which is expensive.
   while (curNum != lastNum) {
     curNode = mNodeArray[curNum];
-    cmp = nsContentUtils::ComparePoints(aNode, aOffset, curNode, 0);
+    cmp = nsContentUtils::ComparePoints(aPoint, EditorRawDOMPoint(curNode, 0));
     if (cmp < 0) {
       lastNum = curNum;
     } else {
@@ -1729,18 +1720,19 @@ WSRunObject::GetWSPointBefore(nsINode* aNode,
   // we've found the node immediately after the point of interest.
   if (curNum == mNodeArray.Length()) {
     // Get the point before the end of the last node, we can pass the length of
-    // the node into GetCharBefore, and it will return the last character.
+    // the node into GetPreviousCharPoint(), and it will return the last
+    // character.
     RefPtr<Text> textNode(mNodeArray[curNum - 1]);
     WSPoint point(textNode, textNode->TextLength(), 0);
-    return GetCharBefore(point);
-  } else {
-    // We can just ask the current node for the point immediately before it,
-    // it will handle moving to the previous node (if any) and returning the
-    // appropriate character
-    RefPtr<Text> textNode(mNodeArray[curNum]);
-    WSPoint point(textNode, 0, 0);
-    return GetCharBefore(point);
+    return GetPreviousCharPoint(point);
   }
+
+  // We can just ask the current node for the point immediately before it,
+  // it will handle moving to the previous node (if any) and returning the
+  // appropriate character
+  RefPtr<Text> textNode(mNodeArray[curNum]);
+  WSPoint point(textNode, 0, 0);
+  return GetPreviousCharPoint(point);
 }
 
 nsresult
@@ -1760,10 +1752,10 @@ WSRunObject::CheckTrailingNBSPOfRun(WSFragment *aRun)
   }
 
   // first check for trailing nbsp
-  WSPoint thePoint = GetCharBefore(aRun->mEndNode, aRun->mEndOffset);
+  WSPoint thePoint = GetPreviousCharPoint(aRun->EndPoint());
   if (thePoint.mTextNode && thePoint.mChar == nbsp) {
     // now check that what is to the left of it is compatible with replacing nbsp with space
-    WSPoint prevPoint = GetCharBefore(thePoint);
+    WSPoint prevPoint = GetPreviousCharPoint(thePoint);
     if (prevPoint.mTextNode) {
       if (!nsCRT::IsAsciiSpace(prevPoint.mChar)) {
         leftCheck = true;
@@ -1810,8 +1802,8 @@ WSRunObject::CheckTrailingNBSPOfRun(WSFragment *aRun)
         NS_ENSURE_TRUE(brNode, NS_ERROR_FAILURE);
 
         // Refresh thePoint, prevPoint
-        thePoint = GetCharBefore(aRun->mEndNode, aRun->mEndOffset);
-        prevPoint = GetCharBefore(thePoint);
+        thePoint = GetPreviousCharPoint(aRun->EndPoint());
+        prevPoint = GetPreviousCharPoint(thePoint);
         rightCheck = true;
       }
     }
@@ -1878,9 +1870,9 @@ WSRunObject::CheckTrailingNBSP(WSFragment* aRun,
   // inserted object.
   NS_ENSURE_TRUE(aRun && aNode, NS_ERROR_NULL_POINTER);
   bool canConvert = false;
-  WSPoint thePoint = GetCharBefore(aNode, aOffset);
+  WSPoint thePoint = GetPreviousCharPoint(EditorRawDOMPoint(aNode, aOffset));
   if (thePoint.mTextNode && thePoint.mChar == nbsp) {
-    WSPoint prevPoint = GetCharBefore(thePoint);
+    WSPoint prevPoint = GetPreviousCharPoint(thePoint);
     if (prevPoint.mTextNode) {
       if (!nsCRT::IsAsciiSpace(prevPoint.mChar)) {
         canConvert = true;
@@ -1921,12 +1913,12 @@ WSRunObject::CheckLeadingNBSP(WSFragment* aRun,
   // in the ws abut an inserted text, so we don't have to worry about what is
   // before it.  What is before it now will end up before the inserted text.
   bool canConvert = false;
-  WSPoint thePoint = GetCharAfter(aNode, aOffset);
+  WSPoint thePoint = GetNextCharPoint(EditorRawDOMPoint(aNode, aOffset));
   if (thePoint.mChar == nbsp) {
     WSPoint tmp = thePoint;
     // we want to be after thePoint
     tmp.mOffset++;
-    WSPoint nextPoint = GetCharAfter(tmp);
+    WSPoint nextPoint = GetNextCharPoint(tmp);
     if (nextPoint.mTextNode) {
       if (!nsCRT::IsAsciiSpace(nextPoint.mChar)) {
         canConvert = true;
diff --git a/editor/libeditor/WSRunObject.h b/editor/libeditor/WSRunObject.h
index 6a6c73e15ec1..d1ed559b3137 100644
--- a/editor/libeditor/WSRunObject.h
+++ b/editor/libeditor/WSRunObject.h
@@ -384,10 +384,32 @@ protected:
   nsresult DeleteRange(const EditorRawDOMPoint& aStartPoint,
                        const EditorRawDOMPoint& aEndPoint);
 
-  WSPoint GetCharAfter(nsINode* aNode, int32_t aOffset);
-  WSPoint GetCharBefore(nsINode* aNode, int32_t aOffset);
-  WSPoint GetCharAfter(const WSPoint& aPoint);
-  WSPoint GetCharBefore(const WSPoint& aPoint);
+  /**
+   * GetNextCharPoint() returns next character's point of aPoint.  If there is
+   * no character after aPoint, mTextNode is set to nullptr.
+   */
+  WSPoint GetNextCharPoint(const EditorRawDOMPoint& aPoint);
+  WSPoint GetNextCharPoint(const WSPoint& aPoint);
+
+  /**
+   * GetPreviousCharPoint() returns previous character's point of of aPoint.
+   * If there is no character before aPoint, mTextNode is set to nullptr.
+   */
+  WSPoint GetPreviousCharPoint(const EditorRawDOMPoint& aPoint);
+  WSPoint GetPreviousCharPoint(const WSPoint& aPoint);
+
+  /**
+   * GetNextCharPointInternal() and GetPreviousCharPointInternal() are
+   * helper methods of GetNextCharPoint(const EditorRawDOMPoint&) and
+   * GetPreviousCharPoint(const EditorRawDOMPoint&).  When the container
+   * isn't in mNodeArray, they call one of these methods.  Then, these
+   * methods look for nearest text node in mNodeArray from aPoint.
+   * Then, will call GetNextCharPoint(const WSPoint&) or
+   * GetPreviousCharPoint(const WSPoint&) and returns its result.
+   */
+  WSPoint GetNextCharPointInternal(const EditorRawDOMPoint& aPoint);
+  WSPoint GetPreviousCharPointInternal(const EditorRawDOMPoint& aPoint);
+
   nsresult ConvertToNBSP(WSPoint aPoint);
   void GetAsciiWSBounds(int16_t aDir, nsINode* aNode, int32_t aOffset,
                         dom::Text** outStartNode, int32_t* outStartOffset,
@@ -417,8 +439,6 @@ protected:
   WSFragment* FindNearestRun(const EditorRawDOMPoint& aPoint, bool aForward);
 
   char16_t GetCharAt(dom::Text* aTextNode, int32_t aOffset);
-  WSPoint GetWSPointAfter(nsINode* aNode, int32_t aOffset);
-  WSPoint GetWSPointBefore(nsINode* aNode, int32_t aOffset);
   nsresult CheckTrailingNBSPOfRun(WSFragment *aRun);
   nsresult CheckTrailingNBSP(WSFragment* aRun, nsINode* aNode,
                              int32_t aOffset);

From 32f244666289150343bb9ea8e56cd63a1088791c Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Wed, 22 Nov 2017 02:45:08 +0900
Subject: [PATCH 140/219] Bug 1408227 - part 6:
 WSRunObject::CheckTrailingNBSP() should take |const EditorRawDOMPoint&|
 instead of a set of container node and offset in it r=m_kato

The name, WSRunObject::CheckTrailingNBSP(), is unclear what it does.  It
replaces previous character of specified point with ASCII space if it is NBSP
and it's not necessary.

So, it should be renamed to ReplacePreviousNBSPIfUnncessary().

Additionally, it should take |const EditorRawDOMPoint&| instead of a set of
container node and offset in it.

MozReview-Commit-ID: 2vq46OiAzo6

--HG--
extra : rebase_source : 132bb71361ff1e60268863cd4ef86bfbd0ddc9d1
---
 editor/libeditor/WSRunObject.cpp | 74 ++++++++++++++++++++------------
 editor/libeditor/WSRunObject.h   | 14 +++++-
 2 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/editor/libeditor/WSRunObject.cpp b/editor/libeditor/WSRunObject.cpp
index 56229b93094d..1066dce231a6 100644
--- a/editor/libeditor/WSRunObject.cpp
+++ b/editor/libeditor/WSRunObject.cpp
@@ -228,9 +228,10 @@ WSRunObject::InsertBreak(Selection& aSelection,
     } else if (beforeRun->mType == WSType::normalWS) {
       // Try to change an nbsp to a space, just to prevent nbsp proliferation
       nsresult rv =
-        CheckTrailingNBSP(beforeRun, pointToInsert.Container(),
-                          pointToInsert.Offset());
-      NS_ENSURE_SUCCESS(rv, nullptr);
+        ReplacePreviousNBSPIfUnncessary(beforeRun, pointToInsert.AsRaw());
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return nullptr;
+      }
     }
   }
 
@@ -310,9 +311,11 @@ WSRunObject::InsertText(nsIDocument& aDocument,
     } else if (beforeRun->mType == WSType::normalWS) {
       // Try to change an nbsp to a space, if possible, just to prevent nbsp
       // proliferation
-      nsresult rv = CheckTrailingNBSP(beforeRun, pointToInsert.Container(),
-                                      pointToInsert.Offset());
-      NS_ENSURE_SUCCESS(rv, rv);
+      nsresult rv =
+        ReplacePreviousNBSPIfUnncessary(beforeRun, pointToInsert.AsRaw());
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
     }
 
     // After this block, pointToInsert is modified by AutoTrackDOMPoint.
@@ -1859,46 +1862,61 @@ WSRunObject::CheckTrailingNBSPOfRun(WSFragment *aRun)
 }
 
 nsresult
-WSRunObject::CheckTrailingNBSP(WSFragment* aRun,
-                               nsINode* aNode,
-                               int32_t aOffset)
+WSRunObject::ReplacePreviousNBSPIfUnncessary(WSFragment* aRun,
+                                             const EditorRawDOMPoint& aPoint)
 {
-  // Try to change an nbsp to a space, if possible, just to prevent nbsp
+  if (NS_WARN_IF(!aRun) ||
+      NS_WARN_IF(!aPoint.IsSet())) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  MOZ_ASSERT(aPoint.IsSetAndValid());
+
+  // Try to change an NBSP to a space, if possible, just to prevent NBSP
   // proliferation.  This routine is called when we are about to make this
   // point in the ws abut an inserted break or text, so we don't have to worry
   // about what is after it.  What is after it now will end up after the
   // inserted object.
-  NS_ENSURE_TRUE(aRun && aNode, NS_ERROR_NULL_POINTER);
   bool canConvert = false;
-  WSPoint thePoint = GetPreviousCharPoint(EditorRawDOMPoint(aNode, aOffset));
+  WSPoint thePoint = GetPreviousCharPoint(aPoint);
   if (thePoint.mTextNode && thePoint.mChar == nbsp) {
     WSPoint prevPoint = GetPreviousCharPoint(thePoint);
     if (prevPoint.mTextNode) {
       if (!nsCRT::IsAsciiSpace(prevPoint.mChar)) {
+        // If previous character is a NBSP and its previous character isn't
+        // ASCII space, we can replace the NBSP with ASCII space.
         canConvert = true;
       }
     } else if (aRun->mLeftType == WSType::text ||
                aRun->mLeftType == WSType::special) {
+      // If previous character is a NBSP and it's the first character of the
+      // text node, additionally, if its previous node is a text node including
+      // non-whitespace characters or <img> node or something inline
+      // non-container element node, we can replace the NBSP with ASCII space.
       canConvert = true;
     }
   }
-  if (canConvert) {
-    // First, insert a space
-    AutoTransactionsConserveSelection dontChangeMySelection(mHTMLEditor);
-    nsAutoString spaceStr(char16_t(32));
-    nsresult rv =
-      mHTMLEditor->InsertTextIntoTextNodeImpl(spaceStr, *thePoint.mTextNode,
-                                              thePoint.mOffset, true);
-    NS_ENSURE_SUCCESS(rv, rv);
 
-    // Finally, delete that nbsp
-    rv = DeleteRange(EditorRawDOMPoint(thePoint.mTextNode,
-                                       thePoint.mOffset + 1),
-                     EditorRawDOMPoint(thePoint.mTextNode,
-                                       thePoint.mOffset + 2));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+  if (!canConvert) {
+    return NS_OK;
+  }
+
+  // First, insert a space before the previous NBSP.
+  AutoTransactionsConserveSelection dontChangeMySelection(mHTMLEditor);
+  nsAutoString spaceStr(char16_t(32));
+  nsresult rv =
+    mHTMLEditor->InsertTextIntoTextNodeImpl(spaceStr, *thePoint.mTextNode,
+                                            thePoint.mOffset, true);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  // Finally, delete the previous NBSP.
+  rv = DeleteRange(EditorRawDOMPoint(thePoint.mTextNode,
+                                     thePoint.mOffset + 1),
+                   EditorRawDOMPoint(thePoint.mTextNode,
+                                     thePoint.mOffset + 2));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
   }
   return NS_OK;
 }
diff --git a/editor/libeditor/WSRunObject.h b/editor/libeditor/WSRunObject.h
index d1ed559b3137..a50cd0cf9e11 100644
--- a/editor/libeditor/WSRunObject.h
+++ b/editor/libeditor/WSRunObject.h
@@ -440,8 +440,18 @@ protected:
 
   char16_t GetCharAt(dom::Text* aTextNode, int32_t aOffset);
   nsresult CheckTrailingNBSPOfRun(WSFragment *aRun);
-  nsresult CheckTrailingNBSP(WSFragment* aRun, nsINode* aNode,
-                             int32_t aOffset);
+
+  /**
+   * ReplacePreviousNBSPIfUnncessary() replaces previous character of aPoint
+   * if it's a NBSP and it's unnecessary.
+   *
+   * @param aRun        Current text run.  aPoint must be in this run.
+   * @param aPoint      Current insertion point.  Its previous character is
+   *                    unnecessary NBSP will be checked.
+   */
+  nsresult ReplacePreviousNBSPIfUnncessary(WSFragment* aRun,
+                                           const EditorRawDOMPoint& aPoint);
+
   nsresult CheckLeadingNBSP(WSFragment* aRun, nsINode* aNode,
                             int32_t aOffset);
 

From 0f1d29505262eb3e7fbfe9272507f4b75e15ab2f Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Sun, 3 Dec 2017 18:43:38 +0000
Subject: [PATCH 141/219] Bug 1421859 - Use ic_status_logo instead of flat_icon
 in MediaControl and TabReceived notifications. r=nechen

ic_status_logo is what all the other notifications use, and flat_icon hasn't
been updated to the new photon logo.

MozReview-Commit-ID: Luo5ibVmXvk

--HG--
extra : rebase_source : 4e9335c177028ecdbe42bd69773494a2420f3700
---
 .../base/java/org/mozilla/gecko/media/MediaControlService.java  | 2 +-
 .../java/org/mozilla/gecko/tabqueue/TabReceivedService.java     | 2 +-
 .../robocop/src/org/mozilla/gecko/tests/MediaPlaybackTest.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/media/MediaControlService.java b/mobile/android/base/java/org/mozilla/gecko/media/MediaControlService.java
index 5766f99f3a9f..580191c3567a 100644
--- a/mobile/android/base/java/org/mozilla/gecko/media/MediaControlService.java
+++ b/mobile/android/base/java/org/mozilla/gecko/media/MediaControlService.java
@@ -408,7 +408,7 @@ public class MediaControlService extends Service implements Tabs.OnTabsChangedLi
             Notification.VISIBILITY_PRIVATE : Notification.VISIBILITY_PUBLIC;
 
         final Notification notification = new Notification.Builder(this)
-            .setSmallIcon(R.drawable.flat_icon)
+            .setSmallIcon(R.drawable.ic_status_logo)
             .setLargeIcon(generateCoverArt(tab))
             .setContentTitle(tab.getTitle())
             .setContentText(tab.getURL())
diff --git a/mobile/android/base/java/org/mozilla/gecko/tabqueue/TabReceivedService.java b/mobile/android/base/java/org/mozilla/gecko/tabqueue/TabReceivedService.java
index 4f5baacdbdf5..cb1a60b3f7b7 100644
--- a/mobile/android/base/java/org/mozilla/gecko/tabqueue/TabReceivedService.java
+++ b/mobile/android/base/java/org/mozilla/gecko/tabqueue/TabReceivedService.java
@@ -62,7 +62,7 @@ public class TabReceivedService extends IntentService {
 
         final String notificationTitle = getNotificationTitle(intent.getStringExtra(BrowserContract.EXTRA_CLIENT_GUID));
         final NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
-        builder.setSmallIcon(R.drawable.flat_icon);
+        builder.setSmallIcon(R.drawable.ic_status_logo);
         builder.setContentTitle(notificationTitle);
         builder.setWhen(System.currentTimeMillis());
         builder.setAutoCancel(true);
diff --git a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/MediaPlaybackTest.java b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/MediaPlaybackTest.java
index 36ef07260002..558efad4a075 100644
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/MediaPlaybackTest.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/MediaPlaybackTest.java
@@ -213,7 +213,7 @@ abstract class MediaPlaybackTest extends OldBaseTest {
 
         Notification notification = sbns[0].getNotification();
         mAsserter.is(notification.icon,
-                     R.drawable.flat_icon,
+                     R.drawable.ic_status_logo,
                      "Notification shows correct small icon.");
         mAsserter.is(notification.extras.get(Notification.EXTRA_TITLE),
                      tab.getTitle(),

From 5231a620c11c7b242afd5a402acfcede3b8e0489 Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Sun, 3 Dec 2017 18:44:53 +0000
Subject: [PATCH 142/219] Bug 1421859 - Remove flat_icon now that it is unused.
 r=nechen

MozReview-Commit-ID: 7wJ0JL2fBFC

--HG--
extra : rebase_source : 89e1a65309682398f4823c6835c19494d8743305
---
 .../src/photon/res/drawable-hdpi/flat_icon.png   | Bin 696 -> 0 bytes
 .../src/photon/res/drawable-xhdpi/flat_icon.png  | Bin 921 -> 0 bytes
 .../src/photon/res/drawable-xxhdpi/flat_icon.png | Bin 1383 -> 0 bytes
 .../photon/res/drawable-xxxhdpi/flat_icon.png    | Bin 1887 -> 0 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 mobile/android/app/src/photon/res/drawable-hdpi/flat_icon.png
 delete mode 100644 mobile/android/app/src/photon/res/drawable-xhdpi/flat_icon.png
 delete mode 100644 mobile/android/app/src/photon/res/drawable-xxhdpi/flat_icon.png
 delete mode 100644 mobile/android/app/src/photon/res/drawable-xxxhdpi/flat_icon.png

diff --git a/mobile/android/app/src/photon/res/drawable-hdpi/flat_icon.png b/mobile/android/app/src/photon/res/drawable-hdpi/flat_icon.png
deleted file mode 100644
index 603c3979a31f7e9c7876dd97968d2e428a59daf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 696
zcmV;p0!RIcP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0007iNkl<ZcmZM<
z7U2K?|H6P?>;Y<y9t@!H;zw=Uwr$(CZQHhO+qP}nw%y($Mb6GNlf^yf`S@lhYak2C
zpb1)`5^^K5uQm}5?XeRdVAg32LK1ImBrJyFHRRsn7H;4@<UU~ulIkAZuk?FqJcH;B
zW}+M-Nwao@LLrRD9f&@n8=SCP+0Y<F`0?{FX(Qbc+(s%V%>VyGW88;mE7l;C%4VYC
z9s2(Gy%g&F5dFvB3SbvbB81|Z41_uOy_1Ojw}tH?s)Arhha?Dz3HaK5M7MZT$c4rD
z1kpR>HCwa<Dz($NZT^Ghc#7Y9g0M!5wnL?~Zai!}f!su+1-qfrB~(F9WJ44So9YO;
z7w{_&rou<)wBN#pV!%}y<-yg^=_3kTyy}iXuKe!<k?=|9lF_+6v1TFU8p0t4_{DNv
z;LzAi35<i>c%%|T3|KCX<~?l*c0=v~YKx%}P;EW7A*$wvrogDSVrUvvx(f&FZoG0B
z4WsIap;b`n3I4a~rE>EqCWcl*wW;{e#etj%Vlz(VSP8^X16b)8Y9l#{Vh-Lwyi&|;
zu$kPr0axAreJ~<C*>;WR$|>^jCAix(gf@9%{Q#pf$P4;IwGR-z!xrS$cv2PJceNls
zK0&4H$bj(hqi{nGg~u@J1MIFAE{1AP(I46IufayrU=a4ftTRUEBmv&SN;lCPIS~yp
zQ5xOw94d7-yLel`mt90avklp?4!-EF(vvhpL9r9w>^LG@dIyW;@N}Qh4SsZ<2%YGL
z5Aam8Jn>;eN*sZ^O~wD7`UJ#*>bM9iy}&$Vw5g`Cu|gPtVc3X!c!-%8hu)})1aR7X
epV+8p4*mtYrz(xWG<_ie0000<MNUMnLSTY0OHA|t

diff --git a/mobile/android/app/src/photon/res/drawable-xhdpi/flat_icon.png b/mobile/android/app/src/photon/res/drawable-xhdpi/flat_icon.png
deleted file mode 100644
index c2597d54390f00f0423b247e954854b8cbd14df7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 921
zcmV;K17`e*P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000AENkl<ZcmZM<
z>R=T7|Noy2(5^iINv^~J7+?F@wr$(?JKMHx+gw{`+qP}nxBkvusbJE{;P6%bj{DE1
zXLfps@6Z|Pn2W7Ai=$YJX-GhAyy6Kb?Sp(6hEp)xcJ#w5u0C;Z{EyYJqZ}mRHCLSc
z+gJ&;4q_N;<4=5sm+>xsLs_)O0_12cWGF)IIMLhirsChq;~c~?kch9~ZQ}S3p$ry5
z**d(A=d3KCDOw4CkA$*VJffHjl>Bkr2(hzRjX2$7>RdXfu@QG%{<pH|iFW9MFNCju
z7O~ieVF;4A!2Hk<*-$nLVP-FVao9)a((5UF(?z(=!nJ-6{=#u6+l6l(J<x23#iJ~G
zAQ?SS8)I;#6L`Sl?JgMcNX0%VJK@lld-)5^*3HH{#6`$}TFc<8|FbC9CpK=?Zy*C&
zRnQyuhfK3@n~jTT53N?{4L$?ePGSOvBL%T|RdN9j8e9u6Xbp~rot3a~EsTOz|Empr
z06SZa5DN>a3ax6Z4aC5%#^X_ow}VfhRadn=_!O+R9lzUfBlg3CdfPT05eI&R)u!P#
zn|7gAxCdJG!eDWrKC)n?b~bLK1JM&&ZN^4%pa!fqz{Ul%Lnib(DGpSFOgr%oe#K`t
zE}#L7Iw1~pfK08N^vtgojM^j)41!GEoV0+tFlvrCkO-NM;3+38pd*Y*5eJ$<wjKCX
z<3#R90aV8?2yo!!Lof_RRZ~8M&4z4Qh{Ip_4#hAW84%lww+$9h2fJX@%i@qP*1;9c
z)H(S;9EDN4)P{$^nI+&qyr8py@8L+D)rJeg8STao4&HcUVN^DrQyUJ&NywCe9L1|_
zE71VAIe7B-<1CCi3?Hq7L_(%h_zf@OY1}Tcb@qj$g=ih*RpdaXbEtv<6DR!$p26QH
zzV88}gC@XA8A!z|1~1LOiapq9atn_)TEKHS2dnKsd;E(x@G`zc9pR-&nZA~PH0b`)
z%{-->4o_;Osm<Z?wzd_X&=Nc>^QiDqtb#imhEOXHZSTTtxVi%<YS-iQV8p;xW#d(6
zJX0!yqi}XjocT`W!$^TMI)*Z?dcXKH%!eHvMmIbpcQ)1+l8p1%fE*aL2UE}<KO)c*
vK6-FF-o+F63H1?<&Uha$;t`bxd$-C1UPK)#GePIn00000NkvXXu0mjfbU&|^

diff --git a/mobile/android/app/src/photon/res/drawable-xxhdpi/flat_icon.png b/mobile/android/app/src/photon/res/drawable-xxhdpi/flat_icon.png
deleted file mode 100644
index c476105050a7e690216672037e5879572e5c1bc4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1383
zcmV-t1(^DYP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000FpNkl<ZcmeI)
z1F++2AAs>~zdh#Kwr$(CZQHhO+qP}nw(Z^ad#>-z^t4HuH^rQ1=C|HA?Y~IMFrm3c
zp@n8Pn}bjSJunvsaU0L^89(tB4{;IeFbWNk90qqBN@@(k8T^7hy~GMshMy}B#UHJ4
z8KU}xc}V9<g9*l9yn&wWMQ&#vOjxwUODO3lp5rnOU>gqN9G*dGYmwO5h7%VjU@H?Y
zU<zs=E(|j6)H9(aR?55pKBJ+Y14v}$?@Hk{taT4P5lw^B@;?;C0(^$G79-%#|K}m{
zrgI%JE&Ta#m=IDsQ36Imr!5i&+PJ^Fj&#_AOd?K1HITW2<j;55xW<$ZVLb!<;Gyx3
zVWO2oh_Cp7Z>Xl_aKhsS$h=nacg^t{mvI6oaRme6EBUuZ)WKG~z$cUyaABsy6&d$~
zb+p=G2g%;1o5KHZL}Q$gtW!tuk@{v>>kGOgk-Zx`hky4Ag=GF;53GW;W`cJp=@Abj
zV69(xiPUO06a$v}h(d^oD(H;i7=Vr_fy6itY0Grj;|5?G)?*;P!diC`S<Qw@+PEDn
z?F(Y*bXekxgZPTWu+@GTly0Omv}~5n2d`1^1afPjbOVE-WyKtDgkJ=5dyZg74rr2t
z9tN#}+`21ScnGwvs{;m<SiybfIVB5EhKNpK5{6?K`eO*%AflilZHC;E$a-*!FVMTy
zf(BF)a%--B;^G@5Xh2^01UU_}wOA%NqF0C;h8%n|TViXWWzf6N$R=ty3Xkg!Sz9Cm
zzC+KpBZUrov$BxWb!&?>fnME3869``DIuq;Fv8c;B3mIk6UM+#r@<700RfQHMdUz9
zOZW7jA-d)|A1DsQP<TO3=P(kZr3>Z9D~K+y&I4)*6S6^0*Kh;-r3<yic8IQl&I76p
zG9Q(H7eEZj(j(so5M4u^2UHkp`XF5>0YtP3Sx_CT5nty4WrLc&>2U=82HyYLh9^99
z9#9&n>8*63O3=E^PVlmLDyZqPbfHGjx`X0JAnY1+)beX!+V&IC9Xz0%P}4%`LVY2k
z%?Rtj0hNcEdP*1Sjf(>JWWfr~R3MTfx&{O41U2QCF4O?iA*x5H0%HhgBtH7#F8<wp
zbcdh9!FZ!6mOyDg;AiQD|6UN?H4H^nR76)Cf~_tgrh);b#SA=x()NZl@d|L}<|`Ob
z3%rGz+J&@eR5)uN&{@HN)<R9c5X;)ax8N+@K{a@&cy0bY)U?gk;<MlkO@yDyJy#v5
zt(>jJ3&N3IL}5F3?FXQy+c3&`SJ*>noyp48{yA2m5)5_@Cj->>4xVy0G8`frjwr~E
zTu6tw8Xr0Dggu3qvylY&0TIoBhoFZQ)nHFQ;30QovmvU($g0sx%7gy=b#{D$JzZ3?
z@p$+Sk-fq?G(=p5!-;^y_=&X|oz^i*FQMrW-Fu8hN(JxtNsg1yx?D;J6cw+bSJyBX
z9Z?*4kQWuvAN%kG7om0g)ZWhP!re0=lRbBaTj0(Ouy=0}5qIH^Ern654~l$-JGESs
zV=~Ey=f1-ongFASqt!AlKBP~mtH(Ro-@w({gt&UXLHi0^p<k%%h}WC~uo%wXI!C{}
zTMuvHjNL^nXZY-VOl*ZSbrZ3j?Mnt~;~^ZG2~!d5tY1^%i{AL?fWhoWR#*9=lV})*
zR}k3^3`Ig${i+-vG{SlOz%D#fc@24h9hiVxi0N)$wv-G_kPd0l0OPP1&+!9mQ5*%3
p18EQqVOb(H2H^+)&`G#Z{|8COg!T>+Zl3@E002ovPDHLkV1oIkfsX(H

diff --git a/mobile/android/app/src/photon/res/drawable-xxxhdpi/flat_icon.png b/mobile/android/app/src/photon/res/drawable-xxxhdpi/flat_icon.png
deleted file mode 100644
index 3c86961bb08700025b9d1e28454d826fe058540c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1887
zcmV-l2cY<gP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000LjNkl<ZcmeI*
z1DxYZ0D$o<&o*|SZQHhO+dkX2ZQHhO+t#wZ_nnpYlIe6Z>E`?W{?D(IW_CC38eU#r
zUS3|hboA)atauQgp$d9pCYEC}_9GpKu^p>1AA?aJKjB#vG%V$<@Jx6f)iDLBkkvA@
z!Y3$T5Rtdi<M15XV?R`sjuH40`7-K?FMx8`0VhjAJKT~{R{WJ{fh6eG7(5xND?ShE
zAQied6gNi7ijT&R*agwjFcUq|6qWERKEexl4Iklqltdd$!VZX*juyz}=9Pab#=~w0
zFal-pII@MX48`yPT4ELKwh_<hwqo;H_-{VL0a(q4p?DRsVO;jxQ3qRKr{>6_!^*!8
z{e%4bc(jGpwxJ3xRs23;@G7RmYO|4md+>=<6EGV)g6vvOgq3#TYs6{rMfEtw!Ajfl
z8ICm&xm7Ocy*Sn7=l#1V%)`a<p&9a8*mxI3L51({9c;3=fj-q@B&t}rELee4{cHLL
zf;SC!1Q{a{Wibr<aI6uyRN*9KM{W3FwJk^t_kw+jv)hD+O#ZuvaSMtfH?pAsE=5#;
z*Up9VNXFT%L1Bk}EIp0wu-YtKf!yI*poKWUok$4ryQ%{Y1vq(D%;9ZA5sZb^#$yF8
zk-Z>SAW+kgS#af#fLZ%-mBR;*Z{r@sp(E_H0mWr5(9a0g800wX9R3}6318q7yotwA
z@Z^6}94ip0*EQHPDufwWh>uYhc3O;_vKFQ@F4h7}Mk<1}4O<YXp&A`<=Egi6Yc_hr
zPQ7F;$ULaXkDE0+>Mw|OI94hS!%iQ{_<5KF6;0IioYuWagGgJDBb32&K~>*qd}8rm
zh*l$%fr~;_B{jcvx*Q^<;&Rb}3qw^0af`;2@B&1uA-*S|w%xcx<4Kqdk#-_R?KVKX
zH1xn<_!3{>GrWiQ@d@sAW&#*ryn96kEDc>7<G=*OV;e*&VRx|WkOEy>@6dNaZHUyy
z?m)w!bKM-8fTtkRC_97P37t#B{SHk)W*mXtR@fP&D|GG;hxdkt!){4dUpxV6(6Mxs
z)?jzE8bm5+<;DMjj*Y~Pnj8;&36ZW8Kl|xiYw(I@2V{>yq)QPK?1is^E~TR;vg&q2
z8h@PtkrMDdqD8NMscH@G)a<MNC%k^v-4h}e!ED?XXpn($x-=Bk@I25vNW#6y43X}{
zvHl2j%5@(O!O8X_tA-Qs2#&P?Ss+qX9ILz80C!;sd~mwU4UIC{KK?BH#YHsHY=Cc3
z0y=c3rjJ#fYBxe@rP%;)p$>HD77ZsL9<n-UHo)Z=3YDedUp#}aFb&-ir|AWmWXLEv
z&>awKpt7<i%kYfGSHyNgMtcK2DD8vFE_K;sSKA<?E#}X3sco0xvP|ykle!VU87fOc
zjLRlqD`Ygv?8P5~>K=F51RR8nnwj7CqQ3qvTKO^XLq>m^4e&0U=r@;4Kmug-jM)Hh
zVj)!LM`;&Kz$1{654p?+cnKBZR6~(q^C_DT(H+aN2b<9!B~V1tioZ_ssrm)M9!$Fz
zPIeGAP&mj6xeN8N2f;dmDu@el0)EBA5^q#!9B80>5RD`_T{6a^5`M++Xo_Wm*OIe_
zFafPmN#ZW(vjOh|J^AN3h_wC<VFDImBV=>{@fRDgAtJ3tAv~hwS8z9<g56QIC1D`i
zqZaZCPQWLS*>hF~Ee^NlLjx3)v<EZ<vf6|gs{^lv+ggtMB<}YYhYzwUYiIE4a8r%N
z_jHsz8*v2r?F@b++|WSW8HS_YD6EC7MvE-OT&Qk4(h#T=Oh#4Q9>&uSZ$M^A$YysT
z{($P{pfIk&b9e_Y;1S%8EQ-#0E`;ogiaes43e_!E|4}tcZqLjkvM_DnL>q9Iq7@!{
z-nQ=uWVcgv;jV=rPLz!5C>*90AB8_r>*U|xgbfHsqvd{Fjr!JN5NhKM31>Lt&U#;q
z&=f}yuKo`76L3@DbUW}P@}qDFzoQ@;-Jr5-6g(TNtW_wFo9#SYfnV_j+CgQrWqq9E
zI_TCG^hJ4mj#u$K-oOuNfayp*X#rIChP;n*^is9)HP6<!uh(8&9*$qcum)bi^Wmj%
z9k|?r!|)2+*GA|GTs8CZ;}=6k7u-YSm4**hpSY?CFV6MgNkjh+Fp9{gBhl&mCd<H&
zj8qCrAXb-~S6{<HWP}Fc8XfN-z7Z=B$#vBIHtrnghDa<Ox4PwtlCN<HkyLrNJym!W
zrXmt*VYo3CJQ}~a_`4w${~0<aaI0Sj_~Di&;szs<;tkz_anQM~_ySQzq;~S^)gtJU
z4@2=f;*5+EZ}v$HfDfwMgMRo0iAF|_6>vFfV=t1?1>=y4Q1f9OhM^w5#qEeTyiD)e
zc@nkpIj+SMD1!mmgtPOb3_iw3cpER_aomJLh%v}3gnM~RezC;ecpX3BCtPWGd3m|C
Z{{cbnqftbfB})JR002ovPDHLkV1hBAd?f$?


From caac6a3325ab98dd3a7a26cd2a6f66ea913cd4e9 Mon Sep 17 00:00:00 2001
From: James Teh <jteh@mozilla.com>
Date: Mon, 4 Dec 2017 15:32:56 +1000
Subject: [PATCH 143/219] Bug 1422201: Only handle remote ids passed to
 IAccessible::accChild on the root accessible. r=MarcoZ

Previously, we could return remote accessibles which weren't actually descendants of the accessible on which accChild was called.
For example, calling accChild on a local document with the id of a remote document would happily return the remote accessible.
This confused clients such as NVDA which use accChild to check whether something is a descendant of a document.

MozReview-Commit-ID: 8mJ4m6RC3r2

--HG--
extra : rebase_source : c56040d84e09c2b9ede94985cdd94606c27160a3
---
 accessible/windows/msaa/AccessibleWrap.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/accessible/windows/msaa/AccessibleWrap.cpp b/accessible/windows/msaa/AccessibleWrap.cpp
index 83731f7d486c..60179df48046 100644
--- a/accessible/windows/msaa/AccessibleWrap.cpp
+++ b/accessible/windows/msaa/AccessibleWrap.cpp
@@ -1481,6 +1481,13 @@ AccessibleWrap::GetIAccessibleFor(const VARIANT& aVarChild, bool* aIsDefunct)
   // window and the child id points in the content documents. Thus we need to
   // make sure that it is never called on proxies.
   if (XRE_IsParentProcess() && !IsProxy() && !sIDGen.IsChromeID(varChild.lVal)) {
+    if (!IsRoot()) {
+      // Bug 1422201: accChild with a remote id is only valid on the root accessible.
+      // Otherwise, we might return remote accessibles which aren't descendants
+      // of this accessible. This would confuse clients which use accChild to
+      // check whether something is a descendant of a document.
+      return nullptr;
+    }
     return GetRemoteIAccessibleFor(varChild);
   }
 

From 87408bd0b048cd468090ee22a9dd0d0752375248 Mon Sep 17 00:00:00 2001
From: Ethan Lin <ethlin@mozilla.com>
Date: Mon, 4 Dec 2017 11:12:25 +0800
Subject: [PATCH 144/219] Bug 1422013 - Invalidate image items for webrender.
 r=mattwoodrow

MozReview-Commit-ID: 701MZhcrf4l

--HG--
extra : rebase_source : 8bed0e5f812570685cf04f5b371da885294513e0
---
 gfx/layers/wr/WebRenderCommandBuilder.cpp |  8 ++--
 gfx/layers/wr/WebRenderUserData.cpp       |  4 +-
 gfx/layers/wr/WebRenderUserData.h         |  3 +-
 layout/painting/FrameLayerBuilder.cpp     | 24 ++++++------
 layout/painting/FrameLayerBuilder.h       |  2 -
 layout/style/ImageLoader.cpp              | 48 +++++++++++++++++------
 6 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/gfx/layers/wr/WebRenderCommandBuilder.cpp b/gfx/layers/wr/WebRenderCommandBuilder.cpp
index 26f6f2abaf17..24603ab456fd 100644
--- a/gfx/layers/wr/WebRenderCommandBuilder.cpp
+++ b/gfx/layers/wr/WebRenderCommandBuilder.cpp
@@ -531,7 +531,7 @@ WebRenderCommandBuilder::GenerateFallbackData(nsDisplayItem* aItem,
   LayoutDeviceIntPoint offset = RoundedToInt(bounds.TopLeft());
   aImageRect = LayoutDeviceRect(offset, LayoutDeviceSize(RoundedToInt(bounds.Size())));
   LayerRect paintRect = LayerRect(LayerPoint(0, 0), LayerSize(paintSize));
-  nsAutoPtr<nsDisplayItemGeometry> geometry = fallbackData->GetGeometry();
+  nsDisplayItemGeometry* geometry = fallbackData->GetGeometry();
 
   // nsDisplayFilter is rendered via BasicLayerManager which means the invalidate
   // region is unknown until we traverse the displaylist contained by it.
@@ -561,6 +561,10 @@ WebRenderCommandBuilder::GenerateFallbackData(nsDisplayItem* aItem,
   }
 
   if (needPaint || !fallbackData->GetKey()) {
+    nsAutoPtr<nsDisplayItemGeometry> newGeometry;
+    newGeometry = aItem->AllocateGeometry(aDisplayListBuilder);
+    fallbackData->SetGeometry(Move(newGeometry));
+
     gfx::SurfaceFormat format = aItem->GetType() == DisplayItemType::TYPE_MASK ?
                                                       gfx::SurfaceFormat::A8 : gfx::SurfaceFormat::B8G8R8A8;
     if (useBlobImage) {
@@ -645,13 +649,11 @@ WebRenderCommandBuilder::GenerateFallbackData(nsDisplayItem* aItem,
       }
     }
 
-    geometry = aItem->AllocateGeometry(aDisplayListBuilder);
     fallbackData->SetScale(scale);
     fallbackData->SetInvalid(false);
   }
 
   // Update current bounds to fallback data
-  fallbackData->SetGeometry(Move(geometry));
   fallbackData->SetBounds(paintBounds);
 
   MOZ_ASSERT(fallbackData->GetKey());
diff --git a/gfx/layers/wr/WebRenderUserData.cpp b/gfx/layers/wr/WebRenderUserData.cpp
index eef58932c16c..ea4e9200a561 100644
--- a/gfx/layers/wr/WebRenderUserData.cpp
+++ b/gfx/layers/wr/WebRenderUserData.cpp
@@ -246,10 +246,10 @@ WebRenderFallbackData::~WebRenderFallbackData()
 {
 }
 
-nsAutoPtr<nsDisplayItemGeometry>
+nsDisplayItemGeometry*
 WebRenderFallbackData::GetGeometry()
 {
-  return mGeometry;
+  return mGeometry.get();
 }
 
 void
diff --git a/gfx/layers/wr/WebRenderUserData.h b/gfx/layers/wr/WebRenderUserData.h
index 4d90cd4e9a91..67f66688e570 100644
--- a/gfx/layers/wr/WebRenderUserData.h
+++ b/gfx/layers/wr/WebRenderUserData.h
@@ -58,6 +58,7 @@ public:
   uint32_t GetDisplayItemKey() { return mDisplayItemKey; }
   void RemoveFromTable();
   virtual void ClearCachedResources() {};
+  virtual nsDisplayItemGeometry* GetGeometry() { return nullptr; }
 protected:
   virtual ~WebRenderUserData();
 
@@ -121,7 +122,7 @@ public:
   virtual WebRenderFallbackData* AsFallbackData() override { return this; }
   virtual UserDataType GetType() override { return UserDataType::eFallback; }
   static UserDataType Type() { return UserDataType::eFallback; }
-  nsAutoPtr<nsDisplayItemGeometry> GetGeometry();
+  nsDisplayItemGeometry* GetGeometry() override;
   void SetGeometry(nsAutoPtr<nsDisplayItemGeometry> aGeometry);
   nsRect GetBounds() { return mBounds; }
   void SetBounds(const nsRect& aRect) { mBounds = aRect; }
diff --git a/layout/painting/FrameLayerBuilder.cpp b/layout/painting/FrameLayerBuilder.cpp
index 050aaa23d63b..5e5f8d3c6a37 100644
--- a/layout/painting/FrameLayerBuilder.cpp
+++ b/layout/painting/FrameLayerBuilder.cpp
@@ -2060,20 +2060,14 @@ FrameLayerBuilder::HasRetainedDataFor(nsIFrame* aFrame, uint32_t aDisplayItemKey
       return true;
     }
   }
-  return false;
-}
-
-void
-FrameLayerBuilder::IterateRetainedDataFor(nsIFrame* aFrame, DisplayItemDataCallback aCallback)
-{
-  const SmallPointerArray<DisplayItemData>& array = aFrame->DisplayItemData();
-
-  for (uint32_t i = 0; i < array.Length(); i++) {
-    DisplayItemData* data = DisplayItemData::AssertDisplayItemData(array.ElementAt(i));
-    if (data->mDisplayItemKey != 0) {
-      aCallback(aFrame, data);
+  if (auto userDataTable =
+       aFrame->GetProperty(nsIFrame::WebRenderUserDataProperty())) {
+    RefPtr<WebRenderUserData> data = userDataTable->Get(aDisplayItemKey);
+    if (data) {
+      return true;
     }
   }
+  return false;
 }
 
 DisplayItemData*
@@ -6279,6 +6273,12 @@ FrameLayerBuilder::GetMostRecentGeometry(nsDisplayItem* aItem)
       return data->GetGeometry();
     }
   }
+  if (auto userDataTable =
+       aItem->Frame()->GetProperty(nsIFrame::WebRenderUserDataProperty())) {
+    if (RefPtr<WebRenderUserData> data = userDataTable->Get(itemPerFrameKey)) {
+      return data->GetGeometry();
+    }
+  }
 
   return nullptr;
 }
diff --git a/layout/painting/FrameLayerBuilder.h b/layout/painting/FrameLayerBuilder.h
index 6a25d9e721b7..e1ec00e8a3cf 100644
--- a/layout/painting/FrameLayerBuilder.h
+++ b/layout/painting/FrameLayerBuilder.h
@@ -555,8 +555,6 @@ public:
 
   typedef void (*DisplayItemDataCallback)(nsIFrame *aFrame, DisplayItemData* aItem);
 
-  static void IterateRetainedDataFor(nsIFrame* aFrame, DisplayItemDataCallback aCallback);
-
   /**
    * Save transform that was in aLayer when we last painted, and the position
    * of the active scrolled root frame. It must be an integer
diff --git a/layout/style/ImageLoader.cpp b/layout/style/ImageLoader.cpp
index be5544687c81..466428a0c3c9 100644
--- a/layout/style/ImageLoader.cpp
+++ b/layout/style/ImageLoader.cpp
@@ -324,22 +324,48 @@ ImageLoader::GetPresContext()
   return shell->GetPresContext();
 }
 
-void InvalidateImagesCallback(nsIFrame* aFrame,
-                              DisplayItemData* aItem)
+static bool
+IsRenderNoImages(uint32_t aDisplayItemKey)
 {
-  DisplayItemType type = GetDisplayItemTypeFromKey(aItem->GetDisplayItemKey());
+  DisplayItemType type = GetDisplayItemTypeFromKey(aDisplayItemKey);
   uint8_t flags = GetDisplayItemFlagsForType(type);
+  return flags & TYPE_RENDERS_NO_IMAGES;
+}
 
-  if (flags & TYPE_RENDERS_NO_IMAGES) {
-    return;
+void InvalidateImages(nsIFrame* aFrame)
+{
+  bool invalidateFrame = false;
+  const SmallPointerArray<DisplayItemData>& array = aFrame->DisplayItemData();
+  for (uint32_t i = 0; i < array.Length(); i++) {
+    DisplayItemData* data = DisplayItemData::AssertDisplayItemData(array.ElementAt(i));
+    uint32_t displayItemKey = data->GetDisplayItemKey();
+    if (displayItemKey != 0 && !IsRenderNoImages(displayItemKey)) {
+      if (nsLayoutUtils::InvalidationDebuggingIsEnabled()) {
+        DisplayItemType type = GetDisplayItemTypeFromKey(displayItemKey);
+        printf_stderr("Invalidating display item(type=%d) based on frame %p \
+                       because it might contain an invalidated image\n",
+                       static_cast<uint32_t>(type), aFrame);
+      }
+
+      data->Invalidate();
+      invalidateFrame = true;
+    }
+  }
+  if (auto userDataTable =
+       aFrame->GetProperty(nsIFrame::WebRenderUserDataProperty())) {
+    for (auto iter = userDataTable->Iter(); !iter.Done(); iter.Next()) {
+      RefPtr<layers::WebRenderUserData> data = iter.UserData();
+      if (data->GetType() == layers::WebRenderAnimationData::UserDataType::eFallback &&
+          !IsRenderNoImages(data->GetDisplayItemKey())) {
+        static_cast<layers::WebRenderFallbackData*>(data.get())->SetInvalid(true);
+      }
+      invalidateFrame = true;
+    }
   }
 
-  if (nsLayoutUtils::InvalidationDebuggingIsEnabled()) {
-    printf_stderr("Invalidating display item(type=%d) based on frame %p \
-      because it might contain an invalidated image\n", static_cast<uint32_t>(type), aFrame);
+  if (invalidateFrame) {
+    aFrame->SchedulePaint();
   }
-  aItem->Invalidate();
-  aFrame->SchedulePaint();
 }
 
 void
@@ -359,7 +385,7 @@ ImageLoader::DoRedraw(FrameSet* aFrameSet, bool aForcePaint)
         // might not find the right display item.
         frame->InvalidateFrame();
       } else {
-        FrameLayerBuilder::IterateRetainedDataFor(frame, InvalidateImagesCallback);
+        InvalidateImages(frame);
 
         // Update ancestor rendering observers (-moz-element etc)
         nsIFrame *f = frame;

From a2b5ec45e822cb21d48b0dca500546ad71f0f5f8 Mon Sep 17 00:00:00 2001
From: Liang-Heng Chen <xeonchen@gmail.com>
Date: Fri, 1 Dec 2017 15:10:36 +0800
Subject: [PATCH 145/219] Bug 1421793 - nsPACMan needs to be shutdown before
 dtor; r=schien

MozReview-Commit-ID: D2aKTC8s9MQ

--HG--
extra : rebase_source : e1442aebd9bd5f6e155ba4e33a9b30a97b3427e3
---
 netwerk/base/nsProtocolProxyService.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/netwerk/base/nsProtocolProxyService.cpp b/netwerk/base/nsProtocolProxyService.cpp
index 19e6eb26651b..11d90a6d156c 100644
--- a/netwerk/base/nsProtocolProxyService.cpp
+++ b/netwerk/base/nsProtocolProxyService.cpp
@@ -1166,8 +1166,10 @@ nsProtocolProxyService::SetupPACThread(nsIEventTarget *mainThreadEventTarget)
         rv = mPACMan->Init(nullptr);
     }
 
-    if (NS_FAILED(rv))
+    if (NS_FAILED(rv)) {
+        mPACMan->Shutdown();
         mPACMan = nullptr;
+    }
     return rv;
 }
 

From 69a04c680f2f0bd5890e1ccca3ad96769d20477c Mon Sep 17 00:00:00 2001
From: "Francesco Lodolo (:flod)" <flod@lodolo.net>
Date: Sun, 3 Dec 2017 09:30:31 +0100
Subject: [PATCH 146/219] Bug 914817 - [ja] Update icon for Rakuten
 searchplugin, switch SearchForm to https r=mkaply

MozReview-Commit-ID: FJsgvRgtFuh

--HG--
extra : rebase_source : bc4c51468b9f612a7c7618c58b8299323e8cf284
---
 browser/locales/searchplugins/rakuten.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/locales/searchplugins/rakuten.xml b/browser/locales/searchplugins/rakuten.xml
index 942a5dbd9504..fc7baff99644 100644
--- a/browser/locales/searchplugins/rakuten.xml
+++ b/browser/locales/searchplugins/rakuten.xml
@@ -6,11 +6,11 @@
 <ShortName>楽天市場</ShortName>
 <Description>楽天市場 商品検索</Description>
 <InputEncoding>EUC-JP</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQALMOAOefn9psbMswMMMQEPjj4/PPz++/v+OPj99/f9+AgMcgIM9AQOuvr////wAAAL8AACH5BAEAAA4ALAAAAAAQABAAAARf0EnJ0FqIze2YemCoaBsQniEwMeIloOQHJk1NvKDSnTRQNIZThddYPAiNk4UYCDQIpwux1ghEEUTGc6BkhWiLA1DokD3Ag5/1odvlFlzFAkdymFAn1caDH3FWFhh1EhEAOw==</Image>
+<Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAEAIACYAgAAJgAAACAgAAABACAARwUAAL4CAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAJfSURBVDiNdZFLSJRhFIaf8/9jOoFa3tLEBC/JCEU5yUgGahIS5TIqiCxTNIiKpCiiVWJBpV0Iw9vGnbMqokW6kYRJZCK6qRNmXhJprMzQ0XH8vxZOo47T2Z7zPuc95xWCytV4J3ug6WE5IoWiSFWiDIEhFJ3Z1TWt6VUXR1fPS0DoehE+cLT6NnBOBFMwGADFXNweW11eU0ediKgAwC9+KkJJSOE6jmordY5WiIjSAQ70vLorwgkApQyiMi1EZWSxMXkb4THxLEx9B8MAEb9t2f3D6fjd+ubTaxl83GBxtTS8R9ABDK+X3PttJBUfDGycGx/BUXUMz+TEigulZjLKr6TpJZP91xDyA42lJZJLSjEnJNF3qZJf75wkFR8iMiOLsWd2RNeXXYiEa5oxblJQEPjkqjJ8i7gd3SzNe9iybz/Rlp2Iae1vp5yOIpMoUglBEE0nMi2TiMStbN6Vy5/P/SjfIhK2YdWQpJiWc15PCIuKpsDeBcDizDQf62+imcKC4zA0UXwJcQE+zxyDT+5heL3Mfhtj+sPbQAorBhjWELpCAYyFeQYb6+l/dItNlh1Yzl/F8PnWzMTm2Dq17KqaZqXUfDBaNB3NZGKovQm3o5v0srMk5BeCUn73uDNPXegQAEflketTzt5aAKUU5oRE9Agzs2NfAdDDIzAnJePzzOGZnEBEiLHaTuY329vFL9KeW1NbgNOhzgmuWKutdm+z/QaAtuxYjMPOkTMxVttlpdTM/4QK3LE5eWX/xMD6/FytD+LdvT3Hf/b1FikhRcBAMRxrtb3cXlFjj8vLW7PgL85j5b2Pva1GAAAAAElFTkSuQmCCiVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFDklEQVRYha2Wa2xUVRSFv33ubadT2lLCQwSngwQRCYVCiwIqSIgPEHkkPDQQoyYYjBgjCBgfGFCDkT/8UjCRVE0UwYhUXlEiEiJRbCkgNEKgQikoD0npTDvtzL13+6N0+hqmM4SVTHLu3mevte6dk7O3kCK+n3BvrmluHI/HQ4KMVNGgQL6qeMBVhDNApYi3v7yitnw1eKnwSncbto0KDrIs7yVgviDBVEgVPWJUNjl+f+msgydDt2Rg3yTscCiwQpHXBXqlItzVCKeM8Pb0ipqtaRkoKx5cgBcrFZHJtyKcABsiTTmvzquqinZroKw4OAxPd4ow+DaJ34DuznSicx8/dqmhfdS0f9hVOPAuUW/X7RcHkKlRK3PzvknY7aNW66K8uDjjuolsF6Soa63gOTGchga8aHOXn8aigCCW1aW0E8/Q5mhe1tf/1O+Nh1oXZcWBN0RlbaI6L9pMr1ElFMx6uktOXZdwTTWXD/xM/akqLH82YkwClhv7QfG8yTOO1O6PG9hWMiBgu9YJRHITFTnhEIPmPkvR++tvSuxGGjnz+Qb++ngdYtnJTSiHKiprxq8GzwBYnrXkZuJA/C9IBsufzdDFSxmxYg1uUyTpXhHuLykOPgFgtgzvmwOyIGlFJzjhELU7vuX89m+4+NMOYvXX47nBCxfRb8IjuJHkJvD0RQDb588aL8rAdAxELv9LxfLFuLEYiJA/vJBxn3xF9oAAAIHZz3D5133JSUQn7Srq39cYZWI64gBiDHZOLhm5eWTm9aTuz0rObi6N53vecx9Wdg/US9YOJN+xMkYbRUama6CrIYtYuL7t2baSHsL4PkyhDRpMoSd1gHoeTjiE5zioemTm9SIwY34833ihBqexAdufnZzI8wpsID8tdSAzL5+7Fy5CHQfL72fg1Nn0Khwdz1/YUwZJP38rJM+WFPt2e/j69GXkWwnvLK4dLefinu1Y3b09oKKeAbmaroHEbMqV3w9QvnQRbiya2hlQrhmgOl0tz4nRWHuOWLht1lDg7JYvCFWfwvJlpUZkqDYoh9M10HjhPL/MmcKBBU/SdPkSACJC4cr3yBsyDLepKSUeceWoUfW6uTESQBUvFqPu+BGOrlkOqgBk9evPyFUfgWo3dwAAFxujkWMmt2dtJXAiXQ9iDBl5Pbn4Yxlnvvw0Hr/j4SkMeeFlnHDSURBV3Tmv6krYTN6PI8rGdA20ws7uQdX6D6g7fiQeG7ZkJb3HTsBpbEhYo6BGZCPcmIgcv79U0XNJ7CJW2yBjZfnja7Fs3KYIlateiwtaPh8l6zaS1a8/6jhd6AT9bvrhmoqW9Q38UFQwB0PC6dVzHHoEgvQe/QAAsXCISwf2tlw20kLhNkXoM/ZBehQMQlUxGZn898dBwjV/Y+w286pabxvGTKs4f6aDAYCy0YFPRWRRV8uCxmK4zS2nW4xJeNG4zU0d3tjK8iO2HT+kAB76/MzD50tbnzsMiHbI94qbGw0iPNaBWRWxbWw7J9EHahP0ZYGvU7CduCprZ1a2iUOnqXja6dPNrt8/R1V3JlW6BaiydkZlzZud4wnb4L5J2KH6wIcisuw2SNehZtlTlec2Jcom7cPbiwOPGo81iIy7JWllq2eZd2aVnz15sz3dDgLvgikZE5yp6HOCTgRJ2r5VqRV0jyfms5mHz/3WHX9ak8ju4oI7Y64UYXSEqAYVyRFQhGsK1YIes2zf0WmHTtd3z9aC/wGRJv+fU1BOjgAAAABJRU5ErkJggg==</Image>
 <Url type="text/html" method="GET" template="https://pt.afl.rakuten.co.jp/c/013ca98b.cd7c5f0c/" resultdomain="rakuten.co.jp">
   <Param name="sitem" value="{searchTerms}"/>
   <Param name="sv" value="2"/>
   <Param name="p" value="0"/>
 </Url>
-<SearchForm>http://www.rakuten.co.jp/</SearchForm>
+<SearchForm>https://www.rakuten.co.jp/</SearchForm>
 </SearchPlugin>

From f2f6e686dff4e56cfd239d64dc03bc4e23b67205 Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Mon, 4 Dec 2017 16:29:35 +1300
Subject: [PATCH 147/219] Bug 1422662 - Move BaseMediaResource::Close() into
 MediaResource class. r=jwwang

For the project to export Gecko's media stack and import it into Servo,
I need a way to shutdown an abstract MediaResource. So I'd like to move
BaseMediaResource::Close() up into MediaResource class.

MozReview-Commit-ID: 9JmxJPs02PN

--HG--
extra : rebase_source : 77128d1f78bea516dda92cdae6975d010a4b303c
---
 dom/media/BaseMediaResource.h | 5 -----
 dom/media/MediaResource.h     | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dom/media/BaseMediaResource.h b/dom/media/BaseMediaResource.h
index 28a7d9007892..1fdfb6dd75cb 100644
--- a/dom/media/BaseMediaResource.h
+++ b/dom/media/BaseMediaResource.h
@@ -29,11 +29,6 @@ public:
     nsIChannel* aChannel,
     bool aIsPrivateBrowsing);
 
-  // Close the resource, stop any listeners, channels, etc.
-  // Cancels any currently blocking Read request and forces that request to
-  // return an error.
-  virtual nsresult Close() = 0;
-
   // Pass true to limit the amount of readahead data (specified by
   // "media.cache_readahead_limit") or false to read as much as the
   // cache size allows.
diff --git a/dom/media/MediaResource.h b/dom/media/MediaResource.h
index 097cb0c0e4a1..a23ba4e55ef9 100644
--- a/dom/media/MediaResource.h
+++ b/dom/media/MediaResource.h
@@ -56,6 +56,11 @@ public:
   NS_METHOD_(MozExternalRefCountType) AddRef(void);
   NS_METHOD_(MozExternalRefCountType) Release(void);
 
+  // Close the resource, stop any listeners, channels, etc.
+  // Cancels any currently blocking Read request and forces that request to
+  // return an error.
+  virtual nsresult Close() { return NS_OK; }
+
   // These methods are called off the main thread.
   // Read up to aCount bytes from the stream. The read starts at
   // aOffset in the stream, seeking to that location initially if

From 3f75a6d4107196f297ec0f6b9539efef24e8104e Mon Sep 17 00:00:00 2001
From: Coroiu Cristina <ccoroiu@mozilla.com>
Date: Mon, 4 Dec 2017 09:21:51 +0200
Subject: [PATCH 148/219] Backed out changeset 7a2629417a47 (bug 1422662) for
 bustage r=backout on a CLOSED TREE

---
 dom/media/BaseMediaResource.h | 5 +++++
 dom/media/MediaResource.h     | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dom/media/BaseMediaResource.h b/dom/media/BaseMediaResource.h
index 1fdfb6dd75cb..28a7d9007892 100644
--- a/dom/media/BaseMediaResource.h
+++ b/dom/media/BaseMediaResource.h
@@ -29,6 +29,11 @@ public:
     nsIChannel* aChannel,
     bool aIsPrivateBrowsing);
 
+  // Close the resource, stop any listeners, channels, etc.
+  // Cancels any currently blocking Read request and forces that request to
+  // return an error.
+  virtual nsresult Close() = 0;
+
   // Pass true to limit the amount of readahead data (specified by
   // "media.cache_readahead_limit") or false to read as much as the
   // cache size allows.
diff --git a/dom/media/MediaResource.h b/dom/media/MediaResource.h
index a23ba4e55ef9..097cb0c0e4a1 100644
--- a/dom/media/MediaResource.h
+++ b/dom/media/MediaResource.h
@@ -56,11 +56,6 @@ public:
   NS_METHOD_(MozExternalRefCountType) AddRef(void);
   NS_METHOD_(MozExternalRefCountType) Release(void);
 
-  // Close the resource, stop any listeners, channels, etc.
-  // Cancels any currently blocking Read request and forces that request to
-  // return an error.
-  virtual nsresult Close() { return NS_OK; }
-
   // These methods are called off the main thread.
   // Read up to aCount bytes from the stream. The read starts at
   // aOffset in the stream, seeking to that location initially if

From b970e21a6901d0b51a010552962fe392a2ec946b Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Sun, 12 Nov 2017 16:06:18 +0900
Subject: [PATCH 149/219] Bug 1032671 - Part 1. Add emoji presentation API for
 UTR#51. r=jfkthame

From ICU 57, ICU supports emoji presentation as draft API.

MozReview-Commit-ID: 6JgQMv4Ky9m

--HG--
extra : rebase_source : 60f451e7476f16ed48aeaccb1fc55d3962a2b4b2
---
 intl/unicharutil/util/nsUnicodeProperties.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/intl/unicharutil/util/nsUnicodeProperties.h b/intl/unicharutil/util/nsUnicodeProperties.h
index 03fafc547440..c16e67521ad0 100644
--- a/intl/unicharutil/util/nsUnicodeProperties.h
+++ b/intl/unicharutil/util/nsUnicodeProperties.h
@@ -46,6 +46,12 @@ enum IdentifierType {
   IDTYPE_ALLOWED = 1,
 };
 
+enum EmojiPresentation {
+  TextOnly = 0,
+  TextDefault = 1,
+  EmojiDefault = 2
+};
+
 extern const hb_unicode_general_category_t sICUtoHBcategory[];
 
 inline uint32_t
@@ -172,6 +178,19 @@ IsDefaultIgnorable(uint32_t aCh)
   return u_hasBinaryProperty(aCh, UCHAR_DEFAULT_IGNORABLE_CODE_POINT);
 }
 
+inline EmojiPresentation
+GetEmojiPresentation(uint32_t aCh)
+{
+  if (!u_hasBinaryProperty(aCh, UCHAR_EMOJI)) {
+    return TextOnly;
+  }
+
+  if (u_hasBinaryProperty(aCh, UCHAR_EMOJI_PRESENTATION)) {
+    return EmojiDefault;
+  }
+  return TextDefault;
+}
+
 // returns the simplified Gen Category as defined in nsUGenCategory
 inline nsUGenCategory GetGenCategory(uint32_t aCh) {
   return sDetailedToGeneralCategory[GetGeneralCategory(aCh)];

From d60606ea884d3cac53558d8df7e8ab218e8c9b53 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Sun, 12 Nov 2017 16:24:58 +0900
Subject: [PATCH 150/219] Bug 1032671 - Part 2. Use font.name-list.emoji
 preference for emoji presenration. r=jfkthame

MozReview-Commit-ID: DbrGeXzCpNT

--HG--
extra : rebase_source : 2a824295ff9c89b243cf49675e4c5c54a7a7259d
---
 gfx/thebes/gfxFontConstants.h      |  1 +
 gfx/thebes/gfxFontFamilyList.h     |  1 +
 gfx/thebes/gfxPlatformFontList.cpp | 69 ++++++++++++++++++++++++------
 gfx/thebes/gfxPlatformFontList.h   | 10 +++++
 gfx/thebes/gfxTextRun.cpp          | 23 +++++++---
 gfx/thebes/gfxTextRun.h            |  3 +-
 6 files changed, 87 insertions(+), 20 deletions(-)

diff --git a/gfx/thebes/gfxFontConstants.h b/gfx/thebes/gfxFontConstants.h
index 7ffa5b0b3851..ee1a4db3ecab 100644
--- a/gfx/thebes/gfxFontConstants.h
+++ b/gfx/thebes/gfxFontConstants.h
@@ -184,6 +184,7 @@ enum eFontPrefLang {
     #undef FONT_PREF_LANG
 
     , eFontPrefLang_CJKSet  // special code for CJK set
+    , eFontPrefLang_Emoji   // special code for emoji presentation
     , eFontPrefLang_First = eFontPrefLang_Western
     , eFontPrefLang_Last = eFontPrefLang_Others
     , eFontPrefLang_Count = (eFontPrefLang_Last - eFontPrefLang_First + 1)
diff --git a/gfx/thebes/gfxFontFamilyList.h b/gfx/thebes/gfxFontFamilyList.h
index d661b5d68465..50db4a275f99 100644
--- a/gfx/thebes/gfxFontFamilyList.h
+++ b/gfx/thebes/gfxFontFamilyList.h
@@ -40,6 +40,7 @@ enum FontFamilyType : uint32_t {
   // special
   eFamily_moz_variable,
   eFamily_moz_fixed,
+  eFamily_moz_emoji,
 
   eFamily_generic_first = eFamily_serif,
   eFamily_generic_last = eFamily_fantasy,
diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp
index a4b3a7ca795e..bd75ac57151c 100644
--- a/gfx/thebes/gfxPlatformFontList.cpp
+++ b/gfx/thebes/gfxPlatformFontList.cpp
@@ -960,20 +960,9 @@ gfxPlatformFontList::ResolveGenericFontNames(
     nsAtom* langGroup = GetLangGroupForPrefLang(aPrefLang);
     NS_ASSERTION(langGroup, "null lang group for pref lang");
 
-    // lookup and add platform fonts uniquely
-    for (const nsString& genericFamily : genericFamilies) {
-        gfxFontStyle style;
-        style.language = langGroup;
-        style.systemFont = false;
-        AutoTArray<gfxFontFamily*,10> families;
-        FindAndAddFamilies(genericFamily, &families, FindFamiliesFlags(0),
-                           &style);
-        for (gfxFontFamily* f : families) {
-            if (!aGenericFamilies->Contains(f)) {
-                aGenericFamilies->AppendElement(f);
-            }
-        }
-    }
+    gfxPlatformFontList::GetFontFamiliesFromGenericFamilies(genericFamilies,
+                                                           langGroup,
+                                                           aGenericFamilies);
 
 #if 0  // dump out generic mappings
     printf("%s ===> ", prefFontName.get());
@@ -985,6 +974,43 @@ gfxPlatformFontList::ResolveGenericFontNames(
 #endif
 }
 
+void
+gfxPlatformFontList::ResolveEmojiFontNames(
+    nsTArray<RefPtr<gfxFontFamily>>* aGenericFamilies)
+{
+    // emoji preference has no lang name
+    AutoTArray<nsString,4> genericFamilies;
+
+    nsAutoCString prefFontListName("font.name-list.emoji");
+    gfxFontUtils::AppendPrefsFontList(prefFontListName.get(), genericFamilies);
+
+    gfxPlatformFontList::GetFontFamiliesFromGenericFamilies(genericFamilies,
+                                                            nullptr,
+                                                            aGenericFamilies);
+}
+
+void
+gfxPlatformFontList::GetFontFamiliesFromGenericFamilies(
+    nsTArray<nsString>& aGenericNameFamilies,
+    nsAtom* aLangGroup,
+    nsTArray<RefPtr<gfxFontFamily>>* aGenericFamilies)
+{
+    // lookup and add platform fonts uniquely
+    for (const nsString& genericFamily : aGenericNameFamilies) {
+        gfxFontStyle style;
+        style.language = aLangGroup;
+        style.systemFont = false;
+        AutoTArray<gfxFontFamily*,10> families;
+        FindAndAddFamilies(genericFamily, &families, FindFamiliesFlags(0),
+                           &style);
+        for (gfxFontFamily* f : families) {
+            if (!aGenericFamilies->Contains(f)) {
+                aGenericFamilies->AppendElement(f);
+            }
+        }
+    }
+}
+
 nsTArray<RefPtr<gfxFontFamily>>*
 gfxPlatformFontList::GetPrefFontsLangGroup(mozilla::FontFamilyType aGenericType,
                                            eFontPrefLang aPrefLang)
@@ -994,6 +1020,17 @@ gfxPlatformFontList::GetPrefFontsLangGroup(mozilla::FontFamilyType aGenericType,
         aGenericType = eFamily_monospace;
     }
 
+    if (aGenericType == eFamily_moz_emoji) {
+        // Emoji font has no lang
+        PrefFontList* prefFonts = mEmojiPrefFont.get();
+        if (MOZ_UNLIKELY(!prefFonts)) {
+            prefFonts = new PrefFontList;
+            ResolveEmojiFontNames(prefFonts);
+            mEmojiPrefFont.reset(prefFonts);
+        }
+        return prefFonts;
+    }
+
     PrefFontList* prefFonts =
         mLangGroupPrefFonts[aPrefLang][aGenericType].get();
     if (MOZ_UNLIKELY(!prefFonts)) {
@@ -1298,6 +1335,10 @@ gfxPlatformFontList::AppendPrefLang(eFontPrefLang aPrefLangs[], uint32_t& aLen,
 mozilla::FontFamilyType
 gfxPlatformFontList::GetDefaultGeneric(eFontPrefLang aLang)
 {
+    if (aLang == eFontPrefLang_Emoji) {
+      return eFamily_moz_emoji;
+    }
+
     // initialize lang group pref font defaults (i.e. serif/sans-serif)
     if (MOZ_UNLIKELY(mDefaultGenericsLangGroup.IsEmpty())) {
         mDefaultGenericsLangGroup.AppendElements(ArrayLength(gPrefLangNames));
diff --git a/gfx/thebes/gfxPlatformFontList.h b/gfx/thebes/gfxPlatformFontList.h
index 9358ebd74440..415253990819 100644
--- a/gfx/thebes/gfxPlatformFontList.h
+++ b/gfx/thebes/gfxPlatformFontList.h
@@ -497,6 +497,15 @@ protected:
                             eFontPrefLang aPrefLang,
                             nsTArray<RefPtr<gfxFontFamily>>* aGenericFamilies);
 
+    void
+    ResolveEmojiFontNames(nsTArray<RefPtr<gfxFontFamily>>* aGenericFamilies);
+
+    void
+    GetFontFamiliesFromGenericFamilies(
+        nsTArray<nsString>& aGenericFamilies,
+        nsAtom* aLangGroup,
+        nsTArray<RefPtr<gfxFontFamily>>* aFontFamilies);
+
     virtual nsresult InitFontListForPlatform() = 0;
 
     void ApplyWhitelist();
@@ -562,6 +571,7 @@ protected:
     mozilla::RangedArray<PrefFontsForLangGroup,
                          eFontPrefLang_First,
                          eFontPrefLang_Count> mLangGroupPrefFonts;
+    mozilla::UniquePtr<PrefFontList> mEmojiPrefFont;
 
     // when system-wide font lookup fails for a character, cache it to skip future searches
     gfxSparseBitSet mCodepointsWithNoFonts;
diff --git a/gfx/thebes/gfxTextRun.cpp b/gfx/thebes/gfxTextRun.cpp
index 70927a803fdb..9a0202bf371f 100644
--- a/gfx/thebes/gfxTextRun.cpp
+++ b/gfx/thebes/gfxTextRun.cpp
@@ -37,6 +37,9 @@ using mozilla::services::GetObserverService;
 static const char16_t kEllipsisChar[] = { 0x2026, 0x0 };
 static const char16_t kASCIIPeriodsChar[] = { '.', '.', '.', 0x0 };
 
+const uint32_t kVariationSelector15 = 0xFE0E; // text presentation
+const uint32_t kVariationSelector16 = 0xFE0F; // emoji presentation
+
 #ifdef DEBUG_roc
 #define DEBUG_TEXT_RUN_STORAGE_METRICS
 #endif
@@ -3056,7 +3059,7 @@ gfxFontGroup::FindFontForChar(uint32_t aCh, uint32_t aPrevCh, uint32_t aNextCh,
         return nullptr;
 
     // 2. search pref fonts
-    gfxFont* font = WhichPrefFontSupportsChar(aCh);
+    gfxFont* font = WhichPrefFontSupportsChar(aCh, aNextCh);
     if (font) {
         *aMatchType = gfxTextRange::kPrefsFallback;
         return font;
@@ -3337,12 +3340,22 @@ gfxFontGroup::ContainsUserFont(const gfxUserFontEntry* aUserFont)
 }
 
 gfxFont*
-gfxFontGroup::WhichPrefFontSupportsChar(uint32_t aCh)
+gfxFontGroup::WhichPrefFontSupportsChar(uint32_t aCh, uint32_t aNextCh)
 {
-    // get the pref font list if it hasn't been set up already
-    uint32_t unicodeRange = FindCharUnicodeRange(aCh);
+    eFontPrefLang charLang;
     gfxPlatformFontList* pfl = gfxPlatformFontList::PlatformFontList();
-    eFontPrefLang charLang = pfl->GetFontPrefLangFor(unicodeRange);
+
+    EmojiPresentation emoji = GetEmojiPresentation(aCh);
+    if ((emoji != EmojiPresentation::TextOnly &&
+         (aNextCh == kVariationSelector16 ||
+          (emoji == EmojiPresentation::EmojiDefault &&
+           aNextCh != kVariationSelector15)))) {
+        charLang = eFontPrefLang_Emoji;
+    } else {
+        // get the pref font list if it hasn't been set up already
+        uint32_t unicodeRange = FindCharUnicodeRange(aCh);
+        charLang = pfl->GetFontPrefLangFor(unicodeRange);
+    }
 
     // if the last pref font was the first family in the pref list, no need to recheck through a list of families
     if (mLastPrefFont && charLang == mLastPrefLang &&
diff --git a/gfx/thebes/gfxTextRun.h b/gfx/thebes/gfxTextRun.h
index daa34f15f253..f0871fa3290a 100644
--- a/gfx/thebes/gfxTextRun.h
+++ b/gfx/thebes/gfxTextRun.h
@@ -1001,7 +1001,8 @@ public:
 
 protected:
     // search through pref fonts for a character, return nullptr if no matching pref font
-    gfxFont* WhichPrefFontSupportsChar(uint32_t aCh);
+    gfxFont* WhichPrefFontSupportsChar(uint32_t aCh,
+                                       uint32_t aNextCh);
 
     gfxFont* WhichSystemFontSupportsChar(uint32_t aCh, uint32_t aNextCh,
                                          Script aRunScript);

From 9fa1068dcc7de8e9447cd30d4380a574847422b4 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Sun, 12 Nov 2017 16:30:23 +0900
Subject: [PATCH 151/219] Bug 1032671 - Part 3. Set font.name-list.emoji for
 some platforms. r=jfkthame

- Segoe UI Emoji for Windows 8+
- EmojiOne Mozilla for Windows 7
- Apple Color Emoji for OSX
- EmojiOne Mozilla for GTK(Linux).  fontconfig doesn't support emoji as family name.
- Noto Color Emoji for Android

MozReview-Commit-ID: GOkOFRujk93

--HG--
extra : rebase_source : e8bae62d555440d9881f111fb26393d59fd15ba4
---
 modules/libpref/init/all.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 56f4e13c30f1..3124b347964b 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -3639,6 +3639,8 @@ pref("ui.mouse.radius.inputSource.touchOnly", true);
 
 #ifdef XP_WIN
 
+pref("font.name-list.emoji", "Segoe UI Emoji, EmojiOne Mozilla");
+
 pref("font.name-list.serif.ar", "Times New Roman");
 pref("font.name-list.sans-serif.ar", "Segoe UI, Tahoma, Arial");
 pref("font.name-list.monospace.ar", "Courier New");
@@ -3995,6 +3997,8 @@ pref("ui.key.saveLink.shift", false); // true = shift, false = meta
 // enable NSPR logging for module fontInfoLog:5
 // canonical names immediately follow '(fontinit) family:' in the log
 
+pref("font.name-list.emoji", "Apple Color Emoji");
+
 pref("font.name-list.serif.ar", "Al Bayan");
 pref("font.name-list.sans-serif.ar", "Geeza Pro");
 pref("font.name-list.monospace.ar", "Geeza Pro");
@@ -4286,6 +4290,10 @@ pref("print.print_in_color", true);
 
 // font names
 
+// fontconfig doesn't support emoji yet
+// https://lists.freedesktop.org/archives/fontconfig/2016-October/005842.html
+pref("font.name-list.emoji", "EmojiOne Mozilla");
+
 pref("font.name-list.serif.ar", "serif");
 pref("font.name-list.sans-serif.ar", "sans-serif");
 pref("font.name-list.monospace.ar", "monospace");
@@ -4461,6 +4469,8 @@ pref("font.size.fixed.x-western", 12);
 #if defined(ANDROID)
 // We use the bundled fonts for Firefox for Android
 
+pref("font.name-list.emoji", "Noto Color Emoji");
+
 pref("font.name-list.serif.ar", "Noto Naskh Arabic, Noto Serif, Droid Serif");
 pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic, Clear Sans, Roboto, Droid Sans");
 pref("font.name-list.monospace.ar", "Noto Naskh Arabic");

From 153c591749d7807372a4ba99e2685b5461d36cf7 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Sun, 12 Nov 2017 16:36:24 +0900
Subject: [PATCH 152/219] Bug 1032671 - Part 4. Font fallback should detect
 emoji range for color emoji font. r=jfkthame

MozReview-Commit-ID: AeqSLUU9GRH

--HG--
extra : rebase_source : 3a3d0c70072b990d83b1304eb527f30307f6e944
---
 gfx/thebes/gfxAndroidPlatform.cpp           | 22 ++++++++---------
 gfx/thebes/gfxPlatformGtk.cpp               | 20 +++++++---------
 gfx/thebes/gfxPlatformMac.cpp               | 23 ++++++++++--------
 gfx/thebes/gfxTextRun.cpp                   |  3 ---
 gfx/thebes/gfxWindowsPlatform.cpp           | 26 ++++++++++-----------
 intl/unicharutil/util/nsUnicodeProperties.h |  3 +++
 6 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp
index 402e22d72c2b..520f397b4651 100644
--- a/gfx/thebes/gfxAndroidPlatform.cpp
+++ b/gfx/thebes/gfxAndroidPlatform.cpp
@@ -22,6 +22,7 @@
 #include "nsIScreen.h"
 #include "nsIScreenManager.h"
 #include "nsServiceManagerUtils.h"
+#include "nsUnicodeProperties.h"
 #include "gfxPrefs.h"
 #include "cairo.h"
 #include "VsyncSource.h"
@@ -35,6 +36,7 @@
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::gfx;
+using namespace mozilla::unicode;
 using mozilla::intl::LocaleService;
 using mozilla::intl::OSPreferences;
 
@@ -166,19 +168,17 @@ gfxAndroidPlatform::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
     static const char kNotoSansCJKJP[] = "Noto Sans CJK JP";
     static const char kNotoColorEmoji[] = "Noto Color Emoji";
 
-    if (aNextCh == 0xfe0fu) {
-        // if char is followed by VS16, try for a color emoji glyph
-        aFontList.AppendElement(kNotoColorEmoji);
+    EmojiPresentation emoji = GetEmojiPresentation(aCh);
+    if (emoji != EmojiPresentation::TextOnly) {
+        if (aNextCh == kVariationSelector16 ||
+           (aNextCh != kVariationSelector15 &&
+            emoji == EmojiPresentation::EmojiDefault)) {
+            // if char is followed by VS16, try for a color emoji glyph
+            aFontList.AppendElement(kNotoColorEmoji);
+        }
     }
 
-    if (!IS_IN_BMP(aCh)) {
-        uint32_t p = aCh >> 16;
-        if (p == 1) { // try color emoji font, unless VS15 (text style) present
-            if (aNextCh != 0xfe0fu && aNextCh != 0xfe0eu) {
-                aFontList.AppendElement(kNotoColorEmoji);
-            }
-        }
-    } else {
+    if (IS_IN_BMP(aCh)) {
         // try language-specific "Droid Sans *" and "Noto Sans *" fonts for
         // certain blocks, as most devices probably have these
         uint8_t block = (aCh >> 8) & 0xff;
diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
index 48195a785306..22d82b497835 100644
--- a/gfx/thebes/gfxPlatformGtk.cpp
+++ b/gfx/thebes/gfxPlatformGtk.cpp
@@ -217,9 +217,14 @@ gfxPlatformGtk::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
                                        Script aRunScript,
                                        nsTArray<const char*>& aFontList)
 {
-    if (aNextCh == 0xfe0fu) {
-      // if char is followed by VS16, try for a color emoji glyph
-      aFontList.AppendElement(kFontEmojiOneMozilla);
+    EmojiPresentation emoji = GetEmojiPresentation(aCh);
+    if (emoji != EmojiPresentation::TextOnly) {
+        if (aNextCh == kVariationSelector16 ||
+           (aNextCh != kVariationSelector15 &&
+            emoji == EmojiPresentation::EmojiDefault)) {
+            // if char is followed by VS16, try for a color emoji glyph
+            aFontList.AppendElement(kFontEmojiOneMozilla);
+        }
     }
 
     aFontList.AppendElement(kFontDejaVuSerif);
@@ -227,15 +232,6 @@ gfxPlatformGtk::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
     aFontList.AppendElement(kFontDejaVuSans);
     aFontList.AppendElement(kFontFreeSans);
 
-    if (!IS_IN_BMP(aCh)) {
-        uint32_t p = aCh >> 16;
-        if (p == 1) { // try color emoji font, unless VS15 (text style) present
-            if (aNextCh != 0xfe0fu && aNextCh != 0xfe0eu) {
-                aFontList.AppendElement(kFontEmojiOneMozilla);
-            }
-        }
-    }
-
     // add fonts for CJK ranges
     // xxx - this isn't really correct, should use the same CJK font ordering
     // as the pref font code
diff --git a/gfx/thebes/gfxPlatformMac.cpp b/gfx/thebes/gfxPlatformMac.cpp
index b3af8c3329d4..4bcbc56da091 100644
--- a/gfx/thebes/gfxPlatformMac.cpp
+++ b/gfx/thebes/gfxPlatformMac.cpp
@@ -18,6 +18,7 @@
 #include "nsTArray.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/VsyncDispatcher.h"
+#include "nsUnicodeProperties.h"
 #include "qcms.h"
 #include "gfx2DGlue.h"
 
@@ -29,6 +30,7 @@
 
 using namespace mozilla;
 using namespace mozilla::gfx;
+using namespace mozilla::unicode;
 
 using mozilla::dom::SystemFontListEntry;
 
@@ -191,23 +193,24 @@ gfxPlatformMac::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
                                        Script aRunScript,
                                        nsTArray<const char*>& aFontList)
 {
-    if (aNextCh == 0xfe0f) {
-        aFontList.AppendElement(kFontAppleColorEmoji);
+    EmojiPresentation emoji = GetEmojiPresentation(aCh);
+    if (emoji != EmojiPresentation::TextOnly) {
+        if (aNextCh == kVariationSelector16 ||
+           (aNextCh != kVariationSelector15 &&
+            emoji == EmojiPresentation::EmojiDefault)) {
+            // if char is followed by VS16, try for a color emoji glyph
+            aFontList.AppendElement(kFontAppleColorEmoji);
+        }
     }
 
     aFontList.AppendElement(kFontLucidaGrande);
 
     if (!IS_IN_BMP(aCh)) {
         uint32_t p = aCh >> 16;
-        uint32_t b = aCh >> 8;
         if (p == 1) {
-            if (b >= 0x1f0 && b < 0x1f7) {
-                aFontList.AppendElement(kFontAppleColorEmoji);
-            } else {
-                aFontList.AppendElement(kFontAppleSymbols);
-                aFontList.AppendElement(kFontSTIXGeneral);
-                aFontList.AppendElement(kFontGeneva);
-            }
+            aFontList.AppendElement(kFontAppleSymbols);
+            aFontList.AppendElement(kFontSTIXGeneral);
+            aFontList.AppendElement(kFontGeneva);
         } else if (p == 2) {
             // OSX installations with MS Office may have these fonts
             aFontList.AppendElement(kFontMingLiUExtB);
diff --git a/gfx/thebes/gfxTextRun.cpp b/gfx/thebes/gfxTextRun.cpp
index 9a0202bf371f..96e9dc077f35 100644
--- a/gfx/thebes/gfxTextRun.cpp
+++ b/gfx/thebes/gfxTextRun.cpp
@@ -37,9 +37,6 @@ using mozilla::services::GetObserverService;
 static const char16_t kEllipsisChar[] = { 0x2026, 0x0 };
 static const char16_t kASCIIPeriodsChar[] = { '.', '.', '.', 0x0 };
 
-const uint32_t kVariationSelector15 = 0xFE0E; // text presentation
-const uint32_t kVariationSelector16 = 0xFE0F; // emoji presentation
-
 #ifdef DEBUG_roc
 #define DEBUG_TEXT_RUN_STORAGE_METRICS
 #endif
diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index 2077ee47b3b5..0b54917aa4b0 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -14,6 +14,7 @@
 #include "gfxWindowsSurface.h"
 
 #include "nsUnicharUtils.h"
+#include "nsUnicodeProperties.h"
 
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
@@ -84,6 +85,7 @@ using namespace mozilla::gfx;
 using namespace mozilla::layers;
 using namespace mozilla::widget;
 using namespace mozilla::image;
+using namespace mozilla::unicode;
 
 DCFromDrawTarget::DCFromDrawTarget(DrawTarget& aDrawTarget)
 {
@@ -603,9 +605,15 @@ gfxWindowsPlatform::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
                                            Script aRunScript,
                                            nsTArray<const char*>& aFontList)
 {
-    if (aNextCh == 0xfe0fu) {
-        aFontList.AppendElement(kFontSegoeUIEmoji);
-        aFontList.AppendElement(kFontEmojiOneMozilla);
+    EmojiPresentation emoji = GetEmojiPresentation(aCh);
+    if (emoji != EmojiPresentation::TextOnly) {
+        if (aNextCh == kVariationSelector16 ||
+           (aNextCh != kVariationSelector15 &&
+            emoji == EmojiPresentation::EmojiDefault)) {
+            // if char is followed by VS16, try for a color emoji glyph
+            aFontList.AppendElement(kFontSegoeUIEmoji);
+            aFontList.AppendElement(kFontEmojiOneMozilla);
+        }
     }
 
     // Arial is used as the default fallback for system fallback
@@ -614,17 +622,7 @@ gfxWindowsPlatform::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
     if (!IS_IN_BMP(aCh)) {
         uint32_t p = aCh >> 16;
         if (p == 1) { // SMP plane
-            if (aNextCh == 0xfe0eu) {
-                aFontList.AppendElement(kFontSegoeUISymbol);
-                aFontList.AppendElement(kFontSegoeUIEmoji);
-                aFontList.AppendElement(kFontEmojiOneMozilla);
-            } else {
-                if (aNextCh != 0xfe0fu) {
-                    aFontList.AppendElement(kFontSegoeUIEmoji);
-                    aFontList.AppendElement(kFontEmojiOneMozilla);
-                }
-                aFontList.AppendElement(kFontSegoeUISymbol);
-            }
+            aFontList.AppendElement(kFontSegoeUISymbol);
             aFontList.AppendElement(kFontEbrima);
             aFontList.AppendElement(kFontNirmalaUI);
             aFontList.AppendElement(kFontCambriaMath);
diff --git a/intl/unicharutil/util/nsUnicodeProperties.h b/intl/unicharutil/util/nsUnicodeProperties.h
index c16e67521ad0..e2ee2a99bfe4 100644
--- a/intl/unicharutil/util/nsUnicodeProperties.h
+++ b/intl/unicharutil/util/nsUnicodeProperties.h
@@ -52,6 +52,9 @@ enum EmojiPresentation {
   EmojiDefault = 2
 };
 
+const uint32_t kVariationSelector15 = 0xFE0E; // text presentation
+const uint32_t kVariationSelector16 = 0xFE0F; // emoji presentation
+
 extern const hb_unicode_general_category_t sICUtoHBcategory[];
 
 inline uint32_t

From ded9cb4ade6f15673a12c952923832a845ff01c8 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Sat, 18 Nov 2017 20:15:05 +0900
Subject: [PATCH 153/219] Bug 1032671 - Part 5. Add reftest for emoji.
 r=jfkthame

Windows 7 doesn't have mono symbol font for emoji code mapping.  And fontconfig
doesn't have better option for this.  So I except to these platforms.

MozReview-Commit-ID: 7TB1guyzBVS

--HG--
extra : rebase_source : 4a014a26618471cf8bee635bae961321c98a162e
---
 .../font-matching/emoji-fallback-1-ref.html    | 18 ++++++++++++++++++
 .../font-matching/emoji-fallback-1.html        | 17 +++++++++++++++++
 .../font-matching/emoji-fallback-2-ref.html    | 18 ++++++++++++++++++
 .../font-matching/emoji-fallback-2.html        | 17 +++++++++++++++++
 .../font-matching/emoji-fallback-3-ref.html    | 18 ++++++++++++++++++
 .../font-matching/emoji-fallback-3.html        | 17 +++++++++++++++++
 layout/reftests/font-matching/reftest.list     |  6 ++++++
 7 files changed, 111 insertions(+)
 create mode 100644 layout/reftests/font-matching/emoji-fallback-1-ref.html
 create mode 100644 layout/reftests/font-matching/emoji-fallback-1.html
 create mode 100644 layout/reftests/font-matching/emoji-fallback-2-ref.html
 create mode 100644 layout/reftests/font-matching/emoji-fallback-2.html
 create mode 100644 layout/reftests/font-matching/emoji-fallback-3-ref.html
 create mode 100644 layout/reftests/font-matching/emoji-fallback-3.html

diff --git a/layout/reftests/font-matching/emoji-fallback-1-ref.html b/layout/reftests/font-matching/emoji-fallback-1-ref.html
new file mode 100644
index 000000000000..0acad534a127
--- /dev/null
+++ b/layout/reftests/font-matching/emoji-fallback-1-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+<head>
+<meta charset="utf-8">
+<title>emoji fallback</title>
+<style>
+#test {
+  font-family: 'Segoe UI Emoji', 'Apple Color Emoji', 'Noto Color Emoji', 'EmojiOne Mozilla';
+  font-size: 24pt;
+}
+</style>
+</head>
+<body>
+
+<div id=test>&#x231a;&#x231b;&#x1f300;&#x1f301;</div>
+
+</body>
+</html>
diff --git a/layout/reftests/font-matching/emoji-fallback-1.html b/layout/reftests/font-matching/emoji-fallback-1.html
new file mode 100644
index 000000000000..fc0a479950e0
--- /dev/null
+++ b/layout/reftests/font-matching/emoji-fallback-1.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+<head>
+<meta charset="utf-8">
+<title>emoji fallback</title>
+<style>
+#test {
+    font-size: 24pt;
+}
+</style>
+</head>
+<body>
+
+<div id=test>&#x231a;&#x231b;&#x1f300;&#x1f301;</div>
+
+</body>
+</html>
diff --git a/layout/reftests/font-matching/emoji-fallback-2-ref.html b/layout/reftests/font-matching/emoji-fallback-2-ref.html
new file mode 100644
index 000000000000..2922dd28cc4c
--- /dev/null
+++ b/layout/reftests/font-matching/emoji-fallback-2-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+<head>
+<meta charset="utf-8">
+<title>emoji fallback to text font</title>
+<style>
+#test {
+  font-family: 'Segoe UI Symbol', 'Apple Symbols', 'Noto Sans Symbols';
+  font-size: 24pt;
+}
+</style>
+</head>
+<body>
+
+<div id=test>&#x231a;&#x231b;&#x1f300;&#x1f301;</div>
+
+</body>
+</html>
diff --git a/layout/reftests/font-matching/emoji-fallback-2.html b/layout/reftests/font-matching/emoji-fallback-2.html
new file mode 100644
index 000000000000..d136ff7d67af
--- /dev/null
+++ b/layout/reftests/font-matching/emoji-fallback-2.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+<head>
+<meta charset="utf-8">
+<title>emoji fallback to text font</title>
+<style>
+#test {
+  font-size: 24pt;
+}
+</style>
+</head>
+<body>
+
+<div id=test>&#x231a;&#xfe0e;&#x231b;&#xfe0e;&#x1f300;&#xfe0e;&#x1f301;&#xfe0e;</div>
+
+</body>
+</html>
diff --git a/layout/reftests/font-matching/emoji-fallback-3-ref.html b/layout/reftests/font-matching/emoji-fallback-3-ref.html
new file mode 100644
index 000000000000..627a0ea7f001
--- /dev/null
+++ b/layout/reftests/font-matching/emoji-fallback-3-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+<head>
+<meta charset="utf-8">
+<title>emoji fallback to color font</title>
+<style>
+#test {
+  font-family: 'Segoe UI Emoji', 'Apple Color Emoji', 'Noto Color Emoji', 'EmojiOne Mozilla';
+  font-size: 24pt;
+}
+</style>
+</head>
+<body>
+
+<div id=test>&#x1f170;&#x1f171;</div>
+
+</body>
+</html>
diff --git a/layout/reftests/font-matching/emoji-fallback-3.html b/layout/reftests/font-matching/emoji-fallback-3.html
new file mode 100644
index 000000000000..57046b555641
--- /dev/null
+++ b/layout/reftests/font-matching/emoji-fallback-3.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+<head>
+<meta charset="utf-8">
+<title>emoji fallback to color font</title>
+<style>
+#test {
+  font-size: 24pt;
+}
+</style>
+</head>
+<body>
+
+<div id=test>&#x1f170;&#xfe0f;&#x1f171;&#xfe0f;</div>
+
+</body>
+</html>
diff --git a/layout/reftests/font-matching/reftest.list b/layout/reftests/font-matching/reftest.list
index 3e92f6276449..89dbb44fc2cc 100644
--- a/layout/reftests/font-matching/reftest.list
+++ b/layout/reftests/font-matching/reftest.list
@@ -121,6 +121,12 @@ skip-if(!cocoaWidget) != apple-symbols-1.html apple-symbols-1-notref.html
 == italic-oblique-9.html italic-oblique-ref.html
 != italic-oblique-kinnari.html italic-oblique-kinnari-ref.html
 
+# GTK and Windows 7 don't have full emoji and symbol font, so emoji-fallback-2
+# don't work well.
+== emoji-fallback-1.html emoji-fallback-1-ref.html
+skip-if(gtkWidget||/^Windows\x20NT\x206\.1/.test(http.oscpu)) == emoji-fallback-2.html emoji-fallback-2-ref.html
+== emoji-fallback-3.html emoji-fallback-3-ref.html
+
 # system font generic per-language tests, only works under OSX currently
 # Bug 1212731 - initial implementation caused startup regression and
 # regression with full-width digits display in UI elements. Disable

From 8f329d4896dd509d95f5a1edd5329b2cfa20419d Mon Sep 17 00:00:00 2001
From: Russell <miller.time.baby@gmail.com>
Date: Thu, 23 Nov 2017 09:44:04 -0800
Subject: [PATCH 154/219] Bug 1419405 - remove Immutable usage in filters
 reducer; r=nchevobbe

MozReview-Commit-ID: GfxqmE3nGjs

--HG--
extra : rebase_source : e6a2dc059d6f5cd487b619c66a86db3ed34c633d
---
 .../new-console-output/actions/filters.js     |  4 +--
 .../new-console-output/reducers/filters.js    | 29 +++++++++++--------
 .../new-console-output/reducers/messages.js   | 10 +++----
 .../webconsole/new-console-output/store.js    |  2 +-
 .../test/components/filter-bar.test.js        |  8 ++---
 .../test/store/filters.test.js                | 12 +++-----
 6 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/devtools/client/webconsole/new-console-output/actions/filters.js b/devtools/client/webconsole/new-console-output/actions/filters.js
index 552146c46965..bbcc9bdf39f5 100644
--- a/devtools/client/webconsole/new-console-output/actions/filters.js
+++ b/devtools/client/webconsole/new-console-output/actions/filters.js
@@ -34,7 +34,7 @@ function filterToggle(filter) {
     });
     const filterState = getAllFilters(getState());
     Services.prefs.setBoolPref(PREFS.FILTER[filter.toUpperCase()],
-      filterState.get(filter));
+      filterState[filter]);
   };
 }
 
@@ -44,7 +44,7 @@ function filtersClear() {
       type: FILTERS_CLEAR,
     });
 
-    const filterState = getAllFilters(getState()).toJS();
+    const filterState = getAllFilters(getState());
     for (let filter in filterState) {
       if (filter !== FILTERS.TEXT) {
         Services.prefs.clearUserPref(PREFS.FILTER[filter.toUpperCase()]);
diff --git a/devtools/client/webconsole/new-console-output/reducers/filters.js b/devtools/client/webconsole/new-console-output/reducers/filters.js
index bd53aea6708e..be1ce9312712 100644
--- a/devtools/client/webconsole/new-console-output/reducers/filters.js
+++ b/devtools/client/webconsole/new-console-output/reducers/filters.js
@@ -5,32 +5,37 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const Immutable = require("devtools/client/shared/vendor/immutable");
 const constants = require("devtools/client/webconsole/new-console-output/constants");
 
-const FilterState = Immutable.Record(constants.DEFAULT_FILTERS_VALUES);
+const FilterState = (overrides) => Object.freeze(
+  cloneState(constants.DEFAULT_FILTERS_VALUES, overrides)
+);
 
-function filters(state = new FilterState(), action) {
+function filters(state = FilterState(), action) {
   switch (action.type) {
     case constants.FILTER_TOGGLE:
       const {filter} = action;
-      const active = !state.get(filter);
-      return state.set(filter, active);
+      const active = !state[filter];
+      return cloneState(state, {[filter]: active});
     case constants.FILTERS_CLEAR:
-      return new FilterState();
+      return FilterState();
     case constants.DEFAULT_FILTERS_RESET:
-      return state.withMutations(record => {
-        constants.DEFAULT_FILTERS.forEach(filterName => {
-          record.set(filterName, constants.DEFAULT_FILTERS_VALUES[filterName]);
-        });
+      const newState = cloneState(state);
+      constants.DEFAULT_FILTERS.forEach(filterName => {
+        newState[filterName] = constants.DEFAULT_FILTERS_VALUES[filterName];
       });
+      return newState;
     case constants.FILTER_TEXT_SET:
-      let {text} = action;
-      return state.set(constants.FILTERS.TEXT, text);
+      const {text} = action;
+      return cloneState(state, {[constants.FILTERS.TEXT]: text});
   }
 
   return state;
 }
 
+function cloneState(state, overrides) {
+  return Object.assign({}, state, overrides);
+}
+
 exports.FilterState = FilterState;
 exports.filters = filters;
diff --git a/devtools/client/webconsole/new-console-output/reducers/messages.js b/devtools/client/webconsole/new-console-output/reducers/messages.js
index 3cece897d582..67db9f7c40ab 100644
--- a/devtools/client/webconsole/new-console-output/reducers/messages.js
+++ b/devtools/client/webconsole/new-console-output/reducers/messages.js
@@ -602,7 +602,7 @@ function passNetworkFilter(message, filters) {
   return (
     message.source !== MESSAGE_SOURCE.NETWORK ||
     message.isXHR === true ||
-    filters.get(FILTERS.NET) === true
+    filters[FILTERS.NET] === true
   );
 }
 
@@ -620,7 +620,7 @@ function passXhrFilter(message, filters) {
   return (
     message.source !== MESSAGE_SOURCE.NETWORK ||
     message.isXHR === false ||
-    filters.get(FILTERS.NETXHR) === true
+    filters[FILTERS.NETXHR] === true
   );
 }
 
@@ -637,7 +637,7 @@ function passLevelFilters(message, filters) {
   return (
     (message.source !== MESSAGE_SOURCE.CONSOLE_API &&
     message.source !== MESSAGE_SOURCE.JAVASCRIPT) ||
-    filters.get(message.level) === true
+    filters[message.level] === true
   );
 }
 
@@ -653,7 +653,7 @@ function passCssFilters(message, filters) {
   // or if the CSS filter is on.
   return (
     message.source !== MESSAGE_SOURCE.CSS ||
-    filters.get("css") === true
+    filters.css === true
   );
 }
 
@@ -665,7 +665,7 @@ function passCssFilters(message, filters) {
  * @returns {Boolean}
  */
 function passSearchFilters(message, filters) {
-  let text = (filters.get("text") || "").trim();
+  let text = (filters.text || "").trim();
 
   // If there is no search, the message passes the filter.
   if (!text) {
diff --git a/devtools/client/webconsole/new-console-output/store.js b/devtools/client/webconsole/new-console-output/store.js
index a28ea3dbbc69..34025ddb4deb 100644
--- a/devtools/client/webconsole/new-console-output/store.js
+++ b/devtools/client/webconsole/new-console-output/store.js
@@ -47,7 +47,7 @@ function configureStore(hud, options = {}) {
 
   const initialState = {
     prefs: PrefState({ logLimit, sidebarToggle }),
-    filters: new FilterState({
+    filters: FilterState({
       error: Services.prefs.getBoolPref(PREFS.FILTER.ERROR),
       warn: Services.prefs.getBoolPref(PREFS.FILTER.WARN),
       info: Services.prefs.getBoolPref(PREFS.FILTER.INFO),
diff --git a/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js b/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
index c7cdea240aaa..242b33a2102f 100644
--- a/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
@@ -90,7 +90,7 @@ describe("FilterBar component:", () => {
     // Toolbar is now hidden
     const toolbar = wrapper.find(".webconsole-filterbar-filtered-messages");
     expect(toolbar.exists()).toBeFalsy();
-    expect(getAllFilters(store.getState()).get(FILTERS.LOG)).toBeTruthy();
+    expect(getAllFilters(store.getState())[FILTERS.LOG]).toBeTruthy();
   });
 
   it("displays the number of hidden messages when a search hide messages", () => {
@@ -185,9 +185,9 @@ describe("FilterBar component:", () => {
 
     // Let's make sure those non-default filters are off.
     const filters = getAllFilters(store.getState());
-    expect(filters.get(FILTERS.CSS)).toBe(false);
-    expect(filters.get(FILTERS.NET)).toBe(false);
-    expect(filters.get(FILTERS.NETXHR)).toBe(false);
+    expect(filters[FILTERS.CSS]).toBe(false);
+    expect(filters[FILTERS.NET]).toBe(false);
+    expect(filters[FILTERS.NETXHR]).toBe(false);
 
     const toolbar = wrapper.find(".webconsole-filterbar-filtered-messages");
     expect(toolbar.exists()).toBeFalsy();
diff --git a/devtools/client/webconsole/new-console-output/test/store/filters.test.js b/devtools/client/webconsole/new-console-output/test/store/filters.test.js
index f7b81ca033e8..5a8f2c76eb1a 100644
--- a/devtools/client/webconsole/new-console-output/test/store/filters.test.js
+++ b/devtools/client/webconsole/new-console-output/test/store/filters.test.js
@@ -213,8 +213,7 @@ describe("Clear filters", () => {
     store.dispatch(actions.filterToggle(FILTERS.NETXHR));
     store.dispatch(actions.filterTextSet("foobar"));
 
-    let filters = getAllFilters(store.getState());
-    expect(filters.toJS()).toEqual({
+    expect(getAllFilters(store.getState())).toEqual({
       // default
       [FILTERS.WARN]: true,
       [FILTERS.LOG]: true,
@@ -240,8 +239,7 @@ describe("Clear filters", () => {
 
     store.dispatch(actions.filtersClear());
 
-    filters = getAllFilters(store.getState());
-    expect(filters.toJS()).toEqual({
+    expect(getAllFilters(store.getState())).toEqual({
       [FILTERS.CSS]: false,
       [FILTERS.DEBUG]: true,
       [FILTERS.ERROR]: true,
@@ -278,8 +276,7 @@ describe("Resets filters", () => {
     store.dispatch(actions.filterToggle(FILTERS.NETXHR));
     store.dispatch(actions.filterTextSet("foobar"));
 
-    let filters = getAllFilters(store.getState());
-    expect(filters.toJS()).toEqual({
+    expect(getAllFilters(store.getState())).toEqual({
       // default
       [FILTERS.WARN]: true,
       [FILTERS.INFO]: true,
@@ -306,8 +303,7 @@ describe("Resets filters", () => {
 
     store.dispatch(actions.defaultFiltersReset());
 
-    filters = getAllFilters(store.getState());
-    expect(filters.toJS()).toEqual({
+    expect(getAllFilters(store.getState())).toEqual({
       // default
       [FILTERS.ERROR]: true,
       [FILTERS.WARN]: true,

From 98bddd976d76846671f6d9d8774dd22bf98bca01 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Mon, 4 Dec 2017 14:57:53 +0800
Subject: [PATCH 155/219] Bug 1422676 - Fix small CSS error in
 test_2d.fill.pattern.imageSmoothingEnabled.html. r=TYLin

MozReview-Commit-ID: JEBm4hNrnfw

--HG--
extra : rebase_source : a6722cd4add5d3a55f5da8f8f12ea779d8c2d628
---
 dom/canvas/test/test_2d.fill.pattern.imageSmoothingEnabled.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dom/canvas/test/test_2d.fill.pattern.imageSmoothingEnabled.html b/dom/canvas/test/test_2d.fill.pattern.imageSmoothingEnabled.html
index bdadf5ebf0bd..cf50ad4a93b0 100644
--- a/dom/canvas/test/test_2d.fill.pattern.imageSmoothingEnabled.html
+++ b/dom/canvas/test/test_2d.fill.pattern.imageSmoothingEnabled.html
@@ -45,7 +45,6 @@ img.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAA
 img.onload = function () {
   ctx.imageSmoothingEnabled = false;
   ctx.save();
-  ctx.fillStyle = "rgb(127, 127, 127);";
   ctx.fillRect(0, 0, canvas.width, canvas.height);
   ctx.scale(16, 16);
   ctx.fillStyle = ctx.createPattern(img, 'no-repeat');
@@ -60,7 +59,6 @@ img.onload = function () {
 
   ctx.imageSmoothingEnabled = true;
   ctx.save();
-  ctx.fillStyle = "rgb(127, 127, 127);";
   ctx.fillRect(0, 0, canvas.width, canvas.height);
   ctx.scale(16, 16);
   ctx.fillStyle = ctx.createPattern(img, 'no-repeat');

From 92398b50fb704aa26a128c6829d06b657cc3913e Mon Sep 17 00:00:00 2001
From: Nevin Chen <cnevinchen@gmail.com>
Date: Thu, 23 Nov 2017 17:07:59 +0800
Subject: [PATCH 156/219] Bug 1419245 - A2HS badge is shown on site with broken
 HTTPS. r=walkingice

MozReview-Commit-ID: BFWdqTcxOi9

--HG--
extra : rebase_source : d891304d2e484e178309dd9fcfa873266cd55f59
---
 .../org/mozilla/gecko/GeckoApplication.java   | 15 ++++++---
 .../base/java/org/mozilla/gecko/Tab.java      | 12 +++----
 .../java/org/mozilla/gecko/pwa/PwaUtils.java  | 31 +++++++++++++++++++
 .../gecko/toolbar/PageActionLayout.java       |  5 ++-
 mobile/android/base/moz.build                 |  1 +
 5 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 mobile/android/base/java/org/mozilla/gecko/pwa/PwaUtils.java

diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
index ddcf1a6af56f..84e684fed6bf 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
@@ -12,7 +12,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
-import android.graphics.Canvas;
 import android.net.Uri;
 import android.os.Environment;
 import android.os.Process;
@@ -39,12 +38,11 @@ import org.mozilla.gecko.icons.Icons;
 import org.mozilla.gecko.lwt.LightweightTheme;
 import org.mozilla.gecko.mdns.MulticastDNSManager;
 import org.mozilla.gecko.media.AudioFocusAgent;
-import org.mozilla.gecko.media.RemoteManager;
 import org.mozilla.gecko.notifications.NotificationClient;
 import org.mozilla.gecko.notifications.NotificationHelper;
 import org.mozilla.gecko.permissions.Permissions;
 import org.mozilla.gecko.preferences.DistroSharedPrefsImport;
-import org.mozilla.gecko.util.ActivityUtils;
+import org.mozilla.gecko.pwa.PwaUtils;
 import org.mozilla.gecko.telemetry.TelemetryBackgroundReceiver;
 import org.mozilla.gecko.util.ActivityResultHandler;
 import org.mozilla.gecko.util.BundleEventListener;
@@ -54,7 +52,6 @@ import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.PRNGFixes;
 import org.mozilla.gecko.util.ShortcutUtils;
 import org.mozilla.gecko.util.ThreadUtils;
-import org.mozilla.gecko.util.UIAsyncTask;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -569,7 +566,15 @@ public class GeckoApplication extends Application
         final String manifestUrl = selectedTab.getManifestUrl();
 
         if (manifestUrl != null) {
-            // If a page has associated manifest, lets install it
+            // If a page has associated manifest, lets install it (PWA A2HS)
+            // At this time, this page must be a secure page.
+            // Please hide PWA badge UI in front end side.
+            // Otherwise we'll throw an exception here.
+            final boolean safeForPwa = PwaUtils.shouldAddPwaShortcut(selectedTab);
+            if (!safeForPwa) {
+                throw new IllegalStateException("This page is not safe for PWA");
+            }
+
             final GeckoBundle message = new GeckoBundle();
             message.putInt("iconSize", GeckoAppShell.getPreferredIconSize());
             message.putString("manifestUrl", manifestUrl);
diff --git a/mobile/android/base/java/org/mozilla/gecko/Tab.java b/mobile/android/base/java/org/mozilla/gecko/Tab.java
index bace159acdeb..dd8d1c24ddc1 100644
--- a/mobile/android/base/java/org/mozilla/gecko/Tab.java
+++ b/mobile/android/base/java/org/mozilla/gecko/Tab.java
@@ -5,7 +5,6 @@
 
 package org.mozilla.gecko;
 
-import java.util.ArrayList;
 import java.util.Map;
 import java.util.concurrent.Future;
 import java.util.regex.Pattern;
@@ -20,10 +19,10 @@ import org.mozilla.gecko.icons.IconDescriptor;
 import org.mozilla.gecko.icons.IconRequestBuilder;
 import org.mozilla.gecko.icons.IconResponse;
 import org.mozilla.gecko.icons.Icons;
+import org.mozilla.gecko.pwa.PwaUtils;
 import org.mozilla.gecko.reader.ReaderModeUtils;
 import org.mozilla.gecko.reader.ReadingListHelper;
 import org.mozilla.gecko.toolbar.BrowserToolbar.TabEditingState;
-import org.mozilla.gecko.toolbar.PageActionLayout;
 import org.mozilla.gecko.util.GeckoBundle;
 import org.mozilla.gecko.util.ShortcutUtils;
 import org.mozilla.gecko.util.ThreadUtils;
@@ -38,7 +37,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
 
 import static org.mozilla.gecko.toolbar.PageActionLayout.PageAction.UUID_PAGE_ACTION_PWA;
 
@@ -486,7 +484,7 @@ public class Tab {
         }
 
         if (mManifestUrl != null) {
-            showPwaPageAction();
+            showPwaBadge();
 
         } else {
             clearPwaPageAction();
@@ -868,14 +866,16 @@ public class Tab {
         return mShouldShowToolbarWithoutAnimationOnFirstSelection;
     }
 
+
     private void clearPwaPageAction() {
         GeckoBundle bundle = new GeckoBundle();
         bundle.putString("id", UUID_PAGE_ACTION_PWA);
         EventDispatcher.getInstance().dispatch("PageActions:Remove", bundle);
     }
 
-    private void showPwaPageAction() {
-        if (!isPrivate()) {
+
+    private void showPwaBadge() {
+        if (PwaUtils.shouldAddPwaShortcut(this)) {
             GeckoBundle bundle = new GeckoBundle();
             bundle.putString("id", UUID_PAGE_ACTION_PWA);
             bundle.putString("title", mAppContext.getString(R.string.pwa_add_to_launcher_badge));
diff --git a/mobile/android/base/java/org/mozilla/gecko/pwa/PwaUtils.java b/mobile/android/base/java/org/mozilla/gecko/pwa/PwaUtils.java
new file mode 100644
index 000000000000..d12630d505ab
--- /dev/null
+++ b/mobile/android/base/java/org/mozilla/gecko/pwa/PwaUtils.java
@@ -0,0 +1,31 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+package org.mozilla.gecko.pwa;
+
+import android.support.annotation.CheckResult;
+
+import org.mozilla.gecko.Tab;
+
+
+public class PwaUtils {
+    /**
+     * Check if this tab should add as PWA shortcut
+     * From the document :https://developers.google.com/web/fundamentals/security/encrypt-in-transit/why-https
+     * PWA must be served from a secure origin. We also restrict it to
+     * 1. Not allow user accept exception
+     * 2. The tab can't be a private tab.
+     *
+     * @param tab Since website info is in the tab, we pass the tab here.
+     * @return true if the tab shouldAddPwaShortcut
+     */
+    @CheckResult
+    public static boolean shouldAddPwaShortcut(Tab tab) {
+        final boolean secure = tab.getSiteIdentity().isSecure();
+        // This tab is safe for pwa only when the site is absolutely secure.
+        // so no exception is allowed
+        final boolean exception = tab.getSiteIdentity().isSecurityException();
+        return !tab.isPrivate() && secure && !exception;
+    }
+}
diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/PageActionLayout.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/PageActionLayout.java
index 2b73697319a6..f189664ca384 100644
--- a/mobile/android/base/java/org/mozilla/gecko/toolbar/PageActionLayout.java
+++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/PageActionLayout.java
@@ -11,6 +11,9 @@ import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.preferences.GeckoPreferences;
+import org.mozilla.gecko.pwa.PwaUtils;
+import org.mozilla.gecko.util.DrawableUtil;
+import org.mozilla.gecko.util.ResourceDrawableUtils;
 import org.mozilla.gecko.util.BundleEventListener;
 import org.mozilla.gecko.util.DrawableUtil;
 import org.mozilla.gecko.util.EventCallback;
@@ -164,7 +167,7 @@ public class PageActionLayout extends ThemedLinearLayout implements BundleEventL
     private void maybeShowPwaOnboarding(String id) {
         // only show pwa at normal mode
         final Tab selectedTab = Tabs.getInstance().getSelectedTab();
-        if (selectedTab.isPrivate()) {
+        if (!PwaUtils.shouldAddPwaShortcut(selectedTab)) {
             return;
         }
         if (UUID_PAGE_ACTION_PWA.equals(id)) {
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 2e94fce755d2..5060a038a44b 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -833,6 +833,7 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'prompts/PromptListItem.java',
     'prompts/PromptService.java',
     'prompts/TabInput.java',
+    'pwa/PwaUtils.java',
     'reader/ReaderModeUtils.java',
     'reader/ReadingListHelper.java',
     'reader/SavedReaderViewHelper.java',

From 9d786faef50d7d109e095765731ee849abfb8aed Mon Sep 17 00:00:00 2001
From: Nevin Chen <cnevinchen@gmail.com>
Date: Mon, 4 Dec 2017 16:07:57 +0800
Subject: [PATCH 157/219] Bug 1421916 - Refine/update PWA action icon r=maliu

MozReview-Commit-ID: 7gndnFFHezm

--HG--
extra : rebase_source : eb804561083aaf2c210523fe346e80712666e5d1
---
 .../res/drawable-xhdpi/add_to_homescreen.png   | Bin 494 -> 610 bytes
 .../res/drawable-xxhdpi/add_to_homescreen.png  | Bin 707 -> 871 bytes
 .../res/drawable-xxxhdpi/add_to_homescreen.png | Bin 667 -> 1091 bytes
 .../photon/res/drawable/add_to_homescreen.png  | Bin 561 -> 423 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/mobile/android/app/src/photon/res/drawable-xhdpi/add_to_homescreen.png b/mobile/android/app/src/photon/res/drawable-xhdpi/add_to_homescreen.png
index e3a0f110d930b312c0191d15b07cb520ee9ac353..a902ec3925f6f8721908223a2649f58af78c3d36 100644
GIT binary patch
delta 586
zcmV-Q0=50_1L6dbBYy%ZNkl<ZcmeF0gRfjc6vk`Yjq1C5Sv-duXTu__@mJJtRNJ;0
z)(C6cwykgKPG&PFxjOsap5)uBbMAh>>zOH+i_#h+MvSQ7d0w$;nq6$$Zl6`=VYo^%
zncS90B)<I?mZxT|dHxW3^ZX%X^K=OQm(52F1nVQe3s0g}n17ztK=3qQQc_Y~<T;Mh
zR0F}+ya);eYx7hH*5;`Ytj$v)SevIpur^PHU~QfX!P-0(g0*=G;+%g7!nY08JaW52
zd!W9Qe8Vu3^bbI~d3i^VMII60{;#_CsZ^>GA-^I0E0%8F55Sw>b$NMtHT(j|5PI{h
z05lNTFf&8JgMXL-9%X>&BLlopJ#CP<F=l|t&{+k*dKuuD>QN~Y;{?FEajN%(X_}Md
zd!Pf7PhsObOc(!tRO$e*+zq+}-Iay>ufOXuY`+Ti*8%+Vp4b7shxQi~6f`TR4-&vp
zvEGMnX#q6h7hsSd0Mt*26+i^8@4BXGHkbA9Jzy9{YkzsW>$>$tee3}KZ{i$44xn@b
zAphB~x-a5eD;oiZApaGnljLpu0p!R5lvM!iWU1UHPN&mV!vJtySJfsS?DwdQR2-E-
zVT@{GzY7%rJ^c0!6=wJdI|R*z=J=IqnhP*Jsp<jA%gbvN#I?CX0TH$Y!0@2D7aNEM
zNW|ukNJCvQzRyBSXir4uSBZmGF6j97?OS=%GzZ`h_CikrH2oEN0PV0W>-+o}h7cG9
Y09olNN;Ai>S^xk507*qoM6N<$f@s<pYybcN

delta 469
zcmV;`0V@9D1nvWnBYy$4Nkl<ZcmeI0foA(q6vm6c0)2qL!9bfxB<uwiz#d>Pusy=c
zU{ElyM;Hdc@)ToxjACPeVS$b6c0Ll~xLXqaa^}`O9Jgt2zVrRsd()FlLhN6J2oYkj
zSj?g*DkUq7IQGr_lZ;<Y*2gn1&1(oR&1(ps%ztno?9IdIV}G9K2N($u_U0Rd7)cQJ
z<`G;7d-Dbm2Ilp-h7f!MrV#wXd@X)KTTOl;zBa!A^0})(9LN9V+>10#v#uJ@>ww_)
zHuL%Xy2tqswUM_ZNv6Neg&wtc(&in)t1b<h^V-bEuhB7gMQH%Fd2;{)1jI_$nl}b;
z?TNB4K&9!iMt>~<P|tB!SM>$B*X@BW&<21x$xFP~O3Z(6&A(BfUA3=HE`8lQ!B;PU
zqA31lS$2fP>z@kftId$qS0}f=+sp9yLjYPBE+KmW{w59p0boA>bTj82fNrO~10d@M
zfTj8;y=Ce{PXR2c0I~^B91m?zu{n3tokB+pf422ek4_DMLTiW{<XU|(v}JTG;@gqU
zZ&7E=hg;|BhKH85?%8DQkV1!&cT(&{a<ilH4RoLf-QjLRgb48s>B2qujLktf00000
LNkvXXu0mjfOn~Aa

diff --git a/mobile/android/app/src/photon/res/drawable-xxhdpi/add_to_homescreen.png b/mobile/android/app/src/photon/res/drawable-xxhdpi/add_to_homescreen.png
index 039c4ae00d07962a831fddbb74404da2f968dc85..f1bc30f139a6ce86fa4c1b45911f1e3e8f1fe481 100644
GIT binary patch
delta 849
zcmV-X1FrnT1?L8kBYy)fNkl<ZcmeF%1FRiQ6bJD8eYI^Hi+4A*jkvZIm0`o$w(T~o
zZQHhO`#;H>VzZsQJuiFTZf8z%-sR|bHFzN@LWK$y-@bkO&$6uSx~>;1TC`~1E?v4L
zQYx`grc9aCMT!*JiTuVBNcS{N3o9Jp0AoLgu^~ONBPkq(B!9+HNMam?WXDlR0vv@z
zz`=7~5s;+8IgNp5#pOJ=NK)aLrkR<Q>D#yO{{$pCa9B`~B*LL1NrXd3k_d;6BoPiB
zNh%yVk~BDUB#Ch7ND|@DktD*QBT0lqN0JDKjwBHd9Z3QlA0QEMZpRe|<@1HZ;k0o?
zT0ubaew(ydv43JcsqIv)S~Vf+SQFd%52&jRwJu%Pa}l<0J;mWb9jR@hod&l0p0VR-
z;=3>>X^)$Z<2?|2_u1<!QKCc|4}b(n1RNQF#7K0UpaRj6P;m;5BO?$;LK==0;|Y^o
zRPZq1K#yFE@q*(I1k;N&2}F(xIM4w%lS%ef;{^0N(tivY0~ru>AU88^$H^+6fr^$7
z{{oPUWyyoajT<Kj*&`+<CI<>#vf&)zI0PX6#Xo@|BQFT@fkS<lB9z&O=QN`LaU|TH
zVH@uoWSu|iLoTtVX{C^LkYO%K1wvyZ*kc~%7qqKWfOr^&kso!`LRO})1BpPmf3wFx
zEL+ln#DC#A5bo>cB@X*{83qzqAU2=CAlf14A{Ptth{NDlL?|;+*L9P%<4Yj_|B5Lf
z1*Cu!kOERb3djdQDBr`O&QuEMCr~xpB=I`CUjhA&)E_WUad{S(<rUChh5}MR3P=Ir
z%d?+gZ>EbMfY6V;f<Er|y76v;S7(eLfHY03D}Ml5<@HCbz5wW<Wm%bg@DAD__!^kv
zb>kV(&}YFbbP`#fZT830M{AjAi?(?2;!Qm72pZbrVz2lO@@^FKDQ{blZ;`2@@k&);
z4F)aI@4=yH1$!$84CgvKZ;$3&BLx~h9uS<@{Pcq!#4l{*cAw+iVJF3*_=*xGN+d!j
zdP<`+&wYmT1^t=>oU9?AOwPVf2-K1W;w?bO-38ScbWSP1f%Fp~J_5uwK)xEoU<adM
b6pR7@gBMOZ7*b*%00000NkvXXu0mjffPi_x

delta 684
zcmV;d0#p6x2EzrABYy&lNkl<ZcmeI&HLw*i6b9hnZWRvY^<CVpqsOhL!lA@nYuu&7
z-KlWxaCdiy<quBgt=z-T%Vu)^ne+T5XTNKi<ch?G!{Kl^91e%WNvG3;Q8!Yl)H{6M
z;<|1_@jHw&9x$F#S2LMRQ=x=$e2^H2fW$Zo65}wEg2PBf<9}Sm-^?Q**@2VG<(dct
z0OM##7U0Oxku1TXBUyw)N3sZqj${!I9mygbI+8^=bR>&#=tvgf(2*>{p(9y@Lr1a*
zhmNEl=Pm`OWy_Yea3L+ab?a8yC?vvuP9MSrcESI>KzW$sn&UW)M3IpQT9G2+$P4U7
z82f-S#vH;Jhkvwfy7}Y826RCgV_p0}bR;^CnLu<TI*xHbL?q=nIAnsih6BlYF6MH%
zid3K*Asg&R3;|jigp|!@n+r<t&+md3fwCbJfMh>GPZhY9PSktQ7C)S@hDurl;{Q6z
z-<4GOznjW9`~3bE<Frv1lTrE!Kx!Z;k#9l4pr`+u=zp}tiPVtKA~2>>7L(EY!PjF@
zAAbJ)19}@F{wJR2mBFo5U6%a1*oM?aV9ZE!DE;*A-MgZ^N24l;xMMDmhM4sb(-5<s
zq&38(mw7=C12GT-F%SbW5Pi#)f&4e^87TbNhk^XVKn%n{TYVbpuc@C4KK-=R1+>6t
zJ7TAXUVqwS-mgA;&h>Nw4G7q?S(QSRUC7wewr$&*n5H*+x#xGRBXmW+ETe%}{z&>O
zlgUic{SLDUNyR~LPYZ=Y9icOFQHN%ZB@pN<fO?7~B$LV1M?>clg!2VBLq(F}I8HS*
zwFu39){Ju*eRLN|O+KH`puy>=Q>e$K0P-I5TqQ$o$Y!&H{yyvCa5x+ehw}|uMH4M-
SBA3<x0000<MNUMnLSTZQ^Gdb=

diff --git a/mobile/android/app/src/photon/res/drawable-xxxhdpi/add_to_homescreen.png b/mobile/android/app/src/photon/res/drawable-xxxhdpi/add_to_homescreen.png
index fe58c67b86fe8d704062ca421538ff7f84d6eed5..1bf1d284feab75e54ca6541654215693b78ac79f 100644
GIT binary patch
literal 1091
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VBzv~aSW+od^?wU!jmY8*7uup
zqhG!{v&Veir3D`XDz@d`-gbT4_AN`d0vWyM=0#hd;LBf?=l?I~+{$08ODp$X^ZlpN
zwMe6D(V`W*-|c!mWzCv3#h*TXI;W?lWff@Jqj9}df8W<@(ZBB&oz{)3eDKlki2wb%
z-)}#5dCgDw_SB$i-u*vX3Rd=CE;y@SSSfHuoT2d<cZ0)cR)+;YnG`P6FbZVsW92Z3
zXJDD7FT!-z{b%nETM<5%S^Iy9z1Vg;uUbn5C^=Qr1){{CgXxSq3*$54CWg<PjtxIs
z6b{rl2_)>Z<uI8qz%m1?^oATeMGga0Y1YsDOAgmuFJ14vIsU*Jd70xoZF!6Tdbr%1
z*t%rp(M$<%vtyesUq9}6#QD^s3;)h8RIiUTxPSR;4)X`uMNj&l3NidpykQ>C*I;V;
zb?VHSmFrj->Nvig6=z_0o3~=+dSDQ7FJ<`P%yF`Y>4Wozd^^S)?E)uim^Sb`%9r*X
z+WfZ6hrv#N*7fa7e{2()XLBmt=(1E+Rt^kb?%kXdx8vut+4uXc8TMqx^DrGOoD=@~
zRZ0DXT<aaRI`0^SI*-hB+$Ov5?s=eS-2~ojcLo863A`1*goCf=9|&LeOrE!afk$yk
zz(2Rp*<D>-ey$5AZVichX?$ObVb465oqio3ci3N43HauqTkC6@%Y5;6;hdn^3|lTd
zo4g|W_K$rlr|)TFm}Eaq@}1%~g{Z}gy+u=m9gJq~5lt;q-ZMdo_3*n*oD0_EDaJ`h
ze49P%(A$)XUmaXp=Rfxa+udYqxGweDNb$JBZH7PpUItuCk#`7ZWLS2CJwb_);Y)wm
z4F-dK^OLv_Z2x5^BGmAXm6dh*QK<&8Q*)Pof4wMYnr8y*zNOPb(^h)cI_ziOF22IZ
zRi5EGBZ~tA8hR<pC~#nl)UR8)FP->U5-z-NH+_?xd)eXUMV1BYr!;Qc@1o<r##z2M
z_PT8|!x_dCVvGU|Fyv7C^38Wio}yY2MvK15>630uojSF2(ig|7b+6+jO&KbR_of+a
z=hgCg__%y);=8l=19$tW9<#Zekasy`#-+@1tK?fxG=%1ES+!)fj=5NIR`!hWD_)2C
zLq9V_X4IC{*(k|>->kxVEWGD7e}VP!61y44ZH4OAczsQHB-XGsvOa3bpHyivX9jt%
z->0W_P5gQK3;)(Ft*5se8rI7%3h)fRX}{>6A;X6?leE@w`(3ME)))Bsds3di`_n%c
z^TRC{hh9k*d=|W5kxFgA{5WNWZ|*mKeC^o&RXy4@^p{Rp!v~8+(n&!#Z?5C>{L^*t
r#xw;t#eeNDRZ}CyL|g+!Qe)d0dA68wUuxC`6%GuZu6{1-oD!M<`FQ8D

literal 667
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#z0(?STfwY#EmO2<{Yin!3fTpG<
zgb9=ZGJsqN1IRWuHioGJ(fa!OKoTMgHU>n%6+lEF3V`MVxj#1kI|Z~=wIs+dn8EzR
zM>FFypCr}Ry<d_Yx_gsI`t3*`>6?FMJ^s7x^ShjXTZN^Bb~fy8Vqjq0?CIhdQW5v|
z`t7_|1_G@Q3m4q>bFz5mvEa*wzyH?XXyTc;$weZ%c~w~4_67eZOXvyx%IyXMZ{xL_
zzf?AOz4`v>XYucAYM-Bfbrg8ltZ;|jaR+}>fjrAkJFZWERTv$&*av5^HD%1_V0mcA
zai~^c$!`sh?|~EEEmpYe?zpSJsYIUjr5)F$S`l=Ka{Iu#`1#)713$cqev@CmzMGdr
zj3w@V(>|Nc+6lTGd+eBAcV{y&G+uXqaG$keCew$48~p462kI;un7%nPPMhE~pTA*(
zke;+1A8VU%TFd3b6P+3#c2qHWh_o^-nZ&8E`|IJx*%Jiy&YpKzm%)=${_WhSqiHM_
zivH?xkB=X?<d<X0)OPAF<A!a)#>x!elpTKfACZ>(*;}1*Z_mGFMh+}W0*o~ugxEe@
z3=})i9-qkYUA%!qMmC}1z;b32=?s~GPYstCd8I8Z68_I;u6ZN-;T#)RwW!x;4uhv#
z^SR9ewwop7`o1Yuba4M8`IbM!S#EVz{DSo-veo?;+E0A0^_KZX*PirU)3~?HT{z+D
o(S??FOnqk;u2^neSXda(xlY_IcDj==FuoZ)UHx3vIVCg!00qGUrT_o{

diff --git a/mobile/android/app/src/photon/res/drawable/add_to_homescreen.png b/mobile/android/app/src/photon/res/drawable/add_to_homescreen.png
index a80852f514829d0dbbb9f1d7f48aa9a66806afc0..d2b30e1b7b55276cdde9d01dd2ed5fb177f15bae 100644
GIT binary patch
delta 398
zcmV;90dfAZ1g8U#BYy#INkl<ZcmZP=R6tWxGet{Ft4Cj7Uz(~0|NsA=QC(eqHW2@Z
z;wM1MRB2`SKV(a&YPg1m#sXjvIRojh$d*ve@P>v4CXgJE?}%;*bqt3BJeE*yI6+G&
zH=M8~#HN<R=!Wa+>Iwo4b3oS%6mtWr{|nXk5@ZP>!~X*nm49O~s04_AhlYkSBa2&F
zT5=-vB7B0ZaSD>;d#D9vSS+Xl$r&3Pv*NM<sOCG&5(ftd9#}YjfQ31bzDA)1MX)&0
z)6-Ljg{_jdwzerK%+W0XvbO>?d<J14`v*u4iT@s`&I{QBP(}omRX}+wtO*3&0-(Yu
zAnpNSP{czm=zoLqJAe+8L$?5LQY9ydhJXbKxe%ZwS3${|$`)V(N-VetjmSn~EdU0Y
z2$BW1cohQ;UINP~Kz0HU`{2Vsb$&p+3RW2bQ<V^23v_gJ^ne<Ff;5ndK_vpQmAeH{
s@j;-bZ$uh?2dJkOSTwLO&>H{%GUr4WmpRWb00000Ne4wvM6N<$f{CS`Y5)KL

delta 537
zcmV+!0_Odv1F-~<BYyw^b5ch_0Itp)=>Px$>q$gGR7ef&R6R(;KorhTGl=Mtf}5Mr
z(x!-XP;h8*5D^!lf<xWi#X%4{IElN1qeH+h1rZf=baS#lse|Ak4xt@v*V_0!n>(&)
z+N9zlc<^%X@B3cz?p-A5e+6_v4T$q_JRV<+Mx&3AWHy_<tbf&N4iAn{LKPtLZnt|2
z9vw1o+x8ral)@AVEFh3igZvsY14)N1q9A$b63Jy*HdCq8hN38|0JI#(*)EsM=eb;N
z<V(uK*uCV2VdRU&;wR;gih22b3xpvElS9P@3WNm`I81I||6ITwuu~8lJzr*RaS4xg
zUGFrT%~!G;jeo`)#`Xj1I>hihcz(#j+e{J|hiZxB<io-4!cSy;Q63rCJM7>Kg#zd0
z3W6o%(J0;%;0NmonD6N_O>=?aBTT`5h!NCqq3Y0Am_HVaoj^~MjhC3fwgq1rI!)9O
zxgoULnx@f(%&V&U(sM}?FHo=7&&UaI24EH+Yp+x))PJr65yT6KPEkkUJ!YeL8~TOE
zmtk?gou7eU@Hc#86~LsNqJ3B66b@{WNM>2qzG#Qh{l4Jc1tt@T#Ox>%_eV!RKUxge
zv)t#vuL3QQap@kgFZE>x7?DV1ty-<#c+&>H0DX2a$D2qjLRwyc$99najQg|WNAAh}
bqvjWJ!V>B{T#_-A00000NkvXXu0mjfzZm^H


From fb207e4f8a189afe0934d28f602bd523919b6504 Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Mon, 4 Dec 2017 16:29:35 +1300
Subject: [PATCH 158/219] Bug 1422662 - Move BaseMediaResource::Close() into
 MediaResource class. r=jwwang

For the project to export Gecko's media stack and import it into Servo,
I need a way to shutdown an abstract MediaResource. So I'd like to move
BaseMediaResource::Close() up into MediaResource class.

MozReview-Commit-ID: 9JmxJPs02PN

--HG--
extra : rebase_source : e61cc1a3a79b3e4ca7e9fa86a602e6e26044e247
---
 dom/media/BaseMediaResource.h                | 5 -----
 dom/media/MediaResource.h                    | 5 +++++
 dom/media/mediasource/SourceBufferResource.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dom/media/BaseMediaResource.h b/dom/media/BaseMediaResource.h
index 28a7d9007892..1fdfb6dd75cb 100644
--- a/dom/media/BaseMediaResource.h
+++ b/dom/media/BaseMediaResource.h
@@ -29,11 +29,6 @@ public:
     nsIChannel* aChannel,
     bool aIsPrivateBrowsing);
 
-  // Close the resource, stop any listeners, channels, etc.
-  // Cancels any currently blocking Read request and forces that request to
-  // return an error.
-  virtual nsresult Close() = 0;
-
   // Pass true to limit the amount of readahead data (specified by
   // "media.cache_readahead_limit") or false to read as much as the
   // cache size allows.
diff --git a/dom/media/MediaResource.h b/dom/media/MediaResource.h
index 097cb0c0e4a1..a23ba4e55ef9 100644
--- a/dom/media/MediaResource.h
+++ b/dom/media/MediaResource.h
@@ -56,6 +56,11 @@ public:
   NS_METHOD_(MozExternalRefCountType) AddRef(void);
   NS_METHOD_(MozExternalRefCountType) Release(void);
 
+  // Close the resource, stop any listeners, channels, etc.
+  // Cancels any currently blocking Read request and forces that request to
+  // return an error.
+  virtual nsresult Close() { return NS_OK; }
+
   // These methods are called off the main thread.
   // Read up to aCount bytes from the stream. The read starts at
   // aOffset in the stream, seeking to that location initially if
diff --git a/dom/media/mediasource/SourceBufferResource.h b/dom/media/mediasource/SourceBufferResource.h
index 4fd0e5060134..a647485c8187 100644
--- a/dom/media/mediasource/SourceBufferResource.h
+++ b/dom/media/mediasource/SourceBufferResource.h
@@ -31,7 +31,7 @@ class SourceBufferResource final : public MediaResource
 {
 public:
   SourceBufferResource();
-  nsresult Close();
+  nsresult Close() override;
   nsresult ReadAt(int64_t aOffset,
                   char* aBuffer,
                   uint32_t aCount,

From 33f3ce5cd671ed9adf9af30b7f2ffd3ba8903568 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 16 Nov 2017 17:58:37 +0800
Subject: [PATCH 159/219] Bug 1417837 - Part 1: De-scope about:reader style
 sheets. r=Gijs

MozReview-Commit-ID: 8C65ljtFDrh

--HG--
extra : rebase_source : 442d8cbaf7f7252b6b6393845d2d09e265678ae9
---
 mobile/android/themes/core/aboutReader.css    | 406 +++++++++++++
 .../themes/core/aboutReaderContent.css        | 114 ----
 .../themes/core/aboutReaderControls.css       | 292 ---------
 mobile/android/themes/core/jar.mn             |   4 -
 .../components/narrate/NarrateControls.jsm    |   6 +-
 .../printing/content/simplifyMode.css         |   8 +-
 .../reader/content/aboutReader.html           |  12 -
 toolkit/content/browser-content.js            |   6 -
 toolkit/themes/shared/aboutReader.css         | 573 ++++++++++++++++++
 toolkit/themes/shared/aboutReaderContent.css  | 178 ------
 toolkit/themes/shared/aboutReaderControls.css | 394 ------------
 toolkit/themes/shared/jar.inc.mn              |   5 +-
 toolkit/themes/shared/narrate.css             | 187 ++++++
 toolkit/themes/shared/narrateControls.css     | 186 ------
 14 files changed, 1172 insertions(+), 1199 deletions(-)
 delete mode 100644 mobile/android/themes/core/aboutReaderContent.css
 delete mode 100644 mobile/android/themes/core/aboutReaderControls.css
 delete mode 100644 toolkit/themes/shared/aboutReaderContent.css
 delete mode 100644 toolkit/themes/shared/aboutReaderControls.css
 delete mode 100644 toolkit/themes/shared/narrateControls.css

diff --git a/mobile/android/themes/core/aboutReader.css b/mobile/android/themes/core/aboutReader.css
index 2df2d1ff6206..32f52080c04d 100644
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -118,3 +118,409 @@ body.dark > .container > .content blockquote {
   color: #aaaaaa !important;
   border-left-color: #777777 !important;
 }
+
+#reader-message {
+  margin-top: 40px;
+  display: none;
+  text-align: center;
+  width: 100%;
+  font-size: 0.9em;
+}
+
+.header {
+  text-align: start;
+  display: none;
+}
+
+.domain,
+.credits {
+  font-size: 0.9em;
+  font-family: sans-serif;
+}
+
+.domain {
+  margin-top: 10px;
+  padding-bottom: 10px;
+  color: #00acff !important;
+  text-decoration: none;
+}
+
+.domain-border {
+  margin-top: 15px;
+  border-bottom: 1.5px solid #777777;
+  width: 50%;
+}
+
+.header > h1 {
+  font-size: 1.33em;
+  font-weight: 700;
+  line-height: 1.1em;
+  width: 100%;
+  margin: 0px;
+  margin-top: 32px;
+  margin-bottom: 16px;
+  padding: 0px;
+}
+
+.header > .credits {
+  padding: 0px;
+  margin: 0px;
+  margin-bottom: 32px;
+}
+
+/*======= Controls toolbar =======*/
+
+.toolbar {
+  font-family: sans-serif;
+  position: fixed;
+  width: 100%;
+  left: 0;
+  margin: 0;
+  padding: 0;
+  bottom: 0;
+  list-style: none;
+  pointer-events: none;
+  transition: opacity 420ms linear;
+}
+
+.toolbar > * {
+  float: right;
+}
+
+.button {
+  width: 56px;
+  height: 56px;
+  display: block;
+  background-position: center;
+  background-size: 26px 16px;
+  background-repeat: no-repeat;
+  background-color: #0979D9;
+  border-radius: 10000px;
+  margin: 20px;
+  border: 0;
+  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
+}
+
+.button:active {
+  background-color: #086ACC;
+}
+
+/* Remove dotted border when button is focused */
+.button::-moz-focus-inner,
+.dropdown-popup > div > button::-moz-focus-inner {
+  border: 0;
+}
+
+.button[hidden],
+.toolbar[hidden] {
+  display: none;
+}
+
+.dropdown-toggle,
+#reader-popup {
+  pointer-events: auto;
+}
+
+.dropdown {
+  left: 0;
+  text-align: center;
+  display: inline-block;
+  list-style: none;
+  margin: 0px;
+  padding: 0px;
+}
+
+/*======= Font style popup =======*/
+
+.dropdown-popup {
+  position: absolute;
+  left: 0;
+  width: calc(100% - 30px);
+  margin: 15px;
+  z-index: 1000;
+  background: #EBEBF0;
+  visibility: hidden;
+  border: 0;
+  border-radius: 4px;
+  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
+  -moz-user-select: none;
+}
+
+/* Only used on desktop */
+.dropdown-popup > hr,
+.dropdown-arrow,
+#font-type-buttons > button > .name,
+#content-width-buttons,
+#line-height-buttons {
+  display: none;
+}
+
+.open > .dropdown-popup {
+  visibility: visible;
+  bottom: 0;
+}
+
+#font-type-buttons,
+#font-size-buttons,
+#color-scheme-buttons {
+  display: flex;
+  flex-direction: row;
+}
+
+#font-type-buttons > button,
+#color-scheme-buttons > button {
+  text-align: center;
+}
+
+#font-type-buttons > button,
+#font-size-buttons > button {
+  width: 50%;
+  background-color: transparent;
+  border: 0;
+}
+
+#font-type-buttons > button {
+  font-size: 24px;
+  color: #AFB1B3;
+  padding: 15px 0;
+}
+
+#font-type-buttons > button:active,
+#font-type-buttons > button.selected {
+  color: #222222;
+}
+
+#font-size-sample {
+  flex: 0;
+  font-size: 24px;
+  color: #000000;
+  margin: 0 30px;
+  padding: 0 10px;
+}
+
+.serif-button {
+  font-family: serif;
+}
+
+.minus-button,
+.plus-button {
+  background-color: transparent;
+  border: 0;
+  height: 60px;
+  background-size: 18px 18px;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+.minus-button {
+  background-size: 24px 6px;
+  margin-left: 50px;
+  padding: 0 5px;
+}
+
+.plus-button {
+  background-size: 24px 24px;
+  margin-right: 50px;
+  padding: 0 5px;
+}
+
+#color-scheme-buttons > button {
+  width: 33%;
+  border-radius: 4px;
+  border: 1px solid #BFBFBF;
+  padding: 10px;
+  margin: 15px 10px;
+  font-size: 14px;
+}
+
+#color-scheme-buttons > button:active,
+#color-scheme-buttons > button.selected {
+  border: 2px solid #0A84FF;
+}
+
+.dark-button {
+  color: #eeeeee;
+  background-color: #333333;
+}
+
+.auto-button {
+  color: #000000;
+  background-color: transparent;
+}
+
+.light-button {
+  color: #333333;
+  background-color: #ffffff;
+}
+
+/*======= Toolbar icons =======*/
+
+/* desktop-only controls */
+.close-button {
+  display: none;
+}
+
+.style-button {
+  background-image: url('chrome://browser/skin/images/reader-style-icon-hdpi.png');
+}
+
+.minus-button {
+  background-image: url('chrome://browser/skin/images/reader-minus-hdpi.png');
+}
+
+.plus-button {
+  background-image: url('chrome://browser/skin/images/reader-plus-hdpi.png');
+}
+
+@media screen and (min-resolution: 2dppx) {
+  .style-button {
+    background-image: url('chrome://browser/skin/images/reader-style-icon-xhdpi.png');
+  }
+
+  .minus-button {
+    background-image: url('chrome://browser/skin/images/reader-minus-xhdpi.png');
+  }
+
+  .plus-button {
+    background-image: url('chrome://browser/skin/images/reader-plus-xhdpi.png');
+  }
+}
+
+@media screen and (min-resolution: 3dppx) {
+  .style-button {
+    background-image: url('chrome://browser/skin/images/reader-style-icon-xxhdpi.png');
+  }
+
+  .minus-button {
+    background-image: url('chrome://browser/skin/images/reader-minus-xxhdpi.png');
+  }
+
+  .plus-button {
+    background-image: url('chrome://browser/skin/images/reader-plus-xxhdpi.png');
+  }
+}
+
+@media screen and (min-width: 960px) {
+  .dropdown-popup {
+    width: 350px;
+    left: auto;
+    right: 0;
+  }
+}
+
+/*======= Article content =======*/
+
+/* Note that any class names from the original article that we want to match on
+ * must be added to CLASSES_TO_PRESERVE in ReaderMode.jsm, so that
+ * Readability.js doesn't strip them out */
+
+#moz-reader-content {
+  display: none;
+  font-size: 1em;
+}
+
+#moz-reader-content a {
+  text-decoration: underline !important;
+  font-weight: normal;
+}
+
+#moz-reader-content a,
+#moz-reader-content a:visited,
+#moz-reader-content a:hover,
+#moz-reader-content a:active {
+  color: #00acff !important;
+}
+
+#moz-reader-content * {
+  max-width: 100% !important;
+  height: auto !important;
+}
+
+#moz-reader-content p {
+  line-height: 1.4em !important;
+  margin: 0px !important;
+  margin-bottom: 20px !important;
+}
+
+/* Covers all images showing edge-to-edge using a 
+   an optional caption text */
+#moz-reader-content .wp-caption,
+#moz-reader-content figure {
+  display: block !important;
+  width: 100% !important;
+  margin: 0px !important;
+  margin-bottom: 32px !important;
+}
+
+/* Images marked to be shown edge-to-edge with an
+   optional captio ntext */
+#moz-reader-content p > img:only-child,
+#moz-reader-content p > a:only-child > img:only-child,
+#moz-reader-content .wp-caption img,
+#moz-reader-content figure img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+/* Account for body padding to make image full width */
+#moz-reader-content img[moz-reader-full-width] {
+  width: calc(100% + 40px);
+  margin-left: -20px;
+  margin-right: -20px;
+  max-width: none !important;
+}
+
+/* Image caption text */
+#moz-reader-content .caption,
+#moz-reader-content .wp-caption-text,
+#moz-reader-content figcaption {
+  font-size: 0.9em;
+  font-family: sans-serif;
+  margin: 0px !important;
+  padding-top: 4px !important;
+}
+
+/* Ensure all pre-formatted code inside the reader content
+   are properly wrapped inside content width */
+#moz-reader-content code,
+#moz-reader-content pre {
+  white-space: pre-wrap !important;
+  margin-bottom: 20px !important;
+}
+
+#moz-reader-content blockquote {
+  margin: 0px !important;
+  margin-bottom: 20px !important;
+  padding: 0px !important;
+  padding-inline-start: 16px !important;
+  border: 0px !important;
+  border-left: 2px solid !important;
+}
+
+#moz-reader-content ul,
+#moz-reader-content ol {
+  margin: 0px !important;
+  margin-bottom: 20px !important;
+  padding: 0px !important;
+  line-height: 1.5em;
+}
+
+#moz-reader-content ul {
+  padding-inline-start: 30px !important;
+  list-style: disc !important;
+}
+
+#moz-reader-content ol {
+  padding-inline-start: 35px !important;
+  list-style: decimal !important;
+}
+
+/* Hide elements with common "hidden" class names */
+#moz-reader-content .visually-hidden,
+#moz-reader-content .visuallyhidden,
+#moz-reader-content .hidden,
+#moz-reader-content .invisible,
+#moz-reader-content .sr-only {
+  display: none;
+}
diff --git a/mobile/android/themes/core/aboutReaderContent.css b/mobile/android/themes/core/aboutReaderContent.css
deleted file mode 100644
index fe6451df2f52..000000000000
--- a/mobile/android/themes/core/aboutReaderContent.css
+++ /dev/null
@@ -1,114 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#moz-reader-content {
-  display: none;
-  font-size: 1em;
-}
-
-a {
-  text-decoration: underline !important;
-  font-weight: normal;
-}
-
-a,
-a:visited,
-a:hover,
-a:active {
-  color: #00acff !important;
-}
-
-* {
-  max-width: 100% !important;
-  height: auto !important;
-}
-
-p {
-  line-height: 1.4em !important;
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-}
-
-/* Covers all images showing edge-to-edge using a 
-   an optional caption text */
-.wp-caption,
-figure {
-  display: block !important;
-  width: 100% !important;
-  margin: 0px !important;
-  margin-bottom: 32px !important;
-}
-
-/* Images marked to be shown edge-to-edge with an
-   optional captio ntext */
-p > img:only-child,
-p > a:only-child > img:only-child,
-.wp-caption img,
-figure img {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-/* Account for body padding to make image full width */
-img[moz-reader-full-width] {
-  width: calc(100% + 40px);
-  margin-left: -20px;
-  margin-right: -20px;
-  max-width: none !important;
-}
-
-/* Image caption text */
-.caption,
-.wp-caption-text,
-figcaption {
-  font-size: 0.9em;
-  font-family: sans-serif;
-  margin: 0px !important;
-  padding-top: 4px !important;
-}
-
-/* Ensure all pre-formatted code inside the reader content
-   are properly wrapped inside content width */
-code,
-pre {
-  white-space: pre-wrap !important;
-  margin-bottom: 20px !important;
-}
-
-blockquote {
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-  padding: 0px !important;
-  padding-inline-start: 16px !important;
-  border: 0px !important;
-  border-left: 2px solid !important;
-}
-
-ul,
-ol {
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-  padding: 0px !important;
-  line-height: 1.5em;
-}
-
-ul {
-  padding-inline-start: 30px !important;
-  list-style: disc !important;
-}
-
-ol {
-  padding-inline-start: 35px !important;
-  list-style: decimal !important;
-}
-
-/* Hide elements with common "hidden" class names */
-.visually-hidden,
-.visuallyhidden,
-.hidden,
-.invisible,
-.sr-only {
-  display: none;
-}
diff --git a/mobile/android/themes/core/aboutReaderControls.css b/mobile/android/themes/core/aboutReaderControls.css
deleted file mode 100644
index 4bfae9cb0da6..000000000000
--- a/mobile/android/themes/core/aboutReaderControls.css
+++ /dev/null
@@ -1,292 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#reader-message {
-  margin-top: 40px;
-  display: none;
-  text-align: center;
-  width: 100%;
-  font-size: 0.9em;
-}
-
-.header {
-  text-align: start;
-  display: none;
-}
-
-.domain,
-.credits {
-  font-size: 0.9em;
-  font-family: sans-serif;
-}
-
-.domain {
-  margin-top: 10px;
-  padding-bottom: 10px;
-  color: #00acff !important;
-  text-decoration: none;
-}
-
-.domain-border {
-  margin-top: 15px;
-  border-bottom: 1.5px solid #777777;
-  width: 50%;
-}
-
-.header > h1 {
-  font-size: 1.33em;
-  font-weight: 700;
-  line-height: 1.1em;
-  width: 100%;
-  margin: 0px;
-  margin-top: 32px;
-  margin-bottom: 16px;
-  padding: 0px;
-}
-
-.header > .credits {
-  padding: 0px;
-  margin: 0px;
-  margin-bottom: 32px;
-}
-
-/*======= Controls toolbar =======*/
-
-.toolbar {
-  font-family: sans-serif;
-  position: fixed;
-  width: 100%;
-  left: 0;
-  margin: 0;
-  padding: 0;
-  bottom: 0;
-  list-style: none;
-  pointer-events: none;
-  transition: opacity 420ms linear;
-}
-
-.toolbar > * {
-  float: right;
-}
-
-.button {
-  width: 56px;
-  height: 56px;
-  display: block;
-  background-position: center;
-  background-size: 26px 16px;
-  background-repeat: no-repeat;
-  background-color: #0979D9;
-  border-radius: 10000px;
-  margin: 20px;
-  border: 0;
-  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
-}
-
-.button:active {
-  background-color: #086ACC;
-}
-
-/* Remove dotted border when button is focused */
-.button::-moz-focus-inner,
-.dropdown-popup > div > button::-moz-focus-inner {
-  border: 0;
-}
-
-.button[hidden],
-.toolbar[hidden] {
-  display: none;
-}
-
-.dropdown-toggle,
-#reader-popup {
-  pointer-events: auto;
-}
-
-.dropdown {
-  left: 0;
-  text-align: center;
-  display: inline-block;
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-}
-
-/*======= Font style popup =======*/
-
-.dropdown-popup {
-  position: absolute;
-  left: 0;
-  width: calc(100% - 30px);
-  margin: 15px;
-  z-index: 1000;
-  background: #EBEBF0;
-  visibility: hidden;
-  border: 0;
-  border-radius: 4px;
-  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
-  -moz-user-select: none;
-}
-
-/* Only used on desktop */
-.dropdown-popup > hr,
-.dropdown-arrow,
-#font-type-buttons > button > .name,
-#content-width-buttons,
-#line-height-buttons {
-  display: none;
-}
-
-.open > .dropdown-popup {
-  visibility: visible;
-  bottom: 0;
-}
-
-#font-type-buttons,
-#font-size-buttons,
-#color-scheme-buttons {
-  display: flex;
-  flex-direction: row;
-}
-
-#font-type-buttons > button,
-#color-scheme-buttons > button {
-  text-align: center;
-}
-
-#font-type-buttons > button,
-#font-size-buttons > button {
-  width: 50%;
-  background-color: transparent;
-  border: 0;
-}
-
-#font-type-buttons > button {
-  font-size: 24px;
-  color: #AFB1B3;
-  padding: 15px 0;
-}
-
-#font-type-buttons > button:active,
-#font-type-buttons > button.selected {
-  color: #222222;
-}
-
-#font-size-sample {
-  flex: 0;
-  font-size: 24px;
-  color: #000000;
-  margin: 0 30px;
-  padding: 0 10px;
-}
-
-.serif-button {
-  font-family: serif;
-}
-
-.minus-button,
-.plus-button {
-  background-color: transparent;
-  border: 0;
-  height: 60px;
-  background-size: 18px 18px;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
-.minus-button {
-  background-size: 24px 6px;
-  margin-left: 50px;
-  padding: 0 5px;
-}
-
-.plus-button {
-  background-size: 24px 24px;
-  margin-right: 50px;
-  padding: 0 5px;
-}
-
-#color-scheme-buttons > button {
-  width: 33%;
-  border-radius: 4px;
-  border: 1px solid #BFBFBF;
-  padding: 10px;
-  margin: 15px 10px;
-  font-size: 14px;
-}
-
-#color-scheme-buttons > button:active,
-#color-scheme-buttons > button.selected {
-  border: 2px solid #0A84FF;
-}
-
-.dark-button {
-  color: #eeeeee;
-  background-color: #333333;
-}
-
-.auto-button {
-  color: #000000;
-  background-color: transparent;
-}
-
-.light-button {
-  color: #333333;
-  background-color: #ffffff;
-}
-
-/*======= Toolbar icons =======*/
-
-/* desktop-only controls */
-.close-button {
-  display: none;
-}
-
-.style-button {
-  background-image: url('chrome://browser/skin/images/reader-style-icon-hdpi.png');
-}
-
-.minus-button {
-  background-image: url('chrome://browser/skin/images/reader-minus-hdpi.png');
-}
-
-.plus-button {
-  background-image: url('chrome://browser/skin/images/reader-plus-hdpi.png');
-}
-
-@media screen and (min-resolution: 2dppx) {
-  .style-button {
-    background-image: url('chrome://browser/skin/images/reader-style-icon-xhdpi.png');
-  }
-
-  .minus-button {
-    background-image: url('chrome://browser/skin/images/reader-minus-xhdpi.png');
-  }
-
-  .plus-button {
-    background-image: url('chrome://browser/skin/images/reader-plus-xhdpi.png');
-  }
-}
-
-@media screen and (min-resolution: 3dppx) {
-  .style-button {
-    background-image: url('chrome://browser/skin/images/reader-style-icon-xxhdpi.png');
-  }
-
-  .minus-button {
-    background-image: url('chrome://browser/skin/images/reader-minus-xxhdpi.png');
-  }
-
-  .plus-button {
-    background-image: url('chrome://browser/skin/images/reader-plus-xxhdpi.png');
-  }
-}
-
-@media screen and (min-width: 960px) {
-  .dropdown-popup {
-    width: 350px;
-    left: auto;
-    right: 0;
-  }
-}
diff --git a/mobile/android/themes/core/jar.mn b/mobile/android/themes/core/jar.mn
index 560bb6f319db..c07c0de67b55 100644
--- a/mobile/android/themes/core/jar.mn
+++ b/mobile/android/themes/core/jar.mn
@@ -15,8 +15,6 @@ chrome.jar:
   skin/aboutMemory.css                      (aboutMemory.css)
   skin/aboutPrivateBrowsing.css             (aboutPrivateBrowsing.css)
   skin/aboutReader.css                      (aboutReader.css)
-  skin/aboutReaderContent.css               (aboutReaderContent.css)
-  skin/aboutReaderControls.css              (aboutReaderControls.css)
   skin/aboutSupport.css                     (aboutSupport.css)
   skin/config.css                           (config.css)
   skin/defines.css                          (defines.css)
@@ -25,8 +23,6 @@ chrome.jar:
 % override chrome://global/skin/about.css chrome://browser/skin/about.css
 % override chrome://global/skin/aboutMemory.css chrome://browser/skin/aboutMemory.css
 % override chrome://global/skin/aboutReader.css chrome://browser/skin/aboutReader.css
-% override chrome://global/skin/aboutReaderContent.css chrome://browser/skin/aboutReaderContent.css
-% override chrome://global/skin/aboutReaderControls.css chrome://browser/skin/aboutReaderControls.css
 % override chrome://global/skin/aboutSupport.css chrome://browser/skin/aboutSupport.css
 % override chrome://global/skin/netError.css chrome://browser/skin/netError.css
 
diff --git a/toolkit/components/narrate/NarrateControls.jsm b/toolkit/components/narrate/NarrateControls.jsm
index 35c2b0bccf99..c202ff627d57 100644
--- a/toolkit/components/narrate/NarrateControls.jsm
+++ b/toolkit/components/narrate/NarrateControls.jsm
@@ -41,13 +41,9 @@ function NarrateControls(mm, win, languagePromise) {
   dropdown.className = "dropdown";
   dropdown.id = "narrate-dropdown";
   // We need inline svg here for the animation to work (bug 908634 & 1190881).
-  // The style animation can't be scoped (bug 830056).
   // eslint-disable-next-line no-unsanitized/property
   dropdown.innerHTML =
-    localize`<style scoped>
-      @import url("chrome://global/skin/narrateControls.css");
-    </style>
-    <li>
+    localize`<li>
        <button class="dropdown-toggle button" id="narrate-toggle"
                title="${"narrate"}" hidden>
          <svg xmlns="http://www.w3.org/2000/svg"
diff --git a/toolkit/components/printing/content/simplifyMode.css b/toolkit/components/printing/content/simplifyMode.css
index 4ad692228304..257acad91b45 100644
--- a/toolkit/components/printing/content/simplifyMode.css
+++ b/toolkit/components/printing/content/simplifyMode.css
@@ -4,9 +4,9 @@
 
 /* This file defines specific rules for print preview when using simplify mode.
  * Some of these rules (styling for title and author on the header element)
- * already exist on aboutReaderControls.css, however, we decoupled it from the
- * original file so we don't need to load a bunch of extra queries that will not
- * take effect when using the simplify page checkbox. */
+ * already exist in aboutReader.css, however, we decoupled it from the original
+ * file so we don't need to load a bunch of extra queries that will not take
+ * effect when using the simplify page checkbox. */
 
 body {
   padding-top: 0px;
@@ -29,4 +29,4 @@ body {
   line-height: 1.48em;
   margin: 0 0 30px 0;
   font-style: italic;
-}
\ No newline at end of file
+}
diff --git a/toolkit/components/reader/content/aboutReader.html b/toolkit/components/reader/content/aboutReader.html
index 53d5a2b47567..635ba6bdb5b5 100644
--- a/toolkit/components/reader/content/aboutReader.html
+++ b/toolkit/components/reader/content/aboutReader.html
@@ -13,9 +13,6 @@
 <body>
   <div id="container" class="container">
     <div id="reader-header" class="header">
-      <style scoped>
-        @import url("chrome://global/skin/aboutReaderControls.css");
-      </style>
       <a id="reader-domain" class="domain"></a>
       <div class="domain-border"></div>
       <h1 id="reader-title"></h1>
@@ -28,24 +25,15 @@
     <hr>
 
     <div class="content">
-      <style scoped>
-        @import url("chrome://global/skin/aboutReaderContent.css");
-      </style>
       <div id="moz-reader-content"></div>
     </div>
 
     <div>
-      <style scoped>
-        @import url("chrome://global/skin/aboutReaderControls.css");
-      </style>
       <div id="reader-message"></div>
     </div>
   </div>
 
   <ul id="reader-toolbar" class="toolbar">
-    <style scoped>
-      @import url("chrome://global/skin/aboutReaderControls.css");
-    </style>
     <li><button id="close-button" class="button close-button"/></li>
     <ul id="style-dropdown" class="dropdown">
       <li><button class="dropdown-toggle button style-button"/></li>
diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js
index c686f86476a5..63116f09cc2e 100644
--- a/toolkit/content/browser-content.js
+++ b/toolkit/content/browser-content.js
@@ -677,12 +677,6 @@ var Printing = {
       contentElement.setAttribute("class", "content");
       containerElement.appendChild(contentElement);
 
-      // Create style element for content div and import aboutReaderContent.css
-      let controlContentStyle = content.document.createElement("style");
-      controlContentStyle.setAttribute("scoped", "");
-      controlContentStyle.textContent = "@import url(\"chrome://global/skin/aboutReaderContent.css\");";
-      contentElement.appendChild(controlContentStyle);
-
       // Jam the article's content into content div
       let readerContent = content.document.createElement("div");
       readerContent.setAttribute("id", "moz-reader-content");
diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
index 36945def6ca9..7b63f56e3e84 100644
--- a/toolkit/themes/shared/aboutReader.css
+++ b/toolkit/themes/shared/aboutReader.css
@@ -163,3 +163,576 @@ body:not(.loaded) .toolbar:-moz-locale-dir(ltr) {
 body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
   transform: translateX(100%);
 }
+
+.light-button {
+  color: #333333;
+  background-color: #ffffff;
+}
+
+.dark-button {
+  color: #eeeeee;
+  background-color: #333333;
+}
+
+.sepia-button {
+  color: #5b4636;
+  background-color: #f4ecd8;
+}
+
+.sans-serif-button {
+  font-family: Helvetica, Arial, sans-serif;
+}
+
+.serif-button {
+  font-family: Georgia, "Times New Roman", serif;
+}
+
+/* Loading/error message */
+
+#reader-message {
+  margin-top: 40px;
+  display: none;
+  text-align: center;
+  width: 100%;
+  font-size: 0.9em;
+}
+
+/* Header */
+
+.header {
+  text-align: start;
+  display: none;
+}
+
+.domain {
+  font-size: 0.9em;
+  line-height: 1.48em;
+  padding-bottom: 4px;
+  font-family: Helvetica, Arial, sans-serif;
+  text-decoration: none;
+  border-bottom: 1px solid;
+  color: #0095dd;
+}
+
+.header > h1 {
+  font-size: 1.6em;
+  line-height: 1.25em;
+  width: 100%;
+  margin: 30px 0;
+  padding: 0;
+}
+
+.header > .credits {
+  font-size: 0.9em;
+  line-height: 1.48em;
+  margin: 0 0 10px 0;
+  padding: 0;
+  font-style: italic;
+}
+
+.header > .meta-data {
+  font-size: 0.65em;
+  margin: 0 0 15px 0;
+}
+
+/*======= Controls toolbar =======*/
+
+.toolbar {
+  font-family: Helvetica, Arial, sans-serif;
+  position: fixed;
+  height: 100%;
+  top: 0;
+  left: 0;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  background-color: #fbfbfb;
+  -moz-user-select: none;
+  border-right: 1px solid #b5b5b5;
+  z-index: 1;
+}
+
+.button {
+  display: block;
+  background-size: 24px 24px;
+  background-repeat: no-repeat;
+  color: #333;
+  background-color: #fbfbfb;
+  height: 40px;
+  padding: 0;
+}
+
+.toolbar .button {
+  width: 40px;
+  background-position: center;
+  margin-right: -1px;
+  border-top: 0;
+  border-left: 0;
+  border-right: 1px solid #b5b5b5;
+  border-bottom: 1px solid #c1c1c1;
+}
+
+.button[hidden] {
+  display: none;
+}
+
+.dropdown {
+  text-align: center;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.dropdown li {
+  margin: 0;
+  padding: 0;
+}
+
+/*======= Popup =======*/
+
+.dropdown-popup {
+  min-width: 300px;
+  text-align: start;
+  position: absolute;
+  left: 48px; /* offset to account for toolbar width */
+  z-index: 1000;
+  background-color: #fbfbfb;
+  visibility: hidden;
+  border-radius: 4px;
+  border: 1px solid #b5b5b5;
+  border-bottom-width: 0;
+  box-shadow: 0 1px 3px #c1c1c1;
+}
+
+.keep-open .dropdown-popup {
+  z-index: initial;
+}
+
+.dropdown-popup > hr {
+  display: none;
+}
+
+.open > .dropdown-popup {
+  visibility: visible;
+}
+
+.dropdown-arrow {
+  position: absolute;
+  top: 30px; /* offset arrow from top of popup */
+  left: -16px;
+  width: 16px;
+  height: 24px;
+  background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg");
+  display: block;
+}
+
+/*======= Font style popup =======*/
+
+#font-type-buttons,
+#font-size-buttons,
+#color-scheme-buttons,
+#content-width-buttons,
+#line-height-buttons {
+  display: flex;
+  flex-direction: row;
+}
+
+#font-type-buttons > button:first-child {
+  border-top-left-radius: 3px;
+}
+#font-type-buttons > button:last-child {
+  border-top-right-radius: 3px;
+}
+#color-scheme-buttons > button:first-child {
+  border-bottom-left-radius: 3px;
+}
+#color-scheme-buttons > button:last-child {
+  border-bottom-right-radius: 3px;
+}
+
+#font-type-buttons > button,
+#font-size-buttons > button,
+#color-scheme-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
+  text-align: center;
+  border: 0;
+}
+
+#font-type-buttons > button,
+#font-size-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
+  width: 50%;
+  background-color: transparent;
+  border-left: 1px solid #B5B5B5;
+  border-bottom: 1px solid #B5B5B5;
+}
+
+#color-scheme-buttons > button {
+  width: 33.33%;
+  font-size: 14px;
+}
+
+#color-scheme-buttons > .dark-button {
+  margin-top: -1px;
+  height: 61px;
+}
+
+#font-type-buttons > button:first-child,
+#font-size-buttons > button:first-child,
+#content-width-buttons > button:first-child,
+#line-height-buttons > button:first-child {
+  border-left: 0;
+}
+
+#font-type-buttons > button {
+  display: inline-block;
+  font-size: 62px;
+  height: 100px;
+}
+
+#font-size-buttons > button,
+#color-scheme-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
+  height: 60px;
+}
+
+#font-type-buttons > button:active:hover,
+#font-type-buttons > button.selected,
+#color-scheme-buttons > button:active:hover,
+#color-scheme-buttons > button.selected {
+  box-shadow: inset 0 -3px 0 0 #fc6420;
+}
+
+#font-type-buttons > button:active:hover,
+#font-type-buttons > button.selected {
+  border-bottom: 1px solid #FC6420;
+}
+
+/* Make the serif button content the same size as the sans-serif button content. */
+#font-type-buttons > button > .description {
+  color: #666;
+  font-size: 12px;
+  margin-top: -5px;
+}
+
+/* Font sizes are different per-platform, so we need custom CSS to line them up. */
+%ifdef XP_MACOSX
+#font-type-buttons > .sans-serif-button > .name {
+  margin-top: 10px;
+}
+
+#font-type-buttons > .sans-serif-button > .description {
+  margin-top: -4px;
+}
+
+#font-type-buttons > .serif-button > .name {
+  font-size: 63px;
+}
+%elifdef XP_WIN
+#font-type-buttons > .sans-serif-button > .name {
+  margin-top: 2px;
+}
+
+#font-type-buttons > .sans-serif-button > .description {
+  margin-top: -4px;
+}
+
+#font-type-buttons > .serif-button > .name {
+  font-size: 63px;
+}
+%else
+#font-type-buttons > .sans-serif-button > .name {
+  margin-top: 5px;
+}
+
+#font-type-buttons > .sans-serif-button > .description {
+  margin-top: -8px;
+}
+
+#font-type-buttons > .serif-button > .name {
+  font-size: 70px;
+}
+%endif
+
+.button:hover,
+#font-size-buttons > button:hover,
+#font-type-buttons > button:hover,
+#content-width-buttons > button:hover,
+#line-height-buttons > button:hover {
+  background-color: #ebebeb;
+}
+
+.dropdown.open,
+.button:active,
+#font-size-buttons > button:active,
+#font-size-buttons > button.selected,
+#content-width-buttons > button:active,
+#content-width-buttons > button.selected,
+#line-height-buttons > button:active,
+#line-height-buttons > button.selected {
+  background-color: #dadada;
+}
+
+/* Only used on Android */
+#font-size-sample {
+  display: none;
+}
+
+.minus-button,
+.plus-button,
+.content-width-minus-button,
+.content-width-plus-button,
+.line-height-minus-button,
+.line-height-plus-button {
+  background-color: transparent;
+  border: 0;
+  background-size: 18px 18px;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+/*======= Toolbar icons =======*/
+
+.close-button {
+  background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg");
+  -moz-context-properties: fill;
+  fill: #808080;
+  height: 68px;
+  background-position: center 8px;
+}
+
+.close-button:hover {
+  fill: #fff;
+  background-color: #d94141;
+  border-bottom: 1px solid #d94141;
+  border-right: 1px solid #d94141;
+}
+
+.close-button:hover:active {
+  background-color: #AE2325;
+  border-bottom: 1px solid #AE2325;
+  border-right: 1px solid #AE2325;
+}
+
+.style-button {
+  background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg");
+}
+
+.minus-button {
+  background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg");
+}
+
+.plus-button {
+  background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg");
+}
+
+.content-width-minus-button {
+  background-size: 42px 16px;
+  background-image: url("chrome://global/skin/reader/RM-Content-Width-Minus-42x16.svg");
+}
+
+.content-width-plus-button {
+  background-size: 44px 16px;
+  background-image: url("chrome://global/skin/reader/RM-Content-Width-Plus-44x16.svg");
+}
+
+.line-height-minus-button {
+  background-size: 34px 14px;
+  background-image: url("chrome://global/skin/reader/RM-Line-Height-Minus-38x14.svg");
+}
+
+.line-height-plus-button {
+  background-size: 34px 24px;
+  background-image: url("chrome://global/skin/reader/RM-Line-Height-Plus-38x24.svg");
+}
+
+@media print {
+  .toolbar {
+    display: none !important;
+  }
+}
+
+/*======= Article content =======*/
+
+/* Note that any class names from the original article that we want to match on
+ * must be added to CLASSES_TO_PRESERVE in ReaderMode.jsm, so that
+ * Readability.js doesn't strip them out */
+
+#moz-reader-content {
+  display: none;
+  font-size: 1em;
+  line-height: 1.6em;
+}
+
+#moz-reader-content.line-height1 {
+  line-height: 1em;
+}
+
+#moz-reader-content.line-height2 {
+  line-height: 1.2em;
+}
+
+#moz-reader-content.line-height3 {
+  line-height: 1.4em;
+}
+
+#moz-reader-content.line-height4 {
+  line-height: 1.6em;
+}
+
+#moz-reader-content.line-height5 {
+  line-height: 1.8em;
+}
+
+#moz-reader-content.line-height6 {
+  line-height: 2.0em;
+}
+
+#moz-reader-content.line-height7 {
+  line-height: 2.2em;
+}
+
+#moz-reader-content.line-height8 {
+  line-height: 2.4em;
+}
+
+#moz-reader-content.line-height9 {
+  line-height: 2.6em;
+}
+
+@media print {
+  #moz-reader-content p,
+  #moz-reader-content code,
+  #moz-reader-content pre,
+  #moz-reader-content blockquote,
+  #moz-reader-content ul,
+  #moz-reader-content ol,
+  #moz-reader-content li,
+  #moz-reader-content figure,
+  #moz-reader-content .wp-caption {
+    margin: 0 0 10px 0 !important;
+    padding: 0 !important;
+  }
+}
+
+#moz-reader-content h1,
+#moz-reader-content h2,
+#moz-reader-content h3 {
+  font-weight: bold;
+}
+
+#moz-reader-content h1 {
+  font-size: 1.6em;
+  line-height: 1.25em;
+}
+
+#moz-reader-content h2 {
+  font-size: 1.2em;
+  line-height: 1.51em;
+}
+
+#moz-reader-content h3 {
+  font-size: 1em;
+  line-height: 1.66em;
+}
+
+#moz-reader-content a:link {
+  text-decoration: underline;
+  font-weight: normal;
+}
+
+#moz-reader-content a:link,
+#moz-reader-content a:link:hover,
+#moz-reader-content a:link:active {
+  color: #0095dd;
+}
+
+#moz-reader-content a:visited {
+  color: #c2e;
+}
+
+#moz-reader-content * {
+  max-width: 100%;
+  height: auto;
+}
+
+#moz-reader-content p,
+#moz-reader-content p,
+#moz-reader-content code,
+#moz-reader-content pre,
+#moz-reader-content blockquote,
+#moz-reader-content ul,
+#moz-reader-content ol,
+#moz-reader-content li,
+#moz-reader-content figure,
+#moz-reader-content .wp-caption {
+  margin: -10px -10px 20px -10px;
+  padding: 10px;
+  border-radius: 5px;
+}
+
+#moz-reader-content li {
+  margin-bottom: 0;
+}
+
+#moz-reader-content li > ul,
+#moz-reader-content li > ol {
+  margin-bottom: -10px;
+}
+
+#moz-reader-content p > img:only-child,
+#moz-reader-content p > a:only-child > img:only-child,
+#moz-reader-content .wp-caption img,
+#moz-reader-content figure img {
+  display: block;
+}
+
+#moz-reader-content img[moz-reader-center] {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+#moz-reader-content .caption,
+#moz-reader-content .wp-caption-text
+#moz-reader-content figcaption {
+  font-size: 0.9em;
+  line-height: 1.48em;
+  font-style: italic;
+}
+
+#moz-reader-content code,
+#moz-reader-content pre {
+  white-space: pre-wrap;
+}
+
+#moz-reader-content blockquote {
+  padding: 0;
+  padding-inline-start: 16px;
+}
+
+#moz-reader-content ul,
+#moz-reader-content ol {
+  padding: 0;
+}
+
+#moz-reader-content ul {
+  padding-inline-start: 30px;
+  list-style: disc;
+}
+
+#moz-reader-content ol {
+  padding-inline-start: 30px;
+  list-style: decimal;
+}
+
+/* Hide elements with common "hidden" class names */
+#moz-reader-content .visually-hidden,
+#moz-reader-content .visuallyhidden,
+#moz-reader-content .hidden,
+#moz-reader-content .invisible,
+#moz-reader-content .sr-only {
+  display: none;
+}
diff --git a/toolkit/themes/shared/aboutReaderContent.css b/toolkit/themes/shared/aboutReaderContent.css
deleted file mode 100644
index f69c17bf88a4..000000000000
--- a/toolkit/themes/shared/aboutReaderContent.css
+++ /dev/null
@@ -1,178 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#moz-reader-content {
-  display: none;
-  font-size: 1em;
-  line-height: 1.6em;
-}
-
-#moz-reader-content.line-height1 {
-  line-height: 1em;
-}
-
-#moz-reader-content.line-height2 {
-  line-height: 1.2em;
-}
-
-#moz-reader-content.line-height3 {
-  line-height: 1.4em;
-}
-
-#moz-reader-content.line-height4 {
-  line-height: 1.6em;
-}
-
-#moz-reader-content.line-height5 {
-  line-height: 1.8em;
-}
-
-#moz-reader-content.line-height6 {
-  line-height: 2.0em;
-}
-
-#moz-reader-content.line-height7 {
-  line-height: 2.2em;
-}
-
-#moz-reader-content.line-height8 {
-  line-height: 2.4em;
-}
-
-#moz-reader-content.line-height9 {
-  line-height: 2.6em;
-}
-
-@media print {
-  p,
-  code,
-  pre,
-  blockquote,
-  ul,
-  ol,
-  li,
-  figure,
-  .wp-caption {
-    margin: 0 0 10px 0 !important;
-    padding: 0 !important;
-  }
-}
-
-h1,
-h2,
-h3 {
-  font-weight: bold;
-}
-
-h1 {
-  font-size: 1.6em;
-  line-height: 1.25em;
-}
-
-h2 {
-  font-size: 1.2em;
-  line-height: 1.51em;
-}
-
-h3 {
-  font-size: 1em;
-  line-height: 1.66em;
-}
-
-a:link {
-  text-decoration: underline;
-  font-weight: normal;
-}
-
-a:link,
-a:link:hover,
-a:link:active {
-  color: #0095dd;
-}
-
-a:visited {
-  color: #c2e;
-}
-
-* {
-  max-width: 100%;
-  height: auto;
-}
-
-p,
-code,
-pre,
-blockquote,
-ul,
-ol,
-li,
-figure,
-.wp-caption {
-  margin: -10px -10px 20px -10px;
-  padding: 10px;
-  border-radius: 5px;
-}
-
-li {
-  margin-bottom: 0;
-}
-
-li > ul,
-li > ol {
-  margin-bottom: -10px;
-}
-
-p > img:only-child,
-p > a:only-child > img:only-child,
-.wp-caption img,
-figure img {
-  display: block;
-}
-
-img[moz-reader-center] {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.caption,
-.wp-caption-text,
-figcaption {
-  font-size: 0.9em;
-  line-height: 1.48em;
-  font-style: italic;
-}
-
-code,
-pre {
-  white-space: pre-wrap;
-}
-
-blockquote {
-  padding: 0;
-  padding-inline-start: 16px;
-}
-
-ul,
-ol {
-  padding: 0;
-}
-
-ul {
-  padding-inline-start: 30px;
-  list-style: disc;
-}
-
-ol {
-  padding-inline-start: 30px;
-  list-style: decimal;
-}
-
-/* Hide elements with common "hidden" class names */
-.visually-hidden,
-.visuallyhidden,
-.hidden,
-.invisible,
-.sr-only {
-  display: none;
-}
diff --git a/toolkit/themes/shared/aboutReaderControls.css b/toolkit/themes/shared/aboutReaderControls.css
deleted file mode 100644
index 2a4b66e5414a..000000000000
--- a/toolkit/themes/shared/aboutReaderControls.css
+++ /dev/null
@@ -1,394 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.light-button {
-  color: #333333;
-  background-color: #ffffff;
-}
-
-.dark-button {
-  color: #eeeeee;
-  background-color: #333333;
-}
-
-.sepia-button {
-  color: #5b4636;
-  background-color: #f4ecd8;
-}
-
-.sans-serif-button {
-  font-family: Helvetica, Arial, sans-serif;
-}
-
-.serif-button {
-  font-family: Georgia, "Times New Roman", serif;
-}
-
-/* Loading/error message */
-
-#reader-message {
-  margin-top: 40px;
-  display: none;
-  text-align: center;
-  width: 100%;
-  font-size: 0.9em;
-}
-
-/* Header */
-
-.header {
-  text-align: start;
-  display: none;
-}
-
-.domain {
-  font-size: 0.9em;
-  line-height: 1.48em;
-  padding-bottom: 4px;
-  font-family: Helvetica, Arial, sans-serif;
-  text-decoration: none;
-  border-bottom: 1px solid;
-  color: #0095dd;
-}
-
-.header > h1 {
-  font-size: 1.6em;
-  line-height: 1.25em;
-  width: 100%;
-  margin: 30px 0;
-  padding: 0;
-}
-
-.header > .credits {
-  font-size: 0.9em;
-  line-height: 1.48em;
-  margin: 0 0 10px 0;
-  padding: 0;
-  font-style: italic;
-}
-
-.header > .meta-data {
-  font-size: 0.65em;
-  margin: 0 0 15px 0;
-}
-
-/*======= Controls toolbar =======*/
-
-.toolbar {
-  font-family: Helvetica, Arial, sans-serif;
-  position: fixed;
-  height: 100%;
-  top: 0;
-  left: 0;
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  background-color: #fbfbfb;
-  -moz-user-select: none;
-  border-right: 1px solid #b5b5b5;
-  z-index: 1;
-}
-
-.button {
-  display: block;
-  background-size: 24px 24px;
-  background-repeat: no-repeat;
-  color: #333;
-  background-color: #fbfbfb;
-  height: 40px;
-  padding: 0;
-}
-
-.toolbar .button {
-  width: 40px;
-  background-position: center;
-  margin-right: -1px;
-  border-top: 0;
-  border-left: 0;
-  border-right: 1px solid #b5b5b5;
-  border-bottom: 1px solid #c1c1c1;
-}
-
-.button[hidden] {
-  display: none;
-}
-
-.dropdown {
-  text-align: center;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.dropdown li {
-  margin: 0;
-  padding: 0;
-}
-
-/*======= Popup =======*/
-
-.dropdown-popup {
-  min-width: 300px;
-  text-align: start;
-  position: absolute;
-  left: 48px; /* offset to account for toolbar width */
-  z-index: 1000;
-  background-color: #fbfbfb;
-  visibility: hidden;
-  border-radius: 4px;
-  border: 1px solid #b5b5b5;
-  border-bottom-width: 0;
-  box-shadow: 0 1px 3px #c1c1c1;
-}
-
-.keep-open .dropdown-popup {
-  z-index: initial;
-}
-
-.dropdown-popup > hr {
-  display: none;
-}
-
-.open > .dropdown-popup {
-  visibility: visible;
-}
-
-.dropdown-arrow {
-  position: absolute;
-  top: 30px; /* offset arrow from top of popup */
-  left: -16px;
-  width: 16px;
-  height: 24px;
-  background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg");
-  display: block;
-}
-
-/*======= Font style popup =======*/
-
-#font-type-buttons,
-#font-size-buttons,
-#color-scheme-buttons,
-#content-width-buttons,
-#line-height-buttons {
-  display: flex;
-  flex-direction: row;
-}
-
-#font-type-buttons > button:first-child {
-  border-top-left-radius: 3px;
-}
-#font-type-buttons > button:last-child {
-  border-top-right-radius: 3px;
-}
-#color-scheme-buttons > button:first-child {
-  border-bottom-left-radius: 3px;
-}
-#color-scheme-buttons > button:last-child {
-  border-bottom-right-radius: 3px;
-}
-
-#font-type-buttons > button,
-#font-size-buttons > button,
-#color-scheme-buttons > button,
-#content-width-buttons > button,
-#line-height-buttons > button {
-  text-align: center;
-  border: 0;
-}
-
-#font-type-buttons > button,
-#font-size-buttons > button,
-#content-width-buttons > button,
-#line-height-buttons > button {
-  width: 50%;
-  background-color: transparent;
-  border-left: 1px solid #B5B5B5;
-  border-bottom: 1px solid #B5B5B5;
-}
-
-#color-scheme-buttons > button {
-  width: 33.33%;
-  font-size: 14px;
-}
-
-#color-scheme-buttons > .dark-button {
-  margin-top: -1px;
-  height: 61px;
-}
-
-#font-type-buttons > button:first-child,
-#font-size-buttons > button:first-child,
-#content-width-buttons > button:first-child,
-#line-height-buttons > button:first-child {
-  border-left: 0;
-}
-
-#font-type-buttons > button {
-  display: inline-block;
-  font-size: 62px;
-  height: 100px;
-}
-
-#font-size-buttons > button,
-#color-scheme-buttons > button,
-#content-width-buttons > button,
-#line-height-buttons > button {
-  height: 60px;
-}
-
-#font-type-buttons > button:active:hover,
-#font-type-buttons > button.selected,
-#color-scheme-buttons > button:active:hover,
-#color-scheme-buttons > button.selected {
-  box-shadow: inset 0 -3px 0 0 #fc6420;
-}
-
-#font-type-buttons > button:active:hover,
-#font-type-buttons > button.selected {
-  border-bottom: 1px solid #FC6420;
-}
-
-/* Make the serif button content the same size as the sans-serif button content. */
-#font-type-buttons > button > .description {
-  color: #666;
-  font-size: 12px;
-  margin-top: -5px;
-}
-
-/* Font sizes are different per-platform, so we need custom CSS to line them up. */
-%ifdef XP_MACOSX
-#font-type-buttons > .sans-serif-button > .name {
-  margin-top: 10px;
-}
-
-#font-type-buttons > .sans-serif-button > .description {
-  margin-top: -4px;
-}
-
-#font-type-buttons > .serif-button > .name {
-  font-size: 63px;
-}
-%elifdef XP_WIN
-#font-type-buttons > .sans-serif-button > .name {
-  margin-top: 2px;
-}
-
-#font-type-buttons > .sans-serif-button > .description {
-  margin-top: -4px;
-}
-
-#font-type-buttons > .serif-button > .name {
-  font-size: 63px;
-}
-%else
-#font-type-buttons > .sans-serif-button > .name {
-  margin-top: 5px;
-}
-
-#font-type-buttons > .sans-serif-button > .description {
-  margin-top: -8px;
-}
-
-#font-type-buttons > .serif-button > .name {
-  font-size: 70px;
-}
-%endif
-
-.button:hover,
-#font-size-buttons > button:hover,
-#font-type-buttons > button:hover,
-#content-width-buttons > button:hover,
-#line-height-buttons > button:hover {
-  background-color: #ebebeb;
-}
-
-.dropdown.open,
-.button:active,
-#font-size-buttons > button:active,
-#font-size-buttons > button.selected,
-#content-width-buttons > button:active,
-#content-width-buttons > button.selected,
-#line-height-buttons > button:active,
-#line-height-buttons > button.selected {
-  background-color: #dadada;
-}
-
-/* Only used on Android */
-#font-size-sample {
-  display: none;
-}
-
-.minus-button,
-.plus-button,
-.content-width-minus-button,
-.content-width-plus-button,
-.line-height-minus-button,
-.line-height-plus-button {
-  background-color: transparent;
-  border: 0;
-  background-size: 18px 18px;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
-/*======= Toolbar icons =======*/
-
-.close-button {
-  background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg");
-  -moz-context-properties: fill;
-  fill: #808080;
-  height: 68px;
-  background-position: center 8px;
-}
-
-.close-button:hover {
-  fill: #fff;
-  background-color: #d94141;
-  border-bottom: 1px solid #d94141;
-  border-right: 1px solid #d94141;
-}
-
-.close-button:hover:active {
-  background-color: #AE2325;
-  border-bottom: 1px solid #AE2325;
-  border-right: 1px solid #AE2325;
-}
-
-.style-button {
-  background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg");
-}
-
-.minus-button {
-  background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg");
-}
-
-.plus-button {
-  background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg");
-}
-
-.content-width-minus-button {
-  background-size: 42px 16px;
-  background-image: url("chrome://global/skin/reader/RM-Content-Width-Minus-42x16.svg");
-}
-
-.content-width-plus-button {
-  background-size: 44px 16px;
-  background-image: url("chrome://global/skin/reader/RM-Content-Width-Plus-44x16.svg");
-}
-
-.line-height-minus-button {
-  background-size: 34px 14px;
-  background-image: url("chrome://global/skin/reader/RM-Line-Height-Minus-38x14.svg");
-}
-
-.line-height-plus-button {
-  background-size: 34px 24px;
-  background-image: url("chrome://global/skin/reader/RM-Line-Height-Plus-38x24.svg");
-}
-
-@media print {
-  .toolbar {
-    display: none !important;
-  }
-}
diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn
index a54038e2cb55..5bc40f3b7784 100644
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -15,9 +15,7 @@ toolkit.jar:
   skin/classic/global/aboutCache.css                       (../../shared/aboutCache.css)
   skin/classic/global/aboutCacheEntry.css                  (../../shared/aboutCacheEntry.css)
   skin/classic/global/aboutMemory.css                      (../../shared/aboutMemory.css)
-  skin/classic/global/aboutReader.css                      (../../shared/aboutReader.css)
-  skin/classic/global/aboutReaderContent.css               (../../shared/aboutReaderContent.css)
-* skin/classic/global/aboutReaderControls.css              (../../shared/aboutReaderControls.css)
+* skin/classic/global/aboutReader.css                      (../../shared/aboutReader.css)
   skin/classic/global/aboutRights.css                      (../../shared/aboutRights.css)
   skin/classic/global/aboutLicense.css                     (../../shared/aboutLicense.css)
   skin/classic/global/aboutSupport.css                     (../../shared/aboutSupport.css)
@@ -50,7 +48,6 @@ toolkit.jar:
   skin/classic/global/icons/blocked.svg                    (../../shared/incontent-icons/blocked.svg)
   skin/classic/global/illustrations/about-license.svg      (../../shared/illustrations/about-license.svg)
   skin/classic/global/narrate.css                          (../../shared/narrate.css)
-  skin/classic/global/narrateControls.css                  (../../shared/narrateControls.css)
   skin/classic/global/narrate/arrow.svg                    (../../shared/narrate/arrow.svg)
   skin/classic/global/narrate/back.svg                     (../../shared/narrate/back.svg)
   skin/classic/global/narrate/fast.svg                     (../../shared/narrate/fast.svg)
diff --git a/toolkit/themes/shared/narrate.css b/toolkit/themes/shared/narrate.css
index 4514eff35e2d..bafdab8deec4 100644
--- a/toolkit/themes/shared/narrate.css
+++ b/toolkit/themes/shared/narrate.css
@@ -44,3 +44,190 @@ body.sepia .narrate-word-highlight {
 body.dark .narrate-word-highlight {
   border-bottom-color: #6f6f6f;
 }
+
+#narrate-dropdown {
+  --border-color: #e5e5e5;
+}
+
+#narrate-toggle > svg {
+  display: block;
+  margin: 0 8px;
+}
+
+.dropdown-popup button {
+  background-color: transparent;
+}
+
+.dropdown-popup button:hover:not(:disabled) {
+  background-color: #eaeaea;
+}
+
+.narrate-row {
+  display: flex;
+  align-items: center;
+  min-height: 40px;
+  box-sizing: border-box;
+}
+
+.narrate-row:not(:first-child) {
+  border-top: 1px solid var(--border-color);
+}
+
+/* Control buttons */
+
+#narrate-control > button {
+  background-size: 24px 24px;
+  background-repeat: no-repeat;
+  background-position: center center;
+  height: 64px;
+  width: 100px;
+  border: none;
+  color: #666;
+  box-sizing: border-box;
+}
+
+#narrate-control > button:not(:first-child) {
+  border-left: 1px solid var(--border-color);
+}
+
+#narrate-skip-previous {
+  border-top-left-radius: 3px;
+  background-image: url("chrome://global/skin/narrate/back.svg");
+  -moz-context-properties: fill;
+  fill: rgb(128 128 128);
+}
+
+#narrate-skip-next {
+  border-top-right-radius: 3px;
+  background-image: url("chrome://global/skin/narrate/forward.svg");
+  -moz-context-properties: fill;
+  fill: rgb(128 128 128);
+}
+
+#narrate-skip-previous:disabled,
+#narrate-skip-next:disabled {
+  fill: rgb(128 128 128 / 50%);
+}
+
+#narrate-start-stop {
+  background-image: url("chrome://global/skin/narrate/start.svg");
+}
+
+#narrate-dropdown.speaking #narrate-start-stop {
+  background-image: url("chrome://global/skin/narrate/stop.svg");
+}
+
+/* Rate control */
+
+#narrate-rate::before, #narrate-rate::after {
+  content: '';
+  width: 48px;
+  height: 40px;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 24px auto;
+}
+
+#narrate-rate::before {
+  background-image: url("chrome://global/skin/narrate/slow.svg");
+}
+
+#narrate-rate::after {
+  background-image: url("chrome://global/skin/narrate/fast.svg");
+}
+
+#narrate-rate-input {
+  margin: 0 1px;
+  flex-grow: 1;
+}
+
+#narrate-rate-input::-moz-range-track {
+  background-color: #979797;
+  height: 2px;
+}
+
+#narrate-rate-input::-moz-range-progress {
+  background-color: #2EA3FF;
+  height: 2px;
+}
+
+#narrate-rate-input::-moz-range-thumb {
+  background-color: #808080;
+  height: 16px;
+  width: 16px;
+  border-radius: 8px;
+  border-width: 0;
+}
+
+#narrate-rate-input:active::-moz-range-thumb {
+  background-color: #2EA3FF;
+}
+
+/* Voice selection */
+
+.voiceselect {
+  width: 100%;
+}
+
+.voiceselect > button.select-toggle,
+.voiceselect > .options > button.option {
+  -moz-appearance: none;
+  border: none;
+  width: 100%;
+  min-height: 40px;
+}
+
+.voiceselect.open > button.select-toggle {
+  border-bottom: 1px solid var(--border-color);
+}
+
+.voiceselect > button.select-toggle::after {
+  content: '';
+  background-image: url("chrome://global/skin/narrate/arrow.svg");
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 12px 12px;
+  display: inline-block;
+  width: 1.5em;
+  height: 1em;
+  vertical-align: middle;
+}
+
+.voiceselect > .options > button.option:not(:first-child) {
+  border-top: 1px solid var(--border-color);
+}
+
+.voiceselect > .options > button.option  {
+  box-sizing: border-box;
+}
+
+.voiceselect > .options:not(.hovering) > button.option:focus {
+  background-color: #eaeaea;
+}
+
+.voiceselect > .options:not(.hovering) > button.option:hover:not(:focus) {
+  background-color: transparent;
+}
+
+.voiceselect > .options > button.option::-moz-focus-inner {
+  outline: none;
+  border: 0;
+}
+
+.voiceselect > .options {
+  display: none;
+  overflow-y: auto;
+}
+
+.voiceselect.open > .options {
+  display: block;
+}
+
+.current-voice {
+  color: #7f7f7f;
+}
+
+.voiceselect:not(.open) > button,
+.voiceselect .option:last-child {
+  border-radius: 0 0 3px 3px;
+}
diff --git a/toolkit/themes/shared/narrateControls.css b/toolkit/themes/shared/narrateControls.css
deleted file mode 100644
index 4def74dc88b1..000000000000
--- a/toolkit/themes/shared/narrateControls.css
+++ /dev/null
@@ -1,186 +0,0 @@
-:scope {
-  --border-color: #e5e5e5;
-}
-
-#narrate-toggle > svg {
-  display: block;
-  margin: 0 8px;
-}
-
-.dropdown-popup button {
-  background-color: transparent;
-}
-
-.dropdown-popup button:hover:not(:disabled) {
-  background-color: #eaeaea;
-}
-
-.narrate-row {
-  display: flex;
-  align-items: center;
-  min-height: 40px;
-  box-sizing: border-box;
-}
-
-.narrate-row:not(:first-child) {
-  border-top: 1px solid var(--border-color);
-}
-
-/* Control buttons */
-
-#narrate-control > button {
-  background-size: 24px 24px;
-  background-repeat: no-repeat;
-  background-position: center center;
-  height: 64px;
-  width: 100px;
-  border: none;
-  color: #666;
-  box-sizing: border-box;
-}
-
-#narrate-control > button:not(:first-child) {
-  border-left: 1px solid var(--border-color);
-}
-
-#narrate-skip-previous {
-  border-top-left-radius: 3px;
-  background-image: url("chrome://global/skin/narrate/back.svg");
-  -moz-context-properties: fill;
-  fill: rgb(128 128 128);
-}
-
-#narrate-skip-next {
-  border-top-right-radius: 3px;
-  background-image: url("chrome://global/skin/narrate/forward.svg");
-  -moz-context-properties: fill;
-  fill: rgb(128 128 128);
-}
-
-#narrate-skip-previous:disabled,
-#narrate-skip-next:disabled {
-  fill: rgb(128 128 128 / 50%);
-}
-
-#narrate-start-stop {
-  background-image: url("chrome://global/skin/narrate/start.svg");
-}
-
-#narrate-dropdown.speaking #narrate-start-stop {
-  background-image: url("chrome://global/skin/narrate/stop.svg");
-}
-
-/* Rate control */
-
-#narrate-rate::before, #narrate-rate::after {
-  content: '';
-  width: 48px;
-  height: 40px;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: 24px auto;
-}
-
-#narrate-rate::before {
-  background-image: url("chrome://global/skin/narrate/slow.svg");
-}
-
-#narrate-rate::after {
-  background-image: url("chrome://global/skin/narrate/fast.svg");
-}
-
-#narrate-rate-input {
-  margin: 0 1px;
-  flex-grow: 1;
-}
-
-#narrate-rate-input::-moz-range-track {
-  background-color: #979797;
-  height: 2px;
-}
-
-#narrate-rate-input::-moz-range-progress {
-  background-color: #2EA3FF;
-  height: 2px;
-}
-
-#narrate-rate-input::-moz-range-thumb {
-  background-color: #808080;
-  height: 16px;
-  width: 16px;
-  border-radius: 8px;
-  border-width: 0;
-}
-
-#narrate-rate-input:active::-moz-range-thumb {
-  background-color: #2EA3FF;
-}
-
-/* Voice selection */
-
-.voiceselect {
-  width: 100%;
-}
-
-.voiceselect > button.select-toggle,
-.voiceselect > .options > button.option {
-  -moz-appearance: none;
-  border: none;
-  width: 100%;
-  min-height: 40px;
-}
-
-.voiceselect.open > button.select-toggle {
-  border-bottom: 1px solid var(--border-color);
-}
-
-.voiceselect > button.select-toggle::after {
-  content: '';
-  background-image: url("chrome://global/skin/narrate/arrow.svg");
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: 12px 12px;
-  display: inline-block;
-  width: 1.5em;
-  height: 1em;
-  vertical-align: middle;
-}
-
-.voiceselect > .options > button.option:not(:first-child) {
-  border-top: 1px solid var(--border-color);
-}
-
-.voiceselect > .options > button.option  {
-  box-sizing: border-box;
-}
-
-.voiceselect > .options:not(.hovering) > button.option:focus {
-  background-color: #eaeaea;
-}
-
-.voiceselect > .options:not(.hovering) > button.option:hover:not(:focus) {
-  background-color: transparent;
-}
-
-.voiceselect > .options > button.option::-moz-focus-inner {
-  outline: none;
-  border: 0;
-}
-
-.voiceselect > .options {
-  display: none;
-  overflow-y: auto;
-}
-
-.voiceselect.open > .options {
-  display: block;
-}
-
-.current-voice {
-  color: #7f7f7f;
-}
-
-.voiceselect:not(.open) > button,
-.option:last-child {
-  border-radius: 0 0 3px 3px;
-}

From f5a443906406ca98277af0b893f4823a2a458bb1 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 21 Nov 2017 11:54:25 +0800
Subject: [PATCH 160/219] Bug 1417837 - Part 2: Preserve class names in
 readerized output that we use in aboutReader.css. r=Gijs

MozReview-Commit-ID: 7qV2SRHeeOJ

--HG--
extra : rebase_source : ca8b15ef9ceb95da5f7b1d985ba60cfb594bfd3e
---
 toolkit/components/reader/ReaderMode.jsm  | 19 ++++++++++++++++++-
 toolkit/components/reader/ReaderWorker.js |  5 +++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/reader/ReaderMode.jsm b/toolkit/components/reader/ReaderMode.jsm
index 9811bc5cc3a7..930a00fa8db7 100644
--- a/toolkit/components/reader/ReaderMode.jsm
+++ b/toolkit/components/reader/ReaderMode.jsm
@@ -18,6 +18,19 @@ const PARSE_ERROR_TOO_MANY_ELEMENTS = 1;
 const PARSE_ERROR_WORKER = 2;
 const PARSE_ERROR_NO_ARTICLE = 3;
 
+// Class names to preserve in the readerized output. We preserve these class
+// names so that rules in aboutReader.css can match them.
+const CLASSES_TO_PRESERVE = [
+  "caption",
+  "hidden",
+  "invisble",
+  "sr-only",
+  "visually-hidden",
+  "visuallyhidden",
+  "wp-caption",
+  "wp-caption-text",
+];
+
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -453,9 +466,13 @@ this.ReaderMode = {
                      createInstance(Ci.nsIDOMSerializer);
     let serializedDoc = serializer.serializeToString(doc);
 
+    let options = {
+      classesToPreserve: CLASSES_TO_PRESERVE,
+    };
+
     let article = null;
     try {
-      article = await ReaderWorker.post("parseDocument", [uriParam, serializedDoc]);
+      article = await ReaderWorker.post("parseDocument", [uriParam, serializedDoc, options]);
     } catch (e) {
       Cu.reportError("Error in ReaderWorker: " + e);
       histogram.add(PARSE_ERROR_WORKER);
diff --git a/toolkit/components/reader/ReaderWorker.js b/toolkit/components/reader/ReaderWorker.js
index 5f69d1fc9d0a..9ae589d7d145 100644
--- a/toolkit/components/reader/ReaderWorker.js
+++ b/toolkit/components/reader/ReaderWorker.js
@@ -42,11 +42,12 @@ var Agent = {
    *
    * @param {object} uri URI data for the document.
    * @param {string} serializedDoc The serialized document.
+   * @param {object} options Options object to pass to Readability.
    *
    * @return {object} Article object returned from Readability.
    */
-  parseDocument(uri, serializedDoc) {
+  parseDocument(uri, serializedDoc, options) {
     let doc = new JSDOMParser().parse(serializedDoc);
-    return new Readability(uri, doc).parse();
+    return new Readability(uri, doc, options).parse();
   },
 };

From 850bcde3b4594a8844753cdde03aaecd1d19dc80 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 30 Nov 2017 11:55:32 +0800
Subject: [PATCH 161/219] Bug 1417837 - Part 3: Replace all IDs in about:reader
 documents with class names. r=Gijs

Since the readerized article content will have its class names stripped
but will retain its original IDs, and we don't want our aboutReader.css
rules targetting UI elements to match anything in the article.

MozReview-Commit-ID: JuXTo8Nth5Q

--HG--
extra : rebase_source : 87aa2f1060a1e7974610a109507a103c5366727a
---
 mobile/android/themes/core/aboutReader.css    | 119 ++++----
 .../components/narrate/NarrateControls.jsm    |  98 +++---
 toolkit/components/narrate/Narrator.jsm       |   2 +-
 toolkit/components/reader/AboutReader.jsm     |  65 ++--
 .../reader/content/aboutReader.html           |  50 ++--
 toolkit/themes/shared/aboutReader.css         | 283 +++++++++---------
 toolkit/themes/shared/narrate.css             |  43 +--
 7 files changed, 335 insertions(+), 325 deletions(-)

diff --git a/mobile/android/themes/core/aboutReader.css b/mobile/android/themes/core/aboutReader.css
index 32f52080c04d..28b31daff75f 100644
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -2,6 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* Avoid adding ID selector rules in this style sheet, since they could
+ * inadvertently match elements in the article content. */
+
 html {
   -moz-text-size-adjust: none;
 }
@@ -33,39 +36,39 @@ body.serif {
   font-family: serif;
 }
 
-#container.font-size1 {
+.container.font-size1 {
   font-size: 10px;
 }
 
-#container.font-size2 {
+.container.font-size2 {
   font-size: 12px;
 }
 
-#container.font-size3 {
+.container.font-size3 {
   font-size: 14px;
 }
 
-#container.font-size4  {
+.container.font-size4  {
   font-size: 16px;
 }
 
-#container.font-size5 {
+.container.font-size5 {
   font-size: 18px;
 }
 
-#container.font-size6 {
+.container.font-size6 {
   font-size: 20px;
 }
 
-#container.font-size7 {
+.container.font-size7 {
   font-size: 22px;
 }
 
-#container.font-size8 {
+.container.font-size8 {
   font-size: 24px;
 }
 
-#container.font-size9 {
+.container.font-size9 {
   font-size: 26px;
 }
 
@@ -119,7 +122,7 @@ body.dark > .container > .content blockquote {
   border-left-color: #777777 !important;
 }
 
-#reader-message {
+.reader-message {
   margin-top: 40px;
   display: none;
   text-align: center;
@@ -217,7 +220,7 @@ body.dark > .container > .content blockquote {
 }
 
 .dropdown-toggle,
-#reader-popup {
+.dropdown-popup {
   pointer-events: auto;
 }
 
@@ -249,9 +252,9 @@ body.dark > .container > .content blockquote {
 /* Only used on desktop */
 .dropdown-popup > hr,
 .dropdown-arrow,
-#font-type-buttons > button > .name,
-#content-width-buttons,
-#line-height-buttons {
+.font-type-buttons > button > .name,
+.content-width-buttons,
+.line-height-buttons {
   display: none;
 }
 
@@ -260,37 +263,37 @@ body.dark > .container > .content blockquote {
   bottom: 0;
 }
 
-#font-type-buttons,
-#font-size-buttons,
-#color-scheme-buttons {
+.font-type-buttons,
+.font-size-buttons,
+.color-scheme-buttons {
   display: flex;
   flex-direction: row;
 }
 
-#font-type-buttons > button,
-#color-scheme-buttons > button {
+.font-type-buttons > button,
+.color-scheme-buttons > button {
   text-align: center;
 }
 
-#font-type-buttons > button,
-#font-size-buttons > button {
+.font-type-buttons > button,
+.font-size-buttons > button {
   width: 50%;
   background-color: transparent;
   border: 0;
 }
 
-#font-type-buttons > button {
+.font-type-buttons > button {
   font-size: 24px;
   color: #AFB1B3;
   padding: 15px 0;
 }
 
-#font-type-buttons > button:active,
-#font-type-buttons > button.selected {
+.font-type-buttons > button:active,
+.font-type-buttons > button.selected {
   color: #222222;
 }
 
-#font-size-sample {
+.font-size-sample {
   flex: 0;
   font-size: 24px;
   color: #000000;
@@ -324,7 +327,7 @@ body.dark > .container > .content blockquote {
   padding: 0 5px;
 }
 
-#color-scheme-buttons > button {
+.color-scheme-buttons > button {
   width: 33%;
   border-radius: 4px;
   border: 1px solid #BFBFBF;
@@ -333,8 +336,8 @@ body.dark > .container > .content blockquote {
   font-size: 14px;
 }
 
-#color-scheme-buttons > button:active,
-#color-scheme-buttons > button.selected {
+.color-scheme-buttons > button:active,
+.color-scheme-buttons > button.selected {
   border: 2px solid #0A84FF;
 }
 
@@ -414,29 +417,29 @@ body.dark > .container > .content blockquote {
  * must be added to CLASSES_TO_PRESERVE in ReaderMode.jsm, so that
  * Readability.js doesn't strip them out */
 
-#moz-reader-content {
+.moz-reader-content {
   display: none;
   font-size: 1em;
 }
 
-#moz-reader-content a {
+.moz-reader-content a {
   text-decoration: underline !important;
   font-weight: normal;
 }
 
-#moz-reader-content a,
-#moz-reader-content a:visited,
-#moz-reader-content a:hover,
-#moz-reader-content a:active {
+.moz-reader-content a,
+.moz-reader-content a:visited,
+.moz-reader-content a:hover,
+.moz-reader-content a:active {
   color: #00acff !important;
 }
 
-#moz-reader-content * {
+.moz-reader-content * {
   max-width: 100% !important;
   height: auto !important;
 }
 
-#moz-reader-content p {
+.moz-reader-content p {
   line-height: 1.4em !important;
   margin: 0px !important;
   margin-bottom: 20px !important;
@@ -444,8 +447,8 @@ body.dark > .container > .content blockquote {
 
 /* Covers all images showing edge-to-edge using a 
    an optional caption text */
-#moz-reader-content .wp-caption,
-#moz-reader-content figure {
+.moz-reader-content .wp-caption,
+.moz-reader-content figure {
   display: block !important;
   width: 100% !important;
   margin: 0px !important;
@@ -454,17 +457,17 @@ body.dark > .container > .content blockquote {
 
 /* Images marked to be shown edge-to-edge with an
    optional captio ntext */
-#moz-reader-content p > img:only-child,
-#moz-reader-content p > a:only-child > img:only-child,
-#moz-reader-content .wp-caption img,
-#moz-reader-content figure img {
+.moz-reader-content p > img:only-child,
+.moz-reader-content p > a:only-child > img:only-child,
+.moz-reader-content .wp-caption img,
+.moz-reader-content figure img {
   display: block;
   margin-left: auto;
   margin-right: auto;
 }
 
 /* Account for body padding to make image full width */
-#moz-reader-content img[moz-reader-full-width] {
+.moz-reader-content img[moz-reader-full-width] {
   width: calc(100% + 40px);
   margin-left: -20px;
   margin-right: -20px;
@@ -472,9 +475,9 @@ body.dark > .container > .content blockquote {
 }
 
 /* Image caption text */
-#moz-reader-content .caption,
-#moz-reader-content .wp-caption-text,
-#moz-reader-content figcaption {
+.moz-reader-content .caption,
+.moz-reader-content .wp-caption-text,
+.moz-reader-content figcaption {
   font-size: 0.9em;
   font-family: sans-serif;
   margin: 0px !important;
@@ -483,13 +486,13 @@ body.dark > .container > .content blockquote {
 
 /* Ensure all pre-formatted code inside the reader content
    are properly wrapped inside content width */
-#moz-reader-content code,
-#moz-reader-content pre {
+.moz-reader-content code,
+.moz-reader-content pre {
   white-space: pre-wrap !important;
   margin-bottom: 20px !important;
 }
 
-#moz-reader-content blockquote {
+.moz-reader-content blockquote {
   margin: 0px !important;
   margin-bottom: 20px !important;
   padding: 0px !important;
@@ -498,29 +501,29 @@ body.dark > .container > .content blockquote {
   border-left: 2px solid !important;
 }
 
-#moz-reader-content ul,
-#moz-reader-content ol {
+.moz-reader-content ul,
+.moz-reader-content ol {
   margin: 0px !important;
   margin-bottom: 20px !important;
   padding: 0px !important;
   line-height: 1.5em;
 }
 
-#moz-reader-content ul {
+.moz-reader-content ul {
   padding-inline-start: 30px !important;
   list-style: disc !important;
 }
 
-#moz-reader-content ol {
+.moz-reader-content ol {
   padding-inline-start: 35px !important;
   list-style: decimal !important;
 }
 
 /* Hide elements with common "hidden" class names */
-#moz-reader-content .visually-hidden,
-#moz-reader-content .visuallyhidden,
-#moz-reader-content .hidden,
-#moz-reader-content .invisible,
-#moz-reader-content .sr-only {
+.moz-reader-content .visually-hidden,
+.moz-reader-content .visuallyhidden,
+.moz-reader-content .hidden,
+.moz-reader-content .invisible,
+.moz-reader-content .sr-only {
   display: none;
 }
diff --git a/toolkit/components/narrate/NarrateControls.jsm b/toolkit/components/narrate/NarrateControls.jsm
index c202ff627d57..f7d00e4e4868 100644
--- a/toolkit/components/narrate/NarrateControls.jsm
+++ b/toolkit/components/narrate/NarrateControls.jsm
@@ -38,13 +38,12 @@ function NarrateControls(mm, win, languagePromise) {
   }
 
   let dropdown = win.document.createElement("ul");
-  dropdown.className = "dropdown";
-  dropdown.id = "narrate-dropdown";
+  dropdown.className = "dropdown narrate-dropdown";
   // We need inline svg here for the animation to work (bug 908634 & 1190881).
   // eslint-disable-next-line no-unsanitized/property
   dropdown.innerHTML =
     localize`<li>
-       <button class="dropdown-toggle button" id="narrate-toggle"
+       <button class="dropdown-toggle button narrate-toggle"
                title="${"narrate"}" hidden>
          <svg xmlns="http://www.w3.org/2000/svg"
               xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -58,11 +57,11 @@ function NarrateControls(mm, win, languagePromise) {
               100% { transform: scaleY(1);   }
             }
 
-            #waveform > rect {
+            .waveform > rect {
               fill: #808080;
             }
 
-            .speaking #waveform > rect {
+            .speaking .waveform > rect {
               fill: #58bf43;
               transform-box: fill-box;
               transform-origin: 50% 50%;
@@ -72,15 +71,15 @@ function NarrateControls(mm, win, languagePromise) {
               animation-timing-function: linear;
             }
 
-            #waveform > rect:nth-child(2) { animation-delay: 250ms; }
-            #waveform > rect:nth-child(3) { animation-delay: 500ms; }
-            #waveform > rect:nth-child(4) { animation-delay: 750ms; }
-            #waveform > rect:nth-child(5) { animation-delay: 1000ms; }
-            #waveform > rect:nth-child(6) { animation-delay: 1250ms; }
-            #waveform > rect:nth-child(7) { animation-delay: 1500ms; }
+            .waveform > rect:nth-child(2) { animation-delay: 250ms; }
+            .waveform > rect:nth-child(3) { animation-delay: 500ms; }
+            .waveform > rect:nth-child(4) { animation-delay: 750ms; }
+            .waveform > rect:nth-child(5) { animation-delay: 1000ms; }
+            .waveform > rect:nth-child(6) { animation-delay: 1250ms; }
+            .waveform > rect:nth-child(7) { animation-delay: 1500ms; }
 
           </style>
-          <g id="waveform">
+          <g class="waveform">
             <rect x="1"  y="8" width="2" height="8"  rx=".5" ry=".5" />
             <rect x="4"  y="5" width="2" height="14" rx=".5" ry=".5" />
             <rect x="7"  y="8" width="2" height="8"  rx=".5" ry=".5" />
@@ -93,18 +92,18 @@ function NarrateControls(mm, win, languagePromise) {
         </button>
     </li>
     <li class="dropdown-popup">
-      <div id="narrate-control" class="narrate-row">
-        <button disabled id="narrate-skip-previous"
+      <div class="narrate-row narrate-control">
+        <button disabled class="narrate-skip-previous"
                 title="${"back"}"></button>
-        <button id="narrate-start-stop" title="${"start"}"></button>
-        <button disabled id="narrate-skip-next"
+        <button class="narrate-start-stop" title="${"start"}"></button>
+        <button disabled class="narrate-skip-next"
                 title="${"forward"}"></button>
       </div>
-      <div id="narrate-rate" class="narrate-row">
-        <input id="narrate-rate-input" value="0" title="${"speed"}"
+      <div class="narrate-row narrate-rate">
+        <input class="narrate-rate-input" value="0" title="${"speed"}"
                step="5" max="100" min="-100" type="range">
       </div>
-      <div id="narrate-voices" class="narrate-row"></div>
+      <div class="narrate-row narrate-voices"></div>
       <div class="dropdown-arrow"></div>
     </li>`;
 
@@ -114,14 +113,14 @@ function NarrateControls(mm, win, languagePromise) {
   let selectLabel = gStrings.GetStringFromName("selectvoicelabel");
   this.voiceSelect = new VoiceSelect(win, selectLabel);
   this.voiceSelect.element.addEventListener("change", this);
-  this.voiceSelect.element.id = "voice-select";
+  this.voiceSelect.element.classList.add("voice-select");
   win.speechSynthesis.addEventListener("voiceschanged", this);
-  dropdown.querySelector("#narrate-voices").appendChild(
+  dropdown.querySelector(".narrate-voices").appendChild(
     this.voiceSelect.element);
 
   dropdown.addEventListener("click", this, true);
 
-  let rateRange = dropdown.querySelector("#narrate-rate > input");
+  let rateRange = dropdown.querySelector(".narrate-rate > input");
   rateRange.addEventListener("change", this);
 
   // The rate is stored as an integer.
@@ -129,7 +128,7 @@ function NarrateControls(mm, win, languagePromise) {
 
   this._setupVoices();
 
-  let tb = win.document.getElementById("reader-toolbar");
+  let tb = win.document.querySelector(".reader-toolbar");
   tb.appendChild(dropdown);
 }
 
@@ -137,7 +136,7 @@ NarrateControls.prototype = {
   handleEvent(evt) {
     switch (evt.type) {
       case "change":
-        if (evt.target.id == "narrate-rate-input") {
+        if (evt.target.classList.contains("narrate-rate-input")) {
           this._onRateInput(evt);
         } else {
           this._onVoiceChange();
@@ -188,7 +187,7 @@ NarrateControls.prototype = {
         this.voiceSelect.addOptions(options);
       }
 
-      let narrateToggle = win.document.getElementById("narrate-toggle");
+      let narrateToggle = win.document.querySelector(".narrate-toggle");
       let histogram = Services.telemetry.getKeyedHistogramById(
         "NARRATE_CONTENT_BY_LANGUAGE_2");
       let initial = !this._voicesInitialized;
@@ -235,41 +234,38 @@ NarrateControls.prototype = {
   },
 
   _onButtonClick(evt) {
-    switch (evt.target.id) {
-      case "narrate-skip-previous":
-        this.narrator.skipPrevious();
-        break;
-      case "narrate-skip-next":
-        this.narrator.skipNext();
-        break;
-      case "narrate-start-stop":
-        if (this.narrator.speaking) {
-          this.narrator.stop();
-        } else {
-          this._updateSpeechControls(true);
-          let options = { rate: this.rate, voice: this.voice };
-          this.narrator.start(options).then(() => {
-            this._updateSpeechControls(false);
-          }, err => {
-            Cu.reportError(`Narrate failed: ${err}.`);
-            this._updateSpeechControls(false);
-          });
-        }
-        break;
+    var classList = evt.target.classList;
+    if (classList.contains("narrate-skip-previous")) {
+      this.narrator.skipPrevious();
+    } else if (classList.contains("narrate-skip-next")) {
+      this.narrator.skipNext();
+    } else if (classList.contains("narrate-start-stop")) {
+      if (this.narrator.speaking) {
+        this.narrator.stop();
+      } else {
+        this._updateSpeechControls(true);
+        let options = { rate: this.rate, voice: this.voice };
+        this.narrator.start(options).then(() => {
+          this._updateSpeechControls(false);
+        }, err => {
+          Cu.reportError(`Narrate failed: ${err}.`);
+          this._updateSpeechControls(false);
+        });
+      }
     }
   },
 
   _updateSpeechControls(speaking) {
-    let dropdown = this._doc.getElementById("narrate-dropdown");
+    let dropdown = this._doc.querySelector(".narrate-dropdown");
     dropdown.classList.toggle("keep-open", speaking);
     dropdown.classList.toggle("speaking", speaking);
 
-    let startStopButton = this._doc.getElementById("narrate-start-stop");
+    let startStopButton = this._doc.querySelector(".narrate-start-stop");
     startStopButton.title =
       gStrings.GetStringFromName(speaking ? "stop" : "start");
 
-    this._doc.getElementById("narrate-skip-previous").disabled = !speaking;
-    this._doc.getElementById("narrate-skip-next").disabled = !speaking;
+    this._doc.querySelector(".narrate-skip-previous").disabled = !speaking;
+    this._doc.querySelector(".narrate-skip-next").disabled = !speaking;
 
     if (speaking) {
       TelemetryStopwatch.start("NARRATE_CONTENT_SPEAKTIME_MS", this);
@@ -332,7 +328,7 @@ NarrateControls.prototype = {
 
   get rate() {
     return this._convertRate(
-      this._doc.getElementById("narrate-rate-input").value);
+      this._doc.querySelector(".narrate-rate-input").value);
   },
 
   get voice() {
diff --git a/toolkit/components/narrate/Narrator.jsm b/toolkit/components/narrate/Narrator.jsm
index 4fecd383ce61..ac0b2e040807 100644
--- a/toolkit/components/narrate/Narrator.jsm
+++ b/toolkit/components/narrate/Narrator.jsm
@@ -89,7 +89,7 @@ Narrator.prototype = {
       // are no other strong references, and it will be GC'ed. Instead,
       // we rely on the window's lifetime and use it as a weak reference.
       this._treeWalkerRef.set(this._win,
-        this._doc.createTreeWalker(this._doc.getElementById("container"),
+        this._doc.createTreeWalker(this._doc.querySelector(".container"),
           nf.SHOW_ELEMENT, filter, false));
     }
 
diff --git a/toolkit/components/reader/AboutReader.jsm b/toolkit/components/reader/AboutReader.jsm
index 3802c2f10896..4c89c2913d76 100644
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/toolkit/components/reader/AboutReader.jsm
@@ -55,14 +55,15 @@ var AboutReader = function(mm, win, articlePromise) {
     this._articlePromise = articlePromise;
   }
 
-  this._headerElementRef = Cu.getWeakReference(doc.getElementById("reader-header"));
-  this._domainElementRef = Cu.getWeakReference(doc.getElementById("reader-domain"));
-  this._titleElementRef = Cu.getWeakReference(doc.getElementById("reader-title"));
-  this._readTimeElementRef = Cu.getWeakReference(doc.getElementById("reader-estimated-time"));
-  this._creditsElementRef = Cu.getWeakReference(doc.getElementById("reader-credits"));
-  this._contentElementRef = Cu.getWeakReference(doc.getElementById("moz-reader-content"));
-  this._toolbarElementRef = Cu.getWeakReference(doc.getElementById("reader-toolbar"));
-  this._messageElementRef = Cu.getWeakReference(doc.getElementById("reader-message"));
+  this._headerElementRef = Cu.getWeakReference(doc.querySelector(".reader-header"));
+  this._domainElementRef = Cu.getWeakReference(doc.querySelector(".reader-domain"));
+  this._titleElementRef = Cu.getWeakReference(doc.querySelector(".reader-title"));
+  this._readTimeElementRef = Cu.getWeakReference(doc.querySelector(".reader-estimated-time"));
+  this._creditsElementRef = Cu.getWeakReference(doc.querySelector(".reader-credits"));
+  this._contentElementRef = Cu.getWeakReference(doc.querySelector(".moz-reader-content"));
+  this._toolbarElementRef = Cu.getWeakReference(doc.querySelector(".reader-toolbar"));
+  this._messageElementRef = Cu.getWeakReference(doc.querySelector(".reader-message"));
+  this._containerElementRef = Cu.getWeakReference(doc.querySelector(".container"));
 
   this._scrollOffset = win.pageYOffset;
 
@@ -173,6 +174,10 @@ AboutReader.prototype = {
     return this._messageElementRef.get();
   },
 
+  get _containerElement() {
+    return this._containerElementRef.get();
+  },
+
   get _isToolbarVertical() {
     if (this._toolbarVertical !== undefined) {
       return this._toolbarVertical;
@@ -200,26 +205,26 @@ AboutReader.prototype = {
 
       case "Reader:AddButton": {
         if (message.data.id && message.data.image &&
-            !this._doc.getElementById(message.data.id)) {
+            !this._doc.getElementsByClassName(message.data.id)[0]) {
           let btn = this._doc.createElement("button");
-          btn.setAttribute("class", "button");
-          btn.setAttribute("style", "background-image: url('" + message.data.image + "')");
-          btn.setAttribute("id", message.data.id);
+          btn.dataset.buttonid = message.data.id;
+          btn.className = "button " + message.data.id;
+          btn.style.backgroundImage = "url('" + message.data.image + "')";
           if (message.data.title)
-            btn.setAttribute("title", message.data.title);
+            btn.title = message.data.title;
           if (message.data.text)
             btn.textContent = message.data.text;
-          let tb = this._doc.getElementById("reader-toolbar");
+          let tb = this._toolbarElement;
           tb.appendChild(btn);
           this._setupButton(message.data.id, button => {
-            this._mm.sendAsyncMessage("Reader:Clicked-" + button.getAttribute("id"), { article: this._article });
+            this._mm.sendAsyncMessage("Reader:Clicked-" + button.dataset.buttonid, { article: this._article });
           });
         }
         break;
       }
       case "Reader:RemoveButton": {
         if (message.data.id) {
-          let btn = this._doc.getElementById(message.data.id);
+          let btn = this._doc.getElementsByClassName(message.data.id)[0];
           if (btn)
             btn.remove();
         }
@@ -303,7 +308,7 @@ AboutReader.prototype = {
   },
 
   _setFontSize(newFontSize) {
-    let containerClasses = this._doc.getElementById("container").classList;
+    let containerClasses = this._containerElement.classList;
 
     if (this._fontSize > 0)
       containerClasses.remove("font-size" + this._fontSize);
@@ -318,14 +323,14 @@ AboutReader.prototype = {
     const FONT_SIZE_MAX = 9;
 
     // Sample text shown in Android UI.
-    let sampleText = this._doc.getElementById("font-size-sample");
+    let sampleText = this._doc.querySelector(".font-size-sample");
     sampleText.textContent = gStrings.GetStringFromName("aboutReader.fontTypeSample");
 
     let currentSize = Services.prefs.getIntPref("reader.font_size");
     currentSize = Math.max(FONT_SIZE_MIN, Math.min(FONT_SIZE_MAX, currentSize));
 
-    let plusButton = this._doc.getElementById("font-size-plus");
-    let minusButton = this._doc.getElementById("font-size-minus");
+    let plusButton = this._doc.querySelector(".plus-button");
+    let minusButton = this._doc.querySelector(".minus-button");
 
     function updateControls() {
       if (currentSize === FONT_SIZE_MIN) {
@@ -375,7 +380,7 @@ AboutReader.prototype = {
   },
 
   _setContentWidth(newContentWidth) {
-    let containerClasses = this._doc.getElementById("container").classList;
+    let containerClasses = this._containerElement.classList;
 
     if (this._contentWidth > 0)
       containerClasses.remove("content-width" + this._contentWidth);
@@ -392,8 +397,8 @@ AboutReader.prototype = {
     let currentContentWidth = Services.prefs.getIntPref("reader.content_width");
     currentContentWidth = Math.max(CONTENT_WIDTH_MIN, Math.min(CONTENT_WIDTH_MAX, currentContentWidth));
 
-    let plusButton = this._doc.getElementById("content-width-plus");
-    let minusButton = this._doc.getElementById("content-width-minus");
+    let plusButton = this._doc.querySelector(".content-width-plus-button");
+    let minusButton = this._doc.querySelector(".content-width-minus-button");
 
     function updateControls() {
       if (currentContentWidth === CONTENT_WIDTH_MIN) {
@@ -443,7 +448,7 @@ AboutReader.prototype = {
   },
 
   _setLineHeight(newLineHeight) {
-    let contentClasses = this._doc.getElementById("moz-reader-content").classList;
+    let contentClasses = this._contentElement.classList;
 
     if (this._lineHeight > 0)
       contentClasses.remove("line-height" + this._lineHeight);
@@ -460,8 +465,8 @@ AboutReader.prototype = {
     let currentLineHeight = Services.prefs.getIntPref("reader.line_height");
     currentLineHeight = Math.max(LINE_HEIGHT_MIN, Math.min(LINE_HEIGHT_MAX, currentLineHeight));
 
-    let plusButton = this._doc.getElementById("line-height-plus");
-    let minusButton = this._doc.getElementById("line-height-minus");
+    let plusButton = this._doc.querySelector(".line-height-plus-button");
+    let minusButton = this._doc.querySelector(".line-height-minus-button");
 
     function updateControls() {
       if (currentLineHeight === LINE_HEIGHT_MIN) {
@@ -876,7 +881,7 @@ AboutReader.prototype = {
 
   _setupSegmentedButton(id, options, initialValue, callback) {
     let doc = this._doc;
-    let segmentedButton = doc.getElementById(id);
+    let segmentedButton = doc.getElementsByClassName(id)[0];
 
     for (let i = 0; i < options.length; i++) {
       let option = options[i];
@@ -930,7 +935,7 @@ AboutReader.prototype = {
       this._setButtonTip(id, titleEntity);
     }
 
-    let button = this._doc.getElementById(id);
+    let button = this._doc.getElementsByClassName(id)[0];
     if (textEntity) {
       button.textContent = gStrings.GetStringFromName(textEntity);
     }
@@ -951,12 +956,12 @@ AboutReader.prototype = {
    * @param   Localizable string providing UI element usage tip.
    */
   _setButtonTip(id, titleEntity) {
-    let button = this._doc.getElementById(id);
+    let button = this._doc.getElementsByClassName(id)[0];
     button.setAttribute("title", gStrings.GetStringFromName(titleEntity));
   },
 
   _setupStyleDropdown() {
-    let dropdownToggle = this._doc.querySelector("#style-dropdown .dropdown-toggle");
+    let dropdownToggle = this._doc.querySelector(".style-dropdown .dropdown-toggle");
     dropdownToggle.setAttribute("title", gStrings.GetStringFromName("aboutReader.toolbar.typeControls"));
   },
 
diff --git a/toolkit/components/reader/content/aboutReader.html b/toolkit/components/reader/content/aboutReader.html
index 635ba6bdb5b5..1aa6444741e5 100644
--- a/toolkit/components/reader/content/aboutReader.html
+++ b/toolkit/components/reader/content/aboutReader.html
@@ -11,52 +11,52 @@
 </head>
 
 <body>
-  <div id="container" class="container">
-    <div id="reader-header" class="header">
-      <a id="reader-domain" class="domain"></a>
+  <div class="container">
+    <div class="header reader-header">
+      <a class="domain reader-domain"></a>
       <div class="domain-border"></div>
-      <h1 id="reader-title"></h1>
-      <div id="reader-credits" class="credits"></div>
-      <div id="meta-data" class="meta-data">
-        <div id="reader-estimated-time"></div>
+      <h1 class="reader-title"></h1>
+      <div class="credits reader-credits"></div>
+      <div class="meta-data">
+        <div class="reader-estimated-time"></div>
       </div>
     </div>
 
     <hr>
 
     <div class="content">
-      <div id="moz-reader-content"></div>
+      <div class="moz-reader-content"></div>
     </div>
 
     <div>
-      <div id="reader-message"></div>
+      <div class="reader-message"></div>
     </div>
   </div>
 
-  <ul id="reader-toolbar" class="toolbar">
-    <li><button id="close-button" class="button close-button"/></li>
-    <ul id="style-dropdown" class="dropdown">
+  <ul class="toolbar reader-toolbar">
+    <li><button class="button close-button"/></li>
+    <ul class="dropdown style-dropdown">
       <li><button class="dropdown-toggle button style-button"/></li>
-      <li id="reader-popup" class="dropdown-popup">
-        <div id="font-type-buttons"></div>
+      <li class="dropdown-popup">
+        <div class="font-type-buttons"></div>
         <hr>
-        <div id="font-size-buttons">
-          <button id="font-size-minus" class="minus-button"/>
-          <button id="font-size-sample"/>
-          <button id="font-size-plus" class="plus-button"/>
+        <div class="font-size-buttons">
+          <button class="minus-button"/>
+          <button class="font-size-sample"/>
+          <button class="plus-button"/>
         </div>
         <hr>
-        <div id="content-width-buttons">
-          <button id="content-width-minus" class="content-width-minus-button"/>
-          <button id="content-width-plus" class="content-width-plus-button"/>
+        <div class="content-width-buttons">
+          <button class="content-width-minus-button"/>
+          <button class="content-width-plus-button"/>
         </div>
         <hr>
-        <div id="line-height-buttons">
-          <button id="line-height-minus" class="line-height-minus-button"/>
-          <button id="line-height-plus" class="line-height-plus-button"/>
+        <div class="line-height-buttons">
+          <button class="line-height-minus-button"/>
+          <button class="line-height-plus-button"/>
         </div>
         <hr>
-        <div id="color-scheme-buttons"></div>
+        <div class="color-scheme-buttons"></div>
         <div class="dropdown-arrow"/>
       </li>
     </ul>
diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
index 7b63f56e3e84..32f7dce08214 100644
--- a/toolkit/themes/shared/aboutReader.css
+++ b/toolkit/themes/shared/aboutReader.css
@@ -2,6 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* Avoid adding ID selector rules in this style sheet, since they could
+ * inadvertently match elements in the article content. */
+
 body {
   padding: 64px 51px;
 }
@@ -43,80 +46,80 @@ body.serif .remove-button  {
   font-family: Georgia, "Times New Roman", serif;
 }
 
-#container {
+.container {
   max-width: 30em;
   margin: 0 auto;
 }
 
-#container.font-size1 {
+.container.font-size1 {
   font-size: 12px;
 }
 
-#container.font-size2 {
+.container.font-size2 {
   font-size: 14px;
 }
 
-#container.font-size3 {
+.container.font-size3 {
   font-size: 16px;
 }
 
-#container.font-size4  {
+.container.font-size4  {
   font-size: 18px;
 }
 
-#container.font-size5 {
+.container.font-size5 {
   font-size: 20px;
 }
 
-#container.font-size6 {
+.container.font-size6 {
   font-size: 22px;
 }
 
-#container.font-size7 {
+.container.font-size7 {
   font-size: 24px;
 }
 
-#container.font-size8 {
+.container.font-size8 {
   font-size: 26px;
 }
 
-#container.font-size9 {
+.container.font-size9 {
   font-size: 28px;
 }
 
-#container.content-width1 {
+.container.content-width1 {
   max-width: 20em;
 }
 
-#container.content-width2 {
+.container.content-width2 {
   max-width: 25em;
 }
 
-#container.content-width3 {
+.container.content-width3 {
   max-width: 30em;
 }
 
-#container.content-width4  {
+.container.content-width4  {
   max-width: 35em;
 }
 
-#container.content-width5 {
+.container.content-width5 {
   max-width: 40em;
 }
 
-#container.content-width6 {
+.container.content-width6 {
   max-width: 45em;
 }
 
-#container.content-width7 {
+.container.content-width7 {
   max-width: 50em;
 }
 
-#container.content-width8 {
+.container.content-width8 {
   max-width: 55em;
 }
 
-#container.content-width9 {
+.container.content-width9 {
   max-width: 60em;
 }
 
@@ -189,7 +192,7 @@ body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
 
 /* Loading/error message */
 
-#reader-message {
+.reader-message {
   margin-top: 40px;
   display: none;
   text-align: center;
@@ -328,91 +331,91 @@ body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
 
 /*======= Font style popup =======*/
 
-#font-type-buttons,
-#font-size-buttons,
-#color-scheme-buttons,
-#content-width-buttons,
-#line-height-buttons {
+.font-type-buttons,
+.font-size-buttons,
+.color-scheme-buttons,
+.content-width-buttons,
+.line-height-buttons {
   display: flex;
   flex-direction: row;
 }
 
-#font-type-buttons > button:first-child {
+.font-type-buttons > button:first-child {
   border-top-left-radius: 3px;
 }
-#font-type-buttons > button:last-child {
+.font-type-buttons > button:last-child {
   border-top-right-radius: 3px;
 }
-#color-scheme-buttons > button:first-child {
+.color-scheme-buttons > button:first-child {
   border-bottom-left-radius: 3px;
 }
-#color-scheme-buttons > button:last-child {
+.color-scheme-buttons > button:last-child {
   border-bottom-right-radius: 3px;
 }
 
-#font-type-buttons > button,
-#font-size-buttons > button,
-#color-scheme-buttons > button,
-#content-width-buttons > button,
-#line-height-buttons > button {
+.font-type-buttons > button,
+.font-size-buttons > button,
+.color-scheme-buttons > button,
+.content-width-buttons > button,
+.line-height-buttons > button {
   text-align: center;
   border: 0;
 }
 
-#font-type-buttons > button,
-#font-size-buttons > button,
-#content-width-buttons > button,
-#line-height-buttons > button {
+.font-type-buttons > button,
+.font-size-buttons > button,
+.content-width-buttons > button,
+.line-height-buttons > button {
   width: 50%;
   background-color: transparent;
   border-left: 1px solid #B5B5B5;
   border-bottom: 1px solid #B5B5B5;
 }
 
-#color-scheme-buttons > button {
+.color-scheme-buttons > button {
   width: 33.33%;
   font-size: 14px;
 }
 
-#color-scheme-buttons > .dark-button {
+.color-scheme-buttons > .dark-button {
   margin-top: -1px;
   height: 61px;
 }
 
-#font-type-buttons > button:first-child,
-#font-size-buttons > button:first-child,
-#content-width-buttons > button:first-child,
-#line-height-buttons > button:first-child {
+.font-type-buttons > button:first-child,
+.font-size-buttons > button:first-child,
+.content-width-buttons > button:first-child,
+.line-height-buttons > button:first-child {
   border-left: 0;
 }
 
-#font-type-buttons > button {
+.font-type-buttons > button {
   display: inline-block;
   font-size: 62px;
   height: 100px;
 }
 
-#font-size-buttons > button,
-#color-scheme-buttons > button,
-#content-width-buttons > button,
-#line-height-buttons > button {
+.font-size-buttons > button,
+.color-scheme-buttons > button,
+.content-width-buttons > button,
+.line-height-buttons > button {
   height: 60px;
 }
 
-#font-type-buttons > button:active:hover,
-#font-type-buttons > button.selected,
-#color-scheme-buttons > button:active:hover,
-#color-scheme-buttons > button.selected {
+.font-type-buttons > button:active:hover,
+.font-type-buttons > button.selected,
+.color-scheme-buttons > button:active:hover,
+.color-scheme-buttons > button.selected {
   box-shadow: inset 0 -3px 0 0 #fc6420;
 }
 
-#font-type-buttons > button:active:hover,
-#font-type-buttons > button.selected {
+.font-type-buttons > button:active:hover,
+.font-type-buttons > button.selected {
   border-bottom: 1px solid #FC6420;
 }
 
 /* Make the serif button content the same size as the sans-serif button content. */
-#font-type-buttons > button > .description {
+.font-type-buttons > button > .description {
   color: #666;
   font-size: 12px;
   margin-top: -5px;
@@ -420,64 +423,64 @@ body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
 
 /* Font sizes are different per-platform, so we need custom CSS to line them up. */
 %ifdef XP_MACOSX
-#font-type-buttons > .sans-serif-button > .name {
+.font-type-buttons > .sans-serif-button > .name {
   margin-top: 10px;
 }
 
-#font-type-buttons > .sans-serif-button > .description {
+.font-type-buttons > .sans-serif-button > .description {
   margin-top: -4px;
 }
 
-#font-type-buttons > .serif-button > .name {
+.font-type-buttons > .serif-button > .name {
   font-size: 63px;
 }
 %elifdef XP_WIN
-#font-type-buttons > .sans-serif-button > .name {
+.font-type-buttons > .sans-serif-button > .name {
   margin-top: 2px;
 }
 
-#font-type-buttons > .sans-serif-button > .description {
+.font-type-buttons > .sans-serif-button > .description {
   margin-top: -4px;
 }
 
-#font-type-buttons > .serif-button > .name {
+.font-type-buttons > .serif-button > .name {
   font-size: 63px;
 }
 %else
-#font-type-buttons > .sans-serif-button > .name {
+.font-type-buttons > .sans-serif-button > .name {
   margin-top: 5px;
 }
 
-#font-type-buttons > .sans-serif-button > .description {
+.font-type-buttons > .sans-serif-button > .description {
   margin-top: -8px;
 }
 
-#font-type-buttons > .serif-button > .name {
+.font-type-buttons > .serif-button > .name {
   font-size: 70px;
 }
 %endif
 
 .button:hover,
-#font-size-buttons > button:hover,
-#font-type-buttons > button:hover,
-#content-width-buttons > button:hover,
-#line-height-buttons > button:hover {
+.font-size-buttons > button:hover,
+.font-type-buttons > button:hover,
+.content-width-buttons > button:hover,
+.line-height-buttons > button:hover {
   background-color: #ebebeb;
 }
 
 .dropdown.open,
 .button:active,
-#font-size-buttons > button:active,
-#font-size-buttons > button.selected,
-#content-width-buttons > button:active,
-#content-width-buttons > button.selected,
-#line-height-buttons > button:active,
-#line-height-buttons > button.selected {
+.font-size-buttons > button:active,
+.font-size-buttons > button.selected,
+.content-width-buttons > button:active,
+.content-width-buttons > button.selected,
+.line-height-buttons > button:active,
+.line-height-buttons > button.selected {
   background-color: #dadada;
 }
 
 /* Only used on Android */
-#font-size-sample {
+.font-size-sample {
   display: none;
 }
 
@@ -561,178 +564,178 @@ body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
  * must be added to CLASSES_TO_PRESERVE in ReaderMode.jsm, so that
  * Readability.js doesn't strip them out */
 
-#moz-reader-content {
+.moz-reader-content {
   display: none;
   font-size: 1em;
   line-height: 1.6em;
 }
 
-#moz-reader-content.line-height1 {
+.moz-reader-content.line-height1 {
   line-height: 1em;
 }
 
-#moz-reader-content.line-height2 {
+.moz-reader-content.line-height2 {
   line-height: 1.2em;
 }
 
-#moz-reader-content.line-height3 {
+.moz-reader-content.line-height3 {
   line-height: 1.4em;
 }
 
-#moz-reader-content.line-height4 {
+.moz-reader-content.line-height4 {
   line-height: 1.6em;
 }
 
-#moz-reader-content.line-height5 {
+.moz-reader-content.line-height5 {
   line-height: 1.8em;
 }
 
-#moz-reader-content.line-height6 {
+.moz-reader-content.line-height6 {
   line-height: 2.0em;
 }
 
-#moz-reader-content.line-height7 {
+.moz-reader-content.line-height7 {
   line-height: 2.2em;
 }
 
-#moz-reader-content.line-height8 {
+.moz-reader-content.line-height8 {
   line-height: 2.4em;
 }
 
-#moz-reader-content.line-height9 {
+.moz-reader-content.line-height9 {
   line-height: 2.6em;
 }
 
 @media print {
-  #moz-reader-content p,
-  #moz-reader-content code,
-  #moz-reader-content pre,
-  #moz-reader-content blockquote,
-  #moz-reader-content ul,
-  #moz-reader-content ol,
-  #moz-reader-content li,
-  #moz-reader-content figure,
-  #moz-reader-content .wp-caption {
+  .moz-reader-content p,
+  .moz-reader-content code,
+  .moz-reader-content pre,
+  .moz-reader-content blockquote,
+  .moz-reader-content ul,
+  .moz-reader-content ol,
+  .moz-reader-content li,
+  .moz-reader-content figure,
+  .moz-reader-content .wp-caption {
     margin: 0 0 10px 0 !important;
     padding: 0 !important;
   }
 }
 
-#moz-reader-content h1,
-#moz-reader-content h2,
-#moz-reader-content h3 {
+.moz-reader-content h1,
+.moz-reader-content h2,
+.moz-reader-content h3 {
   font-weight: bold;
 }
 
-#moz-reader-content h1 {
+.moz-reader-content h1 {
   font-size: 1.6em;
   line-height: 1.25em;
 }
 
-#moz-reader-content h2 {
+.moz-reader-content h2 {
   font-size: 1.2em;
   line-height: 1.51em;
 }
 
-#moz-reader-content h3 {
+.moz-reader-content h3 {
   font-size: 1em;
   line-height: 1.66em;
 }
 
-#moz-reader-content a:link {
+.moz-reader-content a:link {
   text-decoration: underline;
   font-weight: normal;
 }
 
-#moz-reader-content a:link,
-#moz-reader-content a:link:hover,
-#moz-reader-content a:link:active {
+.moz-reader-content a:link,
+.moz-reader-content a:link:hover,
+.moz-reader-content a:link:active {
   color: #0095dd;
 }
 
-#moz-reader-content a:visited {
+.moz-reader-content a:visited {
   color: #c2e;
 }
 
-#moz-reader-content * {
+.moz-reader-content * {
   max-width: 100%;
   height: auto;
 }
 
-#moz-reader-content p,
-#moz-reader-content p,
-#moz-reader-content code,
-#moz-reader-content pre,
-#moz-reader-content blockquote,
-#moz-reader-content ul,
-#moz-reader-content ol,
-#moz-reader-content li,
-#moz-reader-content figure,
-#moz-reader-content .wp-caption {
+.moz-reader-content p,
+.moz-reader-content p,
+.moz-reader-content code,
+.moz-reader-content pre,
+.moz-reader-content blockquote,
+.moz-reader-content ul,
+.moz-reader-content ol,
+.moz-reader-content li,
+.moz-reader-content figure,
+.moz-reader-content .wp-caption {
   margin: -10px -10px 20px -10px;
   padding: 10px;
   border-radius: 5px;
 }
 
-#moz-reader-content li {
+.moz-reader-content li {
   margin-bottom: 0;
 }
 
-#moz-reader-content li > ul,
-#moz-reader-content li > ol {
+.moz-reader-content li > ul,
+.moz-reader-content li > ol {
   margin-bottom: -10px;
 }
 
-#moz-reader-content p > img:only-child,
-#moz-reader-content p > a:only-child > img:only-child,
-#moz-reader-content .wp-caption img,
-#moz-reader-content figure img {
+.moz-reader-content p > img:only-child,
+.moz-reader-content p > a:only-child > img:only-child,
+.moz-reader-content .wp-caption img,
+.moz-reader-content figure img {
   display: block;
 }
 
-#moz-reader-content img[moz-reader-center] {
+.moz-reader-content img[moz-reader-center] {
   margin-left: auto;
   margin-right: auto;
 }
 
-#moz-reader-content .caption,
-#moz-reader-content .wp-caption-text
-#moz-reader-content figcaption {
+.moz-reader-content .caption,
+.moz-reader-content .wp-caption-text
+.moz-reader-content figcaption {
   font-size: 0.9em;
   line-height: 1.48em;
   font-style: italic;
 }
 
-#moz-reader-content code,
-#moz-reader-content pre {
+.moz-reader-content code,
+.moz-reader-content pre {
   white-space: pre-wrap;
 }
 
-#moz-reader-content blockquote {
+.moz-reader-content blockquote {
   padding: 0;
   padding-inline-start: 16px;
 }
 
-#moz-reader-content ul,
-#moz-reader-content ol {
+.moz-reader-content ul,
+.moz-reader-content ol {
   padding: 0;
 }
 
-#moz-reader-content ul {
+.moz-reader-content ul {
   padding-inline-start: 30px;
   list-style: disc;
 }
 
-#moz-reader-content ol {
+.moz-reader-content ol {
   padding-inline-start: 30px;
   list-style: decimal;
 }
 
 /* Hide elements with common "hidden" class names */
-#moz-reader-content .visually-hidden,
-#moz-reader-content .visuallyhidden,
-#moz-reader-content .hidden,
-#moz-reader-content .invisible,
-#moz-reader-content .sr-only {
+.moz-reader-content .visually-hidden,
+.moz-reader-content .visuallyhidden,
+.moz-reader-content .hidden,
+.moz-reader-content .invisible,
+.moz-reader-content .sr-only {
   display: none;
 }
diff --git a/toolkit/themes/shared/narrate.css b/toolkit/themes/shared/narrate.css
index bafdab8deec4..bfab390cbe95 100644
--- a/toolkit/themes/shared/narrate.css
+++ b/toolkit/themes/shared/narrate.css
@@ -1,3 +1,6 @@
+/* Avoid adding ID selector rules in this style sheet, since they could
+ * inadvertently match elements in the article content. */
+
 .narrating {
   position: relative;
   z-index: 1;
@@ -45,20 +48,20 @@ body.dark .narrate-word-highlight {
   border-bottom-color: #6f6f6f;
 }
 
-#narrate-dropdown {
+.narrate-dropdown {
   --border-color: #e5e5e5;
 }
 
-#narrate-toggle > svg {
+.narrate-toggle > svg {
   display: block;
   margin: 0 8px;
 }
 
-.dropdown-popup button {
+.narrate-dropdown > .dropdown-popup button {
   background-color: transparent;
 }
 
-.dropdown-popup button:hover:not(:disabled) {
+.narrate-dropdown > .dropdown-popup button:hover:not(:disabled) {
   background-color: #eaeaea;
 }
 
@@ -75,7 +78,7 @@ body.dark .narrate-word-highlight {
 
 /* Control buttons */
 
-#narrate-control > button {
+.narrate-control > button {
   background-size: 24px 24px;
   background-repeat: no-repeat;
   background-position: center center;
@@ -86,40 +89,40 @@ body.dark .narrate-word-highlight {
   box-sizing: border-box;
 }
 
-#narrate-control > button:not(:first-child) {
+.narrate-control > button:not(:first-child) {
   border-left: 1px solid var(--border-color);
 }
 
-#narrate-skip-previous {
+.narrate-skip-previous {
   border-top-left-radius: 3px;
   background-image: url("chrome://global/skin/narrate/back.svg");
   -moz-context-properties: fill;
   fill: rgb(128 128 128);
 }
 
-#narrate-skip-next {
+.narrate-skip-next {
   border-top-right-radius: 3px;
   background-image: url("chrome://global/skin/narrate/forward.svg");
   -moz-context-properties: fill;
   fill: rgb(128 128 128);
 }
 
-#narrate-skip-previous:disabled,
-#narrate-skip-next:disabled {
+.narrate-skip-previous:disabled,
+.narrate-skip-next:disabled {
   fill: rgb(128 128 128 / 50%);
 }
 
-#narrate-start-stop {
+.narrate-start-stop {
   background-image: url("chrome://global/skin/narrate/start.svg");
 }
 
-#narrate-dropdown.speaking #narrate-start-stop {
+.narrate-dropdown.speaking .narrate-start-stop {
   background-image: url("chrome://global/skin/narrate/stop.svg");
 }
 
 /* Rate control */
 
-#narrate-rate::before, #narrate-rate::after {
+.narrate-rate::before, .narrate-rate::after {
   content: '';
   width: 48px;
   height: 40px;
@@ -128,30 +131,30 @@ body.dark .narrate-word-highlight {
   background-size: 24px auto;
 }
 
-#narrate-rate::before {
+.narrate-rate::before {
   background-image: url("chrome://global/skin/narrate/slow.svg");
 }
 
-#narrate-rate::after {
+.narrate-rate::after {
   background-image: url("chrome://global/skin/narrate/fast.svg");
 }
 
-#narrate-rate-input {
+.narrate-rate-input {
   margin: 0 1px;
   flex-grow: 1;
 }
 
-#narrate-rate-input::-moz-range-track {
+.narrate-rate-input::-moz-range-track {
   background-color: #979797;
   height: 2px;
 }
 
-#narrate-rate-input::-moz-range-progress {
+.narrate-rate-input::-moz-range-progress {
   background-color: #2EA3FF;
   height: 2px;
 }
 
-#narrate-rate-input::-moz-range-thumb {
+.narrate-rate-input::-moz-range-thumb {
   background-color: #808080;
   height: 16px;
   width: 16px;
@@ -159,7 +162,7 @@ body.dark .narrate-word-highlight {
   border-width: 0;
 }
 
-#narrate-rate-input:active::-moz-range-thumb {
+.narrate-rate-input:active::-moz-range-thumb {
   background-color: #2EA3FF;
 }
 

From 6a9b7d564e7f007314420048e7b9de52b0565001 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Fri, 1 Dec 2017 18:15:37 +0100
Subject: [PATCH 162/219] Bug 1408935 - enable
 browser_webconsole_errors_after_page_reload.js;r=nchevobbe

MozReview-Commit-ID: LMfIeeIy61Y

--HG--
extra : rebase_source : 3bdd3d801641d3a1024434f72ef2f926277d19b4
---
 .../test/mochitest/browser.ini                |  1 -
 ...ser_webconsole_errors_after_page_reload.js | 53 +++++++------------
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
index 2dea2ce9dda7..b4e24b2e7559 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -274,7 +274,6 @@ skip-if = true #	Bug 1404368
 [browser_webconsole_duplicate_errors.js]
 skip-if = true #	Bug 1403907
 [browser_webconsole_errors_after_page_reload.js]
-skip-if = true # Bug 1408935
 [browser_webconsole_eval_in_debugger_stackframe.js]
 [browser_webconsole_eval_in_debugger_stackframe2.js]
 skip-if = true # Bug 1408893
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js
index af00bf913a38..3fcf95735b3a 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js
@@ -10,41 +10,28 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "test/test-error.html";
+                 "new-console-output/test/mochitest/test-error.html";
 
-function test() {
-  Task.spawn(function* () {
-    const {tab} = yield loadTab(TEST_URI);
-    const hud = yield openConsole(tab);
-    info("console opened");
+add_task(async function () {
+  let hud = await openNewTabAndConsole(TEST_URI);
 
-    executeSoon(() => {
-      hud.jsterm.clearOutput();
-      info("wait for reload");
-      content.location.reload();
-    });
+  info("Reload the content window");
+  let onNavigate = hud.target.once("navigate");
+  ContentTask.spawn(gBrowser.selectedBrowser, null, () => {
+    content.wrappedJSObject.location.reload();
+  });
+  await onNavigate;
+  info("Target navigated");
 
-    yield hud.target.once("navigate");
-    info("target navigated");
+  // On e10s, the exception is triggered in child process
+  // and is ignored by test harness
+  if (!Services.appinfo.browserTabsRemoteAutostart) {
+    expectUncaughtException();
+  }
 
-    let button = content.document.querySelector("button");
-    ok(button, "button found");
+  let onMessage = waitForMessage(hud, "fooBazBaz is not defined");
+  BrowserTestUtils.synthesizeMouseAtCenter("button", {}, gBrowser.selectedBrowser);
+  await onMessage;
 
-    // On e10s, the exception is triggered in child process
-    // and is ignored by test harness
-    if (!Services.appinfo.browserTabsRemoteAutostart) {
-      expectUncaughtException();
-    }
-
-    EventUtils.sendMouseEvent({type: "click"}, button, content);
-
-    yield waitForMessages({
-      webconsole: hud,
-      messages: [{
-        text: "fooBazBaz is not defined",
-        category: CATEGORY_JS,
-        severity: SEVERITY_ERROR,
-      }],
-    });
-  }).then(finishTest);
-}
+  ok(true, "Received the expected error message");
+});

From 146148c4c03846926af7a9d52f6dc070f62f4c42 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Fri, 1 Dec 2017 17:19:41 +0100
Subject: [PATCH 163/219] Bug 1408940 - enable
 browser_webconsole_history_nav.js;r=nchevobbe

MozReview-Commit-ID: LCLeM9cj7TX

--HG--
rename : devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_nav.js => devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_nav.js
extra : rebase_source : fc669c69d30819d5a4950c5106efdd9e74112f23
---
 .../test/mochitest/browser.ini                |  3 +-
 ...y_nav.js => browser_jsterm_history_nav.js} | 36 +++++++++----------
 2 files changed, 17 insertions(+), 22 deletions(-)
 rename devtools/client/webconsole/new-console-output/test/mochitest/{browser_webconsole_history_nav.js => browser_jsterm_history_nav.js} (64%)

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
index b4e24b2e7559..31f107c92ac5 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -215,6 +215,7 @@ skip-if = true #	Bug 1403188
 [browser_jsterm_dollar.js]
 [browser_jsterm_history.js]
 [browser_jsterm_history_persist.js]
+[browser_jsterm_history_nav.js]
 [browser_jsterm_inspect.js]
 [browser_jsterm_multiline.js]
 [browser_jsterm_no_autocompletion_on_defined_variables.js]
@@ -291,8 +292,6 @@ skip-if = true #	Bug 1404853
 # old console skip-if = true # Requires direct access to content nodes
 [browser_webconsole_history_arrow_keys.js]
 skip-if = true # Bug 1408939
-[browser_webconsole_history_nav.js]
-skip-if = true # Bug 1408940
 [browser_webconsole_hpkp_invalid-headers.js]
 skip-if = true #	Bug 1405340
 # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_nav.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_nav.js
similarity index 64%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_nav.js
rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_nav.js
index 3c177662512f..255af0cc58a5 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_nav.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_nav.js
@@ -5,24 +5,17 @@
 
 "use strict";
 
-// See Bug 660806.
+// See Bug 660806. Check that history navigation with the UP/DOWN arrows does not trigger
+// autocompletion.
 
 const TEST_URI = "data:text/html;charset=utf-8,<p>bug 660806 - history " +
                  "navigation must not show the autocomplete popup";
 
-add_task(function* () {
-  yield loadTab(TEST_URI);
-
-  let hud = yield openConsole();
-
-  yield consoleOpened(hud);
-});
-
-function consoleOpened(HUD) {
-  let deferred = defer();
-
-  let jsterm = HUD.jsterm;
+add_task(async function () {
+  let { jsterm } = await openNewTabAndConsole(TEST_URI);
   let popup = jsterm.autocompletePopup;
+
+  // The autocomplete popup should never be displayed during the test.
   let onShown = function () {
     ok(false, "popup shown");
   };
@@ -42,15 +35,18 @@ function consoleOpened(HUD) {
      "lastInputValue is correct");
 
   EventUtils.synthesizeKey("VK_RETURN", {});
+
+  let onSetInputValue = jsterm.once("set-input-value");
   EventUtils.synthesizeKey("VK_UP", {});
+  await onSetInputValue;
+
+  // We don't have an explicit event to wait for here, so we just wait for the next tick
+  // before checking the popup status.
+  await new Promise(executeSoon);
 
   is(jsterm.lastInputValue, "window.foobarBug660806.location",
      "lastInputValue is correct, again");
 
-  executeSoon(function () {
-    ok(!popup.isOpen, "popup is not open");
-    popup.off("popup-opened", onShown);
-    executeSoon(deferred.resolve);
-  });
-  return deferred.promise;
-}
+  ok(!popup.isOpen, "popup is not open");
+  popup.off("popup-opened", onShown);
+});

From 035be65ea13eca4b1cd9bbb5385d9da8a93e6c13 Mon Sep 17 00:00:00 2001
From: Coroiu Cristina <ccoroiu@mozilla.com>
Date: Mon, 4 Dec 2017 12:34:37 +0200
Subject: [PATCH 164/219] Backed out 3 changesets (bug 1417837) for ESlint
 failures at
 /builds/worker/checkouts/gecko/toolkit/components/narrate/NarrateControls.jsm
 r=backout on a CLOSED TREE

Backed out changeset 0d6b56293cbf (bug 1417837)
Backed out changeset 1c341a427a7a (bug 1417837)
Backed out changeset fa4f488ea88f (bug 1417837)
---
 mobile/android/themes/core/aboutReader.css    | 427 +-----------
 .../themes/core/aboutReaderContent.css        | 114 ++++
 .../themes/core/aboutReaderControls.css       | 292 +++++++++
 mobile/android/themes/core/jar.mn             |   4 +
 .../components/narrate/NarrateControls.jsm    | 104 +--
 toolkit/components/narrate/Narrator.jsm       |   2 +-
 .../printing/content/simplifyMode.css         |   8 +-
 toolkit/components/reader/AboutReader.jsm     |  65 +-
 toolkit/components/reader/ReaderMode.jsm      |  19 +-
 toolkit/components/reader/ReaderWorker.js     |   5 +-
 .../reader/content/aboutReader.html           |  62 +-
 toolkit/content/browser-content.js            |   6 +
 toolkit/themes/shared/aboutReader.css         | 614 +-----------------
 toolkit/themes/shared/aboutReaderContent.css  | 178 +++++
 toolkit/themes/shared/aboutReaderControls.css | 394 +++++++++++
 toolkit/themes/shared/jar.inc.mn              |   5 +-
 toolkit/themes/shared/narrate.css             | 190 ------
 toolkit/themes/shared/narrateControls.css     | 186 ++++++
 18 files changed, 1337 insertions(+), 1338 deletions(-)
 create mode 100644 mobile/android/themes/core/aboutReaderContent.css
 create mode 100644 mobile/android/themes/core/aboutReaderControls.css
 create mode 100644 toolkit/themes/shared/aboutReaderContent.css
 create mode 100644 toolkit/themes/shared/aboutReaderControls.css
 create mode 100644 toolkit/themes/shared/narrateControls.css

diff --git a/mobile/android/themes/core/aboutReader.css b/mobile/android/themes/core/aboutReader.css
index 28b31daff75f..2df2d1ff6206 100644
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* Avoid adding ID selector rules in this style sheet, since they could
- * inadvertently match elements in the article content. */
-
 html {
   -moz-text-size-adjust: none;
 }
@@ -36,39 +33,39 @@ body.serif {
   font-family: serif;
 }
 
-.container.font-size1 {
+#container.font-size1 {
   font-size: 10px;
 }
 
-.container.font-size2 {
+#container.font-size2 {
   font-size: 12px;
 }
 
-.container.font-size3 {
+#container.font-size3 {
   font-size: 14px;
 }
 
-.container.font-size4  {
+#container.font-size4  {
   font-size: 16px;
 }
 
-.container.font-size5 {
+#container.font-size5 {
   font-size: 18px;
 }
 
-.container.font-size6 {
+#container.font-size6 {
   font-size: 20px;
 }
 
-.container.font-size7 {
+#container.font-size7 {
   font-size: 22px;
 }
 
-.container.font-size8 {
+#container.font-size8 {
   font-size: 24px;
 }
 
-.container.font-size9 {
+#container.font-size9 {
   font-size: 26px;
 }
 
@@ -121,409 +118,3 @@ body.dark > .container > .content blockquote {
   color: #aaaaaa !important;
   border-left-color: #777777 !important;
 }
-
-.reader-message {
-  margin-top: 40px;
-  display: none;
-  text-align: center;
-  width: 100%;
-  font-size: 0.9em;
-}
-
-.header {
-  text-align: start;
-  display: none;
-}
-
-.domain,
-.credits {
-  font-size: 0.9em;
-  font-family: sans-serif;
-}
-
-.domain {
-  margin-top: 10px;
-  padding-bottom: 10px;
-  color: #00acff !important;
-  text-decoration: none;
-}
-
-.domain-border {
-  margin-top: 15px;
-  border-bottom: 1.5px solid #777777;
-  width: 50%;
-}
-
-.header > h1 {
-  font-size: 1.33em;
-  font-weight: 700;
-  line-height: 1.1em;
-  width: 100%;
-  margin: 0px;
-  margin-top: 32px;
-  margin-bottom: 16px;
-  padding: 0px;
-}
-
-.header > .credits {
-  padding: 0px;
-  margin: 0px;
-  margin-bottom: 32px;
-}
-
-/*======= Controls toolbar =======*/
-
-.toolbar {
-  font-family: sans-serif;
-  position: fixed;
-  width: 100%;
-  left: 0;
-  margin: 0;
-  padding: 0;
-  bottom: 0;
-  list-style: none;
-  pointer-events: none;
-  transition: opacity 420ms linear;
-}
-
-.toolbar > * {
-  float: right;
-}
-
-.button {
-  width: 56px;
-  height: 56px;
-  display: block;
-  background-position: center;
-  background-size: 26px 16px;
-  background-repeat: no-repeat;
-  background-color: #0979D9;
-  border-radius: 10000px;
-  margin: 20px;
-  border: 0;
-  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
-}
-
-.button:active {
-  background-color: #086ACC;
-}
-
-/* Remove dotted border when button is focused */
-.button::-moz-focus-inner,
-.dropdown-popup > div > button::-moz-focus-inner {
-  border: 0;
-}
-
-.button[hidden],
-.toolbar[hidden] {
-  display: none;
-}
-
-.dropdown-toggle,
-.dropdown-popup {
-  pointer-events: auto;
-}
-
-.dropdown {
-  left: 0;
-  text-align: center;
-  display: inline-block;
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-}
-
-/*======= Font style popup =======*/
-
-.dropdown-popup {
-  position: absolute;
-  left: 0;
-  width: calc(100% - 30px);
-  margin: 15px;
-  z-index: 1000;
-  background: #EBEBF0;
-  visibility: hidden;
-  border: 0;
-  border-radius: 4px;
-  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
-  -moz-user-select: none;
-}
-
-/* Only used on desktop */
-.dropdown-popup > hr,
-.dropdown-arrow,
-.font-type-buttons > button > .name,
-.content-width-buttons,
-.line-height-buttons {
-  display: none;
-}
-
-.open > .dropdown-popup {
-  visibility: visible;
-  bottom: 0;
-}
-
-.font-type-buttons,
-.font-size-buttons,
-.color-scheme-buttons {
-  display: flex;
-  flex-direction: row;
-}
-
-.font-type-buttons > button,
-.color-scheme-buttons > button {
-  text-align: center;
-}
-
-.font-type-buttons > button,
-.font-size-buttons > button {
-  width: 50%;
-  background-color: transparent;
-  border: 0;
-}
-
-.font-type-buttons > button {
-  font-size: 24px;
-  color: #AFB1B3;
-  padding: 15px 0;
-}
-
-.font-type-buttons > button:active,
-.font-type-buttons > button.selected {
-  color: #222222;
-}
-
-.font-size-sample {
-  flex: 0;
-  font-size: 24px;
-  color: #000000;
-  margin: 0 30px;
-  padding: 0 10px;
-}
-
-.serif-button {
-  font-family: serif;
-}
-
-.minus-button,
-.plus-button {
-  background-color: transparent;
-  border: 0;
-  height: 60px;
-  background-size: 18px 18px;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
-.minus-button {
-  background-size: 24px 6px;
-  margin-left: 50px;
-  padding: 0 5px;
-}
-
-.plus-button {
-  background-size: 24px 24px;
-  margin-right: 50px;
-  padding: 0 5px;
-}
-
-.color-scheme-buttons > button {
-  width: 33%;
-  border-radius: 4px;
-  border: 1px solid #BFBFBF;
-  padding: 10px;
-  margin: 15px 10px;
-  font-size: 14px;
-}
-
-.color-scheme-buttons > button:active,
-.color-scheme-buttons > button.selected {
-  border: 2px solid #0A84FF;
-}
-
-.dark-button {
-  color: #eeeeee;
-  background-color: #333333;
-}
-
-.auto-button {
-  color: #000000;
-  background-color: transparent;
-}
-
-.light-button {
-  color: #333333;
-  background-color: #ffffff;
-}
-
-/*======= Toolbar icons =======*/
-
-/* desktop-only controls */
-.close-button {
-  display: none;
-}
-
-.style-button {
-  background-image: url('chrome://browser/skin/images/reader-style-icon-hdpi.png');
-}
-
-.minus-button {
-  background-image: url('chrome://browser/skin/images/reader-minus-hdpi.png');
-}
-
-.plus-button {
-  background-image: url('chrome://browser/skin/images/reader-plus-hdpi.png');
-}
-
-@media screen and (min-resolution: 2dppx) {
-  .style-button {
-    background-image: url('chrome://browser/skin/images/reader-style-icon-xhdpi.png');
-  }
-
-  .minus-button {
-    background-image: url('chrome://browser/skin/images/reader-minus-xhdpi.png');
-  }
-
-  .plus-button {
-    background-image: url('chrome://browser/skin/images/reader-plus-xhdpi.png');
-  }
-}
-
-@media screen and (min-resolution: 3dppx) {
-  .style-button {
-    background-image: url('chrome://browser/skin/images/reader-style-icon-xxhdpi.png');
-  }
-
-  .minus-button {
-    background-image: url('chrome://browser/skin/images/reader-minus-xxhdpi.png');
-  }
-
-  .plus-button {
-    background-image: url('chrome://browser/skin/images/reader-plus-xxhdpi.png');
-  }
-}
-
-@media screen and (min-width: 960px) {
-  .dropdown-popup {
-    width: 350px;
-    left: auto;
-    right: 0;
-  }
-}
-
-/*======= Article content =======*/
-
-/* Note that any class names from the original article that we want to match on
- * must be added to CLASSES_TO_PRESERVE in ReaderMode.jsm, so that
- * Readability.js doesn't strip them out */
-
-.moz-reader-content {
-  display: none;
-  font-size: 1em;
-}
-
-.moz-reader-content a {
-  text-decoration: underline !important;
-  font-weight: normal;
-}
-
-.moz-reader-content a,
-.moz-reader-content a:visited,
-.moz-reader-content a:hover,
-.moz-reader-content a:active {
-  color: #00acff !important;
-}
-
-.moz-reader-content * {
-  max-width: 100% !important;
-  height: auto !important;
-}
-
-.moz-reader-content p {
-  line-height: 1.4em !important;
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-}
-
-/* Covers all images showing edge-to-edge using a 
-   an optional caption text */
-.moz-reader-content .wp-caption,
-.moz-reader-content figure {
-  display: block !important;
-  width: 100% !important;
-  margin: 0px !important;
-  margin-bottom: 32px !important;
-}
-
-/* Images marked to be shown edge-to-edge with an
-   optional captio ntext */
-.moz-reader-content p > img:only-child,
-.moz-reader-content p > a:only-child > img:only-child,
-.moz-reader-content .wp-caption img,
-.moz-reader-content figure img {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-/* Account for body padding to make image full width */
-.moz-reader-content img[moz-reader-full-width] {
-  width: calc(100% + 40px);
-  margin-left: -20px;
-  margin-right: -20px;
-  max-width: none !important;
-}
-
-/* Image caption text */
-.moz-reader-content .caption,
-.moz-reader-content .wp-caption-text,
-.moz-reader-content figcaption {
-  font-size: 0.9em;
-  font-family: sans-serif;
-  margin: 0px !important;
-  padding-top: 4px !important;
-}
-
-/* Ensure all pre-formatted code inside the reader content
-   are properly wrapped inside content width */
-.moz-reader-content code,
-.moz-reader-content pre {
-  white-space: pre-wrap !important;
-  margin-bottom: 20px !important;
-}
-
-.moz-reader-content blockquote {
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-  padding: 0px !important;
-  padding-inline-start: 16px !important;
-  border: 0px !important;
-  border-left: 2px solid !important;
-}
-
-.moz-reader-content ul,
-.moz-reader-content ol {
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-  padding: 0px !important;
-  line-height: 1.5em;
-}
-
-.moz-reader-content ul {
-  padding-inline-start: 30px !important;
-  list-style: disc !important;
-}
-
-.moz-reader-content ol {
-  padding-inline-start: 35px !important;
-  list-style: decimal !important;
-}
-
-/* Hide elements with common "hidden" class names */
-.moz-reader-content .visually-hidden,
-.moz-reader-content .visuallyhidden,
-.moz-reader-content .hidden,
-.moz-reader-content .invisible,
-.moz-reader-content .sr-only {
-  display: none;
-}
diff --git a/mobile/android/themes/core/aboutReaderContent.css b/mobile/android/themes/core/aboutReaderContent.css
new file mode 100644
index 000000000000..fe6451df2f52
--- /dev/null
+++ b/mobile/android/themes/core/aboutReaderContent.css
@@ -0,0 +1,114 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#moz-reader-content {
+  display: none;
+  font-size: 1em;
+}
+
+a {
+  text-decoration: underline !important;
+  font-weight: normal;
+}
+
+a,
+a:visited,
+a:hover,
+a:active {
+  color: #00acff !important;
+}
+
+* {
+  max-width: 100% !important;
+  height: auto !important;
+}
+
+p {
+  line-height: 1.4em !important;
+  margin: 0px !important;
+  margin-bottom: 20px !important;
+}
+
+/* Covers all images showing edge-to-edge using a 
+   an optional caption text */
+.wp-caption,
+figure {
+  display: block !important;
+  width: 100% !important;
+  margin: 0px !important;
+  margin-bottom: 32px !important;
+}
+
+/* Images marked to be shown edge-to-edge with an
+   optional captio ntext */
+p > img:only-child,
+p > a:only-child > img:only-child,
+.wp-caption img,
+figure img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+/* Account for body padding to make image full width */
+img[moz-reader-full-width] {
+  width: calc(100% + 40px);
+  margin-left: -20px;
+  margin-right: -20px;
+  max-width: none !important;
+}
+
+/* Image caption text */
+.caption,
+.wp-caption-text,
+figcaption {
+  font-size: 0.9em;
+  font-family: sans-serif;
+  margin: 0px !important;
+  padding-top: 4px !important;
+}
+
+/* Ensure all pre-formatted code inside the reader content
+   are properly wrapped inside content width */
+code,
+pre {
+  white-space: pre-wrap !important;
+  margin-bottom: 20px !important;
+}
+
+blockquote {
+  margin: 0px !important;
+  margin-bottom: 20px !important;
+  padding: 0px !important;
+  padding-inline-start: 16px !important;
+  border: 0px !important;
+  border-left: 2px solid !important;
+}
+
+ul,
+ol {
+  margin: 0px !important;
+  margin-bottom: 20px !important;
+  padding: 0px !important;
+  line-height: 1.5em;
+}
+
+ul {
+  padding-inline-start: 30px !important;
+  list-style: disc !important;
+}
+
+ol {
+  padding-inline-start: 35px !important;
+  list-style: decimal !important;
+}
+
+/* Hide elements with common "hidden" class names */
+.visually-hidden,
+.visuallyhidden,
+.hidden,
+.invisible,
+.sr-only {
+  display: none;
+}
diff --git a/mobile/android/themes/core/aboutReaderControls.css b/mobile/android/themes/core/aboutReaderControls.css
new file mode 100644
index 000000000000..4bfae9cb0da6
--- /dev/null
+++ b/mobile/android/themes/core/aboutReaderControls.css
@@ -0,0 +1,292 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#reader-message {
+  margin-top: 40px;
+  display: none;
+  text-align: center;
+  width: 100%;
+  font-size: 0.9em;
+}
+
+.header {
+  text-align: start;
+  display: none;
+}
+
+.domain,
+.credits {
+  font-size: 0.9em;
+  font-family: sans-serif;
+}
+
+.domain {
+  margin-top: 10px;
+  padding-bottom: 10px;
+  color: #00acff !important;
+  text-decoration: none;
+}
+
+.domain-border {
+  margin-top: 15px;
+  border-bottom: 1.5px solid #777777;
+  width: 50%;
+}
+
+.header > h1 {
+  font-size: 1.33em;
+  font-weight: 700;
+  line-height: 1.1em;
+  width: 100%;
+  margin: 0px;
+  margin-top: 32px;
+  margin-bottom: 16px;
+  padding: 0px;
+}
+
+.header > .credits {
+  padding: 0px;
+  margin: 0px;
+  margin-bottom: 32px;
+}
+
+/*======= Controls toolbar =======*/
+
+.toolbar {
+  font-family: sans-serif;
+  position: fixed;
+  width: 100%;
+  left: 0;
+  margin: 0;
+  padding: 0;
+  bottom: 0;
+  list-style: none;
+  pointer-events: none;
+  transition: opacity 420ms linear;
+}
+
+.toolbar > * {
+  float: right;
+}
+
+.button {
+  width: 56px;
+  height: 56px;
+  display: block;
+  background-position: center;
+  background-size: 26px 16px;
+  background-repeat: no-repeat;
+  background-color: #0979D9;
+  border-radius: 10000px;
+  margin: 20px;
+  border: 0;
+  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
+}
+
+.button:active {
+  background-color: #086ACC;
+}
+
+/* Remove dotted border when button is focused */
+.button::-moz-focus-inner,
+.dropdown-popup > div > button::-moz-focus-inner {
+  border: 0;
+}
+
+.button[hidden],
+.toolbar[hidden] {
+  display: none;
+}
+
+.dropdown-toggle,
+#reader-popup {
+  pointer-events: auto;
+}
+
+.dropdown {
+  left: 0;
+  text-align: center;
+  display: inline-block;
+  list-style: none;
+  margin: 0px;
+  padding: 0px;
+}
+
+/*======= Font style popup =======*/
+
+.dropdown-popup {
+  position: absolute;
+  left: 0;
+  width: calc(100% - 30px);
+  margin: 15px;
+  z-index: 1000;
+  background: #EBEBF0;
+  visibility: hidden;
+  border: 0;
+  border-radius: 4px;
+  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
+  -moz-user-select: none;
+}
+
+/* Only used on desktop */
+.dropdown-popup > hr,
+.dropdown-arrow,
+#font-type-buttons > button > .name,
+#content-width-buttons,
+#line-height-buttons {
+  display: none;
+}
+
+.open > .dropdown-popup {
+  visibility: visible;
+  bottom: 0;
+}
+
+#font-type-buttons,
+#font-size-buttons,
+#color-scheme-buttons {
+  display: flex;
+  flex-direction: row;
+}
+
+#font-type-buttons > button,
+#color-scheme-buttons > button {
+  text-align: center;
+}
+
+#font-type-buttons > button,
+#font-size-buttons > button {
+  width: 50%;
+  background-color: transparent;
+  border: 0;
+}
+
+#font-type-buttons > button {
+  font-size: 24px;
+  color: #AFB1B3;
+  padding: 15px 0;
+}
+
+#font-type-buttons > button:active,
+#font-type-buttons > button.selected {
+  color: #222222;
+}
+
+#font-size-sample {
+  flex: 0;
+  font-size: 24px;
+  color: #000000;
+  margin: 0 30px;
+  padding: 0 10px;
+}
+
+.serif-button {
+  font-family: serif;
+}
+
+.minus-button,
+.plus-button {
+  background-color: transparent;
+  border: 0;
+  height: 60px;
+  background-size: 18px 18px;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+.minus-button {
+  background-size: 24px 6px;
+  margin-left: 50px;
+  padding: 0 5px;
+}
+
+.plus-button {
+  background-size: 24px 24px;
+  margin-right: 50px;
+  padding: 0 5px;
+}
+
+#color-scheme-buttons > button {
+  width: 33%;
+  border-radius: 4px;
+  border: 1px solid #BFBFBF;
+  padding: 10px;
+  margin: 15px 10px;
+  font-size: 14px;
+}
+
+#color-scheme-buttons > button:active,
+#color-scheme-buttons > button.selected {
+  border: 2px solid #0A84FF;
+}
+
+.dark-button {
+  color: #eeeeee;
+  background-color: #333333;
+}
+
+.auto-button {
+  color: #000000;
+  background-color: transparent;
+}
+
+.light-button {
+  color: #333333;
+  background-color: #ffffff;
+}
+
+/*======= Toolbar icons =======*/
+
+/* desktop-only controls */
+.close-button {
+  display: none;
+}
+
+.style-button {
+  background-image: url('chrome://browser/skin/images/reader-style-icon-hdpi.png');
+}
+
+.minus-button {
+  background-image: url('chrome://browser/skin/images/reader-minus-hdpi.png');
+}
+
+.plus-button {
+  background-image: url('chrome://browser/skin/images/reader-plus-hdpi.png');
+}
+
+@media screen and (min-resolution: 2dppx) {
+  .style-button {
+    background-image: url('chrome://browser/skin/images/reader-style-icon-xhdpi.png');
+  }
+
+  .minus-button {
+    background-image: url('chrome://browser/skin/images/reader-minus-xhdpi.png');
+  }
+
+  .plus-button {
+    background-image: url('chrome://browser/skin/images/reader-plus-xhdpi.png');
+  }
+}
+
+@media screen and (min-resolution: 3dppx) {
+  .style-button {
+    background-image: url('chrome://browser/skin/images/reader-style-icon-xxhdpi.png');
+  }
+
+  .minus-button {
+    background-image: url('chrome://browser/skin/images/reader-minus-xxhdpi.png');
+  }
+
+  .plus-button {
+    background-image: url('chrome://browser/skin/images/reader-plus-xxhdpi.png');
+  }
+}
+
+@media screen and (min-width: 960px) {
+  .dropdown-popup {
+    width: 350px;
+    left: auto;
+    right: 0;
+  }
+}
diff --git a/mobile/android/themes/core/jar.mn b/mobile/android/themes/core/jar.mn
index c07c0de67b55..560bb6f319db 100644
--- a/mobile/android/themes/core/jar.mn
+++ b/mobile/android/themes/core/jar.mn
@@ -15,6 +15,8 @@ chrome.jar:
   skin/aboutMemory.css                      (aboutMemory.css)
   skin/aboutPrivateBrowsing.css             (aboutPrivateBrowsing.css)
   skin/aboutReader.css                      (aboutReader.css)
+  skin/aboutReaderContent.css               (aboutReaderContent.css)
+  skin/aboutReaderControls.css              (aboutReaderControls.css)
   skin/aboutSupport.css                     (aboutSupport.css)
   skin/config.css                           (config.css)
   skin/defines.css                          (defines.css)
@@ -23,6 +25,8 @@ chrome.jar:
 % override chrome://global/skin/about.css chrome://browser/skin/about.css
 % override chrome://global/skin/aboutMemory.css chrome://browser/skin/aboutMemory.css
 % override chrome://global/skin/aboutReader.css chrome://browser/skin/aboutReader.css
+% override chrome://global/skin/aboutReaderContent.css chrome://browser/skin/aboutReaderContent.css
+% override chrome://global/skin/aboutReaderControls.css chrome://browser/skin/aboutReaderControls.css
 % override chrome://global/skin/aboutSupport.css chrome://browser/skin/aboutSupport.css
 % override chrome://global/skin/netError.css chrome://browser/skin/netError.css
 
diff --git a/toolkit/components/narrate/NarrateControls.jsm b/toolkit/components/narrate/NarrateControls.jsm
index f7d00e4e4868..35c2b0bccf99 100644
--- a/toolkit/components/narrate/NarrateControls.jsm
+++ b/toolkit/components/narrate/NarrateControls.jsm
@@ -38,12 +38,17 @@ function NarrateControls(mm, win, languagePromise) {
   }
 
   let dropdown = win.document.createElement("ul");
-  dropdown.className = "dropdown narrate-dropdown";
+  dropdown.className = "dropdown";
+  dropdown.id = "narrate-dropdown";
   // We need inline svg here for the animation to work (bug 908634 & 1190881).
+  // The style animation can't be scoped (bug 830056).
   // eslint-disable-next-line no-unsanitized/property
   dropdown.innerHTML =
-    localize`<li>
-       <button class="dropdown-toggle button narrate-toggle"
+    localize`<style scoped>
+      @import url("chrome://global/skin/narrateControls.css");
+    </style>
+    <li>
+       <button class="dropdown-toggle button" id="narrate-toggle"
                title="${"narrate"}" hidden>
          <svg xmlns="http://www.w3.org/2000/svg"
               xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -57,11 +62,11 @@ function NarrateControls(mm, win, languagePromise) {
               100% { transform: scaleY(1);   }
             }
 
-            .waveform > rect {
+            #waveform > rect {
               fill: #808080;
             }
 
-            .speaking .waveform > rect {
+            .speaking #waveform > rect {
               fill: #58bf43;
               transform-box: fill-box;
               transform-origin: 50% 50%;
@@ -71,15 +76,15 @@ function NarrateControls(mm, win, languagePromise) {
               animation-timing-function: linear;
             }
 
-            .waveform > rect:nth-child(2) { animation-delay: 250ms; }
-            .waveform > rect:nth-child(3) { animation-delay: 500ms; }
-            .waveform > rect:nth-child(4) { animation-delay: 750ms; }
-            .waveform > rect:nth-child(5) { animation-delay: 1000ms; }
-            .waveform > rect:nth-child(6) { animation-delay: 1250ms; }
-            .waveform > rect:nth-child(7) { animation-delay: 1500ms; }
+            #waveform > rect:nth-child(2) { animation-delay: 250ms; }
+            #waveform > rect:nth-child(3) { animation-delay: 500ms; }
+            #waveform > rect:nth-child(4) { animation-delay: 750ms; }
+            #waveform > rect:nth-child(5) { animation-delay: 1000ms; }
+            #waveform > rect:nth-child(6) { animation-delay: 1250ms; }
+            #waveform > rect:nth-child(7) { animation-delay: 1500ms; }
 
           </style>
-          <g class="waveform">
+          <g id="waveform">
             <rect x="1"  y="8" width="2" height="8"  rx=".5" ry=".5" />
             <rect x="4"  y="5" width="2" height="14" rx=".5" ry=".5" />
             <rect x="7"  y="8" width="2" height="8"  rx=".5" ry=".5" />
@@ -92,18 +97,18 @@ function NarrateControls(mm, win, languagePromise) {
         </button>
     </li>
     <li class="dropdown-popup">
-      <div class="narrate-row narrate-control">
-        <button disabled class="narrate-skip-previous"
+      <div id="narrate-control" class="narrate-row">
+        <button disabled id="narrate-skip-previous"
                 title="${"back"}"></button>
-        <button class="narrate-start-stop" title="${"start"}"></button>
-        <button disabled class="narrate-skip-next"
+        <button id="narrate-start-stop" title="${"start"}"></button>
+        <button disabled id="narrate-skip-next"
                 title="${"forward"}"></button>
       </div>
-      <div class="narrate-row narrate-rate">
-        <input class="narrate-rate-input" value="0" title="${"speed"}"
+      <div id="narrate-rate" class="narrate-row">
+        <input id="narrate-rate-input" value="0" title="${"speed"}"
                step="5" max="100" min="-100" type="range">
       </div>
-      <div class="narrate-row narrate-voices"></div>
+      <div id="narrate-voices" class="narrate-row"></div>
       <div class="dropdown-arrow"></div>
     </li>`;
 
@@ -113,14 +118,14 @@ function NarrateControls(mm, win, languagePromise) {
   let selectLabel = gStrings.GetStringFromName("selectvoicelabel");
   this.voiceSelect = new VoiceSelect(win, selectLabel);
   this.voiceSelect.element.addEventListener("change", this);
-  this.voiceSelect.element.classList.add("voice-select");
+  this.voiceSelect.element.id = "voice-select";
   win.speechSynthesis.addEventListener("voiceschanged", this);
-  dropdown.querySelector(".narrate-voices").appendChild(
+  dropdown.querySelector("#narrate-voices").appendChild(
     this.voiceSelect.element);
 
   dropdown.addEventListener("click", this, true);
 
-  let rateRange = dropdown.querySelector(".narrate-rate > input");
+  let rateRange = dropdown.querySelector("#narrate-rate > input");
   rateRange.addEventListener("change", this);
 
   // The rate is stored as an integer.
@@ -128,7 +133,7 @@ function NarrateControls(mm, win, languagePromise) {
 
   this._setupVoices();
 
-  let tb = win.document.querySelector(".reader-toolbar");
+  let tb = win.document.getElementById("reader-toolbar");
   tb.appendChild(dropdown);
 }
 
@@ -136,7 +141,7 @@ NarrateControls.prototype = {
   handleEvent(evt) {
     switch (evt.type) {
       case "change":
-        if (evt.target.classList.contains("narrate-rate-input")) {
+        if (evt.target.id == "narrate-rate-input") {
           this._onRateInput(evt);
         } else {
           this._onVoiceChange();
@@ -187,7 +192,7 @@ NarrateControls.prototype = {
         this.voiceSelect.addOptions(options);
       }
 
-      let narrateToggle = win.document.querySelector(".narrate-toggle");
+      let narrateToggle = win.document.getElementById("narrate-toggle");
       let histogram = Services.telemetry.getKeyedHistogramById(
         "NARRATE_CONTENT_BY_LANGUAGE_2");
       let initial = !this._voicesInitialized;
@@ -234,38 +239,41 @@ NarrateControls.prototype = {
   },
 
   _onButtonClick(evt) {
-    var classList = evt.target.classList;
-    if (classList.contains("narrate-skip-previous")) {
-      this.narrator.skipPrevious();
-    } else if (classList.contains("narrate-skip-next")) {
-      this.narrator.skipNext();
-    } else if (classList.contains("narrate-start-stop")) {
-      if (this.narrator.speaking) {
-        this.narrator.stop();
-      } else {
-        this._updateSpeechControls(true);
-        let options = { rate: this.rate, voice: this.voice };
-        this.narrator.start(options).then(() => {
-          this._updateSpeechControls(false);
-        }, err => {
-          Cu.reportError(`Narrate failed: ${err}.`);
-          this._updateSpeechControls(false);
-        });
-      }
+    switch (evt.target.id) {
+      case "narrate-skip-previous":
+        this.narrator.skipPrevious();
+        break;
+      case "narrate-skip-next":
+        this.narrator.skipNext();
+        break;
+      case "narrate-start-stop":
+        if (this.narrator.speaking) {
+          this.narrator.stop();
+        } else {
+          this._updateSpeechControls(true);
+          let options = { rate: this.rate, voice: this.voice };
+          this.narrator.start(options).then(() => {
+            this._updateSpeechControls(false);
+          }, err => {
+            Cu.reportError(`Narrate failed: ${err}.`);
+            this._updateSpeechControls(false);
+          });
+        }
+        break;
     }
   },
 
   _updateSpeechControls(speaking) {
-    let dropdown = this._doc.querySelector(".narrate-dropdown");
+    let dropdown = this._doc.getElementById("narrate-dropdown");
     dropdown.classList.toggle("keep-open", speaking);
     dropdown.classList.toggle("speaking", speaking);
 
-    let startStopButton = this._doc.querySelector(".narrate-start-stop");
+    let startStopButton = this._doc.getElementById("narrate-start-stop");
     startStopButton.title =
       gStrings.GetStringFromName(speaking ? "stop" : "start");
 
-    this._doc.querySelector(".narrate-skip-previous").disabled = !speaking;
-    this._doc.querySelector(".narrate-skip-next").disabled = !speaking;
+    this._doc.getElementById("narrate-skip-previous").disabled = !speaking;
+    this._doc.getElementById("narrate-skip-next").disabled = !speaking;
 
     if (speaking) {
       TelemetryStopwatch.start("NARRATE_CONTENT_SPEAKTIME_MS", this);
@@ -328,7 +336,7 @@ NarrateControls.prototype = {
 
   get rate() {
     return this._convertRate(
-      this._doc.querySelector(".narrate-rate-input").value);
+      this._doc.getElementById("narrate-rate-input").value);
   },
 
   get voice() {
diff --git a/toolkit/components/narrate/Narrator.jsm b/toolkit/components/narrate/Narrator.jsm
index ac0b2e040807..4fecd383ce61 100644
--- a/toolkit/components/narrate/Narrator.jsm
+++ b/toolkit/components/narrate/Narrator.jsm
@@ -89,7 +89,7 @@ Narrator.prototype = {
       // are no other strong references, and it will be GC'ed. Instead,
       // we rely on the window's lifetime and use it as a weak reference.
       this._treeWalkerRef.set(this._win,
-        this._doc.createTreeWalker(this._doc.querySelector(".container"),
+        this._doc.createTreeWalker(this._doc.getElementById("container"),
           nf.SHOW_ELEMENT, filter, false));
     }
 
diff --git a/toolkit/components/printing/content/simplifyMode.css b/toolkit/components/printing/content/simplifyMode.css
index 257acad91b45..4ad692228304 100644
--- a/toolkit/components/printing/content/simplifyMode.css
+++ b/toolkit/components/printing/content/simplifyMode.css
@@ -4,9 +4,9 @@
 
 /* This file defines specific rules for print preview when using simplify mode.
  * Some of these rules (styling for title and author on the header element)
- * already exist in aboutReader.css, however, we decoupled it from the original
- * file so we don't need to load a bunch of extra queries that will not take
- * effect when using the simplify page checkbox. */
+ * already exist on aboutReaderControls.css, however, we decoupled it from the
+ * original file so we don't need to load a bunch of extra queries that will not
+ * take effect when using the simplify page checkbox. */
 
 body {
   padding-top: 0px;
@@ -29,4 +29,4 @@ body {
   line-height: 1.48em;
   margin: 0 0 30px 0;
   font-style: italic;
-}
+}
\ No newline at end of file
diff --git a/toolkit/components/reader/AboutReader.jsm b/toolkit/components/reader/AboutReader.jsm
index 4c89c2913d76..3802c2f10896 100644
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/toolkit/components/reader/AboutReader.jsm
@@ -55,15 +55,14 @@ var AboutReader = function(mm, win, articlePromise) {
     this._articlePromise = articlePromise;
   }
 
-  this._headerElementRef = Cu.getWeakReference(doc.querySelector(".reader-header"));
-  this._domainElementRef = Cu.getWeakReference(doc.querySelector(".reader-domain"));
-  this._titleElementRef = Cu.getWeakReference(doc.querySelector(".reader-title"));
-  this._readTimeElementRef = Cu.getWeakReference(doc.querySelector(".reader-estimated-time"));
-  this._creditsElementRef = Cu.getWeakReference(doc.querySelector(".reader-credits"));
-  this._contentElementRef = Cu.getWeakReference(doc.querySelector(".moz-reader-content"));
-  this._toolbarElementRef = Cu.getWeakReference(doc.querySelector(".reader-toolbar"));
-  this._messageElementRef = Cu.getWeakReference(doc.querySelector(".reader-message"));
-  this._containerElementRef = Cu.getWeakReference(doc.querySelector(".container"));
+  this._headerElementRef = Cu.getWeakReference(doc.getElementById("reader-header"));
+  this._domainElementRef = Cu.getWeakReference(doc.getElementById("reader-domain"));
+  this._titleElementRef = Cu.getWeakReference(doc.getElementById("reader-title"));
+  this._readTimeElementRef = Cu.getWeakReference(doc.getElementById("reader-estimated-time"));
+  this._creditsElementRef = Cu.getWeakReference(doc.getElementById("reader-credits"));
+  this._contentElementRef = Cu.getWeakReference(doc.getElementById("moz-reader-content"));
+  this._toolbarElementRef = Cu.getWeakReference(doc.getElementById("reader-toolbar"));
+  this._messageElementRef = Cu.getWeakReference(doc.getElementById("reader-message"));
 
   this._scrollOffset = win.pageYOffset;
 
@@ -174,10 +173,6 @@ AboutReader.prototype = {
     return this._messageElementRef.get();
   },
 
-  get _containerElement() {
-    return this._containerElementRef.get();
-  },
-
   get _isToolbarVertical() {
     if (this._toolbarVertical !== undefined) {
       return this._toolbarVertical;
@@ -205,26 +200,26 @@ AboutReader.prototype = {
 
       case "Reader:AddButton": {
         if (message.data.id && message.data.image &&
-            !this._doc.getElementsByClassName(message.data.id)[0]) {
+            !this._doc.getElementById(message.data.id)) {
           let btn = this._doc.createElement("button");
-          btn.dataset.buttonid = message.data.id;
-          btn.className = "button " + message.data.id;
-          btn.style.backgroundImage = "url('" + message.data.image + "')";
+          btn.setAttribute("class", "button");
+          btn.setAttribute("style", "background-image: url('" + message.data.image + "')");
+          btn.setAttribute("id", message.data.id);
           if (message.data.title)
-            btn.title = message.data.title;
+            btn.setAttribute("title", message.data.title);
           if (message.data.text)
             btn.textContent = message.data.text;
-          let tb = this._toolbarElement;
+          let tb = this._doc.getElementById("reader-toolbar");
           tb.appendChild(btn);
           this._setupButton(message.data.id, button => {
-            this._mm.sendAsyncMessage("Reader:Clicked-" + button.dataset.buttonid, { article: this._article });
+            this._mm.sendAsyncMessage("Reader:Clicked-" + button.getAttribute("id"), { article: this._article });
           });
         }
         break;
       }
       case "Reader:RemoveButton": {
         if (message.data.id) {
-          let btn = this._doc.getElementsByClassName(message.data.id)[0];
+          let btn = this._doc.getElementById(message.data.id);
           if (btn)
             btn.remove();
         }
@@ -308,7 +303,7 @@ AboutReader.prototype = {
   },
 
   _setFontSize(newFontSize) {
-    let containerClasses = this._containerElement.classList;
+    let containerClasses = this._doc.getElementById("container").classList;
 
     if (this._fontSize > 0)
       containerClasses.remove("font-size" + this._fontSize);
@@ -323,14 +318,14 @@ AboutReader.prototype = {
     const FONT_SIZE_MAX = 9;
 
     // Sample text shown in Android UI.
-    let sampleText = this._doc.querySelector(".font-size-sample");
+    let sampleText = this._doc.getElementById("font-size-sample");
     sampleText.textContent = gStrings.GetStringFromName("aboutReader.fontTypeSample");
 
     let currentSize = Services.prefs.getIntPref("reader.font_size");
     currentSize = Math.max(FONT_SIZE_MIN, Math.min(FONT_SIZE_MAX, currentSize));
 
-    let plusButton = this._doc.querySelector(".plus-button");
-    let minusButton = this._doc.querySelector(".minus-button");
+    let plusButton = this._doc.getElementById("font-size-plus");
+    let minusButton = this._doc.getElementById("font-size-minus");
 
     function updateControls() {
       if (currentSize === FONT_SIZE_MIN) {
@@ -380,7 +375,7 @@ AboutReader.prototype = {
   },
 
   _setContentWidth(newContentWidth) {
-    let containerClasses = this._containerElement.classList;
+    let containerClasses = this._doc.getElementById("container").classList;
 
     if (this._contentWidth > 0)
       containerClasses.remove("content-width" + this._contentWidth);
@@ -397,8 +392,8 @@ AboutReader.prototype = {
     let currentContentWidth = Services.prefs.getIntPref("reader.content_width");
     currentContentWidth = Math.max(CONTENT_WIDTH_MIN, Math.min(CONTENT_WIDTH_MAX, currentContentWidth));
 
-    let plusButton = this._doc.querySelector(".content-width-plus-button");
-    let minusButton = this._doc.querySelector(".content-width-minus-button");
+    let plusButton = this._doc.getElementById("content-width-plus");
+    let minusButton = this._doc.getElementById("content-width-minus");
 
     function updateControls() {
       if (currentContentWidth === CONTENT_WIDTH_MIN) {
@@ -448,7 +443,7 @@ AboutReader.prototype = {
   },
 
   _setLineHeight(newLineHeight) {
-    let contentClasses = this._contentElement.classList;
+    let contentClasses = this._doc.getElementById("moz-reader-content").classList;
 
     if (this._lineHeight > 0)
       contentClasses.remove("line-height" + this._lineHeight);
@@ -465,8 +460,8 @@ AboutReader.prototype = {
     let currentLineHeight = Services.prefs.getIntPref("reader.line_height");
     currentLineHeight = Math.max(LINE_HEIGHT_MIN, Math.min(LINE_HEIGHT_MAX, currentLineHeight));
 
-    let plusButton = this._doc.querySelector(".line-height-plus-button");
-    let minusButton = this._doc.querySelector(".line-height-minus-button");
+    let plusButton = this._doc.getElementById("line-height-plus");
+    let minusButton = this._doc.getElementById("line-height-minus");
 
     function updateControls() {
       if (currentLineHeight === LINE_HEIGHT_MIN) {
@@ -881,7 +876,7 @@ AboutReader.prototype = {
 
   _setupSegmentedButton(id, options, initialValue, callback) {
     let doc = this._doc;
-    let segmentedButton = doc.getElementsByClassName(id)[0];
+    let segmentedButton = doc.getElementById(id);
 
     for (let i = 0; i < options.length; i++) {
       let option = options[i];
@@ -935,7 +930,7 @@ AboutReader.prototype = {
       this._setButtonTip(id, titleEntity);
     }
 
-    let button = this._doc.getElementsByClassName(id)[0];
+    let button = this._doc.getElementById(id);
     if (textEntity) {
       button.textContent = gStrings.GetStringFromName(textEntity);
     }
@@ -956,12 +951,12 @@ AboutReader.prototype = {
    * @param   Localizable string providing UI element usage tip.
    */
   _setButtonTip(id, titleEntity) {
-    let button = this._doc.getElementsByClassName(id)[0];
+    let button = this._doc.getElementById(id);
     button.setAttribute("title", gStrings.GetStringFromName(titleEntity));
   },
 
   _setupStyleDropdown() {
-    let dropdownToggle = this._doc.querySelector(".style-dropdown .dropdown-toggle");
+    let dropdownToggle = this._doc.querySelector("#style-dropdown .dropdown-toggle");
     dropdownToggle.setAttribute("title", gStrings.GetStringFromName("aboutReader.toolbar.typeControls"));
   },
 
diff --git a/toolkit/components/reader/ReaderMode.jsm b/toolkit/components/reader/ReaderMode.jsm
index 930a00fa8db7..9811bc5cc3a7 100644
--- a/toolkit/components/reader/ReaderMode.jsm
+++ b/toolkit/components/reader/ReaderMode.jsm
@@ -18,19 +18,6 @@ const PARSE_ERROR_TOO_MANY_ELEMENTS = 1;
 const PARSE_ERROR_WORKER = 2;
 const PARSE_ERROR_NO_ARTICLE = 3;
 
-// Class names to preserve in the readerized output. We preserve these class
-// names so that rules in aboutReader.css can match them.
-const CLASSES_TO_PRESERVE = [
-  "caption",
-  "hidden",
-  "invisble",
-  "sr-only",
-  "visually-hidden",
-  "visuallyhidden",
-  "wp-caption",
-  "wp-caption-text",
-];
-
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -466,13 +453,9 @@ this.ReaderMode = {
                      createInstance(Ci.nsIDOMSerializer);
     let serializedDoc = serializer.serializeToString(doc);
 
-    let options = {
-      classesToPreserve: CLASSES_TO_PRESERVE,
-    };
-
     let article = null;
     try {
-      article = await ReaderWorker.post("parseDocument", [uriParam, serializedDoc, options]);
+      article = await ReaderWorker.post("parseDocument", [uriParam, serializedDoc]);
     } catch (e) {
       Cu.reportError("Error in ReaderWorker: " + e);
       histogram.add(PARSE_ERROR_WORKER);
diff --git a/toolkit/components/reader/ReaderWorker.js b/toolkit/components/reader/ReaderWorker.js
index 9ae589d7d145..5f69d1fc9d0a 100644
--- a/toolkit/components/reader/ReaderWorker.js
+++ b/toolkit/components/reader/ReaderWorker.js
@@ -42,12 +42,11 @@ var Agent = {
    *
    * @param {object} uri URI data for the document.
    * @param {string} serializedDoc The serialized document.
-   * @param {object} options Options object to pass to Readability.
    *
    * @return {object} Article object returned from Readability.
    */
-  parseDocument(uri, serializedDoc, options) {
+  parseDocument(uri, serializedDoc) {
     let doc = new JSDOMParser().parse(serializedDoc);
-    return new Readability(uri, doc, options).parse();
+    return new Readability(uri, doc).parse();
   },
 };
diff --git a/toolkit/components/reader/content/aboutReader.html b/toolkit/components/reader/content/aboutReader.html
index 1aa6444741e5..53d5a2b47567 100644
--- a/toolkit/components/reader/content/aboutReader.html
+++ b/toolkit/components/reader/content/aboutReader.html
@@ -11,52 +11,64 @@
 </head>
 
 <body>
-  <div class="container">
-    <div class="header reader-header">
-      <a class="domain reader-domain"></a>
+  <div id="container" class="container">
+    <div id="reader-header" class="header">
+      <style scoped>
+        @import url("chrome://global/skin/aboutReaderControls.css");
+      </style>
+      <a id="reader-domain" class="domain"></a>
       <div class="domain-border"></div>
-      <h1 class="reader-title"></h1>
-      <div class="credits reader-credits"></div>
-      <div class="meta-data">
-        <div class="reader-estimated-time"></div>
+      <h1 id="reader-title"></h1>
+      <div id="reader-credits" class="credits"></div>
+      <div id="meta-data" class="meta-data">
+        <div id="reader-estimated-time"></div>
       </div>
     </div>
 
     <hr>
 
     <div class="content">
-      <div class="moz-reader-content"></div>
+      <style scoped>
+        @import url("chrome://global/skin/aboutReaderContent.css");
+      </style>
+      <div id="moz-reader-content"></div>
     </div>
 
     <div>
-      <div class="reader-message"></div>
+      <style scoped>
+        @import url("chrome://global/skin/aboutReaderControls.css");
+      </style>
+      <div id="reader-message"></div>
     </div>
   </div>
 
-  <ul class="toolbar reader-toolbar">
-    <li><button class="button close-button"/></li>
-    <ul class="dropdown style-dropdown">
+  <ul id="reader-toolbar" class="toolbar">
+    <style scoped>
+      @import url("chrome://global/skin/aboutReaderControls.css");
+    </style>
+    <li><button id="close-button" class="button close-button"/></li>
+    <ul id="style-dropdown" class="dropdown">
       <li><button class="dropdown-toggle button style-button"/></li>
-      <li class="dropdown-popup">
-        <div class="font-type-buttons"></div>
+      <li id="reader-popup" class="dropdown-popup">
+        <div id="font-type-buttons"></div>
         <hr>
-        <div class="font-size-buttons">
-          <button class="minus-button"/>
-          <button class="font-size-sample"/>
-          <button class="plus-button"/>
+        <div id="font-size-buttons">
+          <button id="font-size-minus" class="minus-button"/>
+          <button id="font-size-sample"/>
+          <button id="font-size-plus" class="plus-button"/>
         </div>
         <hr>
-        <div class="content-width-buttons">
-          <button class="content-width-minus-button"/>
-          <button class="content-width-plus-button"/>
+        <div id="content-width-buttons">
+          <button id="content-width-minus" class="content-width-minus-button"/>
+          <button id="content-width-plus" class="content-width-plus-button"/>
         </div>
         <hr>
-        <div class="line-height-buttons">
-          <button class="line-height-minus-button"/>
-          <button class="line-height-plus-button"/>
+        <div id="line-height-buttons">
+          <button id="line-height-minus" class="line-height-minus-button"/>
+          <button id="line-height-plus" class="line-height-plus-button"/>
         </div>
         <hr>
-        <div class="color-scheme-buttons"></div>
+        <div id="color-scheme-buttons"></div>
         <div class="dropdown-arrow"/>
       </li>
     </ul>
diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js
index 63116f09cc2e..c686f86476a5 100644
--- a/toolkit/content/browser-content.js
+++ b/toolkit/content/browser-content.js
@@ -677,6 +677,12 @@ var Printing = {
       contentElement.setAttribute("class", "content");
       containerElement.appendChild(contentElement);
 
+      // Create style element for content div and import aboutReaderContent.css
+      let controlContentStyle = content.document.createElement("style");
+      controlContentStyle.setAttribute("scoped", "");
+      controlContentStyle.textContent = "@import url(\"chrome://global/skin/aboutReaderContent.css\");";
+      contentElement.appendChild(controlContentStyle);
+
       // Jam the article's content into content div
       let readerContent = content.document.createElement("div");
       readerContent.setAttribute("id", "moz-reader-content");
diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
index 32f7dce08214..36945def6ca9 100644
--- a/toolkit/themes/shared/aboutReader.css
+++ b/toolkit/themes/shared/aboutReader.css
@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* Avoid adding ID selector rules in this style sheet, since they could
- * inadvertently match elements in the article content. */
-
 body {
   padding: 64px 51px;
 }
@@ -46,80 +43,80 @@ body.serif .remove-button  {
   font-family: Georgia, "Times New Roman", serif;
 }
 
-.container {
+#container {
   max-width: 30em;
   margin: 0 auto;
 }
 
-.container.font-size1 {
+#container.font-size1 {
   font-size: 12px;
 }
 
-.container.font-size2 {
+#container.font-size2 {
   font-size: 14px;
 }
 
-.container.font-size3 {
+#container.font-size3 {
   font-size: 16px;
 }
 
-.container.font-size4  {
+#container.font-size4  {
   font-size: 18px;
 }
 
-.container.font-size5 {
+#container.font-size5 {
   font-size: 20px;
 }
 
-.container.font-size6 {
+#container.font-size6 {
   font-size: 22px;
 }
 
-.container.font-size7 {
+#container.font-size7 {
   font-size: 24px;
 }
 
-.container.font-size8 {
+#container.font-size8 {
   font-size: 26px;
 }
 
-.container.font-size9 {
+#container.font-size9 {
   font-size: 28px;
 }
 
-.container.content-width1 {
+#container.content-width1 {
   max-width: 20em;
 }
 
-.container.content-width2 {
+#container.content-width2 {
   max-width: 25em;
 }
 
-.container.content-width3 {
+#container.content-width3 {
   max-width: 30em;
 }
 
-.container.content-width4  {
+#container.content-width4  {
   max-width: 35em;
 }
 
-.container.content-width5 {
+#container.content-width5 {
   max-width: 40em;
 }
 
-.container.content-width6 {
+#container.content-width6 {
   max-width: 45em;
 }
 
-.container.content-width7 {
+#container.content-width7 {
   max-width: 50em;
 }
 
-.container.content-width8 {
+#container.content-width8 {
   max-width: 55em;
 }
 
-.container.content-width9 {
+#container.content-width9 {
   max-width: 60em;
 }
 
@@ -166,576 +163,3 @@ body:not(.loaded) .toolbar:-moz-locale-dir(ltr) {
 body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
   transform: translateX(100%);
 }
-
-.light-button {
-  color: #333333;
-  background-color: #ffffff;
-}
-
-.dark-button {
-  color: #eeeeee;
-  background-color: #333333;
-}
-
-.sepia-button {
-  color: #5b4636;
-  background-color: #f4ecd8;
-}
-
-.sans-serif-button {
-  font-family: Helvetica, Arial, sans-serif;
-}
-
-.serif-button {
-  font-family: Georgia, "Times New Roman", serif;
-}
-
-/* Loading/error message */
-
-.reader-message {
-  margin-top: 40px;
-  display: none;
-  text-align: center;
-  width: 100%;
-  font-size: 0.9em;
-}
-
-/* Header */
-
-.header {
-  text-align: start;
-  display: none;
-}
-
-.domain {
-  font-size: 0.9em;
-  line-height: 1.48em;
-  padding-bottom: 4px;
-  font-family: Helvetica, Arial, sans-serif;
-  text-decoration: none;
-  border-bottom: 1px solid;
-  color: #0095dd;
-}
-
-.header > h1 {
-  font-size: 1.6em;
-  line-height: 1.25em;
-  width: 100%;
-  margin: 30px 0;
-  padding: 0;
-}
-
-.header > .credits {
-  font-size: 0.9em;
-  line-height: 1.48em;
-  margin: 0 0 10px 0;
-  padding: 0;
-  font-style: italic;
-}
-
-.header > .meta-data {
-  font-size: 0.65em;
-  margin: 0 0 15px 0;
-}
-
-/*======= Controls toolbar =======*/
-
-.toolbar {
-  font-family: Helvetica, Arial, sans-serif;
-  position: fixed;
-  height: 100%;
-  top: 0;
-  left: 0;
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  background-color: #fbfbfb;
-  -moz-user-select: none;
-  border-right: 1px solid #b5b5b5;
-  z-index: 1;
-}
-
-.button {
-  display: block;
-  background-size: 24px 24px;
-  background-repeat: no-repeat;
-  color: #333;
-  background-color: #fbfbfb;
-  height: 40px;
-  padding: 0;
-}
-
-.toolbar .button {
-  width: 40px;
-  background-position: center;
-  margin-right: -1px;
-  border-top: 0;
-  border-left: 0;
-  border-right: 1px solid #b5b5b5;
-  border-bottom: 1px solid #c1c1c1;
-}
-
-.button[hidden] {
-  display: none;
-}
-
-.dropdown {
-  text-align: center;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.dropdown li {
-  margin: 0;
-  padding: 0;
-}
-
-/*======= Popup =======*/
-
-.dropdown-popup {
-  min-width: 300px;
-  text-align: start;
-  position: absolute;
-  left: 48px; /* offset to account for toolbar width */
-  z-index: 1000;
-  background-color: #fbfbfb;
-  visibility: hidden;
-  border-radius: 4px;
-  border: 1px solid #b5b5b5;
-  border-bottom-width: 0;
-  box-shadow: 0 1px 3px #c1c1c1;
-}
-
-.keep-open .dropdown-popup {
-  z-index: initial;
-}
-
-.dropdown-popup > hr {
-  display: none;
-}
-
-.open > .dropdown-popup {
-  visibility: visible;
-}
-
-.dropdown-arrow {
-  position: absolute;
-  top: 30px; /* offset arrow from top of popup */
-  left: -16px;
-  width: 16px;
-  height: 24px;
-  background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg");
-  display: block;
-}
-
-/*======= Font style popup =======*/
-
-.font-type-buttons,
-.font-size-buttons,
-.color-scheme-buttons,
-.content-width-buttons,
-.line-height-buttons {
-  display: flex;
-  flex-direction: row;
-}
-
-.font-type-buttons > button:first-child {
-  border-top-left-radius: 3px;
-}
-.font-type-buttons > button:last-child {
-  border-top-right-radius: 3px;
-}
-.color-scheme-buttons > button:first-child {
-  border-bottom-left-radius: 3px;
-}
-.color-scheme-buttons > button:last-child {
-  border-bottom-right-radius: 3px;
-}
-
-.font-type-buttons > button,
-.font-size-buttons > button,
-.color-scheme-buttons > button,
-.content-width-buttons > button,
-.line-height-buttons > button {
-  text-align: center;
-  border: 0;
-}
-
-.font-type-buttons > button,
-.font-size-buttons > button,
-.content-width-buttons > button,
-.line-height-buttons > button {
-  width: 50%;
-  background-color: transparent;
-  border-left: 1px solid #B5B5B5;
-  border-bottom: 1px solid #B5B5B5;
-}
-
-.color-scheme-buttons > button {
-  width: 33.33%;
-  font-size: 14px;
-}
-
-.color-scheme-buttons > .dark-button {
-  margin-top: -1px;
-  height: 61px;
-}
-
-.font-type-buttons > button:first-child,
-.font-size-buttons > button:first-child,
-.content-width-buttons > button:first-child,
-.line-height-buttons > button:first-child {
-  border-left: 0;
-}
-
-.font-type-buttons > button {
-  display: inline-block;
-  font-size: 62px;
-  height: 100px;
-}
-
-.font-size-buttons > button,
-.color-scheme-buttons > button,
-.content-width-buttons > button,
-.line-height-buttons > button {
-  height: 60px;
-}
-
-.font-type-buttons > button:active:hover,
-.font-type-buttons > button.selected,
-.color-scheme-buttons > button:active:hover,
-.color-scheme-buttons > button.selected {
-  box-shadow: inset 0 -3px 0 0 #fc6420;
-}
-
-.font-type-buttons > button:active:hover,
-.font-type-buttons > button.selected {
-  border-bottom: 1px solid #FC6420;
-}
-
-/* Make the serif button content the same size as the sans-serif button content. */
-.font-type-buttons > button > .description {
-  color: #666;
-  font-size: 12px;
-  margin-top: -5px;
-}
-
-/* Font sizes are different per-platform, so we need custom CSS to line them up. */
-%ifdef XP_MACOSX
-.font-type-buttons > .sans-serif-button > .name {
-  margin-top: 10px;
-}
-
-.font-type-buttons > .sans-serif-button > .description {
-  margin-top: -4px;
-}
-
-.font-type-buttons > .serif-button > .name {
-  font-size: 63px;
-}
-%elifdef XP_WIN
-.font-type-buttons > .sans-serif-button > .name {
-  margin-top: 2px;
-}
-
-.font-type-buttons > .sans-serif-button > .description {
-  margin-top: -4px;
-}
-
-.font-type-buttons > .serif-button > .name {
-  font-size: 63px;
-}
-%else
-.font-type-buttons > .sans-serif-button > .name {
-  margin-top: 5px;
-}
-
-.font-type-buttons > .sans-serif-button > .description {
-  margin-top: -8px;
-}
-
-.font-type-buttons > .serif-button > .name {
-  font-size: 70px;
-}
-%endif
-
-.button:hover,
-.font-size-buttons > button:hover,
-.font-type-buttons > button:hover,
-.content-width-buttons > button:hover,
-.line-height-buttons > button:hover {
-  background-color: #ebebeb;
-}
-
-.dropdown.open,
-.button:active,
-.font-size-buttons > button:active,
-.font-size-buttons > button.selected,
-.content-width-buttons > button:active,
-.content-width-buttons > button.selected,
-.line-height-buttons > button:active,
-.line-height-buttons > button.selected {
-  background-color: #dadada;
-}
-
-/* Only used on Android */
-.font-size-sample {
-  display: none;
-}
-
-.minus-button,
-.plus-button,
-.content-width-minus-button,
-.content-width-plus-button,
-.line-height-minus-button,
-.line-height-plus-button {
-  background-color: transparent;
-  border: 0;
-  background-size: 18px 18px;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
-/*======= Toolbar icons =======*/
-
-.close-button {
-  background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg");
-  -moz-context-properties: fill;
-  fill: #808080;
-  height: 68px;
-  background-position: center 8px;
-}
-
-.close-button:hover {
-  fill: #fff;
-  background-color: #d94141;
-  border-bottom: 1px solid #d94141;
-  border-right: 1px solid #d94141;
-}
-
-.close-button:hover:active {
-  background-color: #AE2325;
-  border-bottom: 1px solid #AE2325;
-  border-right: 1px solid #AE2325;
-}
-
-.style-button {
-  background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg");
-}
-
-.minus-button {
-  background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg");
-}
-
-.plus-button {
-  background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg");
-}
-
-.content-width-minus-button {
-  background-size: 42px 16px;
-  background-image: url("chrome://global/skin/reader/RM-Content-Width-Minus-42x16.svg");
-}
-
-.content-width-plus-button {
-  background-size: 44px 16px;
-  background-image: url("chrome://global/skin/reader/RM-Content-Width-Plus-44x16.svg");
-}
-
-.line-height-minus-button {
-  background-size: 34px 14px;
-  background-image: url("chrome://global/skin/reader/RM-Line-Height-Minus-38x14.svg");
-}
-
-.line-height-plus-button {
-  background-size: 34px 24px;
-  background-image: url("chrome://global/skin/reader/RM-Line-Height-Plus-38x24.svg");
-}
-
-@media print {
-  .toolbar {
-    display: none !important;
-  }
-}
-
-/*======= Article content =======*/
-
-/* Note that any class names from the original article that we want to match on
- * must be added to CLASSES_TO_PRESERVE in ReaderMode.jsm, so that
- * Readability.js doesn't strip them out */
-
-.moz-reader-content {
-  display: none;
-  font-size: 1em;
-  line-height: 1.6em;
-}
-
-.moz-reader-content.line-height1 {
-  line-height: 1em;
-}
-
-.moz-reader-content.line-height2 {
-  line-height: 1.2em;
-}
-
-.moz-reader-content.line-height3 {
-  line-height: 1.4em;
-}
-
-.moz-reader-content.line-height4 {
-  line-height: 1.6em;
-}
-
-.moz-reader-content.line-height5 {
-  line-height: 1.8em;
-}
-
-.moz-reader-content.line-height6 {
-  line-height: 2.0em;
-}
-
-.moz-reader-content.line-height7 {
-  line-height: 2.2em;
-}
-
-.moz-reader-content.line-height8 {
-  line-height: 2.4em;
-}
-
-.moz-reader-content.line-height9 {
-  line-height: 2.6em;
-}
-
-@media print {
-  .moz-reader-content p,
-  .moz-reader-content code,
-  .moz-reader-content pre,
-  .moz-reader-content blockquote,
-  .moz-reader-content ul,
-  .moz-reader-content ol,
-  .moz-reader-content li,
-  .moz-reader-content figure,
-  .moz-reader-content .wp-caption {
-    margin: 0 0 10px 0 !important;
-    padding: 0 !important;
-  }
-}
-
-.moz-reader-content h1,
-.moz-reader-content h2,
-.moz-reader-content h3 {
-  font-weight: bold;
-}
-
-.moz-reader-content h1 {
-  font-size: 1.6em;
-  line-height: 1.25em;
-}
-
-.moz-reader-content h2 {
-  font-size: 1.2em;
-  line-height: 1.51em;
-}
-
-.moz-reader-content h3 {
-  font-size: 1em;
-  line-height: 1.66em;
-}
-
-.moz-reader-content a:link {
-  text-decoration: underline;
-  font-weight: normal;
-}
-
-.moz-reader-content a:link,
-.moz-reader-content a:link:hover,
-.moz-reader-content a:link:active {
-  color: #0095dd;
-}
-
-.moz-reader-content a:visited {
-  color: #c2e;
-}
-
-.moz-reader-content * {
-  max-width: 100%;
-  height: auto;
-}
-
-.moz-reader-content p,
-.moz-reader-content p,
-.moz-reader-content code,
-.moz-reader-content pre,
-.moz-reader-content blockquote,
-.moz-reader-content ul,
-.moz-reader-content ol,
-.moz-reader-content li,
-.moz-reader-content figure,
-.moz-reader-content .wp-caption {
-  margin: -10px -10px 20px -10px;
-  padding: 10px;
-  border-radius: 5px;
-}
-
-.moz-reader-content li {
-  margin-bottom: 0;
-}
-
-.moz-reader-content li > ul,
-.moz-reader-content li > ol {
-  margin-bottom: -10px;
-}
-
-.moz-reader-content p > img:only-child,
-.moz-reader-content p > a:only-child > img:only-child,
-.moz-reader-content .wp-caption img,
-.moz-reader-content figure img {
-  display: block;
-}
-
-.moz-reader-content img[moz-reader-center] {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.moz-reader-content .caption,
-.moz-reader-content .wp-caption-text
-.moz-reader-content figcaption {
-  font-size: 0.9em;
-  line-height: 1.48em;
-  font-style: italic;
-}
-
-.moz-reader-content code,
-.moz-reader-content pre {
-  white-space: pre-wrap;
-}
-
-.moz-reader-content blockquote {
-  padding: 0;
-  padding-inline-start: 16px;
-}
-
-.moz-reader-content ul,
-.moz-reader-content ol {
-  padding: 0;
-}
-
-.moz-reader-content ul {
-  padding-inline-start: 30px;
-  list-style: disc;
-}
-
-.moz-reader-content ol {
-  padding-inline-start: 30px;
-  list-style: decimal;
-}
-
-/* Hide elements with common "hidden" class names */
-.moz-reader-content .visually-hidden,
-.moz-reader-content .visuallyhidden,
-.moz-reader-content .hidden,
-.moz-reader-content .invisible,
-.moz-reader-content .sr-only {
-  display: none;
-}
diff --git a/toolkit/themes/shared/aboutReaderContent.css b/toolkit/themes/shared/aboutReaderContent.css
new file mode 100644
index 000000000000..f69c17bf88a4
--- /dev/null
+++ b/toolkit/themes/shared/aboutReaderContent.css
@@ -0,0 +1,178 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#moz-reader-content {
+  display: none;
+  font-size: 1em;
+  line-height: 1.6em;
+}
+
+#moz-reader-content.line-height1 {
+  line-height: 1em;
+}
+
+#moz-reader-content.line-height2 {
+  line-height: 1.2em;
+}
+
+#moz-reader-content.line-height3 {
+  line-height: 1.4em;
+}
+
+#moz-reader-content.line-height4 {
+  line-height: 1.6em;
+}
+
+#moz-reader-content.line-height5 {
+  line-height: 1.8em;
+}
+
+#moz-reader-content.line-height6 {
+  line-height: 2.0em;
+}
+
+#moz-reader-content.line-height7 {
+  line-height: 2.2em;
+}
+
+#moz-reader-content.line-height8 {
+  line-height: 2.4em;
+}
+
+#moz-reader-content.line-height9 {
+  line-height: 2.6em;
+}
+
+@media print {
+  p,
+  code,
+  pre,
+  blockquote,
+  ul,
+  ol,
+  li,
+  figure,
+  .wp-caption {
+    margin: 0 0 10px 0 !important;
+    padding: 0 !important;
+  }
+}
+
+h1,
+h2,
+h3 {
+  font-weight: bold;
+}
+
+h1 {
+  font-size: 1.6em;
+  line-height: 1.25em;
+}
+
+h2 {
+  font-size: 1.2em;
+  line-height: 1.51em;
+}
+
+h3 {
+  font-size: 1em;
+  line-height: 1.66em;
+}
+
+a:link {
+  text-decoration: underline;
+  font-weight: normal;
+}
+
+a:link,
+a:link:hover,
+a:link:active {
+  color: #0095dd;
+}
+
+a:visited {
+  color: #c2e;
+}
+
+* {
+  max-width: 100%;
+  height: auto;
+}
+
+p,
+code,
+pre,
+blockquote,
+ul,
+ol,
+li,
+figure,
+.wp-caption {
+  margin: -10px -10px 20px -10px;
+  padding: 10px;
+  border-radius: 5px;
+}
+
+li {
+  margin-bottom: 0;
+}
+
+li > ul,
+li > ol {
+  margin-bottom: -10px;
+}
+
+p > img:only-child,
+p > a:only-child > img:only-child,
+.wp-caption img,
+figure img {
+  display: block;
+}
+
+img[moz-reader-center] {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.caption,
+.wp-caption-text,
+figcaption {
+  font-size: 0.9em;
+  line-height: 1.48em;
+  font-style: italic;
+}
+
+code,
+pre {
+  white-space: pre-wrap;
+}
+
+blockquote {
+  padding: 0;
+  padding-inline-start: 16px;
+}
+
+ul,
+ol {
+  padding: 0;
+}
+
+ul {
+  padding-inline-start: 30px;
+  list-style: disc;
+}
+
+ol {
+  padding-inline-start: 30px;
+  list-style: decimal;
+}
+
+/* Hide elements with common "hidden" class names */
+.visually-hidden,
+.visuallyhidden,
+.hidden,
+.invisible,
+.sr-only {
+  display: none;
+}
diff --git a/toolkit/themes/shared/aboutReaderControls.css b/toolkit/themes/shared/aboutReaderControls.css
new file mode 100644
index 000000000000..2a4b66e5414a
--- /dev/null
+++ b/toolkit/themes/shared/aboutReaderControls.css
@@ -0,0 +1,394 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+.light-button {
+  color: #333333;
+  background-color: #ffffff;
+}
+
+.dark-button {
+  color: #eeeeee;
+  background-color: #333333;
+}
+
+.sepia-button {
+  color: #5b4636;
+  background-color: #f4ecd8;
+}
+
+.sans-serif-button {
+  font-family: Helvetica, Arial, sans-serif;
+}
+
+.serif-button {
+  font-family: Georgia, "Times New Roman", serif;
+}
+
+/* Loading/error message */
+
+#reader-message {
+  margin-top: 40px;
+  display: none;
+  text-align: center;
+  width: 100%;
+  font-size: 0.9em;
+}
+
+/* Header */
+
+.header {
+  text-align: start;
+  display: none;
+}
+
+.domain {
+  font-size: 0.9em;
+  line-height: 1.48em;
+  padding-bottom: 4px;
+  font-family: Helvetica, Arial, sans-serif;
+  text-decoration: none;
+  border-bottom: 1px solid;
+  color: #0095dd;
+}
+
+.header > h1 {
+  font-size: 1.6em;
+  line-height: 1.25em;
+  width: 100%;
+  margin: 30px 0;
+  padding: 0;
+}
+
+.header > .credits {
+  font-size: 0.9em;
+  line-height: 1.48em;
+  margin: 0 0 10px 0;
+  padding: 0;
+  font-style: italic;
+}
+
+.header > .meta-data {
+  font-size: 0.65em;
+  margin: 0 0 15px 0;
+}
+
+/*======= Controls toolbar =======*/
+
+.toolbar {
+  font-family: Helvetica, Arial, sans-serif;
+  position: fixed;
+  height: 100%;
+  top: 0;
+  left: 0;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  background-color: #fbfbfb;
+  -moz-user-select: none;
+  border-right: 1px solid #b5b5b5;
+  z-index: 1;
+}
+
+.button {
+  display: block;
+  background-size: 24px 24px;
+  background-repeat: no-repeat;
+  color: #333;
+  background-color: #fbfbfb;
+  height: 40px;
+  padding: 0;
+}
+
+.toolbar .button {
+  width: 40px;
+  background-position: center;
+  margin-right: -1px;
+  border-top: 0;
+  border-left: 0;
+  border-right: 1px solid #b5b5b5;
+  border-bottom: 1px solid #c1c1c1;
+}
+
+.button[hidden] {
+  display: none;
+}
+
+.dropdown {
+  text-align: center;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.dropdown li {
+  margin: 0;
+  padding: 0;
+}
+
+/*======= Popup =======*/
+
+.dropdown-popup {
+  min-width: 300px;
+  text-align: start;
+  position: absolute;
+  left: 48px; /* offset to account for toolbar width */
+  z-index: 1000;
+  background-color: #fbfbfb;
+  visibility: hidden;
+  border-radius: 4px;
+  border: 1px solid #b5b5b5;
+  border-bottom-width: 0;
+  box-shadow: 0 1px 3px #c1c1c1;
+}
+
+.keep-open .dropdown-popup {
+  z-index: initial;
+}
+
+.dropdown-popup > hr {
+  display: none;
+}
+
+.open > .dropdown-popup {
+  visibility: visible;
+}
+
+.dropdown-arrow {
+  position: absolute;
+  top: 30px; /* offset arrow from top of popup */
+  left: -16px;
+  width: 16px;
+  height: 24px;
+  background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg");
+  display: block;
+}
+
+/*======= Font style popup =======*/
+
+#font-type-buttons,
+#font-size-buttons,
+#color-scheme-buttons,
+#content-width-buttons,
+#line-height-buttons {
+  display: flex;
+  flex-direction: row;
+}
+
+#font-type-buttons > button:first-child {
+  border-top-left-radius: 3px;
+}
+#font-type-buttons > button:last-child {
+  border-top-right-radius: 3px;
+}
+#color-scheme-buttons > button:first-child {
+  border-bottom-left-radius: 3px;
+}
+#color-scheme-buttons > button:last-child {
+  border-bottom-right-radius: 3px;
+}
+
+#font-type-buttons > button,
+#font-size-buttons > button,
+#color-scheme-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
+  text-align: center;
+  border: 0;
+}
+
+#font-type-buttons > button,
+#font-size-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
+  width: 50%;
+  background-color: transparent;
+  border-left: 1px solid #B5B5B5;
+  border-bottom: 1px solid #B5B5B5;
+}
+
+#color-scheme-buttons > button {
+  width: 33.33%;
+  font-size: 14px;
+}
+
+#color-scheme-buttons > .dark-button {
+  margin-top: -1px;
+  height: 61px;
+}
+
+#font-type-buttons > button:first-child,
+#font-size-buttons > button:first-child,
+#content-width-buttons > button:first-child,
+#line-height-buttons > button:first-child {
+  border-left: 0;
+}
+
+#font-type-buttons > button {
+  display: inline-block;
+  font-size: 62px;
+  height: 100px;
+}
+
+#font-size-buttons > button,
+#color-scheme-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
+  height: 60px;
+}
+
+#font-type-buttons > button:active:hover,
+#font-type-buttons > button.selected,
+#color-scheme-buttons > button:active:hover,
+#color-scheme-buttons > button.selected {
+  box-shadow: inset 0 -3px 0 0 #fc6420;
+}
+
+#font-type-buttons > button:active:hover,
+#font-type-buttons > button.selected {
+  border-bottom: 1px solid #FC6420;
+}
+
+/* Make the serif button content the same size as the sans-serif button content. */
+#font-type-buttons > button > .description {
+  color: #666;
+  font-size: 12px;
+  margin-top: -5px;
+}
+
+/* Font sizes are different per-platform, so we need custom CSS to line them up. */
+%ifdef XP_MACOSX
+#font-type-buttons > .sans-serif-button > .name {
+  margin-top: 10px;
+}
+
+#font-type-buttons > .sans-serif-button > .description {
+  margin-top: -4px;
+}
+
+#font-type-buttons > .serif-button > .name {
+  font-size: 63px;
+}
+%elifdef XP_WIN
+#font-type-buttons > .sans-serif-button > .name {
+  margin-top: 2px;
+}
+
+#font-type-buttons > .sans-serif-button > .description {
+  margin-top: -4px;
+}
+
+#font-type-buttons > .serif-button > .name {
+  font-size: 63px;
+}
+%else
+#font-type-buttons > .sans-serif-button > .name {
+  margin-top: 5px;
+}
+
+#font-type-buttons > .sans-serif-button > .description {
+  margin-top: -8px;
+}
+
+#font-type-buttons > .serif-button > .name {
+  font-size: 70px;
+}
+%endif
+
+.button:hover,
+#font-size-buttons > button:hover,
+#font-type-buttons > button:hover,
+#content-width-buttons > button:hover,
+#line-height-buttons > button:hover {
+  background-color: #ebebeb;
+}
+
+.dropdown.open,
+.button:active,
+#font-size-buttons > button:active,
+#font-size-buttons > button.selected,
+#content-width-buttons > button:active,
+#content-width-buttons > button.selected,
+#line-height-buttons > button:active,
+#line-height-buttons > button.selected {
+  background-color: #dadada;
+}
+
+/* Only used on Android */
+#font-size-sample {
+  display: none;
+}
+
+.minus-button,
+.plus-button,
+.content-width-minus-button,
+.content-width-plus-button,
+.line-height-minus-button,
+.line-height-plus-button {
+  background-color: transparent;
+  border: 0;
+  background-size: 18px 18px;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+/*======= Toolbar icons =======*/
+
+.close-button {
+  background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg");
+  -moz-context-properties: fill;
+  fill: #808080;
+  height: 68px;
+  background-position: center 8px;
+}
+
+.close-button:hover {
+  fill: #fff;
+  background-color: #d94141;
+  border-bottom: 1px solid #d94141;
+  border-right: 1px solid #d94141;
+}
+
+.close-button:hover:active {
+  background-color: #AE2325;
+  border-bottom: 1px solid #AE2325;
+  border-right: 1px solid #AE2325;
+}
+
+.style-button {
+  background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg");
+}
+
+.minus-button {
+  background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg");
+}
+
+.plus-button {
+  background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg");
+}
+
+.content-width-minus-button {
+  background-size: 42px 16px;
+  background-image: url("chrome://global/skin/reader/RM-Content-Width-Minus-42x16.svg");
+}
+
+.content-width-plus-button {
+  background-size: 44px 16px;
+  background-image: url("chrome://global/skin/reader/RM-Content-Width-Plus-44x16.svg");
+}
+
+.line-height-minus-button {
+  background-size: 34px 14px;
+  background-image: url("chrome://global/skin/reader/RM-Line-Height-Minus-38x14.svg");
+}
+
+.line-height-plus-button {
+  background-size: 34px 24px;
+  background-image: url("chrome://global/skin/reader/RM-Line-Height-Plus-38x24.svg");
+}
+
+@media print {
+  .toolbar {
+    display: none !important;
+  }
+}
diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn
index 5bc40f3b7784..a54038e2cb55 100644
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -15,7 +15,9 @@ toolkit.jar:
   skin/classic/global/aboutCache.css                       (../../shared/aboutCache.css)
   skin/classic/global/aboutCacheEntry.css                  (../../shared/aboutCacheEntry.css)
   skin/classic/global/aboutMemory.css                      (../../shared/aboutMemory.css)
-* skin/classic/global/aboutReader.css                      (../../shared/aboutReader.css)
+  skin/classic/global/aboutReader.css                      (../../shared/aboutReader.css)
+  skin/classic/global/aboutReaderContent.css               (../../shared/aboutReaderContent.css)
+* skin/classic/global/aboutReaderControls.css              (../../shared/aboutReaderControls.css)
   skin/classic/global/aboutRights.css                      (../../shared/aboutRights.css)
   skin/classic/global/aboutLicense.css                     (../../shared/aboutLicense.css)
   skin/classic/global/aboutSupport.css                     (../../shared/aboutSupport.css)
@@ -48,6 +50,7 @@ toolkit.jar:
   skin/classic/global/icons/blocked.svg                    (../../shared/incontent-icons/blocked.svg)
   skin/classic/global/illustrations/about-license.svg      (../../shared/illustrations/about-license.svg)
   skin/classic/global/narrate.css                          (../../shared/narrate.css)
+  skin/classic/global/narrateControls.css                  (../../shared/narrateControls.css)
   skin/classic/global/narrate/arrow.svg                    (../../shared/narrate/arrow.svg)
   skin/classic/global/narrate/back.svg                     (../../shared/narrate/back.svg)
   skin/classic/global/narrate/fast.svg                     (../../shared/narrate/fast.svg)
diff --git a/toolkit/themes/shared/narrate.css b/toolkit/themes/shared/narrate.css
index bfab390cbe95..4514eff35e2d 100644
--- a/toolkit/themes/shared/narrate.css
+++ b/toolkit/themes/shared/narrate.css
@@ -1,6 +1,3 @@
-/* Avoid adding ID selector rules in this style sheet, since they could
- * inadvertently match elements in the article content. */
-
 .narrating {
   position: relative;
   z-index: 1;
@@ -47,190 +44,3 @@ body.sepia .narrate-word-highlight {
 body.dark .narrate-word-highlight {
   border-bottom-color: #6f6f6f;
 }
-
-.narrate-dropdown {
-  --border-color: #e5e5e5;
-}
-
-.narrate-toggle > svg {
-  display: block;
-  margin: 0 8px;
-}
-
-.narrate-dropdown > .dropdown-popup button {
-  background-color: transparent;
-}
-
-.narrate-dropdown > .dropdown-popup button:hover:not(:disabled) {
-  background-color: #eaeaea;
-}
-
-.narrate-row {
-  display: flex;
-  align-items: center;
-  min-height: 40px;
-  box-sizing: border-box;
-}
-
-.narrate-row:not(:first-child) {
-  border-top: 1px solid var(--border-color);
-}
-
-/* Control buttons */
-
-.narrate-control > button {
-  background-size: 24px 24px;
-  background-repeat: no-repeat;
-  background-position: center center;
-  height: 64px;
-  width: 100px;
-  border: none;
-  color: #666;
-  box-sizing: border-box;
-}
-
-.narrate-control > button:not(:first-child) {
-  border-left: 1px solid var(--border-color);
-}
-
-.narrate-skip-previous {
-  border-top-left-radius: 3px;
-  background-image: url("chrome://global/skin/narrate/back.svg");
-  -moz-context-properties: fill;
-  fill: rgb(128 128 128);
-}
-
-.narrate-skip-next {
-  border-top-right-radius: 3px;
-  background-image: url("chrome://global/skin/narrate/forward.svg");
-  -moz-context-properties: fill;
-  fill: rgb(128 128 128);
-}
-
-.narrate-skip-previous:disabled,
-.narrate-skip-next:disabled {
-  fill: rgb(128 128 128 / 50%);
-}
-
-.narrate-start-stop {
-  background-image: url("chrome://global/skin/narrate/start.svg");
-}
-
-.narrate-dropdown.speaking .narrate-start-stop {
-  background-image: url("chrome://global/skin/narrate/stop.svg");
-}
-
-/* Rate control */
-
-.narrate-rate::before, .narrate-rate::after {
-  content: '';
-  width: 48px;
-  height: 40px;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: 24px auto;
-}
-
-.narrate-rate::before {
-  background-image: url("chrome://global/skin/narrate/slow.svg");
-}
-
-.narrate-rate::after {
-  background-image: url("chrome://global/skin/narrate/fast.svg");
-}
-
-.narrate-rate-input {
-  margin: 0 1px;
-  flex-grow: 1;
-}
-
-.narrate-rate-input::-moz-range-track {
-  background-color: #979797;
-  height: 2px;
-}
-
-.narrate-rate-input::-moz-range-progress {
-  background-color: #2EA3FF;
-  height: 2px;
-}
-
-.narrate-rate-input::-moz-range-thumb {
-  background-color: #808080;
-  height: 16px;
-  width: 16px;
-  border-radius: 8px;
-  border-width: 0;
-}
-
-.narrate-rate-input:active::-moz-range-thumb {
-  background-color: #2EA3FF;
-}
-
-/* Voice selection */
-
-.voiceselect {
-  width: 100%;
-}
-
-.voiceselect > button.select-toggle,
-.voiceselect > .options > button.option {
-  -moz-appearance: none;
-  border: none;
-  width: 100%;
-  min-height: 40px;
-}
-
-.voiceselect.open > button.select-toggle {
-  border-bottom: 1px solid var(--border-color);
-}
-
-.voiceselect > button.select-toggle::after {
-  content: '';
-  background-image: url("chrome://global/skin/narrate/arrow.svg");
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: 12px 12px;
-  display: inline-block;
-  width: 1.5em;
-  height: 1em;
-  vertical-align: middle;
-}
-
-.voiceselect > .options > button.option:not(:first-child) {
-  border-top: 1px solid var(--border-color);
-}
-
-.voiceselect > .options > button.option  {
-  box-sizing: border-box;
-}
-
-.voiceselect > .options:not(.hovering) > button.option:focus {
-  background-color: #eaeaea;
-}
-
-.voiceselect > .options:not(.hovering) > button.option:hover:not(:focus) {
-  background-color: transparent;
-}
-
-.voiceselect > .options > button.option::-moz-focus-inner {
-  outline: none;
-  border: 0;
-}
-
-.voiceselect > .options {
-  display: none;
-  overflow-y: auto;
-}
-
-.voiceselect.open > .options {
-  display: block;
-}
-
-.current-voice {
-  color: #7f7f7f;
-}
-
-.voiceselect:not(.open) > button,
-.voiceselect .option:last-child {
-  border-radius: 0 0 3px 3px;
-}
diff --git a/toolkit/themes/shared/narrateControls.css b/toolkit/themes/shared/narrateControls.css
new file mode 100644
index 000000000000..4def74dc88b1
--- /dev/null
+++ b/toolkit/themes/shared/narrateControls.css
@@ -0,0 +1,186 @@
+:scope {
+  --border-color: #e5e5e5;
+}
+
+#narrate-toggle > svg {
+  display: block;
+  margin: 0 8px;
+}
+
+.dropdown-popup button {
+  background-color: transparent;
+}
+
+.dropdown-popup button:hover:not(:disabled) {
+  background-color: #eaeaea;
+}
+
+.narrate-row {
+  display: flex;
+  align-items: center;
+  min-height: 40px;
+  box-sizing: border-box;
+}
+
+.narrate-row:not(:first-child) {
+  border-top: 1px solid var(--border-color);
+}
+
+/* Control buttons */
+
+#narrate-control > button {
+  background-size: 24px 24px;
+  background-repeat: no-repeat;
+  background-position: center center;
+  height: 64px;
+  width: 100px;
+  border: none;
+  color: #666;
+  box-sizing: border-box;
+}
+
+#narrate-control > button:not(:first-child) {
+  border-left: 1px solid var(--border-color);
+}
+
+#narrate-skip-previous {
+  border-top-left-radius: 3px;
+  background-image: url("chrome://global/skin/narrate/back.svg");
+  -moz-context-properties: fill;
+  fill: rgb(128 128 128);
+}
+
+#narrate-skip-next {
+  border-top-right-radius: 3px;
+  background-image: url("chrome://global/skin/narrate/forward.svg");
+  -moz-context-properties: fill;
+  fill: rgb(128 128 128);
+}
+
+#narrate-skip-previous:disabled,
+#narrate-skip-next:disabled {
+  fill: rgb(128 128 128 / 50%);
+}
+
+#narrate-start-stop {
+  background-image: url("chrome://global/skin/narrate/start.svg");
+}
+
+#narrate-dropdown.speaking #narrate-start-stop {
+  background-image: url("chrome://global/skin/narrate/stop.svg");
+}
+
+/* Rate control */
+
+#narrate-rate::before, #narrate-rate::after {
+  content: '';
+  width: 48px;
+  height: 40px;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 24px auto;
+}
+
+#narrate-rate::before {
+  background-image: url("chrome://global/skin/narrate/slow.svg");
+}
+
+#narrate-rate::after {
+  background-image: url("chrome://global/skin/narrate/fast.svg");
+}
+
+#narrate-rate-input {
+  margin: 0 1px;
+  flex-grow: 1;
+}
+
+#narrate-rate-input::-moz-range-track {
+  background-color: #979797;
+  height: 2px;
+}
+
+#narrate-rate-input::-moz-range-progress {
+  background-color: #2EA3FF;
+  height: 2px;
+}
+
+#narrate-rate-input::-moz-range-thumb {
+  background-color: #808080;
+  height: 16px;
+  width: 16px;
+  border-radius: 8px;
+  border-width: 0;
+}
+
+#narrate-rate-input:active::-moz-range-thumb {
+  background-color: #2EA3FF;
+}
+
+/* Voice selection */
+
+.voiceselect {
+  width: 100%;
+}
+
+.voiceselect > button.select-toggle,
+.voiceselect > .options > button.option {
+  -moz-appearance: none;
+  border: none;
+  width: 100%;
+  min-height: 40px;
+}
+
+.voiceselect.open > button.select-toggle {
+  border-bottom: 1px solid var(--border-color);
+}
+
+.voiceselect > button.select-toggle::after {
+  content: '';
+  background-image: url("chrome://global/skin/narrate/arrow.svg");
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 12px 12px;
+  display: inline-block;
+  width: 1.5em;
+  height: 1em;
+  vertical-align: middle;
+}
+
+.voiceselect > .options > button.option:not(:first-child) {
+  border-top: 1px solid var(--border-color);
+}
+
+.voiceselect > .options > button.option  {
+  box-sizing: border-box;
+}
+
+.voiceselect > .options:not(.hovering) > button.option:focus {
+  background-color: #eaeaea;
+}
+
+.voiceselect > .options:not(.hovering) > button.option:hover:not(:focus) {
+  background-color: transparent;
+}
+
+.voiceselect > .options > button.option::-moz-focus-inner {
+  outline: none;
+  border: 0;
+}
+
+.voiceselect > .options {
+  display: none;
+  overflow-y: auto;
+}
+
+.voiceselect.open > .options {
+  display: block;
+}
+
+.current-voice {
+  color: #7f7f7f;
+}
+
+.voiceselect:not(.open) > button,
+.option:last-child {
+  border-radius: 0 0 3px 3px;
+}

From b8ef3369945eb30f9972df127c2227520e8c99b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 4 Dec 2017 11:22:33 +0100
Subject: [PATCH 165/219] Bug 1422634: Avoid sheet notifications to dereference
 a null restyle manager. r=heycam

MozReview-Commit-ID: 2BLUCEqnRDG

--HG--
extra : rebase_source : 00c701e6842d984f1508be93f77c1f8aebd96090
---
 layout/style/ServoStyleSet.cpp | 6 ++++++
 layout/style/ServoStyleSet.h   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/layout/style/ServoStyleSet.cpp b/layout/style/ServoStyleSet.cpp
index 2a9aa2e88a09..2f895b122541 100644
--- a/layout/style/ServoStyleSet.cpp
+++ b/layout/style/ServoStyleSet.cpp
@@ -179,6 +179,12 @@ ServoStyleSet::Shutdown()
   ClearNonInheritingStyleContexts();
   mRawSet = nullptr;
   mStyleRuleMap = nullptr;
+
+  // Also drop the reference to the pres context to avoid notifications from our
+  // stylesheets to dereference a null restyle manager, see bug 1422634.
+  //
+  // We should really fix bug 154199...
+  mPresContext = nullptr;
 }
 
 void
diff --git a/layout/style/ServoStyleSet.h b/layout/style/ServoStyleSet.h
index 81b5ec82daea..39e1b30ab67b 100644
--- a/layout/style/ServoStyleSet.h
+++ b/layout/style/ServoStyleSet.h
@@ -600,7 +600,8 @@ private:
 
   const Kind mKind;
 
-  // Nullptr if this is an XBL style set.
+  // Nullptr if this is an XBL style set, of if we've been already detached from
+  // our shell.
   nsPresContext* MOZ_NON_OWNING_REF mPresContext = nullptr;
 
   // Because XBL style set could be used by multiple PresContext, we need to

From 8e7a2e8d51bc7f2162cbaba9f7f88c7c2d71f0b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 4 Dec 2017 11:40:46 +0100
Subject: [PATCH 166/219] Bug 1422634: followup: fix typo in the comment.
 r=comment-only

DONTBUILD

MozReview-Commit-ID: FG6XfLAKGcs
---
 layout/style/ServoStyleSet.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/style/ServoStyleSet.h b/layout/style/ServoStyleSet.h
index 39e1b30ab67b..a6b5ee14db73 100644
--- a/layout/style/ServoStyleSet.h
+++ b/layout/style/ServoStyleSet.h
@@ -600,7 +600,7 @@ private:
 
   const Kind mKind;
 
-  // Nullptr if this is an XBL style set, of if we've been already detached from
+  // Nullptr if this is an XBL style set, or if we've been already detached from
   // our shell.
   nsPresContext* MOZ_NON_OWNING_REF mPresContext = nullptr;
 

From 311c67101912d3fb908c448df4eef7c02cd8d2d3 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 16 Nov 2017 17:58:37 +0800
Subject: [PATCH 167/219] Bug 1417837 - Part 1: De-scope about:reader style
 sheets. r=Gijs

MozReview-Commit-ID: 8C65ljtFDrh

--HG--
extra : rebase_source : 442d8cbaf7f7252b6b6393845d2d09e265678ae9
---
 mobile/android/themes/core/aboutReader.css    | 406 +++++++++++++
 .../themes/core/aboutReaderContent.css        | 114 ----
 .../themes/core/aboutReaderControls.css       | 292 ---------
 mobile/android/themes/core/jar.mn             |   4 -
 .../components/narrate/NarrateControls.jsm    |   6 +-
 .../printing/content/simplifyMode.css         |   8 +-
 .../reader/content/aboutReader.html           |  12 -
 toolkit/content/browser-content.js            |   6 -
 toolkit/themes/shared/aboutReader.css         | 573 ++++++++++++++++++
 toolkit/themes/shared/aboutReaderContent.css  | 178 ------
 toolkit/themes/shared/aboutReaderControls.css | 394 ------------
 toolkit/themes/shared/jar.inc.mn              |   5 +-
 toolkit/themes/shared/narrate.css             | 187 ++++++
 toolkit/themes/shared/narrateControls.css     | 186 ------
 14 files changed, 1172 insertions(+), 1199 deletions(-)
 delete mode 100644 mobile/android/themes/core/aboutReaderContent.css
 delete mode 100644 mobile/android/themes/core/aboutReaderControls.css
 delete mode 100644 toolkit/themes/shared/aboutReaderContent.css
 delete mode 100644 toolkit/themes/shared/aboutReaderControls.css
 delete mode 100644 toolkit/themes/shared/narrateControls.css

diff --git a/mobile/android/themes/core/aboutReader.css b/mobile/android/themes/core/aboutReader.css
index 2df2d1ff6206..32f52080c04d 100644
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -118,3 +118,409 @@ body.dark > .container > .content blockquote {
   color: #aaaaaa !important;
   border-left-color: #777777 !important;
 }
+
+#reader-message {
+  margin-top: 40px;
+  display: none;
+  text-align: center;
+  width: 100%;
+  font-size: 0.9em;
+}
+
+.header {
+  text-align: start;
+  display: none;
+}
+
+.domain,
+.credits {
+  font-size: 0.9em;
+  font-family: sans-serif;
+}
+
+.domain {
+  margin-top: 10px;
+  padding-bottom: 10px;
+  color: #00acff !important;
+  text-decoration: none;
+}
+
+.domain-border {
+  margin-top: 15px;
+  border-bottom: 1.5px solid #777777;
+  width: 50%;
+}
+
+.header > h1 {
+  font-size: 1.33em;
+  font-weight: 700;
+  line-height: 1.1em;
+  width: 100%;
+  margin: 0px;
+  margin-top: 32px;
+  margin-bottom: 16px;
+  padding: 0px;
+}
+
+.header > .credits {
+  padding: 0px;
+  margin: 0px;
+  margin-bottom: 32px;
+}
+
+/*======= Controls toolbar =======*/
+
+.toolbar {
+  font-family: sans-serif;
+  position: fixed;
+  width: 100%;
+  left: 0;
+  margin: 0;
+  padding: 0;
+  bottom: 0;
+  list-style: none;
+  pointer-events: none;
+  transition: opacity 420ms linear;
+}
+
+.toolbar > * {
+  float: right;
+}
+
+.button {
+  width: 56px;
+  height: 56px;
+  display: block;
+  background-position: center;
+  background-size: 26px 16px;
+  background-repeat: no-repeat;
+  background-color: #0979D9;
+  border-radius: 10000px;
+  margin: 20px;
+  border: 0;
+  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
+}
+
+.button:active {
+  background-color: #086ACC;
+}
+
+/* Remove dotted border when button is focused */
+.button::-moz-focus-inner,
+.dropdown-popup > div > button::-moz-focus-inner {
+  border: 0;
+}
+
+.button[hidden],
+.toolbar[hidden] {
+  display: none;
+}
+
+.dropdown-toggle,
+#reader-popup {
+  pointer-events: auto;
+}
+
+.dropdown {
+  left: 0;
+  text-align: center;
+  display: inline-block;
+  list-style: none;
+  margin: 0px;
+  padding: 0px;
+}
+
+/*======= Font style popup =======*/
+
+.dropdown-popup {
+  position: absolute;
+  left: 0;
+  width: calc(100% - 30px);
+  margin: 15px;
+  z-index: 1000;
+  background: #EBEBF0;
+  visibility: hidden;
+  border: 0;
+  border-radius: 4px;
+  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
+  -moz-user-select: none;
+}
+
+/* Only used on desktop */
+.dropdown-popup > hr,
+.dropdown-arrow,
+#font-type-buttons > button > .name,
+#content-width-buttons,
+#line-height-buttons {
+  display: none;
+}
+
+.open > .dropdown-popup {
+  visibility: visible;
+  bottom: 0;
+}
+
+#font-type-buttons,
+#font-size-buttons,
+#color-scheme-buttons {
+  display: flex;
+  flex-direction: row;
+}
+
+#font-type-buttons > button,
+#color-scheme-buttons > button {
+  text-align: center;
+}
+
+#font-type-buttons > button,
+#font-size-buttons > button {
+  width: 50%;
+  background-color: transparent;
+  border: 0;
+}
+
+#font-type-buttons > button {
+  font-size: 24px;
+  color: #AFB1B3;
+  padding: 15px 0;
+}
+
+#font-type-buttons > button:active,
+#font-type-buttons > button.selected {
+  color: #222222;
+}
+
+#font-size-sample {
+  flex: 0;
+  font-size: 24px;
+  color: #000000;
+  margin: 0 30px;
+  padding: 0 10px;
+}
+
+.serif-button {
+  font-family: serif;
+}
+
+.minus-button,
+.plus-button {
+  background-color: transparent;
+  border: 0;
+  height: 60px;
+  background-size: 18px 18px;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+.minus-button {
+  background-size: 24px 6px;
+  margin-left: 50px;
+  padding: 0 5px;
+}
+
+.plus-button {
+  background-size: 24px 24px;
+  margin-right: 50px;
+  padding: 0 5px;
+}
+
+#color-scheme-buttons > button {
+  width: 33%;
+  border-radius: 4px;
+  border: 1px solid #BFBFBF;
+  padding: 10px;
+  margin: 15px 10px;
+  font-size: 14px;
+}
+
+#color-scheme-buttons > button:active,
+#color-scheme-buttons > button.selected {
+  border: 2px solid #0A84FF;
+}
+
+.dark-button {
+  color: #eeeeee;
+  background-color: #333333;
+}
+
+.auto-button {
+  color: #000000;
+  background-color: transparent;
+}
+
+.light-button {
+  color: #333333;
+  background-color: #ffffff;
+}
+
+/*======= Toolbar icons =======*/
+
+/* desktop-only controls */
+.close-button {
+  display: none;
+}
+
+.style-button {
+  background-image: url('chrome://browser/skin/images/reader-style-icon-hdpi.png');
+}
+
+.minus-button {
+  background-image: url('chrome://browser/skin/images/reader-minus-hdpi.png');
+}
+
+.plus-button {
+  background-image: url('chrome://browser/skin/images/reader-plus-hdpi.png');
+}
+
+@media screen and (min-resolution: 2dppx) {
+  .style-button {
+    background-image: url('chrome://browser/skin/images/reader-style-icon-xhdpi.png');
+  }
+
+  .minus-button {
+    background-image: url('chrome://browser/skin/images/reader-minus-xhdpi.png');
+  }
+
+  .plus-button {
+    background-image: url('chrome://browser/skin/images/reader-plus-xhdpi.png');
+  }
+}
+
+@media screen and (min-resolution: 3dppx) {
+  .style-button {
+    background-image: url('chrome://browser/skin/images/reader-style-icon-xxhdpi.png');
+  }
+
+  .minus-button {
+    background-image: url('chrome://browser/skin/images/reader-minus-xxhdpi.png');
+  }
+
+  .plus-button {
+    background-image: url('chrome://browser/skin/images/reader-plus-xxhdpi.png');
+  }
+}
+
+@media screen and (min-width: 960px) {
+  .dropdown-popup {
+    width: 350px;
+    left: auto;
+    right: 0;
+  }
+}
+
+/*======= Article content =======*/
+
+/* Note that any class names from the original article that we want to match on
+ * must be added to CLASSES_TO_PRESERVE in ReaderMode.jsm, so that
+ * Readability.js doesn't strip them out */
+
+#moz-reader-content {
+  display: none;
+  font-size: 1em;
+}
+
+#moz-reader-content a {
+  text-decoration: underline !important;
+  font-weight: normal;
+}
+
+#moz-reader-content a,
+#moz-reader-content a:visited,
+#moz-reader-content a:hover,
+#moz-reader-content a:active {
+  color: #00acff !important;
+}
+
+#moz-reader-content * {
+  max-width: 100% !important;
+  height: auto !important;
+}
+
+#moz-reader-content p {
+  line-height: 1.4em !important;
+  margin: 0px !important;
+  margin-bottom: 20px !important;
+}
+
+/* Covers all images showing edge-to-edge using a 
+   an optional caption text */
+#moz-reader-content .wp-caption,
+#moz-reader-content figure {
+  display: block !important;
+  width: 100% !important;
+  margin: 0px !important;
+  margin-bottom: 32px !important;
+}
+
+/* Images marked to be shown edge-to-edge with an
+   optional captio ntext */
+#moz-reader-content p > img:only-child,
+#moz-reader-content p > a:only-child > img:only-child,
+#moz-reader-content .wp-caption img,
+#moz-reader-content figure img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+/* Account for body padding to make image full width */
+#moz-reader-content img[moz-reader-full-width] {
+  width: calc(100% + 40px);
+  margin-left: -20px;
+  margin-right: -20px;
+  max-width: none !important;
+}
+
+/* Image caption text */
+#moz-reader-content .caption,
+#moz-reader-content .wp-caption-text,
+#moz-reader-content figcaption {
+  font-size: 0.9em;
+  font-family: sans-serif;
+  margin: 0px !important;
+  padding-top: 4px !important;
+}
+
+/* Ensure all pre-formatted code inside the reader content
+   are properly wrapped inside content width */
+#moz-reader-content code,
+#moz-reader-content pre {
+  white-space: pre-wrap !important;
+  margin-bottom: 20px !important;
+}
+
+#moz-reader-content blockquote {
+  margin: 0px !important;
+  margin-bottom: 20px !important;
+  padding: 0px !important;
+  padding-inline-start: 16px !important;
+  border: 0px !important;
+  border-left: 2px solid !important;
+}
+
+#moz-reader-content ul,
+#moz-reader-content ol {
+  margin: 0px !important;
+  margin-bottom: 20px !important;
+  padding: 0px !important;
+  line-height: 1.5em;
+}
+
+#moz-reader-content ul {
+  padding-inline-start: 30px !important;
+  list-style: disc !important;
+}
+
+#moz-reader-content ol {
+  padding-inline-start: 35px !important;
+  list-style: decimal !important;
+}
+
+/* Hide elements with common "hidden" class names */
+#moz-reader-content .visually-hidden,
+#moz-reader-content .visuallyhidden,
+#moz-reader-content .hidden,
+#moz-reader-content .invisible,
+#moz-reader-content .sr-only {
+  display: none;
+}
diff --git a/mobile/android/themes/core/aboutReaderContent.css b/mobile/android/themes/core/aboutReaderContent.css
deleted file mode 100644
index fe6451df2f52..000000000000
--- a/mobile/android/themes/core/aboutReaderContent.css
+++ /dev/null
@@ -1,114 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#moz-reader-content {
-  display: none;
-  font-size: 1em;
-}
-
-a {
-  text-decoration: underline !important;
-  font-weight: normal;
-}
-
-a,
-a:visited,
-a:hover,
-a:active {
-  color: #00acff !important;
-}
-
-* {
-  max-width: 100% !important;
-  height: auto !important;
-}
-
-p {
-  line-height: 1.4em !important;
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-}
-
-/* Covers all images showing edge-to-edge using a 
-   an optional caption text */
-.wp-caption,
-figure {
-  display: block !important;
-  width: 100% !important;
-  margin: 0px !important;
-  margin-bottom: 32px !important;
-}
-
-/* Images marked to be shown edge-to-edge with an
-   optional captio ntext */
-p > img:only-child,
-p > a:only-child > img:only-child,
-.wp-caption img,
-figure img {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-/* Account for body padding to make image full width */
-img[moz-reader-full-width] {
-  width: calc(100% + 40px);
-  margin-left: -20px;
-  margin-right: -20px;
-  max-width: none !important;
-}
-
-/* Image caption text */
-.caption,
-.wp-caption-text,
-figcaption {
-  font-size: 0.9em;
-  font-family: sans-serif;
-  margin: 0px !important;
-  padding-top: 4px !important;
-}
-
-/* Ensure all pre-formatted code inside the reader content
-   are properly wrapped inside content width */
-code,
-pre {
-  white-space: pre-wrap !important;
-  margin-bottom: 20px !important;
-}
-
-blockquote {
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-  padding: 0px !important;
-  padding-inline-start: 16px !important;
-  border: 0px !important;
-  border-left: 2px solid !important;
-}
-
-ul,
-ol {
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-  padding: 0px !important;
-  line-height: 1.5em;
-}
-
-ul {
-  padding-inline-start: 30px !important;
-  list-style: disc !important;
-}
-
-ol {
-  padding-inline-start: 35px !important;
-  list-style: decimal !important;
-}
-
-/* Hide elements with common "hidden" class names */
-.visually-hidden,
-.visuallyhidden,
-.hidden,
-.invisible,
-.sr-only {
-  display: none;
-}
diff --git a/mobile/android/themes/core/aboutReaderControls.css b/mobile/android/themes/core/aboutReaderControls.css
deleted file mode 100644
index 4bfae9cb0da6..000000000000
--- a/mobile/android/themes/core/aboutReaderControls.css
+++ /dev/null
@@ -1,292 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#reader-message {
-  margin-top: 40px;
-  display: none;
-  text-align: center;
-  width: 100%;
-  font-size: 0.9em;
-}
-
-.header {
-  text-align: start;
-  display: none;
-}
-
-.domain,
-.credits {
-  font-size: 0.9em;
-  font-family: sans-serif;
-}
-
-.domain {
-  margin-top: 10px;
-  padding-bottom: 10px;
-  color: #00acff !important;
-  text-decoration: none;
-}
-
-.domain-border {
-  margin-top: 15px;
-  border-bottom: 1.5px solid #777777;
-  width: 50%;
-}
-
-.header > h1 {
-  font-size: 1.33em;
-  font-weight: 700;
-  line-height: 1.1em;
-  width: 100%;
-  margin: 0px;
-  margin-top: 32px;
-  margin-bottom: 16px;
-  padding: 0px;
-}
-
-.header > .credits {
-  padding: 0px;
-  margin: 0px;
-  margin-bottom: 32px;
-}
-
-/*======= Controls toolbar =======*/
-
-.toolbar {
-  font-family: sans-serif;
-  position: fixed;
-  width: 100%;
-  left: 0;
-  margin: 0;
-  padding: 0;
-  bottom: 0;
-  list-style: none;
-  pointer-events: none;
-  transition: opacity 420ms linear;
-}
-
-.toolbar > * {
-  float: right;
-}
-
-.button {
-  width: 56px;
-  height: 56px;
-  display: block;
-  background-position: center;
-  background-size: 26px 16px;
-  background-repeat: no-repeat;
-  background-color: #0979D9;
-  border-radius: 10000px;
-  margin: 20px;
-  border: 0;
-  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
-}
-
-.button:active {
-  background-color: #086ACC;
-}
-
-/* Remove dotted border when button is focused */
-.button::-moz-focus-inner,
-.dropdown-popup > div > button::-moz-focus-inner {
-  border: 0;
-}
-
-.button[hidden],
-.toolbar[hidden] {
-  display: none;
-}
-
-.dropdown-toggle,
-#reader-popup {
-  pointer-events: auto;
-}
-
-.dropdown {
-  left: 0;
-  text-align: center;
-  display: inline-block;
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-}
-
-/*======= Font style popup =======*/
-
-.dropdown-popup {
-  position: absolute;
-  left: 0;
-  width: calc(100% - 30px);
-  margin: 15px;
-  z-index: 1000;
-  background: #EBEBF0;
-  visibility: hidden;
-  border: 0;
-  border-radius: 4px;
-  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
-  -moz-user-select: none;
-}
-
-/* Only used on desktop */
-.dropdown-popup > hr,
-.dropdown-arrow,
-#font-type-buttons > button > .name,
-#content-width-buttons,
-#line-height-buttons {
-  display: none;
-}
-
-.open > .dropdown-popup {
-  visibility: visible;
-  bottom: 0;
-}
-
-#font-type-buttons,
-#font-size-buttons,
-#color-scheme-buttons {
-  display: flex;
-  flex-direction: row;
-}
-
-#font-type-buttons > button,
-#color-scheme-buttons > button {
-  text-align: center;
-}
-
-#font-type-buttons > button,
-#font-size-buttons > button {
-  width: 50%;
-  background-color: transparent;
-  border: 0;
-}
-
-#font-type-buttons > button {
-  font-size: 24px;
-  color: #AFB1B3;
-  padding: 15px 0;
-}
-
-#font-type-buttons > button:active,
-#font-type-buttons > button.selected {
-  color: #222222;
-}
-
-#font-size-sample {
-  flex: 0;
-  font-size: 24px;
-  color: #000000;
-  margin: 0 30px;
-  padding: 0 10px;
-}
-
-.serif-button {
-  font-family: serif;
-}
-
-.minus-button,
-.plus-button {
-  background-color: transparent;
-  border: 0;
-  height: 60px;
-  background-size: 18px 18px;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
-.minus-button {
-  background-size: 24px 6px;
-  margin-left: 50px;
-  padding: 0 5px;
-}
-
-.plus-button {
-  background-size: 24px 24px;
-  margin-right: 50px;
-  padding: 0 5px;
-}
-
-#color-scheme-buttons > button {
-  width: 33%;
-  border-radius: 4px;
-  border: 1px solid #BFBFBF;
-  padding: 10px;
-  margin: 15px 10px;
-  font-size: 14px;
-}
-
-#color-scheme-buttons > button:active,
-#color-scheme-buttons > button.selected {
-  border: 2px solid #0A84FF;
-}
-
-.dark-button {
-  color: #eeeeee;
-  background-color: #333333;
-}
-
-.auto-button {
-  color: #000000;
-  background-color: transparent;
-}
-
-.light-button {
-  color: #333333;
-  background-color: #ffffff;
-}
-
-/*======= Toolbar icons =======*/
-
-/* desktop-only controls */
-.close-button {
-  display: none;
-}
-
-.style-button {
-  background-image: url('chrome://browser/skin/images/reader-style-icon-hdpi.png');
-}
-
-.minus-button {
-  background-image: url('chrome://browser/skin/images/reader-minus-hdpi.png');
-}
-
-.plus-button {
-  background-image: url('chrome://browser/skin/images/reader-plus-hdpi.png');
-}
-
-@media screen and (min-resolution: 2dppx) {
-  .style-button {
-    background-image: url('chrome://browser/skin/images/reader-style-icon-xhdpi.png');
-  }
-
-  .minus-button {
-    background-image: url('chrome://browser/skin/images/reader-minus-xhdpi.png');
-  }
-
-  .plus-button {
-    background-image: url('chrome://browser/skin/images/reader-plus-xhdpi.png');
-  }
-}
-
-@media screen and (min-resolution: 3dppx) {
-  .style-button {
-    background-image: url('chrome://browser/skin/images/reader-style-icon-xxhdpi.png');
-  }
-
-  .minus-button {
-    background-image: url('chrome://browser/skin/images/reader-minus-xxhdpi.png');
-  }
-
-  .plus-button {
-    background-image: url('chrome://browser/skin/images/reader-plus-xxhdpi.png');
-  }
-}
-
-@media screen and (min-width: 960px) {
-  .dropdown-popup {
-    width: 350px;
-    left: auto;
-    right: 0;
-  }
-}
diff --git a/mobile/android/themes/core/jar.mn b/mobile/android/themes/core/jar.mn
index 560bb6f319db..c07c0de67b55 100644
--- a/mobile/android/themes/core/jar.mn
+++ b/mobile/android/themes/core/jar.mn
@@ -15,8 +15,6 @@ chrome.jar:
   skin/aboutMemory.css                      (aboutMemory.css)
   skin/aboutPrivateBrowsing.css             (aboutPrivateBrowsing.css)
   skin/aboutReader.css                      (aboutReader.css)
-  skin/aboutReaderContent.css               (aboutReaderContent.css)
-  skin/aboutReaderControls.css              (aboutReaderControls.css)
   skin/aboutSupport.css                     (aboutSupport.css)
   skin/config.css                           (config.css)
   skin/defines.css                          (defines.css)
@@ -25,8 +23,6 @@ chrome.jar:
 % override chrome://global/skin/about.css chrome://browser/skin/about.css
 % override chrome://global/skin/aboutMemory.css chrome://browser/skin/aboutMemory.css
 % override chrome://global/skin/aboutReader.css chrome://browser/skin/aboutReader.css
-% override chrome://global/skin/aboutReaderContent.css chrome://browser/skin/aboutReaderContent.css
-% override chrome://global/skin/aboutReaderControls.css chrome://browser/skin/aboutReaderControls.css
 % override chrome://global/skin/aboutSupport.css chrome://browser/skin/aboutSupport.css
 % override chrome://global/skin/netError.css chrome://browser/skin/netError.css
 
diff --git a/toolkit/components/narrate/NarrateControls.jsm b/toolkit/components/narrate/NarrateControls.jsm
index 35c2b0bccf99..c202ff627d57 100644
--- a/toolkit/components/narrate/NarrateControls.jsm
+++ b/toolkit/components/narrate/NarrateControls.jsm
@@ -41,13 +41,9 @@ function NarrateControls(mm, win, languagePromise) {
   dropdown.className = "dropdown";
   dropdown.id = "narrate-dropdown";
   // We need inline svg here for the animation to work (bug 908634 & 1190881).
-  // The style animation can't be scoped (bug 830056).
   // eslint-disable-next-line no-unsanitized/property
   dropdown.innerHTML =
-    localize`<style scoped>
-      @import url("chrome://global/skin/narrateControls.css");
-    </style>
-    <li>
+    localize`<li>
        <button class="dropdown-toggle button" id="narrate-toggle"
                title="${"narrate"}" hidden>
          <svg xmlns="http://www.w3.org/2000/svg"
diff --git a/toolkit/components/printing/content/simplifyMode.css b/toolkit/components/printing/content/simplifyMode.css
index 4ad692228304..257acad91b45 100644
--- a/toolkit/components/printing/content/simplifyMode.css
+++ b/toolkit/components/printing/content/simplifyMode.css
@@ -4,9 +4,9 @@
 
 /* This file defines specific rules for print preview when using simplify mode.
  * Some of these rules (styling for title and author on the header element)
- * already exist on aboutReaderControls.css, however, we decoupled it from the
- * original file so we don't need to load a bunch of extra queries that will not
- * take effect when using the simplify page checkbox. */
+ * already exist in aboutReader.css, however, we decoupled it from the original
+ * file so we don't need to load a bunch of extra queries that will not take
+ * effect when using the simplify page checkbox. */
 
 body {
   padding-top: 0px;
@@ -29,4 +29,4 @@ body {
   line-height: 1.48em;
   margin: 0 0 30px 0;
   font-style: italic;
-}
\ No newline at end of file
+}
diff --git a/toolkit/components/reader/content/aboutReader.html b/toolkit/components/reader/content/aboutReader.html
index 53d5a2b47567..635ba6bdb5b5 100644
--- a/toolkit/components/reader/content/aboutReader.html
+++ b/toolkit/components/reader/content/aboutReader.html
@@ -13,9 +13,6 @@
 <body>
   <div id="container" class="container">
     <div id="reader-header" class="header">
-      <style scoped>
-        @import url("chrome://global/skin/aboutReaderControls.css");
-      </style>
       <a id="reader-domain" class="domain"></a>
       <div class="domain-border"></div>
       <h1 id="reader-title"></h1>
@@ -28,24 +25,15 @@
     <hr>
 
     <div class="content">
-      <style scoped>
-        @import url("chrome://global/skin/aboutReaderContent.css");
-      </style>
       <div id="moz-reader-content"></div>
     </div>
 
     <div>
-      <style scoped>
-        @import url("chrome://global/skin/aboutReaderControls.css");
-      </style>
       <div id="reader-message"></div>
     </div>
   </div>
 
   <ul id="reader-toolbar" class="toolbar">
-    <style scoped>
-      @import url("chrome://global/skin/aboutReaderControls.css");
-    </style>
     <li><button id="close-button" class="button close-button"/></li>
     <ul id="style-dropdown" class="dropdown">
       <li><button class="dropdown-toggle button style-button"/></li>
diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js
index c686f86476a5..63116f09cc2e 100644
--- a/toolkit/content/browser-content.js
+++ b/toolkit/content/browser-content.js
@@ -677,12 +677,6 @@ var Printing = {
       contentElement.setAttribute("class", "content");
       containerElement.appendChild(contentElement);
 
-      // Create style element for content div and import aboutReaderContent.css
-      let controlContentStyle = content.document.createElement("style");
-      controlContentStyle.setAttribute("scoped", "");
-      controlContentStyle.textContent = "@import url(\"chrome://global/skin/aboutReaderContent.css\");";
-      contentElement.appendChild(controlContentStyle);
-
       // Jam the article's content into content div
       let readerContent = content.document.createElement("div");
       readerContent.setAttribute("id", "moz-reader-content");
diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
index 36945def6ca9..7b63f56e3e84 100644
--- a/toolkit/themes/shared/aboutReader.css
+++ b/toolkit/themes/shared/aboutReader.css
@@ -163,3 +163,576 @@ body:not(.loaded) .toolbar:-moz-locale-dir(ltr) {
 body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
   transform: translateX(100%);
 }
+
+.light-button {
+  color: #333333;
+  background-color: #ffffff;
+}
+
+.dark-button {
+  color: #eeeeee;
+  background-color: #333333;
+}
+
+.sepia-button {
+  color: #5b4636;
+  background-color: #f4ecd8;
+}
+
+.sans-serif-button {
+  font-family: Helvetica, Arial, sans-serif;
+}
+
+.serif-button {
+  font-family: Georgia, "Times New Roman", serif;
+}
+
+/* Loading/error message */
+
+#reader-message {
+  margin-top: 40px;
+  display: none;
+  text-align: center;
+  width: 100%;
+  font-size: 0.9em;
+}
+
+/* Header */
+
+.header {
+  text-align: start;
+  display: none;
+}
+
+.domain {
+  font-size: 0.9em;
+  line-height: 1.48em;
+  padding-bottom: 4px;
+  font-family: Helvetica, Arial, sans-serif;
+  text-decoration: none;
+  border-bottom: 1px solid;
+  color: #0095dd;
+}
+
+.header > h1 {
+  font-size: 1.6em;
+  line-height: 1.25em;
+  width: 100%;
+  margin: 30px 0;
+  padding: 0;
+}
+
+.header > .credits {
+  font-size: 0.9em;
+  line-height: 1.48em;
+  margin: 0 0 10px 0;
+  padding: 0;
+  font-style: italic;
+}
+
+.header > .meta-data {
+  font-size: 0.65em;
+  margin: 0 0 15px 0;
+}
+
+/*======= Controls toolbar =======*/
+
+.toolbar {
+  font-family: Helvetica, Arial, sans-serif;
+  position: fixed;
+  height: 100%;
+  top: 0;
+  left: 0;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  background-color: #fbfbfb;
+  -moz-user-select: none;
+  border-right: 1px solid #b5b5b5;
+  z-index: 1;
+}
+
+.button {
+  display: block;
+  background-size: 24px 24px;
+  background-repeat: no-repeat;
+  color: #333;
+  background-color: #fbfbfb;
+  height: 40px;
+  padding: 0;
+}
+
+.toolbar .button {
+  width: 40px;
+  background-position: center;
+  margin-right: -1px;
+  border-top: 0;
+  border-left: 0;
+  border-right: 1px solid #b5b5b5;
+  border-bottom: 1px solid #c1c1c1;
+}
+
+.button[hidden] {
+  display: none;
+}
+
+.dropdown {
+  text-align: center;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.dropdown li {
+  margin: 0;
+  padding: 0;
+}
+
+/*======= Popup =======*/
+
+.dropdown-popup {
+  min-width: 300px;
+  text-align: start;
+  position: absolute;
+  left: 48px; /* offset to account for toolbar width */
+  z-index: 1000;
+  background-color: #fbfbfb;
+  visibility: hidden;
+  border-radius: 4px;
+  border: 1px solid #b5b5b5;
+  border-bottom-width: 0;
+  box-shadow: 0 1px 3px #c1c1c1;
+}
+
+.keep-open .dropdown-popup {
+  z-index: initial;
+}
+
+.dropdown-popup > hr {
+  display: none;
+}
+
+.open > .dropdown-popup {
+  visibility: visible;
+}
+
+.dropdown-arrow {
+  position: absolute;
+  top: 30px; /* offset arrow from top of popup */
+  left: -16px;
+  width: 16px;
+  height: 24px;
+  background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg");
+  display: block;
+}
+
+/*======= Font style popup =======*/
+
+#font-type-buttons,
+#font-size-buttons,
+#color-scheme-buttons,
+#content-width-buttons,
+#line-height-buttons {
+  display: flex;
+  flex-direction: row;
+}
+
+#font-type-buttons > button:first-child {
+  border-top-left-radius: 3px;
+}
+#font-type-buttons > button:last-child {
+  border-top-right-radius: 3px;
+}
+#color-scheme-buttons > button:first-child {
+  border-bottom-left-radius: 3px;
+}
+#color-scheme-buttons > button:last-child {
+  border-bottom-right-radius: 3px;
+}
+
+#font-type-buttons > button,
+#font-size-buttons > button,
+#color-scheme-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
+  text-align: center;
+  border: 0;
+}
+
+#font-type-buttons > button,
+#font-size-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
+  width: 50%;
+  background-color: transparent;
+  border-left: 1px solid #B5B5B5;
+  border-bottom: 1px solid #B5B5B5;
+}
+
+#color-scheme-buttons > button {
+  width: 33.33%;
+  font-size: 14px;
+}
+
+#color-scheme-buttons > .dark-button {
+  margin-top: -1px;
+  height: 61px;
+}
+
+#font-type-buttons > button:first-child,
+#font-size-buttons > button:first-child,
+#content-width-buttons > button:first-child,
+#line-height-buttons > button:first-child {
+  border-left: 0;
+}
+
+#font-type-buttons > button {
+  display: inline-block;
+  font-size: 62px;
+  height: 100px;
+}
+
+#font-size-buttons > button,
+#color-scheme-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
+  height: 60px;
+}
+
+#font-type-buttons > button:active:hover,
+#font-type-buttons > button.selected,
+#color-scheme-buttons > button:active:hover,
+#color-scheme-buttons > button.selected {
+  box-shadow: inset 0 -3px 0 0 #fc6420;
+}
+
+#font-type-buttons > button:active:hover,
+#font-type-buttons > button.selected {
+  border-bottom: 1px solid #FC6420;
+}
+
+/* Make the serif button content the same size as the sans-serif button content. */
+#font-type-buttons > button > .description {
+  color: #666;
+  font-size: 12px;
+  margin-top: -5px;
+}
+
+/* Font sizes are different per-platform, so we need custom CSS to line them up. */
+%ifdef XP_MACOSX
+#font-type-buttons > .sans-serif-button > .name {
+  margin-top: 10px;
+}
+
+#font-type-buttons > .sans-serif-button > .description {
+  margin-top: -4px;
+}
+
+#font-type-buttons > .serif-button > .name {
+  font-size: 63px;
+}
+%elifdef XP_WIN
+#font-type-buttons > .sans-serif-button > .name {
+  margin-top: 2px;
+}
+
+#font-type-buttons > .sans-serif-button > .description {
+  margin-top: -4px;
+}
+
+#font-type-buttons > .serif-button > .name {
+  font-size: 63px;
+}
+%else
+#font-type-buttons > .sans-serif-button > .name {
+  margin-top: 5px;
+}
+
+#font-type-buttons > .sans-serif-button > .description {
+  margin-top: -8px;
+}
+
+#font-type-buttons > .serif-button > .name {
+  font-size: 70px;
+}
+%endif
+
+.button:hover,
+#font-size-buttons > button:hover,
+#font-type-buttons > button:hover,
+#content-width-buttons > button:hover,
+#line-height-buttons > button:hover {
+  background-color: #ebebeb;
+}
+
+.dropdown.open,
+.button:active,
+#font-size-buttons > button:active,
+#font-size-buttons > button.selected,
+#content-width-buttons > button:active,
+#content-width-buttons > button.selected,
+#line-height-buttons > button:active,
+#line-height-buttons > button.selected {
+  background-color: #dadada;
+}
+
+/* Only used on Android */
+#font-size-sample {
+  display: none;
+}
+
+.minus-button,
+.plus-button,
+.content-width-minus-button,
+.content-width-plus-button,
+.line-height-minus-button,
+.line-height-plus-button {
+  background-color: transparent;
+  border: 0;
+  background-size: 18px 18px;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+/*======= Toolbar icons =======*/
+
+.close-button {
+  background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg");
+  -moz-context-properties: fill;
+  fill: #808080;
+  height: 68px;
+  background-position: center 8px;
+}
+
+.close-button:hover {
+  fill: #fff;
+  background-color: #d94141;
+  border-bottom: 1px solid #d94141;
+  border-right: 1px solid #d94141;
+}
+
+.close-button:hover:active {
+  background-color: #AE2325;
+  border-bottom: 1px solid #AE2325;
+  border-right: 1px solid #AE2325;
+}
+
+.style-button {
+  background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg");
+}
+
+.minus-button {
+  background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg");
+}
+
+.plus-button {
+  background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg");
+}
+
+.content-width-minus-button {
+  background-size: 42px 16px;
+  background-image: url("chrome://global/skin/reader/RM-Content-Width-Minus-42x16.svg");
+}
+
+.content-width-plus-button {
+  background-size: 44px 16px;
+  background-image: url("chrome://global/skin/reader/RM-Content-Width-Plus-44x16.svg");
+}
+
+.line-height-minus-button {
+  background-size: 34px 14px;
+  background-image: url("chrome://global/skin/reader/RM-Line-Height-Minus-38x14.svg");
+}
+
+.line-height-plus-button {
+  background-size: 34px 24px;
+  background-image: url("chrome://global/skin/reader/RM-Line-Height-Plus-38x24.svg");
+}
+
+@media print {
+  .toolbar {
+    display: none !important;
+  }
+}
+
+/*======= Article content =======*/
+
+/* Note that any class names from the original article that we want to match on
+ * must be added to CLASSES_TO_PRESERVE in ReaderMode.jsm, so that
+ * Readability.js doesn't strip them out */
+
+#moz-reader-content {
+  display: none;
+  font-size: 1em;
+  line-height: 1.6em;
+}
+
+#moz-reader-content.line-height1 {
+  line-height: 1em;
+}
+
+#moz-reader-content.line-height2 {
+  line-height: 1.2em;
+}
+
+#moz-reader-content.line-height3 {
+  line-height: 1.4em;
+}
+
+#moz-reader-content.line-height4 {
+  line-height: 1.6em;
+}
+
+#moz-reader-content.line-height5 {
+  line-height: 1.8em;
+}
+
+#moz-reader-content.line-height6 {
+  line-height: 2.0em;
+}
+
+#moz-reader-content.line-height7 {
+  line-height: 2.2em;
+}
+
+#moz-reader-content.line-height8 {
+  line-height: 2.4em;
+}
+
+#moz-reader-content.line-height9 {
+  line-height: 2.6em;
+}
+
+@media print {
+  #moz-reader-content p,
+  #moz-reader-content code,
+  #moz-reader-content pre,
+  #moz-reader-content blockquote,
+  #moz-reader-content ul,
+  #moz-reader-content ol,
+  #moz-reader-content li,
+  #moz-reader-content figure,
+  #moz-reader-content .wp-caption {
+    margin: 0 0 10px 0 !important;
+    padding: 0 !important;
+  }
+}
+
+#moz-reader-content h1,
+#moz-reader-content h2,
+#moz-reader-content h3 {
+  font-weight: bold;
+}
+
+#moz-reader-content h1 {
+  font-size: 1.6em;
+  line-height: 1.25em;
+}
+
+#moz-reader-content h2 {
+  font-size: 1.2em;
+  line-height: 1.51em;
+}
+
+#moz-reader-content h3 {
+  font-size: 1em;
+  line-height: 1.66em;
+}
+
+#moz-reader-content a:link {
+  text-decoration: underline;
+  font-weight: normal;
+}
+
+#moz-reader-content a:link,
+#moz-reader-content a:link:hover,
+#moz-reader-content a:link:active {
+  color: #0095dd;
+}
+
+#moz-reader-content a:visited {
+  color: #c2e;
+}
+
+#moz-reader-content * {
+  max-width: 100%;
+  height: auto;
+}
+
+#moz-reader-content p,
+#moz-reader-content p,
+#moz-reader-content code,
+#moz-reader-content pre,
+#moz-reader-content blockquote,
+#moz-reader-content ul,
+#moz-reader-content ol,
+#moz-reader-content li,
+#moz-reader-content figure,
+#moz-reader-content .wp-caption {
+  margin: -10px -10px 20px -10px;
+  padding: 10px;
+  border-radius: 5px;
+}
+
+#moz-reader-content li {
+  margin-bottom: 0;
+}
+
+#moz-reader-content li > ul,
+#moz-reader-content li > ol {
+  margin-bottom: -10px;
+}
+
+#moz-reader-content p > img:only-child,
+#moz-reader-content p > a:only-child > img:only-child,
+#moz-reader-content .wp-caption img,
+#moz-reader-content figure img {
+  display: block;
+}
+
+#moz-reader-content img[moz-reader-center] {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+#moz-reader-content .caption,
+#moz-reader-content .wp-caption-text
+#moz-reader-content figcaption {
+  font-size: 0.9em;
+  line-height: 1.48em;
+  font-style: italic;
+}
+
+#moz-reader-content code,
+#moz-reader-content pre {
+  white-space: pre-wrap;
+}
+
+#moz-reader-content blockquote {
+  padding: 0;
+  padding-inline-start: 16px;
+}
+
+#moz-reader-content ul,
+#moz-reader-content ol {
+  padding: 0;
+}
+
+#moz-reader-content ul {
+  padding-inline-start: 30px;
+  list-style: disc;
+}
+
+#moz-reader-content ol {
+  padding-inline-start: 30px;
+  list-style: decimal;
+}
+
+/* Hide elements with common "hidden" class names */
+#moz-reader-content .visually-hidden,
+#moz-reader-content .visuallyhidden,
+#moz-reader-content .hidden,
+#moz-reader-content .invisible,
+#moz-reader-content .sr-only {
+  display: none;
+}
diff --git a/toolkit/themes/shared/aboutReaderContent.css b/toolkit/themes/shared/aboutReaderContent.css
deleted file mode 100644
index f69c17bf88a4..000000000000
--- a/toolkit/themes/shared/aboutReaderContent.css
+++ /dev/null
@@ -1,178 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#moz-reader-content {
-  display: none;
-  font-size: 1em;
-  line-height: 1.6em;
-}
-
-#moz-reader-content.line-height1 {
-  line-height: 1em;
-}
-
-#moz-reader-content.line-height2 {
-  line-height: 1.2em;
-}
-
-#moz-reader-content.line-height3 {
-  line-height: 1.4em;
-}
-
-#moz-reader-content.line-height4 {
-  line-height: 1.6em;
-}
-
-#moz-reader-content.line-height5 {
-  line-height: 1.8em;
-}
-
-#moz-reader-content.line-height6 {
-  line-height: 2.0em;
-}
-
-#moz-reader-content.line-height7 {
-  line-height: 2.2em;
-}
-
-#moz-reader-content.line-height8 {
-  line-height: 2.4em;
-}
-
-#moz-reader-content.line-height9 {
-  line-height: 2.6em;
-}
-
-@media print {
-  p,
-  code,
-  pre,
-  blockquote,
-  ul,
-  ol,
-  li,
-  figure,
-  .wp-caption {
-    margin: 0 0 10px 0 !important;
-    padding: 0 !important;
-  }
-}
-
-h1,
-h2,
-h3 {
-  font-weight: bold;
-}
-
-h1 {
-  font-size: 1.6em;
-  line-height: 1.25em;
-}
-
-h2 {
-  font-size: 1.2em;
-  line-height: 1.51em;
-}
-
-h3 {
-  font-size: 1em;
-  line-height: 1.66em;
-}
-
-a:link {
-  text-decoration: underline;
-  font-weight: normal;
-}
-
-a:link,
-a:link:hover,
-a:link:active {
-  color: #0095dd;
-}
-
-a:visited {
-  color: #c2e;
-}
-
-* {
-  max-width: 100%;
-  height: auto;
-}
-
-p,
-code,
-pre,
-blockquote,
-ul,
-ol,
-li,
-figure,
-.wp-caption {
-  margin: -10px -10px 20px -10px;
-  padding: 10px;
-  border-radius: 5px;
-}
-
-li {
-  margin-bottom: 0;
-}
-
-li > ul,
-li > ol {
-  margin-bottom: -10px;
-}
-
-p > img:only-child,
-p > a:only-child > img:only-child,
-.wp-caption img,
-figure img {
-  display: block;
-}
-
-img[moz-reader-center] {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.caption,
-.wp-caption-text,
-figcaption {
-  font-size: 0.9em;
-  line-height: 1.48em;
-  font-style: italic;
-}
-
-code,
-pre {
-  white-space: pre-wrap;
-}
-
-blockquote {
-  padding: 0;
-  padding-inline-start: 16px;
-}
-
-ul,
-ol {
-  padding: 0;
-}
-
-ul {
-  padding-inline-start: 30px;
-  list-style: disc;
-}
-
-ol {
-  padding-inline-start: 30px;
-  list-style: decimal;
-}
-
-/* Hide elements with common "hidden" class names */
-.visually-hidden,
-.visuallyhidden,
-.hidden,
-.invisible,
-.sr-only {
-  display: none;
-}
diff --git a/toolkit/themes/shared/aboutReaderControls.css b/toolkit/themes/shared/aboutReaderControls.css
deleted file mode 100644
index 2a4b66e5414a..000000000000
--- a/toolkit/themes/shared/aboutReaderControls.css
+++ /dev/null
@@ -1,394 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.light-button {
-  color: #333333;
-  background-color: #ffffff;
-}
-
-.dark-button {
-  color: #eeeeee;
-  background-color: #333333;
-}
-
-.sepia-button {
-  color: #5b4636;
-  background-color: #f4ecd8;
-}
-
-.sans-serif-button {
-  font-family: Helvetica, Arial, sans-serif;
-}
-
-.serif-button {
-  font-family: Georgia, "Times New Roman", serif;
-}
-
-/* Loading/error message */
-
-#reader-message {
-  margin-top: 40px;
-  display: none;
-  text-align: center;
-  width: 100%;
-  font-size: 0.9em;
-}
-
-/* Header */
-
-.header {
-  text-align: start;
-  display: none;
-}
-
-.domain {
-  font-size: 0.9em;
-  line-height: 1.48em;
-  padding-bottom: 4px;
-  font-family: Helvetica, Arial, sans-serif;
-  text-decoration: none;
-  border-bottom: 1px solid;
-  color: #0095dd;
-}
-
-.header > h1 {
-  font-size: 1.6em;
-  line-height: 1.25em;
-  width: 100%;
-  margin: 30px 0;
-  padding: 0;
-}
-
-.header > .credits {
-  font-size: 0.9em;
-  line-height: 1.48em;
-  margin: 0 0 10px 0;
-  padding: 0;
-  font-style: italic;
-}
-
-.header > .meta-data {
-  font-size: 0.65em;
-  margin: 0 0 15px 0;
-}
-
-/*======= Controls toolbar =======*/
-
-.toolbar {
-  font-family: Helvetica, Arial, sans-serif;
-  position: fixed;
-  height: 100%;
-  top: 0;
-  left: 0;
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  background-color: #fbfbfb;
-  -moz-user-select: none;
-  border-right: 1px solid #b5b5b5;
-  z-index: 1;
-}
-
-.button {
-  display: block;
-  background-size: 24px 24px;
-  background-repeat: no-repeat;
-  color: #333;
-  background-color: #fbfbfb;
-  height: 40px;
-  padding: 0;
-}
-
-.toolbar .button {
-  width: 40px;
-  background-position: center;
-  margin-right: -1px;
-  border-top: 0;
-  border-left: 0;
-  border-right: 1px solid #b5b5b5;
-  border-bottom: 1px solid #c1c1c1;
-}
-
-.button[hidden] {
-  display: none;
-}
-
-.dropdown {
-  text-align: center;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.dropdown li {
-  margin: 0;
-  padding: 0;
-}
-
-/*======= Popup =======*/
-
-.dropdown-popup {
-  min-width: 300px;
-  text-align: start;
-  position: absolute;
-  left: 48px; /* offset to account for toolbar width */
-  z-index: 1000;
-  background-color: #fbfbfb;
-  visibility: hidden;
-  border-radius: 4px;
-  border: 1px solid #b5b5b5;
-  border-bottom-width: 0;
-  box-shadow: 0 1px 3px #c1c1c1;
-}
-
-.keep-open .dropdown-popup {
-  z-index: initial;
-}
-
-.dropdown-popup > hr {
-  display: none;
-}
-
-.open > .dropdown-popup {
-  visibility: visible;
-}
-
-.dropdown-arrow {
-  position: absolute;
-  top: 30px; /* offset arrow from top of popup */
-  left: -16px;
-  width: 16px;
-  height: 24px;
-  background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg");
-  display: block;
-}
-
-/*======= Font style popup =======*/
-
-#font-type-buttons,
-#font-size-buttons,
-#color-scheme-buttons,
-#content-width-buttons,
-#line-height-buttons {
-  display: flex;
-  flex-direction: row;
-}
-
-#font-type-buttons > button:first-child {
-  border-top-left-radius: 3px;
-}
-#font-type-buttons > button:last-child {
-  border-top-right-radius: 3px;
-}
-#color-scheme-buttons > button:first-child {
-  border-bottom-left-radius: 3px;
-}
-#color-scheme-buttons > button:last-child {
-  border-bottom-right-radius: 3px;
-}
-
-#font-type-buttons > button,
-#font-size-buttons > button,
-#color-scheme-buttons > button,
-#content-width-buttons > button,
-#line-height-buttons > button {
-  text-align: center;
-  border: 0;
-}
-
-#font-type-buttons > button,
-#font-size-buttons > button,
-#content-width-buttons > button,
-#line-height-buttons > button {
-  width: 50%;
-  background-color: transparent;
-  border-left: 1px solid #B5B5B5;
-  border-bottom: 1px solid #B5B5B5;
-}
-
-#color-scheme-buttons > button {
-  width: 33.33%;
-  font-size: 14px;
-}
-
-#color-scheme-buttons > .dark-button {
-  margin-top: -1px;
-  height: 61px;
-}
-
-#font-type-buttons > button:first-child,
-#font-size-buttons > button:first-child,
-#content-width-buttons > button:first-child,
-#line-height-buttons > button:first-child {
-  border-left: 0;
-}
-
-#font-type-buttons > button {
-  display: inline-block;
-  font-size: 62px;
-  height: 100px;
-}
-
-#font-size-buttons > button,
-#color-scheme-buttons > button,
-#content-width-buttons > button,
-#line-height-buttons > button {
-  height: 60px;
-}
-
-#font-type-buttons > button:active:hover,
-#font-type-buttons > button.selected,
-#color-scheme-buttons > button:active:hover,
-#color-scheme-buttons > button.selected {
-  box-shadow: inset 0 -3px 0 0 #fc6420;
-}
-
-#font-type-buttons > button:active:hover,
-#font-type-buttons > button.selected {
-  border-bottom: 1px solid #FC6420;
-}
-
-/* Make the serif button content the same size as the sans-serif button content. */
-#font-type-buttons > button > .description {
-  color: #666;
-  font-size: 12px;
-  margin-top: -5px;
-}
-
-/* Font sizes are different per-platform, so we need custom CSS to line them up. */
-%ifdef XP_MACOSX
-#font-type-buttons > .sans-serif-button > .name {
-  margin-top: 10px;
-}
-
-#font-type-buttons > .sans-serif-button > .description {
-  margin-top: -4px;
-}
-
-#font-type-buttons > .serif-button > .name {
-  font-size: 63px;
-}
-%elifdef XP_WIN
-#font-type-buttons > .sans-serif-button > .name {
-  margin-top: 2px;
-}
-
-#font-type-buttons > .sans-serif-button > .description {
-  margin-top: -4px;
-}
-
-#font-type-buttons > .serif-button > .name {
-  font-size: 63px;
-}
-%else
-#font-type-buttons > .sans-serif-button > .name {
-  margin-top: 5px;
-}
-
-#font-type-buttons > .sans-serif-button > .description {
-  margin-top: -8px;
-}
-
-#font-type-buttons > .serif-button > .name {
-  font-size: 70px;
-}
-%endif
-
-.button:hover,
-#font-size-buttons > button:hover,
-#font-type-buttons > button:hover,
-#content-width-buttons > button:hover,
-#line-height-buttons > button:hover {
-  background-color: #ebebeb;
-}
-
-.dropdown.open,
-.button:active,
-#font-size-buttons > button:active,
-#font-size-buttons > button.selected,
-#content-width-buttons > button:active,
-#content-width-buttons > button.selected,
-#line-height-buttons > button:active,
-#line-height-buttons > button.selected {
-  background-color: #dadada;
-}
-
-/* Only used on Android */
-#font-size-sample {
-  display: none;
-}
-
-.minus-button,
-.plus-button,
-.content-width-minus-button,
-.content-width-plus-button,
-.line-height-minus-button,
-.line-height-plus-button {
-  background-color: transparent;
-  border: 0;
-  background-size: 18px 18px;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
-/*======= Toolbar icons =======*/
-
-.close-button {
-  background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg");
-  -moz-context-properties: fill;
-  fill: #808080;
-  height: 68px;
-  background-position: center 8px;
-}
-
-.close-button:hover {
-  fill: #fff;
-  background-color: #d94141;
-  border-bottom: 1px solid #d94141;
-  border-right: 1px solid #d94141;
-}
-
-.close-button:hover:active {
-  background-color: #AE2325;
-  border-bottom: 1px solid #AE2325;
-  border-right: 1px solid #AE2325;
-}
-
-.style-button {
-  background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg");
-}
-
-.minus-button {
-  background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg");
-}
-
-.plus-button {
-  background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg");
-}
-
-.content-width-minus-button {
-  background-size: 42px 16px;
-  background-image: url("chrome://global/skin/reader/RM-Content-Width-Minus-42x16.svg");
-}
-
-.content-width-plus-button {
-  background-size: 44px 16px;
-  background-image: url("chrome://global/skin/reader/RM-Content-Width-Plus-44x16.svg");
-}
-
-.line-height-minus-button {
-  background-size: 34px 14px;
-  background-image: url("chrome://global/skin/reader/RM-Line-Height-Minus-38x14.svg");
-}
-
-.line-height-plus-button {
-  background-size: 34px 24px;
-  background-image: url("chrome://global/skin/reader/RM-Line-Height-Plus-38x24.svg");
-}
-
-@media print {
-  .toolbar {
-    display: none !important;
-  }
-}
diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn
index a54038e2cb55..5bc40f3b7784 100644
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -15,9 +15,7 @@ toolkit.jar:
   skin/classic/global/aboutCache.css                       (../../shared/aboutCache.css)
   skin/classic/global/aboutCacheEntry.css                  (../../shared/aboutCacheEntry.css)
   skin/classic/global/aboutMemory.css                      (../../shared/aboutMemory.css)
-  skin/classic/global/aboutReader.css                      (../../shared/aboutReader.css)
-  skin/classic/global/aboutReaderContent.css               (../../shared/aboutReaderContent.css)
-* skin/classic/global/aboutReaderControls.css              (../../shared/aboutReaderControls.css)
+* skin/classic/global/aboutReader.css                      (../../shared/aboutReader.css)
   skin/classic/global/aboutRights.css                      (../../shared/aboutRights.css)
   skin/classic/global/aboutLicense.css                     (../../shared/aboutLicense.css)
   skin/classic/global/aboutSupport.css                     (../../shared/aboutSupport.css)
@@ -50,7 +48,6 @@ toolkit.jar:
   skin/classic/global/icons/blocked.svg                    (../../shared/incontent-icons/blocked.svg)
   skin/classic/global/illustrations/about-license.svg      (../../shared/illustrations/about-license.svg)
   skin/classic/global/narrate.css                          (../../shared/narrate.css)
-  skin/classic/global/narrateControls.css                  (../../shared/narrateControls.css)
   skin/classic/global/narrate/arrow.svg                    (../../shared/narrate/arrow.svg)
   skin/classic/global/narrate/back.svg                     (../../shared/narrate/back.svg)
   skin/classic/global/narrate/fast.svg                     (../../shared/narrate/fast.svg)
diff --git a/toolkit/themes/shared/narrate.css b/toolkit/themes/shared/narrate.css
index 4514eff35e2d..bafdab8deec4 100644
--- a/toolkit/themes/shared/narrate.css
+++ b/toolkit/themes/shared/narrate.css
@@ -44,3 +44,190 @@ body.sepia .narrate-word-highlight {
 body.dark .narrate-word-highlight {
   border-bottom-color: #6f6f6f;
 }
+
+#narrate-dropdown {
+  --border-color: #e5e5e5;
+}
+
+#narrate-toggle > svg {
+  display: block;
+  margin: 0 8px;
+}
+
+.dropdown-popup button {
+  background-color: transparent;
+}
+
+.dropdown-popup button:hover:not(:disabled) {
+  background-color: #eaeaea;
+}
+
+.narrate-row {
+  display: flex;
+  align-items: center;
+  min-height: 40px;
+  box-sizing: border-box;
+}
+
+.narrate-row:not(:first-child) {
+  border-top: 1px solid var(--border-color);
+}
+
+/* Control buttons */
+
+#narrate-control > button {
+  background-size: 24px 24px;
+  background-repeat: no-repeat;
+  background-position: center center;
+  height: 64px;
+  width: 100px;
+  border: none;
+  color: #666;
+  box-sizing: border-box;
+}
+
+#narrate-control > button:not(:first-child) {
+  border-left: 1px solid var(--border-color);
+}
+
+#narrate-skip-previous {
+  border-top-left-radius: 3px;
+  background-image: url("chrome://global/skin/narrate/back.svg");
+  -moz-context-properties: fill;
+  fill: rgb(128 128 128);
+}
+
+#narrate-skip-next {
+  border-top-right-radius: 3px;
+  background-image: url("chrome://global/skin/narrate/forward.svg");
+  -moz-context-properties: fill;
+  fill: rgb(128 128 128);
+}
+
+#narrate-skip-previous:disabled,
+#narrate-skip-next:disabled {
+  fill: rgb(128 128 128 / 50%);
+}
+
+#narrate-start-stop {
+  background-image: url("chrome://global/skin/narrate/start.svg");
+}
+
+#narrate-dropdown.speaking #narrate-start-stop {
+  background-image: url("chrome://global/skin/narrate/stop.svg");
+}
+
+/* Rate control */
+
+#narrate-rate::before, #narrate-rate::after {
+  content: '';
+  width: 48px;
+  height: 40px;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 24px auto;
+}
+
+#narrate-rate::before {
+  background-image: url("chrome://global/skin/narrate/slow.svg");
+}
+
+#narrate-rate::after {
+  background-image: url("chrome://global/skin/narrate/fast.svg");
+}
+
+#narrate-rate-input {
+  margin: 0 1px;
+  flex-grow: 1;
+}
+
+#narrate-rate-input::-moz-range-track {
+  background-color: #979797;
+  height: 2px;
+}
+
+#narrate-rate-input::-moz-range-progress {
+  background-color: #2EA3FF;
+  height: 2px;
+}
+
+#narrate-rate-input::-moz-range-thumb {
+  background-color: #808080;
+  height: 16px;
+  width: 16px;
+  border-radius: 8px;
+  border-width: 0;
+}
+
+#narrate-rate-input:active::-moz-range-thumb {
+  background-color: #2EA3FF;
+}
+
+/* Voice selection */
+
+.voiceselect {
+  width: 100%;
+}
+
+.voiceselect > button.select-toggle,
+.voiceselect > .options > button.option {
+  -moz-appearance: none;
+  border: none;
+  width: 100%;
+  min-height: 40px;
+}
+
+.voiceselect.open > button.select-toggle {
+  border-bottom: 1px solid var(--border-color);
+}
+
+.voiceselect > button.select-toggle::after {
+  content: '';
+  background-image: url("chrome://global/skin/narrate/arrow.svg");
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 12px 12px;
+  display: inline-block;
+  width: 1.5em;
+  height: 1em;
+  vertical-align: middle;
+}
+
+.voiceselect > .options > button.option:not(:first-child) {
+  border-top: 1px solid var(--border-color);
+}
+
+.voiceselect > .options > button.option  {
+  box-sizing: border-box;
+}
+
+.voiceselect > .options:not(.hovering) > button.option:focus {
+  background-color: #eaeaea;
+}
+
+.voiceselect > .options:not(.hovering) > button.option:hover:not(:focus) {
+  background-color: transparent;
+}
+
+.voiceselect > .options > button.option::-moz-focus-inner {
+  outline: none;
+  border: 0;
+}
+
+.voiceselect > .options {
+  display: none;
+  overflow-y: auto;
+}
+
+.voiceselect.open > .options {
+  display: block;
+}
+
+.current-voice {
+  color: #7f7f7f;
+}
+
+.voiceselect:not(.open) > button,
+.voiceselect .option:last-child {
+  border-radius: 0 0 3px 3px;
+}
diff --git a/toolkit/themes/shared/narrateControls.css b/toolkit/themes/shared/narrateControls.css
deleted file mode 100644
index 4def74dc88b1..000000000000
--- a/toolkit/themes/shared/narrateControls.css
+++ /dev/null
@@ -1,186 +0,0 @@
-:scope {
-  --border-color: #e5e5e5;
-}
-
-#narrate-toggle > svg {
-  display: block;
-  margin: 0 8px;
-}
-
-.dropdown-popup button {
-  background-color: transparent;
-}
-
-.dropdown-popup button:hover:not(:disabled) {
-  background-color: #eaeaea;
-}
-
-.narrate-row {
-  display: flex;
-  align-items: center;
-  min-height: 40px;
-  box-sizing: border-box;
-}
-
-.narrate-row:not(:first-child) {
-  border-top: 1px solid var(--border-color);
-}
-
-/* Control buttons */
-
-#narrate-control > button {
-  background-size: 24px 24px;
-  background-repeat: no-repeat;
-  background-position: center center;
-  height: 64px;
-  width: 100px;
-  border: none;
-  color: #666;
-  box-sizing: border-box;
-}
-
-#narrate-control > button:not(:first-child) {
-  border-left: 1px solid var(--border-color);
-}
-
-#narrate-skip-previous {
-  border-top-left-radius: 3px;
-  background-image: url("chrome://global/skin/narrate/back.svg");
-  -moz-context-properties: fill;
-  fill: rgb(128 128 128);
-}
-
-#narrate-skip-next {
-  border-top-right-radius: 3px;
-  background-image: url("chrome://global/skin/narrate/forward.svg");
-  -moz-context-properties: fill;
-  fill: rgb(128 128 128);
-}
-
-#narrate-skip-previous:disabled,
-#narrate-skip-next:disabled {
-  fill: rgb(128 128 128 / 50%);
-}
-
-#narrate-start-stop {
-  background-image: url("chrome://global/skin/narrate/start.svg");
-}
-
-#narrate-dropdown.speaking #narrate-start-stop {
-  background-image: url("chrome://global/skin/narrate/stop.svg");
-}
-
-/* Rate control */
-
-#narrate-rate::before, #narrate-rate::after {
-  content: '';
-  width: 48px;
-  height: 40px;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: 24px auto;
-}
-
-#narrate-rate::before {
-  background-image: url("chrome://global/skin/narrate/slow.svg");
-}
-
-#narrate-rate::after {
-  background-image: url("chrome://global/skin/narrate/fast.svg");
-}
-
-#narrate-rate-input {
-  margin: 0 1px;
-  flex-grow: 1;
-}
-
-#narrate-rate-input::-moz-range-track {
-  background-color: #979797;
-  height: 2px;
-}
-
-#narrate-rate-input::-moz-range-progress {
-  background-color: #2EA3FF;
-  height: 2px;
-}
-
-#narrate-rate-input::-moz-range-thumb {
-  background-color: #808080;
-  height: 16px;
-  width: 16px;
-  border-radius: 8px;
-  border-width: 0;
-}
-
-#narrate-rate-input:active::-moz-range-thumb {
-  background-color: #2EA3FF;
-}
-
-/* Voice selection */
-
-.voiceselect {
-  width: 100%;
-}
-
-.voiceselect > button.select-toggle,
-.voiceselect > .options > button.option {
-  -moz-appearance: none;
-  border: none;
-  width: 100%;
-  min-height: 40px;
-}
-
-.voiceselect.open > button.select-toggle {
-  border-bottom: 1px solid var(--border-color);
-}
-
-.voiceselect > button.select-toggle::after {
-  content: '';
-  background-image: url("chrome://global/skin/narrate/arrow.svg");
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: 12px 12px;
-  display: inline-block;
-  width: 1.5em;
-  height: 1em;
-  vertical-align: middle;
-}
-
-.voiceselect > .options > button.option:not(:first-child) {
-  border-top: 1px solid var(--border-color);
-}
-
-.voiceselect > .options > button.option  {
-  box-sizing: border-box;
-}
-
-.voiceselect > .options:not(.hovering) > button.option:focus {
-  background-color: #eaeaea;
-}
-
-.voiceselect > .options:not(.hovering) > button.option:hover:not(:focus) {
-  background-color: transparent;
-}
-
-.voiceselect > .options > button.option::-moz-focus-inner {
-  outline: none;
-  border: 0;
-}
-
-.voiceselect > .options {
-  display: none;
-  overflow-y: auto;
-}
-
-.voiceselect.open > .options {
-  display: block;
-}
-
-.current-voice {
-  color: #7f7f7f;
-}
-
-.voiceselect:not(.open) > button,
-.option:last-child {
-  border-radius: 0 0 3px 3px;
-}

From e7abc5fa5fa26851d5c531e0e61a7b332ed137fb Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 21 Nov 2017 11:54:25 +0800
Subject: [PATCH 168/219] Bug 1417837 - Part 2: Preserve class names in
 readerized output that we use in aboutReader.css. r=Gijs

MozReview-Commit-ID: 7qV2SRHeeOJ

--HG--
extra : rebase_source : ca8b15ef9ceb95da5f7b1d985ba60cfb594bfd3e
---
 toolkit/components/reader/ReaderMode.jsm  | 19 ++++++++++++++++++-
 toolkit/components/reader/ReaderWorker.js |  5 +++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/reader/ReaderMode.jsm b/toolkit/components/reader/ReaderMode.jsm
index 9811bc5cc3a7..930a00fa8db7 100644
--- a/toolkit/components/reader/ReaderMode.jsm
+++ b/toolkit/components/reader/ReaderMode.jsm
@@ -18,6 +18,19 @@ const PARSE_ERROR_TOO_MANY_ELEMENTS = 1;
 const PARSE_ERROR_WORKER = 2;
 const PARSE_ERROR_NO_ARTICLE = 3;
 
+// Class names to preserve in the readerized output. We preserve these class
+// names so that rules in aboutReader.css can match them.
+const CLASSES_TO_PRESERVE = [
+  "caption",
+  "hidden",
+  "invisble",
+  "sr-only",
+  "visually-hidden",
+  "visuallyhidden",
+  "wp-caption",
+  "wp-caption-text",
+];
+
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -453,9 +466,13 @@ this.ReaderMode = {
                      createInstance(Ci.nsIDOMSerializer);
     let serializedDoc = serializer.serializeToString(doc);
 
+    let options = {
+      classesToPreserve: CLASSES_TO_PRESERVE,
+    };
+
     let article = null;
     try {
-      article = await ReaderWorker.post("parseDocument", [uriParam, serializedDoc]);
+      article = await ReaderWorker.post("parseDocument", [uriParam, serializedDoc, options]);
     } catch (e) {
       Cu.reportError("Error in ReaderWorker: " + e);
       histogram.add(PARSE_ERROR_WORKER);
diff --git a/toolkit/components/reader/ReaderWorker.js b/toolkit/components/reader/ReaderWorker.js
index 5f69d1fc9d0a..9ae589d7d145 100644
--- a/toolkit/components/reader/ReaderWorker.js
+++ b/toolkit/components/reader/ReaderWorker.js
@@ -42,11 +42,12 @@ var Agent = {
    *
    * @param {object} uri URI data for the document.
    * @param {string} serializedDoc The serialized document.
+   * @param {object} options Options object to pass to Readability.
    *
    * @return {object} Article object returned from Readability.
    */
-  parseDocument(uri, serializedDoc) {
+  parseDocument(uri, serializedDoc, options) {
     let doc = new JSDOMParser().parse(serializedDoc);
-    return new Readability(uri, doc).parse();
+    return new Readability(uri, doc, options).parse();
   },
 };

From 824f088ce89d728458867faa49d53a8045bf0102 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 30 Nov 2017 11:55:32 +0800
Subject: [PATCH 169/219] Bug 1417837 - Part 3: Replace all IDs in about:reader
 documents with class names. r=Gijs

Since the readerized article content will have its class names stripped
but will retain its original IDs, and we don't want our aboutReader.css
rules targetting UI elements to match anything in the article.

MozReview-Commit-ID: JuXTo8Nth5Q

--HG--
extra : rebase_source : a5987d80f45c3ec5192c1aa5da772a05cfda79ff
---
 mobile/android/themes/core/aboutReader.css    | 119 ++++----
 .../components/narrate/NarrateControls.jsm    |  98 +++---
 toolkit/components/narrate/Narrator.jsm       |   2 +-
 .../narrate/test/NarrateTestUtils.jsm         |  24 +-
 toolkit/components/reader/AboutReader.jsm     |  65 ++--
 .../reader/content/aboutReader.html           |  50 ++--
 .../test/browser_readerMode_readingTime.js    |   6 +-
 toolkit/themes/shared/aboutReader.css         | 283 +++++++++---------
 toolkit/themes/shared/narrate.css             |  43 +--
 9 files changed, 350 insertions(+), 340 deletions(-)

diff --git a/mobile/android/themes/core/aboutReader.css b/mobile/android/themes/core/aboutReader.css
index 32f52080c04d..28b31daff75f 100644
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -2,6 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* Avoid adding ID selector rules in this style sheet, since they could
+ * inadvertently match elements in the article content. */
+
 html {
   -moz-text-size-adjust: none;
 }
@@ -33,39 +36,39 @@ body.serif {
   font-family: serif;
 }
 
-#container.font-size1 {
+.container.font-size1 {
   font-size: 10px;
 }
 
-#container.font-size2 {
+.container.font-size2 {
   font-size: 12px;
 }
 
-#container.font-size3 {
+.container.font-size3 {
   font-size: 14px;
 }
 
-#container.font-size4  {
+.container.font-size4  {
   font-size: 16px;
 }
 
-#container.font-size5 {
+.container.font-size5 {
   font-size: 18px;
 }
 
-#container.font-size6 {
+.container.font-size6 {
   font-size: 20px;
 }
 
-#container.font-size7 {
+.container.font-size7 {
   font-size: 22px;
 }
 
-#container.font-size8 {
+.container.font-size8 {
   font-size: 24px;
 }
 
-#container.font-size9 {
+.container.font-size9 {
   font-size: 26px;
 }
 
@@ -119,7 +122,7 @@ body.dark > .container > .content blockquote {
   border-left-color: #777777 !important;
 }
 
-#reader-message {
+.reader-message {
   margin-top: 40px;
   display: none;
   text-align: center;
@@ -217,7 +220,7 @@ body.dark > .container > .content blockquote {
 }
 
 .dropdown-toggle,
-#reader-popup {
+.dropdown-popup {
   pointer-events: auto;
 }
 
@@ -249,9 +252,9 @@ body.dark > .container > .content blockquote {
 /* Only used on desktop */
 .dropdown-popup > hr,
 .dropdown-arrow,
-#font-type-buttons > button > .name,
-#content-width-buttons,
-#line-height-buttons {
+.font-type-buttons > button > .name,
+.content-width-buttons,
+.line-height-buttons {
   display: none;
 }
 
@@ -260,37 +263,37 @@ body.dark > .container > .content blockquote {
   bottom: 0;
 }
 
-#font-type-buttons,
-#font-size-buttons,
-#color-scheme-buttons {
+.font-type-buttons,
+.font-size-buttons,
+.color-scheme-buttons {
   display: flex;
   flex-direction: row;
 }
 
-#font-type-buttons > button,
-#color-scheme-buttons > button {
+.font-type-buttons > button,
+.color-scheme-buttons > button {
   text-align: center;
 }
 
-#font-type-buttons > button,
-#font-size-buttons > button {
+.font-type-buttons > button,
+.font-size-buttons > button {
   width: 50%;
   background-color: transparent;
   border: 0;
 }
 
-#font-type-buttons > button {
+.font-type-buttons > button {
   font-size: 24px;
   color: #AFB1B3;
   padding: 15px 0;
 }
 
-#font-type-buttons > button:active,
-#font-type-buttons > button.selected {
+.font-type-buttons > button:active,
+.font-type-buttons > button.selected {
   color: #222222;
 }
 
-#font-size-sample {
+.font-size-sample {
   flex: 0;
   font-size: 24px;
   color: #000000;
@@ -324,7 +327,7 @@ body.dark > .container > .content blockquote {
   padding: 0 5px;
 }
 
-#color-scheme-buttons > button {
+.color-scheme-buttons > button {
   width: 33%;
   border-radius: 4px;
   border: 1px solid #BFBFBF;
@@ -333,8 +336,8 @@ body.dark > .container > .content blockquote {
   font-size: 14px;
 }
 
-#color-scheme-buttons > button:active,
-#color-scheme-buttons > button.selected {
+.color-scheme-buttons > button:active,
+.color-scheme-buttons > button.selected {
   border: 2px solid #0A84FF;
 }
 
@@ -414,29 +417,29 @@ body.dark > .container > .content blockquote {
  * must be added to CLASSES_TO_PRESERVE in ReaderMode.jsm, so that
  * Readability.js doesn't strip them out */
 
-#moz-reader-content {
+.moz-reader-content {
   display: none;
   font-size: 1em;
 }
 
-#moz-reader-content a {
+.moz-reader-content a {
   text-decoration: underline !important;
   font-weight: normal;
 }
 
-#moz-reader-content a,
-#moz-reader-content a:visited,
-#moz-reader-content a:hover,
-#moz-reader-content a:active {
+.moz-reader-content a,
+.moz-reader-content a:visited,
+.moz-reader-content a:hover,
+.moz-reader-content a:active {
   color: #00acff !important;
 }
 
-#moz-reader-content * {
+.moz-reader-content * {
   max-width: 100% !important;
   height: auto !important;
 }
 
-#moz-reader-content p {
+.moz-reader-content p {
   line-height: 1.4em !important;
   margin: 0px !important;
   margin-bottom: 20px !important;
@@ -444,8 +447,8 @@ body.dark > .container > .content blockquote {
 
 /* Covers all images showing edge-to-edge using a 
    an optional caption text */
-#moz-reader-content .wp-caption,
-#moz-reader-content figure {
+.moz-reader-content .wp-caption,
+.moz-reader-content figure {
   display: block !important;
   width: 100% !important;
   margin: 0px !important;
@@ -454,17 +457,17 @@ body.dark > .container > .content blockquote {
 
 /* Images marked to be shown edge-to-edge with an
    optional captio ntext */
-#moz-reader-content p > img:only-child,
-#moz-reader-content p > a:only-child > img:only-child,
-#moz-reader-content .wp-caption img,
-#moz-reader-content figure img {
+.moz-reader-content p > img:only-child,
+.moz-reader-content p > a:only-child > img:only-child,
+.moz-reader-content .wp-caption img,
+.moz-reader-content figure img {
   display: block;
   margin-left: auto;
   margin-right: auto;
 }
 
 /* Account for body padding to make image full width */
-#moz-reader-content img[moz-reader-full-width] {
+.moz-reader-content img[moz-reader-full-width] {
   width: calc(100% + 40px);
   margin-left: -20px;
   margin-right: -20px;
@@ -472,9 +475,9 @@ body.dark > .container > .content blockquote {
 }
 
 /* Image caption text */
-#moz-reader-content .caption,
-#moz-reader-content .wp-caption-text,
-#moz-reader-content figcaption {
+.moz-reader-content .caption,
+.moz-reader-content .wp-caption-text,
+.moz-reader-content figcaption {
   font-size: 0.9em;
   font-family: sans-serif;
   margin: 0px !important;
@@ -483,13 +486,13 @@ body.dark > .container > .content blockquote {
 
 /* Ensure all pre-formatted code inside the reader content
    are properly wrapped inside content width */
-#moz-reader-content code,
-#moz-reader-content pre {
+.moz-reader-content code,
+.moz-reader-content pre {
   white-space: pre-wrap !important;
   margin-bottom: 20px !important;
 }
 
-#moz-reader-content blockquote {
+.moz-reader-content blockquote {
   margin: 0px !important;
   margin-bottom: 20px !important;
   padding: 0px !important;
@@ -498,29 +501,29 @@ body.dark > .container > .content blockquote {
   border-left: 2px solid !important;
 }
 
-#moz-reader-content ul,
-#moz-reader-content ol {
+.moz-reader-content ul,
+.moz-reader-content ol {
   margin: 0px !important;
   margin-bottom: 20px !important;
   padding: 0px !important;
   line-height: 1.5em;
 }
 
-#moz-reader-content ul {
+.moz-reader-content ul {
   padding-inline-start: 30px !important;
   list-style: disc !important;
 }
 
-#moz-reader-content ol {
+.moz-reader-content ol {
   padding-inline-start: 35px !important;
   list-style: decimal !important;
 }
 
 /* Hide elements with common "hidden" class names */
-#moz-reader-content .visually-hidden,
-#moz-reader-content .visuallyhidden,
-#moz-reader-content .hidden,
-#moz-reader-content .invisible,
-#moz-reader-content .sr-only {
+.moz-reader-content .visually-hidden,
+.moz-reader-content .visuallyhidden,
+.moz-reader-content .hidden,
+.moz-reader-content .invisible,
+.moz-reader-content .sr-only {
   display: none;
 }
diff --git a/toolkit/components/narrate/NarrateControls.jsm b/toolkit/components/narrate/NarrateControls.jsm
index c202ff627d57..828292cc2b41 100644
--- a/toolkit/components/narrate/NarrateControls.jsm
+++ b/toolkit/components/narrate/NarrateControls.jsm
@@ -38,13 +38,12 @@ function NarrateControls(mm, win, languagePromise) {
   }
 
   let dropdown = win.document.createElement("ul");
-  dropdown.className = "dropdown";
-  dropdown.id = "narrate-dropdown";
+  dropdown.className = "dropdown narrate-dropdown";
   // We need inline svg here for the animation to work (bug 908634 & 1190881).
   // eslint-disable-next-line no-unsanitized/property
   dropdown.innerHTML =
     localize`<li>
-       <button class="dropdown-toggle button" id="narrate-toggle"
+       <button class="dropdown-toggle button narrate-toggle"
                title="${"narrate"}" hidden>
          <svg xmlns="http://www.w3.org/2000/svg"
               xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -58,11 +57,11 @@ function NarrateControls(mm, win, languagePromise) {
               100% { transform: scaleY(1);   }
             }
 
-            #waveform > rect {
+            .waveform > rect {
               fill: #808080;
             }
 
-            .speaking #waveform > rect {
+            .speaking .waveform > rect {
               fill: #58bf43;
               transform-box: fill-box;
               transform-origin: 50% 50%;
@@ -72,15 +71,15 @@ function NarrateControls(mm, win, languagePromise) {
               animation-timing-function: linear;
             }
 
-            #waveform > rect:nth-child(2) { animation-delay: 250ms; }
-            #waveform > rect:nth-child(3) { animation-delay: 500ms; }
-            #waveform > rect:nth-child(4) { animation-delay: 750ms; }
-            #waveform > rect:nth-child(5) { animation-delay: 1000ms; }
-            #waveform > rect:nth-child(6) { animation-delay: 1250ms; }
-            #waveform > rect:nth-child(7) { animation-delay: 1500ms; }
+            .waveform > rect:nth-child(2) { animation-delay: 250ms; }
+            .waveform > rect:nth-child(3) { animation-delay: 500ms; }
+            .waveform > rect:nth-child(4) { animation-delay: 750ms; }
+            .waveform > rect:nth-child(5) { animation-delay: 1000ms; }
+            .waveform > rect:nth-child(6) { animation-delay: 1250ms; }
+            .waveform > rect:nth-child(7) { animation-delay: 1500ms; }
 
           </style>
-          <g id="waveform">
+          <g class="waveform">
             <rect x="1"  y="8" width="2" height="8"  rx=".5" ry=".5" />
             <rect x="4"  y="5" width="2" height="14" rx=".5" ry=".5" />
             <rect x="7"  y="8" width="2" height="8"  rx=".5" ry=".5" />
@@ -93,18 +92,18 @@ function NarrateControls(mm, win, languagePromise) {
         </button>
     </li>
     <li class="dropdown-popup">
-      <div id="narrate-control" class="narrate-row">
-        <button disabled id="narrate-skip-previous"
+      <div class="narrate-row narrate-control">
+        <button disabled class="narrate-skip-previous"
                 title="${"back"}"></button>
-        <button id="narrate-start-stop" title="${"start"}"></button>
-        <button disabled id="narrate-skip-next"
+        <button class="narrate-start-stop" title="${"start"}"></button>
+        <button disabled class="narrate-skip-next"
                 title="${"forward"}"></button>
       </div>
-      <div id="narrate-rate" class="narrate-row">
-        <input id="narrate-rate-input" value="0" title="${"speed"}"
+      <div class="narrate-row narrate-rate">
+        <input class="narrate-rate-input" value="0" title="${"speed"}"
                step="5" max="100" min="-100" type="range">
       </div>
-      <div id="narrate-voices" class="narrate-row"></div>
+      <div class="narrate-row narrate-voices"></div>
       <div class="dropdown-arrow"></div>
     </li>`;
 
@@ -114,14 +113,14 @@ function NarrateControls(mm, win, languagePromise) {
   let selectLabel = gStrings.GetStringFromName("selectvoicelabel");
   this.voiceSelect = new VoiceSelect(win, selectLabel);
   this.voiceSelect.element.addEventListener("change", this);
-  this.voiceSelect.element.id = "voice-select";
+  this.voiceSelect.element.classList.add("voice-select");
   win.speechSynthesis.addEventListener("voiceschanged", this);
-  dropdown.querySelector("#narrate-voices").appendChild(
+  dropdown.querySelector(".narrate-voices").appendChild(
     this.voiceSelect.element);
 
   dropdown.addEventListener("click", this, true);
 
-  let rateRange = dropdown.querySelector("#narrate-rate > input");
+  let rateRange = dropdown.querySelector(".narrate-rate > input");
   rateRange.addEventListener("change", this);
 
   // The rate is stored as an integer.
@@ -129,7 +128,7 @@ function NarrateControls(mm, win, languagePromise) {
 
   this._setupVoices();
 
-  let tb = win.document.getElementById("reader-toolbar");
+  let tb = win.document.querySelector(".reader-toolbar");
   tb.appendChild(dropdown);
 }
 
@@ -137,7 +136,7 @@ NarrateControls.prototype = {
   handleEvent(evt) {
     switch (evt.type) {
       case "change":
-        if (evt.target.id == "narrate-rate-input") {
+        if (evt.target.classList.contains("narrate-rate-input")) {
           this._onRateInput(evt);
         } else {
           this._onVoiceChange();
@@ -188,7 +187,7 @@ NarrateControls.prototype = {
         this.voiceSelect.addOptions(options);
       }
 
-      let narrateToggle = win.document.getElementById("narrate-toggle");
+      let narrateToggle = win.document.querySelector(".narrate-toggle");
       let histogram = Services.telemetry.getKeyedHistogramById(
         "NARRATE_CONTENT_BY_LANGUAGE_2");
       let initial = !this._voicesInitialized;
@@ -235,41 +234,38 @@ NarrateControls.prototype = {
   },
 
   _onButtonClick(evt) {
-    switch (evt.target.id) {
-      case "narrate-skip-previous":
-        this.narrator.skipPrevious();
-        break;
-      case "narrate-skip-next":
-        this.narrator.skipNext();
-        break;
-      case "narrate-start-stop":
-        if (this.narrator.speaking) {
-          this.narrator.stop();
-        } else {
-          this._updateSpeechControls(true);
-          let options = { rate: this.rate, voice: this.voice };
-          this.narrator.start(options).then(() => {
-            this._updateSpeechControls(false);
-          }, err => {
-            Cu.reportError(`Narrate failed: ${err}.`);
-            this._updateSpeechControls(false);
-          });
-        }
-        break;
+    let classList = evt.target.classList;
+    if (classList.contains("narrate-skip-previous")) {
+      this.narrator.skipPrevious();
+    } else if (classList.contains("narrate-skip-next")) {
+      this.narrator.skipNext();
+    } else if (classList.contains("narrate-start-stop")) {
+      if (this.narrator.speaking) {
+        this.narrator.stop();
+      } else {
+        this._updateSpeechControls(true);
+        let options = { rate: this.rate, voice: this.voice };
+        this.narrator.start(options).then(() => {
+          this._updateSpeechControls(false);
+        }, err => {
+          Cu.reportError(`Narrate failed: ${err}.`);
+          this._updateSpeechControls(false);
+        });
+      }
     }
   },
 
   _updateSpeechControls(speaking) {
-    let dropdown = this._doc.getElementById("narrate-dropdown");
+    let dropdown = this._doc.querySelector(".narrate-dropdown");
     dropdown.classList.toggle("keep-open", speaking);
     dropdown.classList.toggle("speaking", speaking);
 
-    let startStopButton = this._doc.getElementById("narrate-start-stop");
+    let startStopButton = this._doc.querySelector(".narrate-start-stop");
     startStopButton.title =
       gStrings.GetStringFromName(speaking ? "stop" : "start");
 
-    this._doc.getElementById("narrate-skip-previous").disabled = !speaking;
-    this._doc.getElementById("narrate-skip-next").disabled = !speaking;
+    this._doc.querySelector(".narrate-skip-previous").disabled = !speaking;
+    this._doc.querySelector(".narrate-skip-next").disabled = !speaking;
 
     if (speaking) {
       TelemetryStopwatch.start("NARRATE_CONTENT_SPEAKTIME_MS", this);
@@ -332,7 +328,7 @@ NarrateControls.prototype = {
 
   get rate() {
     return this._convertRate(
-      this._doc.getElementById("narrate-rate-input").value);
+      this._doc.querySelector(".narrate-rate-input").value);
   },
 
   get voice() {
diff --git a/toolkit/components/narrate/Narrator.jsm b/toolkit/components/narrate/Narrator.jsm
index 4fecd383ce61..ac0b2e040807 100644
--- a/toolkit/components/narrate/Narrator.jsm
+++ b/toolkit/components/narrate/Narrator.jsm
@@ -89,7 +89,7 @@ Narrator.prototype = {
       // are no other strong references, and it will be GC'ed. Instead,
       // we rely on the window's lifetime and use it as a weak reference.
       this._treeWalkerRef.set(this._win,
-        this._doc.createTreeWalker(this._doc.getElementById("container"),
+        this._doc.createTreeWalker(this._doc.querySelector(".container"),
           nf.SHOW_ELEMENT, filter, false));
     }
 
diff --git a/toolkit/components/narrate/test/NarrateTestUtils.jsm b/toolkit/components/narrate/test/NarrateTestUtils.jsm
index 3a030497d23d..b1f31ae675b1 100644
--- a/toolkit/components/narrate/test/NarrateTestUtils.jsm
+++ b/toolkit/components/narrate/test/NarrateTestUtils.jsm
@@ -12,17 +12,17 @@ Cu.import("resource://testing-common/ContentTaskUtils.jsm");
 this.EXPORTED_SYMBOLS = [ "NarrateTestUtils" ];
 
 this.NarrateTestUtils = {
-  TOGGLE: "#narrate-toggle",
-  POPUP: "#narrate-dropdown .dropdown-popup",
-  VOICE_SELECT: "#narrate-voices .select-toggle",
-  VOICE_OPTIONS: "#narrate-voices .options",
-  VOICE_SELECTED: "#narrate-voices .options .option.selected",
-  VOICE_SELECT_LABEL: "#narrate-voices .select-toggle .current-voice",
-  RATE: "#narrate-rate-input",
-  START: "#narrate-dropdown:not(.speaking) #narrate-start-stop",
-  STOP: "#narrate-dropdown.speaking #narrate-start-stop",
-  BACK: "#narrate-skip-previous",
-  FORWARD: "#narrate-skip-next",
+  TOGGLE: ".narrate-toggle",
+  POPUP: ".narrate-dropdown .dropdown-popup",
+  VOICE_SELECT: ".narrate-voices .select-toggle",
+  VOICE_OPTIONS: ".narrate-voices .options",
+  VOICE_SELECTED: ".narrate-voices .options .option.selected",
+  VOICE_SELECT_LABEL: ".narrate-voices .select-toggle .current-voice",
+  RATE: ".narrate-rate-input",
+  START: ".narrate-dropdown:not(.speaking) .narrate-start-stop",
+  STOP: ".narrate-dropdown.speaking .narrate-start-stop",
+  BACK: ".narrate-skip-previous",
+  FORWARD: ".narrate-skip-next",
 
   isVisible(element) {
     let style = element.ownerGlobal.getComputedStyle(element);
@@ -68,7 +68,7 @@ this.NarrateTestUtils = {
     }
 
     let voiceOption = window.document.querySelector(
-      `#narrate-voices .option[data-value="${voiceUri}"]`);
+      `.narrate-voices .option[data-value="${voiceUri}"]`);
 
     voiceOption.focus();
     voiceOption.click();
diff --git a/toolkit/components/reader/AboutReader.jsm b/toolkit/components/reader/AboutReader.jsm
index 3802c2f10896..4c89c2913d76 100644
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/toolkit/components/reader/AboutReader.jsm
@@ -55,14 +55,15 @@ var AboutReader = function(mm, win, articlePromise) {
     this._articlePromise = articlePromise;
   }
 
-  this._headerElementRef = Cu.getWeakReference(doc.getElementById("reader-header"));
-  this._domainElementRef = Cu.getWeakReference(doc.getElementById("reader-domain"));
-  this._titleElementRef = Cu.getWeakReference(doc.getElementById("reader-title"));
-  this._readTimeElementRef = Cu.getWeakReference(doc.getElementById("reader-estimated-time"));
-  this._creditsElementRef = Cu.getWeakReference(doc.getElementById("reader-credits"));
-  this._contentElementRef = Cu.getWeakReference(doc.getElementById("moz-reader-content"));
-  this._toolbarElementRef = Cu.getWeakReference(doc.getElementById("reader-toolbar"));
-  this._messageElementRef = Cu.getWeakReference(doc.getElementById("reader-message"));
+  this._headerElementRef = Cu.getWeakReference(doc.querySelector(".reader-header"));
+  this._domainElementRef = Cu.getWeakReference(doc.querySelector(".reader-domain"));
+  this._titleElementRef = Cu.getWeakReference(doc.querySelector(".reader-title"));
+  this._readTimeElementRef = Cu.getWeakReference(doc.querySelector(".reader-estimated-time"));
+  this._creditsElementRef = Cu.getWeakReference(doc.querySelector(".reader-credits"));
+  this._contentElementRef = Cu.getWeakReference(doc.querySelector(".moz-reader-content"));
+  this._toolbarElementRef = Cu.getWeakReference(doc.querySelector(".reader-toolbar"));
+  this._messageElementRef = Cu.getWeakReference(doc.querySelector(".reader-message"));
+  this._containerElementRef = Cu.getWeakReference(doc.querySelector(".container"));
 
   this._scrollOffset = win.pageYOffset;
 
@@ -173,6 +174,10 @@ AboutReader.prototype = {
     return this._messageElementRef.get();
   },
 
+  get _containerElement() {
+    return this._containerElementRef.get();
+  },
+
   get _isToolbarVertical() {
     if (this._toolbarVertical !== undefined) {
       return this._toolbarVertical;
@@ -200,26 +205,26 @@ AboutReader.prototype = {
 
       case "Reader:AddButton": {
         if (message.data.id && message.data.image &&
-            !this._doc.getElementById(message.data.id)) {
+            !this._doc.getElementsByClassName(message.data.id)[0]) {
           let btn = this._doc.createElement("button");
-          btn.setAttribute("class", "button");
-          btn.setAttribute("style", "background-image: url('" + message.data.image + "')");
-          btn.setAttribute("id", message.data.id);
+          btn.dataset.buttonid = message.data.id;
+          btn.className = "button " + message.data.id;
+          btn.style.backgroundImage = "url('" + message.data.image + "')";
           if (message.data.title)
-            btn.setAttribute("title", message.data.title);
+            btn.title = message.data.title;
           if (message.data.text)
             btn.textContent = message.data.text;
-          let tb = this._doc.getElementById("reader-toolbar");
+          let tb = this._toolbarElement;
           tb.appendChild(btn);
           this._setupButton(message.data.id, button => {
-            this._mm.sendAsyncMessage("Reader:Clicked-" + button.getAttribute("id"), { article: this._article });
+            this._mm.sendAsyncMessage("Reader:Clicked-" + button.dataset.buttonid, { article: this._article });
           });
         }
         break;
       }
       case "Reader:RemoveButton": {
         if (message.data.id) {
-          let btn = this._doc.getElementById(message.data.id);
+          let btn = this._doc.getElementsByClassName(message.data.id)[0];
           if (btn)
             btn.remove();
         }
@@ -303,7 +308,7 @@ AboutReader.prototype = {
   },
 
   _setFontSize(newFontSize) {
-    let containerClasses = this._doc.getElementById("container").classList;
+    let containerClasses = this._containerElement.classList;
 
     if (this._fontSize > 0)
       containerClasses.remove("font-size" + this._fontSize);
@@ -318,14 +323,14 @@ AboutReader.prototype = {
     const FONT_SIZE_MAX = 9;
 
     // Sample text shown in Android UI.
-    let sampleText = this._doc.getElementById("font-size-sample");
+    let sampleText = this._doc.querySelector(".font-size-sample");
     sampleText.textContent = gStrings.GetStringFromName("aboutReader.fontTypeSample");
 
     let currentSize = Services.prefs.getIntPref("reader.font_size");
     currentSize = Math.max(FONT_SIZE_MIN, Math.min(FONT_SIZE_MAX, currentSize));
 
-    let plusButton = this._doc.getElementById("font-size-plus");
-    let minusButton = this._doc.getElementById("font-size-minus");
+    let plusButton = this._doc.querySelector(".plus-button");
+    let minusButton = this._doc.querySelector(".minus-button");
 
     function updateControls() {
       if (currentSize === FONT_SIZE_MIN) {
@@ -375,7 +380,7 @@ AboutReader.prototype = {
   },
 
   _setContentWidth(newContentWidth) {
-    let containerClasses = this._doc.getElementById("container").classList;
+    let containerClasses = this._containerElement.classList;
 
     if (this._contentWidth > 0)
       containerClasses.remove("content-width" + this._contentWidth);
@@ -392,8 +397,8 @@ AboutReader.prototype = {
     let currentContentWidth = Services.prefs.getIntPref("reader.content_width");
     currentContentWidth = Math.max(CONTENT_WIDTH_MIN, Math.min(CONTENT_WIDTH_MAX, currentContentWidth));
 
-    let plusButton = this._doc.getElementById("content-width-plus");
-    let minusButton = this._doc.getElementById("content-width-minus");
+    let plusButton = this._doc.querySelector(".content-width-plus-button");
+    let minusButton = this._doc.querySelector(".content-width-minus-button");
 
     function updateControls() {
       if (currentContentWidth === CONTENT_WIDTH_MIN) {
@@ -443,7 +448,7 @@ AboutReader.prototype = {
   },
 
   _setLineHeight(newLineHeight) {
-    let contentClasses = this._doc.getElementById("moz-reader-content").classList;
+    let contentClasses = this._contentElement.classList;
 
     if (this._lineHeight > 0)
       contentClasses.remove("line-height" + this._lineHeight);
@@ -460,8 +465,8 @@ AboutReader.prototype = {
     let currentLineHeight = Services.prefs.getIntPref("reader.line_height");
     currentLineHeight = Math.max(LINE_HEIGHT_MIN, Math.min(LINE_HEIGHT_MAX, currentLineHeight));
 
-    let plusButton = this._doc.getElementById("line-height-plus");
-    let minusButton = this._doc.getElementById("line-height-minus");
+    let plusButton = this._doc.querySelector(".line-height-plus-button");
+    let minusButton = this._doc.querySelector(".line-height-minus-button");
 
     function updateControls() {
       if (currentLineHeight === LINE_HEIGHT_MIN) {
@@ -876,7 +881,7 @@ AboutReader.prototype = {
 
   _setupSegmentedButton(id, options, initialValue, callback) {
     let doc = this._doc;
-    let segmentedButton = doc.getElementById(id);
+    let segmentedButton = doc.getElementsByClassName(id)[0];
 
     for (let i = 0; i < options.length; i++) {
       let option = options[i];
@@ -930,7 +935,7 @@ AboutReader.prototype = {
       this._setButtonTip(id, titleEntity);
     }
 
-    let button = this._doc.getElementById(id);
+    let button = this._doc.getElementsByClassName(id)[0];
     if (textEntity) {
       button.textContent = gStrings.GetStringFromName(textEntity);
     }
@@ -951,12 +956,12 @@ AboutReader.prototype = {
    * @param   Localizable string providing UI element usage tip.
    */
   _setButtonTip(id, titleEntity) {
-    let button = this._doc.getElementById(id);
+    let button = this._doc.getElementsByClassName(id)[0];
     button.setAttribute("title", gStrings.GetStringFromName(titleEntity));
   },
 
   _setupStyleDropdown() {
-    let dropdownToggle = this._doc.querySelector("#style-dropdown .dropdown-toggle");
+    let dropdownToggle = this._doc.querySelector(".style-dropdown .dropdown-toggle");
     dropdownToggle.setAttribute("title", gStrings.GetStringFromName("aboutReader.toolbar.typeControls"));
   },
 
diff --git a/toolkit/components/reader/content/aboutReader.html b/toolkit/components/reader/content/aboutReader.html
index 635ba6bdb5b5..1aa6444741e5 100644
--- a/toolkit/components/reader/content/aboutReader.html
+++ b/toolkit/components/reader/content/aboutReader.html
@@ -11,52 +11,52 @@
 </head>
 
 <body>
-  <div id="container" class="container">
-    <div id="reader-header" class="header">
-      <a id="reader-domain" class="domain"></a>
+  <div class="container">
+    <div class="header reader-header">
+      <a class="domain reader-domain"></a>
       <div class="domain-border"></div>
-      <h1 id="reader-title"></h1>
-      <div id="reader-credits" class="credits"></div>
-      <div id="meta-data" class="meta-data">
-        <div id="reader-estimated-time"></div>
+      <h1 class="reader-title"></h1>
+      <div class="credits reader-credits"></div>
+      <div class="meta-data">
+        <div class="reader-estimated-time"></div>
       </div>
     </div>
 
     <hr>
 
     <div class="content">
-      <div id="moz-reader-content"></div>
+      <div class="moz-reader-content"></div>
     </div>
 
     <div>
-      <div id="reader-message"></div>
+      <div class="reader-message"></div>
     </div>
   </div>
 
-  <ul id="reader-toolbar" class="toolbar">
-    <li><button id="close-button" class="button close-button"/></li>
-    <ul id="style-dropdown" class="dropdown">
+  <ul class="toolbar reader-toolbar">
+    <li><button class="button close-button"/></li>
+    <ul class="dropdown style-dropdown">
       <li><button class="dropdown-toggle button style-button"/></li>
-      <li id="reader-popup" class="dropdown-popup">
-        <div id="font-type-buttons"></div>
+      <li class="dropdown-popup">
+        <div class="font-type-buttons"></div>
         <hr>
-        <div id="font-size-buttons">
-          <button id="font-size-minus" class="minus-button"/>
-          <button id="font-size-sample"/>
-          <button id="font-size-plus" class="plus-button"/>
+        <div class="font-size-buttons">
+          <button class="minus-button"/>
+          <button class="font-size-sample"/>
+          <button class="plus-button"/>
         </div>
         <hr>
-        <div id="content-width-buttons">
-          <button id="content-width-minus" class="content-width-minus-button"/>
-          <button id="content-width-plus" class="content-width-plus-button"/>
+        <div class="content-width-buttons">
+          <button class="content-width-minus-button"/>
+          <button class="content-width-plus-button"/>
         </div>
         <hr>
-        <div id="line-height-buttons">
-          <button id="line-height-minus" class="line-height-minus-button"/>
-          <button id="line-height-plus" class="line-height-plus-button"/>
+        <div class="line-height-buttons">
+          <button class="line-height-minus-button"/>
+          <button class="line-height-plus-button"/>
         </div>
         <hr>
-        <div id="color-scheme-buttons"></div>
+        <div class="color-scheme-buttons"></div>
         <div class="dropdown-arrow"/>
       </li>
     </ul>
diff --git a/toolkit/components/reader/test/browser_readerMode_readingTime.js b/toolkit/components/reader/test/browser_readerMode_readingTime.js
index ed92f6b6d078..5513c22b023b 100644
--- a/toolkit/components/reader/test/browser_readerMode_readingTime.js
+++ b/toolkit/components/reader/test/browser_readerMode_readingTime.js
@@ -18,7 +18,7 @@ add_task(async function() {
     await pageShownPromise;
     await ContentTask.spawn(browser, null, async function() {
       // make sure there is a reading time on the page and that it displays the correct information
-      let readingTimeElement = content.document.getElementById("reader-estimated-time");
+      let readingTimeElement = content.document.querySelector(".reader-estimated-time");
       ok(readingTimeElement, "Reading time element should be in document");
       is(readingTimeElement.textContent, "9-12 minutes", "Reading time should be '9-12 minutes'");
     });
@@ -37,7 +37,7 @@ add_task(async function() {
     await pageShownPromise;
     await ContentTask.spawn(browser, null, async function() {
       // make sure there is a reading time on the page and that it displays the correct information
-      let readingTimeElement = content.document.getElementById("reader-estimated-time");
+      let readingTimeElement = content.document.querySelector(".reader-estimated-time");
       ok(readingTimeElement, "Reading time element should be in document");
       is(readingTimeElement.textContent, "1 minute", "Reading time should be '1 minute'");
     });
@@ -57,7 +57,7 @@ add_task(async function() {
     await pageShownPromise;
     await ContentTask.spawn(browser, null, async function() {
       // make sure there is a reading time on the page and that it displays the correct information
-      let readingTimeElement = content.document.getElementById("reader-estimated-time");
+      let readingTimeElement = content.document.querySelector(".reader-estimated-time");
       ok(readingTimeElement, "Reading time element should be in document");
       is(readingTimeElement.textContent, "3 minutes", "Reading time should be '3 minutes'");
     });
diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
index 7b63f56e3e84..32f7dce08214 100644
--- a/toolkit/themes/shared/aboutReader.css
+++ b/toolkit/themes/shared/aboutReader.css
@@ -2,6 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* Avoid adding ID selector rules in this style sheet, since they could
+ * inadvertently match elements in the article content. */
+
 body {
   padding: 64px 51px;
 }
@@ -43,80 +46,80 @@ body.serif .remove-button  {
   font-family: Georgia, "Times New Roman", serif;
 }
 
-#container {
+.container {
   max-width: 30em;
   margin: 0 auto;
 }
 
-#container.font-size1 {
+.container.font-size1 {
   font-size: 12px;
 }
 
-#container.font-size2 {
+.container.font-size2 {
   font-size: 14px;
 }
 
-#container.font-size3 {
+.container.font-size3 {
   font-size: 16px;
 }
 
-#container.font-size4  {
+.container.font-size4  {
   font-size: 18px;
 }
 
-#container.font-size5 {
+.container.font-size5 {
   font-size: 20px;
 }
 
-#container.font-size6 {
+.container.font-size6 {
   font-size: 22px;
 }
 
-#container.font-size7 {
+.container.font-size7 {
   font-size: 24px;
 }
 
-#container.font-size8 {
+.container.font-size8 {
   font-size: 26px;
 }
 
-#container.font-size9 {
+.container.font-size9 {
   font-size: 28px;
 }
 
-#container.content-width1 {
+.container.content-width1 {
   max-width: 20em;
 }
 
-#container.content-width2 {
+.container.content-width2 {
   max-width: 25em;
 }
 
-#container.content-width3 {
+.container.content-width3 {
   max-width: 30em;
 }
 
-#container.content-width4  {
+.container.content-width4  {
   max-width: 35em;
 }
 
-#container.content-width5 {
+.container.content-width5 {
   max-width: 40em;
 }
 
-#container.content-width6 {
+.container.content-width6 {
   max-width: 45em;
 }
 
-#container.content-width7 {
+.container.content-width7 {
   max-width: 50em;
 }
 
-#container.content-width8 {
+.container.content-width8 {
   max-width: 55em;
 }
 
-#container.content-width9 {
+.container.content-width9 {
   max-width: 60em;
 }
 
@@ -189,7 +192,7 @@ body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
 
 /* Loading/error message */
 
-#reader-message {
+.reader-message {
   margin-top: 40px;
   display: none;
   text-align: center;
@@ -328,91 +331,91 @@ body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
 
 /*======= Font style popup =======*/
 
-#font-type-buttons,
-#font-size-buttons,
-#color-scheme-buttons,
-#content-width-buttons,
-#line-height-buttons {
+.font-type-buttons,
+.font-size-buttons,
+.color-scheme-buttons,
+.content-width-buttons,
+.line-height-buttons {
   display: flex;
   flex-direction: row;
 }
 
-#font-type-buttons > button:first-child {
+.font-type-buttons > button:first-child {
   border-top-left-radius: 3px;
 }
-#font-type-buttons > button:last-child {
+.font-type-buttons > button:last-child {
   border-top-right-radius: 3px;
 }
-#color-scheme-buttons > button:first-child {
+.color-scheme-buttons > button:first-child {
   border-bottom-left-radius: 3px;
 }
-#color-scheme-buttons > button:last-child {
+.color-scheme-buttons > button:last-child {
   border-bottom-right-radius: 3px;
 }
 
-#font-type-buttons > button,
-#font-size-buttons > button,
-#color-scheme-buttons > button,
-#content-width-buttons > button,
-#line-height-buttons > button {
+.font-type-buttons > button,
+.font-size-buttons > button,
+.color-scheme-buttons > button,
+.content-width-buttons > button,
+.line-height-buttons > button {
   text-align: center;
   border: 0;
 }
 
-#font-type-buttons > button,
-#font-size-buttons > button,
-#content-width-buttons > button,
-#line-height-buttons > button {
+.font-type-buttons > button,
+.font-size-buttons > button,
+.content-width-buttons > button,
+.line-height-buttons > button {
   width: 50%;
   background-color: transparent;
   border-left: 1px solid #B5B5B5;
   border-bottom: 1px solid #B5B5B5;
 }
 
-#color-scheme-buttons > button {
+.color-scheme-buttons > button {
   width: 33.33%;
   font-size: 14px;
 }
 
-#color-scheme-buttons > .dark-button {
+.color-scheme-buttons > .dark-button {
   margin-top: -1px;
   height: 61px;
 }
 
-#font-type-buttons > button:first-child,
-#font-size-buttons > button:first-child,
-#content-width-buttons > button:first-child,
-#line-height-buttons > button:first-child {
+.font-type-buttons > button:first-child,
+.font-size-buttons > button:first-child,
+.content-width-buttons > button:first-child,
+.line-height-buttons > button:first-child {
   border-left: 0;
 }
 
-#font-type-buttons > button {
+.font-type-buttons > button {
   display: inline-block;
   font-size: 62px;
   height: 100px;
 }
 
-#font-size-buttons > button,
-#color-scheme-buttons > button,
-#content-width-buttons > button,
-#line-height-buttons > button {
+.font-size-buttons > button,
+.color-scheme-buttons > button,
+.content-width-buttons > button,
+.line-height-buttons > button {
   height: 60px;
 }
 
-#font-type-buttons > button:active:hover,
-#font-type-buttons > button.selected,
-#color-scheme-buttons > button:active:hover,
-#color-scheme-buttons > button.selected {
+.font-type-buttons > button:active:hover,
+.font-type-buttons > button.selected,
+.color-scheme-buttons > button:active:hover,
+.color-scheme-buttons > button.selected {
   box-shadow: inset 0 -3px 0 0 #fc6420;
 }
 
-#font-type-buttons > button:active:hover,
-#font-type-buttons > button.selected {
+.font-type-buttons > button:active:hover,
+.font-type-buttons > button.selected {
   border-bottom: 1px solid #FC6420;
 }
 
 /* Make the serif button content the same size as the sans-serif button content. */
-#font-type-buttons > button > .description {
+.font-type-buttons > button > .description {
   color: #666;
   font-size: 12px;
   margin-top: -5px;
@@ -420,64 +423,64 @@ body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
 
 /* Font sizes are different per-platform, so we need custom CSS to line them up. */
 %ifdef XP_MACOSX
-#font-type-buttons > .sans-serif-button > .name {
+.font-type-buttons > .sans-serif-button > .name {
   margin-top: 10px;
 }
 
-#font-type-buttons > .sans-serif-button > .description {
+.font-type-buttons > .sans-serif-button > .description {
   margin-top: -4px;
 }
 
-#font-type-buttons > .serif-button > .name {
+.font-type-buttons > .serif-button > .name {
   font-size: 63px;
 }
 %elifdef XP_WIN
-#font-type-buttons > .sans-serif-button > .name {
+.font-type-buttons > .sans-serif-button > .name {
   margin-top: 2px;
 }
 
-#font-type-buttons > .sans-serif-button > .description {
+.font-type-buttons > .sans-serif-button > .description {
   margin-top: -4px;
 }
 
-#font-type-buttons > .serif-button > .name {
+.font-type-buttons > .serif-button > .name {
   font-size: 63px;
 }
 %else
-#font-type-buttons > .sans-serif-button > .name {
+.font-type-buttons > .sans-serif-button > .name {
   margin-top: 5px;
 }
 
-#font-type-buttons > .sans-serif-button > .description {
+.font-type-buttons > .sans-serif-button > .description {
   margin-top: -8px;
 }
 
-#font-type-buttons > .serif-button > .name {
+.font-type-buttons > .serif-button > .name {
   font-size: 70px;
 }
 %endif
 
 .button:hover,
-#font-size-buttons > button:hover,
-#font-type-buttons > button:hover,
-#content-width-buttons > button:hover,
-#line-height-buttons > button:hover {
+.font-size-buttons > button:hover,
+.font-type-buttons > button:hover,
+.content-width-buttons > button:hover,
+.line-height-buttons > button:hover {
   background-color: #ebebeb;
 }
 
 .dropdown.open,
 .button:active,
-#font-size-buttons > button:active,
-#font-size-buttons > button.selected,
-#content-width-buttons > button:active,
-#content-width-buttons > button.selected,
-#line-height-buttons > button:active,
-#line-height-buttons > button.selected {
+.font-size-buttons > button:active,
+.font-size-buttons > button.selected,
+.content-width-buttons > button:active,
+.content-width-buttons > button.selected,
+.line-height-buttons > button:active,
+.line-height-buttons > button.selected {
   background-color: #dadada;
 }
 
 /* Only used on Android */
-#font-size-sample {
+.font-size-sample {
   display: none;
 }
 
@@ -561,178 +564,178 @@ body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
  * must be added to CLASSES_TO_PRESERVE in ReaderMode.jsm, so that
  * Readability.js doesn't strip them out */
 
-#moz-reader-content {
+.moz-reader-content {
   display: none;
   font-size: 1em;
   line-height: 1.6em;
 }
 
-#moz-reader-content.line-height1 {
+.moz-reader-content.line-height1 {
   line-height: 1em;
 }
 
-#moz-reader-content.line-height2 {
+.moz-reader-content.line-height2 {
   line-height: 1.2em;
 }
 
-#moz-reader-content.line-height3 {
+.moz-reader-content.line-height3 {
   line-height: 1.4em;
 }
 
-#moz-reader-content.line-height4 {
+.moz-reader-content.line-height4 {
   line-height: 1.6em;
 }
 
-#moz-reader-content.line-height5 {
+.moz-reader-content.line-height5 {
   line-height: 1.8em;
 }
 
-#moz-reader-content.line-height6 {
+.moz-reader-content.line-height6 {
   line-height: 2.0em;
 }
 
-#moz-reader-content.line-height7 {
+.moz-reader-content.line-height7 {
   line-height: 2.2em;
 }
 
-#moz-reader-content.line-height8 {
+.moz-reader-content.line-height8 {
   line-height: 2.4em;
 }
 
-#moz-reader-content.line-height9 {
+.moz-reader-content.line-height9 {
   line-height: 2.6em;
 }
 
 @media print {
-  #moz-reader-content p,
-  #moz-reader-content code,
-  #moz-reader-content pre,
-  #moz-reader-content blockquote,
-  #moz-reader-content ul,
-  #moz-reader-content ol,
-  #moz-reader-content li,
-  #moz-reader-content figure,
-  #moz-reader-content .wp-caption {
+  .moz-reader-content p,
+  .moz-reader-content code,
+  .moz-reader-content pre,
+  .moz-reader-content blockquote,
+  .moz-reader-content ul,
+  .moz-reader-content ol,
+  .moz-reader-content li,
+  .moz-reader-content figure,
+  .moz-reader-content .wp-caption {
     margin: 0 0 10px 0 !important;
     padding: 0 !important;
   }
 }
 
-#moz-reader-content h1,
-#moz-reader-content h2,
-#moz-reader-content h3 {
+.moz-reader-content h1,
+.moz-reader-content h2,
+.moz-reader-content h3 {
   font-weight: bold;
 }
 
-#moz-reader-content h1 {
+.moz-reader-content h1 {
   font-size: 1.6em;
   line-height: 1.25em;
 }
 
-#moz-reader-content h2 {
+.moz-reader-content h2 {
   font-size: 1.2em;
   line-height: 1.51em;
 }
 
-#moz-reader-content h3 {
+.moz-reader-content h3 {
   font-size: 1em;
   line-height: 1.66em;
 }
 
-#moz-reader-content a:link {
+.moz-reader-content a:link {
   text-decoration: underline;
   font-weight: normal;
 }
 
-#moz-reader-content a:link,
-#moz-reader-content a:link:hover,
-#moz-reader-content a:link:active {
+.moz-reader-content a:link,
+.moz-reader-content a:link:hover,
+.moz-reader-content a:link:active {
   color: #0095dd;
 }
 
-#moz-reader-content a:visited {
+.moz-reader-content a:visited {
   color: #c2e;
 }
 
-#moz-reader-content * {
+.moz-reader-content * {
   max-width: 100%;
   height: auto;
 }
 
-#moz-reader-content p,
-#moz-reader-content p,
-#moz-reader-content code,
-#moz-reader-content pre,
-#moz-reader-content blockquote,
-#moz-reader-content ul,
-#moz-reader-content ol,
-#moz-reader-content li,
-#moz-reader-content figure,
-#moz-reader-content .wp-caption {
+.moz-reader-content p,
+.moz-reader-content p,
+.moz-reader-content code,
+.moz-reader-content pre,
+.moz-reader-content blockquote,
+.moz-reader-content ul,
+.moz-reader-content ol,
+.moz-reader-content li,
+.moz-reader-content figure,
+.moz-reader-content .wp-caption {
   margin: -10px -10px 20px -10px;
   padding: 10px;
   border-radius: 5px;
 }
 
-#moz-reader-content li {
+.moz-reader-content li {
   margin-bottom: 0;
 }
 
-#moz-reader-content li > ul,
-#moz-reader-content li > ol {
+.moz-reader-content li > ul,
+.moz-reader-content li > ol {
   margin-bottom: -10px;
 }
 
-#moz-reader-content p > img:only-child,
-#moz-reader-content p > a:only-child > img:only-child,
-#moz-reader-content .wp-caption img,
-#moz-reader-content figure img {
+.moz-reader-content p > img:only-child,
+.moz-reader-content p > a:only-child > img:only-child,
+.moz-reader-content .wp-caption img,
+.moz-reader-content figure img {
   display: block;
 }
 
-#moz-reader-content img[moz-reader-center] {
+.moz-reader-content img[moz-reader-center] {
   margin-left: auto;
   margin-right: auto;
 }
 
-#moz-reader-content .caption,
-#moz-reader-content .wp-caption-text
-#moz-reader-content figcaption {
+.moz-reader-content .caption,
+.moz-reader-content .wp-caption-text
+.moz-reader-content figcaption {
   font-size: 0.9em;
   line-height: 1.48em;
   font-style: italic;
 }
 
-#moz-reader-content code,
-#moz-reader-content pre {
+.moz-reader-content code,
+.moz-reader-content pre {
   white-space: pre-wrap;
 }
 
-#moz-reader-content blockquote {
+.moz-reader-content blockquote {
   padding: 0;
   padding-inline-start: 16px;
 }
 
-#moz-reader-content ul,
-#moz-reader-content ol {
+.moz-reader-content ul,
+.moz-reader-content ol {
   padding: 0;
 }
 
-#moz-reader-content ul {
+.moz-reader-content ul {
   padding-inline-start: 30px;
   list-style: disc;
 }
 
-#moz-reader-content ol {
+.moz-reader-content ol {
   padding-inline-start: 30px;
   list-style: decimal;
 }
 
 /* Hide elements with common "hidden" class names */
-#moz-reader-content .visually-hidden,
-#moz-reader-content .visuallyhidden,
-#moz-reader-content .hidden,
-#moz-reader-content .invisible,
-#moz-reader-content .sr-only {
+.moz-reader-content .visually-hidden,
+.moz-reader-content .visuallyhidden,
+.moz-reader-content .hidden,
+.moz-reader-content .invisible,
+.moz-reader-content .sr-only {
   display: none;
 }
diff --git a/toolkit/themes/shared/narrate.css b/toolkit/themes/shared/narrate.css
index bafdab8deec4..bfab390cbe95 100644
--- a/toolkit/themes/shared/narrate.css
+++ b/toolkit/themes/shared/narrate.css
@@ -1,3 +1,6 @@
+/* Avoid adding ID selector rules in this style sheet, since they could
+ * inadvertently match elements in the article content. */
+
 .narrating {
   position: relative;
   z-index: 1;
@@ -45,20 +48,20 @@ body.dark .narrate-word-highlight {
   border-bottom-color: #6f6f6f;
 }
 
-#narrate-dropdown {
+.narrate-dropdown {
   --border-color: #e5e5e5;
 }
 
-#narrate-toggle > svg {
+.narrate-toggle > svg {
   display: block;
   margin: 0 8px;
 }
 
-.dropdown-popup button {
+.narrate-dropdown > .dropdown-popup button {
   background-color: transparent;
 }
 
-.dropdown-popup button:hover:not(:disabled) {
+.narrate-dropdown > .dropdown-popup button:hover:not(:disabled) {
   background-color: #eaeaea;
 }
 
@@ -75,7 +78,7 @@ body.dark .narrate-word-highlight {
 
 /* Control buttons */
 
-#narrate-control > button {
+.narrate-control > button {
   background-size: 24px 24px;
   background-repeat: no-repeat;
   background-position: center center;
@@ -86,40 +89,40 @@ body.dark .narrate-word-highlight {
   box-sizing: border-box;
 }
 
-#narrate-control > button:not(:first-child) {
+.narrate-control > button:not(:first-child) {
   border-left: 1px solid var(--border-color);
 }
 
-#narrate-skip-previous {
+.narrate-skip-previous {
   border-top-left-radius: 3px;
   background-image: url("chrome://global/skin/narrate/back.svg");
   -moz-context-properties: fill;
   fill: rgb(128 128 128);
 }
 
-#narrate-skip-next {
+.narrate-skip-next {
   border-top-right-radius: 3px;
   background-image: url("chrome://global/skin/narrate/forward.svg");
   -moz-context-properties: fill;
   fill: rgb(128 128 128);
 }
 
-#narrate-skip-previous:disabled,
-#narrate-skip-next:disabled {
+.narrate-skip-previous:disabled,
+.narrate-skip-next:disabled {
   fill: rgb(128 128 128 / 50%);
 }
 
-#narrate-start-stop {
+.narrate-start-stop {
   background-image: url("chrome://global/skin/narrate/start.svg");
 }
 
-#narrate-dropdown.speaking #narrate-start-stop {
+.narrate-dropdown.speaking .narrate-start-stop {
   background-image: url("chrome://global/skin/narrate/stop.svg");
 }
 
 /* Rate control */
 
-#narrate-rate::before, #narrate-rate::after {
+.narrate-rate::before, .narrate-rate::after {
   content: '';
   width: 48px;
   height: 40px;
@@ -128,30 +131,30 @@ body.dark .narrate-word-highlight {
   background-size: 24px auto;
 }
 
-#narrate-rate::before {
+.narrate-rate::before {
   background-image: url("chrome://global/skin/narrate/slow.svg");
 }
 
-#narrate-rate::after {
+.narrate-rate::after {
   background-image: url("chrome://global/skin/narrate/fast.svg");
 }
 
-#narrate-rate-input {
+.narrate-rate-input {
   margin: 0 1px;
   flex-grow: 1;
 }
 
-#narrate-rate-input::-moz-range-track {
+.narrate-rate-input::-moz-range-track {
   background-color: #979797;
   height: 2px;
 }
 
-#narrate-rate-input::-moz-range-progress {
+.narrate-rate-input::-moz-range-progress {
   background-color: #2EA3FF;
   height: 2px;
 }
 
-#narrate-rate-input::-moz-range-thumb {
+.narrate-rate-input::-moz-range-thumb {
   background-color: #808080;
   height: 16px;
   width: 16px;
@@ -159,7 +162,7 @@ body.dark .narrate-word-highlight {
   border-width: 0;
 }
 
-#narrate-rate-input:active::-moz-range-thumb {
+.narrate-rate-input:active::-moz-range-thumb {
   background-color: #2EA3FF;
 }
 

From d0874f7146970f490950cffb44a166b0e147a951 Mon Sep 17 00:00:00 2001
From: abhinav <abhinav.koppula@gmail.com>
Date: Wed, 29 Nov 2017 22:02:12 +0530
Subject: [PATCH 170/219] Bug 1419368 - NetMonitor: Stop using ImmutableJS in
 timing-markers reducer. r=Honza

MozReview-Commit-ID: 5PQsSWT5m1P

--HG--
extra : rebase_source : 1f1a21c174bbf69a29c781d95ff179e60189ad59
---
 .../netmonitor/src/reducers/timing-markers.js | 26 +++++++++----------
 .../src/selectors/timing-markers.js           |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/devtools/client/netmonitor/src/reducers/timing-markers.js b/devtools/client/netmonitor/src/reducers/timing-markers.js
index 9923ccac4871..5475d6f3f9d7 100644
--- a/devtools/client/netmonitor/src/reducers/timing-markers.js
+++ b/devtools/client/netmonitor/src/reducers/timing-markers.js
@@ -4,39 +4,39 @@
 
 "use strict";
 
-const I = require("devtools/client/shared/vendor/immutable");
 const {
   ADD_TIMING_MARKER,
   CLEAR_TIMING_MARKERS,
   CLEAR_REQUESTS,
 } = require("../constants");
 
-const TimingMarkers = I.Record({
-  firstDocumentDOMContentLoadedTimestamp: -1,
-  firstDocumentLoadTimestamp: -1,
-});
+function TimingMarkers() {
+  return {
+    firstDocumentDOMContentLoadedTimestamp: -1,
+    firstDocumentLoadTimestamp: -1,
+  };
+}
 
 function addTimingMarker(state, action) {
+  state = { ...state };
+
   if (action.marker.name === "document::DOMContentLoaded" &&
       state.firstDocumentDOMContentLoadedTimestamp === -1) {
-    return state.set("firstDocumentDOMContentLoadedTimestamp",
-                     action.marker.unixTime / 1000);
+    state.firstDocumentDOMContentLoadedTimestamp = action.marker.unixTime / 1000;
+    return state;
   }
 
   if (action.marker.name === "document::Load" &&
       state.firstDocumentLoadTimestamp === -1) {
-    return state.set("firstDocumentLoadTimestamp",
-                     action.marker.unixTime / 1000);
+    state.firstDocumentLoadTimestamp = action.marker.unixTime / 1000;
+    return state;
   }
 
   return state;
 }
 
 function clearTimingMarkers(state) {
-  return state.withMutations(st => {
-    st.remove("firstDocumentDOMContentLoadedTimestamp");
-    st.remove("firstDocumentLoadTimestamp");
-  });
+  return new TimingMarkers();
 }
 
 function timingMarkers(state = new TimingMarkers(), action) {
diff --git a/devtools/client/netmonitor/src/selectors/timing-markers.js b/devtools/client/netmonitor/src/selectors/timing-markers.js
index 1c018698cffc..5c482080b872 100644
--- a/devtools/client/netmonitor/src/selectors/timing-markers.js
+++ b/devtools/client/netmonitor/src/selectors/timing-markers.js
@@ -5,7 +5,7 @@
 "use strict";
 
 function getDisplayedTimingMarker(state, marker) {
-  return state.timingMarkers.get(marker) - state.requests.firstStartedMillis;
+  return state.timingMarkers.marker - state.requests.firstStartedMillis;
 }
 
 module.exports = {

From f14389a0654064265221d52cc36a86e53e9bf01c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 4 Dec 2017 02:47:54 +0100
Subject: [PATCH 171/219] Bug 1422654: stylo: Avoid restyling XBL-bound element
 if the binding doesn't have stylesheets. r=heycam

MozReview-Commit-ID: An2McUbpCLk

--HG--
extra : rebase_source : 1c869057d032773fbfd426d6f392cc936c81029c
---
 dom/xbl/nsXBLService.cpp              | 19 +++++++++++++-----
 layout/base/PresShell.cpp             | 10 ++-------
 layout/base/ServoRestyleManager.cpp   |  8 +++++---
 layout/base/ServoRestyleManager.h     | 11 +++++++++-
 layout/base/nsCSSFrameConstructor.cpp | 29 ++++++++++++---------------
 5 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/dom/xbl/nsXBLService.cpp b/dom/xbl/nsXBLService.cpp
index 64ee00751a43..720a8af346b5 100644
--- a/dom/xbl/nsXBLService.cpp
+++ b/dom/xbl/nsXBLService.cpp
@@ -443,14 +443,18 @@ private:
 class MOZ_RAII AutoStyleElement
 {
 public:
-  explicit AutoStyleElement(Element* aElement)
+  AutoStyleElement(Element* aElement, bool* aResolveStyle)
     : mElement(aElement)
     , mHadData(aElement->HasServoData())
+    , mResolveStyle(aResolveStyle)
   {
+    MOZ_ASSERT(mResolveStyle);
     if (mHadData) {
-      ServoRestyleManager::ClearServoDataFromSubtree(mElement);
+      ServoRestyleManager::ClearServoDataFromSubtree(
+        mElement, ServoRestyleManager::IncludeRoot::No);
     }
   }
+
   ~AutoStyleElement()
   {
     nsIPresShell* presShell = mElement->OwnerDoc()->GetShell();
@@ -458,13 +462,18 @@ public:
       return;
     }
 
-    ServoStyleSet* servoSet = presShell->StyleSet()->AsServo();
-    servoSet->StyleNewSubtree(mElement);
+    if (*mResolveStyle) {
+      mElement->ClearServoData();
+
+      ServoStyleSet* servoSet = presShell->StyleSet()->AsServo();
+      servoSet->StyleNewSubtree(mElement);
+    }
   }
 
 private:
   Element* mElement;
   bool mHadData;
+  bool* mResolveStyle;
 };
 
 // This function loads a particular XBL file and installs all of the bindings
@@ -532,7 +541,7 @@ nsXBLService::LoadBindings(nsIContent* aContent, nsIURI* aURL,
     return NS_ERROR_ILLEGAL_VALUE;
   }
 
-  AutoStyleElement styleElement(aContent->AsElement());
+  AutoStyleElement styleElement(aContent->AsElement(), aResolveStyle);
 
   // We loaded a style binding.  It goes on the end.
   // Install the binding on the content node.
diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
index 5fa349dd6045..1f9e00e48a72 100644
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
@@ -2963,14 +2963,8 @@ PresShell::DestroyFramesForAndRestyle(Element* aElement)
       //
       // FIXME(emilio): It'd be more ergonomic to just map the no data -> data
       // case to a reframe from the style system.
-      StyleChildrenIterator iter(aElement);
-      for (nsIContent* child = iter.GetNextChild();
-           child;
-           child = iter.GetNextChild()) {
-        if (child->IsElement()) {
-          ServoRestyleManager::ClearServoDataFromSubtree(child->AsElement());
-        }
-      }
+      ServoRestyleManager::ClearServoDataFromSubtree(
+          aElement, ServoRestyleManager::IncludeRoot::No);
     } else {
       // This is the case of an element that was redistributed but is no longer
       // bound to any insertion point. Just forget about all the data.
diff --git a/layout/base/ServoRestyleManager.cpp b/layout/base/ServoRestyleManager.cpp
index 8ff59cb85ce5..4f48296bda3d 100644
--- a/layout/base/ServoRestyleManager.cpp
+++ b/layout/base/ServoRestyleManager.cpp
@@ -427,7 +427,7 @@ ServoRestyleManager::PostRebuildAllStyleDataEvent(nsChangeHint aExtraHint,
 }
 
 /* static */ void
-ServoRestyleManager::ClearServoDataFromSubtree(Element* aElement)
+ServoRestyleManager::ClearServoDataFromSubtree(Element* aElement, IncludeRoot aIncludeRoot)
 {
   if (!aElement->HasServoData()) {
     MOZ_ASSERT(!aElement->HasDirtyDescendantsForServo());
@@ -438,11 +438,13 @@ ServoRestyleManager::ClearServoDataFromSubtree(Element* aElement)
   StyleChildrenIterator it(aElement);
   for (nsIContent* n = it.GetNextChild(); n; n = it.GetNextChild()) {
     if (n->IsElement()) {
-      ClearServoDataFromSubtree(n->AsElement());
+      ClearServoDataFromSubtree(n->AsElement(), IncludeRoot::Yes);
     }
   }
 
-  aElement->ClearServoData();
+  if (MOZ_LIKELY(aIncludeRoot == IncludeRoot::Yes)) {
+    aElement->ClearServoData();
+  }
 }
 
 /* static */ void
diff --git a/layout/base/ServoRestyleManager.h b/layout/base/ServoRestyleManager.h
index e00d1ad5b193..19132f2516e8 100644
--- a/layout/base/ServoRestyleManager.h
+++ b/layout/base/ServoRestyleManager.h
@@ -242,11 +242,20 @@ private:
                                 ServoStyleSet& aStyleSet);
 
 public:
+  /**
+   * Whether to clear all the style data (including the element itself), or just
+   * the descendants' data.
+   */
+  enum class IncludeRoot {
+    Yes,
+    No,
+  };
+
   /**
    * Clears the ServoElementData and HasDirtyDescendants from all elements
    * in the subtree rooted at aElement.
    */
-  static void ClearServoDataFromSubtree(Element* aElement);
+  static void ClearServoDataFromSubtree(Element*, IncludeRoot = IncludeRoot::Yes);
 
   /**
    * Clears HasDirtyDescendants and RestyleData from all elements in the
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 34f28d758ba3..53b411e42c54 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -2599,15 +2599,10 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element*                 aDocEle
       mDocument->BindingManager()->AddToAttachedQueue(binding);
     }
 
-    if (resolveStyle || styleContext->IsServo()) {
+    if (resolveStyle) {
       // FIXME: Should this use ResolveStyleContext?  (The calls in this
       // function are the only case in nsCSSFrameConstructor where we don't do
       // so for the construction of a style context for an element.)
-      //
-      // NOTE(emilio): In the case of Servo, even though resolveStyle returns
-      // false, we re-get the style context to avoid tripping otherwise-useful
-      // assertions when resolving pseudo-elements. Note that this operation in
-      // Servo is cheap.
       styleContext = mPresShell->StyleSet()->ResolveStyleFor(
           aDocElement, nullptr, LazyComputeBehavior::Assert);
       display = styleContext->StyleDisplay();
@@ -5906,16 +5901,18 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState
         aState.AddPendingBinding(newPendingBinding.forget());
       }
 
-      // See the comment in the similar-looking block in
-      // ConstructDocElementFrame to see why we always re-fetch the style
-      // context in Servo.
-      if (styleContext->IsServo()) {
-        styleContext =
-          mPresShell->StyleSet()->AsServo()->ResolveServoStyle(aContent->AsElement());
-      } else if (resolveStyle) {
-        styleContext =
-          ResolveStyleContext(styleContext->AsGecko()->GetParent(),
-                              aContent, &aState);
+      if (resolveStyle) {
+        // Need to take a different path (Servo directly grabs the style from
+        // the element, Gecko needs to actually re-resolve it using the parent
+        // style context).
+        if (styleContext->IsServo()) {
+          styleContext =
+            mPresShell->StyleSet()->AsServo()->ResolveServoStyle(aContent->AsElement());
+        } else {
+          styleContext =
+            ResolveStyleContext(styleContext->AsGecko()->GetParent(),
+                                aContent, &aState);
+        }
       }
 
       display = styleContext->StyleDisplay();

From b1ad4c3c996fdfd410a3aefb8af777bbe8a5b2f6 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Sun, 3 Dec 2017 22:54:04 +0100
Subject: [PATCH 172/219] Bug 1422628 - enable
 bugprone-forward-declaration-namespace in the static analysis r=andi

MozReview-Commit-ID: LHvTVoyy81A

--HG--
extra : rebase_source : bc9a03323ef635a55b2b38297a8d61ca3d8e8320
---
 tools/clang-tidy/config.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/clang-tidy/config.yaml b/tools/clang-tidy/config.yaml
index 92899c387bb9..e85f32914409 100644
--- a/tools/clang-tidy/config.yaml
+++ b/tools/clang-tidy/config.yaml
@@ -6,6 +6,8 @@ target: obj-x86_64-pc-linux-gnu
 clang_checkers:
  - name: -*
    publish: !!bool no
+ - name: bugprone-forward-declaration-namespace
+   publish: !!bool yes
  - name: clang-analyzer-deadcode.DeadStores
    publish: !!bool yes
  - name: clang-analyzer-security.*

From 834586be68b67e9a40bc3b7d7777ed29db6d23fd Mon Sep 17 00:00:00 2001
From: Jamie Nicol <jnicol@mozilla.com>
Date: Wed, 29 Nov 2017 16:08:12 +0000
Subject: [PATCH 173/219] Bug 1421586 - Limit maximum number of SurfaceTextures
 in existence. r=snorp

Limit the number of SurfaceTextures to ensure that we do not reach the
process's fd limit. 200 was chosen as the limit because it allows for
more tiles than any reasonable page should require, yet should not
come close to the 1024 fd limit, even with 2 fds (buffer and sync
fence) per SurfaceTexture.

MozReview-Commit-ID: F21H1Rj4FVF

--HG--
extra : rebase_source : 379b460c8067cc3c5aa11a47cc66f865bae1ac64
---
 .../gecko/gfx/GeckoSurfaceTexture.java        | 38 +++++++++++--------
 .../gecko/gfx/SurfaceAllocatorService.java    |  5 +++
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoSurfaceTexture.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoSurfaceTexture.java
index a68cf3944a0c..5c257cf914e1 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoSurfaceTexture.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoSurfaceTexture.java
@@ -17,6 +17,7 @@ import org.mozilla.gecko.annotation.WrapForJNI;
 
 public final class GeckoSurfaceTexture extends SurfaceTexture {
     private static final String LOGTAG = "GeckoSurfaceTexture";
+    private static final int MAX_SURFACE_TEXTURES = 200;
     private static volatile int sNextHandle = 1;
     private static final HashMap<Integer, GeckoSurfaceTexture> sSurfaceTextures = new HashMap<Integer, GeckoSurfaceTexture>();
 
@@ -155,10 +156,6 @@ public final class GeckoSurfaceTexture extends SurfaceTexture {
         if (useCount == 0) {
             setListener(null);
 
-            synchronized (sSurfaceTextures) {
-                sSurfaceTextures.remove(mHandle);
-            }
-
             if (mAttachedContext == 0) {
                 release();
                 return;
@@ -188,6 +185,10 @@ public final class GeckoSurfaceTexture extends SurfaceTexture {
 
         for (GeckoSurfaceTexture tex : list) {
             try {
+                synchronized (sSurfaceTextures) {
+                    sSurfaceTextures.remove(tex.mHandle);
+                }
+
                 if (tex.isSingleBuffer()) {
                    tex.releaseTexImage();
                 }
@@ -213,26 +214,31 @@ public final class GeckoSurfaceTexture extends SurfaceTexture {
             throw new IllegalArgumentException("single buffer mode not supported on API version < 19");
         }
 
-        int handle = sNextHandle++;
-
-        final GeckoSurfaceTexture gst;
-        if (isSingleBufferSupported()) {
-            gst = new GeckoSurfaceTexture(handle, singleBufferMode);
-        } else {
-            gst = new GeckoSurfaceTexture(handle);
-        }
-
         synchronized (sSurfaceTextures) {
+            // We want to limit the maximum number of SurfaceTextures at any one time.
+            // This is because they use a large number of fds, and once the process' limit
+            // is reached bad things happen. See bug 1421586.
+            if (sSurfaceTextures.size() >= MAX_SURFACE_TEXTURES) {
+                return null;
+            }
+
+            int handle = sNextHandle++;
+
+            final GeckoSurfaceTexture gst;
+            if (isSingleBufferSupported()) {
+                gst = new GeckoSurfaceTexture(handle, singleBufferMode);
+            } else {
+                gst = new GeckoSurfaceTexture(handle);
+            }
+
             if (sSurfaceTextures.containsKey(handle)) {
                 gst.release();
                 throw new IllegalArgumentException("Already have a GeckoSurfaceTexture with that handle");
             }
 
             sSurfaceTextures.put(handle, gst);
+            return gst;
         }
-
-
-        return gst;
     }
 
     @WrapForJNI
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/SurfaceAllocatorService.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/SurfaceAllocatorService.java
index 61a3adace9fe..8a223333d665 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/SurfaceAllocatorService.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/SurfaceAllocatorService.java
@@ -23,6 +23,11 @@ public class SurfaceAllocatorService extends Service {
     private Binder mBinder = new ISurfaceAllocator.Stub() {
         public GeckoSurface acquireSurface(int width, int height, boolean singleBufferMode) {
             GeckoSurfaceTexture gst = GeckoSurfaceTexture.acquire(singleBufferMode);
+
+            if (gst == null) {
+                return null;
+            }
+
             if (width > 0 && height > 0) {
                 gst.setDefaultBufferSize(width, height);
             }

From d2f91da2bd7398467ee8477dc40f29c0d00c9435 Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Fri, 1 Dec 2017 14:24:27 +0800
Subject: [PATCH 174/219] Bug 1422677. P1 - move the call to
 ComputePlaybackRate() out of UpdatePlaybackRate(). r=bechen,gerald

We want to remove the side effect of ComputePlaybackRate(). Anyone who wants
the side effect (updating mPlaybackBytesPerSecond/mPlaybackRateReliable)
should call it explicitly.

MozReview-Commit-ID: 8oHvCl5pewz

--HG--
extra : rebase_source : 3ee54ea32d2d2d7185d9a65c6658a3e700f1fb71
---
 dom/media/ChannelMediaDecoder.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dom/media/ChannelMediaDecoder.cpp b/dom/media/ChannelMediaDecoder.cpp
index cf1497f9ad39..22b32ec8ae75 100644
--- a/dom/media/ChannelMediaDecoder.cpp
+++ b/dom/media/ChannelMediaDecoder.cpp
@@ -274,6 +274,7 @@ ChannelMediaDecoder::NotifyDownloadEnded(nsresult aStatus)
 
   MediaDecoderOwner* owner = GetOwner();
   if (NS_SUCCEEDED(aStatus) || aStatus == NS_BASE_STREAM_CLOSED) {
+    ComputePlaybackRate();
     UpdatePlaybackRate();
     owner->DownloadSuspended();
     // NotifySuspendedStatusChanged will tell the element that download
@@ -339,6 +340,7 @@ ChannelMediaDecoder::DurationChanged()
   AbstractThread::AutoEnter context(AbstractMainThread());
   MediaDecoder::DurationChanged();
   // Duration has changed so we should recompute playback rate
+  ComputePlaybackRate();
   UpdatePlaybackRate();
 }
 
@@ -349,6 +351,7 @@ ChannelMediaDecoder::DownloadProgressed()
   MOZ_DIAGNOSTIC_ASSERT(!IsShutdown());
   AbstractThread::AutoEnter context(AbstractMainThread());
   GetOwner()->DownloadProgressed();
+  ComputePlaybackRate();
   UpdatePlaybackRate();
   mResource->ThrottleReadahead(ShouldThrottleDownload());
 }
@@ -377,7 +380,6 @@ ChannelMediaDecoder::UpdatePlaybackRate()
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(mResource);
 
-  ComputePlaybackRate();
   uint32_t rate = mPlaybackBytesPerSecond;
 
   if (mPlaybackRateReliable) {

From 2f2083875cd71a14ded03583546f52a527d78f5a Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Fri, 1 Dec 2017 14:34:58 +0800
Subject: [PATCH 175/219] Bug 1422677. P2 - remove the side effect of
 MediaDecoder::CanPlayThrough(). r=bechen,gerald

We calculate 'canplaythrough' in ChannelMediaDecoder::DownloadProgressed() and
send updates to MDSM.

MozReview-Commit-ID: KAeDciPAUKs

--HG--
extra : rebase_source : 64d7705fb5ca6b1003664ac313ad1ae0ab1bbea6
---
 dom/html/HTMLMediaElement.cpp     | 7 -------
 dom/media/ChannelMediaDecoder.cpp | 3 +++
 dom/media/MediaDecoder.cpp        | 7 +------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
index dc03c8be38c2..83ef8867c016 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -6010,13 +6010,6 @@ HTMLMediaElement::UpdateReadyStateInternal()
   if (nextFrameStatus == NEXT_FRAME_UNAVAILABLE_BUFFERING) {
     // Force HAVE_CURRENT_DATA when buffering.
     ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_CURRENT_DATA);
-    if (mDecoder) {
-      // The side effect of CanPlayThrough() will update mCanPlayThrough of
-      // MDSM so it has a chance to exit buffering quickly.
-      // TODO: This implicit coupling is bad. Refactoring should be done
-      // to remove the side effect of CanPlayThrough().
-      mDecoder->CanPlayThrough();
-    }
     return;
   }
 
diff --git a/dom/media/ChannelMediaDecoder.cpp b/dom/media/ChannelMediaDecoder.cpp
index 22b32ec8ae75..3e806effa068 100644
--- a/dom/media/ChannelMediaDecoder.cpp
+++ b/dom/media/ChannelMediaDecoder.cpp
@@ -354,6 +354,9 @@ ChannelMediaDecoder::DownloadProgressed()
   ComputePlaybackRate();
   UpdatePlaybackRate();
   mResource->ThrottleReadahead(ShouldThrottleDownload());
+  // Note GetStatistics() depends on the side effect of ComputePlaybackRate().
+  MediaStatistics stats = GetStatistics();
+  GetStateMachine()->DispatchCanPlayThrough(stats.CanPlayThrough());
 }
 
 void
diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index 06a57ac74473..ea48115514b3 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -1416,12 +1416,7 @@ MediaDecoder::CanPlayThrough()
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_DIAGNOSTIC_ASSERT(!IsShutdown());
   AbstractThread::AutoEnter context(AbstractMainThread());
-  bool val = CanPlayThroughImpl();
-  if (val != mCanPlayThrough) {
-    mCanPlayThrough = val;
-    mDecoderStateMachine->DispatchCanPlayThrough(val);
-  }
-  return val;
+  return CanPlayThroughImpl();
 }
 
 RefPtr<SetCDMPromise>

From d1dc9d3976b44a1d202f87e8fbddba6f46ccadae Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Fri, 1 Dec 2017 14:36:35 +0800
Subject: [PATCH 176/219] Bug 1422677. P3 - pass a MediaStatistics to
 ShouldThrottleDownload(). r=bechen,gerald

So it won't have to call GetStatistics() again.

MozReview-Commit-ID: 1tRnRHAiX4L

--HG--
extra : rebase_source : 4e2d3c4eb6f149fded9c9ba05872a72c55fad05b
---
 dom/media/ChannelMediaDecoder.cpp | 11 +++++------
 dom/media/ChannelMediaDecoder.h   |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dom/media/ChannelMediaDecoder.cpp b/dom/media/ChannelMediaDecoder.cpp
index 3e806effa068..9fa863847e90 100644
--- a/dom/media/ChannelMediaDecoder.cpp
+++ b/dom/media/ChannelMediaDecoder.cpp
@@ -353,10 +353,10 @@ ChannelMediaDecoder::DownloadProgressed()
   GetOwner()->DownloadProgressed();
   ComputePlaybackRate();
   UpdatePlaybackRate();
-  mResource->ThrottleReadahead(ShouldThrottleDownload());
   // Note GetStatistics() depends on the side effect of ComputePlaybackRate().
   MediaStatistics stats = GetStatistics();
   GetStateMachine()->DispatchCanPlayThrough(stats.CanPlayThrough());
+  mResource->ThrottleReadahead(ShouldThrottleDownload(stats));
 }
 
 void
@@ -415,7 +415,7 @@ ChannelMediaDecoder::GetStatistics()
 }
 
 bool
-ChannelMediaDecoder::ShouldThrottleDownload()
+ChannelMediaDecoder::ShouldThrottleDownload(const MediaStatistics& aStats)
 {
   // We throttle the download if either the throttle override pref is set
   // (so that we can always throttle in Firefox on mobile) or if the download
@@ -423,7 +423,7 @@ ChannelMediaDecoder::ShouldThrottleDownload()
   MOZ_ASSERT(NS_IsMainThread());
   NS_ENSURE_TRUE(GetStateMachine(), false);
 
-  int64_t length = mResource->GetLength();
+  int64_t length = aStats.mTotalBytes;
   if (length > 0 &&
       length <= int64_t(MediaPrefs::MediaMemoryCacheMaxSize()) * 1024) {
     // Don't throttle the download of small resources. This is to speed
@@ -437,13 +437,12 @@ ChannelMediaDecoder::ShouldThrottleDownload()
     return true;
   }
 
-  MediaStatistics stats = GetStatistics();
-  if (!stats.mDownloadRateReliable || !stats.mPlaybackRateReliable) {
+  if (!aStats.mDownloadRateReliable || !aStats.mPlaybackRateReliable) {
     return false;
   }
   uint32_t factor =
     std::max(2u, Preferences::GetUint("media.throttle-factor", 2));
-  return stats.mDownloadRate > factor * stats.mPlaybackRate;
+  return aStats.mDownloadRate > factor * aStats.mPlaybackRate;
 }
 
 void
diff --git a/dom/media/ChannelMediaDecoder.h b/dom/media/ChannelMediaDecoder.h
index cb499ef7cacc..55b9068be2cc 100644
--- a/dom/media/ChannelMediaDecoder.h
+++ b/dom/media/ChannelMediaDecoder.h
@@ -131,7 +131,7 @@ private:
   // at any time.
   MediaStatistics GetStatistics();
 
-  bool ShouldThrottleDownload();
+  bool ShouldThrottleDownload(const MediaStatistics& aStats);
 
   // Data needed to estimate playback data rate. The timeline used for
   // this estimate is "decode time" (where the "current time" is the

From 19a55c6ba77da12f5364334f2e71d701765296fc Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Fri, 1 Dec 2017 14:44:34 +0800
Subject: [PATCH 177/219] Bug 1422677. P4 - remove the call to
 ComputePlaybackRate() from OnPlaybackEvent(). r=bechen,gerald

It should be called explicitly for anyone that wants its side effect.

MozReview-Commit-ID: EHiPjklV6oZ

--HG--
extra : rebase_source : bb7b0138698448f1064e90b0318637db969b1527
---
 dom/media/ChannelMediaDecoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/media/ChannelMediaDecoder.cpp b/dom/media/ChannelMediaDecoder.cpp
index 9fa863847e90..493edacfac96 100644
--- a/dom/media/ChannelMediaDecoder.cpp
+++ b/dom/media/ChannelMediaDecoder.cpp
@@ -294,6 +294,7 @@ ChannelMediaDecoder::CanPlayThroughImpl()
 {
   MOZ_ASSERT(NS_IsMainThread());
   NS_ENSURE_TRUE(GetStateMachine(), false);
+  ComputePlaybackRate();
   return GetStatistics().CanPlayThrough();
 }
 
@@ -324,7 +325,6 @@ ChannelMediaDecoder::OnPlaybackEvent(MediaPlaybackEvent&& aEvent)
       mPlaybackStatistics.AddBytes(newPos - mPlaybackPosition);
       mPlaybackPosition = newPos;
       mPlaybackStatistics.Stop();
-      ComputePlaybackRate();
       break;
     }
     default:

From e6e0f6315474dcc05ec98d21cf895b74be9cd2bc Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Fri, 1 Dec 2017 15:05:25 +0800
Subject: [PATCH 178/219] Bug 1422677. P5 - remove mPlaybackBytesPerSecond and
 mPlaybackRateReliable by removing the side effect of ComputePlaybackRate().
 r=bechen,gerald

MozReview-Commit-ID: BbCdsLXHT9d

--HG--
extra : rebase_source : c5a538b16ef91e20a54f2f645d8d5e0c88462b97
---
 dom/media/ChannelMediaDecoder.cpp | 38 +++++++++++++------------------
 dom/media/ChannelMediaDecoder.h   | 17 +++++++-------
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/dom/media/ChannelMediaDecoder.cpp b/dom/media/ChannelMediaDecoder.cpp
index 493edacfac96..741829f99bd1 100644
--- a/dom/media/ChannelMediaDecoder.cpp
+++ b/dom/media/ChannelMediaDecoder.cpp
@@ -274,8 +274,7 @@ ChannelMediaDecoder::NotifyDownloadEnded(nsresult aStatus)
 
   MediaDecoderOwner* owner = GetOwner();
   if (NS_SUCCEEDED(aStatus) || aStatus == NS_BASE_STREAM_CLOSED) {
-    ComputePlaybackRate();
-    UpdatePlaybackRate();
+    UpdatePlaybackRate(ComputePlaybackRate());
     owner->DownloadSuspended();
     // NotifySuspendedStatusChanged will tell the element that download
     // has been suspended "by the cache", which is true since we never
@@ -294,8 +293,7 @@ ChannelMediaDecoder::CanPlayThroughImpl()
 {
   MOZ_ASSERT(NS_IsMainThread());
   NS_ENSURE_TRUE(GetStateMachine(), false);
-  ComputePlaybackRate();
-  return GetStatistics().CanPlayThrough();
+  return GetStatistics(ComputePlaybackRate()).CanPlayThrough();
 }
 
 bool
@@ -340,8 +338,7 @@ ChannelMediaDecoder::DurationChanged()
   AbstractThread::AutoEnter context(AbstractMainThread());
   MediaDecoder::DurationChanged();
   // Duration has changed so we should recompute playback rate
-  ComputePlaybackRate();
-  UpdatePlaybackRate();
+  UpdatePlaybackRate(ComputePlaybackRate());
 }
 
 void
@@ -351,15 +348,14 @@ ChannelMediaDecoder::DownloadProgressed()
   MOZ_DIAGNOSTIC_ASSERT(!IsShutdown());
   AbstractThread::AutoEnter context(AbstractMainThread());
   GetOwner()->DownloadProgressed();
-  ComputePlaybackRate();
-  UpdatePlaybackRate();
-  // Note GetStatistics() depends on the side effect of ComputePlaybackRate().
-  MediaStatistics stats = GetStatistics();
+  auto rate = ComputePlaybackRate();
+  UpdatePlaybackRate(rate);
+  MediaStatistics stats = GetStatistics(rate);
   GetStateMachine()->DispatchCanPlayThrough(stats.CanPlayThrough());
   mResource->ThrottleReadahead(ShouldThrottleDownload(stats));
 }
 
-void
+ChannelMediaDecoder::PlaybackRateInfo
 ChannelMediaDecoder::ComputePlaybackRate()
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -367,25 +363,23 @@ ChannelMediaDecoder::ComputePlaybackRate()
 
   int64_t length = mResource->GetLength();
   if (mozilla::IsFinite<double>(mDuration) && mDuration > 0 && length >= 0) {
-    mPlaybackRateReliable = true;
-    mPlaybackBytesPerSecond = length / mDuration;
-    return;
+    return { uint32_t(length / mDuration), true };
   }
 
   bool reliable = false;
-  mPlaybackBytesPerSecond = mPlaybackStatistics.GetRate(&reliable);
-  mPlaybackRateReliable = reliable;
+  uint32_t rate = mPlaybackStatistics.GetRate(&reliable);
+  return { rate, reliable };
 }
 
 void
-ChannelMediaDecoder::UpdatePlaybackRate()
+ChannelMediaDecoder::UpdatePlaybackRate(const PlaybackRateInfo& aInfo)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(mResource);
 
-  uint32_t rate = mPlaybackBytesPerSecond;
+  uint32_t rate = aInfo.mRate;
 
-  if (mPlaybackRateReliable) {
+  if (aInfo.mReliable) {
     // Avoid passing a zero rate
     rate = std::max(rate, 1u);
   } else {
@@ -398,7 +392,7 @@ ChannelMediaDecoder::UpdatePlaybackRate()
 }
 
 MediaStatistics
-ChannelMediaDecoder::GetStatistics()
+ChannelMediaDecoder::GetStatistics(const PlaybackRateInfo& aInfo)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(mResource);
@@ -408,8 +402,8 @@ ChannelMediaDecoder::GetStatistics()
     mResource->GetDownloadRate(&result.mDownloadRateReliable);
   result.mDownloadPosition = mResource->GetCachedDataEnd(mPlaybackPosition);
   result.mTotalBytes = mResource->GetLength();
-  result.mPlaybackRate = mPlaybackBytesPerSecond;
-  result.mPlaybackRateReliable = mPlaybackRateReliable;
+  result.mPlaybackRate = aInfo.mRate;
+  result.mPlaybackRateReliable = aInfo.mReliable;
   result.mPlaybackPosition = mPlaybackPosition;
   return result;
 }
diff --git a/dom/media/ChannelMediaDecoder.h b/dom/media/ChannelMediaDecoder.h
index 55b9068be2cc..a818bd0f0ab5 100644
--- a/dom/media/ChannelMediaDecoder.h
+++ b/dom/media/ChannelMediaDecoder.h
@@ -118,18 +118,23 @@ private:
 
   bool IsLiveStream() override final;
 
+  struct PlaybackRateInfo
+  {
+    uint32_t mRate; // Estimate of the current playback rate (bytes/second).
+    bool mReliable; // True if mRate is a reliable estimate.
+  };
   // The actual playback rate computation.
-  void ComputePlaybackRate();
+  PlaybackRateInfo ComputePlaybackRate();
 
   // Something has changed that could affect the computed playback rate,
   // so recompute it.
-  void UpdatePlaybackRate();
+  void UpdatePlaybackRate(const PlaybackRateInfo& aInfo);
 
   // Return statistics. This is used for progress events and other things.
   // This can be called from any thread. It's only a snapshot of the
   // current state, since other threads might be changing the state
   // at any time.
-  MediaStatistics GetStatistics();
+  MediaStatistics GetStatistics(const PlaybackRateInfo& aInfo);
 
   bool ShouldThrottleDownload(const MediaStatistics& aStats);
 
@@ -138,12 +143,6 @@ private:
   // time of the last decoded video frame).
   MediaChannelStatistics mPlaybackStatistics;
 
-  // Estimate of the current playback rate (bytes/second).
-  double mPlaybackBytesPerSecond = 0;
-
-  // True if mPlaybackBytesPerSecond is a reliable estimate.
-  bool mPlaybackRateReliable = true;
-
   // True when our media stream has been pinned. We pin the stream
   // while seeking.
   bool mPinnedForSeek = false;

From 5343debb6aba39bb00e3dc3b16c0d116fa223879 Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Mon, 4 Dec 2017 14:59:31 +0200
Subject: [PATCH 179/219] Backed out 3 changesets (bug 1417837) for failing
 browser/chrome/test_media_playback.html r=backout on a CLOSED TREE

Backed out changeset 9556f12b4058 (bug 1417837)
Backed out changeset 49a463e85e42 (bug 1417837)
Backed out changeset 7a76f2363663 (bug 1417837)
---
 mobile/android/themes/core/aboutReader.css    | 427 +-----------
 .../themes/core/aboutReaderContent.css        | 114 ++++
 .../themes/core/aboutReaderControls.css       | 292 +++++++++
 mobile/android/themes/core/jar.mn             |   4 +
 .../components/narrate/NarrateControls.jsm    | 104 +--
 toolkit/components/narrate/Narrator.jsm       |   2 +-
 .../narrate/test/NarrateTestUtils.jsm         |  24 +-
 .../printing/content/simplifyMode.css         |   8 +-
 toolkit/components/reader/AboutReader.jsm     |  65 +-
 toolkit/components/reader/ReaderMode.jsm      |  19 +-
 toolkit/components/reader/ReaderWorker.js     |   5 +-
 .../reader/content/aboutReader.html           |  62 +-
 .../test/browser_readerMode_readingTime.js    |   6 +-
 toolkit/content/browser-content.js            |   6 +
 toolkit/themes/shared/aboutReader.css         | 614 +-----------------
 toolkit/themes/shared/aboutReaderContent.css  | 178 +++++
 toolkit/themes/shared/aboutReaderControls.css | 394 +++++++++++
 toolkit/themes/shared/jar.inc.mn              |   5 +-
 toolkit/themes/shared/narrate.css             | 190 ------
 toolkit/themes/shared/narrateControls.css     | 186 ++++++
 20 files changed, 1352 insertions(+), 1353 deletions(-)
 create mode 100644 mobile/android/themes/core/aboutReaderContent.css
 create mode 100644 mobile/android/themes/core/aboutReaderControls.css
 create mode 100644 toolkit/themes/shared/aboutReaderContent.css
 create mode 100644 toolkit/themes/shared/aboutReaderControls.css
 create mode 100644 toolkit/themes/shared/narrateControls.css

diff --git a/mobile/android/themes/core/aboutReader.css b/mobile/android/themes/core/aboutReader.css
index 28b31daff75f..2df2d1ff6206 100644
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* Avoid adding ID selector rules in this style sheet, since they could
- * inadvertently match elements in the article content. */
-
 html {
   -moz-text-size-adjust: none;
 }
@@ -36,39 +33,39 @@ body.serif {
   font-family: serif;
 }
 
-.container.font-size1 {
+#container.font-size1 {
   font-size: 10px;
 }
 
-.container.font-size2 {
+#container.font-size2 {
   font-size: 12px;
 }
 
-.container.font-size3 {
+#container.font-size3 {
   font-size: 14px;
 }
 
-.container.font-size4  {
+#container.font-size4  {
   font-size: 16px;
 }
 
-.container.font-size5 {
+#container.font-size5 {
   font-size: 18px;
 }
 
-.container.font-size6 {
+#container.font-size6 {
   font-size: 20px;
 }
 
-.container.font-size7 {
+#container.font-size7 {
   font-size: 22px;
 }
 
-.container.font-size8 {
+#container.font-size8 {
   font-size: 24px;
 }
 
-.container.font-size9 {
+#container.font-size9 {
   font-size: 26px;
 }
 
@@ -121,409 +118,3 @@ body.dark > .container > .content blockquote {
   color: #aaaaaa !important;
   border-left-color: #777777 !important;
 }
-
-.reader-message {
-  margin-top: 40px;
-  display: none;
-  text-align: center;
-  width: 100%;
-  font-size: 0.9em;
-}
-
-.header {
-  text-align: start;
-  display: none;
-}
-
-.domain,
-.credits {
-  font-size: 0.9em;
-  font-family: sans-serif;
-}
-
-.domain {
-  margin-top: 10px;
-  padding-bottom: 10px;
-  color: #00acff !important;
-  text-decoration: none;
-}
-
-.domain-border {
-  margin-top: 15px;
-  border-bottom: 1.5px solid #777777;
-  width: 50%;
-}
-
-.header > h1 {
-  font-size: 1.33em;
-  font-weight: 700;
-  line-height: 1.1em;
-  width: 100%;
-  margin: 0px;
-  margin-top: 32px;
-  margin-bottom: 16px;
-  padding: 0px;
-}
-
-.header > .credits {
-  padding: 0px;
-  margin: 0px;
-  margin-bottom: 32px;
-}
-
-/*======= Controls toolbar =======*/
-
-.toolbar {
-  font-family: sans-serif;
-  position: fixed;
-  width: 100%;
-  left: 0;
-  margin: 0;
-  padding: 0;
-  bottom: 0;
-  list-style: none;
-  pointer-events: none;
-  transition: opacity 420ms linear;
-}
-
-.toolbar > * {
-  float: right;
-}
-
-.button {
-  width: 56px;
-  height: 56px;
-  display: block;
-  background-position: center;
-  background-size: 26px 16px;
-  background-repeat: no-repeat;
-  background-color: #0979D9;
-  border-radius: 10000px;
-  margin: 20px;
-  border: 0;
-  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
-}
-
-.button:active {
-  background-color: #086ACC;
-}
-
-/* Remove dotted border when button is focused */
-.button::-moz-focus-inner,
-.dropdown-popup > div > button::-moz-focus-inner {
-  border: 0;
-}
-
-.button[hidden],
-.toolbar[hidden] {
-  display: none;
-}
-
-.dropdown-toggle,
-.dropdown-popup {
-  pointer-events: auto;
-}
-
-.dropdown {
-  left: 0;
-  text-align: center;
-  display: inline-block;
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-}
-
-/*======= Font style popup =======*/
-
-.dropdown-popup {
-  position: absolute;
-  left: 0;
-  width: calc(100% - 30px);
-  margin: 15px;
-  z-index: 1000;
-  background: #EBEBF0;
-  visibility: hidden;
-  border: 0;
-  border-radius: 4px;
-  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
-  -moz-user-select: none;
-}
-
-/* Only used on desktop */
-.dropdown-popup > hr,
-.dropdown-arrow,
-.font-type-buttons > button > .name,
-.content-width-buttons,
-.line-height-buttons {
-  display: none;
-}
-
-.open > .dropdown-popup {
-  visibility: visible;
-  bottom: 0;
-}
-
-.font-type-buttons,
-.font-size-buttons,
-.color-scheme-buttons {
-  display: flex;
-  flex-direction: row;
-}
-
-.font-type-buttons > button,
-.color-scheme-buttons > button {
-  text-align: center;
-}
-
-.font-type-buttons > button,
-.font-size-buttons > button {
-  width: 50%;
-  background-color: transparent;
-  border: 0;
-}
-
-.font-type-buttons > button {
-  font-size: 24px;
-  color: #AFB1B3;
-  padding: 15px 0;
-}
-
-.font-type-buttons > button:active,
-.font-type-buttons > button.selected {
-  color: #222222;
-}
-
-.font-size-sample {
-  flex: 0;
-  font-size: 24px;
-  color: #000000;
-  margin: 0 30px;
-  padding: 0 10px;
-}
-
-.serif-button {
-  font-family: serif;
-}
-
-.minus-button,
-.plus-button {
-  background-color: transparent;
-  border: 0;
-  height: 60px;
-  background-size: 18px 18px;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
-.minus-button {
-  background-size: 24px 6px;
-  margin-left: 50px;
-  padding: 0 5px;
-}
-
-.plus-button {
-  background-size: 24px 24px;
-  margin-right: 50px;
-  padding: 0 5px;
-}
-
-.color-scheme-buttons > button {
-  width: 33%;
-  border-radius: 4px;
-  border: 1px solid #BFBFBF;
-  padding: 10px;
-  margin: 15px 10px;
-  font-size: 14px;
-}
-
-.color-scheme-buttons > button:active,
-.color-scheme-buttons > button.selected {
-  border: 2px solid #0A84FF;
-}
-
-.dark-button {
-  color: #eeeeee;
-  background-color: #333333;
-}
-
-.auto-button {
-  color: #000000;
-  background-color: transparent;
-}
-
-.light-button {
-  color: #333333;
-  background-color: #ffffff;
-}
-
-/*======= Toolbar icons =======*/
-
-/* desktop-only controls */
-.close-button {
-  display: none;
-}
-
-.style-button {
-  background-image: url('chrome://browser/skin/images/reader-style-icon-hdpi.png');
-}
-
-.minus-button {
-  background-image: url('chrome://browser/skin/images/reader-minus-hdpi.png');
-}
-
-.plus-button {
-  background-image: url('chrome://browser/skin/images/reader-plus-hdpi.png');
-}
-
-@media screen and (min-resolution: 2dppx) {
-  .style-button {
-    background-image: url('chrome://browser/skin/images/reader-style-icon-xhdpi.png');
-  }
-
-  .minus-button {
-    background-image: url('chrome://browser/skin/images/reader-minus-xhdpi.png');
-  }
-
-  .plus-button {
-    background-image: url('chrome://browser/skin/images/reader-plus-xhdpi.png');
-  }
-}
-
-@media screen and (min-resolution: 3dppx) {
-  .style-button {
-    background-image: url('chrome://browser/skin/images/reader-style-icon-xxhdpi.png');
-  }
-
-  .minus-button {
-    background-image: url('chrome://browser/skin/images/reader-minus-xxhdpi.png');
-  }
-
-  .plus-button {
-    background-image: url('chrome://browser/skin/images/reader-plus-xxhdpi.png');
-  }
-}
-
-@media screen and (min-width: 960px) {
-  .dropdown-popup {
-    width: 350px;
-    left: auto;
-    right: 0;
-  }
-}
-
-/*======= Article content =======*/
-
-/* Note that any class names from the original article that we want to match on
- * must be added to CLASSES_TO_PRESERVE in ReaderMode.jsm, so that
- * Readability.js doesn't strip them out */
-
-.moz-reader-content {
-  display: none;
-  font-size: 1em;
-}
-
-.moz-reader-content a {
-  text-decoration: underline !important;
-  font-weight: normal;
-}
-
-.moz-reader-content a,
-.moz-reader-content a:visited,
-.moz-reader-content a:hover,
-.moz-reader-content a:active {
-  color: #00acff !important;
-}
-
-.moz-reader-content * {
-  max-width: 100% !important;
-  height: auto !important;
-}
-
-.moz-reader-content p {
-  line-height: 1.4em !important;
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-}
-
-/* Covers all images showing edge-to-edge using a 
-   an optional caption text */
-.moz-reader-content .wp-caption,
-.moz-reader-content figure {
-  display: block !important;
-  width: 100% !important;
-  margin: 0px !important;
-  margin-bottom: 32px !important;
-}
-
-/* Images marked to be shown edge-to-edge with an
-   optional captio ntext */
-.moz-reader-content p > img:only-child,
-.moz-reader-content p > a:only-child > img:only-child,
-.moz-reader-content .wp-caption img,
-.moz-reader-content figure img {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-/* Account for body padding to make image full width */
-.moz-reader-content img[moz-reader-full-width] {
-  width: calc(100% + 40px);
-  margin-left: -20px;
-  margin-right: -20px;
-  max-width: none !important;
-}
-
-/* Image caption text */
-.moz-reader-content .caption,
-.moz-reader-content .wp-caption-text,
-.moz-reader-content figcaption {
-  font-size: 0.9em;
-  font-family: sans-serif;
-  margin: 0px !important;
-  padding-top: 4px !important;
-}
-
-/* Ensure all pre-formatted code inside the reader content
-   are properly wrapped inside content width */
-.moz-reader-content code,
-.moz-reader-content pre {
-  white-space: pre-wrap !important;
-  margin-bottom: 20px !important;
-}
-
-.moz-reader-content blockquote {
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-  padding: 0px !important;
-  padding-inline-start: 16px !important;
-  border: 0px !important;
-  border-left: 2px solid !important;
-}
-
-.moz-reader-content ul,
-.moz-reader-content ol {
-  margin: 0px !important;
-  margin-bottom: 20px !important;
-  padding: 0px !important;
-  line-height: 1.5em;
-}
-
-.moz-reader-content ul {
-  padding-inline-start: 30px !important;
-  list-style: disc !important;
-}
-
-.moz-reader-content ol {
-  padding-inline-start: 35px !important;
-  list-style: decimal !important;
-}
-
-/* Hide elements with common "hidden" class names */
-.moz-reader-content .visually-hidden,
-.moz-reader-content .visuallyhidden,
-.moz-reader-content .hidden,
-.moz-reader-content .invisible,
-.moz-reader-content .sr-only {
-  display: none;
-}
diff --git a/mobile/android/themes/core/aboutReaderContent.css b/mobile/android/themes/core/aboutReaderContent.css
new file mode 100644
index 000000000000..fe6451df2f52
--- /dev/null
+++ b/mobile/android/themes/core/aboutReaderContent.css
@@ -0,0 +1,114 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#moz-reader-content {
+  display: none;
+  font-size: 1em;
+}
+
+a {
+  text-decoration: underline !important;
+  font-weight: normal;
+}
+
+a,
+a:visited,
+a:hover,
+a:active {
+  color: #00acff !important;
+}
+
+* {
+  max-width: 100% !important;
+  height: auto !important;
+}
+
+p {
+  line-height: 1.4em !important;
+  margin: 0px !important;
+  margin-bottom: 20px !important;
+}
+
+/* Covers all images showing edge-to-edge using a 
+   an optional caption text */
+.wp-caption,
+figure {
+  display: block !important;
+  width: 100% !important;
+  margin: 0px !important;
+  margin-bottom: 32px !important;
+}
+
+/* Images marked to be shown edge-to-edge with an
+   optional captio ntext */
+p > img:only-child,
+p > a:only-child > img:only-child,
+.wp-caption img,
+figure img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+/* Account for body padding to make image full width */
+img[moz-reader-full-width] {
+  width: calc(100% + 40px);
+  margin-left: -20px;
+  margin-right: -20px;
+  max-width: none !important;
+}
+
+/* Image caption text */
+.caption,
+.wp-caption-text,
+figcaption {
+  font-size: 0.9em;
+  font-family: sans-serif;
+  margin: 0px !important;
+  padding-top: 4px !important;
+}
+
+/* Ensure all pre-formatted code inside the reader content
+   are properly wrapped inside content width */
+code,
+pre {
+  white-space: pre-wrap !important;
+  margin-bottom: 20px !important;
+}
+
+blockquote {
+  margin: 0px !important;
+  margin-bottom: 20px !important;
+  padding: 0px !important;
+  padding-inline-start: 16px !important;
+  border: 0px !important;
+  border-left: 2px solid !important;
+}
+
+ul,
+ol {
+  margin: 0px !important;
+  margin-bottom: 20px !important;
+  padding: 0px !important;
+  line-height: 1.5em;
+}
+
+ul {
+  padding-inline-start: 30px !important;
+  list-style: disc !important;
+}
+
+ol {
+  padding-inline-start: 35px !important;
+  list-style: decimal !important;
+}
+
+/* Hide elements with common "hidden" class names */
+.visually-hidden,
+.visuallyhidden,
+.hidden,
+.invisible,
+.sr-only {
+  display: none;
+}
diff --git a/mobile/android/themes/core/aboutReaderControls.css b/mobile/android/themes/core/aboutReaderControls.css
new file mode 100644
index 000000000000..4bfae9cb0da6
--- /dev/null
+++ b/mobile/android/themes/core/aboutReaderControls.css
@@ -0,0 +1,292 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#reader-message {
+  margin-top: 40px;
+  display: none;
+  text-align: center;
+  width: 100%;
+  font-size: 0.9em;
+}
+
+.header {
+  text-align: start;
+  display: none;
+}
+
+.domain,
+.credits {
+  font-size: 0.9em;
+  font-family: sans-serif;
+}
+
+.domain {
+  margin-top: 10px;
+  padding-bottom: 10px;
+  color: #00acff !important;
+  text-decoration: none;
+}
+
+.domain-border {
+  margin-top: 15px;
+  border-bottom: 1.5px solid #777777;
+  width: 50%;
+}
+
+.header > h1 {
+  font-size: 1.33em;
+  font-weight: 700;
+  line-height: 1.1em;
+  width: 100%;
+  margin: 0px;
+  margin-top: 32px;
+  margin-bottom: 16px;
+  padding: 0px;
+}
+
+.header > .credits {
+  padding: 0px;
+  margin: 0px;
+  margin-bottom: 32px;
+}
+
+/*======= Controls toolbar =======*/
+
+.toolbar {
+  font-family: sans-serif;
+  position: fixed;
+  width: 100%;
+  left: 0;
+  margin: 0;
+  padding: 0;
+  bottom: 0;
+  list-style: none;
+  pointer-events: none;
+  transition: opacity 420ms linear;
+}
+
+.toolbar > * {
+  float: right;
+}
+
+.button {
+  width: 56px;
+  height: 56px;
+  display: block;
+  background-position: center;
+  background-size: 26px 16px;
+  background-repeat: no-repeat;
+  background-color: #0979D9;
+  border-radius: 10000px;
+  margin: 20px;
+  border: 0;
+  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
+}
+
+.button:active {
+  background-color: #086ACC;
+}
+
+/* Remove dotted border when button is focused */
+.button::-moz-focus-inner,
+.dropdown-popup > div > button::-moz-focus-inner {
+  border: 0;
+}
+
+.button[hidden],
+.toolbar[hidden] {
+  display: none;
+}
+
+.dropdown-toggle,
+#reader-popup {
+  pointer-events: auto;
+}
+
+.dropdown {
+  left: 0;
+  text-align: center;
+  display: inline-block;
+  list-style: none;
+  margin: 0px;
+  padding: 0px;
+}
+
+/*======= Font style popup =======*/
+
+.dropdown-popup {
+  position: absolute;
+  left: 0;
+  width: calc(100% - 30px);
+  margin: 15px;
+  z-index: 1000;
+  background: #EBEBF0;
+  visibility: hidden;
+  border: 0;
+  border-radius: 4px;
+  box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.40);
+  -moz-user-select: none;
+}
+
+/* Only used on desktop */
+.dropdown-popup > hr,
+.dropdown-arrow,
+#font-type-buttons > button > .name,
+#content-width-buttons,
+#line-height-buttons {
+  display: none;
+}
+
+.open > .dropdown-popup {
+  visibility: visible;
+  bottom: 0;
+}
+
+#font-type-buttons,
+#font-size-buttons,
+#color-scheme-buttons {
+  display: flex;
+  flex-direction: row;
+}
+
+#font-type-buttons > button,
+#color-scheme-buttons > button {
+  text-align: center;
+}
+
+#font-type-buttons > button,
+#font-size-buttons > button {
+  width: 50%;
+  background-color: transparent;
+  border: 0;
+}
+
+#font-type-buttons > button {
+  font-size: 24px;
+  color: #AFB1B3;
+  padding: 15px 0;
+}
+
+#font-type-buttons > button:active,
+#font-type-buttons > button.selected {
+  color: #222222;
+}
+
+#font-size-sample {
+  flex: 0;
+  font-size: 24px;
+  color: #000000;
+  margin: 0 30px;
+  padding: 0 10px;
+}
+
+.serif-button {
+  font-family: serif;
+}
+
+.minus-button,
+.plus-button {
+  background-color: transparent;
+  border: 0;
+  height: 60px;
+  background-size: 18px 18px;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+.minus-button {
+  background-size: 24px 6px;
+  margin-left: 50px;
+  padding: 0 5px;
+}
+
+.plus-button {
+  background-size: 24px 24px;
+  margin-right: 50px;
+  padding: 0 5px;
+}
+
+#color-scheme-buttons > button {
+  width: 33%;
+  border-radius: 4px;
+  border: 1px solid #BFBFBF;
+  padding: 10px;
+  margin: 15px 10px;
+  font-size: 14px;
+}
+
+#color-scheme-buttons > button:active,
+#color-scheme-buttons > button.selected {
+  border: 2px solid #0A84FF;
+}
+
+.dark-button {
+  color: #eeeeee;
+  background-color: #333333;
+}
+
+.auto-button {
+  color: #000000;
+  background-color: transparent;
+}
+
+.light-button {
+  color: #333333;
+  background-color: #ffffff;
+}
+
+/*======= Toolbar icons =======*/
+
+/* desktop-only controls */
+.close-button {
+  display: none;
+}
+
+.style-button {
+  background-image: url('chrome://browser/skin/images/reader-style-icon-hdpi.png');
+}
+
+.minus-button {
+  background-image: url('chrome://browser/skin/images/reader-minus-hdpi.png');
+}
+
+.plus-button {
+  background-image: url('chrome://browser/skin/images/reader-plus-hdpi.png');
+}
+
+@media screen and (min-resolution: 2dppx) {
+  .style-button {
+    background-image: url('chrome://browser/skin/images/reader-style-icon-xhdpi.png');
+  }
+
+  .minus-button {
+    background-image: url('chrome://browser/skin/images/reader-minus-xhdpi.png');
+  }
+
+  .plus-button {
+    background-image: url('chrome://browser/skin/images/reader-plus-xhdpi.png');
+  }
+}
+
+@media screen and (min-resolution: 3dppx) {
+  .style-button {
+    background-image: url('chrome://browser/skin/images/reader-style-icon-xxhdpi.png');
+  }
+
+  .minus-button {
+    background-image: url('chrome://browser/skin/images/reader-minus-xxhdpi.png');
+  }
+
+  .plus-button {
+    background-image: url('chrome://browser/skin/images/reader-plus-xxhdpi.png');
+  }
+}
+
+@media screen and (min-width: 960px) {
+  .dropdown-popup {
+    width: 350px;
+    left: auto;
+    right: 0;
+  }
+}
diff --git a/mobile/android/themes/core/jar.mn b/mobile/android/themes/core/jar.mn
index c07c0de67b55..560bb6f319db 100644
--- a/mobile/android/themes/core/jar.mn
+++ b/mobile/android/themes/core/jar.mn
@@ -15,6 +15,8 @@ chrome.jar:
   skin/aboutMemory.css                      (aboutMemory.css)
   skin/aboutPrivateBrowsing.css             (aboutPrivateBrowsing.css)
   skin/aboutReader.css                      (aboutReader.css)
+  skin/aboutReaderContent.css               (aboutReaderContent.css)
+  skin/aboutReaderControls.css              (aboutReaderControls.css)
   skin/aboutSupport.css                     (aboutSupport.css)
   skin/config.css                           (config.css)
   skin/defines.css                          (defines.css)
@@ -23,6 +25,8 @@ chrome.jar:
 % override chrome://global/skin/about.css chrome://browser/skin/about.css
 % override chrome://global/skin/aboutMemory.css chrome://browser/skin/aboutMemory.css
 % override chrome://global/skin/aboutReader.css chrome://browser/skin/aboutReader.css
+% override chrome://global/skin/aboutReaderContent.css chrome://browser/skin/aboutReaderContent.css
+% override chrome://global/skin/aboutReaderControls.css chrome://browser/skin/aboutReaderControls.css
 % override chrome://global/skin/aboutSupport.css chrome://browser/skin/aboutSupport.css
 % override chrome://global/skin/netError.css chrome://browser/skin/netError.css
 
diff --git a/toolkit/components/narrate/NarrateControls.jsm b/toolkit/components/narrate/NarrateControls.jsm
index 828292cc2b41..35c2b0bccf99 100644
--- a/toolkit/components/narrate/NarrateControls.jsm
+++ b/toolkit/components/narrate/NarrateControls.jsm
@@ -38,12 +38,17 @@ function NarrateControls(mm, win, languagePromise) {
   }
 
   let dropdown = win.document.createElement("ul");
-  dropdown.className = "dropdown narrate-dropdown";
+  dropdown.className = "dropdown";
+  dropdown.id = "narrate-dropdown";
   // We need inline svg here for the animation to work (bug 908634 & 1190881).
+  // The style animation can't be scoped (bug 830056).
   // eslint-disable-next-line no-unsanitized/property
   dropdown.innerHTML =
-    localize`<li>
-       <button class="dropdown-toggle button narrate-toggle"
+    localize`<style scoped>
+      @import url("chrome://global/skin/narrateControls.css");
+    </style>
+    <li>
+       <button class="dropdown-toggle button" id="narrate-toggle"
                title="${"narrate"}" hidden>
          <svg xmlns="http://www.w3.org/2000/svg"
               xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -57,11 +62,11 @@ function NarrateControls(mm, win, languagePromise) {
               100% { transform: scaleY(1);   }
             }
 
-            .waveform > rect {
+            #waveform > rect {
               fill: #808080;
             }
 
-            .speaking .waveform > rect {
+            .speaking #waveform > rect {
               fill: #58bf43;
               transform-box: fill-box;
               transform-origin: 50% 50%;
@@ -71,15 +76,15 @@ function NarrateControls(mm, win, languagePromise) {
               animation-timing-function: linear;
             }
 
-            .waveform > rect:nth-child(2) { animation-delay: 250ms; }
-            .waveform > rect:nth-child(3) { animation-delay: 500ms; }
-            .waveform > rect:nth-child(4) { animation-delay: 750ms; }
-            .waveform > rect:nth-child(5) { animation-delay: 1000ms; }
-            .waveform > rect:nth-child(6) { animation-delay: 1250ms; }
-            .waveform > rect:nth-child(7) { animation-delay: 1500ms; }
+            #waveform > rect:nth-child(2) { animation-delay: 250ms; }
+            #waveform > rect:nth-child(3) { animation-delay: 500ms; }
+            #waveform > rect:nth-child(4) { animation-delay: 750ms; }
+            #waveform > rect:nth-child(5) { animation-delay: 1000ms; }
+            #waveform > rect:nth-child(6) { animation-delay: 1250ms; }
+            #waveform > rect:nth-child(7) { animation-delay: 1500ms; }
 
           </style>
-          <g class="waveform">
+          <g id="waveform">
             <rect x="1"  y="8" width="2" height="8"  rx=".5" ry=".5" />
             <rect x="4"  y="5" width="2" height="14" rx=".5" ry=".5" />
             <rect x="7"  y="8" width="2" height="8"  rx=".5" ry=".5" />
@@ -92,18 +97,18 @@ function NarrateControls(mm, win, languagePromise) {
         </button>
     </li>
     <li class="dropdown-popup">
-      <div class="narrate-row narrate-control">
-        <button disabled class="narrate-skip-previous"
+      <div id="narrate-control" class="narrate-row">
+        <button disabled id="narrate-skip-previous"
                 title="${"back"}"></button>
-        <button class="narrate-start-stop" title="${"start"}"></button>
-        <button disabled class="narrate-skip-next"
+        <button id="narrate-start-stop" title="${"start"}"></button>
+        <button disabled id="narrate-skip-next"
                 title="${"forward"}"></button>
       </div>
-      <div class="narrate-row narrate-rate">
-        <input class="narrate-rate-input" value="0" title="${"speed"}"
+      <div id="narrate-rate" class="narrate-row">
+        <input id="narrate-rate-input" value="0" title="${"speed"}"
                step="5" max="100" min="-100" type="range">
       </div>
-      <div class="narrate-row narrate-voices"></div>
+      <div id="narrate-voices" class="narrate-row"></div>
       <div class="dropdown-arrow"></div>
     </li>`;
 
@@ -113,14 +118,14 @@ function NarrateControls(mm, win, languagePromise) {
   let selectLabel = gStrings.GetStringFromName("selectvoicelabel");
   this.voiceSelect = new VoiceSelect(win, selectLabel);
   this.voiceSelect.element.addEventListener("change", this);
-  this.voiceSelect.element.classList.add("voice-select");
+  this.voiceSelect.element.id = "voice-select";
   win.speechSynthesis.addEventListener("voiceschanged", this);
-  dropdown.querySelector(".narrate-voices").appendChild(
+  dropdown.querySelector("#narrate-voices").appendChild(
     this.voiceSelect.element);
 
   dropdown.addEventListener("click", this, true);
 
-  let rateRange = dropdown.querySelector(".narrate-rate > input");
+  let rateRange = dropdown.querySelector("#narrate-rate > input");
   rateRange.addEventListener("change", this);
 
   // The rate is stored as an integer.
@@ -128,7 +133,7 @@ function NarrateControls(mm, win, languagePromise) {
 
   this._setupVoices();
 
-  let tb = win.document.querySelector(".reader-toolbar");
+  let tb = win.document.getElementById("reader-toolbar");
   tb.appendChild(dropdown);
 }
 
@@ -136,7 +141,7 @@ NarrateControls.prototype = {
   handleEvent(evt) {
     switch (evt.type) {
       case "change":
-        if (evt.target.classList.contains("narrate-rate-input")) {
+        if (evt.target.id == "narrate-rate-input") {
           this._onRateInput(evt);
         } else {
           this._onVoiceChange();
@@ -187,7 +192,7 @@ NarrateControls.prototype = {
         this.voiceSelect.addOptions(options);
       }
 
-      let narrateToggle = win.document.querySelector(".narrate-toggle");
+      let narrateToggle = win.document.getElementById("narrate-toggle");
       let histogram = Services.telemetry.getKeyedHistogramById(
         "NARRATE_CONTENT_BY_LANGUAGE_2");
       let initial = !this._voicesInitialized;
@@ -234,38 +239,41 @@ NarrateControls.prototype = {
   },
 
   _onButtonClick(evt) {
-    let classList = evt.target.classList;
-    if (classList.contains("narrate-skip-previous")) {
-      this.narrator.skipPrevious();
-    } else if (classList.contains("narrate-skip-next")) {
-      this.narrator.skipNext();
-    } else if (classList.contains("narrate-start-stop")) {
-      if (this.narrator.speaking) {
-        this.narrator.stop();
-      } else {
-        this._updateSpeechControls(true);
-        let options = { rate: this.rate, voice: this.voice };
-        this.narrator.start(options).then(() => {
-          this._updateSpeechControls(false);
-        }, err => {
-          Cu.reportError(`Narrate failed: ${err}.`);
-          this._updateSpeechControls(false);
-        });
-      }
+    switch (evt.target.id) {
+      case "narrate-skip-previous":
+        this.narrator.skipPrevious();
+        break;
+      case "narrate-skip-next":
+        this.narrator.skipNext();
+        break;
+      case "narrate-start-stop":
+        if (this.narrator.speaking) {
+          this.narrator.stop();
+        } else {
+          this._updateSpeechControls(true);
+          let options = { rate: this.rate, voice: this.voice };
+          this.narrator.start(options).then(() => {
+            this._updateSpeechControls(false);
+          }, err => {
+            Cu.reportError(`Narrate failed: ${err}.`);
+            this._updateSpeechControls(false);
+          });
+        }
+        break;
     }
   },
 
   _updateSpeechControls(speaking) {
-    let dropdown = this._doc.querySelector(".narrate-dropdown");
+    let dropdown = this._doc.getElementById("narrate-dropdown");
     dropdown.classList.toggle("keep-open", speaking);
     dropdown.classList.toggle("speaking", speaking);
 
-    let startStopButton = this._doc.querySelector(".narrate-start-stop");
+    let startStopButton = this._doc.getElementById("narrate-start-stop");
     startStopButton.title =
       gStrings.GetStringFromName(speaking ? "stop" : "start");
 
-    this._doc.querySelector(".narrate-skip-previous").disabled = !speaking;
-    this._doc.querySelector(".narrate-skip-next").disabled = !speaking;
+    this._doc.getElementById("narrate-skip-previous").disabled = !speaking;
+    this._doc.getElementById("narrate-skip-next").disabled = !speaking;
 
     if (speaking) {
       TelemetryStopwatch.start("NARRATE_CONTENT_SPEAKTIME_MS", this);
@@ -328,7 +336,7 @@ NarrateControls.prototype = {
 
   get rate() {
     return this._convertRate(
-      this._doc.querySelector(".narrate-rate-input").value);
+      this._doc.getElementById("narrate-rate-input").value);
   },
 
   get voice() {
diff --git a/toolkit/components/narrate/Narrator.jsm b/toolkit/components/narrate/Narrator.jsm
index ac0b2e040807..4fecd383ce61 100644
--- a/toolkit/components/narrate/Narrator.jsm
+++ b/toolkit/components/narrate/Narrator.jsm
@@ -89,7 +89,7 @@ Narrator.prototype = {
       // are no other strong references, and it will be GC'ed. Instead,
       // we rely on the window's lifetime and use it as a weak reference.
       this._treeWalkerRef.set(this._win,
-        this._doc.createTreeWalker(this._doc.querySelector(".container"),
+        this._doc.createTreeWalker(this._doc.getElementById("container"),
           nf.SHOW_ELEMENT, filter, false));
     }
 
diff --git a/toolkit/components/narrate/test/NarrateTestUtils.jsm b/toolkit/components/narrate/test/NarrateTestUtils.jsm
index b1f31ae675b1..3a030497d23d 100644
--- a/toolkit/components/narrate/test/NarrateTestUtils.jsm
+++ b/toolkit/components/narrate/test/NarrateTestUtils.jsm
@@ -12,17 +12,17 @@ Cu.import("resource://testing-common/ContentTaskUtils.jsm");
 this.EXPORTED_SYMBOLS = [ "NarrateTestUtils" ];
 
 this.NarrateTestUtils = {
-  TOGGLE: ".narrate-toggle",
-  POPUP: ".narrate-dropdown .dropdown-popup",
-  VOICE_SELECT: ".narrate-voices .select-toggle",
-  VOICE_OPTIONS: ".narrate-voices .options",
-  VOICE_SELECTED: ".narrate-voices .options .option.selected",
-  VOICE_SELECT_LABEL: ".narrate-voices .select-toggle .current-voice",
-  RATE: ".narrate-rate-input",
-  START: ".narrate-dropdown:not(.speaking) .narrate-start-stop",
-  STOP: ".narrate-dropdown.speaking .narrate-start-stop",
-  BACK: ".narrate-skip-previous",
-  FORWARD: ".narrate-skip-next",
+  TOGGLE: "#narrate-toggle",
+  POPUP: "#narrate-dropdown .dropdown-popup",
+  VOICE_SELECT: "#narrate-voices .select-toggle",
+  VOICE_OPTIONS: "#narrate-voices .options",
+  VOICE_SELECTED: "#narrate-voices .options .option.selected",
+  VOICE_SELECT_LABEL: "#narrate-voices .select-toggle .current-voice",
+  RATE: "#narrate-rate-input",
+  START: "#narrate-dropdown:not(.speaking) #narrate-start-stop",
+  STOP: "#narrate-dropdown.speaking #narrate-start-stop",
+  BACK: "#narrate-skip-previous",
+  FORWARD: "#narrate-skip-next",
 
   isVisible(element) {
     let style = element.ownerGlobal.getComputedStyle(element);
@@ -68,7 +68,7 @@ this.NarrateTestUtils = {
     }
 
     let voiceOption = window.document.querySelector(
-      `.narrate-voices .option[data-value="${voiceUri}"]`);
+      `#narrate-voices .option[data-value="${voiceUri}"]`);
 
     voiceOption.focus();
     voiceOption.click();
diff --git a/toolkit/components/printing/content/simplifyMode.css b/toolkit/components/printing/content/simplifyMode.css
index 257acad91b45..4ad692228304 100644
--- a/toolkit/components/printing/content/simplifyMode.css
+++ b/toolkit/components/printing/content/simplifyMode.css
@@ -4,9 +4,9 @@
 
 /* This file defines specific rules for print preview when using simplify mode.
  * Some of these rules (styling for title and author on the header element)
- * already exist in aboutReader.css, however, we decoupled it from the original
- * file so we don't need to load a bunch of extra queries that will not take
- * effect when using the simplify page checkbox. */
+ * already exist on aboutReaderControls.css, however, we decoupled it from the
+ * original file so we don't need to load a bunch of extra queries that will not
+ * take effect when using the simplify page checkbox. */
 
 body {
   padding-top: 0px;
@@ -29,4 +29,4 @@ body {
   line-height: 1.48em;
   margin: 0 0 30px 0;
   font-style: italic;
-}
+}
\ No newline at end of file
diff --git a/toolkit/components/reader/AboutReader.jsm b/toolkit/components/reader/AboutReader.jsm
index 4c89c2913d76..3802c2f10896 100644
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/toolkit/components/reader/AboutReader.jsm
@@ -55,15 +55,14 @@ var AboutReader = function(mm, win, articlePromise) {
     this._articlePromise = articlePromise;
   }
 
-  this._headerElementRef = Cu.getWeakReference(doc.querySelector(".reader-header"));
-  this._domainElementRef = Cu.getWeakReference(doc.querySelector(".reader-domain"));
-  this._titleElementRef = Cu.getWeakReference(doc.querySelector(".reader-title"));
-  this._readTimeElementRef = Cu.getWeakReference(doc.querySelector(".reader-estimated-time"));
-  this._creditsElementRef = Cu.getWeakReference(doc.querySelector(".reader-credits"));
-  this._contentElementRef = Cu.getWeakReference(doc.querySelector(".moz-reader-content"));
-  this._toolbarElementRef = Cu.getWeakReference(doc.querySelector(".reader-toolbar"));
-  this._messageElementRef = Cu.getWeakReference(doc.querySelector(".reader-message"));
-  this._containerElementRef = Cu.getWeakReference(doc.querySelector(".container"));
+  this._headerElementRef = Cu.getWeakReference(doc.getElementById("reader-header"));
+  this._domainElementRef = Cu.getWeakReference(doc.getElementById("reader-domain"));
+  this._titleElementRef = Cu.getWeakReference(doc.getElementById("reader-title"));
+  this._readTimeElementRef = Cu.getWeakReference(doc.getElementById("reader-estimated-time"));
+  this._creditsElementRef = Cu.getWeakReference(doc.getElementById("reader-credits"));
+  this._contentElementRef = Cu.getWeakReference(doc.getElementById("moz-reader-content"));
+  this._toolbarElementRef = Cu.getWeakReference(doc.getElementById("reader-toolbar"));
+  this._messageElementRef = Cu.getWeakReference(doc.getElementById("reader-message"));
 
   this._scrollOffset = win.pageYOffset;
 
@@ -174,10 +173,6 @@ AboutReader.prototype = {
     return this._messageElementRef.get();
   },
 
-  get _containerElement() {
-    return this._containerElementRef.get();
-  },
-
   get _isToolbarVertical() {
     if (this._toolbarVertical !== undefined) {
       return this._toolbarVertical;
@@ -205,26 +200,26 @@ AboutReader.prototype = {
 
       case "Reader:AddButton": {
         if (message.data.id && message.data.image &&
-            !this._doc.getElementsByClassName(message.data.id)[0]) {
+            !this._doc.getElementById(message.data.id)) {
           let btn = this._doc.createElement("button");
-          btn.dataset.buttonid = message.data.id;
-          btn.className = "button " + message.data.id;
-          btn.style.backgroundImage = "url('" + message.data.image + "')";
+          btn.setAttribute("class", "button");
+          btn.setAttribute("style", "background-image: url('" + message.data.image + "')");
+          btn.setAttribute("id", message.data.id);
           if (message.data.title)
-            btn.title = message.data.title;
+            btn.setAttribute("title", message.data.title);
           if (message.data.text)
             btn.textContent = message.data.text;
-          let tb = this._toolbarElement;
+          let tb = this._doc.getElementById("reader-toolbar");
           tb.appendChild(btn);
           this._setupButton(message.data.id, button => {
-            this._mm.sendAsyncMessage("Reader:Clicked-" + button.dataset.buttonid, { article: this._article });
+            this._mm.sendAsyncMessage("Reader:Clicked-" + button.getAttribute("id"), { article: this._article });
           });
         }
         break;
       }
       case "Reader:RemoveButton": {
         if (message.data.id) {
-          let btn = this._doc.getElementsByClassName(message.data.id)[0];
+          let btn = this._doc.getElementById(message.data.id);
           if (btn)
             btn.remove();
         }
@@ -308,7 +303,7 @@ AboutReader.prototype = {
   },
 
   _setFontSize(newFontSize) {
-    let containerClasses = this._containerElement.classList;
+    let containerClasses = this._doc.getElementById("container").classList;
 
     if (this._fontSize > 0)
       containerClasses.remove("font-size" + this._fontSize);
@@ -323,14 +318,14 @@ AboutReader.prototype = {
     const FONT_SIZE_MAX = 9;
 
     // Sample text shown in Android UI.
-    let sampleText = this._doc.querySelector(".font-size-sample");
+    let sampleText = this._doc.getElementById("font-size-sample");
     sampleText.textContent = gStrings.GetStringFromName("aboutReader.fontTypeSample");
 
     let currentSize = Services.prefs.getIntPref("reader.font_size");
     currentSize = Math.max(FONT_SIZE_MIN, Math.min(FONT_SIZE_MAX, currentSize));
 
-    let plusButton = this._doc.querySelector(".plus-button");
-    let minusButton = this._doc.querySelector(".minus-button");
+    let plusButton = this._doc.getElementById("font-size-plus");
+    let minusButton = this._doc.getElementById("font-size-minus");
 
     function updateControls() {
       if (currentSize === FONT_SIZE_MIN) {
@@ -380,7 +375,7 @@ AboutReader.prototype = {
   },
 
   _setContentWidth(newContentWidth) {
-    let containerClasses = this._containerElement.classList;
+    let containerClasses = this._doc.getElementById("container").classList;
 
     if (this._contentWidth > 0)
       containerClasses.remove("content-width" + this._contentWidth);
@@ -397,8 +392,8 @@ AboutReader.prototype = {
     let currentContentWidth = Services.prefs.getIntPref("reader.content_width");
     currentContentWidth = Math.max(CONTENT_WIDTH_MIN, Math.min(CONTENT_WIDTH_MAX, currentContentWidth));
 
-    let plusButton = this._doc.querySelector(".content-width-plus-button");
-    let minusButton = this._doc.querySelector(".content-width-minus-button");
+    let plusButton = this._doc.getElementById("content-width-plus");
+    let minusButton = this._doc.getElementById("content-width-minus");
 
     function updateControls() {
       if (currentContentWidth === CONTENT_WIDTH_MIN) {
@@ -448,7 +443,7 @@ AboutReader.prototype = {
   },
 
   _setLineHeight(newLineHeight) {
-    let contentClasses = this._contentElement.classList;
+    let contentClasses = this._doc.getElementById("moz-reader-content").classList;
 
     if (this._lineHeight > 0)
       contentClasses.remove("line-height" + this._lineHeight);
@@ -465,8 +460,8 @@ AboutReader.prototype = {
     let currentLineHeight = Services.prefs.getIntPref("reader.line_height");
     currentLineHeight = Math.max(LINE_HEIGHT_MIN, Math.min(LINE_HEIGHT_MAX, currentLineHeight));
 
-    let plusButton = this._doc.querySelector(".line-height-plus-button");
-    let minusButton = this._doc.querySelector(".line-height-minus-button");
+    let plusButton = this._doc.getElementById("line-height-plus");
+    let minusButton = this._doc.getElementById("line-height-minus");
 
     function updateControls() {
       if (currentLineHeight === LINE_HEIGHT_MIN) {
@@ -881,7 +876,7 @@ AboutReader.prototype = {
 
   _setupSegmentedButton(id, options, initialValue, callback) {
     let doc = this._doc;
-    let segmentedButton = doc.getElementsByClassName(id)[0];
+    let segmentedButton = doc.getElementById(id);
 
     for (let i = 0; i < options.length; i++) {
       let option = options[i];
@@ -935,7 +930,7 @@ AboutReader.prototype = {
       this._setButtonTip(id, titleEntity);
     }
 
-    let button = this._doc.getElementsByClassName(id)[0];
+    let button = this._doc.getElementById(id);
     if (textEntity) {
       button.textContent = gStrings.GetStringFromName(textEntity);
     }
@@ -956,12 +951,12 @@ AboutReader.prototype = {
    * @param   Localizable string providing UI element usage tip.
    */
   _setButtonTip(id, titleEntity) {
-    let button = this._doc.getElementsByClassName(id)[0];
+    let button = this._doc.getElementById(id);
     button.setAttribute("title", gStrings.GetStringFromName(titleEntity));
   },
 
   _setupStyleDropdown() {
-    let dropdownToggle = this._doc.querySelector(".style-dropdown .dropdown-toggle");
+    let dropdownToggle = this._doc.querySelector("#style-dropdown .dropdown-toggle");
     dropdownToggle.setAttribute("title", gStrings.GetStringFromName("aboutReader.toolbar.typeControls"));
   },
 
diff --git a/toolkit/components/reader/ReaderMode.jsm b/toolkit/components/reader/ReaderMode.jsm
index 930a00fa8db7..9811bc5cc3a7 100644
--- a/toolkit/components/reader/ReaderMode.jsm
+++ b/toolkit/components/reader/ReaderMode.jsm
@@ -18,19 +18,6 @@ const PARSE_ERROR_TOO_MANY_ELEMENTS = 1;
 const PARSE_ERROR_WORKER = 2;
 const PARSE_ERROR_NO_ARTICLE = 3;
 
-// Class names to preserve in the readerized output. We preserve these class
-// names so that rules in aboutReader.css can match them.
-const CLASSES_TO_PRESERVE = [
-  "caption",
-  "hidden",
-  "invisble",
-  "sr-only",
-  "visually-hidden",
-  "visuallyhidden",
-  "wp-caption",
-  "wp-caption-text",
-];
-
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -466,13 +453,9 @@ this.ReaderMode = {
                      createInstance(Ci.nsIDOMSerializer);
     let serializedDoc = serializer.serializeToString(doc);
 
-    let options = {
-      classesToPreserve: CLASSES_TO_PRESERVE,
-    };
-
     let article = null;
     try {
-      article = await ReaderWorker.post("parseDocument", [uriParam, serializedDoc, options]);
+      article = await ReaderWorker.post("parseDocument", [uriParam, serializedDoc]);
     } catch (e) {
       Cu.reportError("Error in ReaderWorker: " + e);
       histogram.add(PARSE_ERROR_WORKER);
diff --git a/toolkit/components/reader/ReaderWorker.js b/toolkit/components/reader/ReaderWorker.js
index 9ae589d7d145..5f69d1fc9d0a 100644
--- a/toolkit/components/reader/ReaderWorker.js
+++ b/toolkit/components/reader/ReaderWorker.js
@@ -42,12 +42,11 @@ var Agent = {
    *
    * @param {object} uri URI data for the document.
    * @param {string} serializedDoc The serialized document.
-   * @param {object} options Options object to pass to Readability.
    *
    * @return {object} Article object returned from Readability.
    */
-  parseDocument(uri, serializedDoc, options) {
+  parseDocument(uri, serializedDoc) {
     let doc = new JSDOMParser().parse(serializedDoc);
-    return new Readability(uri, doc, options).parse();
+    return new Readability(uri, doc).parse();
   },
 };
diff --git a/toolkit/components/reader/content/aboutReader.html b/toolkit/components/reader/content/aboutReader.html
index 1aa6444741e5..53d5a2b47567 100644
--- a/toolkit/components/reader/content/aboutReader.html
+++ b/toolkit/components/reader/content/aboutReader.html
@@ -11,52 +11,64 @@
 </head>
 
 <body>
-  <div class="container">
-    <div class="header reader-header">
-      <a class="domain reader-domain"></a>
+  <div id="container" class="container">
+    <div id="reader-header" class="header">
+      <style scoped>
+        @import url("chrome://global/skin/aboutReaderControls.css");
+      </style>
+      <a id="reader-domain" class="domain"></a>
       <div class="domain-border"></div>
-      <h1 class="reader-title"></h1>
-      <div class="credits reader-credits"></div>
-      <div class="meta-data">
-        <div class="reader-estimated-time"></div>
+      <h1 id="reader-title"></h1>
+      <div id="reader-credits" class="credits"></div>
+      <div id="meta-data" class="meta-data">
+        <div id="reader-estimated-time"></div>
       </div>
     </div>
 
     <hr>
 
     <div class="content">
-      <div class="moz-reader-content"></div>
+      <style scoped>
+        @import url("chrome://global/skin/aboutReaderContent.css");
+      </style>
+      <div id="moz-reader-content"></div>
     </div>
 
     <div>
-      <div class="reader-message"></div>
+      <style scoped>
+        @import url("chrome://global/skin/aboutReaderControls.css");
+      </style>
+      <div id="reader-message"></div>
     </div>
   </div>
 
-  <ul class="toolbar reader-toolbar">
-    <li><button class="button close-button"/></li>
-    <ul class="dropdown style-dropdown">
+  <ul id="reader-toolbar" class="toolbar">
+    <style scoped>
+      @import url("chrome://global/skin/aboutReaderControls.css");
+    </style>
+    <li><button id="close-button" class="button close-button"/></li>
+    <ul id="style-dropdown" class="dropdown">
       <li><button class="dropdown-toggle button style-button"/></li>
-      <li class="dropdown-popup">
-        <div class="font-type-buttons"></div>
+      <li id="reader-popup" class="dropdown-popup">
+        <div id="font-type-buttons"></div>
         <hr>
-        <div class="font-size-buttons">
-          <button class="minus-button"/>
-          <button class="font-size-sample"/>
-          <button class="plus-button"/>
+        <div id="font-size-buttons">
+          <button id="font-size-minus" class="minus-button"/>
+          <button id="font-size-sample"/>
+          <button id="font-size-plus" class="plus-button"/>
         </div>
         <hr>
-        <div class="content-width-buttons">
-          <button class="content-width-minus-button"/>
-          <button class="content-width-plus-button"/>
+        <div id="content-width-buttons">
+          <button id="content-width-minus" class="content-width-minus-button"/>
+          <button id="content-width-plus" class="content-width-plus-button"/>
         </div>
         <hr>
-        <div class="line-height-buttons">
-          <button class="line-height-minus-button"/>
-          <button class="line-height-plus-button"/>
+        <div id="line-height-buttons">
+          <button id="line-height-minus" class="line-height-minus-button"/>
+          <button id="line-height-plus" class="line-height-plus-button"/>
         </div>
         <hr>
-        <div class="color-scheme-buttons"></div>
+        <div id="color-scheme-buttons"></div>
         <div class="dropdown-arrow"/>
       </li>
     </ul>
diff --git a/toolkit/components/reader/test/browser_readerMode_readingTime.js b/toolkit/components/reader/test/browser_readerMode_readingTime.js
index 5513c22b023b..ed92f6b6d078 100644
--- a/toolkit/components/reader/test/browser_readerMode_readingTime.js
+++ b/toolkit/components/reader/test/browser_readerMode_readingTime.js
@@ -18,7 +18,7 @@ add_task(async function() {
     await pageShownPromise;
     await ContentTask.spawn(browser, null, async function() {
       // make sure there is a reading time on the page and that it displays the correct information
-      let readingTimeElement = content.document.querySelector(".reader-estimated-time");
+      let readingTimeElement = content.document.getElementById("reader-estimated-time");
       ok(readingTimeElement, "Reading time element should be in document");
       is(readingTimeElement.textContent, "9-12 minutes", "Reading time should be '9-12 minutes'");
     });
@@ -37,7 +37,7 @@ add_task(async function() {
     await pageShownPromise;
     await ContentTask.spawn(browser, null, async function() {
       // make sure there is a reading time on the page and that it displays the correct information
-      let readingTimeElement = content.document.querySelector(".reader-estimated-time");
+      let readingTimeElement = content.document.getElementById("reader-estimated-time");
       ok(readingTimeElement, "Reading time element should be in document");
       is(readingTimeElement.textContent, "1 minute", "Reading time should be '1 minute'");
     });
@@ -57,7 +57,7 @@ add_task(async function() {
     await pageShownPromise;
     await ContentTask.spawn(browser, null, async function() {
       // make sure there is a reading time on the page and that it displays the correct information
-      let readingTimeElement = content.document.querySelector(".reader-estimated-time");
+      let readingTimeElement = content.document.getElementById("reader-estimated-time");
       ok(readingTimeElement, "Reading time element should be in document");
       is(readingTimeElement.textContent, "3 minutes", "Reading time should be '3 minutes'");
     });
diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js
index 63116f09cc2e..c686f86476a5 100644
--- a/toolkit/content/browser-content.js
+++ b/toolkit/content/browser-content.js
@@ -677,6 +677,12 @@ var Printing = {
       contentElement.setAttribute("class", "content");
       containerElement.appendChild(contentElement);
 
+      // Create style element for content div and import aboutReaderContent.css
+      let controlContentStyle = content.document.createElement("style");
+      controlContentStyle.setAttribute("scoped", "");
+      controlContentStyle.textContent = "@import url(\"chrome://global/skin/aboutReaderContent.css\");";
+      contentElement.appendChild(controlContentStyle);
+
       // Jam the article's content into content div
       let readerContent = content.document.createElement("div");
       readerContent.setAttribute("id", "moz-reader-content");
diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
index 32f7dce08214..36945def6ca9 100644
--- a/toolkit/themes/shared/aboutReader.css
+++ b/toolkit/themes/shared/aboutReader.css
@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* Avoid adding ID selector rules in this style sheet, since they could
- * inadvertently match elements in the article content. */
-
 body {
   padding: 64px 51px;
 }
@@ -46,80 +43,80 @@ body.serif .remove-button  {
   font-family: Georgia, "Times New Roman", serif;
 }
 
-.container {
+#container {
   max-width: 30em;
   margin: 0 auto;
 }
 
-.container.font-size1 {
+#container.font-size1 {
   font-size: 12px;
 }
 
-.container.font-size2 {
+#container.font-size2 {
   font-size: 14px;
 }
 
-.container.font-size3 {
+#container.font-size3 {
   font-size: 16px;
 }
 
-.container.font-size4  {
+#container.font-size4  {
   font-size: 18px;
 }
 
-.container.font-size5 {
+#container.font-size5 {
   font-size: 20px;
 }
 
-.container.font-size6 {
+#container.font-size6 {
   font-size: 22px;
 }
 
-.container.font-size7 {
+#container.font-size7 {
   font-size: 24px;
 }
 
-.container.font-size8 {
+#container.font-size8 {
   font-size: 26px;
 }
 
-.container.font-size9 {
+#container.font-size9 {
   font-size: 28px;
 }
 
-.container.content-width1 {
+#container.content-width1 {
   max-width: 20em;
 }
 
-.container.content-width2 {
+#container.content-width2 {
   max-width: 25em;
 }
 
-.container.content-width3 {
+#container.content-width3 {
   max-width: 30em;
 }
 
-.container.content-width4  {
+#container.content-width4  {
   max-width: 35em;
 }
 
-.container.content-width5 {
+#container.content-width5 {
   max-width: 40em;
 }
 
-.container.content-width6 {
+#container.content-width6 {
   max-width: 45em;
 }
 
-.container.content-width7 {
+#container.content-width7 {
   max-width: 50em;
 }
 
-.container.content-width8 {
+#container.content-width8 {
   max-width: 55em;
 }
 
-.container.content-width9 {
+#container.content-width9 {
   max-width: 60em;
 }
 
@@ -166,576 +163,3 @@ body:not(.loaded) .toolbar:-moz-locale-dir(ltr) {
 body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
   transform: translateX(100%);
 }
-
-.light-button {
-  color: #333333;
-  background-color: #ffffff;
-}
-
-.dark-button {
-  color: #eeeeee;
-  background-color: #333333;
-}
-
-.sepia-button {
-  color: #5b4636;
-  background-color: #f4ecd8;
-}
-
-.sans-serif-button {
-  font-family: Helvetica, Arial, sans-serif;
-}
-
-.serif-button {
-  font-family: Georgia, "Times New Roman", serif;
-}
-
-/* Loading/error message */
-
-.reader-message {
-  margin-top: 40px;
-  display: none;
-  text-align: center;
-  width: 100%;
-  font-size: 0.9em;
-}
-
-/* Header */
-
-.header {
-  text-align: start;
-  display: none;
-}
-
-.domain {
-  font-size: 0.9em;
-  line-height: 1.48em;
-  padding-bottom: 4px;
-  font-family: Helvetica, Arial, sans-serif;
-  text-decoration: none;
-  border-bottom: 1px solid;
-  color: #0095dd;
-}
-
-.header > h1 {
-  font-size: 1.6em;
-  line-height: 1.25em;
-  width: 100%;
-  margin: 30px 0;
-  padding: 0;
-}
-
-.header > .credits {
-  font-size: 0.9em;
-  line-height: 1.48em;
-  margin: 0 0 10px 0;
-  padding: 0;
-  font-style: italic;
-}
-
-.header > .meta-data {
-  font-size: 0.65em;
-  margin: 0 0 15px 0;
-}
-
-/*======= Controls toolbar =======*/
-
-.toolbar {
-  font-family: Helvetica, Arial, sans-serif;
-  position: fixed;
-  height: 100%;
-  top: 0;
-  left: 0;
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  background-color: #fbfbfb;
-  -moz-user-select: none;
-  border-right: 1px solid #b5b5b5;
-  z-index: 1;
-}
-
-.button {
-  display: block;
-  background-size: 24px 24px;
-  background-repeat: no-repeat;
-  color: #333;
-  background-color: #fbfbfb;
-  height: 40px;
-  padding: 0;
-}
-
-.toolbar .button {
-  width: 40px;
-  background-position: center;
-  margin-right: -1px;
-  border-top: 0;
-  border-left: 0;
-  border-right: 1px solid #b5b5b5;
-  border-bottom: 1px solid #c1c1c1;
-}
-
-.button[hidden] {
-  display: none;
-}
-
-.dropdown {
-  text-align: center;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.dropdown li {
-  margin: 0;
-  padding: 0;
-}
-
-/*======= Popup =======*/
-
-.dropdown-popup {
-  min-width: 300px;
-  text-align: start;
-  position: absolute;
-  left: 48px; /* offset to account for toolbar width */
-  z-index: 1000;
-  background-color: #fbfbfb;
-  visibility: hidden;
-  border-radius: 4px;
-  border: 1px solid #b5b5b5;
-  border-bottom-width: 0;
-  box-shadow: 0 1px 3px #c1c1c1;
-}
-
-.keep-open .dropdown-popup {
-  z-index: initial;
-}
-
-.dropdown-popup > hr {
-  display: none;
-}
-
-.open > .dropdown-popup {
-  visibility: visible;
-}
-
-.dropdown-arrow {
-  position: absolute;
-  top: 30px; /* offset arrow from top of popup */
-  left: -16px;
-  width: 16px;
-  height: 24px;
-  background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg");
-  display: block;
-}
-
-/*======= Font style popup =======*/
-
-.font-type-buttons,
-.font-size-buttons,
-.color-scheme-buttons,
-.content-width-buttons,
-.line-height-buttons {
-  display: flex;
-  flex-direction: row;
-}
-
-.font-type-buttons > button:first-child {
-  border-top-left-radius: 3px;
-}
-.font-type-buttons > button:last-child {
-  border-top-right-radius: 3px;
-}
-.color-scheme-buttons > button:first-child {
-  border-bottom-left-radius: 3px;
-}
-.color-scheme-buttons > button:last-child {
-  border-bottom-right-radius: 3px;
-}
-
-.font-type-buttons > button,
-.font-size-buttons > button,
-.color-scheme-buttons > button,
-.content-width-buttons > button,
-.line-height-buttons > button {
-  text-align: center;
-  border: 0;
-}
-
-.font-type-buttons > button,
-.font-size-buttons > button,
-.content-width-buttons > button,
-.line-height-buttons > button {
-  width: 50%;
-  background-color: transparent;
-  border-left: 1px solid #B5B5B5;
-  border-bottom: 1px solid #B5B5B5;
-}
-
-.color-scheme-buttons > button {
-  width: 33.33%;
-  font-size: 14px;
-}
-
-.color-scheme-buttons > .dark-button {
-  margin-top: -1px;
-  height: 61px;
-}
-
-.font-type-buttons > button:first-child,
-.font-size-buttons > button:first-child,
-.content-width-buttons > button:first-child,
-.line-height-buttons > button:first-child {
-  border-left: 0;
-}
-
-.font-type-buttons > button {
-  display: inline-block;
-  font-size: 62px;
-  height: 100px;
-}
-
-.font-size-buttons > button,
-.color-scheme-buttons > button,
-.content-width-buttons > button,
-.line-height-buttons > button {
-  height: 60px;
-}
-
-.font-type-buttons > button:active:hover,
-.font-type-buttons > button.selected,
-.color-scheme-buttons > button:active:hover,
-.color-scheme-buttons > button.selected {
-  box-shadow: inset 0 -3px 0 0 #fc6420;
-}
-
-.font-type-buttons > button:active:hover,
-.font-type-buttons > button.selected {
-  border-bottom: 1px solid #FC6420;
-}
-
-/* Make the serif button content the same size as the sans-serif button content. */
-.font-type-buttons > button > .description {
-  color: #666;
-  font-size: 12px;
-  margin-top: -5px;
-}
-
-/* Font sizes are different per-platform, so we need custom CSS to line them up. */
-%ifdef XP_MACOSX
-.font-type-buttons > .sans-serif-button > .name {
-  margin-top: 10px;
-}
-
-.font-type-buttons > .sans-serif-button > .description {
-  margin-top: -4px;
-}
-
-.font-type-buttons > .serif-button > .name {
-  font-size: 63px;
-}
-%elifdef XP_WIN
-.font-type-buttons > .sans-serif-button > .name {
-  margin-top: 2px;
-}
-
-.font-type-buttons > .sans-serif-button > .description {
-  margin-top: -4px;
-}
-
-.font-type-buttons > .serif-button > .name {
-  font-size: 63px;
-}
-%else
-.font-type-buttons > .sans-serif-button > .name {
-  margin-top: 5px;
-}
-
-.font-type-buttons > .sans-serif-button > .description {
-  margin-top: -8px;
-}
-
-.font-type-buttons > .serif-button > .name {
-  font-size: 70px;
-}
-%endif
-
-.button:hover,
-.font-size-buttons > button:hover,
-.font-type-buttons > button:hover,
-.content-width-buttons > button:hover,
-.line-height-buttons > button:hover {
-  background-color: #ebebeb;
-}
-
-.dropdown.open,
-.button:active,
-.font-size-buttons > button:active,
-.font-size-buttons > button.selected,
-.content-width-buttons > button:active,
-.content-width-buttons > button.selected,
-.line-height-buttons > button:active,
-.line-height-buttons > button.selected {
-  background-color: #dadada;
-}
-
-/* Only used on Android */
-.font-size-sample {
-  display: none;
-}
-
-.minus-button,
-.plus-button,
-.content-width-minus-button,
-.content-width-plus-button,
-.line-height-minus-button,
-.line-height-plus-button {
-  background-color: transparent;
-  border: 0;
-  background-size: 18px 18px;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
-/*======= Toolbar icons =======*/
-
-.close-button {
-  background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg");
-  -moz-context-properties: fill;
-  fill: #808080;
-  height: 68px;
-  background-position: center 8px;
-}
-
-.close-button:hover {
-  fill: #fff;
-  background-color: #d94141;
-  border-bottom: 1px solid #d94141;
-  border-right: 1px solid #d94141;
-}
-
-.close-button:hover:active {
-  background-color: #AE2325;
-  border-bottom: 1px solid #AE2325;
-  border-right: 1px solid #AE2325;
-}
-
-.style-button {
-  background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg");
-}
-
-.minus-button {
-  background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg");
-}
-
-.plus-button {
-  background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg");
-}
-
-.content-width-minus-button {
-  background-size: 42px 16px;
-  background-image: url("chrome://global/skin/reader/RM-Content-Width-Minus-42x16.svg");
-}
-
-.content-width-plus-button {
-  background-size: 44px 16px;
-  background-image: url("chrome://global/skin/reader/RM-Content-Width-Plus-44x16.svg");
-}
-
-.line-height-minus-button {
-  background-size: 34px 14px;
-  background-image: url("chrome://global/skin/reader/RM-Line-Height-Minus-38x14.svg");
-}
-
-.line-height-plus-button {
-  background-size: 34px 24px;
-  background-image: url("chrome://global/skin/reader/RM-Line-Height-Plus-38x24.svg");
-}
-
-@media print {
-  .toolbar {
-    display: none !important;
-  }
-}
-
-/*======= Article content =======*/
-
-/* Note that any class names from the original article that we want to match on
- * must be added to CLASSES_TO_PRESERVE in ReaderMode.jsm, so that
- * Readability.js doesn't strip them out */
-
-.moz-reader-content {
-  display: none;
-  font-size: 1em;
-  line-height: 1.6em;
-}
-
-.moz-reader-content.line-height1 {
-  line-height: 1em;
-}
-
-.moz-reader-content.line-height2 {
-  line-height: 1.2em;
-}
-
-.moz-reader-content.line-height3 {
-  line-height: 1.4em;
-}
-
-.moz-reader-content.line-height4 {
-  line-height: 1.6em;
-}
-
-.moz-reader-content.line-height5 {
-  line-height: 1.8em;
-}
-
-.moz-reader-content.line-height6 {
-  line-height: 2.0em;
-}
-
-.moz-reader-content.line-height7 {
-  line-height: 2.2em;
-}
-
-.moz-reader-content.line-height8 {
-  line-height: 2.4em;
-}
-
-.moz-reader-content.line-height9 {
-  line-height: 2.6em;
-}
-
-@media print {
-  .moz-reader-content p,
-  .moz-reader-content code,
-  .moz-reader-content pre,
-  .moz-reader-content blockquote,
-  .moz-reader-content ul,
-  .moz-reader-content ol,
-  .moz-reader-content li,
-  .moz-reader-content figure,
-  .moz-reader-content .wp-caption {
-    margin: 0 0 10px 0 !important;
-    padding: 0 !important;
-  }
-}
-
-.moz-reader-content h1,
-.moz-reader-content h2,
-.moz-reader-content h3 {
-  font-weight: bold;
-}
-
-.moz-reader-content h1 {
-  font-size: 1.6em;
-  line-height: 1.25em;
-}
-
-.moz-reader-content h2 {
-  font-size: 1.2em;
-  line-height: 1.51em;
-}
-
-.moz-reader-content h3 {
-  font-size: 1em;
-  line-height: 1.66em;
-}
-
-.moz-reader-content a:link {
-  text-decoration: underline;
-  font-weight: normal;
-}
-
-.moz-reader-content a:link,
-.moz-reader-content a:link:hover,
-.moz-reader-content a:link:active {
-  color: #0095dd;
-}
-
-.moz-reader-content a:visited {
-  color: #c2e;
-}
-
-.moz-reader-content * {
-  max-width: 100%;
-  height: auto;
-}
-
-.moz-reader-content p,
-.moz-reader-content p,
-.moz-reader-content code,
-.moz-reader-content pre,
-.moz-reader-content blockquote,
-.moz-reader-content ul,
-.moz-reader-content ol,
-.moz-reader-content li,
-.moz-reader-content figure,
-.moz-reader-content .wp-caption {
-  margin: -10px -10px 20px -10px;
-  padding: 10px;
-  border-radius: 5px;
-}
-
-.moz-reader-content li {
-  margin-bottom: 0;
-}
-
-.moz-reader-content li > ul,
-.moz-reader-content li > ol {
-  margin-bottom: -10px;
-}
-
-.moz-reader-content p > img:only-child,
-.moz-reader-content p > a:only-child > img:only-child,
-.moz-reader-content .wp-caption img,
-.moz-reader-content figure img {
-  display: block;
-}
-
-.moz-reader-content img[moz-reader-center] {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.moz-reader-content .caption,
-.moz-reader-content .wp-caption-text
-.moz-reader-content figcaption {
-  font-size: 0.9em;
-  line-height: 1.48em;
-  font-style: italic;
-}
-
-.moz-reader-content code,
-.moz-reader-content pre {
-  white-space: pre-wrap;
-}
-
-.moz-reader-content blockquote {
-  padding: 0;
-  padding-inline-start: 16px;
-}
-
-.moz-reader-content ul,
-.moz-reader-content ol {
-  padding: 0;
-}
-
-.moz-reader-content ul {
-  padding-inline-start: 30px;
-  list-style: disc;
-}
-
-.moz-reader-content ol {
-  padding-inline-start: 30px;
-  list-style: decimal;
-}
-
-/* Hide elements with common "hidden" class names */
-.moz-reader-content .visually-hidden,
-.moz-reader-content .visuallyhidden,
-.moz-reader-content .hidden,
-.moz-reader-content .invisible,
-.moz-reader-content .sr-only {
-  display: none;
-}
diff --git a/toolkit/themes/shared/aboutReaderContent.css b/toolkit/themes/shared/aboutReaderContent.css
new file mode 100644
index 000000000000..f69c17bf88a4
--- /dev/null
+++ b/toolkit/themes/shared/aboutReaderContent.css
@@ -0,0 +1,178 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#moz-reader-content {
+  display: none;
+  font-size: 1em;
+  line-height: 1.6em;
+}
+
+#moz-reader-content.line-height1 {
+  line-height: 1em;
+}
+
+#moz-reader-content.line-height2 {
+  line-height: 1.2em;
+}
+
+#moz-reader-content.line-height3 {
+  line-height: 1.4em;
+}
+
+#moz-reader-content.line-height4 {
+  line-height: 1.6em;
+}
+
+#moz-reader-content.line-height5 {
+  line-height: 1.8em;
+}
+
+#moz-reader-content.line-height6 {
+  line-height: 2.0em;
+}
+
+#moz-reader-content.line-height7 {
+  line-height: 2.2em;
+}
+
+#moz-reader-content.line-height8 {
+  line-height: 2.4em;
+}
+
+#moz-reader-content.line-height9 {
+  line-height: 2.6em;
+}
+
+@media print {
+  p,
+  code,
+  pre,
+  blockquote,
+  ul,
+  ol,
+  li,
+  figure,
+  .wp-caption {
+    margin: 0 0 10px 0 !important;
+    padding: 0 !important;
+  }
+}
+
+h1,
+h2,
+h3 {
+  font-weight: bold;
+}
+
+h1 {
+  font-size: 1.6em;
+  line-height: 1.25em;
+}
+
+h2 {
+  font-size: 1.2em;
+  line-height: 1.51em;
+}
+
+h3 {
+  font-size: 1em;
+  line-height: 1.66em;
+}
+
+a:link {
+  text-decoration: underline;
+  font-weight: normal;
+}
+
+a:link,
+a:link:hover,
+a:link:active {
+  color: #0095dd;
+}
+
+a:visited {
+  color: #c2e;
+}
+
+* {
+  max-width: 100%;
+  height: auto;
+}
+
+p,
+code,
+pre,
+blockquote,
+ul,
+ol,
+li,
+figure,
+.wp-caption {
+  margin: -10px -10px 20px -10px;
+  padding: 10px;
+  border-radius: 5px;
+}
+
+li {
+  margin-bottom: 0;
+}
+
+li > ul,
+li > ol {
+  margin-bottom: -10px;
+}
+
+p > img:only-child,
+p > a:only-child > img:only-child,
+.wp-caption img,
+figure img {
+  display: block;
+}
+
+img[moz-reader-center] {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.caption,
+.wp-caption-text,
+figcaption {
+  font-size: 0.9em;
+  line-height: 1.48em;
+  font-style: italic;
+}
+
+code,
+pre {
+  white-space: pre-wrap;
+}
+
+blockquote {
+  padding: 0;
+  padding-inline-start: 16px;
+}
+
+ul,
+ol {
+  padding: 0;
+}
+
+ul {
+  padding-inline-start: 30px;
+  list-style: disc;
+}
+
+ol {
+  padding-inline-start: 30px;
+  list-style: decimal;
+}
+
+/* Hide elements with common "hidden" class names */
+.visually-hidden,
+.visuallyhidden,
+.hidden,
+.invisible,
+.sr-only {
+  display: none;
+}
diff --git a/toolkit/themes/shared/aboutReaderControls.css b/toolkit/themes/shared/aboutReaderControls.css
new file mode 100644
index 000000000000..2a4b66e5414a
--- /dev/null
+++ b/toolkit/themes/shared/aboutReaderControls.css
@@ -0,0 +1,394 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+.light-button {
+  color: #333333;
+  background-color: #ffffff;
+}
+
+.dark-button {
+  color: #eeeeee;
+  background-color: #333333;
+}
+
+.sepia-button {
+  color: #5b4636;
+  background-color: #f4ecd8;
+}
+
+.sans-serif-button {
+  font-family: Helvetica, Arial, sans-serif;
+}
+
+.serif-button {
+  font-family: Georgia, "Times New Roman", serif;
+}
+
+/* Loading/error message */
+
+#reader-message {
+  margin-top: 40px;
+  display: none;
+  text-align: center;
+  width: 100%;
+  font-size: 0.9em;
+}
+
+/* Header */
+
+.header {
+  text-align: start;
+  display: none;
+}
+
+.domain {
+  font-size: 0.9em;
+  line-height: 1.48em;
+  padding-bottom: 4px;
+  font-family: Helvetica, Arial, sans-serif;
+  text-decoration: none;
+  border-bottom: 1px solid;
+  color: #0095dd;
+}
+
+.header > h1 {
+  font-size: 1.6em;
+  line-height: 1.25em;
+  width: 100%;
+  margin: 30px 0;
+  padding: 0;
+}
+
+.header > .credits {
+  font-size: 0.9em;
+  line-height: 1.48em;
+  margin: 0 0 10px 0;
+  padding: 0;
+  font-style: italic;
+}
+
+.header > .meta-data {
+  font-size: 0.65em;
+  margin: 0 0 15px 0;
+}
+
+/*======= Controls toolbar =======*/
+
+.toolbar {
+  font-family: Helvetica, Arial, sans-serif;
+  position: fixed;
+  height: 100%;
+  top: 0;
+  left: 0;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  background-color: #fbfbfb;
+  -moz-user-select: none;
+  border-right: 1px solid #b5b5b5;
+  z-index: 1;
+}
+
+.button {
+  display: block;
+  background-size: 24px 24px;
+  background-repeat: no-repeat;
+  color: #333;
+  background-color: #fbfbfb;
+  height: 40px;
+  padding: 0;
+}
+
+.toolbar .button {
+  width: 40px;
+  background-position: center;
+  margin-right: -1px;
+  border-top: 0;
+  border-left: 0;
+  border-right: 1px solid #b5b5b5;
+  border-bottom: 1px solid #c1c1c1;
+}
+
+.button[hidden] {
+  display: none;
+}
+
+.dropdown {
+  text-align: center;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.dropdown li {
+  margin: 0;
+  padding: 0;
+}
+
+/*======= Popup =======*/
+
+.dropdown-popup {
+  min-width: 300px;
+  text-align: start;
+  position: absolute;
+  left: 48px; /* offset to account for toolbar width */
+  z-index: 1000;
+  background-color: #fbfbfb;
+  visibility: hidden;
+  border-radius: 4px;
+  border: 1px solid #b5b5b5;
+  border-bottom-width: 0;
+  box-shadow: 0 1px 3px #c1c1c1;
+}
+
+.keep-open .dropdown-popup {
+  z-index: initial;
+}
+
+.dropdown-popup > hr {
+  display: none;
+}
+
+.open > .dropdown-popup {
+  visibility: visible;
+}
+
+.dropdown-arrow {
+  position: absolute;
+  top: 30px; /* offset arrow from top of popup */
+  left: -16px;
+  width: 16px;
+  height: 24px;
+  background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg");
+  display: block;
+}
+
+/*======= Font style popup =======*/
+
+#font-type-buttons,
+#font-size-buttons,
+#color-scheme-buttons,
+#content-width-buttons,
+#line-height-buttons {
+  display: flex;
+  flex-direction: row;
+}
+
+#font-type-buttons > button:first-child {
+  border-top-left-radius: 3px;
+}
+#font-type-buttons > button:last-child {
+  border-top-right-radius: 3px;
+}
+#color-scheme-buttons > button:first-child {
+  border-bottom-left-radius: 3px;
+}
+#color-scheme-buttons > button:last-child {
+  border-bottom-right-radius: 3px;
+}
+
+#font-type-buttons > button,
+#font-size-buttons > button,
+#color-scheme-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
+  text-align: center;
+  border: 0;
+}
+
+#font-type-buttons > button,
+#font-size-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
+  width: 50%;
+  background-color: transparent;
+  border-left: 1px solid #B5B5B5;
+  border-bottom: 1px solid #B5B5B5;
+}
+
+#color-scheme-buttons > button {
+  width: 33.33%;
+  font-size: 14px;
+}
+
+#color-scheme-buttons > .dark-button {
+  margin-top: -1px;
+  height: 61px;
+}
+
+#font-type-buttons > button:first-child,
+#font-size-buttons > button:first-child,
+#content-width-buttons > button:first-child,
+#line-height-buttons > button:first-child {
+  border-left: 0;
+}
+
+#font-type-buttons > button {
+  display: inline-block;
+  font-size: 62px;
+  height: 100px;
+}
+
+#font-size-buttons > button,
+#color-scheme-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
+  height: 60px;
+}
+
+#font-type-buttons > button:active:hover,
+#font-type-buttons > button.selected,
+#color-scheme-buttons > button:active:hover,
+#color-scheme-buttons > button.selected {
+  box-shadow: inset 0 -3px 0 0 #fc6420;
+}
+
+#font-type-buttons > button:active:hover,
+#font-type-buttons > button.selected {
+  border-bottom: 1px solid #FC6420;
+}
+
+/* Make the serif button content the same size as the sans-serif button content. */
+#font-type-buttons > button > .description {
+  color: #666;
+  font-size: 12px;
+  margin-top: -5px;
+}
+
+/* Font sizes are different per-platform, so we need custom CSS to line them up. */
+%ifdef XP_MACOSX
+#font-type-buttons > .sans-serif-button > .name {
+  margin-top: 10px;
+}
+
+#font-type-buttons > .sans-serif-button > .description {
+  margin-top: -4px;
+}
+
+#font-type-buttons > .serif-button > .name {
+  font-size: 63px;
+}
+%elifdef XP_WIN
+#font-type-buttons > .sans-serif-button > .name {
+  margin-top: 2px;
+}
+
+#font-type-buttons > .sans-serif-button > .description {
+  margin-top: -4px;
+}
+
+#font-type-buttons > .serif-button > .name {
+  font-size: 63px;
+}
+%else
+#font-type-buttons > .sans-serif-button > .name {
+  margin-top: 5px;
+}
+
+#font-type-buttons > .sans-serif-button > .description {
+  margin-top: -8px;
+}
+
+#font-type-buttons > .serif-button > .name {
+  font-size: 70px;
+}
+%endif
+
+.button:hover,
+#font-size-buttons > button:hover,
+#font-type-buttons > button:hover,
+#content-width-buttons > button:hover,
+#line-height-buttons > button:hover {
+  background-color: #ebebeb;
+}
+
+.dropdown.open,
+.button:active,
+#font-size-buttons > button:active,
+#font-size-buttons > button.selected,
+#content-width-buttons > button:active,
+#content-width-buttons > button.selected,
+#line-height-buttons > button:active,
+#line-height-buttons > button.selected {
+  background-color: #dadada;
+}
+
+/* Only used on Android */
+#font-size-sample {
+  display: none;
+}
+
+.minus-button,
+.plus-button,
+.content-width-minus-button,
+.content-width-plus-button,
+.line-height-minus-button,
+.line-height-plus-button {
+  background-color: transparent;
+  border: 0;
+  background-size: 18px 18px;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+/*======= Toolbar icons =======*/
+
+.close-button {
+  background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg");
+  -moz-context-properties: fill;
+  fill: #808080;
+  height: 68px;
+  background-position: center 8px;
+}
+
+.close-button:hover {
+  fill: #fff;
+  background-color: #d94141;
+  border-bottom: 1px solid #d94141;
+  border-right: 1px solid #d94141;
+}
+
+.close-button:hover:active {
+  background-color: #AE2325;
+  border-bottom: 1px solid #AE2325;
+  border-right: 1px solid #AE2325;
+}
+
+.style-button {
+  background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg");
+}
+
+.minus-button {
+  background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg");
+}
+
+.plus-button {
+  background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg");
+}
+
+.content-width-minus-button {
+  background-size: 42px 16px;
+  background-image: url("chrome://global/skin/reader/RM-Content-Width-Minus-42x16.svg");
+}
+
+.content-width-plus-button {
+  background-size: 44px 16px;
+  background-image: url("chrome://global/skin/reader/RM-Content-Width-Plus-44x16.svg");
+}
+
+.line-height-minus-button {
+  background-size: 34px 14px;
+  background-image: url("chrome://global/skin/reader/RM-Line-Height-Minus-38x14.svg");
+}
+
+.line-height-plus-button {
+  background-size: 34px 24px;
+  background-image: url("chrome://global/skin/reader/RM-Line-Height-Plus-38x24.svg");
+}
+
+@media print {
+  .toolbar {
+    display: none !important;
+  }
+}
diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn
index 5bc40f3b7784..a54038e2cb55 100644
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -15,7 +15,9 @@ toolkit.jar:
   skin/classic/global/aboutCache.css                       (../../shared/aboutCache.css)
   skin/classic/global/aboutCacheEntry.css                  (../../shared/aboutCacheEntry.css)
   skin/classic/global/aboutMemory.css                      (../../shared/aboutMemory.css)
-* skin/classic/global/aboutReader.css                      (../../shared/aboutReader.css)
+  skin/classic/global/aboutReader.css                      (../../shared/aboutReader.css)
+  skin/classic/global/aboutReaderContent.css               (../../shared/aboutReaderContent.css)
+* skin/classic/global/aboutReaderControls.css              (../../shared/aboutReaderControls.css)
   skin/classic/global/aboutRights.css                      (../../shared/aboutRights.css)
   skin/classic/global/aboutLicense.css                     (../../shared/aboutLicense.css)
   skin/classic/global/aboutSupport.css                     (../../shared/aboutSupport.css)
@@ -48,6 +50,7 @@ toolkit.jar:
   skin/classic/global/icons/blocked.svg                    (../../shared/incontent-icons/blocked.svg)
   skin/classic/global/illustrations/about-license.svg      (../../shared/illustrations/about-license.svg)
   skin/classic/global/narrate.css                          (../../shared/narrate.css)
+  skin/classic/global/narrateControls.css                  (../../shared/narrateControls.css)
   skin/classic/global/narrate/arrow.svg                    (../../shared/narrate/arrow.svg)
   skin/classic/global/narrate/back.svg                     (../../shared/narrate/back.svg)
   skin/classic/global/narrate/fast.svg                     (../../shared/narrate/fast.svg)
diff --git a/toolkit/themes/shared/narrate.css b/toolkit/themes/shared/narrate.css
index bfab390cbe95..4514eff35e2d 100644
--- a/toolkit/themes/shared/narrate.css
+++ b/toolkit/themes/shared/narrate.css
@@ -1,6 +1,3 @@
-/* Avoid adding ID selector rules in this style sheet, since they could
- * inadvertently match elements in the article content. */
-
 .narrating {
   position: relative;
   z-index: 1;
@@ -47,190 +44,3 @@ body.sepia .narrate-word-highlight {
 body.dark .narrate-word-highlight {
   border-bottom-color: #6f6f6f;
 }
-
-.narrate-dropdown {
-  --border-color: #e5e5e5;
-}
-
-.narrate-toggle > svg {
-  display: block;
-  margin: 0 8px;
-}
-
-.narrate-dropdown > .dropdown-popup button {
-  background-color: transparent;
-}
-
-.narrate-dropdown > .dropdown-popup button:hover:not(:disabled) {
-  background-color: #eaeaea;
-}
-
-.narrate-row {
-  display: flex;
-  align-items: center;
-  min-height: 40px;
-  box-sizing: border-box;
-}
-
-.narrate-row:not(:first-child) {
-  border-top: 1px solid var(--border-color);
-}
-
-/* Control buttons */
-
-.narrate-control > button {
-  background-size: 24px 24px;
-  background-repeat: no-repeat;
-  background-position: center center;
-  height: 64px;
-  width: 100px;
-  border: none;
-  color: #666;
-  box-sizing: border-box;
-}
-
-.narrate-control > button:not(:first-child) {
-  border-left: 1px solid var(--border-color);
-}
-
-.narrate-skip-previous {
-  border-top-left-radius: 3px;
-  background-image: url("chrome://global/skin/narrate/back.svg");
-  -moz-context-properties: fill;
-  fill: rgb(128 128 128);
-}
-
-.narrate-skip-next {
-  border-top-right-radius: 3px;
-  background-image: url("chrome://global/skin/narrate/forward.svg");
-  -moz-context-properties: fill;
-  fill: rgb(128 128 128);
-}
-
-.narrate-skip-previous:disabled,
-.narrate-skip-next:disabled {
-  fill: rgb(128 128 128 / 50%);
-}
-
-.narrate-start-stop {
-  background-image: url("chrome://global/skin/narrate/start.svg");
-}
-
-.narrate-dropdown.speaking .narrate-start-stop {
-  background-image: url("chrome://global/skin/narrate/stop.svg");
-}
-
-/* Rate control */
-
-.narrate-rate::before, .narrate-rate::after {
-  content: '';
-  width: 48px;
-  height: 40px;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: 24px auto;
-}
-
-.narrate-rate::before {
-  background-image: url("chrome://global/skin/narrate/slow.svg");
-}
-
-.narrate-rate::after {
-  background-image: url("chrome://global/skin/narrate/fast.svg");
-}
-
-.narrate-rate-input {
-  margin: 0 1px;
-  flex-grow: 1;
-}
-
-.narrate-rate-input::-moz-range-track {
-  background-color: #979797;
-  height: 2px;
-}
-
-.narrate-rate-input::-moz-range-progress {
-  background-color: #2EA3FF;
-  height: 2px;
-}
-
-.narrate-rate-input::-moz-range-thumb {
-  background-color: #808080;
-  height: 16px;
-  width: 16px;
-  border-radius: 8px;
-  border-width: 0;
-}
-
-.narrate-rate-input:active::-moz-range-thumb {
-  background-color: #2EA3FF;
-}
-
-/* Voice selection */
-
-.voiceselect {
-  width: 100%;
-}
-
-.voiceselect > button.select-toggle,
-.voiceselect > .options > button.option {
-  -moz-appearance: none;
-  border: none;
-  width: 100%;
-  min-height: 40px;
-}
-
-.voiceselect.open > button.select-toggle {
-  border-bottom: 1px solid var(--border-color);
-}
-
-.voiceselect > button.select-toggle::after {
-  content: '';
-  background-image: url("chrome://global/skin/narrate/arrow.svg");
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: 12px 12px;
-  display: inline-block;
-  width: 1.5em;
-  height: 1em;
-  vertical-align: middle;
-}
-
-.voiceselect > .options > button.option:not(:first-child) {
-  border-top: 1px solid var(--border-color);
-}
-
-.voiceselect > .options > button.option  {
-  box-sizing: border-box;
-}
-
-.voiceselect > .options:not(.hovering) > button.option:focus {
-  background-color: #eaeaea;
-}
-
-.voiceselect > .options:not(.hovering) > button.option:hover:not(:focus) {
-  background-color: transparent;
-}
-
-.voiceselect > .options > button.option::-moz-focus-inner {
-  outline: none;
-  border: 0;
-}
-
-.voiceselect > .options {
-  display: none;
-  overflow-y: auto;
-}
-
-.voiceselect.open > .options {
-  display: block;
-}
-
-.current-voice {
-  color: #7f7f7f;
-}
-
-.voiceselect:not(.open) > button,
-.voiceselect .option:last-child {
-  border-radius: 0 0 3px 3px;
-}
diff --git a/toolkit/themes/shared/narrateControls.css b/toolkit/themes/shared/narrateControls.css
new file mode 100644
index 000000000000..4def74dc88b1
--- /dev/null
+++ b/toolkit/themes/shared/narrateControls.css
@@ -0,0 +1,186 @@
+:scope {
+  --border-color: #e5e5e5;
+}
+
+#narrate-toggle > svg {
+  display: block;
+  margin: 0 8px;
+}
+
+.dropdown-popup button {
+  background-color: transparent;
+}
+
+.dropdown-popup button:hover:not(:disabled) {
+  background-color: #eaeaea;
+}
+
+.narrate-row {
+  display: flex;
+  align-items: center;
+  min-height: 40px;
+  box-sizing: border-box;
+}
+
+.narrate-row:not(:first-child) {
+  border-top: 1px solid var(--border-color);
+}
+
+/* Control buttons */
+
+#narrate-control > button {
+  background-size: 24px 24px;
+  background-repeat: no-repeat;
+  background-position: center center;
+  height: 64px;
+  width: 100px;
+  border: none;
+  color: #666;
+  box-sizing: border-box;
+}
+
+#narrate-control > button:not(:first-child) {
+  border-left: 1px solid var(--border-color);
+}
+
+#narrate-skip-previous {
+  border-top-left-radius: 3px;
+  background-image: url("chrome://global/skin/narrate/back.svg");
+  -moz-context-properties: fill;
+  fill: rgb(128 128 128);
+}
+
+#narrate-skip-next {
+  border-top-right-radius: 3px;
+  background-image: url("chrome://global/skin/narrate/forward.svg");
+  -moz-context-properties: fill;
+  fill: rgb(128 128 128);
+}
+
+#narrate-skip-previous:disabled,
+#narrate-skip-next:disabled {
+  fill: rgb(128 128 128 / 50%);
+}
+
+#narrate-start-stop {
+  background-image: url("chrome://global/skin/narrate/start.svg");
+}
+
+#narrate-dropdown.speaking #narrate-start-stop {
+  background-image: url("chrome://global/skin/narrate/stop.svg");
+}
+
+/* Rate control */
+
+#narrate-rate::before, #narrate-rate::after {
+  content: '';
+  width: 48px;
+  height: 40px;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 24px auto;
+}
+
+#narrate-rate::before {
+  background-image: url("chrome://global/skin/narrate/slow.svg");
+}
+
+#narrate-rate::after {
+  background-image: url("chrome://global/skin/narrate/fast.svg");
+}
+
+#narrate-rate-input {
+  margin: 0 1px;
+  flex-grow: 1;
+}
+
+#narrate-rate-input::-moz-range-track {
+  background-color: #979797;
+  height: 2px;
+}
+
+#narrate-rate-input::-moz-range-progress {
+  background-color: #2EA3FF;
+  height: 2px;
+}
+
+#narrate-rate-input::-moz-range-thumb {
+  background-color: #808080;
+  height: 16px;
+  width: 16px;
+  border-radius: 8px;
+  border-width: 0;
+}
+
+#narrate-rate-input:active::-moz-range-thumb {
+  background-color: #2EA3FF;
+}
+
+/* Voice selection */
+
+.voiceselect {
+  width: 100%;
+}
+
+.voiceselect > button.select-toggle,
+.voiceselect > .options > button.option {
+  -moz-appearance: none;
+  border: none;
+  width: 100%;
+  min-height: 40px;
+}
+
+.voiceselect.open > button.select-toggle {
+  border-bottom: 1px solid var(--border-color);
+}
+
+.voiceselect > button.select-toggle::after {
+  content: '';
+  background-image: url("chrome://global/skin/narrate/arrow.svg");
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 12px 12px;
+  display: inline-block;
+  width: 1.5em;
+  height: 1em;
+  vertical-align: middle;
+}
+
+.voiceselect > .options > button.option:not(:first-child) {
+  border-top: 1px solid var(--border-color);
+}
+
+.voiceselect > .options > button.option  {
+  box-sizing: border-box;
+}
+
+.voiceselect > .options:not(.hovering) > button.option:focus {
+  background-color: #eaeaea;
+}
+
+.voiceselect > .options:not(.hovering) > button.option:hover:not(:focus) {
+  background-color: transparent;
+}
+
+.voiceselect > .options > button.option::-moz-focus-inner {
+  outline: none;
+  border: 0;
+}
+
+.voiceselect > .options {
+  display: none;
+  overflow-y: auto;
+}
+
+.voiceselect.open > .options {
+  display: block;
+}
+
+.current-voice {
+  color: #7f7f7f;
+}
+
+.voiceselect:not(.open) > button,
+.option:last-child {
+  border-radius: 0 0 3px 3px;
+}

From 501b6f7440979757c45abb67518be493a801a3ee Mon Sep 17 00:00:00 2001
From: Jamie Nicol <jnicol@mozilla.com>
Date: Thu, 30 Nov 2017 11:40:57 +0000
Subject: [PATCH 180/219] Bug 1421481 - Increase allowed number of webgl
 contexts on mobile. r=snorp

This was previously limited to 2 per principal and 4 total on
mobile. Mobile GPU drivers have progressed a lot since the limit was
put in place, and the strict limit is causing webcompat issues on
google maps.

Increase to 8 per principal and 16 in total, bringing us
closer in line with Chrome. Make these limits contrallable via a pref
so that if there are any problems it is easy to change.

MozReview-Commit-ID: 8Tsbrjr4KCE

--HG--
extra : rebase_source : 8efd43265a665237a8bfcb689f5fc758466bcd71
---
 dom/canvas/WebGLContext.cpp | 26 ++++++++++++--------------
 gfx/thebes/gfxPrefs.h       |  2 ++
 modules/libpref/init/all.js |  7 +++++++
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/dom/canvas/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp
index f05408e6439d..fb3f26599904 100644
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -5,6 +5,7 @@
 
 #include "WebGLContext.h"
 
+#include <algorithm>
 #include <queue>
 
 #include "AccessCheck.h"
@@ -1153,15 +1154,12 @@ WebGLContext::ClearBackbufferIfNeeded()
 void
 WebGLContext::LoseOldestWebGLContextIfLimitExceeded()
 {
-#ifdef MOZ_GFX_OPTIMIZE_MOBILE
-    // some mobile devices can't have more than 8 GL contexts overall
-    const size_t kMaxWebGLContextsPerPrincipal = 2;
-    const size_t kMaxWebGLContexts             = 4;
-#else
-    const size_t kMaxWebGLContextsPerPrincipal = 16;
-    const size_t kMaxWebGLContexts             = 32;
-#endif
-    MOZ_ASSERT(kMaxWebGLContextsPerPrincipal < kMaxWebGLContexts);
+    const size_t maxWebGLContexts = gfxPrefs::WebGLMaxContexts();
+    size_t maxWebGLContextsPerPrincipal = gfxPrefs::WebGLMaxContextsPerPrincipal();
+
+    // maxWebGLContextsPerPrincipal must be less than maxWebGLContexts
+    MOZ_ASSERT(maxWebGLContextsPerPrincipal < maxWebGLContexts);
+    maxWebGLContextsPerPrincipal = std::min(maxWebGLContextsPerPrincipal, maxWebGLContexts - 1);
 
     if (!NS_IsMainThread()) {
         // XXX mtseng: bug 709490, WebGLMemoryTracker is not thread safe.
@@ -1176,7 +1174,7 @@ WebGLContext::LoseOldestWebGLContextIfLimitExceeded()
     WebGLMemoryTracker::ContextsArrayType& contexts = WebGLMemoryTracker::Contexts();
 
     // quick exit path, should cover a majority of cases
-    if (contexts.Length() <= kMaxWebGLContextsPerPrincipal)
+    if (contexts.Length() <= maxWebGLContextsPerPrincipal)
         return;
 
     // note that here by "context" we mean "non-lost context". See the check for
@@ -1225,14 +1223,14 @@ WebGLContext::LoseOldestWebGLContextIfLimitExceeded()
         }
     }
 
-    if (numContextsThisPrincipal > kMaxWebGLContextsPerPrincipal) {
+    if (numContextsThisPrincipal > maxWebGLContextsPerPrincipal) {
         GenerateWarning("Exceeded %zu live WebGL contexts for this principal, losing the "
-                        "least recently used one.", kMaxWebGLContextsPerPrincipal);
+                        "least recently used one.", maxWebGLContextsPerPrincipal);
         MOZ_ASSERT(oldestContextThisPrincipal); // if we reach this point, this can't be null
         const_cast<WebGLContext*>(oldestContextThisPrincipal)->LoseContext();
-    } else if (numContexts > kMaxWebGLContexts) {
+    } else if (numContexts > maxWebGLContexts) {
         GenerateWarning("Exceeded %zu live WebGL contexts, losing the least "
-                        "recently used one.", kMaxWebGLContexts);
+                        "recently used one.", maxWebGLContexts);
         MOZ_ASSERT(oldestContext); // if we reach this point, this can't be null
         const_cast<WebGLContext*>(oldestContext)->LoseContext();
     }
diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
index 64a22c9b6637..d9c06fb73a4e 100644
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -742,6 +742,8 @@ private:
   DECL_GFX_PREF(Once, "webgl.force-layers-readback",           WebGLForceLayersReadback, bool, false);
   DECL_GFX_PREF(Live, "webgl.force-index-validation",          WebGLForceIndexValidation, int32_t, 0);
   DECL_GFX_PREF(Live, "webgl.lose-context-on-memory-pressure", WebGLLoseContextOnMemoryPressure, bool, false);
+  DECL_GFX_PREF(Once, "webgl.max-contexts",                    WebGLMaxContexts, uint32_t, 32);
+  DECL_GFX_PREF(Once, "webgl.max-contexts-per-principal",      WebGLMaxContextsPerPrincipal, uint32_t, 16);
   DECL_GFX_PREF(Live, "webgl.max-warnings-per-context",        WebGLMaxWarningsPerContext, uint32_t, 32);
   DECL_GFX_PREF(Live, "webgl.min_capability_mode",             WebGLMinCapabilityMode, bool, false);
   DECL_GFX_PREF(Live, "webgl.msaa-force",                      WebGLForceMSAA, bool, false);
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index b802cbd3f62f..c6b0b5a6342b 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4698,6 +4698,13 @@ pref("webgl.force-index-validation", 0);
 pref("webgl.lose-context-on-memory-pressure", false);
 pref("webgl.can-lose-context-in-foreground", true);
 pref("webgl.restore-context-when-visible", true);
+#ifdef ANDROID
+pref("webgl.max-contexts", 16);
+pref("webgl.max-contexts-per-principal", 8);
+#else
+pref("webgl.max-contexts", 32);
+pref("webgl.max-contexts-per-principal", 16);
+#endif
 pref("webgl.max-warnings-per-context", 32);
 pref("webgl.enable-draft-extensions", false);
 pref("webgl.enable-privileged-extensions", false);

From 96903a4e476ecc5db5264263b9d05ea5057e67e8 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Fri, 1 Dec 2017 19:12:49 +0100
Subject: [PATCH 181/219] Bug 1422363 - Enable
 readability-static-accessed-through-instance in the static analysis r=andi

MozReview-Commit-ID: H65g81ZCSfp

--HG--
extra : rebase_source : 37797c334c55e3679026801e19d28ed8b49a3b4c
---
 tools/clang-tidy/config.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/clang-tidy/config.yaml b/tools/clang-tidy/config.yaml
index e85f32914409..4355b675d35e 100644
--- a/tools/clang-tidy/config.yaml
+++ b/tools/clang-tidy/config.yaml
@@ -55,6 +55,8 @@ clang_checkers:
    publish: !!bool yes
  - name: readability-redundant-smartptr-get
    publish: !!bool no
+ - name: readability-static-accessed-through-instance
+   publish: !!bool yes
  - name: readability-uniqueptr-delete-release
    publish: !!bool yes
  - name: modernize-use-auto

From 3ee7081a6a1e05c86f7a6c6613dd8adda81f9a23 Mon Sep 17 00:00:00 2001
From: Andreas Tolfsen <ato@sny.no>
Date: Sun, 3 Dec 2017 18:02:09 +0000
Subject: [PATCH 182/219] Bug 1422604 - Add -z shorthand for --headless to
 Marionette harness. r=whimboo

MozReview-Commit-ID: FsNihTuRTMl

--HG--
extra : rebase_source : 0615901f22296de79a09a40858889c4c7338a679
---
 testing/marionette/harness/marionette_harness/runner/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/marionette/harness/marionette_harness/runner/base.py b/testing/marionette/harness/marionette_harness/runner/base.py
index 0e18915458d6..4e50d5a85ba8 100644
--- a/testing/marionette/harness/marionette_harness/runner/base.py
+++ b/testing/marionette/harness/marionette_harness/runner/base.py
@@ -356,7 +356,7 @@ class BaseMarionetteArguments(ArgumentParser):
                           dest='e10s',
                           default=True,
                           help='Disable e10s when running marionette tests.')
-        self.add_argument("--headless",
+        self.add_argument("-z", "--headless",
                           action="store_true",
                           dest="headless",
                           default=os.environ.get("MOZ_HEADLESS", False),

From f4e0f16e442002a55fb9b7c4d63961db77538291 Mon Sep 17 00:00:00 2001
From: Johann Hofmann <jhofmann@mozilla.com>
Date: Wed, 24 May 2017 22:04:01 +0200
Subject: [PATCH 183/219] Bug 1364208 - Consider local IP address form actions
 secure for the insecure password warning. r=MattN

We whitelist local IP addresses for the in-content insecure password warning,
but many of them will have forms that point to e.g., /login.php. That should
not show the insecure password warning either.

MozReview-Commit-ID: KozEWAqKGIA

--HG--
extra : rebase_source : b9d55d687307067a2aecfa6f139975fbe62f0319
---
 toolkit/components/passwordmgr/InsecurePasswordUtils.jsm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/passwordmgr/InsecurePasswordUtils.jsm b/toolkit/components/passwordmgr/InsecurePasswordUtils.jsm
index b986607d1c21..e2d131292e6d 100644
--- a/toolkit/components/passwordmgr/InsecurePasswordUtils.jsm
+++ b/toolkit/components/passwordmgr/InsecurePasswordUtils.jsm
@@ -76,7 +76,10 @@ this.InsecurePasswordUtils = {
 
       if (uri.schemeIs("http")) {
         isFormSubmitHTTP = true;
-        if (gContentSecurityManager.isOriginPotentiallyTrustworthy(principal)) {
+        if (gContentSecurityManager.isOriginPotentiallyTrustworthy(principal) ||
+            // Ignore sites with local IP addresses pointing to local forms.
+            (this._isPrincipalForLocalIPAddress(aForm.rootElement.nodePrincipal) &&
+             this._isPrincipalForLocalIPAddress(principal))) {
           isFormSubmitSecure = true;
         }
       } else {

From 95288d7450ad4f30c44357b9cb33de5ebf8c1270 Mon Sep 17 00:00:00 2001
From: Andreas Tolfsen <ato@sny.no>
Date: Sun, 3 Dec 2017 15:48:13 +0000
Subject: [PATCH 184/219] Bug 1422593 - Pretty print WindowProxy and
 ChromeWindow. r=whimboo

Enhances format.pprint to also provide pretty-printing of WindowProxy
and ChromeWindow prototypes.

Unfortunately there is no good way of testing this because
Object.prototype.toString.call always gets the underlying prototype.

MozReview-Commit-ID: 5sKzJvpWVyc

--HG--
extra : rebase_source : ca021d78a19c49ad2c2a381832d25c201ee8b2e0
---
 testing/marionette/format.js | 59 ++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/testing/marionette/format.js b/testing/marionette/format.js
index de11f712eded..2a9413b30aaa 100644
--- a/testing/marionette/format.js
+++ b/testing/marionette/format.js
@@ -4,8 +4,14 @@
 
 "use strict";
 
+const {utils: Cu} = Components;
+
+Cu.import("resource://gre/modules/Log.jsm");
+
 this.EXPORTED_SYMBOLS = ["pprint", "truncate"];
 
+const log = Log.repository.getLogger("Marionette");
+
 const MAX_STRING_LENGTH = 250;
 
 /**
@@ -22,22 +28,21 @@ const MAX_STRING_LENGTH = 250;
  *     let htmlElement = document.querySelector("input#foo");
  *     pprint`Expected element ${htmlElement}`;
  *     => 'Expected element <input id="foo" class="bar baz" type="input">'
+ *
+ *     pprint`Current window: ${window}`;
+ *     => '[object Window https://www.mozilla.org/]'
  * </code></pre>
  */
 function pprint(ss, ...values) {
-  function prettyObject(obj) {
-    let proto = Object.prototype.toString.call(obj);
-    let s = "";
-    try {
-      s = JSON.stringify(obj);
-    } catch (e) {
-      if (e instanceof TypeError) {
-        s = `<${e.message}>`;
-      } else {
-        throw e;
-      }
+  function pretty(val) {
+    let proto = Object.prototype.toString.call(val);
+
+    if (val && val.nodeType === 1) {
+      return prettyElement(val);
+    } else if (["[object Window]", "[object ChromeWindow]"].includes(proto)) {
+      return prettyWindowGlobal(val);
     }
-    return proto + " " + s;
+    return prettyObject(val);
   }
 
   function prettyElement(el) {
@@ -53,20 +58,36 @@ function pprint(ss, ...values) {
     return `<${el.localName}${idents}>`;
   }
 
+  function prettyWindowGlobal(win) {
+    let proto = Object.prototype.toString.call(win);
+    return `[${proto.substring(1, proto.length - 1)} ${win.location}]`;
+  }
+
+  function prettyObject(obj) {
+    let proto = Object.prototype.toString.call(obj);
+    let s = "";
+    try {
+      s = JSON.stringify(obj);
+    } catch (e) {
+      if (e instanceof TypeError) {
+        s = `<${e.message}>`;
+      } else {
+        throw e;
+      }
+    }
+    return `${proto} ${s}`;
+  }
+
   let res = [];
   for (let i = 0; i < ss.length; i++) {
     res.push(ss[i]);
     if (i < values.length) {
-      let val = values[i];
       let s;
       try {
-        if (val && val.nodeType === 1) {
-          s = prettyElement(val);
-        } else {
-          s = prettyObject(val);
-        }
+        s = pretty(values[i]);
       } catch (e) {
-        s = typeof val;
+        log.warn("Problem pretty printing:", e);
+        s = typeof values[i];
       }
       res.push(s);
     }

From 0ac75ab2f7ef7c57e2dad097e55b17aeda210766 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Mon, 4 Dec 2017 12:20:26 +0000
Subject: [PATCH 185/219] Bug 1422727 - Removed some unused functions and
 variables from browser.js. r=florian

MozReview-Commit-ID: IKs5MFFxUp3

--HG--
extra : rebase_source : feed07fdc63301f02488726178ee60ca20a1391a
---
 browser/base/content/browser.js | 50 ---------------------------------
 1 file changed, 50 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 7e0ff64a1dec..4a3662be1910 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2287,33 +2287,6 @@ function BrowserOpenTab(event) {
   openUILinkIn(BROWSER_NEW_TAB_URL, where, { relatedToCurrent });
 }
 
-/* Called from the openLocation dialog. This allows that dialog to instruct
-   its opener to open a new window and then step completely out of the way.
-   Anything less byzantine is causing horrible crashes, rather believably,
-   though oddly only on Linux. */
-function delayedOpenWindow(chrome, flags, href, postData) {
-  // The other way to use setTimeout,
-  // setTimeout(openDialog, 10, chrome, "_blank", flags, url),
-  // doesn't work here.  The extra "magic" extra argument setTimeout adds to
-  // the callback function would confuse gBrowserInit.onLoad() by making
-  // window.arguments[1] be an integer instead of null.
-  setTimeout(function() { openDialog(chrome, "_blank", flags, href, null, null, postData); }, 10);
-}
-
-/* Required because the tab needs time to set up its content viewers and get the load of
-   the URI kicked off before becoming the active content area. */
-function delayedOpenTab(aUrl, aReferrer, aCharset, aPostData, aAllowThirdPartyFixup) {
-  gBrowser.loadOneTab(aUrl, {
-    referrerURI: aReferrer,
-    charset: aCharset,
-    postData: aPostData,
-    inBackground: false,
-    allowThirdPartyFixup: aAllowThirdPartyFixup,
-    // Bug 1367168: only use systemPrincipal till we can remove that function
-    triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
-  });
-}
-
 var gLastOpenDirectory = {
   _lastDir: null,
   get path() {
@@ -3540,15 +3513,6 @@ var PrintPreviewListener = {
   },
 };
 
-function getMarkupDocumentViewer() {
-  return gBrowser.markupDocumentViewer;
-}
-
-// This function is obsolete. Newer code should use <tooltip page="true"/> instead.
-function FillInHTMLTooltip(tipElement) {
-  document.getElementById("aHTMLTooltip").fillInPageTooltip(tipElement);
-}
-
 var browserDragAndDrop = {
   canDropLink: aEvent => Services.droppedLinkHandler.canDropLink(aEvent, true),
 
@@ -6332,20 +6296,6 @@ var gPageStyleMenu = {
   },
 };
 
-/* Legacy global page-style functions */
-var stylesheetFillPopup = gPageStyleMenu.fillPopup.bind(gPageStyleMenu);
-function stylesheetSwitchAll(contentWindow, title) {
-  // We ignore the contentWindow param. Add-ons don't appear to use
-  // it, and it's difficult to support in e10s (where it will be a
-  // CPOW).
-  gPageStyleMenu.switchStyleSheet(title);
-}
-function setStyleDisabled(disabled) {
-  if (disabled)
-    gPageStyleMenu.disableStyle();
-}
-
-
 var LanguageDetectionListener = {
   init() {
     window.messageManager.addMessageListener("Translation:DocumentState", msg => {

From 6c19d68c0e108ab3596e6e1196fbed28ec659e09 Mon Sep 17 00:00:00 2001
From: Bharat Raghunathan <bharatraghunthan9767@gmail.com>
Date: Mon, 4 Dec 2017 10:35:38 +0530
Subject: [PATCH 186/219] Bug 1422648 - Removed instances of
 nsSocketTransport::mNetAddrPreResolved r=valentin

MozReview-Commit-ID: 2qJ1l7KJKK2

--HG--
extra : rebase_source : 829aad4ada7abe27b3656bf1a90c507e8e31fa9d
---
 netwerk/base/nsSocketTransport2.cpp | 6 ------
 netwerk/base/nsSocketTransport2.h   | 1 -
 2 files changed, 7 deletions(-)

diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp
index 505b384fdeba..e74f866b0081 100644
--- a/netwerk/base/nsSocketTransport2.cpp
+++ b/netwerk/base/nsSocketTransport2.cpp
@@ -784,7 +784,6 @@ nsSocketTransport::nsSocketTransport()
     , mResolving(false)
     , mNetAddrIsSet(false)
     , mSelfAddrIsSet(false)
-    , mNetAddrPreResolved(false)
     , mLock("nsSocketTransport.mLock")
     , mFD(this)
     , mFDref(0)
@@ -1071,11 +1070,6 @@ nsSocketTransport::ResolveHost()
 
     nsresult rv;
 
-    if (mNetAddrPreResolved) {
-        mState = STATE_RESOLVING;
-        return PostEvent(MSG_DNS_LOOKUP_COMPLETE, NS_OK, nullptr);
-    }
-
     if (!mProxyHost.IsEmpty()) {
         if (!mProxyTransparent || mProxyTransparentResolvesHost) {
 #if defined(XP_UNIX)
diff --git a/netwerk/base/nsSocketTransport2.h b/netwerk/base/nsSocketTransport2.h
index a120dca5f74d..65ff10f845b4 100644
--- a/netwerk/base/nsSocketTransport2.h
+++ b/netwerk/base/nsSocketTransport2.h
@@ -341,7 +341,6 @@ private:
     NetAddr                 mSelfAddr; // getsockname()
     Atomic<bool, Relaxed>   mNetAddrIsSet;
     Atomic<bool, Relaxed>   mSelfAddrIsSet;
-    Atomic<bool, Relaxed>   mNetAddrPreResolved;
 
     nsAutoPtr<NetAddr>      mBindAddr;
 

From 0b2f749b622f29d7d0fc3c7affb4dfc9127fa173 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Mon, 4 Dec 2017 16:28:50 +0900
Subject: [PATCH 187/219] Bug 1422668 - Back out changes of RangeBoundary.h
 which were added for EditorDOMPoint r=catalinb

EditorDOMPoint was a subclass of RangeBoundary.  Therefore, for heavy
use of it in editor, we've implemented a lot of complicated feature
into RangeBoundary.  However, EditorDOMPoint stopped inheriting
RangeBoundary.  So, we can get simple RangeBoundary implementation
back now.

This patch makes RangeBoundary.h almost same as 3f7cbec2446b except
keeps implementing GetPreviousSiblingOfChildAtOffset() and
GetNextSiblingOfChildAtOffset() because the former is used by
Selection and both of them are simple.  And also keeps making it
a friend of EditorDOMPoint because EditorDOMPoint still needs to
copy to/from RangeBoundary.

MozReview-Commit-ID: Hr5SA52ScK0

--HG--
extra : rebase_source : a00a46ff931a5c4fcabf910510fa448b513f50c5
---
 dom/base/RangeBoundary.h          | 311 +++++-------------------------
 dom/base/nsRange.cpp              |   7 -
 editor/libeditor/EditorDOMPoint.h |  16 +-
 3 files changed, 62 insertions(+), 272 deletions(-)

diff --git a/dom/base/RangeBoundary.h b/dom/base/RangeBoundary.h
index 1ffac2fbb719..ead48adf82c5 100644
--- a/dom/base/RangeBoundary.h
+++ b/dom/base/RangeBoundary.h
@@ -11,8 +11,6 @@
 #include "nsIContent.h"
 #include "mozilla/Maybe.h"
 
-class nsRange;
-
 namespace mozilla {
 
 template<typename T, typename U>
@@ -50,10 +48,6 @@ class RangeBoundaryBase
   template<typename T, typename U>
   friend class EditorDOMPointBase;
 
-  // nsRange needs to use InvalidOffset() which requires mRef initialized
-  // before it's called.
-  friend class ::nsRange;
-
   friend void ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback&,
                                           RangeBoundary&, const char*,
                                           uint32_t);
@@ -78,29 +72,22 @@ public:
     , mRef(nullptr)
     , mOffset(mozilla::Some(aOffset))
   {
-    if (!mParent) {
-      mOffset.reset();
+    if (mParent && mParent->IsContainerNode()) {
+      // Find a reference node
+      if (aOffset == static_cast<int32_t>(aContainer->GetChildCount())) {
+        mRef = aContainer->GetLastChild();
+      } else if (aOffset != 0) {
+        mRef = mParent->GetChildAt(aOffset - 1);
+      }
+
+      NS_WARNING_ASSERTION(mRef || aOffset == 0,
+                           "Constructing RangeBoundary with invalid value");
     }
+
+    NS_WARNING_ASSERTION(!mRef || mRef->GetParentNode() == mParent,
+                         "Constructing RangeBoundary with invalid value");
   }
 
-protected:
-  RangeBoundaryBase(nsINode* aContainer, nsIContent* aRef, int32_t aOffset)
-    : mParent(aContainer)
-    , mRef(aRef)
-    , mOffset(mozilla::Some(aOffset))
-  {
-    MOZ_RELEASE_ASSERT(aContainer,
-      "This constructor shouldn't be used when pointing nowhere");
-    if (!mRef) {
-      MOZ_ASSERT(!mParent->IsContainerNode() || mOffset.value() == 0);
-      return;
-    }
-    MOZ_ASSERT(mOffset.value() > 0);
-    MOZ_ASSERT(mParent == mRef->GetParentNode());
-    MOZ_ASSERT(mParent->GetChildAt(mOffset.value() - 1) == mRef);
-  }
-
-public:
   RangeBoundaryBase()
     : mParent(nullptr)
     , mRef(nullptr)
@@ -119,7 +106,6 @@ public:
   nsIContent*
   Ref() const
   {
-    EnsureRef();
     return mRef;
   }
 
@@ -135,7 +121,6 @@ public:
     if (!mParent || !mParent->IsContainerNode()) {
       return nullptr;
     }
-    EnsureRef();
     if (!mRef) {
       MOZ_ASSERT(Offset() == 0, "invalid RangeBoundary");
       return mParent->GetFirstChild();
@@ -155,7 +140,6 @@ public:
     if (NS_WARN_IF(!mParent) || NS_WARN_IF(!mParent->IsContainerNode())) {
       return nullptr;
     }
-    EnsureRef();
     if (NS_WARN_IF(!mRef->GetNextSibling())) {
       // Already referring the end of the container.
       return nullptr;
@@ -174,7 +158,6 @@ public:
     if (NS_WARN_IF(!mParent) || NS_WARN_IF(!mParent->IsContainerNode())) {
       return nullptr;
     }
-    EnsureRef();
     if (NS_WARN_IF(!mRef)) {
       // Already referring the start of the container.
       return nullptr;
@@ -188,155 +171,57 @@ public:
     if (mOffset.isSome()) {
       return mOffset.value();
     }
+
     if (!mParent) {
-      MOZ_ASSERT(!mRef);
       return 0;
     }
-    MOZ_ASSERT(mParent->IsContainerNode(),
-      "If the container cannot have children, mOffset.isSome() should be true");
+
     MOZ_ASSERT(mRef);
     MOZ_ASSERT(mRef->GetParentNode() == mParent);
-    if (!mRef->GetPreviousSibling()) {
-      mOffset = mozilla::Some(1);
-      return mOffset.value();
-    }
-    if (!mRef->GetNextSibling()) {
-      mOffset = mozilla::Some(mParent->GetChildCount());
-      return mOffset.value();
-    }
-    // Use nsINode::IndexOf() as the last resort due to being expensive.
     mOffset = mozilla::Some(mParent->IndexOf(mRef) + 1);
+
     return mOffset.value();
   }
 
-  /**
-   * Set() sets a point to aOffset or aChild.
-   * If it's set with offset, mRef is invalidated.  If it's set with aChild,
-   * mOffset may be invalidated unless the offset can be computed simply.
-   */
+  void
+  InvalidateOffset()
+  {
+    MOZ_ASSERT(mParent);
+    MOZ_ASSERT(mParent->IsContainerNode(), "Range is positioned on a text node!");
+
+    if (!mRef) {
+      MOZ_ASSERT(mOffset.isSome() && mOffset.value() == 0,
+                 "Invalidating offset of invalid RangeBoundary?");
+      return;
+    }
+    mOffset.reset();
+  }
+
   void
   Set(nsINode* aContainer, int32_t aOffset)
   {
     mParent = aContainer;
-    mRef = nullptr;
-    mOffset = mozilla::Some(aOffset);
-  }
-  void
-  Set(const nsINode* aChild)
-  {
-    MOZ_ASSERT(aChild);
-    if (!aChild->IsContent()) {
-      Clear();
-      return;
-    }
-    mParent = aChild->GetParentNode();
-    mRef = aChild->GetPreviousSibling();
-    if (!mRef) {
-      mOffset = mozilla::Some(0);
+    if (mParent && mParent->IsContainerNode()) {
+      // Find a reference node
+      if (aOffset == static_cast<int32_t>(aContainer->GetChildCount())) {
+        mRef = aContainer->GetLastChild();
+      } else if (aOffset == 0) {
+        mRef = nullptr;
+      } else {
+        mRef = mParent->GetChildAt(aOffset - 1);
+        MOZ_ASSERT(mRef);
+      }
+
+      NS_WARNING_ASSERTION(mRef || aOffset == 0,
+                           "Setting RangeBoundary to invalid value");
     } else {
-      mOffset.reset();
-    }
-  }
-
-  /**
-   * Clear() makes the instance not point anywhere.
-   */
-  void
-  Clear()
-  {
-    mParent = nullptr;
-    mRef = nullptr;
-    mOffset.reset();
-  }
-
-  /**
-   * AdvanceOffset() tries to reference next sibling of mRef if its container
-   * can have children or increments offset if the container is a text node or
-   * something.
-   * If the container can have children and there is no next sibling, this
-   * outputs warning and does nothing.  So, callers need to check if there is
-   * next sibling which you need to refer.
-   *
-   * @return            true if there is a next sibling to refer.
-   */
-  bool
-  AdvanceOffset()
-  {
-    if (NS_WARN_IF(!mParent)) {
-      return false;
-    }
-    EnsureRef();
-    if (!mRef) {
-      if (!mParent->IsContainerNode()) {
-        // In text node or something, just increment the offset.
-        MOZ_ASSERT(mOffset.isSome());
-        if (NS_WARN_IF(mOffset.value() == mParent->Length())) {
-          // Already referring the end of the node.
-          return false;
-        }
-        mOffset = mozilla::Some(mOffset.value() + 1);
-        return true;
-      }
-      mRef = mParent->GetFirstChild();
-      if (NS_WARN_IF(!mRef)) {
-        // No children in the container.
-        mOffset = mozilla::Some(0);
-        return false;
-      }
-      mOffset = mozilla::Some(1);
-      return true;
+      mRef = nullptr;
     }
 
-    nsIContent* nextSibling = mRef->GetNextSibling();
-    if (NS_WARN_IF(!nextSibling)) {
-      // Already referring the end of the container.
-      return false;
-    }
-    mRef = nextSibling;
-    if (mOffset.isSome()) {
-      mOffset = mozilla::Some(mOffset.value() + 1);
-    }
-    return true;
-  }
+    mOffset = mozilla::Some(aOffset);
 
-  /**
-   * RewindOffset() tries to reference next sibling of mRef if its container
-   * can have children or decrements offset if the container is a text node or
-   * something.
-   * If the container can have children and there is no next previous, this
-   * outputs warning and does nothing.  So, callers need to check if there is
-   * previous sibling which you need to refer.
-   *
-   * @return            true if there is a previous sibling to refer.
-   */
-  bool
-  RewindOffset()
-  {
-    if (NS_WARN_IF(!mParent)) {
-      return false;
-    }
-    EnsureRef();
-    if (!mRef) {
-      if (NS_WARN_IF(mParent->IsContainerNode())) {
-        // Already referring the start of the container
-        mOffset = mozilla::Some(0);
-        return false;
-      }
-      // In text node or something, just decrement the offset.
-      MOZ_ASSERT(mOffset.isSome());
-      if (NS_WARN_IF(mOffset.value() == 0)) {
-        // Already referring the start of the node.
-        return false;
-      }
-      mOffset = mozilla::Some(mOffset.value() - 1);
-      return true;
-    }
-
-    mRef = mRef->GetPreviousSibling();
-    if (mOffset.isSome()) {
-      mOffset = mozilla::Some(mOffset.value() - 1);
-    }
-    return true;
+    NS_WARNING_ASSERTION(!mRef || mRef->GetParentNode() == mParent,
+                         "Setting RangeBoundary to invalid value");
   }
 
   void
@@ -364,13 +249,10 @@ public:
       return false;
     }
 
-    if (mRef && mRef->GetParentNode() != mParent) {
-      return false;
+    if (Ref()) {
+      return Ref()->GetParentNode() == Container();
     }
-    if (mOffset.isSome() && mOffset.value() > mParent->Length()) {
-      return false;
-    }
-    return true;
+    return Offset() <= Container()->Length();
   }
 
   bool
@@ -414,54 +296,8 @@ public:
   template<typename A, typename B>
   bool operator==(const RangeBoundaryBase<A, B>& aOther) const
   {
-    if (mParent != aOther.mParent) {
-      return false;
-    }
-
-    if (mOffset.isSome() && aOther.mOffset.isSome()) {
-      // If both mOffset are set, we need to compare both mRef too because
-      // the relation of mRef and mOffset have already broken by DOM tree
-      // changes.
-      if (mOffset != aOther.mOffset) {
-        return false;
-      }
-      if (mRef == aOther.mRef) {
-        return true;
-      }
-      if (NS_WARN_IF(mRef && aOther.mRef)) {
-        // In this case, relation between mRef and mOffset of one of or both of
-        // them doesn't match with current DOM tree since the DOM tree might
-        // have been changed after computing mRef or mOffset.
-        return false;
-      }
-      // If one of mRef hasn't been computed yet, we should compare them only
-      // with mOffset.  Perhaps, we shouldn't copy mRef from non-nullptr one to
-      // nullptr one since if we copy it here, it may be unexpected behavior for
-      // some callers.
-      return true;
-    }
-
-    if (mOffset.isSome() && !mRef &&
-        !aOther.mOffset.isSome() && aOther.mRef) {
-      // If this has only mOffset and the other has only mRef, this needs to
-      // compute mRef now.
-      EnsureRef();
-      return mRef == aOther.mRef;
-    }
-
-    if (!mOffset.isSome() && mRef &&
-        aOther.mOffset.isSome() && !aOther.mRef) {
-      // If this has only mRef and the other has only mOffset, the other needs
-      // to compute mRef now.
-      aOther.EnsureRef();
-      return mRef == aOther.mRef;
-    }
-
-    // If mOffset of one of them hasn't been computed from mRef yet, we should
-    // compare only with mRef.  Perhaps, we shouldn't copy mOffset from being
-    // some one to not being some one since if we copy it here, it may be
-    // unexpected behavior for some callers.
-    return mRef == aOther.mRef;
+    return mParent == aOther.mParent &&
+      (mRef ? mRef == aOther.mRef : mOffset == aOther.mOffset);
   }
 
   template<typename A, typename B>
@@ -470,50 +306,9 @@ public:
     return !(*this == aOther);
   }
 
-protected:
-  /**
-   * InvalidOffset() is error prone method, unfortunately.  If somebody
-   * needs to call this method, it needs to call EnsureRef() before changing
-   * the position of the referencing point.
-   */
-  void
-  InvalidateOffset()
-  {
-    MOZ_ASSERT(mParent);
-    MOZ_ASSERT(mParent->IsContainerNode(),
-               "Range is positioned on a text node!");
-    MOZ_ASSERT(mRef || (mOffset.isSome() && mOffset.value() == 0),
-               "mRef should be computed before a call of InvalidateOffset()");
-
-    if (!mRef) {
-      return;
-    }
-    mOffset.reset();
-  }
-
-  void
-  EnsureRef() const
-  {
-    if (mRef) {
-      return;
-    }
-    if (!mParent) {
-      MOZ_ASSERT(!mOffset.isSome());
-      return;
-    }
-    MOZ_ASSERT(mOffset.isSome());
-    MOZ_ASSERT(mOffset.value() <= mParent->Length());
-    if (!mParent->IsContainerNode() ||
-        mOffset.value() == 0) {
-      return;
-    }
-    mRef = mParent->GetChildAt(mOffset.value() - 1);
-    MOZ_ASSERT(mRef);
-  }
-
 private:
   ParentType mParent;
-  mutable RefType mRef;
+  RefType mRef;
 
   mutable mozilla::Maybe<uint32_t> mOffset;
 };
diff --git a/dom/base/nsRange.cpp b/dom/base/nsRange.cpp
index 70b9a14e2bc5..29e742164b0a 100644
--- a/dom/base/nsRange.cpp
+++ b/dom/base/nsRange.cpp
@@ -1021,13 +1021,6 @@ nsRange::DoSetRange(const RawRangeBoundary& aStart,
   mStart = aStart;
   mEnd = aEnd;
 
-  // If RangeBoundary is initialized with a container node and offset in it,
-  // its mRef may not have been initialized yet.  However, nsRange will need to
-  // adjust the offset when the node position is changed.  In such case,
-  // RangeBoundary::mRef needs to be initialized for recomputing offset later.
-  mStart.EnsureRef();
-  mEnd.EnsureRef();
-
   mIsPositioned = !!mStart.Container();
   if (checkCommonAncestor) {
     nsINode* oldCommonAncestor = mRegisteredCommonAncestor;
diff --git a/editor/libeditor/EditorDOMPoint.h b/editor/libeditor/EditorDOMPoint.h
index c95f95f5109c..aa1733dd8566 100644
--- a/editor/libeditor/EditorDOMPoint.h
+++ b/editor/libeditor/EditorDOMPoint.h
@@ -585,15 +585,17 @@ public:
       return RawRangeBoundary(mParent, mOffset.value());
     }
     if (mIsChildInitialized && mOffset.isSome()) {
-      // If we've already set both child and offset, we should use both of them
-      // to create RangeBoundaryBase instance because the constructor will
-      // validate the relation in debug build.
+      // If we've already set both child and offset, we should create
+      // RangeBoundary with offset after validation.
+#ifdef DEBUG
       if (mChild) {
-        return RawRangeBoundary(mParent, mChild->GetPreviousSibling(),
-                                mOffset.value());
+        MOZ_ASSERT(mParent == mChild->GetParentNode());
+        MOZ_ASSERT(mParent->GetChildAt(mOffset.value()) == mChild);
+      } else {
+        MOZ_ASSERT(mParent->Length() == mOffset.value());
       }
-      return RawRangeBoundary(mParent, mParent->GetLastChild(),
-                              mOffset.value());
+#endif // #ifdef DEBUG
+      return RawRangeBoundary(mParent,  mOffset.value());
     }
     // Otherwise, we should create RangeBoundaryBase only with available
     // information.

From 9e9a48523bce63c812b588bf705fa497cd5b7001 Mon Sep 17 00:00:00 2001
From: David Teller <dteller@mozilla.com>
Date: Wed, 18 Oct 2017 10:49:47 +0100
Subject: [PATCH 188/219] Bug 1377007 - Adding a SpiderMonkey compilation flag
 for BinAST;r=ted

MozReview-Commit-ID: qJ6SY8YlQ2

--HG--
extra : rebase_source : 7aedde8309069cdaa2f9626b2c6a118626a3ed1b
---
 js/moz.configure | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/js/moz.configure b/js/moz.configure
index 4075cb516d9c..5dfa23b2e8ba 100644
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -408,3 +408,17 @@ def enable_pipeline_operator(value):
 
 set_config('ENABLE_PIPELINE_OPERATOR', enable_pipeline_operator)
 set_define('ENABLE_PIPELINE_OPERATOR', enable_pipeline_operator)
+
+
+
+# Experimental support for BinAST
+# ==============================================================
+
+@depends(target, milestone)
+def enable_build_binast(target, milestone):
+    # For reasons unknown at this time, BinAST causes timeouts on win32.
+    if milestone.is_nightly and not (target.kernel == 'WINNT' and target.cpu == 'x86'):
+        return True
+
+set_define('JS_BUILD_BINAST', enable_build_binast)
+set_config('JS_BUILD_BINAST', enable_build_binast)

From a848a751c31185ae54339dbac4e5b6b3e0a71528 Mon Sep 17 00:00:00 2001
From: David Teller <dteller@mozilla.com>
Date: Wed, 13 Sep 2017 15:30:19 +0200
Subject: [PATCH 189/219] Bug 1377007 - Implementation of the Token Reader
 dedicated to testing;r=arai,jorendorff

This patch ports to SpiderMonkey the tokenizer currently implemented
in the external binjs-ref tool.

While this tokenizer will clearly not be the tokenizer eventually
shipped to end-users (whether in Firefox or in binjs-ref), the plan is
to keep it both in binjs-ref and in SpiderMonkey (Nightly only) as a
tool for helping test the higher layers of Binjs.

MozReview-Commit-ID: 1i6XnVIf8p5

--HG--
extra : rebase_source : cad7016695ca6a5f35c3a9911264fa4fc470b949
---
 js/src/frontend/BinToken.cpp                  |  29 +
 js/src/frontend/BinToken.h                    | 201 +++++++
 js/src/frontend/BinTokenReaderTester.cpp      | 529 ++++++++++++++++++
 js/src/frontend/BinTokenReaderTester.h        | 356 ++++++++++++
 .../tokenizer/tester/test-empty-list.binjs    | Bin 0 -> 21 bytes
 .../tester/test-empty-untagged-tuple.binjs    |   1 +
 .../tokenizer/tester/test-nested-lists.binjs  | Bin 0 -> 90 bytes
 .../tokenizer/tester/test-simple-string.binjs | Bin 0 -> 34 bytes
 .../tester/test-simple-tagged-tuple.binjs     | Bin 0 -> 81 bytes
 .../tester/test-string-with-escapes.binjs     | Bin 0 -> 44 bytes
 .../tokenizer/tester/test-trivial-list.binjs  | Bin 0 -> 69 bytes
 .../tester/test-trivial-untagged-tuple.binjs  | Bin 0 -> 63 bytes
 js/src/jsapi-tests/moz.build                  |   5 +
 js/src/jsapi-tests/testBinASTReader.cpp       | 164 ++++++
 .../jsapi-tests/testBinTokenReaderTester.cpp  | 318 +++++++++++
 js/src/moz.build                              |   7 +
 16 files changed, 1610 insertions(+)
 create mode 100644 js/src/frontend/BinToken.cpp
 create mode 100644 js/src/frontend/BinToken.h
 create mode 100644 js/src/frontend/BinTokenReaderTester.cpp
 create mode 100644 js/src/frontend/BinTokenReaderTester.h
 create mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-empty-list.binjs
 create mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-empty-untagged-tuple.binjs
 create mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-nested-lists.binjs
 create mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-simple-string.binjs
 create mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-simple-tagged-tuple.binjs
 create mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-string-with-escapes.binjs
 create mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-trivial-list.binjs
 create mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-trivial-untagged-tuple.binjs
 create mode 100644 js/src/jsapi-tests/testBinASTReader.cpp
 create mode 100644 js/src/jsapi-tests/testBinTokenReaderTester.cpp

diff --git a/js/src/frontend/BinToken.cpp b/js/src/frontend/BinToken.cpp
new file mode 100644
index 000000000000..75b0754b3fae
--- /dev/null
+++ b/js/src/frontend/BinToken.cpp
@@ -0,0 +1,29 @@
+#include "frontend/BinToken.h"
+
+#include <sys/types.h>
+
+namespace js {
+namespace frontend {
+
+const char* BINKIND_DESCRIPTIONS[] = {
+#define WITH_KIND(_, SPEC_NAME) #SPEC_NAME,
+    FOR_EACH_BIN_KIND(WITH_KIND)
+#undef WITH_KIND
+};
+
+const char* BINFIELD_DESCRIPTIONS[] = {
+    #define WITH_FIELD(_, SPEC_NAME) #SPEC_NAME,
+        FOR_EACH_BIN_FIELD(WITH_FIELD)
+    #undef WITH_FIELD
+};
+
+const char* describeBinKind(const BinKind& kind) {
+    return BINKIND_DESCRIPTIONS[static_cast<size_t>(kind)];
+}
+
+const char* describeBinField(const BinField& field) {
+    return BINFIELD_DESCRIPTIONS[static_cast<size_t>(field)];
+}
+
+} // namespace frontend
+} // namespace js
\ No newline at end of file
diff --git a/js/src/frontend/BinToken.h b/js/src/frontend/BinToken.h
new file mode 100644
index 000000000000..3f2cff616c72
--- /dev/null
+++ b/js/src/frontend/BinToken.h
@@ -0,0 +1,201 @@
+#ifndef frontend_BinToken_h
+#define frontend_BinToken_h
+
+/**
+ * Definition of Binary AST tokens.
+ *
+ * In the Binary AST world, an AST is composed of nodes, where a node is
+ * defined by:
+ * - a Kind (see `BinKind`);
+ * - a list of fields, where each field is:
+ *    - a Name (see `BinField`);
+ *    - a Value, which may be either a node or a primitive value.
+ *
+ * The mapping between Kind and list of fields is determined entirely by
+ * the grammar of Binary AST. The mapping between (Kind, Name) and the structure
+ * of Value is also determined entirely by the grammar of Binary AST.
+ *
+ * As per the specifications of Binary AST, kinds may be added as the language
+ * grows, but never removed. The mapping between Kind and list of fields may
+ * also change to add new fields or make some fields optional, but may never
+ * remove a field. Finally, the mapping between (Kind, Name) and the structure
+ * of Value may be modified to add new possible values, but never to remove a
+ * value.
+ *
+ * A Binary AST parser must be able to fail gracefully when confronted with
+ * unknown Kinds or Names.
+ *
+ * At the time of this writing, the Binary AST defined from the Babylon AST
+ * (see https://github.com/babel/babylon/blob/master/ast/spec.md) restricted
+ * to ES5, with a few amendments to store additional scoping data and to
+ * represent the empty AST.
+ *
+ * Future versions of the Binary AST will progressively grow to encompass ES6
+ * and beyond.
+ */
+
+namespace js {
+namespace frontend {
+
+ /**
+ * The different kinds of Binary AST nodes, as per the specifications of
+ * Binary AST.
+ *
+ * These kinds match roughly with the `ParseNodeKind` used internally.
+ *
+ * Usage:
+ *
+ * ```c++
+ * #define WITH_KIND(CPP_NAME, SPEC_NAME) ...
+ * FOR_EACH_BIN_KIND(WITH_KIND)
+ * ```
+ *
+ *
+ * (sorted by alphabetical order)
+ */
+#define FOR_EACH_BIN_KIND(F) \
+    F(ArrayExpression, ArrayExpression) \
+    F(AssignmentExpression, AssignmentExpression) \
+    F(AssignmentOperator, AssignmentOperator) \
+    F(BinaryExpression, BinaryExpression) \
+    F(BinaryOperator, BinaryOperator) \
+    F(BINJS_Scope, BINJS:Scope) \
+    F(BlockStatement, BlockStatement) \
+    F(BooleanLiteral, BooleanLiteral) \
+    F(BracketExpression, BracketExpression) \
+    F(BreakStatement, BreakStatement) \
+    F(CallExpression, CallExpression) \
+    F(CatchClause, CatchClause) \
+    F(ComputedPropertyName, ComputedPropertyName) \
+    F(ConditionalExpression, ConditionalExpression) \
+    F(ContinueStatement, ContinueStatement) \
+    F(DebuggerStatement, DebuggerStatement) \
+    F(Declaration, Declaration) \
+    F(Directive, Directive) \
+    F(DirectiveLiteral, DirectiveLiteral) \
+    F(DotExpression, DotExpression) \
+    F(DoWhileStatement, DoWhileStatement) \
+    F(Elision, Elision) \
+    F(EmptyStatement, EmptyStatement) \
+    F(Expression, Expression) \
+    F(ExpressionStatement, ExpressionStatement) \
+    F(ForStatement, ForStatement) \
+    F(ForInStatement, ForInStatement) \
+    F(FunctionExpression, FunctionExpression) \
+    F(FunctionDeclaration, FunctionDeclaration) \
+    F(Identifier, Identifier) \
+    F(IfStatement, IfStatement) \
+    F(LabeledStatement, LabeledStatement) \
+    F(Literal, Literal) \
+    F(LogicalExpression, LogicalExpression) \
+    F(LogicalOperator, LogicalOperator) \
+    F(NewExpression, NewExpression) \
+    F(NullLiteral, NullLiteral) \
+    F(NumericLiteral, NumericLiteral) \
+    F(ObjectExpression, ObjectExpression) \
+    F(ObjectGetter, ObjectGetter) \
+    F(ObjectMethod, ObjectMethod) \
+    F(ObjectSetter, ObjectSetter) \
+    F(ObjectProperty, ObjectProperty) \
+    F(Pattern, Pattern) \
+    F(Program, Program) \
+    F(PropertyKind, PropertyKind) \
+    F(RegExpLiteral, RegExpLiteral) \
+    F(ReturnStatement, ReturnStatement) \
+    F(SequenceExpression, SequenceExpression) \
+    F(StringLiteral, StringLiteral) \
+    F(Statement, Statement) \
+    F(SwitchCase, SwitchCase) \
+    F(SwitchStatement, SwitchStatement) \
+    F(ThisExpression, ThisExpression) \
+    F(ThrowStatement, ThrowStatement) \
+    F(TryStatement, TryStatement) \
+    F(UnaryExpression, UnaryExpression) \
+    F(UnaryOperator, UnaryOperator) \
+    F(UpdateExpression, UpdateExpression) \
+    F(UpdateOperator, UpdateOperator) \
+    F(VariableDeclaration, VariableDeclaration) \
+    F(VariableDeclarator, VariableDeclarator) \
+    F(VariableKind, VariableKind) \
+    F(WhileStatement, WhileStatement) \
+    F(WithStatement, WithStatement)
+
+enum class BinKind {
+#define EMIT_ENUM(name, _) name,
+    FOR_EACH_BIN_KIND(EMIT_ENUM)
+#undef EMIT_ENUM
+    BINKIND_LIMIT /* domain size */
+};
+
+const char* describeBinKind(const BinKind& kind);
+
+/**
+ * The different fields of Binary AST nodes, as per the specifications of
+ * Binary AST.
+ *
+ * Usage:
+ *
+ * ```c++
+ * #define WITH_FIELD(CPP_NAME, SPEC_NAME) ...
+ * FOR_EACH_BIN_FIELD(WITH_FIELD)
+ * ```
+ *
+ * (sorted by alphabetical order)
+ */
+ #define FOR_EACH_BIN_FIELD(F) \
+    F(Alternate, alternate) \
+    F(Argument, argument) \
+    F(Arguments, arguments) \
+    F(BINJS_CapturedNames, BINJS:CapturedNames) \
+    F(BINJS_ConstDeclaredNames, BINJS:ConstDeclaredNames) \
+    F(BINJS_HasDirectEval, BINJS:HasDirectEval) \
+    F(BINJS_LetDeclaredNames, BINJS:LetDeclaredNames) \
+    F(BINJS_VarDeclaredNames, BINJS:VarDeclaredNames) \
+    F(BINJS_Scope, BINJS:Scope) \
+    F(Block, block) \
+    F(Callee, callee) \
+    F(Cases, cases) \
+    F(Consequent, consequent) \
+    F(Body, body) \
+    F(Declarations, declarations) \
+    F(Directives, directives) \
+    F(Discriminant, discriminant) \
+    F(Elements, elements) \
+    F(Expression, expression) \
+    F(Expressions, expressions) \
+    F(Finalizer, finalizer) \
+    F(Flags, flags) \
+    F(Handler, handler) \
+    F(Id, id) \
+    F(Init, init) \
+    F(Key, key) \
+    F(Kind, kind) \
+    F(Label, label) \
+    F(Left, left) \
+    F(Name, name) \
+    F(Object, object) \
+    F(Operator, operator) \
+    F(Param, param) \
+    F(Params, params) \
+    F(Pattern, pattern) \
+    F(Prefix, prefix) \
+    F(Properties, properties) \
+    F(Property, property) \
+    F(Right, right) \
+    F(Test, test) \
+    F(Update, update) \
+    F(Value, value)
+
+enum class BinField {
+#define EMIT_ENUM(name, _) name,
+    FOR_EACH_BIN_FIELD(EMIT_ENUM)
+#undef EMIT_ENUM
+    BINFIELD_LIMIT /* domain size */
+};
+
+const char* describeBinField(const BinField& kind);
+
+} // namespace frontend
+} // namespace js
+
+#endif // frontend_BinToken_h
diff --git a/js/src/frontend/BinTokenReaderTester.cpp b/js/src/frontend/BinTokenReaderTester.cpp
new file mode 100644
index 000000000000..2962a3f88808
--- /dev/null
+++ b/js/src/frontend/BinTokenReaderTester.cpp
@@ -0,0 +1,529 @@
+#include "frontend/BinTokenReaderTester.h"
+
+#include "mozilla/EndianUtils.h"
+#include "gc/Zone.h"
+
+namespace js {
+namespace frontend {
+
+using BinFields = BinTokenReaderTester::BinFields;
+using AutoList = BinTokenReaderTester::AutoList;
+using AutoTaggedTuple = BinTokenReaderTester::AutoTaggedTuple;
+using AutoTuple = BinTokenReaderTester::AutoTuple;
+
+BinTokenReaderTester::BinTokenReaderTester(JSContext* cx, const uint8_t* start, const size_t length)
+    : cx_(cx)
+    , start_(start)
+    , current_(start)
+    , stop_(start + length)
+    , latestKnownGoodPos_(0)
+{ }
+
+BinTokenReaderTester::BinTokenReaderTester(JSContext* cx, const Vector<uint8_t>& chars)
+    : cx_(cx)
+    , start_(chars.begin())
+    , current_(chars.begin())
+    , stop_(chars.end())
+    , latestKnownGoodPos_(0)
+{ }
+
+bool
+BinTokenReaderTester::raiseError(const char* description)
+{
+    MOZ_ASSERT(!cx_->isExceptionPending());
+    TokenPos pos;
+    latestTokenPos(pos);
+    JS_ReportErrorASCII(cx_, "BinAST parsing error: %s at offsets %u => %u",
+                        description, pos.begin, pos.end);
+    return false;
+}
+
+bool
+BinTokenReaderTester::readBuf(uint8_t* bytes, uint32_t len)
+{
+    MOZ_ASSERT(!cx_->isExceptionPending());
+    MOZ_ASSERT(len > 0);
+
+    if (stop_ < current_ + len)
+        return raiseError("Buffer exceeds length");
+
+    for (uint32_t i = 0; i < len; ++i)
+        *bytes++ = *current_++;
+
+    return true;
+}
+
+bool
+BinTokenReaderTester::readByte(uint8_t* byte)
+{
+    return readBuf(byte, 1);
+}
+
+
+// Nullable booleans:
+//
+// 0 => false
+// 1 => true
+// 2 => null
+bool
+BinTokenReaderTester::readMaybeBool(Maybe<bool>& result)
+{
+    updateLatestKnownGood();
+    uint8_t byte;
+    if (!readByte(&byte))
+        return false;
+
+    switch (byte) {
+      case 0:
+        result = Some(false);
+        break;
+      case 1:
+        result = Some(true);
+        break;
+      case 2:
+        result = Nothing();
+        break;
+      default:
+        return raiseError("Invalid boolean value");
+    }
+    return true;
+}
+
+bool
+BinTokenReaderTester::readBool(bool& out)
+{
+    Maybe<bool> result;
+
+    if (!readMaybeBool(result))
+        return false;
+
+    if (result.isNothing())
+        return raiseError("Empty boolean value");
+
+    out = *result;
+    return true;
+}
+
+// Nullable doubles (little-endian)
+//
+// 0x7FF0000000000001 (signaling NaN) => null
+// anything other 64 bit sequence => IEEE-764 64-bit floating point number
+bool
+BinTokenReaderTester::readMaybeDouble(Maybe<double>& result)
+{
+    updateLatestKnownGood();
+
+    uint8_t bytes[8];
+    MOZ_ASSERT(sizeof(bytes) == sizeof(double));
+    if (!readBuf(reinterpret_cast<uint8_t*>(bytes), ArrayLength(bytes)))
+        return false;
+
+    // Decode little-endian.
+    const uint64_t asInt = LittleEndian::readUint64(bytes);
+
+    if (asInt == 0x7FF0000000000001) {
+        result = Nothing();
+    } else {
+        // Canonicalize NaN, just to make sure another form of signalling NaN
+        // doesn't slip past us.
+        const double asDouble = CanonicalizeNaN(BitwiseCast<double>(asInt));
+        result = Some(asDouble);
+    }
+
+    return true;
+}
+
+bool
+BinTokenReaderTester::readDouble(double& out)
+{
+    Maybe<double> result;
+
+    if (!readMaybeDouble(result))
+        return false;
+
+    if (result.isNothing())
+        return raiseError("Empty double value");
+
+    out = *result;
+    return true;
+}
+
+// Internal uint32_t
+//
+// Encoded as 4 bytes, little-endian.
+bool
+BinTokenReaderTester::readInternalUint32(uint32_t* result)
+{
+    uint8_t bytes[4];
+    MOZ_ASSERT(sizeof(bytes) == sizeof(uint32_t));
+    if (!readBuf(bytes, 4))
+        return false;
+
+    // Decode little-endian.
+    *result = LittleEndian::readUint32(bytes);
+
+    return true;
+}
+
+
+
+// Nullable strings:
+// - "<string>" (not counted in byte length)
+// - byte length (not counted in byte length)
+// - bytes (UTF-8)
+// - "</string>" (not counted in byte length)
+//
+// The special sequence of bytes `[255, 0]` (which is an invalid UTF-8 sequence)
+// is reserved to `null`.
+bool
+BinTokenReaderTester::readMaybeChars(Maybe<Chars>& out)
+{
+    updateLatestKnownGood();
+
+    if (!readConst("<string>"))
+        return false;
+
+    // 1. Read byteLength
+    uint32_t byteLen;
+    if (!readInternalUint32(&byteLen))
+        return false;
+
+    // 2. Reject if we can't read
+    if (current_ + byteLen < current_) // Check for overflows
+        return raiseError("Arithmetics overflow: string is too long");
+
+    if (current_ + byteLen > stop_)
+        return raiseError("Not enough bytes to read chars");
+
+    // 3. Check null string (no allocation)
+    if (byteLen == 2 && *current_ == 255 && *(current_ + 1) == 0) {
+        // Special case: null string.
+        out = Nothing();
+        current_ += byteLen;
+        return true;
+    }
+
+    // 4. Other strings (bytes are copied)
+    out.emplace(cx_);
+    if (!out->resize(byteLen)) {
+        ReportOutOfMemory(cx_);
+        return false;
+    }
+    PodCopy(out->begin(), current_, byteLen);
+    current_ += byteLen;
+
+    if (!readConst("</string>"))
+        return false;
+
+    return true;
+}
+
+bool
+BinTokenReaderTester::readChars(Chars& out)
+{
+    Maybe<Chars> result;
+
+    if (!readMaybeChars(result))
+        return false;
+
+    if (result.isNothing())
+        return raiseError("Empty string");
+
+    out = Move(*result);
+    return true;
+}
+
+template <size_t N>
+bool
+BinTokenReaderTester::matchConst(const char (&value)[N])
+{
+    MOZ_ASSERT(N > 0);
+    MOZ_ASSERT(value[N - 1] == 0);
+    MOZ_ASSERT(!cx_->isExceptionPending());
+
+    if (current_ + N - 1 > stop_)
+        return false;
+
+    // Perform lookup, without side-effects.
+    if (!std::equal(current_, current_ + N - 1 /*implicit NUL*/, value))
+        return false;
+
+    // Looks like we have a match. Now perform side-effects
+    current_ += N - 1;
+    updateLatestKnownGood();
+    return true;
+}
+
+
+// Untagged tuple:
+// - "<tuple>";
+// - contents (specified by the higher-level grammar);
+// - "</tuple>"
+bool
+BinTokenReaderTester::enterUntaggedTuple(AutoTuple& guard)
+{
+    if (!readConst("<tuple>"))
+        return false;
+
+    guard.init();
+    return true;
+}
+
+template <size_t N>
+bool
+BinTokenReaderTester::readConst(const char (&value)[N])
+{
+    updateLatestKnownGood();
+    if (!matchConst(value))
+        return raiseError("Could not find expected literal");
+
+    return true;
+}
+
+// Tagged tuples:
+// - "<tuple>"
+// - "<head>"
+// - non-null string `name`, followed by \0 (see `readString()`);
+// - uint32_t number of fields;
+// - array of `number of fields` non-null strings followed each by \0 (see `readString()`);
+// - "</head>"
+// - content (specified by the higher-level grammar);
+// - "</tuple>"
+bool
+BinTokenReaderTester::enterTaggedTuple(BinKind& tag, BinFields& fields, AutoTaggedTuple& guard)
+{
+    // Header
+    if (!readConst("<tuple>"))
+        return false;
+
+    if (!readConst("<head>"))
+        return false;
+
+    // This would probably be much faster with a HashTable, but we don't
+    // really care about the speed of BinTokenReaderTester.
+    do {
+
+#define FIND_MATCH(CONSTRUCTOR, NAME) \
+        if (matchConst(#NAME "\0")) { \
+            tag = BinKind::CONSTRUCTOR; \
+            break; \
+        } // else
+
+        FOR_EACH_BIN_KIND(FIND_MATCH)
+#undef FIND_MATCH
+
+        // else
+        return raiseError("Invalid tag");
+    } while(false);
+
+    // Now fields.
+    uint32_t fieldNum;
+    if (!readInternalUint32(&fieldNum))
+        return false;
+
+    fields.clear();
+    if (!fields.reserve(fieldNum))
+        return raiseError("Out of memory");
+
+    for (uint32_t i = 0; i < fieldNum; ++i) {
+        // This would probably be much faster with a HashTable, but we don't
+        // really care about the speed of BinTokenReaderTester.
+        BinField field;
+        do {
+
+#define FIND_MATCH(CONSTRUCTOR, NAME) \
+            if (matchConst(#NAME "\0")) { \
+                field = BinField::CONSTRUCTOR; \
+                break; \
+            } // else
+
+            FOR_EACH_BIN_FIELD(FIND_MATCH)
+#undef FIND_MATCH
+
+            // else
+            return raiseError("Invalid field");
+        } while (false);
+
+        // Make sure that we do not have duplicate fields.
+        // Search is linear, but again, we don't really care
+        // in this implementation.
+        for (uint32_t j = 0; j < i; ++j) {
+            if (fields[j] == field) {
+                return raiseError("Duplicate field");
+            }
+        }
+
+        fields.infallibleAppend(field); // Already checked.
+    }
+
+    // End of header
+
+    if (!readConst("</head>"))
+        return false;
+
+    // Enter the body.
+    guard.init();
+    return true;
+}
+
+// List:
+//
+// - "<list>" (not counted in byte length);
+// - uint32_t byte length (not counted in byte length);
+// - uint32_t number of items;
+// - contents (specified by higher-level grammar);
+// - "</list>" (not counted in byte length)
+//
+// The total byte length of `number of items` + `contents` must be `byte length`.
+bool
+BinTokenReaderTester::enterList(uint32_t& items, AutoList& guard)
+{
+    if (!readConst("<list>"))
+        return false;
+
+    uint32_t byteLen;
+    if (!readInternalUint32(&byteLen))
+        return false;
+
+    const uint8_t* stop = current_ + byteLen;
+
+    if (stop < current_) // Check for overflows
+        return raiseError("Arithmetics overflow: list is too long");
+
+    if (stop > this->stop_)
+        return raiseError("Incorrect list length");
+
+    guard.init(stop);
+
+    if (!readInternalUint32(&items))
+        return false;
+
+    return true;
+}
+
+void
+BinTokenReaderTester::updateLatestKnownGood()
+{
+    MOZ_ASSERT(current_ >= start_);
+    const size_t update = current_ - start_;
+    MOZ_ASSERT(update >= latestKnownGoodPos_);
+    latestKnownGoodPos_ = update;
+}
+
+size_t
+BinTokenReaderTester::offset() const
+{
+    return latestKnownGoodPos_;
+}
+
+void
+BinTokenReaderTester::latestTokenPos(TokenPos& pos)
+{
+    pos.begin = latestKnownGoodPos_;
+    pos.end = current_ - start_;
+    MOZ_ASSERT(pos.end >= pos.begin);
+}
+
+void
+BinTokenReaderTester::AutoBase::init()
+{
+    initialized_ = true;
+}
+
+BinTokenReaderTester::AutoBase::AutoBase(BinTokenReaderTester& reader)
+    : reader_(reader)
+{ }
+
+BinTokenReaderTester::AutoBase::~AutoBase()
+{
+    // By now, the `AutoBase` must have been deinitialized by calling `done()`.
+    // The only case in which we can accept not calling `done()` is if we have
+    // bailed out because of an error.
+    MOZ_ASSERT_IF(initialized_, reader_.cx_->isExceptionPending());
+}
+
+bool
+BinTokenReaderTester::AutoBase::checkPosition(const uint8_t* expectedEnd)
+{
+    if (reader_.current_ != expectedEnd)
+        return reader_.raiseError("Caller did not consume the expected set of bytes");
+
+    return true;
+}
+
+BinTokenReaderTester::AutoList::AutoList(BinTokenReaderTester& reader)
+    : AutoBase(reader)
+{ }
+
+void
+BinTokenReaderTester::AutoList::init(const uint8_t* expectedEnd)
+{
+    AutoBase::init();
+    this->expectedEnd_ = expectedEnd;
+}
+
+bool
+BinTokenReaderTester::AutoList::done()
+{
+    MOZ_ASSERT(initialized_);
+    initialized_ = false;
+    if (reader_.cx_->isExceptionPending()) {
+        // Already errored, no need to check further.
+        return false;
+    }
+
+    // Check that we have consumed the exact number of bytes.
+    if (!checkPosition(expectedEnd_))
+        return false;
+
+    // Check suffix.
+    if (!reader_.readConst("</list>"))
+        return false;
+
+    return true;
+}
+
+BinTokenReaderTester::AutoTaggedTuple::AutoTaggedTuple(BinTokenReaderTester& reader)
+    : AutoBase(reader)
+{ }
+
+bool
+BinTokenReaderTester::AutoTaggedTuple::done()
+{
+    MOZ_ASSERT(initialized_);
+    initialized_ = false;
+    if (reader_.cx_->isExceptionPending()) {
+        // Already errored, no need to check further.
+        return false;
+    }
+
+    // Check suffix.
+    if (!reader_.readConst("</tuple>"))
+        return false;
+
+    return true;
+}
+
+BinTokenReaderTester::AutoTuple::AutoTuple(BinTokenReaderTester& reader)
+    : AutoBase(reader)
+{ }
+
+bool
+BinTokenReaderTester::AutoTuple::done()
+{
+    MOZ_ASSERT(initialized_);
+    initialized_ = false;
+    if (reader_.cx_->isExceptionPending()) {
+        // Already errored, no need to check further.
+        return false;
+    }
+
+    // Check suffix.
+    if (!reader_.readConst("</tuple>"))
+        return false;
+
+    return true;
+}
+
+} // namespace frontend
+} // namespace js
diff --git a/js/src/frontend/BinTokenReaderTester.h b/js/src/frontend/BinTokenReaderTester.h
new file mode 100644
index 000000000000..45418f1249d2
--- /dev/null
+++ b/js/src/frontend/BinTokenReaderTester.h
@@ -0,0 +1,356 @@
+#ifndef frontend_BinTokenReaderTester_h
+#define frontend_BinTokenReaderTester_h
+
+#include "mozilla/Maybe.h"
+
+#include "frontend/BinToken.h"
+#include "frontend/TokenStream.h"
+
+#include "js/TypeDecls.h"
+
+#if !defined(NIGHTLY_BUILD)
+#error "BinTokenReaderTester.* is designed to help test implementations of successive versions of JS BinaryAST. It is available only on Nightly."
+#endif // !defined(NIGHTLY_BUILD)
+
+namespace js {
+namespace frontend {
+
+using namespace mozilla;
+using namespace JS;
+
+/**
+ * A token reader for a simple, alternative serialization format for BinAST.
+ *
+ * This serialization format, which is also supported by the reference
+ * implementation of the BinAST compression suite, is designed to be
+ * mostly human-readable and easy to check for all sorts of deserialization
+ * errors. While this format is NOT designed to be shipped to end-users, it
+ * is nevertheless a very useful tool for implementing and testing parsers.
+ *
+ * Both the format and the implementation are ridiculously inefficient:
+ *
+ * - the underlying format tags almost all its data with e.g. `<tuple>`, `</tuple>`
+ *   to aid with detecting offset errors or format error;
+ * - the underlying format copies list of fields into every single node, instead
+ *   of keeping them once in the header;
+ * - every kind/field extraction requires memory allocation and plenty of string
+ *   comparisons;
+ * - ...
+ *
+ * This token reader is designed to be API-compatible with the standard, shipped,
+ * token reader. For these reasons:
+ *
+ * - it does not support any form of look ahead, push back;
+ * - it does not support any form of error recovery.
+ */
+class MOZ_STACK_CLASS BinTokenReaderTester
+{
+  public:
+    // A list of fields, in the order in which they appear in the stream.
+    using BinFields = Vector<BinField, 8>;
+
+    // A bunch of characters. At this stage, there is no guarantee on whether
+    // they are valid UTF-8. Future versions may replace this by slice into
+    // the buffer.
+    using Chars     = Vector<uint8_t, 32>;
+
+    class AutoList;
+    class AutoTuple;
+    class AutoTaggedTuple;
+
+  public:
+    /**
+     * Construct a token reader.
+     *
+     * Does NOT copy the buffer.
+     */
+    BinTokenReaderTester(JSContext* cx, const uint8_t* start, const size_t length);
+
+    /**
+     * Construct a token reader.
+     *
+     * Does NOT copy the buffer.
+     */
+    BinTokenReaderTester(JSContext* cx, const Vector<uint8_t>& chars);
+
+    // --- Primitive values.
+    //
+    // Note that the underlying format allows for a `null` value for primitive
+    // values.
+    //
+    // Reading will return an error either in case of I/O error or in case of
+    // a format problem. Reading if an exception in pending is an error and
+    // will cause assertion failures. Do NOT attempt to read once an exception
+    // has been cleared: the token reader does NOT support recovery, by design.
+
+    /**
+     * Read a single `true | false | null` value.
+     *
+     * @param out Set to `Nothing` if the data specifies that the value is `null`.
+     * Otherwise, `Some(true)` or `Some(false)`.
+     *
+     * @return false If a boolean could not be read. In this case, an error
+     * has been raised.
+     */
+    MOZ_MUST_USE bool readMaybeBool(Maybe<bool>& out);
+    MOZ_MUST_USE bool readBool(bool& out);
+
+    /**
+     * Read a single `number | null` value.
+     *
+     * @param out Set to `Nothing` if the data specifies that the value is `null`.
+     * Otherwise, `Some(x)`, where `x` is a valid `double` (i.e. either a non-NaN
+     * or a canonical NaN).
+     *
+     * @return false If a double could not be read. In this case, an error
+     * has been raised.
+     */
+    MOZ_MUST_USE bool readMaybeDouble(Maybe<double>& out);
+    MOZ_MUST_USE bool readDouble(double& out);
+
+    /**
+     * Read a single `string | null` value.
+     *
+     * @param out Set to `Nothing` if the data specifies that the value is `null`.
+     * Otherwise, `Some(x)`, where `x` is a `string`.
+     *
+     * WARNING: At this stage, the `string` encoding has NOT been validated.
+     *
+     * @return false If a string could not be read. In this case, an error
+     * has been raised.
+     */
+    MOZ_MUST_USE bool readMaybeChars(Maybe<Chars>& out);
+    MOZ_MUST_USE bool readChars(Chars& out);
+
+    // --- Composite values.
+    //
+    // The underlying format does NOT allows for a `null` composite value.
+    //
+    // Reading will return an error either in case of I/O error or in case of
+    // a format problem. Reading from a poisoned tokenizer is an error and
+    // will cause assertion failures.
+
+    /**
+     * Start reading a list.
+     *
+     * @param length (OUT) The number of elements in the list.
+     * @param guard (OUT) A guard, ensuring that we read the list correctly.
+     *
+     * The `guard` is dedicated to ensuring that reading the list has consumed
+     * exactly all the bytes from that list. The `guard` MUST therefore be
+     * destroyed at the point where the caller has reached the end of the list.
+     * If the caller has consumed too few/too many bytes, this will be reported
+     * in the call go `guard.done()`.
+     *
+     * @return out If the header of the list is invalid.
+     */
+    MOZ_MUST_USE bool enterList(uint32_t& length, AutoList& guard);
+
+    /**
+     * Start reading a tagged tuple.
+     *
+     * @param tag (OUT) The tag of the tuple.
+     * @param fields (OUT) The ORDERED list of fields encoded in this tuple.
+     * @param guard (OUT) A guard, ensuring that we read the tagged tuple correctly.
+     *
+     * The `guard` is dedicated to ensuring that reading the list has consumed
+     * exactly all the bytes from that tuple. The `guard` MUST therefore be
+     * destroyed at the point where the caller has reached the end of the tuple.
+     * If the caller has consumed too few/too many bytes, this will be reported
+     * in the call go `guard.done()`.
+     *
+     * @return out If the header of the tuple is invalid.
+     */
+    MOZ_MUST_USE bool enterTaggedTuple(BinKind& tag, BinTokenReaderTester::BinFields& fields, AutoTaggedTuple& guard);
+
+    /**
+     * Start reading an untagged tuple.
+     *
+     * @param guard (OUT) A guard, ensuring that we read the tuple correctly.
+     *
+     * The `guard` is dedicated to ensuring that reading the list has consumed
+     * exactly all the bytes from that tuple. The `guard` MUST therefore be
+     * destroyed at the point where the caller has reached the end of the tuple.
+     * If the caller has consumed too few/too many bytes, this will be reported
+     * in the call go `guard.done()`.
+     *
+     * @return out If the header of the tuple is invalid.
+     */
+    MOZ_MUST_USE bool enterUntaggedTuple(AutoTuple& guard);
+
+    /**
+     * Return the position of the latest token.
+     */
+    void latestTokenPos(TokenPos& out);
+    size_t offset() const;
+
+    /**
+     * Raise an error.
+     *
+     * Once `raiseError` has been called, the tokenizer is poisoned.
+     */
+    MOZ_MUST_USE bool raiseError(const char* description);
+
+     /**
+      * Poison this tokenizer.
+      */
+    void poison();
+
+  private:
+    /**
+     * Read a single byte.
+     */
+    MOZ_MUST_USE bool readByte(uint8_t* byte);
+
+    /**
+     * Read several bytes.
+     *
+     * If there is not enough data, or if the tokenizer has previously been
+     * poisoned, return `false` and report an exception.
+     */
+    MOZ_MUST_USE bool readBuf(uint8_t* bytes, uint32_t len);
+
+    /**
+     * Read a single uint32_t.
+     */
+    MOZ_MUST_USE bool readInternalUint32(uint32_t*);
+
+    /**
+     * Read a sequence of chars, ensuring that they match an expected
+     * sequence of chars.
+     *
+     * @param value The sequence of chars to expect, NUL-terminated. The NUL
+     * is not expected in the stream.
+     */
+     template <size_t N>
+     MOZ_MUST_USE bool readConst(const char (&value)[N]);
+
+     /**
+     * Read a sequence of chars, consuming the bytes only if they match an expected
+     * sequence of chars.
+     *
+     * @param value The sequence of chars to expect, NUL-terminated. The NUL
+     * is not expected in the stream.
+     * @return true if `value` (minus NUL) represents the next few chars in the
+     * internal buffer, false otherwise. If `true`, the chars are consumed,
+     * otherwise there is no side-effect.
+     */
+    template <size_t N>
+    MOZ_MUST_USE bool matchConst(const char (&value)[N]);
+
+    /**
+     * Update the "latest known good" position, which is used during error
+     * reporting.
+     */
+    void updateLatestKnownGood();
+
+  private:
+    JSContext* cx_;
+
+    // `true` if we have encountered an error. Errors are non recoverable.
+    // Attempting to read from a poisoned tokenizer will cause assertion errors.
+    bool poisoned_;
+
+    // The first byte of the buffer. Not owned.
+    const uint8_t* start_;
+
+    // The current position.
+    const uint8_t* current_;
+
+    // The last+1 byte of the buffer.
+    const uint8_t* stop_;
+
+
+    // Latest known good position. Used for error reporting.
+    size_t latestKnownGoodPos_;
+
+    BinTokenReaderTester(const BinTokenReaderTester&) = delete;
+    BinTokenReaderTester(BinTokenReaderTester&&) = delete;
+    BinTokenReaderTester& operator=(BinTokenReaderTester&) = delete;
+
+  public:
+    // The following classes are used whenever we encounter a tuple/tagged tuple/list
+    // to make sure that:
+    //
+    // - if the construct "knows" its byte length, we have exactly consumed all
+    //   the bytes (otherwise, this means that the file is corrupted, perhaps on
+    //   purpose, so we need to reject the stream);
+    // - if the construct has a footer, once we are done reading it, we have
+    //   reached the footer (this is to aid with debugging).
+    //
+    // In either case, the caller MUST call method `done()` of the guard once
+    // it is done reading the tuple/tagged tuple/list, to report any pending error.
+
+    // Base class used by other Auto* classes.
+    class MOZ_STACK_CLASS AutoBase
+    {
+      protected:
+        explicit AutoBase(BinTokenReaderTester& reader);
+        ~AutoBase();
+
+        // Raise an error if we are not in the expected position.
+        MOZ_MUST_USE bool checkPosition(const uint8_t* expectedPosition);
+
+        friend BinTokenReaderTester;
+        void init();
+
+        // Set to `true` if `init()` has been called. Reset to `false` once
+        // all conditions have been checked.
+        bool initialized_;
+        BinTokenReaderTester& reader_;
+    };
+
+    // Guard class used to ensure that `enterList` is used properly.
+    class MOZ_STACK_CLASS AutoList : public AutoBase
+    {
+      public:
+        explicit AutoList(BinTokenReaderTester& reader);
+
+        // Check that we have properly read to the end of the list.
+        MOZ_MUST_USE bool done();
+      protected:
+        friend BinTokenReaderTester;
+        void init(const uint8_t* expectedEnd);
+      private:
+        const uint8_t* expectedEnd_;
+    };
+
+    // Guard class used to ensure that `enterTaggedTuple` is used properly.
+    class MOZ_STACK_CLASS AutoTaggedTuple : public AutoBase
+    {
+      public:
+        explicit AutoTaggedTuple(BinTokenReaderTester& reader);
+
+        // Check that we have properly read to the end of the tuple.
+        MOZ_MUST_USE bool done();
+    };
+
+    // Guard class used to ensure that `readTuple` is used properly.
+    class MOZ_STACK_CLASS AutoTuple : public AutoBase
+    {
+      public:
+        explicit AutoTuple(BinTokenReaderTester& reader);
+
+        // Check that we have properly read to the end of the tuple.
+        MOZ_MUST_USE bool done();
+    };
+
+    // Compare a `Chars` and a string literal (ONLY a string literal).
+    template <size_t N>
+    static bool equals(const Chars& left, const char (&right)[N]) {
+        MOZ_ASSERT(N > 0);
+        MOZ_ASSERT(right[N - 1] == 0);
+        if (left.length() + 1 /* implicit NUL */ != N)
+            return false;
+
+        if (!std::equal(left.begin(), left.end(), right))
+          return false;
+
+        return true;
+    }
+};
+
+} // namespace frontend
+} // namespace js
+
+#endif // frontend_BinTokenReaderTester_h
diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-empty-list.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-empty-list.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..da01d11ad0fa16a02f162d329fb3cd7ba3977eb1
GIT binary patch
literal 21
UcmcD?$t*6hV_|>*8+|Yr05Ts0pa1{>

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-empty-untagged-tuple.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-empty-untagged-tuple.binjs
new file mode 100644
index 000000000000..a4386f1d20cd
--- /dev/null
+++ b/js/src/jsapi-tests/binast/tokenizer/tester/test-empty-untagged-tuple.binjs
@@ -0,0 +1 @@
+<tuple></tuple>
\ No newline at end of file
diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-nested-lists.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-nested-lists.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..d20681c3cc1dd283dee8568cfaa854af41335d5f
GIT binary patch
literal 90
zcmcD?$t*6h^JHLPU<6_tFwX?YVgm7sONuh{((Ram?6mxR8+|ArSv)DR2qCTy)@}o#
E0Px}%*Z=?k

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-simple-string.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-simple-string.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..4dd9869685ebb23c52fa3f61a299fb94df82428b
GIT binary patch
literal 34
fcmcC1E-A{)OSj`?U|=ZD%q_@CRe*@t=tE@y!tV>9

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-simple-tagged-tuple.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-simple-tagged-tuple.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..395fdb4476b5632e0445b8e17aa76c3f91c31a57
GIT binary patch
literal 81
zcmcC1DJ{rJwX?}cO-!*1NGvHyEy`nHVqjp%OkpTX%qdM}u+az0*%X%)W#*;ZF$3k&
X^7C!<q5OQI<^!h`IUQ{DAtnI;9z+@$

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-string-with-escapes.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-string-with-escapes.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..b895cf16b7e053f6e50dff48f37d62b6f9d30126
GIT binary patch
literal 44
pcmcC1E-A{)OScneU|@hS70NS9G89salM@S4ixn6c8Eo{SY5+ZI4gmlF

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-trivial-list.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-trivial-list.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..b92d59df5ea358770349b9bd2cb1f0b1c14eb9d8
GIT binary patch
literal 69
vcmcD?$t*6hGhtw0U;<*B;*z4wymUKeAUiET-$ozGM;1>?EJBFugS7(yf`AkA

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-trivial-untagged-tuple.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-trivial-untagged-tuple.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..7100fae76b620b7ecce0e6b7304c10ecaccd0823
GIT binary patch
literal 63
qcmcC1DJ{rJwX-QMDay=Cw_|2tU`Wf)x6z04k;Rh|ixA@a5PblXG8CBr

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/moz.build b/js/src/jsapi-tests/moz.build
index 9ea1ddf5d1a7..8f4e1484eca8 100644
--- a/js/src/jsapi-tests/moz.build
+++ b/js/src/jsapi-tests/moz.build
@@ -137,6 +137,11 @@ if CONFIG['ENABLE_STREAMS']:
         'testReadableStream.cpp',
     ]
 
+if CONFIG['JS_BUILD_BINAST']:
+    UNIFIED_SOURCES += [
+        'testBinTokenReaderTester.cpp'
+    ]
+
 DEFINES['EXPORT_JS_API'] = True
 
 LOCAL_INCLUDES += [
diff --git a/js/src/jsapi-tests/testBinASTReader.cpp b/js/src/jsapi-tests/testBinASTReader.cpp
new file mode 100644
index 000000000000..567db6db2b28
--- /dev/null
+++ b/js/src/jsapi-tests/testBinASTReader.cpp
@@ -0,0 +1,164 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+#include "mozilla/Vector.h"
+
+#include <dirent.h>
+#include <sys/stat.h>
+
+#include "frontend/BinSource.h"
+#include "frontend/FullParseHandler.h"
+#include "frontend/ParseContext.h"
+#include "frontend/Parser.h"
+
+#include "jsapi-tests/tests.h"
+
+using UsedNameTracker = js::frontend::UsedNameTracker;
+
+extern void readFull(const char* path, Vector<char>& buf);
+
+void readFull(JSContext* cx, const char* path, Vector<char16_t>& buf) {
+    buf.shrinkTo(0);
+
+    Vector<char> intermediate(cx);
+    readFull(path, intermediate);
+
+    if (!buf.appendAll(intermediate))
+        MOZ_CRASH();
+}
+
+BEGIN_TEST(testBinASTReaderECMAScript2)
+{
+    const char PATH[] = "jsapi-tests/binast/parser/tester/";
+
+    // Read the list of files in the directory.
+    DIR* dir = opendir(PATH);
+    if (!dir)
+        MOZ_CRASH();
+
+    const char BIN_SUFFIX[] = ".binjs";
+    const char TXT_SUFFIX[] = ".js";
+
+    CompileOptions options(cx);
+    options.setIntroductionType("unit test parse")
+           .setFileAndLine("<string>", 1);
+
+    while (auto entry = readdir(dir)) {
+        // Find files whose name ends with ".binjs".
+        if (entry->d_namlen < sizeof(BIN_SUFFIX))
+            continue;
+        if (strncmp(entry->d_name + entry->d_namlen - (sizeof(BIN_SUFFIX) - 1), BIN_SUFFIX, sizeof(BIN_SUFFIX)) != 0)
+            continue;
+
+        // Find text file.
+        UniqueChars txtPath(static_cast<char*>(js_malloc(entry->d_namlen + sizeof(PATH) + 1)));
+        strncpy(txtPath.get(), PATH, sizeof(PATH));
+        strncpy(txtPath.get() + sizeof(PATH) - 1, entry->d_name, entry->d_namlen);
+        strncpy(txtPath.get() + sizeof(PATH) + entry->d_namlen - sizeof(BIN_SUFFIX), TXT_SUFFIX, sizeof(TXT_SUFFIX));
+        txtPath[sizeof(PATH) + entry->d_namlen - sizeof(BIN_SUFFIX) + sizeof(TXT_SUFFIX) - 1] = 0;
+        fprintf(stderr, "Testing %s\n", txtPath.get());
+
+        // Read text file.
+        Vector<char16_t> txtSource(cx);
+        readFull(cx, txtPath.get(), txtSource);
+
+        // Parse text file.
+        UsedNameTracker txtUsedNames(cx);
+        if (!txtUsedNames.init())
+            MOZ_CRASH();
+        js::frontend::Parser<js::frontend::FullParseHandler, char16_t> parser(cx, cx->tempLifoAlloc(), options, txtSource.begin(), txtSource.length(),
+                                                  /* foldConstants = */ false, txtUsedNames, nullptr,
+                                                  nullptr);
+        if (!parser.checkOptions())
+            MOZ_CRASH();
+
+        auto txtParsed = parser.parse(); // Will be deallocated once `parser` goes out of scope.
+        RootedValue txtExn(cx);
+        if (!txtParsed) {
+            // Save exception for more detailed error message, if necessary.
+            if (!js::GetAndClearException(cx, &txtExn))
+                MOZ_CRASH();
+        }
+
+        // Read binary file.
+        UniqueChars binPath(static_cast<char*>(js_malloc(entry->d_namlen + sizeof(PATH) + 1)));
+        strncpy(binPath.get(), PATH, sizeof(PATH));
+        strncpy(binPath.get() + sizeof(PATH) - 1, entry->d_name, entry->d_namlen);
+        binPath[entry->d_namlen + sizeof(PATH) - 1] = 0;
+
+        Vector<char> binSource(cx);
+        readFull(binPath.get(), binSource);
+
+        // Parse binary file.
+        js::frontend::UsedNameTracker binUsedNames(cx);
+        if (!binUsedNames.init())
+            MOZ_CRASH();
+
+        js::frontend::BinASTParser reader(cx, cx->tempLifoAlloc(), binUsedNames, options);
+
+        auto binParsed = reader.parse(binSource); // Will be deallocated once `reader` goes out of scope.
+        RootedValue binExn(cx);
+        if (binParsed.isErr()) {
+            // Save exception for more detailed error message, if necessary.
+            if (!js::GetAndClearException(cx, &binExn))
+                MOZ_CRASH();
+        }
+
+        // The binary parser should accept the file iff the text parser has.
+        if (binParsed.isOk() && !txtParsed) {
+            fprintf(stderr, "Text file parsing failed: ");
+
+            js::ErrorReport report(cx);
+            if (!report.init(cx, txtExn, js::ErrorReport::WithSideEffects))
+                MOZ_CRASH();
+
+            PrintError(cx, stderr, report.toStringResult(), report.report(), /* reportWarnings */ true);
+            MOZ_CRASH("Binary parser accepted a file that text parser rejected");
+        }
+
+        if (binParsed.isErr() && txtParsed) {
+            fprintf(stderr, "Binary file parsing failed: ");
+
+            js::ErrorReport report(cx);
+            if (!report.init(cx, binExn, js::ErrorReport::WithSideEffects))
+                MOZ_CRASH();
+
+            PrintError(cx, stderr, report.toStringResult(), report.report(), /* reportWarnings */ true);
+            MOZ_CRASH("Binary parser rejected a file that text parser accepted");
+        }
+
+        if (binParsed.isErr()) {
+            fprintf(stderr, "Binary parser and text parser agree that %s is invalid\n", txtPath.get());
+            continue;
+        }
+
+#if defined(DEBUG) // Dumping an AST is only defined in DEBUG builds
+        // Compare ASTs.
+        Sprinter binPrinter(cx);
+        if (!binPrinter.init())
+            MOZ_CRASH();
+        DumpParseTree(binParsed.unwrap(), binPrinter);
+
+        Sprinter txtPrinter(cx);
+        if (!txtPrinter.init())
+            MOZ_CRASH();
+        DumpParseTree(txtParsed, txtPrinter);
+
+        if (strcmp(binPrinter.string(), txtPrinter.string()) != 0) {
+            fprintf(stderr, "Got distinct ASTs when parsing %s:\n\tBINARY\n%s\n\n\tTEXT\n%s\n", txtPath.get(), binPrinter.string(), txtPrinter.string());            
+            MOZ_CRASH();
+        }
+        fprintf(stderr, "Got the same AST when parsing %s\n", txtPath.get());
+
+#endif // defined(DEBUG)
+    }
+
+    return true;
+}
+END_TEST(testBinASTReaderECMAScript2)
+
diff --git a/js/src/jsapi-tests/testBinTokenReaderTester.cpp b/js/src/jsapi-tests/testBinTokenReaderTester.cpp
new file mode 100644
index 000000000000..f7ab1e5a0621
--- /dev/null
+++ b/js/src/jsapi-tests/testBinTokenReaderTester.cpp
@@ -0,0 +1,318 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <string.h>
+#include <sys/stat.h>
+
+#if defined (XP_WIN)
+#include <windows.h>
+#elif defined(XP_UNIX)
+#include <fcntl.h>
+#include <unistd.h>
+#endif // defined (XP_WIN) || defined (XP_UNIX)
+
+#include "frontend/BinTokenReaderTester.h"
+#include "gc/Zone.h"
+
+#include "js/Vector.h"
+
+#include "jsapi-tests/tests.h"
+
+using Tokenizer = js::frontend::BinTokenReaderTester;
+using Chars = Tokenizer::Chars;
+
+// Hack: These tests need access to resources, which are present in the source dir
+// but not copied by our build system. To simplify things, we chdir to the source
+// dir at the start of each test and return to the previous directory afterwards.
+
+#if defined(XP_UNIX)
+
+static int gJsDirectory(0);
+void enterJsDirectory() {
+// Save current directory.
+    MOZ_ASSERT(gJsDirectory == 0);
+    gJsDirectory = open(".", O_RDONLY);
+    MOZ_ASSERT(gJsDirectory != 0, "Could not open directory '.'");
+// Go to the directory provided by autospider, if any.
+    const char* destination = getenv("AUTOSPIDER_DIR");
+    if (destination) {
+        if (chdir(destination) == -1)
+            MOZ_CRASH_UNSAFE_PRINTF("Could not chdir to %s", destination);
+    }
+}
+void exitJsDirectory() {
+    MOZ_ASSERT(gJsDirectory);
+    if (fchdir(gJsDirectory) == -1)
+        MOZ_CRASH("Could not return to original directory");
+    if (close(gJsDirectory) != 0)
+        MOZ_CRASH("Could not close js directory");
+    gJsDirectory = 0;
+}
+
+#else
+
+char gJsDirectory[MAX_PATH] = { 0 };
+
+void enterJsDirectory() {
+    // Save current directory.
+    MOZ_ASSERT(strlen(gJsDirectory) == 0);
+    auto result = GetCurrentDirectory(MAX_PATH, gJsDirectory);
+    if (result <= 0)
+        MOZ_CRASH("Could not get current directory");
+    if (result > MAX_PATH)
+        MOZ_CRASH_UNSAFE_PRINTF("Could not get current directory: needed %ld bytes, got %ld\n", result, MAX_PATH);
+
+    // Find destination directory, if any.
+    char destination[MAX_PATH];
+    if (!GetEnvironmentVariable("AUTOSPIDER_DIR", destination, MAX_PATH)) {
+        if (GetLastError() != ERROR_ENVVAR_NOT_FOUND)
+            MOZ_CRASH("Could not get AUTOSPIDER_DIR");
+        else
+            return;
+    }
+
+    // Go to the directory.
+    if (SetCurrentDirectory(destination) != 0)
+        MOZ_CRASH_UNSAFE_PRINTF("Could not chdir to %s", destination);
+}
+
+void exitJsDirectory() {
+    MOZ_ASSERT(strlen(gJsDirectory) > 0);
+    if (SetCurrentDirectory(gJsDirectory) != 0)
+        MOZ_CRASH("Could not return to original directory");
+    gJsDirectory[0] = 0;
+}
+
+#endif // defined(XP_UNIX) || defined(XP_WIN)
+
+void readFull(const char* path, js::Vector<uint8_t>& buf) {
+    enterJsDirectory();
+    buf.shrinkTo(0);
+    FILE* in = fopen(path, "r");
+    if (!in)
+        MOZ_CRASH_UNSAFE_PRINTF("Could not open %s: %s", path, strerror(errno));
+
+    struct stat info;
+    if (stat(path, &info) < 0)
+        MOZ_CRASH_UNSAFE_PRINTF("Could not get stat on %s", path);
+
+    if (!buf.growBy(info.st_size))
+        MOZ_CRASH("OOM");
+
+    int result = fread(buf.begin(), 1, info.st_size, in);
+    if (fclose(in) != 0)
+        MOZ_CRASH("Could not close input file");
+    if (result != info.st_size)
+        MOZ_CRASH("Read error");
+    exitJsDirectory();
+}
+
+
+// Reading a simple string.
+BEGIN_TEST(testBinTokenReaderTesterSimpleString)
+{
+    js::Vector<uint8_t> contents(cx);
+    readFull("jsapi-tests/binast/tokenizer/tester/test-simple-string.binjs", contents);
+    Tokenizer tokenizer(cx, contents);
+
+    Maybe<Chars> found;
+    CHECK(tokenizer.readMaybeChars(found));
+
+    CHECK(Tokenizer::equals(*found, "simple string")); // FIXME: Find a way to make CHECK_EQUAL use `Tokenizer::equals`.
+
+    return true;
+}
+END_TEST(testBinTokenReaderTesterSimpleString)
+
+// Reading a string with embedded 0.
+BEGIN_TEST(testBinTokenReaderTesterStringWithEscapes)
+{
+    js::Vector<uint8_t> contents(cx);
+    readFull("jsapi-tests/binast/tokenizer/tester/test-string-with-escapes.binjs", contents);
+    Tokenizer tokenizer(cx, contents);
+
+    Maybe<Chars> found;
+    CHECK(tokenizer.readMaybeChars(found));
+
+    CHECK(Tokenizer::equals(*found, "string with escapes \0\1\0")); // FIXME: Find a way to make CHECK_EQUAL use `Tokenizer::equals`.
+
+    return true;
+}
+END_TEST(testBinTokenReaderTesterStringWithEscapes)
+
+// Reading an empty untagged tuple
+BEGIN_TEST(testBinTokenReaderTesterEmptyUntaggedTuple)
+{
+    js::Vector<uint8_t> contents(cx);
+    readFull("jsapi-tests/binast/tokenizer/tester/test-empty-untagged-tuple.binjs", contents);
+    Tokenizer tokenizer(cx, contents);
+
+    {
+        Tokenizer::AutoTuple guard(tokenizer);
+        CHECK(tokenizer.enterUntaggedTuple(guard));
+        CHECK(guard.done());
+    }
+
+    return true;
+}
+END_TEST(testBinTokenReaderTesterEmptyUntaggedTuple)
+
+// Reading a untagged tuple with two strings
+BEGIN_TEST(testBinTokenReaderTesterTwoStringsInTuple)
+{
+    js::Vector<uint8_t> contents(cx);
+    readFull("jsapi-tests/binast/tokenizer/tester/test-trivial-untagged-tuple.binjs", contents);
+    Tokenizer tokenizer(cx, contents);
+
+    {
+        Tokenizer::AutoTuple guard(tokenizer);
+        CHECK(tokenizer.enterUntaggedTuple(guard));
+
+        Maybe<Chars> found_0;
+        CHECK(tokenizer.readMaybeChars(found_0));
+        CHECK(Tokenizer::equals(*found_0, "foo")); // FIXME: Find a way to make CHECK_EQUAL use `Tokenizer::equals`.
+
+        Maybe<Chars> found_1;
+        CHECK(tokenizer.readMaybeChars(found_1));
+        CHECK(Tokenizer::equals(*found_1, "bar")); // FIXME: Find a way to make CHECK_EQUAL use `Tokenizer::equals`.
+
+        CHECK(guard.done());
+    }
+
+    return true;
+}
+END_TEST(testBinTokenReaderTesterTwoStringsInTuple)
+
+// Reading a tagged tuple `Pattern { id: "foo", value: 3.1415}`
+BEGIN_TEST(testBinTokenReaderTesterSimpleTaggedTuple)
+{
+    js::Vector<uint8_t> contents(cx);
+    readFull("jsapi-tests/binast/tokenizer/tester/test-simple-tagged-tuple.binjs", contents);
+    Tokenizer tokenizer(cx, contents);
+
+    {
+        js::frontend::BinKind tag;
+        Tokenizer::BinFields fields(cx);
+        Tokenizer::AutoTaggedTuple guard(tokenizer);
+        CHECK(tokenizer.enterTaggedTuple(tag, fields, guard));
+
+        CHECK(tag == js::frontend::BinKind::Pattern);
+
+        Maybe<Chars> found_id;
+        const double EXPECTED_value = 3.1415;
+        Maybe<double> found_value;
+
+        // Order of fields is not deterministic in the encoder (we could make
+        // it deterministic for the test, though, since we already know the binary).
+        if (fields[0] == js::frontend::BinField::Id) {
+            CHECK(fields[1] == js::frontend::BinField::Value);
+            CHECK(tokenizer.readMaybeChars(found_id));
+            CHECK(tokenizer.readMaybeDouble(found_value));
+        } else if (fields[0] == js::frontend::BinField::Value) {
+            CHECK(fields[1] == js::frontend::BinField::Id);
+            CHECK(tokenizer.readMaybeDouble(found_value));
+            CHECK(tokenizer.readMaybeChars(found_id));
+        } else {
+            CHECK(false);
+        }
+
+        CHECK(EXPECTED_value == *found_value); // Apparently, CHECK_EQUAL doesn't work on `double`.
+        CHECK(Tokenizer::equals(*found_id, "foo"));
+        CHECK(guard.done());
+    }
+
+    return true;
+}
+END_TEST(testBinTokenReaderTesterSimpleTaggedTuple)
+
+
+// Reading an empty list
+BEGIN_TEST(testBinTokenReaderTesterEmptyList)
+{
+    js::Vector<uint8_t> contents(cx);
+    readFull("jsapi-tests/binast/tokenizer/tester/test-empty-list.binjs", contents);
+    Tokenizer tokenizer(cx, contents);
+
+    {
+        uint32_t length;
+        Tokenizer::AutoList guard(tokenizer);
+        CHECK(tokenizer.enterList(length, guard));
+
+        CHECK(length == 0);
+        CHECK(guard.done());
+    }
+
+    return true;
+}
+END_TEST(testBinTokenReaderTesterEmptyList)
+
+// Reading `["foo", "bar"]`
+BEGIN_TEST(testBinTokenReaderTesterSimpleList)
+{
+    js::Vector<uint8_t> contents(cx);
+    readFull("jsapi-tests/binast/tokenizer/tester/test-trivial-list.binjs", contents);
+    Tokenizer tokenizer(cx, contents);
+
+    {
+        uint32_t length;
+        Tokenizer::AutoList guard(tokenizer);
+        CHECK(tokenizer.enterList(length, guard));
+
+        CHECK(length == 2);
+
+        Maybe<Chars> found_0;
+        CHECK(tokenizer.readMaybeChars(found_0));
+        CHECK(Tokenizer::equals(*found_0, "foo"));
+
+        Maybe<Chars> found_1;
+        CHECK(tokenizer.readMaybeChars(found_1));
+        CHECK(Tokenizer::equals(*found_1, "bar"));
+
+        CHECK(guard.done());
+    }
+
+    return true;
+}
+END_TEST(testBinTokenReaderTesterSimpleList)
+
+
+// Reading `[["foo", "bar"]]`
+BEGIN_TEST(testBinTokenReaderTesterNestedList)
+{
+    js::Vector<uint8_t> contents(cx);
+    readFull("jsapi-tests/binast/tokenizer/tester/test-nested-lists.binjs", contents);
+    Tokenizer tokenizer(cx, contents);
+
+    {
+        uint32_t outerLength;
+        Tokenizer::AutoList outerGuard(tokenizer);
+        CHECK(tokenizer.enterList(outerLength, outerGuard));
+        CHECK(outerLength == 1);
+
+        {
+            uint32_t innerLength;
+            Tokenizer::AutoList innerGuard(tokenizer);
+            CHECK(tokenizer.enterList(innerLength, innerGuard));
+            CHECK(innerLength == 2);
+
+            Maybe<Chars> found_0;
+            CHECK(tokenizer.readMaybeChars(found_0));
+            CHECK(Tokenizer::equals(*found_0, "foo"));
+
+            Maybe<Chars> found_1;
+            CHECK(tokenizer.readMaybeChars(found_1));
+            CHECK(Tokenizer::equals(*found_1, "bar"));
+
+            CHECK(innerGuard.done());
+        }
+
+        CHECK(outerGuard.done());
+    }
+
+    return true;
+}
+END_TEST(testBinTokenReaderTesterNestedList)
diff --git a/js/src/moz.build b/js/src/moz.build
index ddd98e0185df..dc02562ed677 100755
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -642,6 +642,13 @@ if CONFIG['NIGHTLY_BUILD']:
     DEFINES['ENABLE_SIMD'] = True
     DEFINES['ENABLE_WASM_THREAD_OPS'] = True
 
+if CONFIG['JS_BUILD_BINAST']:
+    # Some parts of BinAST are designed only to test evolutions of the
+    # specification:
+    UNIFIED_SOURCES += ['frontend/BinTokenReaderTester.cpp']
+    # The rest of BinAST should eventually move to release.
+    UNIFIED_SOURCES += ['frontend/BinToken.cpp']
+
 # Wasm code should use WASM_HUGE_MEMORY instead of JS_CODEGEN_X64
 # so that it is easy to use the huge-mapping optimization for other
 # 64-bit platforms in the future.

From 6cbd331d9e475fa32f66e17b9c26faf442579ab1 Mon Sep 17 00:00:00 2001
From: David Teller <dteller@mozilla.com>
Date: Tue, 5 Sep 2017 14:51:30 +0200
Subject: [PATCH 190/219] Bug 1377007 - GC for binjs-ref parser;r=sfink

MozReview-Commit-ID: EjZZ1ofm52t

--HG--
extra : rebase_source : f45fc9709f0c2d18baccdc27cba3476b7a610b61
---
 js/public/RootingAPI.h             | 3 +++
 js/src/frontend/BytecodeCompiler.h | 5 +++++
 js/src/gc/RootMarking.cpp          | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
index 62d3f0f1cb68..9b64ff5ded3e 100644
--- a/js/public/RootingAPI.h
+++ b/js/public/RootingAPI.h
@@ -867,6 +867,9 @@ class JS_PUBLIC_API(AutoGCRooter)
     enum {
         VALARRAY =     -2, /* js::AutoValueArray */
         PARSER =       -3, /* js::frontend::Parser */
+#if defined(JS_BUILD_BINAST)
+        BINPARSER =    -4, /* js::frontend::BinSource */
+#endif // defined(JS_BUILD_BINAST)
         VALVECTOR =   -10, /* js::AutoValueVector */
         IDVECTOR =    -11, /* js::AutoIdVector */
         OBJVECTOR =   -14, /* js::AutoObjectVector */
diff --git a/js/src/frontend/BytecodeCompiler.h b/js/src/frontend/BytecodeCompiler.h
index 82ea548279cc..97578ed4f7a7 100644
--- a/js/src/frontend/BytecodeCompiler.h
+++ b/js/src/frontend/BytecodeCompiler.h
@@ -124,6 +124,11 @@ IsKeyword(JSLinearString* str);
 void
 TraceParser(JSTracer* trc, JS::AutoGCRooter* parser);
 
+/* Trace all GC things reachable from binjs parser. Defined in BinSource.cpp. */
+void
+TraceBinParser(JSTracer* trc, JS::AutoGCRooter* parser);
+
+
 class MOZ_STACK_CLASS AutoFrontendTraceLog
 {
 #ifdef JS_TRACE_LOGGING
diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index c0ee94921941..ac9e2a2f0a58 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -153,6 +153,12 @@ AutoGCRooter::trace(JSTracer* trc)
         frontend::TraceParser(trc, this);
         return;
 
+#if defined(JS_BUILD_BINAST)
+      case BINPARSER:
+        frontend::TraceBinParser(trc, this);
+        return;
+#endif // defined(JS_BUILD_BINAST)
+
       case VALARRAY: {
         /*
          * We don't know the template size parameter, but we can safely treat it

From b6e2e4872e94d1e20ac92af9c99e37f042a96d26 Mon Sep 17 00:00:00 2001
From: David Teller <dteller@mozilla.com>
Date: Mon, 11 Sep 2017 16:54:48 +0200
Subject: [PATCH 191/219] Bug 1377007 - Implementing basic binjs-ref parser in
 SpiderMonkey;r=arai,jorendorff

This patch implements a Binary AST parser matching the latest
binjs-ref parser at this date. The subset of JS recognized matches
ES5, with an AST based on a slightly customized Babylon AST.

At this stage, the parser trusts its input, insofar as it does not
check directives or bindings. Followup patch will introduce checking
of these directives/bindings.

MozReview-Commit-ID: 1nt230rt02R

--HG--
extra : rebase_source : 1500f15c296342dcacd65d9ab12800bdea3a1258
---
 js/src/frontend/BinSource.cpp            | 2517 ++++++++++++++++++++++
 js/src/frontend/BinSource.h              |  274 +++
 js/src/frontend/BinTokenReaderTester.cpp |   17 +-
 js/src/frontend/BinTokenReaderTester.h   |    3 +-
 js/src/frontend/BytecodeCompiler.h       |    3 +
 js/src/frontend/FullParseHandler.h       |  104 +-
 js/src/frontend/ParseContext-inl.h       |   96 +
 js/src/frontend/ParseContext.h           |   26 +
 js/src/frontend/ParseNode.h              |   28 +-
 js/src/frontend/Parser.cpp               |   98 +-
 js/src/frontend/Parser.h                 |   36 +-
 js/src/frontend/SharedContext.h          |    2 +
 js/src/jsapi-tests/testBinASTReader.cpp  |   71 +-
 js/src/moz.build                         |    5 +-
 14 files changed, 3161 insertions(+), 119 deletions(-)
 create mode 100644 js/src/frontend/BinSource.cpp
 create mode 100644 js/src/frontend/BinSource.h
 create mode 100644 js/src/frontend/ParseContext-inl.h

diff --git a/js/src/frontend/BinSource.cpp b/js/src/frontend/BinSource.cpp
new file mode 100644
index 000000000000..85c23a5203d6
--- /dev/null
+++ b/js/src/frontend/BinSource.cpp
@@ -0,0 +1,2517 @@
+#include "frontend/BinSource.h"
+
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/Casting.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/Move.h"
+#include "mozilla/PodOperations.h"
+#include "mozilla/Vector.h"
+
+#include "frontend/BinTokenReaderTester.h"
+#include "frontend/FullParseHandler.h"
+#include "frontend/Parser.h"
+#include "frontend/SharedContext.h"
+
+#include "vm/RegExpObject.h"
+
+#include "frontend/ParseContext-inl.h"
+#include "frontend/ParseNode-inl.h"
+
+
+// # About compliance with EcmaScript
+//
+// For the moment, this parser implements ES5. Future versions will be extended
+// to ES6 and further on.
+//
+// By design, it does NOT implement Annex B.3.3. If possible, we would like
+// to avoid going down that rabbit hole.
+//
+//
+// # About the AST
+//
+// At this stage of experimentation, the AST specifications change often. This
+// version of the parser attempts to implement
+// https://gist.github.com/Yoric/2390f0367515c079172be2526349b294
+//
+//
+// # About validating the AST
+//
+// Normally, this implementation validates all properties of the AST *except* the
+// order of fields, which is partially constrained by the AST spec (e.g. in a block,
+// field `scope` must appear before field `body`, etc.).
+//
+//
+// # About names and scopes
+//
+// One of the key objectives of the BinAST syntax is to be able to entirely skip
+// parsing inner functions until they are needed. With a purely syntactic AST,
+// this is generally impossible, as we would need to walk the AST to find
+// lexically-bound/var-bound variables, instances of direct eval, etc.
+//
+// To achieve this, BinAST files contain scope data, as instances of
+// `BinJS:Scope` nodes. Rather than walking the AST to assign bindings
+// to scopes, we extract data from the `BinJS:Scope` and check it lazily,
+// once we actually need to walk the AST.
+//
+// WARNING: The current implementation DOES NOT perform the check yet. It
+// is therefore unsafe.
+//
+// # About directives
+//
+// Currently, directives are ignored and treated as regular strings.
+//
+// They should be treated lazily (whenever we open a subscope), like bindings.
+
+// Evaluate an expression, checking that the result is not 0.
+//
+// Throw `cx->alreadyReportedError()` if it returns 0/nullptr.
+#define TRY(EXPR) \
+    do { \
+        if (!EXPR) \
+            return cx_->alreadyReportedError(); \
+    } while(false)
+
+
+#define TRY_VAR(VAR, EXPR) \
+    do { \
+        VAR = EXPR; \
+        if (!VAR) \
+            return cx_->alreadyReportedError(); \
+    } while (false)
+
+#define TRY_DECL(VAR, EXPR) \
+    auto VAR = EXPR; \
+    if (!VAR) \
+       return cx_->alreadyReportedError();
+
+#define TRY_EMPL(VAR, EXPR) \
+    do { \
+        auto _tryEmplResult = EXPR; \
+        if (!_tryEmplResult) \
+            return cx_->alreadyReportedError(); \
+        VAR.emplace(_tryEmplResult.unwrap()); \
+    } while (false)
+
+#define MOZ_TRY_EMPLACE(VAR, EXPR) \
+    do { \
+        auto _tryEmplResult = EXPR; \
+        if (_tryEmplResult.isErr()) \
+            return ::mozilla::Err(_tryEmplResult.unwrapErr()); \
+        VAR.emplace(_tryEmplResult.unwrap()); \
+    } while (false)
+
+using namespace mozilla;
+
+namespace js {
+namespace frontend {
+
+using AutoList = BinTokenReaderTester::AutoList;
+using AutoTaggedTuple = BinTokenReaderTester::AutoTaggedTuple;
+using AutoTuple = BinTokenReaderTester::AutoTuple;
+using BinFields = BinTokenReaderTester::BinFields;
+using Chars = BinTokenReaderTester::Chars;
+using NameBag = GCHashSet<JSString*>;
+using Names = GCVector<JSString*, 8>;
+using UsedNamePtr = UsedNameTracker::UsedNameMap::Ptr;
+
+namespace {
+    // Compare a bunch of `uint8_t` values (as returned by the tokenizer_) with
+    // a string literal (and ONLY a string literal).
+    template<size_t N>
+    bool operator==(const Chars& left, const char (&right)[N]) {
+        return BinTokenReaderTester::equals(left, right);
+    }
+
+    bool isMethod(BinKind kind) {
+        switch (kind) {
+          case BinKind::ObjectMethod:
+          case BinKind::ObjectGetter:
+          case BinKind::ObjectSetter:
+            return true;
+          default:
+            return false;
+        }
+    }
+
+#if defined(DEBUG)
+    bool isMethodOrFunction(BinKind kind) {
+        if (isMethod(kind))
+            return true;
+        if (kind == BinKind::FunctionExpression || kind == BinKind::FunctionDeclaration)
+            return true;
+        return false;
+    }
+#endif // defined(DEBUG)
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parse(const Vector<uint8_t>& data)
+{
+    return parse(data.begin(), data.length());
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parse(const uint8_t* start, const size_t length)
+{
+    auto result = parseAux(start, length);
+    poison(); // Make sure that the parser is never used again accidentally.
+    return result;
+}
+
+
+JS::Result<ParseNode*>
+BinASTParser::parseAux(const uint8_t* start, const size_t length)
+{
+    tokenizer_.emplace(cx_, start, length);
+
+    Directives directives(options().strictOption);
+    GlobalSharedContext globalsc(cx_, ScopeKind::Global,
+                                 directives, options().extraWarningsOption);
+    BinParseContext globalpc(cx_, this, &globalsc, /* newDirectives = */ nullptr);
+    if (!globalpc.init())
+        return cx_->alreadyReportedError();
+
+    ParseContext::VarScope varScope(cx_, &globalpc, usedNames_);
+    if (!varScope.init(&globalpc))
+        return cx_->alreadyReportedError();
+
+    ParseNode* result(nullptr);
+    MOZ_TRY_VAR(result, parseProgram());
+
+    Maybe<GlobalScope::Data*> bindings = NewGlobalScopeData(cx_, varScope, alloc_, parseContext_);
+    if (!bindings)
+        return cx_->alreadyReportedError();
+    globalsc.bindings = *bindings;
+
+    return result; // Magic conversion to Ok.
+}
+
+Result<ParseNode*>
+BinASTParser::parseProgram()
+{
+    BinKind kind;
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    if (kind != BinKind::Program)
+        return this->raiseInvalidKind("Program", kind);
+
+    ParseNode* result;
+    MOZ_TRY_VAR(result, parseBlockStatementAux(kind, fields));
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseBlockStatement()
+{
+    BinKind kind;
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    ParseNode* result(nullptr);
+    switch (kind) {
+      default:
+        return raiseInvalidKind("BlockStatement", kind);
+      case BinKind::BlockStatement:
+        MOZ_TRY_VAR(result, parseBlockStatementAux(kind, fields));
+        break;
+    }
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<Ok>
+BinASTParser::parseAndUpdateScopeNames(ParseContext::Scope& scope, DeclarationKind kind)
+{
+    AutoList guard(*tokenizer_);
+    uint32_t length = 0;
+
+    TRY(tokenizer_->enterList(length, guard));
+    RootedAtom name(cx_);
+    for (uint32_t i = 0; i < length; ++i) {
+        name = nullptr;
+
+        MOZ_TRY(readString(&name));
+        auto ptr = scope.lookupDeclaredNameForAdd(name);
+        if (ptr) {
+            if (kind == DeclarationKind::Let || kind == DeclarationKind::Const)
+                return raiseError("Variable redeclaration");
+
+#if defined(DEBUG)
+            // FIXME: Fix binjs-ref.
+            fprintf(stderr, "Weird: `var` redeclaration. Check encoder: ");
+            name->dump();
+            fprintf(stderr, "\n");
+#endif // defined(DEBUG)
+            continue;
+        }
+
+        TRY(scope.addDeclaredName(parseContext_, ptr, name.get(), kind, tokenizer_->offset()));
+    }
+    TRY(guard.done());
+    return Ok();
+}
+
+JS::Result<Ok>
+BinASTParser::parseAndUpdateCurrentScope()
+{
+    return parseAndUpdateScope(parseContext_->varScope(), *parseContext_->innermostScope());
+}
+
+JS::Result<Ok>
+BinASTParser::parseAndUpdateScope(ParseContext::Scope& varScope, ParseContext::Scope& letScope)
+{
+    BinKind kind;
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    switch (kind) {
+      default:
+        return raiseInvalidKind("Scope", kind);
+      case BinKind::BINJS_Scope:
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::BINJS_HasDirectEval:
+                MOZ_TRY(readBool()); // Currently ignored.
+                break;
+              case BinField::BINJS_LetDeclaredNames:
+                MOZ_TRY(parseAndUpdateScopeNames(letScope, DeclarationKind::Let));
+                break;
+              case BinField::BINJS_ConstDeclaredNames:
+                MOZ_TRY(parseAndUpdateScopeNames(letScope, DeclarationKind::Const));
+                break;
+              case BinField::BINJS_VarDeclaredNames:
+                MOZ_TRY(parseAndUpdateScopeNames(varScope, DeclarationKind::Var));
+                break;
+              case BinField::BINJS_CapturedNames: {
+                Rooted<Maybe<Names>> names(cx_); //FIXME: Currently ignored.
+                MOZ_TRY(parseStringList(&names));
+                break;
+              }
+              default:
+                return raiseInvalidField("Scope", field);
+            }
+        }
+        break;
+    }
+
+    TRY(guard.done());
+    return Ok();
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseBlockStatementAux(const BinKind kind, const BinFields& fields)
+{
+    ParseContext::Statement stmt(parseContext_, StatementKind::Block);
+    ParseContext::Scope scope(cx_, parseContext_, usedNames_);
+    TRY(scope.init(parseContext_));
+
+    ParseNode* body(nullptr);
+    ParseNode* directives(nullptr); // FIXME: Largely ignored
+
+    for (auto field : fields) {
+        switch (field) {
+          case BinField::BINJS_Scope:
+            MOZ_TRY(parseAndUpdateCurrentScope());
+            break;
+          case BinField::Body:
+            MOZ_TRY_VAR(body, parseStatementList());
+            break;
+          case BinField::Directives:
+            if (kind != BinKind::Program)
+                return raiseInvalidField("BlockStatement", field);
+            MOZ_TRY_VAR(directives, parseDirectiveList());
+            break;
+          default:
+            return raiseInvalidField("BlockStatement", field);
+        }
+    }
+
+    // In case of absent optional fields, inject default values.
+    if (!body)
+        body = factory_.newStatementList(tokenizer_->pos());
+
+    MOZ_TRY_VAR(body, appendDirectivesToBody(body, directives));
+
+    ParseNode* result;
+    if (kind == BinKind::Program) {
+        result = body;
+    } else {
+        TRY_DECL(bindings, NewLexicalScopeData(cx_, scope, alloc_, parseContext_));
+        TRY_VAR(result, factory_.newLexicalScope(*bindings, body));
+    }
+
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::appendDirectivesToBody(ParseNode* body, ParseNode* directives)
+{
+    ParseNode* result = body;
+    if (directives && directives->pn_count >= 1) {
+        MOZ_ASSERT(directives->isArity(PN_LIST));
+
+        // Convert directive list to a list of strings.
+        TRY_DECL(prefix, factory_.newStatementList(directives->pn_head->pn_pos));
+        for (ParseNode* iter = directives->pn_head; iter != nullptr; iter = iter->pn_next) {
+            TRY_DECL(statement, factory_.newExprStatement(iter, iter->pn_pos.end));
+            prefix->appendWithoutOrderAssumption(statement);
+        }
+
+        // Prepend to the body.
+        ParseNode* iter = body->pn_head;
+        while (iter) {
+            ParseNode* next = iter->pn_next;
+            prefix->appendWithoutOrderAssumption(iter);
+            iter = next;
+        }
+        prefix->setKind(body->getKind());
+        prefix->setOp(body->getOp());
+        result = prefix;
+#if defined(DEBUG)
+        result->checkListConsistency();
+#endif // defined(DEBUG)
+    }
+
+    return result;
+}
+
+JS::Result<Ok>
+BinASTParser::parseStringList(MutableHandle<Maybe<Names>> out)
+{
+    MOZ_ASSERT(out.get().isNothing()); // Sanity check: the node must not have been parsed yet.
+
+    uint32_t length;
+    AutoList guard(*tokenizer_);
+
+    Names result(cx_);
+
+    TRY(tokenizer_->enterList(length, guard));
+    if (!result.reserve(length))
+        return raiseOOM();
+
+    RootedAtom string(cx_);
+    for (uint32_t i = 0; i < length; ++i) {
+        string = nullptr;
+
+        MOZ_TRY(readString(&string));
+        result.infallibleAppend(Move(string)); // Checked in the call to `reserve`.
+    }
+
+    TRY(guard.done());
+    out.set(Move(Some(Move(result))));
+    return Ok();
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseStatementList()
+{
+    uint32_t length;
+    AutoList guard(*tokenizer_);
+
+    TRY_DECL(result, factory_.newStatementList(tokenizer_->pos()));
+
+    TRY(tokenizer_->enterList(length, guard));
+    for (uint32_t i = 0; i < length; ++i) {
+        BinKind kind;
+        BinFields fields(cx_);
+        AutoTaggedTuple guard(*tokenizer_);
+
+        ParseNode* statement(nullptr);
+
+        TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+        switch (kind) {
+          case BinKind::FunctionDeclaration:
+            MOZ_TRY_VAR(statement, parseFunctionAux(kind, fields));
+            break;
+          default:
+            MOZ_TRY_VAR(statement, parseStatementAux(kind, fields));
+            break;
+        }
+
+        TRY(guard.done());
+        result->appendWithoutOrderAssumption(statement);
+    }
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseStatement()
+{
+    BinKind kind;
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    ParseNode* result;
+    MOZ_TRY_VAR(result, parseStatementAux(kind, fields));
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseStatementAux(const BinKind kind, const BinFields& fields)
+{
+    const size_t start = tokenizer_->offset();
+
+    ParseNode* result(nullptr);
+    switch (kind) {
+      case BinKind::EmptyStatement: {
+        TRY_VAR(result, factory_.newEmptyStatement(tokenizer_->pos(start)));
+        break;
+      }
+      case BinKind::BlockStatement:
+        MOZ_TRY_VAR(result, parseBlockStatementAux(kind, fields));
+        break;
+      case BinKind::ExpressionStatement:
+        MOZ_TRY_VAR(result, parseExpressionStatementAux(kind, fields));
+        break;
+      case BinKind::DebuggerStatement: {
+        TRY_VAR(result, factory_.newDebuggerStatement(tokenizer_->pos(start)));
+        break;
+      }
+      case BinKind::WithStatement: {
+        ParseNode* body(nullptr);
+        ParseNode* expr(nullptr);
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Body:
+                MOZ_TRY_VAR(body, parseStatement());
+                break;
+              case BinField::Object:
+                MOZ_TRY_VAR(expr, parseExpression());
+                break;
+              default:
+                return raiseInvalidField("WithStatement", field);
+            }
+        }
+
+        if (!body)
+            return raiseMissingField("WithStatement", BinField::Body);
+        if (!expr)
+            return raiseMissingField("WithStatement", BinField::Object);
+
+        TRY_VAR(result, factory_.newWithStatement(start, expr, body));
+
+        break;
+      }
+      case BinKind::ReturnStatement: {
+        if (!parseContext_->isFunctionBox()) {
+            // Return statements are permitted only inside functions.
+            return raiseInvalidKind("Toplevel Statement", kind);
+        }
+        parseContext_->functionBox()->usesReturn = true;
+
+        ParseNode* arg(nullptr);
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Argument:
+                MOZ_TRY_VAR(arg, parseExpression());
+                break;
+              default:
+                return raiseInvalidField("ReturnStatement", field);
+            }
+        }
+
+        TRY_VAR(result, factory_.newReturnStatement(arg, tokenizer_->pos(start)));
+
+        break;
+      }
+      case BinKind::LabeledStatement: {
+        // We check for the existence of the jump target when parsing `break label;` or `continue label;`.
+        ParseContext::Statement stmt(parseContext_, StatementKind::Label);
+        ParseNode* label(nullptr);
+        ParseNode* body(nullptr);
+
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Label:
+                MOZ_TRY_VAR(label, parseIdentifier());
+                break;
+              case BinField::Body: {
+                if (!label)  // By order of fields, `label` MUST always be before `body` in the file.
+                    return raiseMissingField("LabeledStatement", BinField::Label);
+                MOZ_ASSERT(label->name());
+                ParseContext::LabelStatement stmt(parseContext_, label->name());
+                MOZ_TRY_VAR(body, parseStatement());
+                break;
+              }
+              default:
+                return raiseInvalidField("LabeledStatement", field);
+            }
+        }
+
+        if (!label)
+            return raiseMissingField("LabeledStatement", BinField::Label);
+        if (!body)
+            return raiseMissingField("LabeledStatement", BinField::Body);
+
+        TRY_VAR(result, factory_.newLabeledStatement(label->name(), body, start));
+
+        break;
+      }
+
+      case BinKind::BreakStatement:
+      case BinKind::ContinueStatement:
+        MOZ_TRY_VAR(result, parseBreakOrContinueStatementAux(kind, fields));
+        break;
+
+      case BinKind::IfStatement: {
+        ParseContext::Statement stmt(parseContext_, StatementKind::If);
+
+        ParseNode* test(nullptr);
+        ParseNode* consequent(nullptr);
+        ParseNode* alternate(nullptr); // Optional
+
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Test:
+                MOZ_TRY_VAR(test, parseExpression());
+                break;
+              case BinField::Consequent:
+                MOZ_TRY_VAR(consequent, parseStatement());
+                break;
+              case BinField::Alternate:
+                MOZ_TRY_VAR(alternate, parseStatement());
+                break;
+              default:
+                return raiseInvalidField("IfStatement", field);
+            }
+        }
+
+        if (!test)
+            return raiseMissingField("IfStatement", BinField::Test);
+        if (!consequent)
+            return raiseMissingField("IfStatement", BinField::Consequent);
+
+        TRY_VAR(result, factory_.newIfStatement(start, test, consequent, alternate));
+
+        break;
+      }
+      case BinKind::SwitchStatement: {
+        ParseContext::Statement stmt(parseContext_, StatementKind::Switch);
+        ParseNode* discriminant(nullptr);
+        ParseNode* cases(nullptr);
+
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Discriminant: {
+                MOZ_TRY_VAR(discriminant, parseExpression());
+                break;
+              }
+              case BinField::Cases: {
+                MOZ_TRY_VAR(cases, parseSwitchCaseList());
+                break;
+              }
+              default:
+                return raiseInvalidField("SwitchStatement", field);
+            }
+        }
+
+        if (!discriminant)
+            return raiseMissingField("SwitchStatement", BinField::Discriminant);
+        if (!cases) {
+            TRY_VAR(cases, factory_.newStatementList(tokenizer_->pos()));
+
+            TRY_VAR(cases, factory_.newLexicalScope(nullptr, cases));
+        }
+
+        TRY_VAR(result, factory_.newSwitchStatement(start, discriminant, cases));
+
+        break;
+      }
+
+      case BinKind::ThrowStatement: {
+        ParseNode* arg(nullptr);
+        for (auto field : fields) {
+            if (field != BinField::Argument)
+                return raiseInvalidField("ThrowStatement", field);
+
+            MOZ_TRY_VAR(arg, parseExpression());
+        }
+
+        if (!arg)
+            return raiseMissingField("ThrowStatement", BinField::Argument);
+
+        TRY_VAR(result, factory_.newThrowStatement(arg, tokenizer_->pos(start)));
+
+        break;
+      }
+
+      case BinKind::TryStatement: {
+        ParseNode* block(nullptr);
+        ParseNode* handler(nullptr);
+        ParseNode* finalizer(nullptr);
+
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Block: {
+                ParseContext::Statement stmt(parseContext_, StatementKind::Try);
+                ParseContext::Scope scope(cx_, parseContext_, usedNames_);
+                TRY(scope.init(parseContext_));
+                MOZ_TRY_VAR(block, parseBlockStatement());
+                break;
+              }
+              case BinField::Handler:
+                MOZ_TRY_VAR(handler, parseCatchClause());
+                break;
+
+              case BinField::Finalizer: {
+                ParseContext::Statement stmt(parseContext_, StatementKind::Finally);
+                ParseContext::Scope scope(cx_, parseContext_, usedNames_);
+                TRY(scope.init(parseContext_));
+                MOZ_TRY_VAR(finalizer, parseBlockStatement());
+                break;
+              }
+
+              default:
+                return raiseInvalidField("TryStatement", field);
+            }
+        }
+
+        if (!block)
+            return raiseMissingField("TryStatement", BinField::Handler);
+        if (!handler && !finalizer)
+            return raiseMissingField("TryStatement (without catch)", BinField::Finalizer);
+
+        TRY_VAR(result, factory_.newTryStatement(start, block, handler, finalizer));
+        break;
+      }
+
+      case BinKind::WhileStatement:
+      case BinKind::DoWhileStatement: {
+        ParseContext::Statement stmt(parseContext_, kind == BinKind::WhileStatement ? StatementKind::WhileLoop : StatementKind::DoLoop);
+        ParseNode* test(nullptr);
+        ParseNode* body(nullptr);
+
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Test:
+                MOZ_TRY_VAR(test, parseExpression());
+                break;
+              case BinField::Body:
+                MOZ_TRY_VAR(body, parseStatement());
+                break;
+              default:
+                return raiseInvalidField("WhileStatement | DoWhileStatement", field);
+            }
+        }
+
+        if (!test)
+            return raiseMissingField("WhileStatement | DoWhileStatement", BinField::Test);
+        if (!body)
+            return raiseMissingField("WhileStatement | DoWhileStatement", BinField::Body);
+
+        if (kind == BinKind::WhileStatement)
+            TRY_VAR(result, factory_.newWhileStatement(start, test, body));
+        else
+            TRY_VAR(result, factory_.newDoWhileStatement(body, test, tokenizer_->pos(start)));
+
+        break;
+      }
+      case BinKind::ForStatement: {
+        ParseContext::Statement stmt(parseContext_, StatementKind::ForLoop);
+
+        // Implicit scope around the `for`, used to store `for (let x; ...; ...)`
+        // or `for (const x; ...; ...)`-style declarations. Detail on the
+        // declaration is stored as part of `BINJS_Scope`.
+        ParseContext::Scope scope(cx_, parseContext_, usedNames_);
+        TRY(scope.init(parseContext_));
+        ParseNode* init(nullptr); // Optional
+        ParseNode* test(nullptr); // Optional
+        ParseNode* update(nullptr); // Optional
+        ParseNode* body(nullptr); // Required
+
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Init:
+                MOZ_TRY_VAR(init, parseForInit());
+                break;
+              case BinField::Test:
+                MOZ_TRY_VAR(test, parseExpression());
+                break;
+              case BinField::Update:
+                MOZ_TRY_VAR(update, parseExpression());
+                break;
+              case BinField::BINJS_Scope: // The scope always appears before the body.
+                MOZ_TRY(parseAndUpdateCurrentScope());
+                break;
+              case BinField::Body:
+                MOZ_TRY_VAR(body, parseStatement());
+                break;
+              default:
+                return raiseInvalidField("ForStatement", field);
+            }
+        }
+
+        if (!body)
+            return raiseMissingField("ForStatement", BinField::Body);
+
+        TRY_DECL(forHead, factory_.newForHead(init, test, update, tokenizer_->pos(start)));
+        TRY_VAR(result, factory_.newForStatement(start, forHead, body, /* iflags = */ 0));
+
+        if (!scope.isEmpty()) {
+            TRY_DECL(bindings, NewLexicalScopeData(cx_, scope, alloc_, parseContext_));
+            TRY_VAR(result, factory_.newLexicalScope(*bindings, result));
+        }
+
+        break;
+      }
+      case BinKind::ForInStatement: {
+        ParseContext::Statement stmt(parseContext_, StatementKind::ForInLoop);
+
+        // Implicit scope around the `for`, used to store `for (let x in  ...)`
+        // or `for (const x in ...)`-style declarations. Detail on the
+        // declaration is stored as part of `BINJS_Scope`.
+        ParseContext::Scope scope(cx_, parseContext_, usedNames_);
+        TRY(scope.init(parseContext_));
+        ParseNode* left(nullptr);
+        ParseNode* right(nullptr);
+        ParseNode* body(nullptr);
+
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Left:
+                MOZ_TRY_VAR(left, parseForInInit());
+                break;
+              case BinField::Right:
+                MOZ_TRY_VAR(right, parseExpression());
+                break;
+              case BinField::Body:
+                MOZ_TRY_VAR(body, parseStatement());
+                break;
+              case BinField::BINJS_Scope:
+                MOZ_TRY(parseAndUpdateCurrentScope());
+                break;
+              default:
+                return raiseInvalidField("ForInStatement", field);
+            }
+        }
+
+        if (!left)
+            return raiseMissingField("ForInStatement", BinField::Left);
+        if (!right)
+            return raiseMissingField("ForInStatement", BinField::Right);
+        if (!body)
+            return raiseMissingField("ForInStatement", BinField::Body);
+
+        TRY_DECL(forHead, factory_.newForInOrOfHead(PNK_FORIN, left, right, tokenizer_->pos(start)));
+        TRY_VAR(result, factory_.newForStatement(start, forHead, body, /*flags*/ 0));
+
+        if (!scope.isEmpty()) {
+            TRY_DECL(bindings, NewLexicalScopeData(cx_, scope, alloc_, parseContext_));
+            TRY_VAR(result, factory_.newLexicalScope(*bindings, result));
+        }
+        break;
+      }
+
+      case BinKind::VariableDeclaration:
+        MOZ_TRY_VAR(result, parseVariableDeclarationAux(kind, fields));
+        break;
+
+      default:
+        return raiseInvalidKind("Statement", kind);
+    }
+
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseBreakOrContinueStatementAux(const BinKind kind, const BinFields& fields)
+{
+    const auto start = tokenizer_->offset();
+    ParseNode* label(nullptr);
+
+    for (auto field : fields) {
+        switch (field) {
+          case BinField::Label:
+            MOZ_TRY_VAR(label, parsePattern());
+
+            if (label && !label->isKind(PNK_NAME))
+                return raiseError("ContinueStatement | BreakStatement - Label MUST be an identifier"); // FIXME: This should be changed in the grammar.
+
+            break;
+          default:
+            return raiseInvalidField("ContinueStatement", field);
+        }
+    }
+
+    TokenPos pos = tokenizer_->pos(start);
+    ParseNode* result;
+    if (kind == BinKind::ContinueStatement) {
+#if 0 // FIXME: We probably need to fix the AST before making this check.
+        auto validity = parseContext_->checkContinueStatement(label ? label->name() : nullptr);
+        if (validity.isErr()) {
+            switch (validity.unwrapErr()) {
+              case ParseContext::ContinueStatementError::NotInALoop:
+                return raiseError(kind, "Not in a loop");
+              case ParseContext::ContinueStatementError::LabelNotFound:
+                return raiseError(kind, "Label not found");
+            }
+        }
+#endif // 0
+        // Ok, this is a valid continue statement.
+        TRY_VAR(result, factory_.newContinueStatement(label ? label->name() : nullptr, pos));
+    } else {
+#if 0 // FIXME: We probably need to fix the AST before making this check.
+        auto validity = parseContext_->checkBreakStatement(label ? label->name() : nullptr);
+        if (validity.isErr()) {
+            switch (validity.unwrapErr()) {
+              case ParseContext::BreakStatementError::ToughBreak:
+                 return raiseError(kind, "Not in a loop");
+              case ParseContext::BreakStatementError::LabelNotFound:
+                 return raiseError(kind, "Label not found");
+            }
+        }
+#endif // 0
+        // Ok, this is a valid break statement.
+        TRY_VAR(result, factory_.newBreakStatement(label ? label->name() : nullptr, pos));
+    }
+
+    MOZ_ASSERT(result);
+
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseForInit()
+{
+    // This can be either a VarDecl or an Expression.
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+    BinKind kind;
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    ParseNode* result(nullptr);
+
+    switch (kind) {
+      case BinKind::VariableDeclaration:
+        MOZ_TRY_VAR(result, parseVariableDeclarationAux(kind, fields));
+        break;
+      default:
+        // Parse as expression
+        MOZ_TRY_VAR(result, parseExpressionAux(kind, fields));
+        break;
+    }
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseForInInit()
+{
+    // This can be either a VarDecl or a Pattern.
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+    BinKind kind;
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    ParseNode* result(nullptr);
+
+    switch (kind) {
+      case BinKind::VariableDeclaration:
+        MOZ_TRY_VAR(result, parseVariableDeclarationAux(kind, fields));
+        break;
+      default:
+        // Parse as expression. Not a joke: http://www.ecma-international.org/ecma-262/5.1/index.html#sec-12.6.4 .
+        MOZ_TRY_VAR(result, parseExpressionAux(kind, fields));
+        break;
+    }
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseFunctionAux(const BinKind kind, const BinFields& fields)
+{
+    MOZ_ASSERT(isMethodOrFunction(kind));
+
+    const size_t start = tokenizer_->offset();
+
+    ParseNode* id(nullptr);
+    ParseNode* params(nullptr);
+    ParseNode* body(nullptr);
+    ParseNode* directives(nullptr); // Largely ignored for the moment.
+    ParseNode* key(nullptr);  // Methods only
+
+    // Allocate the function before walking down the tree.
+    RootedFunction fun(cx_);
+    TRY_VAR(fun, NewFunctionWithProto(cx_,
+            /*native*/nullptr,
+            /*nargs ?*/0,
+            /*flags */ JSFunction::INTERPRETED_NORMAL,
+            /*enclosing env*/nullptr,
+            /*name*/ nullptr, // Will be known later
+            /*proto*/ nullptr,
+            /*alloc*/gc::AllocKind::FUNCTION,
+            TenuredObject
+    ));
+    TRY_DECL(funbox, alloc_.new_<FunctionBox>(cx_,
+        alloc_,
+        traceListHead_,
+        fun,
+        /*toStringStart*/0,
+        /*Directives*/Directives(parseContext_),
+        /*extraWarning*/false,
+        GeneratorKind::NotGenerator,
+        FunctionAsyncKind::SyncFunction
+    ));
+
+    traceListHead_ = funbox;
+
+    FunctionSyntaxKind syntax;
+    switch (kind) {
+      case BinKind::FunctionDeclaration:
+        syntax = Statement;
+        break;
+      case BinKind::FunctionExpression:
+        syntax = PrimaryExpression; // FIXME: Probably doesn't work.
+        break;
+      case BinKind::ObjectMethod:
+        syntax = Method;
+        break;
+      case BinKind::ObjectGetter:
+        syntax = Getter;
+        break;
+      case BinKind::ObjectSetter:
+        syntax = Setter;
+        break;
+      default:
+        MOZ_CRASH("Invalid FunctionSyntaxKind"); // Checked above.
+    }
+    funbox->initWithEnclosingParseContext(parseContext_, syntax);
+
+    // Container scopes.
+    ParseContext::Scope& varScope = parseContext_->varScope();
+    ParseContext::Scope* letScope = parseContext_->innermostScope();
+
+    // Push a new ParseContext.
+    BinParseContext funpc(cx_, this, funbox, /* newDirectives = */ nullptr);
+    TRY(funpc.init());
+    parseContext_->functionScope().useAsVarScope(parseContext_);
+    MOZ_ASSERT(parseContext_->isFunctionBox());
+
+    for (auto field : fields) {
+        switch (field) {
+          case BinField::Id:
+            MOZ_TRY_VAR(id, parseIdentifier());
+            break;
+          case BinField::Params:
+            MOZ_TRY_VAR(params, parseArgumentList());
+            break;
+          case BinField::BINJS_Scope:
+            // This scope information affects the scopes contained in the function body. MUST appear before the `body`.
+            MOZ_TRY(parseAndUpdateScope(varScope, *letScope));
+            break;
+          case BinField::Directives:
+            MOZ_TRY_VAR(directives, parseDirectiveList());
+            break;
+          case BinField::Body:
+            MOZ_TRY_VAR(body, parseBlockStatement());
+            break;
+          case BinField::Key:
+            if (!isMethod(kind))
+                return raiseInvalidField("Functions (unless defined as methods)", field);
+
+            MOZ_TRY_VAR(key, parseObjectPropertyName());
+            break;
+          default:
+            return raiseInvalidField("Function", field);
+        }
+    }
+
+    // Inject default values for absent fields.
+    if (!params)
+        TRY_VAR(params, new_<ListNode>(PNK_PARAMSBODY, tokenizer_->pos()));
+
+    if (!body)
+        TRY_VAR(body, factory_.newStatementList(tokenizer_->pos()));
+
+    if (kind == BinKind::FunctionDeclaration && !id) {
+        // The name is compulsory only for function declarations.
+        return raiseMissingField("FunctionDeclaration", BinField::Id);
+    }
+
+    // Reject if required values are missing.
+    if (isMethod(kind) && !key)
+        return raiseMissingField("method", BinField::Key);
+
+    if (id)
+        fun->initAtom(id->pn_atom);
+
+    MOZ_ASSERT(params->isArity(PN_LIST));
+
+    if (!(body->isKind(PNK_LEXICALSCOPE) && body->pn_u.scope.body->isKind(PNK_STATEMENTLIST))) {
+        // Promote to lexical scope + statement list.
+        if (!body->isKind(PNK_STATEMENTLIST)) {
+            TRY_DECL(list, factory_.newStatementList(tokenizer_->pos(start)));
+
+            list->initList(body);
+            body = list;
+        }
+
+        // Promote to lexical scope.
+        TRY_VAR(body, factory_.newLexicalScope(nullptr, body));
+    }
+    MOZ_ASSERT(body->isKind(PNK_LEXICALSCOPE));
+
+    MOZ_TRY_VAR(body, appendDirectivesToBody(body, directives));
+
+    params->appendWithoutOrderAssumption(body);
+
+    TokenPos pos = tokenizer_->pos(start);
+    TRY_DECL(function, kind == BinKind::FunctionDeclaration
+                       ? factory_.newFunctionStatement(pos)
+                       : factory_.newFunctionExpression(pos));
+
+    factory_.setFunctionBox(function, funbox);
+    factory_.setFunctionFormalParametersAndBody(function, params);
+
+    ParseNode* result;
+    if (kind == BinKind::ObjectMethod)
+        TRY_VAR(result, factory_.newObjectMethodOrPropertyDefinition(key, function, AccessorType::None));
+    else if (kind == BinKind::ObjectGetter)
+        TRY_VAR(result, factory_.newObjectMethodOrPropertyDefinition(key, function, AccessorType::Getter));
+    else if (kind == BinKind::ObjectSetter)
+        TRY_VAR(result, factory_.newObjectMethodOrPropertyDefinition(key, function, AccessorType::Setter));
+    else
+        result = function;
+
+    // Now handle bindings.
+    HandlePropertyName dotThis = cx_->names().dotThis;
+    const bool declareThis = hasUsedName(dotThis) || funbox->bindingsAccessedDynamically() || funbox->isDerivedClassConstructor();
+
+    if (declareThis) {
+        ParseContext::Scope& funScope = parseContext_->functionScope();
+        ParseContext::Scope::AddDeclaredNamePtr p = funScope.lookupDeclaredNameForAdd(dotThis);
+        MOZ_ASSERT(!p);
+        TRY(funScope.addDeclaredName(parseContext_, p, dotThis, DeclarationKind::Var,
+                                      DeclaredNameInfo::npos));
+        funbox->setHasThisBinding();
+    }
+
+    TRY_DECL(bindings,
+             NewFunctionScopeData(cx_, parseContext_->functionScope(),
+                                  /* hasParameterExprs = */false, alloc_, parseContext_));
+
+    funbox->functionScopeBindings().set(*bindings);
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseObjectPropertyName()
+{
+    auto start = tokenizer_->offset();
+
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+    BinKind kind;
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    ParseNode* result;
+    switch (kind) {
+      case BinKind::StringLiteral: {
+        ParseNode* string;
+        MOZ_TRY_VAR(string, parseStringLiteralAux(kind, fields));
+        uint32_t index;
+        if (string->pn_atom->isIndex(&index))
+            TRY_VAR(result, factory_.newNumber(index, NoDecimal, TokenPos(start, tokenizer_->offset())));
+        else
+            result = string;
+
+        break;
+      }
+      case BinKind::NumericLiteral:
+        MOZ_TRY_VAR(result, parseNumericLiteralAux(kind, fields));
+        break;
+      case BinKind::Identifier:
+        MOZ_TRY_VAR(result, parseIdentifierAux(kind, fields, /* expectObjectPropertyName = */ true));
+        break;
+      case BinKind::ComputedPropertyName: {
+        ParseNode* expr;
+        MOZ_TRY_VAR(expr, parseExpressionAux(kind, fields));
+        TRY_VAR(result, factory_.newComputedName(expr, start, tokenizer_->offset()));
+        break;
+      }
+      default:
+        return raiseInvalidKind("ObjectLiteralPropertyName", kind);
+    }
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseVariableDeclarationAux(const BinKind kind, const BinFields& fields)
+{
+    const size_t start = tokenizer_->offset();
+
+    ParseNode* result(nullptr);
+    switch (kind) {
+      default:
+        return raiseInvalidKind("VariableDeclaration", kind);
+      case BinKind::VariableDeclaration:
+        ParseNodeKind pnk = PNK_LIMIT;
+
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Kind: {
+                Maybe<Chars> kindName;
+                MOZ_TRY(readString(kindName));
+
+                if (*kindName == "let")
+                    pnk = PNK_LET;
+                else if (*kindName == "var")
+                    pnk = PNK_VAR;
+                else if (*kindName == "const")
+                    pnk = PNK_CONST;
+                else
+                    return raiseInvalidEnum("VariableDeclaration", *kindName);
+
+                break;
+              }
+              case BinField::Declarations: {
+                uint32_t length;
+                AutoList guard(*tokenizer_);
+
+                TRY(tokenizer_->enterList(length, guard));
+                TRY_VAR(result, factory_.newDeclarationList(PNK_CONST /*Placeholder*/, tokenizer_->pos(start)));
+
+                for (uint32_t i = 0; i < length; ++i) {
+                    ParseNode* current;
+                    MOZ_TRY_VAR(current, parseVariableDeclarator());
+                    MOZ_ASSERT(current);
+
+                    result->appendWithoutOrderAssumption(current);
+                }
+
+                TRY(guard.done());
+                break;
+              }
+              default:
+                return raiseInvalidField("VariableDeclaration", field);
+            }
+        }
+
+        if (!result || pnk == PNK_LIMIT)
+            return raiseMissingField("VariableDeclaration", BinField::Declarations);
+
+        result->setKind(pnk);
+
+        MOZ_ASSERT(!result->isKind(PNK_NOP));
+    }
+
+    return result;
+}
+
+
+JS::Result<ParseNode*>
+BinASTParser::parseExpressionStatementAux(const BinKind kind, const BinFields& fields)
+{
+    MOZ_ASSERT(kind == BinKind::ExpressionStatement);
+
+    ParseNode* expr(nullptr);
+    for (auto field : fields) {
+        switch (field) {
+          case BinField::Expression:
+            MOZ_TRY_VAR(expr, parseExpression());
+
+            break;
+          default:
+            return raiseInvalidField("ExpressionStatement", field);
+        }
+    }
+
+    if (!expr)
+        return raiseMissingField("ExpressionStatement", BinField::Expression);
+
+    TRY_DECL(result, factory_.newExprStatement(expr, tokenizer_->offset()));
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseVariableDeclarator()
+{
+    const size_t start = tokenizer_->offset();
+
+    BinKind kind;
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    if (kind != BinKind::VariableDeclarator)
+        return raiseInvalidKind("VariableDeclarator", kind);
+
+    ParseNode* id(nullptr);
+    ParseNode* init(nullptr); // Optional.
+    for (auto field : fields) {
+        switch (field) {
+          case BinField::Id:
+            MOZ_TRY_VAR(id, parsePattern());
+
+            break;
+          case BinField::Init:
+            MOZ_TRY_VAR(init, parseExpression());
+
+            break;
+          default:
+            return raiseInvalidField("VariableDeclarator", field);
+        }
+    }
+
+    TRY(guard.done());
+    if (!id)
+        return raiseMissingField("VariableDeclarator", BinField::Id);
+
+    ParseNode* result(nullptr);
+
+    // FIXME: Documentation in ParseNode is clearly obsolete.
+    if (id->isKind(PNK_NAME)) {
+        // `var foo [= bar]``
+        TRY_VAR(result, factory_.newName(id->pn_atom->asPropertyName(), tokenizer_->pos(start), cx_));
+
+        if (init)
+            result->pn_expr = init;
+
+    } else {
+        // `var pattern = bar`
+        if (!init) {
+            // Here, `init` is required.
+            return raiseMissingField("VariableDeclarator (with non-trivial pattern)", BinField::Init);
+        }
+
+        TRY_VAR(result, factory_.newAssignment(PNK_ASSIGN, id, init));
+    }
+
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseExpressionList(bool acceptElisions)
+{
+    const size_t start = tokenizer_->offset();
+
+    uint32_t length;
+    AutoList guard(*tokenizer_);
+
+    TRY(tokenizer_->enterList(length, guard));
+    TRY_DECL(result, factory_.newArrayLiteral(start));
+
+    for (uint32_t i = 0; i < length; ++i) {
+        BinFields fields(cx_);
+        AutoTaggedTuple guard(*tokenizer_);
+        BinKind kind;
+
+        TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+        switch (kind) {
+          case BinKind::Elision: {
+            if (!acceptElisions)
+                return raiseInvalidKind("[Expression]", kind);
+
+            MOZ_TRY(parseElisionAux(kind, fields));
+            TRY(!factory_.addElision(result, tokenizer_->pos(start)));
+            break;
+          }
+          default: {
+            ParseNode* expr(nullptr);
+            MOZ_TRY_VAR(expr, parseExpressionAux(kind, fields));
+
+            MOZ_ASSERT(expr);
+            factory_.addArrayElement(result, expr);
+          }
+        }
+
+        TRY(guard.done());
+    }
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<Ok>
+BinASTParser::parseElisionAux(const BinKind kind, const BinFields& fields)
+{
+    MOZ_ASSERT(kind == BinKind::Elision);
+    MOZ_TRY(checkEmptyTuple(kind, fields));
+
+    return Ok();
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseSwitchCaseList()
+{
+    uint32_t length;
+    AutoList guard(*tokenizer_);
+
+    TRY(tokenizer_->enterList(length, guard));
+    TRY_DECL(list, factory_.newStatementList(tokenizer_->pos()));
+
+    // Set to `true` once we have encountered a `default:` case.
+    // Two `default:` cases is an error.
+    bool haveDefault = false;
+
+    for (uint32_t i = 0; i < length; ++i) {
+        ParseNode* caseNode(nullptr);
+        MOZ_TRY_VAR(caseNode, parseSwitchCase());
+        MOZ_ASSERT(caseNode);
+
+        if (caseNode->pn_left == nullptr) {
+            // Ah, seems that we have encountered a default case.
+            if (haveDefault) {
+                // Oh, wait, two defaults? That's an error.
+                return raiseError("This switch() has more than one `default:` case");
+            }
+            haveDefault = true;
+        }
+        factory_.addCaseStatementToList(list, caseNode);
+    }
+
+    TRY(guard.done());
+    TRY_DECL(result, factory_.newLexicalScope(nullptr, list));
+
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseExpression()
+{
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+    BinKind kind;
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    ParseNode* result(nullptr);
+    MOZ_TRY_VAR(result, parseExpressionAux(kind, fields));
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseExpressionAux(const BinKind kind, const BinFields& fields)
+{
+    const size_t start = tokenizer_->offset();
+
+    ParseNode* result(nullptr);
+
+    switch (kind) {
+      case BinKind::Identifier: {
+        MOZ_TRY_VAR(result, parseIdentifierAux(kind, fields));
+        break;
+      }
+      case BinKind::BooleanLiteral: {
+        Maybe<bool> value;
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Value:
+                MOZ_TRY_EMPLACE(value, readBool());
+                break;
+              default:
+                return raiseInvalidField("BooleanLiteral", field);
+            }
+        }
+
+        // In case of absent optional fields, inject default values.
+        if (!value)
+            value.emplace(false);
+
+        TRY_VAR(result, factory_.newBooleanLiteral(*value, tokenizer_->pos(start)));
+
+        break;
+      }
+      case BinKind::NullLiteral: {
+        MOZ_TRY(checkEmptyTuple(kind, fields));
+        TRY_VAR(result, factory_.newNullLiteral(tokenizer_->pos(start)));
+        break;
+      }
+      case BinKind::NumericLiteral:
+        MOZ_TRY_VAR(result, parseNumericLiteralAux(kind, fields));
+        break;
+
+      case BinKind::RegExpLiteral: {
+        RootedAtom pattern(cx_);
+        Maybe<Chars> flags;
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Pattern:
+                MOZ_TRY(readString(&pattern));
+                break;
+              case BinField::Flags:
+                MOZ_TRY(readString(flags));
+                break;
+              default:
+                return raiseInvalidField("RegExpLiteral", field);
+            }
+        }
+
+        if (!pattern)
+            return raiseMissingField("RegExpLiteral", BinField::Pattern);
+        if (!flags)
+            return raiseMissingField("RegExpLiteral", BinField::Flags);
+
+        RegExpFlag reflags = NoFlags;
+        for (auto c : *flags) {
+            if (c == 'g' && !(reflags & GlobalFlag))
+                reflags = RegExpFlag(reflags | GlobalFlag);
+            else if (c == 'i' && !(reflags & IgnoreCaseFlag))
+                reflags = RegExpFlag(reflags | IgnoreCaseFlag);
+            else if (c == 'm' && !(reflags & MultilineFlag))
+                reflags = RegExpFlag(reflags | MultilineFlag);
+            else if (c == 'y' && !(reflags & StickyFlag))
+                reflags = RegExpFlag(reflags | StickyFlag);
+            else if (c == 'u' && !(reflags & UnicodeFlag))
+                reflags = RegExpFlag(reflags | UnicodeFlag);
+            else
+                return raiseInvalidEnum("RegExpLiteral", *flags);
+        }
+
+
+        Rooted<RegExpObject*> reobj(cx_);
+        TRY_VAR(reobj, RegExpObject::create(cx_,
+            pattern,
+            reflags,
+            /* options*/ nullptr,
+            /* tokenStream */ nullptr,
+            alloc_,
+            TenuredObject));
+
+        TRY_VAR(result, factory_.newRegExp(reobj, tokenizer_->pos(start), *this));
+
+        break;
+      }
+      case BinKind::StringLiteral:
+        MOZ_TRY_VAR(result, parseStringLiteralAux(kind, fields));
+        break;
+
+      case BinKind::ThisExpression: {
+        MOZ_TRY(checkEmptyTuple(kind, fields));
+
+        if (parseContext_->isFunctionBox())
+            parseContext_->functionBox()->usesThis = true;
+
+        TokenPos pos = tokenizer_->pos(start);
+        ParseNode* thisName(nullptr);
+        if (parseContext_->sc()->thisBinding() == ThisBinding::Function)
+            TRY_VAR(thisName, factory_.newName(cx_->names().dotThis, pos, cx_));
+
+        TRY_VAR(result, factory_.newThisLiteral(pos, thisName));
+        break;
+      }
+      case BinKind::ArrayExpression:
+        MOZ_TRY_VAR(result, parseArrayExpressionAux(kind, fields));
+        break;
+
+      case BinKind::ObjectExpression:
+        MOZ_TRY_VAR(result, parseObjectExpressionAux(kind, fields));
+        break;
+
+      case BinKind::FunctionExpression:
+        MOZ_TRY_VAR(result, parseFunctionAux(kind, fields));
+        result->setOp(JSOP_LAMBDA);
+        break;
+
+      case BinKind::UnaryExpression:
+      case BinKind::UpdateExpression: {
+        ParseNode* expr(nullptr);
+        Maybe<Chars> operation;
+        Maybe<bool> prefix; // FIXME: Ignored for unary_expression?
+
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Operator:
+                MOZ_TRY(readString(operation));
+                break;
+              case BinField::Prefix:
+                MOZ_TRY_EMPLACE(prefix, readBool());
+                break;
+              case BinField::Argument:
+                  // arguments are always parsed *after* operator.
+                  if (operation.isNothing())
+                      return raiseMissingField("UpdateExpression", BinField::Operator);
+                MOZ_TRY_VAR(expr, parseExpression());
+                break;
+              default:
+                return raiseInvalidField("UpdateExpression", field);
+            }
+        }
+
+        if (!expr)
+            return raiseMissingField("UpdateExpression", BinField::Argument);
+        if (operation.isNothing())
+            return raiseMissingField("UpdateExpression", BinField::Operator);
+
+        // In case of absent optional fields, inject default values.
+        if (prefix.isNothing())
+            prefix.emplace(false);
+
+        ParseNodeKind pnk = PNK_LIMIT;
+        if (kind == BinKind::UnaryExpression) {
+            if (*operation == "-") {
+                pnk = PNK_NEG;
+            } else if (*operation == "+") {
+                pnk = PNK_POS;
+            } else if (*operation == "!") {
+                pnk = PNK_NOT;
+            } else if (*operation == "~") {
+                pnk = PNK_BITNOT;
+            } else if (*operation == "typeof") {
+                if (expr->isKind(PNK_NAME))
+                    pnk = PNK_TYPEOFNAME;
+                else
+                    pnk = PNK_TYPEOFEXPR;
+            } else if (*operation == "void") {
+                pnk = PNK_VOID;
+            } else if (*operation == "delete") {
+                switch (expr->getKind()) {
+                  case PNK_NAME:
+                    expr->setOp(JSOP_DELNAME);
+                    pnk = PNK_DELETENAME;
+                    break;
+                  case PNK_DOT:
+                    pnk = PNK_DELETEPROP;
+                    break;
+                  case PNK_ELEM:
+                    pnk = PNK_DELETEELEM;
+                    break;
+                  default:
+                    pnk = PNK_DELETEEXPR;
+                }
+            } else {
+                return raiseInvalidEnum("UnaryOperator", *operation);
+            }
+        } else if (kind == BinKind::UpdateExpression) {
+            if (!expr->isKind(PNK_NAME) && !factory_.isPropertyAccess(expr))
+                return raiseError("Invalid increment/decrement operand"); // FIXME: Shouldn't this be part of the syntax?
+
+            if (*operation == "++") {
+                if (*prefix)
+                    pnk = PNK_PREINCREMENT;
+                else
+                    pnk = PNK_POSTINCREMENT;
+            } else if (*operation == "--") {
+                if (*prefix)
+                    pnk = PNK_PREDECREMENT;
+                else
+                    pnk = PNK_POSTDECREMENT;
+            } else {
+                return raiseInvalidEnum("UpdateOperator", *operation);
+            }
+        }
+
+        TRY_VAR(result, factory_.newUnary(pnk, start, expr));
+
+        break;
+      }
+      case BinKind::BinaryExpression:
+      case BinKind::LogicalExpression: {
+        ParseNode* left(nullptr);
+        ParseNode* right(nullptr);
+        Maybe<Chars> operation;
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Left:
+                MOZ_TRY_VAR(left, parseExpression());
+                break;
+              case BinField::Right:
+                MOZ_TRY_VAR(right, parseExpression());
+                break;
+              case BinField::Operator:
+                MOZ_TRY(readString(operation));
+                break;
+              default:
+                return raiseInvalidField("LogicalExpression | BinaryExpression", field);
+            }
+        }
+
+        if (!left)
+            return raiseMissingField("LogicalExpression | BinaryExpression", BinField::Left);
+        if (!right)
+            return raiseMissingField("LogicalExpression | BinaryExpression", BinField::Right);
+        if (operation.isNothing())
+            return raiseMissingField("LogicalExpression | BinaryExpression", BinField::Operator);
+
+        // FIXME: Instead of Chars, we should use atoms and comparison
+        // between atom ptr.
+        ParseNodeKind pnk = PNK_LIMIT;
+        if (*operation == "==")
+            pnk = PNK_EQ;
+        else if (*operation == "!=")
+            pnk = PNK_NE;
+        else if (*operation == "===")
+            pnk = PNK_STRICTEQ;
+        else if (*operation == "!==")
+            pnk = PNK_STRICTNE;
+        else if (*operation == "<")
+            pnk = PNK_LT;
+        else if (*operation == "<=")
+            pnk = PNK_LE;
+        else if (*operation == ">")
+            pnk = PNK_GT;
+        else if (*operation == ">=")
+            pnk = PNK_GE;
+        else if (*operation == "<<")
+            pnk = PNK_LSH;
+        else if (*operation == ">>")
+            pnk = PNK_RSH;
+        else if (*operation == ">>>")
+            pnk = PNK_URSH;
+        else if (*operation == "+")
+            pnk = PNK_ADD;
+        else if (*operation == "-")
+            pnk = PNK_SUB;
+        else if (*operation == "*")
+            pnk = PNK_STAR;
+        else if (*operation == "/")
+            pnk = PNK_DIV;
+        else if (*operation == "%")
+            pnk = PNK_MOD;
+        else if (*operation == "|")
+            pnk = PNK_BITOR;
+        else if (*operation == "^")
+            pnk = PNK_BITXOR;
+        else if (*operation == "&")
+            pnk = PNK_BITAND;
+        else if (*operation == "in")
+            pnk = PNK_IN;
+        else if (*operation == "instanceof")
+            pnk = PNK_INSTANCEOF;
+        else if (*operation == "||")
+            pnk = PNK_OR;
+        else if (*operation == "&&")
+            pnk = PNK_AND;
+        else if (*operation == "**")
+            pnk = PNK_POW;
+        else
+            return raiseInvalidEnum("BinaryOperator | LogicalOperator", *operation);
+
+        if (left->isKind(pnk) && pnk != PNK_POW /* PNK_POW is not left-associative */) {
+            // Regroup left-associative operations into lists.
+            left->appendWithoutOrderAssumption(right);
+            result = left;
+        } else {
+            TRY_DECL(list, factory_.newList(pnk, tokenizer_->pos(start)));
+
+            list->appendWithoutOrderAssumption(left);
+            list->appendWithoutOrderAssumption(right);
+            result = list;
+        }
+
+         break;
+      }
+      case BinKind::AssignmentExpression: {
+        ParseNode* left(nullptr);
+        ParseNode* right(nullptr);
+        Maybe<Chars> operation;
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Left:
+                MOZ_TRY_VAR(left, parseExpression());
+                break;
+              case BinField::Right:
+                MOZ_TRY_VAR(right, parseExpression());
+                break;
+              case BinField::Operator:
+                MOZ_TRY(readString(operation));
+                break;
+              default:
+                return raiseInvalidField("AssignmentExpression", field);
+            }
+        }
+
+        if (!left)
+            return raiseMissingField("AssignmentExpression", BinField::Left);
+        if (!right)
+            return raiseMissingField("AssignmentExpression", BinField::Right);
+        if (operation.isNothing())
+            return raiseMissingField("AssignmentExpression", BinField::Operator);
+
+        // FIXME: Instead of Chars, we should use atoms and comparison
+        // between atom ptr.
+        // FIXME: We should probably turn associative operations into lists.
+        ParseNodeKind pnk = PNK_LIMIT;
+        if (*operation == "=")
+            pnk = PNK_ASSIGN;
+        else if (*operation == "+=")
+            pnk = PNK_ADDASSIGN;
+        else if (*operation == "-=")
+            pnk = PNK_SUBASSIGN;
+        else if (*operation == "*=")
+            pnk = PNK_MULASSIGN;
+        else if (*operation == "/=")
+            pnk = PNK_DIVASSIGN;
+        else if (*operation == "%=")
+            pnk = PNK_MODASSIGN;
+        else if (*operation == "<<=")
+            pnk = PNK_LSHASSIGN;
+        else if (*operation == ">>=")
+            pnk = PNK_RSHASSIGN;
+        else if (*operation == ">>>=")
+            pnk = PNK_URSHASSIGN;
+        else if (*operation == "|=")
+            pnk = PNK_BITORASSIGN;
+        else if (*operation == "^=")
+            pnk = PNK_BITXORASSIGN;
+        else if (*operation == "&=")
+            pnk = PNK_BITANDASSIGN;
+        else
+            return raiseInvalidEnum("AssignmentOperator", *operation);
+
+        TRY_VAR(result, factory_.newAssignment(pnk, left, right));
+
+        break;
+      }
+      case BinKind::BracketExpression:
+      case BinKind::DotExpression:
+        MOZ_TRY_VAR(result, parseMemberExpressionAux(kind, fields));
+
+        break;
+      case BinKind::ConditionalExpression: {
+        ParseNode* test(nullptr);
+        ParseNode* alternate(nullptr);
+        ParseNode* consequent(nullptr);
+
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Test:
+                MOZ_TRY_VAR(test, parseExpression());
+                break;
+              case BinField::Consequent:
+                MOZ_TRY_VAR(consequent, parseExpression());
+                break;
+              case BinField::Alternate:
+                MOZ_TRY_VAR(alternate, parseExpression());
+                break;
+              default:
+                return raiseInvalidField("ConditionalExpression", field);
+            }
+        }
+
+        if (!test)
+            return raiseMissingField("ConditionalExpression", BinField::Test);
+        if (!consequent)
+            return raiseMissingField("ConditionalExpression", BinField::Consequent);
+        if (!alternate)
+            return raiseMissingField("ConditionalExpression", BinField::Alternate);
+
+        TRY_VAR(result, factory_.newConditional(test, consequent, alternate));
+
+        break;
+      }
+      case BinKind::CallExpression:
+      case BinKind::NewExpression: {
+        ParseNode* callee(nullptr);
+
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Callee:
+                MOZ_TRY_VAR(callee, parseExpression());
+                break;
+              case BinField::Arguments:
+                MOZ_TRY_VAR(result, parseExpressionList(/* acceptElisions = */ false));
+                break;
+              default:
+                return raiseInvalidField("NewExpression", field);
+            }
+        }
+
+        // In case of absent required fields, fail.
+        if (!callee)
+            return raiseMissingField("NewExpression", BinField::Callee);
+
+        // In case of absent optional fields, inject default values.
+        if (!result)
+            TRY_VAR(result, factory_.newArrayLiteral(start));
+
+        ParseNodeKind pnk =
+            kind == BinKind::CallExpression
+            ? PNK_CALL
+            : PNK_NEW;
+        result->setKind(pnk);
+        result->prepend(callee);
+
+        break;
+      }
+      case BinKind::SequenceExpression: {
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Expressions:
+                MOZ_TRY_VAR(result, parseExpressionList(/* acceptElisions = */ false));
+                break;
+              default:
+                return raiseInvalidField("SequenceExpression", field);
+            }
+        }
+
+        if (!result)
+            return raiseMissingField("SequenceExpression", BinField::Expression);
+
+        result->setKind(PNK_COMMA);
+        break;
+      }
+      default:
+        return raiseInvalidKind("Expression", kind);
+    }
+
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseNumericLiteralAux(const BinKind kind, const BinFields& fields)
+{
+    auto start = tokenizer_->offset();
+
+    Maybe<double> value;
+    for (auto field : fields) {
+        switch (field) {
+          case BinField::Value:
+            MOZ_TRY_EMPLACE(value, readNumber());
+            break;
+          default:
+            return raiseInvalidField("NumericLiteral", field);
+        }
+    }
+
+    // In case of absent optional fields, inject default values.
+    if (!value)
+        value.emplace(0);
+
+    TRY_DECL(result, factory_.newNumber(*value, DecimalPoint::HasDecimal, tokenizer_->pos(start)));
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseStringLiteralAux(const BinKind kind, const BinFields& fields)
+{
+    auto start = tokenizer_->offset();
+
+    RootedAtom value(cx_);
+    for (auto field : fields) {
+        switch (field) {
+          case BinField::Value:
+            MOZ_TRY(readString(&value));
+            break;
+          default:
+            return raiseInvalidField("StringLiteral", field);
+        }
+    }
+
+    if (!value)
+        return raiseMissingField("StringLiteral", BinField::Value);
+
+    TRY_DECL(result, factory_.newStringLiteral(value, tokenizer_->pos(start)));
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseArrayExpressionAux(const BinKind kind, const BinFields& fields)
+{
+    MOZ_ASSERT(kind == BinKind::ArrayExpression);
+
+    ParseNode* result(nullptr);
+    for (auto field : fields) {
+        switch (field) {
+          case BinField::Elements: {
+            MOZ_TRY_VAR(result, parseExpressionList(/* acceptElisions = */ true));
+            break;
+          }
+          default:
+            return raiseInvalidField("ArrayExpression", field);
+        }
+    }
+
+    // Inject default values for absent fields.
+    if (!result)
+        TRY_VAR(result, factory_.newArrayLiteral(tokenizer_->offset()));
+
+    MOZ_ASSERT(result->isKind(PNK_ARRAY));
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseObjectExpressionAux(const BinKind kind, const BinFields& fields)
+{
+    MOZ_ASSERT(kind == BinKind::ObjectExpression);
+
+    ParseNode* result(nullptr);
+    for (auto field : fields) {
+        switch (field) {
+          case BinField::Properties: {
+            MOZ_TRY_VAR(result, parseObjectMemberList());
+            break;
+          }
+          default:
+            return raiseInvalidField("Property | Method", field);
+        }
+    }
+
+    if (!result)
+        TRY_VAR(result, factory_.newObjectLiteral(tokenizer_->offset()));
+
+    MOZ_ASSERT(result->isArity(PN_LIST));
+    MOZ_ASSERT(result->isKind(PNK_OBJECT));
+
+#if defined(DEBUG)
+    // Sanity check.
+    for (ParseNode* iter = result->pn_head; iter != nullptr; iter = iter->pn_next) {
+        MOZ_ASSERT(iter->isKind(PNK_COLON));
+        MOZ_ASSERT(iter->pn_left != nullptr);
+        MOZ_ASSERT(iter->pn_right != nullptr);
+    }
+#endif // defined(DEBUG)
+
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseMemberExpressionAux(const BinKind kind, const BinFields& fields)
+{
+    MOZ_ASSERT(kind == BinKind::DotExpression || kind == BinKind::BracketExpression);
+
+    ParseNode* object(nullptr);
+    ParseNode* property(nullptr);
+
+    for (auto field : fields) {
+        switch (field) {
+          case BinField::Object:
+            MOZ_TRY_VAR(object, parseExpression());
+            break;
+          case BinField::Property:
+            if (kind == BinKind::BracketExpression)
+                MOZ_TRY_VAR(property, parseExpression());
+            else
+                MOZ_TRY_VAR(property, parseIdentifier());
+            break;
+          default:
+            return raiseInvalidField("MemberExpression", field);
+        }
+    }
+
+    // In case of absent required fields, fail.
+    if (!object)
+        return raiseMissingField("MemberExpression", BinField::Object);
+    if (!property)
+        return raiseMissingField("MemberExpression", BinField::Property);
+
+    ParseNode* result(nullptr);
+    if (kind == BinKind::DotExpression) {
+        MOZ_ASSERT(property->isKind(PNK_NAME));
+        PropertyName* name = property->pn_atom->asPropertyName();
+        TRY_VAR(result, factory_.newPropertyAccess(object, name, tokenizer_->offset()));
+    } else {
+        TRY_VAR(result, factory_.newPropertyByValue(object, property, tokenizer_->offset()));
+    }
+
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseDirectiveList()
+{
+    uint32_t length;
+    AutoList guard(*tokenizer_);
+    TRY(tokenizer_->enterList(length, guard));
+
+    TokenPos pos = tokenizer_->pos();
+    TRY_DECL(result, factory_.newStatementList(pos));
+
+    RootedAtom value(cx_);
+    for (uint32_t i = 0; i < length; ++i) {
+        value = nullptr;
+        MOZ_TRY(readString(&value));
+
+        TRY_DECL(directive, factory_.newStringLiteral(value, pos));
+        factory_.addStatementToList(result, directive);
+    }
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseSwitchCase()
+{
+    const size_t start = tokenizer_->offset();
+
+    BinKind kind;
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    if (kind != BinKind::SwitchCase)
+        return raiseInvalidKind("SwitchCase", kind);
+
+    ParseNode* test(nullptr); // Optional.
+    ParseNode* statements(nullptr); // Required.
+
+    for (auto field : fields) {
+        switch (field) {
+          case BinField::Test:
+            MOZ_TRY_VAR(test, parseExpression());
+            break;
+          case BinField::Consequent:
+            MOZ_TRY_VAR(statements, parseStatementList());
+            break;
+          default:
+            return raiseInvalidField("SwitchCase", field);
+        }
+    }
+
+    TRY(guard.done());
+    if (!statements)
+        return raiseMissingField("SwitchCase", BinField::Consequent);
+
+    MOZ_ASSERT(statements->isKind(PNK_STATEMENTLIST));
+
+    TRY_DECL(result, factory_.newCaseOrDefault(start, test, statements));
+
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseCatchClause()
+{
+    ParseContext::Statement stmt(parseContext_, StatementKind::Catch);
+    ParseContext::Scope scope(cx_, parseContext_, usedNames_);
+    TRY(scope.init(parseContext_));
+    const size_t start = tokenizer_->offset();
+
+    BinKind kind;
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    ParseNode* result(nullptr);
+
+    switch (kind) {
+      default:
+        return raiseInvalidKind("CatchClause", kind);
+      case BinKind::CatchClause: {
+        ParseNode* param(nullptr);
+        ParseNode* body(nullptr);
+
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Param:
+                MOZ_TRY_VAR(param, parsePattern());
+                break;
+              case BinField::Body:
+                MOZ_TRY_VAR(body, parseBlockStatement());
+                break;
+              case BinField::BINJS_Scope:
+                MOZ_TRY(parseAndUpdateCurrentScope());
+                break;
+              default:
+                return raiseInvalidField("CatchClause", field);
+            }
+        }
+
+        if (!param)
+            return raiseMissingField("CatchClause", BinField::Param);
+        if (!body)
+            return raiseMissingField("CatchClause", BinField::Body);
+
+        TRY_DECL(catchClause, factory_.newCatchBlock(param, /* catchGuard = */ nullptr, body));
+        TRY_DECL(bindings, NewLexicalScopeData(cx_, scope, alloc_, parseContext_));
+
+        TRY_DECL(catchClauseScope, factory_.newLexicalScope(*bindings, catchClause));
+
+        TRY_VAR(result, factory_.newCatchList(tokenizer_->pos(start)));
+
+        result->appendWithoutOrderAssumption(catchClauseScope);
+      }
+    }
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseArgumentList()
+{
+    uint32_t length;
+    AutoList guard(*tokenizer_);
+
+    TRY(tokenizer_->enterList(length, guard));
+    ParseNode* result = new_<ListNode>(PNK_PARAMSBODY, tokenizer_->pos());
+
+    for (uint32_t i = 0; i < length; ++i) {
+        ParseNode* pattern;
+        MOZ_TRY_VAR(pattern, parsePattern());
+
+        result->appendWithoutOrderAssumption(pattern);
+    }
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseIdentifier()
+{
+    BinKind kind;
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    ParseNode* result;
+    MOZ_TRY_VAR(result, parseIdentifierAux(kind, fields));
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseIdentifierAux(const BinKind, const BinFields& fields, const bool expectObjectPropertyName /* = false */)
+{
+    const size_t start = tokenizer_->offset();
+
+    RootedAtom id(cx_);
+    for (auto field : fields) {
+        switch (field) {
+          case BinField::Name:
+            MOZ_TRY(readString(&id));
+            break;
+          default:
+            return raiseInvalidField("Identifier", field);
+        }
+    }
+
+    if (!id)
+        return raiseMissingField("Identifier", BinField::Name);
+
+    if (!IsIdentifier(id))
+        return raiseError("Invalid identifier");
+    if (!expectObjectPropertyName && IsKeyword(id))
+        return raiseError("Invalid identifier (keyword)");
+
+    // Once `IsIdentifier` has returned true, we may call `asPropertyName()` without fear.
+    TokenPos pos = tokenizer_->pos(start);
+
+    ParseNode* result;
+    if (expectObjectPropertyName)
+        TRY_VAR(result, factory_.newObjectLiteralPropertyName(id->asPropertyName(), pos));
+    else
+        TRY_VAR(result, factory_.newName(id->asPropertyName(), pos, cx_));
+
+    return result;
+}
+
+
+JS::Result<ParseNode*>
+BinASTParser::parsePattern()
+{
+    BinKind kind;
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    ParseNode* result;
+    MOZ_TRY_VAR(result, parsePatternAux(kind, fields));
+
+    TRY(guard.done());
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parsePatternAux(const BinKind kind, const BinFields& fields)
+{
+    ParseNode* result;
+    switch (kind) {
+      case BinKind::Identifier:
+        MOZ_TRY_VAR(result, parseIdentifierAux(kind ,fields));
+        break;
+      default:
+        return raiseInvalidKind("Pattern", kind);
+    }
+
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseObjectMember()
+{
+    BinKind kind;
+    BinFields fields(cx_);
+    AutoTaggedTuple guard(*tokenizer_);
+
+    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
+    ParseNode* result(nullptr);
+
+    switch (kind) {
+      case BinKind::ObjectProperty: {
+        ParseNode* key(nullptr);
+        ParseNode* value(nullptr);
+        for (auto field : fields) {
+            switch (field) {
+              case BinField::Key:
+                MOZ_TRY_VAR(key, parseObjectPropertyName());
+                break;
+              case BinField::Value:
+                MOZ_TRY_VAR(value, parseExpression());
+                break;
+              default:
+                return raiseInvalidField("ObjectMember", field);
+            }
+        }
+
+        if (!key)
+            return raiseMissingField("ObjectMember", BinField::Key);
+        if (!value)
+            return raiseMissingField("ObjectMember", BinField::Value);
+
+        if (!factory_.isUsableAsObjectPropertyName(key))
+            return raiseError("ObjectMember key kind");
+
+        TRY_VAR(result, factory_.newObjectMethodOrPropertyDefinition(key, value, AccessorType::None));
+
+        break;
+      }
+      case BinKind::ObjectMethod:
+      case BinKind::ObjectGetter:
+      case BinKind::ObjectSetter:
+        MOZ_TRY_VAR(result, parseFunctionAux(kind, fields));
+
+        if (!result)
+            return raiseEmpty("ObjectMethod");
+
+        MOZ_ASSERT(result->isKind(PNK_COLON));
+        break;
+      default:
+        return raiseInvalidKind("ObjectMember", kind);
+    }
+
+    TRY(guard.done());
+    MOZ_ASSERT(result);
+    return result;
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parseObjectMemberList()
+{
+    uint32_t length;
+    AutoList guard(*tokenizer_);
+
+    auto start = tokenizer_->offset();
+    TRY(tokenizer_->enterList(length, guard));
+
+    TRY_DECL(result, factory_.newObjectLiteral(start));
+
+    for (uint32_t i = 0; i < length; ++i) {
+        ParseNode* keyValue;
+        MOZ_TRY_VAR(keyValue, parseObjectMember());
+        MOZ_ASSERT(keyValue);
+
+        result->appendWithoutOrderAssumption(keyValue);
+    }
+
+    TRY(guard.done());
+    return result;
+}
+
+
+JS::Result<Ok>
+BinASTParser::checkEmptyTuple(const BinKind kind, const BinFields& fields)
+{
+    if (fields.length() != 0)
+        return raiseInvalidField(describeBinKind(kind), fields[0]);
+
+    return Ok();
+}
+
+
+JS::Result<Ok>
+BinASTParser::readString(MutableHandleAtom out)
+{
+    MOZ_ASSERT(!out);
+
+    Maybe<Chars> string;
+    MOZ_TRY(readString(string));
+    MOZ_ASSERT(string);
+
+    RootedAtom atom(cx_);
+    TRY_VAR(atom, Atomize(cx_, (const char*)string->begin(), string->length()));
+
+    out.set(Move(atom));
+    return Ok();
+}
+
+JS::Result<ParseNode*>
+BinASTParser::parsePropertyName()
+{
+    RootedAtom atom(cx_);
+    MOZ_TRY(readString(&atom));
+
+    TokenPos pos = tokenizer_->pos();
+
+    ParseNode* result;
+
+    // If the atom matches an index (e.g. "3"), we need to normalize the
+    // propertyName to ensure that it has the same representation as
+    // the numeric index (e.g. 3).
+    uint32_t index;
+    if (atom->isIndex(&index))
+        TRY_VAR(result, factory_.newNumber(index, NoDecimal, pos));
+    else
+        TRY_VAR(result, factory_.newStringLiteral(atom, pos));
+
+    return result;
+}
+
+JS::Result<Ok>
+BinASTParser::readString(Maybe<Chars>& out)
+{
+    MOZ_ASSERT(out.isNothing());
+    Chars result(cx_);
+    TRY(tokenizer_->readChars(result));
+
+    out.emplace(Move(result));
+    return Ok();
+}
+
+JS::Result<double>
+BinASTParser::readNumber()
+{
+    double result;
+    TRY(tokenizer_->readDouble(result));
+
+    return result;
+}
+
+JS::Result<bool>
+BinASTParser::readBool()
+{
+    bool result;
+    TRY(tokenizer_->readBool(result));
+
+    return result;
+}
+
+mozilla::GenericErrorResult<JS::Error&>
+BinASTParser::raiseInvalidKind(const char* superKind, const BinKind kind)
+{
+    Sprinter out(cx_);
+    TRY(out.init());
+    TRY(out.printf("In %s, invalid kind %s", superKind, describeBinKind(kind)));
+    return raiseError(out.string());
+}
+
+mozilla::GenericErrorResult<JS::Error&>
+BinASTParser::raiseInvalidField(const char* kind, const BinField field)
+{
+    Sprinter out(cx_);
+    TRY(out.init());
+    TRY(out.printf("In %s, invalid field '%s'", kind, describeBinField(field)));
+    return raiseError(out.string());
+}
+
+mozilla::GenericErrorResult<JS::Error&>
+BinASTParser::raiseInvalidEnum(const char* kind, const Chars& value)
+{
+    // We don't trust the actual chars of `value` to be properly formatted anything, so let's not use
+    // them anywhere.
+    return raiseError("Invalid enum");
+}
+
+mozilla::GenericErrorResult<JS::Error&>
+BinASTParser::raiseMissingField(const char* kind, const BinField field)
+{
+    Sprinter out(cx_);
+    TRY(out.init());
+    TRY(out.printf("In %s, missing field '%s'", kind, describeBinField(field)));
+
+    return raiseError(out.string());
+}
+
+mozilla::GenericErrorResult<JS::Error&>
+BinASTParser::raiseEmpty(const char* description)
+{
+    Sprinter out(cx_);
+    TRY(out.init());
+    TRY(out.printf("Empty %s", description));
+
+    return raiseError(out.string());
+}
+
+mozilla::GenericErrorResult<JS::Error&>
+BinASTParser::raiseOOM()
+{
+    ReportOutOfMemory(cx_);
+    return cx_->alreadyReportedError();
+}
+
+mozilla::GenericErrorResult<JS::Error&>
+BinASTParser::raiseError(BinKind kind, const char* description)
+{
+    Sprinter out(cx_);
+    TRY(out.init());
+    TRY(out.printf("In %s, ", description));
+    MOZ_ALWAYS_FALSE(tokenizer_->raiseError(out.string()));
+
+    return cx_->alreadyReportedError();
+}
+
+mozilla::GenericErrorResult<JS::Error&>
+BinASTParser::raiseError(const char* description)
+{
+    MOZ_ALWAYS_FALSE(tokenizer_->raiseError(description));
+    return cx_->alreadyReportedError();
+}
+
+void
+BinASTParser::poison()
+{
+    tokenizer_.reset();
+}
+
+void
+BinASTParser::reportErrorNoOffset(unsigned errorNumber, ...)
+{
+    va_list args;
+    va_start(args, errorNumber);
+
+    ErrorMetadata metadata;
+    metadata.filename = getFilename();
+    metadata.lineNumber = 0;
+    metadata.columnNumber = offset();
+    ReportCompileError(cx_, Move(metadata), nullptr, JSREPORT_ERROR, errorNumber, args);
+
+    va_end(args);
+}
+
+bool
+BinASTParser::hasUsedName(HandlePropertyName name)
+{
+    if (UsedNamePtr p = usedNames_.lookup(name))
+        return p->value().isUsedInScript(parseContext_->scriptId());
+
+    return false;
+}
+
+void
+TraceBinParser(JSTracer* trc, AutoGCRooter* parser)
+{
+    static_cast<BinASTParser*>(parser)->trace(trc);
+}
+
+} // namespace frontend
+} // namespace js
+
+
+// #undef everything, to avoid collisions with unified builds.
+
+#undef TRY
+#undef TRY_VAR
+#undef TRY_DECL
+#undef TRY_EMPL
+#undef MOZ_TRY_EMPLACE
diff --git a/js/src/frontend/BinSource.h b/js/src/frontend/BinSource.h
new file mode 100644
index 000000000000..e362bdc90ee2
--- /dev/null
+++ b/js/src/frontend/BinSource.h
@@ -0,0 +1,274 @@
+#ifndef frontend_BinSource_h
+#define frontend_BinSource_h
+
+/**
+ * A Binary AST parser.
+ *
+ * At the time of this writing, this parser implements the grammar of ES5
+ * and trusts its input (in particular, variable declarations).
+ */
+
+#include "mozilla/Maybe.h"
+
+#include "frontend/BinTokenReaderTester.h"
+#include "frontend/FullParseHandler.h"
+#include "frontend/ParseContext.h"
+#include "frontend/ParseNode.h"
+#include "frontend/SharedContext.h"
+
+#include "js/GCHashTable.h"
+#include "js/GCVector.h"
+#include "js/Result.h"
+
+namespace js {
+namespace frontend {
+
+class BinASTParser;
+
+/**
+ * The parser for a Binary AST.
+ *
+ * By design, this parser never needs to backtrack or look ahead. Errors are not
+ * recoverable.
+ */
+class BinASTParser : private JS::AutoGCRooter, public ErrorReporter
+{
+    using Names = JS::GCVector<JSString*, 8>;
+    using Tokenizer = BinTokenReaderTester;
+    using Chars = Tokenizer::Chars;
+
+  public:
+    BinASTParser(JSContext* cx, LifoAlloc& alloc, UsedNameTracker& usedNames, const JS::ReadOnlyCompileOptions& options)
+        : AutoGCRooter(cx, BINPARSER)
+        , traceListHead_(nullptr)
+        , options_(options)
+        , cx_(cx)
+        , alloc_(alloc)
+        , nodeAlloc_(cx, alloc)
+        , keepAtoms_(cx)
+        , parseContext_(nullptr)
+        , usedNames_(usedNames)
+        , factory_(cx, alloc, nullptr, SourceKind::Binary)
+    {
+         cx_->frontendCollectionPool().addActiveCompilation();
+         tempPoolMark_ = alloc.mark();
+    }
+    ~BinASTParser()
+    {
+        alloc_.release(tempPoolMark_);
+
+        /*
+         * The parser can allocate enormous amounts of memory for large functions.
+         * Eagerly free the memory now (which otherwise won't be freed until the
+         * next GC) to avoid unnecessary OOMs.
+         */
+        alloc_.freeAllIfHugeAndUnused();
+
+        cx_->frontendCollectionPool().removeActiveCompilation();
+    }
+
+    /**
+     * Parse a buffer, returning a node (which may be nullptr) in case of success
+     * or Nothing() in case of error.
+     *
+     * The instance of `ParseNode` MAY NOT survive the `BinASTParser`. Indeed,
+     * destruction of the `BinASTParser` will also destroy the `ParseNode`.
+     *
+     * In case of error, the parser reports the JS error.
+     */
+    JS::Result<ParseNode*> parse(const uint8_t* start, const size_t length);
+    JS::Result<ParseNode*> parse(const Vector<uint8_t>& data);
+
+  private:
+    MOZ_MUST_USE JS::Result<ParseNode*> parseAux(const uint8_t* start, const size_t length);
+
+    // --- Raise errors.
+    //
+    // These methods return a (failed) JS::Result for convenience.
+
+    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseInvalidKind(const char* superKind, const BinKind kind);
+    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseInvalidField(const char* kind, const BinField field);
+    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseInvalidEnum(const char* kind, const Chars& value);
+    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseMissingField(const char* kind, const BinField field);
+    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseEmpty(const char* description);
+    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseOOM();
+    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseError(const char* description);
+    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseError(BinKind kind, const char* description);
+
+    // Ensure that this parser will never be used again.
+    void poison();
+
+    // --- Parse full nodes (methods are sorted by alphabetical order)
+    //
+    // These method may NEVER return `nullptr`. // FIXME: We can probably optimize Result<> based on this.
+
+    MOZ_MUST_USE JS::Result<ParseNode*> parseBlockStatement();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseCatchClause();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseExpression();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseForInit();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseForInInit();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseIdentifier();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseObjectPropertyName();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseObjectMember();
+    MOZ_MUST_USE JS::Result<ParseNode*> parsePattern(); // Parse a *binding* pattern.
+    MOZ_MUST_USE JS::Result<ParseNode*> parsePropertyName();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseProgram();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseStatement();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseSwitchCase();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseVariableDeclarator();
+
+
+    // --- Parse lists of nodes (methods are sorted by alphabetical order)
+
+    MOZ_MUST_USE JS::Result<ParseNode*> parseArgumentList();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseDirectiveList();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseExpressionList(bool acceptElisions);
+
+    // Returns a list of PNK_COLON.
+    MOZ_MUST_USE JS::Result<ParseNode*> parseObjectMemberList();
+
+    MOZ_MUST_USE JS::Result<ParseNode*> parseStatementList();
+    MOZ_MUST_USE JS::Result<ParseNode*> parseSwitchCaseList();
+
+    // --- Parse the contents of a node whose kind has already been determined.
+
+    MOZ_MUST_USE JS::Result<ParseNode*> parseArrayExpressionAux(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<ParseNode*> parseBreakOrContinueStatementAux(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<ParseNode*> parseBlockStatementAux(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<ParseNode*> parseExpressionStatementAux(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<ParseNode*> parseExpressionAux(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<ParseNode*> parseFunctionAux(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<ParseNode*> parseIdentifierAux(const BinKind, const Tokenizer::BinFields& fields, const bool expectObjectPropertyName = false);
+    MOZ_MUST_USE JS::Result<ParseNode*> parseMemberExpressionAux(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<ParseNode*> parseNumericLiteralAux(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<ParseNode*> parseObjectExpressionAux(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<ParseNode*> parsePatternAux(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<ParseNode*> parseStringLiteralAux(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<ParseNode*> parseStatementAux(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<ParseNode*> parseVariableDeclarationAux(const BinKind kind, const Tokenizer::BinFields& fields);
+
+    // --- Auxiliary parsing functions that may have a side-effect on the parser but do not return a node.
+
+    MOZ_MUST_USE JS::Result<Ok> checkEmptyTuple(const BinKind kind, const Tokenizer::BinFields& fields);
+    MOZ_MUST_USE JS::Result<Ok> parseElisionAux(const BinKind kind, const Tokenizer::BinFields& fields);
+
+    // Parse full scope information to the current innermost scope.
+    MOZ_MUST_USE JS::Result<Ok> parseAndUpdateCurrentScope();
+    // Parse full scope information to a specific var scope / let scope combination.
+    MOZ_MUST_USE JS::Result<Ok> parseAndUpdateScope(ParseContext::Scope& varScope, ParseContext::Scope& letScope);
+    // Parse a list of names and add it to a given scope.
+    MOZ_MUST_USE JS::Result<Ok> parseAndUpdateScopeNames(ParseContext::Scope& scope, DeclarationKind kind);
+    MOZ_MUST_USE JS::Result<Ok> parseStringList(MutableHandle<Maybe<Names>> out);
+
+    // --- Utilities.
+
+    MOZ_MUST_USE JS::Result<ParseNode*> appendDirectivesToBody(ParseNode* body, ParseNode* directives);
+
+    // Read a string as a `Chars`.
+    MOZ_MUST_USE JS::Result<Ok> readString(Maybe<Chars>& out);
+    MOZ_MUST_USE JS::Result<Ok> readString(MutableHandleAtom out);
+    MOZ_MUST_USE JS::Result<bool> readBool();
+    MOZ_MUST_USE JS::Result<double> readNumber();
+
+    const ReadOnlyCompileOptions& options() const override {
+        return this->options_;
+    }
+
+    // Names
+
+
+    bool hasUsedName(HandlePropertyName name);
+
+    // --- GC.
+
+    void trace(JSTracer* trc) {
+        ObjectBox::TraceList(trc, traceListHead_);
+    }
+
+
+  public:
+    ObjectBox* newObjectBox(JSObject* obj) {
+        MOZ_ASSERT(obj);
+
+        /*
+         * We use JSContext.tempLifoAlloc to allocate parsed objects and place them
+         * on a list in this Parser to ensure GC safety. Thus the tempLifoAlloc
+         * arenas containing the entries must be alive until we are done with
+         * scanning, parsing and code generation for the whole script or top-level
+         * function.
+         */
+
+         ObjectBox* objbox = alloc_.new_<ObjectBox>(obj, traceListHead_);
+         if (!objbox) {
+             ReportOutOfMemory(cx_);
+             return nullptr;
+        }
+
+        traceListHead_ = objbox;
+
+        return objbox;
+    }
+
+    ParseNode* allocParseNode(size_t size) {
+        MOZ_ASSERT(size == sizeof(ParseNode));
+        return static_cast<ParseNode*>(nodeAlloc_.allocNode());
+    }
+
+    JS_DECLARE_NEW_METHODS(new_, allocParseNode, inline)
+
+  private: // Implement ErrorReporter
+
+    virtual void lineNumAndColumnIndex(size_t offset, uint32_t* line, uint32_t* column) const override {
+        *line = 0;
+        *column = offset;
+    }
+    virtual size_t offset() const override {
+        if (tokenizer_.isSome())
+            return tokenizer_->offset();
+
+        return 0;
+    }
+    virtual bool hasTokenizationStarted() const override {
+        return tokenizer_.isSome();
+    }
+    virtual void reportErrorNoOffset(unsigned errorNumber, ...) override;
+    virtual const char* getFilename() const override {
+        return this->options_.filename();
+    }
+
+    ObjectBox* traceListHead_;
+    const ReadOnlyCompileOptions& options_;
+    JSContext* cx_;
+    LifoAlloc& alloc_;
+    LifoAlloc::Mark tempPoolMark_;
+    ParseNodeAllocator nodeAlloc_;
+
+    // Root atoms and objects allocated for the parse tree.
+    AutoKeepAtoms keepAtoms_;
+
+    // The current ParseContext, holding directives, etc.
+    ParseContext* parseContext_;
+    UsedNameTracker& usedNames_;
+    Maybe<Tokenizer> tokenizer_;
+    FullParseHandler factory_;
+
+    friend class BinParseContext;
+
+    // Needs access to AutoGCRooter.
+    friend void TraceBinParser(JSTracer* trc, AutoGCRooter* parser);
+};
+
+class BinParseContext : public ParseContext
+{
+  public:
+    BinParseContext(JSContext* cx, BinASTParser* parser, SharedContext* sc, Directives* newDirectives)
+        : ParseContext(cx, parser->parseContext_, sc, *parser,
+                       parser->usedNames_, newDirectives, /* isFull = */ true)
+    { }
+};
+
+
+} // namespace frontend
+} // namespace js
+
+#endif // frontend_BinSource_h
\ No newline at end of file
diff --git a/js/src/frontend/BinTokenReaderTester.cpp b/js/src/frontend/BinTokenReaderTester.cpp
index 2962a3f88808..177909efbcbd 100644
--- a/js/src/frontend/BinTokenReaderTester.cpp
+++ b/js/src/frontend/BinTokenReaderTester.cpp
@@ -31,8 +31,7 @@ bool
 BinTokenReaderTester::raiseError(const char* description)
 {
     MOZ_ASSERT(!cx_->isExceptionPending());
-    TokenPos pos;
-    latestTokenPos(pos);
+    TokenPos pos = this->pos();
     JS_ReportErrorASCII(cx_, "BinAST parsing error: %s at offsets %u => %u",
                         description, pos.begin, pos.end);
     return false;
@@ -416,12 +415,20 @@ BinTokenReaderTester::offset() const
     return latestKnownGoodPos_;
 }
 
-void
-BinTokenReaderTester::latestTokenPos(TokenPos& pos)
+TokenPos
+BinTokenReaderTester::pos()
 {
-    pos.begin = latestKnownGoodPos_;
+    return pos(latestKnownGoodPos_);
+}
+
+TokenPos
+BinTokenReaderTester::pos(size_t start)
+{
+    TokenPos pos;
+    pos.begin = start;
     pos.end = current_ - start_;
     MOZ_ASSERT(pos.end >= pos.begin);
+    return pos;
 }
 
 void
diff --git a/js/src/frontend/BinTokenReaderTester.h b/js/src/frontend/BinTokenReaderTester.h
index 45418f1249d2..7fa8ffe03b3b 100644
--- a/js/src/frontend/BinTokenReaderTester.h
+++ b/js/src/frontend/BinTokenReaderTester.h
@@ -181,7 +181,8 @@ class MOZ_STACK_CLASS BinTokenReaderTester
     /**
      * Return the position of the latest token.
      */
-    void latestTokenPos(TokenPos& out);
+    TokenPos pos();
+    TokenPos pos(size_t startOffset);
     size_t offset() const;
 
     /**
diff --git a/js/src/frontend/BytecodeCompiler.h b/js/src/frontend/BytecodeCompiler.h
index 97578ed4f7a7..44142cb2c0df 100644
--- a/js/src/frontend/BytecodeCompiler.h
+++ b/js/src/frontend/BytecodeCompiler.h
@@ -124,10 +124,13 @@ IsKeyword(JSLinearString* str);
 void
 TraceParser(JSTracer* trc, JS::AutoGCRooter* parser);
 
+#if defined(JS_BUILD_BINAST)
+
 /* Trace all GC things reachable from binjs parser. Defined in BinSource.cpp. */
 void
 TraceBinParser(JSTracer* trc, JS::AutoGCRooter* parser);
 
+#endif // defined(JS_BUILD_BINAST)
 
 class MOZ_STACK_CLASS AutoFrontendTraceLog
 {
diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h
index fb50650e0462..fecfaf9cffde 100644
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.h
@@ -18,6 +18,13 @@
 namespace js {
 namespace frontend {
 
+enum class SourceKind {
+    // We are parsing from a text source (Parser.h)
+    Text,
+    // We are parsing from a binary source (BinSource.h)
+    Binary,
+};
+
 // Parse handler used when generating a full parse tree for all code which the
 // parser encounters.
 class FullParseHandler
@@ -38,6 +45,8 @@ class FullParseHandler
     size_t lazyInnerFunctionIndex;
     size_t lazyClosedOverBindingIndex;
 
+    const SourceKind sourceKind_;
+
   public:
     /* new_ methods for creating parse nodes. These report OOM on context. */
     JS_DECLARE_NEW_METHODS(new_, allocParseNode, inline)
@@ -65,15 +74,24 @@ class FullParseHandler
         return node->isInParens() && (node->isKind(PNK_OBJECT) || node->isKind(PNK_ARRAY));
     }
 
-    FullParseHandler(JSContext* cx, LifoAlloc& alloc, LazyScript* lazyOuterFunction)
+    FullParseHandler(JSContext* cx, LifoAlloc& alloc, LazyScript* lazyOuterFunction,
+                     SourceKind kind = SourceKind::Text)
       : allocator(cx, alloc),
         lazyOuterFunction_(cx, lazyOuterFunction),
         lazyInnerFunctionIndex(0),
-        lazyClosedOverBindingIndex(0)
+        lazyClosedOverBindingIndex(0),
+        sourceKind_(SourceKind::Text)
     {}
 
     static ParseNode* null() { return nullptr; }
 
+    // The FullParseHandler may be used to create nodes for text sources
+    // (from Parser.h) or for binary sources (from BinSource.h). In the latter
+    // case, some common assumptions on offsets are incorrect, e.g. in `a + b`,
+    // `a`, `b` and `+` may be stored in any order. We use `sourceKind()`
+    // to determine whether we need to check these assumptions.
+    SourceKind sourceKind() const { return sourceKind_; }
+
     ParseNode* freeTree(ParseNode* pn) { return allocator.freeTree(pn); }
     void prepareNodeForMutation(ParseNode* pn) { return allocator.prepareNodeForMutation(pn); }
 
@@ -224,7 +242,7 @@ class FullParseHandler
         ParseNode* elision = new_<NullaryNode>(PNK_ELISION, pos);
         if (!elision)
             return false;
-        literal->append(elision);
+        addList(/* list = */ literal, /* child = */ elision);
         literal->pn_xflags |= PNX_ARRAYHOLESPREAD | PNX_NONCONST;
         return true;
     }
@@ -233,7 +251,7 @@ class FullParseHandler
         ParseNode* spread = newSpread(begin, inner);
         if (!spread)
             return false;
-        literal->append(spread);
+        addList(/* list = */ literal, /* child = */ spread);
         literal->pn_xflags |= PNX_ARRAYHOLESPREAD | PNX_NONCONST;
         return true;
     }
@@ -241,7 +259,7 @@ class FullParseHandler
     void addArrayElement(ParseNode* literal, ParseNode* element) {
         if (!element->isConstant())
             literal->pn_xflags |= PNX_NONCONST;
-        literal->append(element);
+        addList(/* list = */ literal, /* child = */ element);
     }
 
     ParseNode* newCall(const TokenPos& pos) {
@@ -280,7 +298,9 @@ class FullParseHandler
     ParseNode* newSuperBase(ParseNode* thisName, const TokenPos& pos) {
         return new_<UnaryNode>(PNK_SUPERBASE, pos, thisName);
     }
-
+    ParseNode* newCatchBlock(ParseNode* catchName, ParseNode* catchGuard, ParseNode* catchBody) {
+        return new_<TernaryNode>(PNK_CATCH, catchName, catchGuard, catchBody);
+    }
     MOZ_MUST_USE bool addPrototypeMutation(ParseNode* literal, uint32_t begin, ParseNode* expr) {
         // Object literals with mutated [[Prototype]] are non-constant so that
         // singleton objects will have Object.prototype as their [[Prototype]].
@@ -289,22 +309,19 @@ class FullParseHandler
         ParseNode* mutation = newUnary(PNK_MUTATEPROTO, begin, expr);
         if (!mutation)
             return false;
-        literal->append(mutation);
+        addList(/* list = */ literal, /* child = */ mutation);
         return true;
     }
 
     MOZ_MUST_USE bool addPropertyDefinition(ParseNode* literal, ParseNode* key, ParseNode* val) {
         MOZ_ASSERT(literal->isKind(PNK_OBJECT));
         MOZ_ASSERT(literal->isArity(PN_LIST));
-        MOZ_ASSERT(key->isKind(PNK_NUMBER) ||
-                   key->isKind(PNK_OBJECT_PROPERTY_NAME) ||
-                   key->isKind(PNK_STRING) ||
-                   key->isKind(PNK_COMPUTED_NAME));
+        MOZ_ASSERT(isUsableAsObjectPropertyName(key));
 
         ParseNode* propdef = newBinary(PNK_COLON, key, val, JSOP_INITPROP);
         if (!propdef)
             return false;
-        literal->append(propdef);
+        addList(/* list = */ literal, /* child = */ propdef);
         return true;
     }
 
@@ -319,7 +336,7 @@ class FullParseHandler
         ParseNode* propdef = newBinary(PNK_SHORTHAND, name, expr, JSOP_INITPROP);
         if (!propdef)
             return false;
-        literal->append(propdef);
+        addList(/* list = */ literal, /* child = */ propdef);
         return true;
     }
 
@@ -331,7 +348,7 @@ class FullParseHandler
         ParseNode* spread = newSpread(begin, inner);
         if (!spread)
             return false;
-        literal->append(spread);
+        addList(/* list = */ literal, /* child = */ spread);
         return true;
     }
 
@@ -339,16 +356,13 @@ class FullParseHandler
                                                 AccessorType atype)
     {
         MOZ_ASSERT(literal->isArity(PN_LIST));
-        MOZ_ASSERT(key->isKind(PNK_NUMBER) ||
-                   key->isKind(PNK_OBJECT_PROPERTY_NAME) ||
-                   key->isKind(PNK_STRING) ||
-                   key->isKind(PNK_COMPUTED_NAME));
         literal->pn_xflags |= PNX_NONCONST;
 
-        ParseNode* propdef = newBinary(PNK_COLON, key, fn, AccessorTypeToJSOp(atype));
+        ParseNode* propdef = newObjectMethodOrPropertyDefinition(key, fn, atype);
         if (!propdef)
             return false;
-        literal->append(propdef);
+
+        addList(/* list = */ literal, /* child = */ propdef);
         return true;
     }
 
@@ -356,15 +370,12 @@ class FullParseHandler
                                                AccessorType atype, bool isStatic)
     {
         MOZ_ASSERT(methodList->isKind(PNK_CLASSMETHODLIST));
-        MOZ_ASSERT(key->isKind(PNK_NUMBER) ||
-                   key->isKind(PNK_OBJECT_PROPERTY_NAME) ||
-                   key->isKind(PNK_STRING) ||
-                   key->isKind(PNK_COMPUTED_NAME));
+        MOZ_ASSERT(isUsableAsObjectPropertyName(key));
 
         ParseNode* classMethod = new_<ClassMethod>(key, fn, AccessorTypeToJSOp(atype), isStatic);
         if (!classMethod)
             return false;
-        methodList->append(classMethod);
+        addList(/* list = */ methodList, /* child = */ classMethod);
         return true;
     }
 
@@ -403,7 +414,7 @@ class FullParseHandler
     void addStatementToList(ParseNode* list, ParseNode* stmt) {
         MOZ_ASSERT(list->isKind(PNK_STATEMENTLIST));
 
-        list->append(stmt);
+        addList(/* list = */ list, /* child = */ stmt);
 
         if (isFunctionStmt(stmt)) {
             // PNX_FUNCDEFS notifies the emitter that the block contains
@@ -423,7 +434,7 @@ class FullParseHandler
         MOZ_ASSERT(casepn->isKind(PNK_CASE));
         MOZ_ASSERT(casepn->pn_right->isKind(PNK_STATEMENTLIST));
 
-        list->append(casepn);
+        addList(/* list = */ list, /* child = */ casepn);
 
         if (casepn->pn_right->pn_xflags & PNX_FUNCDEFS)
             list->pn_xflags |= PNX_FUNCDEFS;
@@ -439,7 +450,7 @@ class FullParseHandler
 
         MOZ_ASSERT(genName->getOp() == JSOP_GETNAME);
         genName->setOp(JSOP_SETNAME);
-        ParseNode* genInit = newBinary(PNK_ASSIGN, genName, makeGen);
+        ParseNode* genInit = newAssignment(PNK_ASSIGN, /* lhs = */ genName, /* rhs = */ makeGen);
         if (!genInit)
             return false;
 
@@ -640,6 +651,20 @@ class FullParseHandler
                !node->pn_funbox->isArrow();
     }
 
+    ParseNode* newObjectMethodOrPropertyDefinition(ParseNode* key, ParseNode* fn, AccessorType atype) {
+        MOZ_ASSERT(isUsableAsObjectPropertyName(key));
+
+        return newBinary(PNK_COLON, key, fn, AccessorTypeToJSOp(atype));
+    }
+
+    bool setComprehensionLambdaBody(ParseNode* pn, ParseNode* body) {
+        MOZ_ASSERT(body->isKind(PNK_STATEMENTLIST));
+        ParseNode* paramsBody = newList(PNK_PARAMSBODY, body);
+        if (!paramsBody)
+            return false;
+        setFunctionFormalParametersAndBody(pn, paramsBody);
+        return true;
+    }
     void setFunctionFormalParametersAndBody(ParseNode* pn, ParseNode* kid) {
         MOZ_ASSERT_IF(kid, kid->isKind(PNK_PARAMSBODY));
         pn->pn_body = kid;
@@ -650,11 +675,11 @@ class FullParseHandler
         funbox->functionNode = pn;
     }
     void addFunctionFormalParameter(ParseNode* pn, ParseNode* argpn) {
-        pn->pn_body->append(argpn);
+        addList(/* list = */ pn->pn_body, /* child = */ argpn);
     }
     void setFunctionBody(ParseNode* fn, ParseNode* body) {
         MOZ_ASSERT(fn->pn_body->isKind(PNK_PARAMSBODY));
-        fn->pn_body->append(body);
+        addList(/* list = */ fn->pn_body, /* child = */ body);
     }
 
     ParseNode* newModule(const TokenPos& pos) {
@@ -670,7 +695,7 @@ class FullParseHandler
         if (!newExpr)
             return nullptr;
 
-        addList(newExpr, ctor);
+        addList(/* list = */ newExpr, /* child = */ ctor);
         return newExpr;
     }
 
@@ -713,6 +738,13 @@ class FullParseHandler
         return node->isKind(PNK_SUPERBASE);
     }
 
+    bool isUsableAsObjectPropertyName(ParseNode* node) {
+        return node->isKind(PNK_NUMBER)
+            || node->isKind(PNK_OBJECT_PROPERTY_NAME)
+            || node->isKind(PNK_STRING)
+            || node->isKind(PNK_COMPUTED_NAME);
+    }
+
     inline MOZ_MUST_USE bool finishInitializerAssignment(ParseNode* pn, ParseNode* init);
 
     void setBeginPosition(ParseNode* pn, ParseNode* oth) {
@@ -778,7 +810,10 @@ class FullParseHandler
     }
 
     void addList(ParseNode* list, ParseNode* kid) {
-        list->append(kid);
+        if (sourceKind_ == SourceKind::Text)
+            list->append(kid);
+        else
+            list->appendWithoutOrderAssumption(kid);
     }
 
     void setOp(ParseNode* pn, JSOp op) {
@@ -857,10 +892,11 @@ FullParseHandler::addCatchBlock(ParseNode* catchList, ParseNode* lexicalScope,
                                 ParseNode* catchName, ParseNode* catchGuard,
                                 ParseNode* catchBody)
 {
-    ParseNode* catchpn = new_<TernaryNode>(PNK_CATCH, catchName, catchGuard, catchBody);
+    MOZ_ASSERT(catchList->isKind(PNK_CATCHLIST));
+    ParseNode* catchpn = newCatchBlock(catchName, catchGuard, catchBody);
     if (!catchpn)
         return false;
-    catchList->append(lexicalScope);
+    addList(/* list = */ catchList, /* child = */ lexicalScope);
     lexicalScope->setScopeBody(catchpn);
     return true;
 }
diff --git a/js/src/frontend/ParseContext-inl.h b/js/src/frontend/ParseContext-inl.h
new file mode 100644
index 000000000000..be2d22b53b47
--- /dev/null
+++ b/js/src/frontend/ParseContext-inl.h
@@ -0,0 +1,96 @@
+#ifndef frontend_ParseContext_inl_h
+#define frontend_ParseContext_inl_h
+
+#include "frontend/ParseContext.h"
+
+namespace js {
+namespace frontend {
+
+template <>
+inline bool
+ParseContext::Statement::is<ParseContext::LabelStatement>() const
+{
+    return kind_ == StatementKind::Label;
+}
+
+template <>
+inline bool
+ParseContext::Statement::is<ParseContext::ClassStatement>() const
+{
+    return kind_ == StatementKind::Class;
+}
+
+
+inline JS::Result<Ok, ParseContext::BreakStatementError>
+ParseContext::checkBreakStatement(PropertyName* label)
+{
+    // Labeled 'break' statements target the nearest labeled statements (could
+    // be any kind) with the same label. Unlabeled 'break' statements target
+    // the innermost loop or switch statement.
+    if (label) {
+        auto hasSameLabel = [&label](ParseContext::LabelStatement* stmt) {
+            MOZ_ASSERT(stmt);
+            return stmt->label() == label;
+        };
+
+        if (!findInnermostStatement<ParseContext::LabelStatement>(hasSameLabel))
+            return mozilla::Err(ParseContext::BreakStatementError::LabelNotFound);
+
+    } else {
+        auto isBreakTarget = [](ParseContext::Statement* stmt) {
+            return StatementKindIsUnlabeledBreakTarget(stmt->kind());
+        };
+
+        if (!findInnermostStatement(isBreakTarget))
+            return mozilla::Err(ParseContext::BreakStatementError::ToughBreak);
+    }
+
+    return Ok();
+}
+
+inline JS::Result<Ok, ParseContext::ContinueStatementError>
+ParseContext::checkContinueStatement(PropertyName* label)
+{
+    // Labeled 'continue' statements target the nearest labeled loop
+    // statements with the same label. Unlabeled 'continue' statements target
+    // the innermost loop statement.
+    auto isLoop = [](ParseContext::Statement* stmt) {
+        MOZ_ASSERT(stmt);
+        return StatementKindIsLoop(stmt->kind());
+    };
+
+    if (!label) {
+        // Unlabeled statement: we target the innermost loop, so make sure that
+        // there is an innermost loop.
+        if (!findInnermostStatement(isLoop))
+            return mozilla::Err(ParseContext::ContinueStatementError::NotInALoop);
+        return Ok();
+    }
+
+    // Labeled statement: targest the nearest labeled loop with the same label.
+    ParseContext::Statement* stmt = innermostStatement();
+    bool foundLoop = false; // True if we have encountered at least one loop.
+
+    for (;;) {
+        stmt = ParseContext::Statement::findNearest(stmt, isLoop);
+        if (!stmt)
+            return foundLoop ? mozilla::Err(ParseContext::ContinueStatementError::LabelNotFound)
+                             : mozilla::Err(ParseContext::ContinueStatementError::NotInALoop);
+
+        foundLoop = true;
+
+        // Is it labeled by our label?
+        stmt = stmt->enclosing();
+        while (stmt && stmt->is<ParseContext::LabelStatement>()) {
+            if (stmt->as<ParseContext::LabelStatement>().label() == label)
+                return Ok();
+
+            stmt = stmt->enclosing();
+        }
+    }
+}
+
+}
+}
+
+#endif // frontend_ParseContext_inl_h
diff --git a/js/src/frontend/ParseContext.h b/js/src/frontend/ParseContext.h
index 53dee523b115..04e457f0f8fa 100644
--- a/js/src/frontend/ParseContext.h
+++ b/js/src/frontend/ParseContext.h
@@ -7,7 +7,11 @@
 #ifndef frontend_ParseContext_h
 #define frontend_ParseContext_h
 
+#include "ds/Nestable.h"
+
+#include "frontend/BytecodeCompiler.h"
 #include "frontend/ErrorReporter.h"
+#include "frontend/SharedContext.h"
 
 namespace js {
 
@@ -289,6 +293,10 @@ class ParseContext : public Nestable<ParseContext>
             return declared_.acquire(pc->sc()->context);
         }
 
+        bool isEmpty() const {
+            return declared_->all().empty();
+        }
+
         DeclaredNamePtr lookupDeclaredName(JSAtom* name) {
             return declared_->lookup(name);
         }
@@ -402,6 +410,7 @@ class ParseContext : public Nestable<ParseContext>
     {
       public:
         explicit inline VarScope(ParserBase* parser);
+        explicit inline VarScope(JSContext* cx, ParseContext* pc, UsedNameTracker& usedNames);
     };
 
   private:
@@ -517,6 +526,7 @@ class ParseContext : public Nestable<ParseContext>
         return sc_;
     }
 
+    // `true` if we are in the body of a function definition.
     bool isFunctionBox() const {
         return sc_->isFunctionBox();
     }
@@ -578,6 +588,22 @@ class ParseContext : public Nestable<ParseContext>
         return *closedOverBindingsForLazy_;
     }
 
+    enum class BreakStatementError {
+        // Unlabeled break must be inside loop or switch.
+        ToughBreak,
+        LabelNotFound,
+    };
+
+    // Return Err(true) if we have encountered at least one loop,
+    // Err(false) otherwise.
+    MOZ_MUST_USE inline JS::Result<Ok, BreakStatementError> checkBreakStatement(PropertyName* label);
+
+    enum class ContinueStatementError {
+        NotInALoop,
+        LabelNotFound,
+    };
+    MOZ_MUST_USE inline JS::Result<Ok, ContinueStatementError> checkContinueStatement(PropertyName* label);
+
     // True if we are at the topmost level of a entire script or function body.
     // For example, while parsing this code we would encounter f1 and f2 at
     // body level, but we would not encounter f3 or f4 at body level:
diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h
index 92bf5620691e..675da8c2e87b 100644
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.h
@@ -13,6 +13,27 @@
 #include "frontend/TokenStream.h"
 #include "vm/Printer.h"
 
+// A few notes on lifetime of ParseNode trees:
+//
+// - All the `ParseNode` instances MUST BE explicitly allocated in the context's `LifoAlloc`.
+//   This is typically implemented by the `FullParseHandler` or it can be reimplemented with
+//   a custom `new_`.
+//
+// - The tree is bulk-deallocated when the parser is deallocated. Consequently, references
+//   to a subtree MUST NOT exist once the parser has been deallocated.
+//
+// - This bulk-deallocation DOES NOT run destructors.
+//
+// - Instances of `LexicalScope::Data` MUST BE allocated as instances of `ParseNode`, in the same
+//   `LifoAlloc`. They are bulk-deallocated alongside the rest of the tree.
+//
+// - Instances of `JSAtom` used throughout the tree (including instances of `PropertyName`) MUST
+//   be kept alive by the parser. This is done through an instance of `AutoKeepAtoms` held by
+//   the parser.
+//
+// - Once the parser is deallocated, the `JSAtom` instances MAY be garbage-collected.
+
+
 namespace js {
 namespace frontend {
 
@@ -600,6 +621,7 @@ class ParseNode
     appendOrCreateList(ParseNodeKind kind, ParseNode* left, ParseNode* right,
                        FullParseHandler* handler, ParseContext* pc);
 
+    // include "ParseNode-inl.h" for these methods.
     inline PropertyName* name() const;
     inline JSAtom* atom() const;
 
@@ -733,8 +755,12 @@ class ParseNode
     }
 
     void append(ParseNode* pn) {
-        MOZ_ASSERT(pn_arity == PN_LIST);
         MOZ_ASSERT(pn->pn_pos.begin >= pn_pos.begin);
+        appendWithoutOrderAssumption(pn);
+    }
+
+    void appendWithoutOrderAssumption(ParseNode* pn) {
+        MOZ_ASSERT(pn_arity == PN_LIST);
         pn_pos.end = pn->pn_pos.end;
         *pn_tail = pn;
         pn_tail = &pn->pn_next;
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index ac5997f3f187..de78778c6d91 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -42,6 +42,7 @@
 #include "jsatominlines.h"
 #include "jsscriptinlines.h"
 
+#include "frontend/ParseContext-inl.h"
 #include "frontend/ParseNode-inl.h"
 #include "vm/EnvironmentObject-inl.h"
 
@@ -1746,7 +1747,7 @@ Parser<FullParseHandler, char16_t>::checkStatementsEOF()
 }
 
 template <typename Scope>
-static typename Scope::Data*
+typename Scope::Data*
 NewEmptyBindingData(JSContext* cx, LifoAlloc& alloc, uint32_t numBindings)
 {
     size_t allocSize = Scope::sizeOfData(numBindings);
@@ -1760,8 +1761,9 @@ NewEmptyBindingData(JSContext* cx, LifoAlloc& alloc, uint32_t numBindings)
 }
 
 Maybe<GlobalScope::Data*>
-ParserBase::newGlobalScopeData(ParseContext::Scope& scope)
+NewGlobalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc)
 {
+
     Vector<BindingName> funs(context);
     Vector<BindingName> vars(context);
     Vector<BindingName> lets(context);
@@ -1824,8 +1826,14 @@ ParserBase::newGlobalScopeData(ParseContext::Scope& scope)
     return Some(bindings);
 }
 
+Maybe<GlobalScope::Data*>
+ParserBase::newGlobalScopeData(ParseContext::Scope& scope)
+{
+    return NewGlobalScopeData(context, scope, alloc, pc);
+}
+
 Maybe<ModuleScope::Data*>
-ParserBase::newModuleScopeData(ParseContext::Scope& scope)
+NewModuleScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc)
 {
     Vector<BindingName> imports(context);
     Vector<BindingName> vars(context);
@@ -1890,8 +1898,14 @@ ParserBase::newModuleScopeData(ParseContext::Scope& scope)
     return Some(bindings);
 }
 
+Maybe<ModuleScope::Data*>
+ParserBase::newModuleScopeData(ParseContext::Scope& scope)
+{
+    return NewModuleScopeData(context, scope, alloc, pc);
+}
+
 Maybe<EvalScope::Data*>
-ParserBase::newEvalScopeData(ParseContext::Scope& scope)
+NewEvalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc)
 {
     Vector<BindingName> funs(context);
     Vector<BindingName> vars(context);
@@ -1934,8 +1948,14 @@ ParserBase::newEvalScopeData(ParseContext::Scope& scope)
     return Some(bindings);
 }
 
+Maybe<EvalScope::Data*>
+ParserBase::newEvalScopeData(ParseContext::Scope& scope)
+{
+    return NewEvalScopeData(context, scope, alloc, pc);
+}
+
 Maybe<FunctionScope::Data*>
-ParserBase::newFunctionScopeData(ParseContext::Scope& scope, bool hasParameterExprs)
+NewFunctionScopeData(JSContext* context, ParseContext::Scope& scope, bool hasParameterExprs, LifoAlloc& alloc, ParseContext* pc)
 {
     Vector<BindingName> positionalFormals(context);
     Vector<BindingName> formals(context);
@@ -2028,8 +2048,14 @@ ParserBase::newFunctionScopeData(ParseContext::Scope& scope, bool hasParameterEx
     return Some(bindings);
 }
 
+Maybe<FunctionScope::Data*>
+ParserBase::newFunctionScopeData(ParseContext::Scope& scope, bool hasParameterExprs)
+{
+    return NewFunctionScopeData(context, scope, hasParameterExprs, alloc, pc);
+}
+
 Maybe<VarScope::Data*>
-ParserBase::newVarScopeData(ParseContext::Scope& scope)
+NewVarScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc)
 {
     Vector<BindingName> vars(context);
 
@@ -2060,8 +2086,14 @@ ParserBase::newVarScopeData(ParseContext::Scope& scope)
     return Some(bindings);
 }
 
+Maybe<VarScope::Data*>
+ParserBase::newVarScopeData(ParseContext::Scope& scope)
+{
+    return NewVarScopeData(context, scope, alloc, pc);
+}
+
 Maybe<LexicalScope::Data*>
-ParserBase::newLexicalScopeData(ParseContext::Scope& scope)
+NewLexicalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc)
 {
     Vector<BindingName> lets(context);
     Vector<BindingName> consts(context);
@@ -2111,6 +2143,12 @@ ParserBase::newLexicalScopeData(ParseContext::Scope& scope)
     return Some(bindings);
 }
 
+Maybe<LexicalScope::Data*>
+ParserBase::newLexicalScopeData(ParseContext::Scope& scope)
+{
+    return NewLexicalScopeData(context, scope, alloc, pc);
+}
+
 template <>
 SyntaxParseHandler::Node
 Parser<SyntaxParseHandler, char16_t>::finishLexicalScope(ParseContext::Scope& scope, Node body)
@@ -6454,44 +6492,16 @@ Parser<ParseHandler, CharT>::continueStatement(YieldHandling yieldHandling)
     if (!matchLabel(yieldHandling, &label))
         return null();
 
-    // Labeled 'continue' statements target the nearest labeled loop
-    // statements with the same label. Unlabeled 'continue' statements target
-    // the innermost loop statement.
-    auto isLoop = [](ParseContext::Statement* stmt) {
-        return StatementKindIsLoop(stmt->kind());
-    };
-
-    if (label) {
-        ParseContext::Statement* stmt = pc->innermostStatement();
-        bool foundLoop = false;
-
-        for (;;) {
-            stmt = ParseContext::Statement::findNearest(stmt, isLoop);
-            if (!stmt) {
-                if (foundLoop)
-                    error(JSMSG_LABEL_NOT_FOUND);
-                else
-                    errorAt(begin, JSMSG_BAD_CONTINUE);
-                return null();
-            }
-
-            foundLoop = true;
-
-            // Is it labeled by our label?
-            bool foundTarget = false;
-            stmt = stmt->enclosing();
-            while (stmt && stmt->is<ParseContext::LabelStatement>()) {
-                if (stmt->as<ParseContext::LabelStatement>().label() == label) {
-                    foundTarget = true;
-                    break;
-                }
-                stmt = stmt->enclosing();
-            }
-            if (foundTarget)
-                break;
+    auto validity = pc->checkContinueStatement(label);
+    if (validity.isErr()) {
+        switch (validity.unwrapErr()) {
+          case ParseContext::ContinueStatementError::NotInALoop:
+            errorAt(begin, JSMSG_BAD_CONTINUE);
+            break;
+          case ParseContext::ContinueStatementError::LabelNotFound:
+            error(JSMSG_LABEL_NOT_FOUND);
+            break;
         }
-    } else if (!pc->findInnermostStatement(isLoop)) {
-        error(JSMSG_BAD_CONTINUE);
         return null();
     }
 
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index 507d2940a74f..0b050fa95e30 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -47,20 +47,6 @@ public:
     { }
 };
 
-template <>
-inline bool
-ParseContext::Statement::is<ParseContext::LabelStatement>() const
-{
-    return kind_ == StatementKind::Label;
-}
-
-template <>
-inline bool
-ParseContext::Statement::is<ParseContext::ClassStatement>() const
-{
-    return kind_ == StatementKind::Class;
-}
-
 template <typename T>
 inline T&
 ParseContext::Statement::as()
@@ -305,6 +291,13 @@ ParseContext::VarScope::VarScope(ParserBase* parser)
     useAsVarScope(parser->pc);
 }
 
+inline
+ParseContext::VarScope::VarScope(JSContext* cx, ParseContext* pc, UsedNameTracker& usedNames)
+  : Scope(cx, pc, usedNames)
+{
+    useAsVarScope(pc);
+}
+
 enum class ExpressionClosure { Allowed, Forbidden };
 
 template <class ParseHandler, typename CharT>
@@ -948,6 +941,21 @@ class MOZ_STACK_CLASS AutoAwaitIsKeyword
     }
 };
 
+template <typename Scope>
+extern typename Scope::Data*
+NewEmptyBindingData(JSContext* cx, LifoAlloc& alloc, uint32_t numBindings);
+
+Maybe<GlobalScope::Data*>
+NewGlobalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc);
+Maybe<EvalScope::Data*>
+NewEvalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc);
+Maybe<FunctionScope::Data*>
+NewFunctionScopeData(JSContext* context, ParseContext::Scope& scope, bool hasParameterExprs, LifoAlloc& alloc, ParseContext* pc);
+Maybe<VarScope::Data*>
+NewVarScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc);
+Maybe<LexicalScope::Data*>
+NewLexicalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc);
+
 } /* namespace frontend */
 } /* namespace js */
 
diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h
index ba2a5623758b..741eae2f9fa3 100644
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -15,12 +15,14 @@
 
 #include "builtin/ModuleObject.h"
 #include "ds/InlineTable.h"
+#include "frontend/ParseNode.h"
 #include "frontend/TokenStream.h"
 #include "vm/EnvironmentObject.h"
 
 namespace js {
 namespace frontend {
 
+class ParseContext;
 class ParseNode;
 
 enum class StatementKind : uint8_t
diff --git a/js/src/jsapi-tests/testBinASTReader.cpp b/js/src/jsapi-tests/testBinASTReader.cpp
index 567db6db2b28..26d6daf44f76 100644
--- a/js/src/jsapi-tests/testBinASTReader.cpp
+++ b/js/src/jsapi-tests/testBinASTReader.cpp
@@ -8,9 +8,17 @@
 
 #include "mozilla/Vector.h"
 
+#if defined(XP_UNIX)
+
 #include <dirent.h>
 #include <sys/stat.h>
 
+#elif defined(XP_WIN)
+
+#include <windows.h>
+
+#endif
+
 #include "frontend/BinSource.h"
 #include "frontend/FullParseHandler.h"
 #include "frontend/ParseContext.h"
@@ -20,12 +28,12 @@
 
 using UsedNameTracker = js::frontend::UsedNameTracker;
 
-extern void readFull(const char* path, Vector<char>& buf);
+extern void readFull(const char* path, Vector<uint8_t>& buf);
 
 void readFull(JSContext* cx, const char* path, Vector<char16_t>& buf) {
     buf.shrinkTo(0);
 
-    Vector<char> intermediate(cx);
+    Vector<uint8_t> intermediate(cx);
     readFull(path, intermediate);
 
     if (!buf.appendAll(intermediate))
@@ -34,13 +42,6 @@ void readFull(JSContext* cx, const char* path, Vector<char16_t>& buf) {
 
 BEGIN_TEST(testBinASTReaderECMAScript2)
 {
-    const char PATH[] = "jsapi-tests/binast/parser/tester/";
-
-    // Read the list of files in the directory.
-    DIR* dir = opendir(PATH);
-    if (!dir)
-        MOZ_CRASH();
-
     const char BIN_SUFFIX[] = ".binjs";
     const char TXT_SUFFIX[] = ".js";
 
@@ -48,19 +49,46 @@ BEGIN_TEST(testBinASTReaderECMAScript2)
     options.setIntroductionType("unit test parse")
            .setFileAndLine("<string>", 1);
 
+#if defined(XP_UNIX)
+
+    const char PATH[] = "jsapi-tests/binast/parser/tester/";
+
+    // Read the list of files in the directory.
+    DIR* dir = opendir(PATH);
+    if (!dir)
+        MOZ_CRASH();
+
+
     while (auto entry = readdir(dir)) {
         // Find files whose name ends with ".binjs".
-        if (entry->d_namlen < sizeof(BIN_SUFFIX))
+        const char* d_name = entry->d_name;
+
+#elif defined(XP_WIN)
+
+    const char PATH[] = "jsapi-tests\\binast\\parser\\tester\\*.binjs";
+
+    WIN32_FIND_DATA FindFileData;
+    HANDLE hFind = FindFirstFile(PATH, &FindFileData);
+    for (bool found = (hFind != INVALID_HANDLE_VALUE);
+            found;
+            found = FindNextFile(hFind, &FindFileData)
+    {
+        const char* d_name = FindFileData.cFileName;
+
+#endif // defined(XP_UNIX) || defined(XP_WIN)
+
+        const size_t namlen = strlen(d_name);
+        if (namlen < sizeof(BIN_SUFFIX))
             continue;
-        if (strncmp(entry->d_name + entry->d_namlen - (sizeof(BIN_SUFFIX) - 1), BIN_SUFFIX, sizeof(BIN_SUFFIX)) != 0)
+        if (strncmp(d_name + namlen - (sizeof(BIN_SUFFIX) - 1), BIN_SUFFIX, sizeof(BIN_SUFFIX)) != 0)
             continue;
 
         // Find text file.
-        UniqueChars txtPath(static_cast<char*>(js_malloc(entry->d_namlen + sizeof(PATH) + 1)));
+        UniqueChars txtPath(static_cast<char*>(js_malloc(namlen + sizeof(PATH) + 1)));
         strncpy(txtPath.get(), PATH, sizeof(PATH));
-        strncpy(txtPath.get() + sizeof(PATH) - 1, entry->d_name, entry->d_namlen);
-        strncpy(txtPath.get() + sizeof(PATH) + entry->d_namlen - sizeof(BIN_SUFFIX), TXT_SUFFIX, sizeof(TXT_SUFFIX));
-        txtPath[sizeof(PATH) + entry->d_namlen - sizeof(BIN_SUFFIX) + sizeof(TXT_SUFFIX) - 1] = 0;
+        strncpy(txtPath.get() + sizeof(PATH) - 1, d_name, namlen);
+        strncpy(txtPath.get() + sizeof(PATH) + namlen - sizeof(BIN_SUFFIX), TXT_SUFFIX, sizeof(TXT_SUFFIX));
+        txtPath[sizeof(PATH) + namlen - sizeof(BIN_SUFFIX) + sizeof(TXT_SUFFIX) - 1] = 0;
         fprintf(stderr, "Testing %s\n", txtPath.get());
 
         // Read text file.
@@ -86,12 +114,12 @@ BEGIN_TEST(testBinASTReaderECMAScript2)
         }
 
         // Read binary file.
-        UniqueChars binPath(static_cast<char*>(js_malloc(entry->d_namlen + sizeof(PATH) + 1)));
+        UniqueChars binPath(static_cast<char*>(js_malloc(namlen + sizeof(PATH) + 1)));
         strncpy(binPath.get(), PATH, sizeof(PATH));
-        strncpy(binPath.get() + sizeof(PATH) - 1, entry->d_name, entry->d_namlen);
-        binPath[entry->d_namlen + sizeof(PATH) - 1] = 0;
+        strncpy(binPath.get() + sizeof(PATH) - 1, d_name, namlen);
+        binPath[namlen + sizeof(PATH) - 1] = 0;
 
-        Vector<char> binSource(cx);
+        Vector<uint8_t> binSource(cx);
         readFull(binPath.get(), binSource);
 
         // Parse binary file.
@@ -158,6 +186,11 @@ BEGIN_TEST(testBinASTReaderECMAScript2)
 #endif // defined(DEBUG)
     }
 
+#if defined(XP_WIN)
+    if (!FindClose(hFind))
+        MOZ_CRASH("Could not close Find");
+#endif // defined(XP_WIN)
+
     return true;
 }
 END_TEST(testBinASTReaderECMAScript2)
diff --git a/js/src/moz.build b/js/src/moz.build
index dc02562ed677..bc1c8216de8f 100755
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -647,7 +647,10 @@ if CONFIG['JS_BUILD_BINAST']:
     # specification:
     UNIFIED_SOURCES += ['frontend/BinTokenReaderTester.cpp']
     # The rest of BinAST should eventually move to release.
-    UNIFIED_SOURCES += ['frontend/BinToken.cpp']
+    UNIFIED_SOURCES += [
+        'frontend/BinSource.cpp',
+        'frontend/BinToken.cpp'
+    ]
 
 # Wasm code should use WASM_HUGE_MEMORY instead of JS_CODEGEN_X64
 # so that it is easy to use the huge-mapping optimization for other

From ee82ed4a0fcf1c911205f116ca95689192c63b49 Mon Sep 17 00:00:00 2001
From: David Teller <dteller@mozilla.com>
Date: Mon, 18 Sep 2017 16:41:00 +0200
Subject: [PATCH 192/219] Bug 1377007 - JS shell bindings for
 binjs-ref;r=arai,jorendorff

MozReview-Commit-ID: 4kKbxpqXVSU

--HG--
extra : rebase_source : caabe344f20a1af6d092a50738e5f8931738e0ba
---
 js/src/shell/js.cpp | 77 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 74 insertions(+), 3 deletions(-)

diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 649352ed3b54..8794f40880a2 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -74,6 +74,11 @@
 #include "builtin/ModuleObject.h"
 #include "builtin/RegExp.h"
 #include "builtin/TestingFunctions.h"
+
+#if defined(JS_BUILD_BINAST)
+#include "frontend/BinSource.h"
+#endif // defined(JS_BUILD_BINAST)
+
 #include "frontend/Parser.h"
 #include "gc/GCInternals.h"
 #include "jit/arm/Simulator-arm.h"
@@ -4392,6 +4397,64 @@ GetModuleLoadPath(JSContext* cx, unsigned argc, Value* vp)
     return true;
 }
 
+#if defined(JS_BUILD_BINAST)
+
+static bool
+BinParse(JSContext* cx, unsigned argc, Value* vp)
+{
+    using namespace js::frontend;
+
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    if (args.length() < 1) {
+        JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+                                  "parse", "0", "s");
+        return false;
+    }
+    if (!args[0].isObject()) {
+        const char* typeName = InformalValueTypeName(args[0]);
+        JS_ReportErrorASCII(cx, "expected object (typed array) to parse, got %s", typeName);
+        return false;
+    }
+
+    RootedObject obj(cx, &args[0].toObject());
+    if (!JS_IsTypedArrayObject(obj)) {
+        const char* typeName = InformalValueTypeName(args[0]);
+        JS_ReportErrorASCII(cx, "expected typed array to parse, got %s", typeName);
+        return false;
+    }
+
+    uint32_t buf_length = 0;
+    bool buf_isSharedMemory = false;
+    uint8_t* buf_data = nullptr;
+    GetArrayBufferViewLengthAndData(obj, &buf_length, &buf_isSharedMemory, &buf_data);
+    MOZ_ASSERT(buf_data);
+
+    CompileOptions options(cx);
+    options.setIntroductionType("js shell bin parse")
+           .setFileAndLine("<ArrayBuffer>", 1);
+
+    UsedNameTracker usedNames(cx);
+    if (!usedNames.init())
+        return false;
+
+    BinASTParser reader(cx, cx->tempLifoAlloc(), usedNames, options);
+
+    JS::Result<ParseNode*> parsed = reader.parse(buf_data, buf_length);
+    if (parsed.isErr())
+        return false;
+
+#ifdef DEBUG
+    Fprinter out(stderr);
+    DumpParseTree(parsed.unwrap(), out);
+#endif
+
+    args.rval().setUndefined();
+    return true;
+}
+
+#endif // defined(JS_BUILD_BINAST)
+
 static bool
 Parse(JSContext* cx, unsigned argc, Value* vp)
 {
@@ -4424,22 +4487,22 @@ Parse(JSContext* cx, unsigned argc, Value* vp)
     CompileOptions options(cx);
     options.setIntroductionType("js shell parse")
            .setFileAndLine("<string>", 1);
+
     UsedNameTracker usedNames(cx);
     if (!usedNames.init())
         return false;
     Parser<FullParseHandler, char16_t> parser(cx, cx->tempLifoAlloc(), options, chars, length,
-                                              /* foldConstants = */ true, usedNames, nullptr,
+                                              /* foldConstants = */ false, usedNames, nullptr,
                                               nullptr);
     if (!parser.checkOptions())
         return false;
 
-    ParseNode* pn = parser.parse();
+    ParseNode* pn = parser.parse(); // Deallocated once `parser` goes out of scope.
     if (!pn)
         return false;
 #ifdef DEBUG
     js::Fprinter out(stderr);
     DumpParseTree(pn, out);
-    out.putChar('\n');
 #endif
     args.rval().setUndefined();
     return true;
@@ -6746,6 +6809,14 @@ static const JSFunctionSpecWithHelp shell_functions[] = {
 "  Return any --module-load-path argument passed to the shell.  Used by the\n"
 "  module loader.\n"),
 
+#if defined(JS_BUILD_BINAST)
+
+JS_FN_HELP("parseBin", BinParse, 1, 0,
+"parseBin(arraybuffer)",
+"  Parses a Binary AST, potentially throwing."),
+
+#endif // defined(JS_BUILD_BINAST)
+
     JS_FN_HELP("parse", Parse, 1, 0,
 "parse(code)",
 "  Parses a string, potentially throwing."),

From 1981a6b9023c7e9aa015bca024698a66cc1aeaac Mon Sep 17 00:00:00 2001
From: David Teller <dteller@mozilla.com>
Date: Tue, 19 Sep 2017 20:50:21 +0200
Subject: [PATCH 193/219] Bug 1377007 - Tests: Parsing ECMA2-level tests with
 binjs;r=arai,jorendorff

MozReview-Commit-ID: 2DysquT2BdD

--HG--
extra : rebase_source : b49c071497fc79e5e3933b004ba946e4ef52dd1b
---
 .eslintignore                                 |   1 +
 .../parser/tester/StrictEquality-001.binjs    | Bin 0 -> 7935 bytes
 .../parser/tester/StrictEquality-001.js       |  73 +++++
 .../binast/parser/tester/apply-001-n.binjs    | Bin 0 -> 4825 bytes
 .../binast/parser/tester/apply-001-n.js       |  29 ++
 .../binast/parser/tester/boolean-001.binjs    | Bin 0 -> 7700 bytes
 .../binast/parser/tester/boolean-001.js       |  47 +++
 .../binast/parser/tester/boolean-002.binjs    | Bin 0 -> 7749 bytes
 .../binast/parser/tester/boolean-002.js       |  51 +++
 .../binast/parser/tester/call-1.binjs         | Bin 0 -> 6585 bytes
 .../binast/parser/tester/call-1.js            |  42 +++
 .../parser/tester/constructor-001.binjs       | Bin 0 -> 7148 bytes
 .../binast/parser/tester/constructor-001.js   |  66 ++++
 .../binast/parser/tester/date-002.binjs       | Bin 0 -> 8840 bytes
 .../binast/parser/tester/date-002.js          |  54 ++++
 .../binast/parser/tester/date-003.binjs       | Bin 0 -> 8996 bytes
 .../binast/parser/tester/date-003.js          |  56 ++++
 .../binast/parser/tester/date-004.binjs       | Bin 0 -> 8655 bytes
 .../binast/parser/tester/date-004.js          |  50 +++
 .../binast/parser/tester/dowhile-001.binjs    | Bin 0 -> 7058 bytes
 .../binast/parser/tester/dowhile-001.js       |  44 +++
 .../binast/parser/tester/dowhile-002.binjs    | Bin 0 -> 10101 bytes
 .../binast/parser/tester/dowhile-002.js       |  71 +++++
 .../binast/parser/tester/dowhile-003.binjs    | Bin 0 -> 11729 bytes
 .../binast/parser/tester/dowhile-003.js       |  63 ++++
 .../binast/parser/tester/dowhile-004.binjs    | Bin 0 -> 9961 bytes
 .../binast/parser/tester/dowhile-004.js       |  67 ++++
 .../binast/parser/tester/dowhile-005.binjs    | Bin 0 -> 9175 bytes
 .../binast/parser/tester/dowhile-005.js       |  73 +++++
 .../binast/parser/tester/dowhile-006.binjs    | Bin 0 -> 15060 bytes
 .../binast/parser/tester/dowhile-006.js       |  89 ++++++
 .../binast/parser/tester/dowhile-007.binjs    | Bin 0 -> 21270 bytes
 .../binast/parser/tester/dowhile-007.js       |  97 ++++++
 .../binast/parser/tester/exception-001.binjs  | Bin 0 -> 6518 bytes
 .../binast/parser/tester/exception-001.js     |  45 +++
 .../binast/parser/tester/exception-002.binjs  | Bin 0 -> 6710 bytes
 .../binast/parser/tester/exception-002.js     |  45 +++
 .../binast/parser/tester/exception-003.binjs  | Bin 0 -> 8413 bytes
 .../binast/parser/tester/exception-003.js     |  49 +++
 .../binast/parser/tester/exception-004.binjs  | Bin 0 -> 6792 bytes
 .../binast/parser/tester/exception-004.js     |  45 +++
 .../binast/parser/tester/exception-005.binjs  | Bin 0 -> 6792 bytes
 .../binast/parser/tester/exception-005.js     |  45 +++
 .../binast/parser/tester/exception-006.binjs  | Bin 0 -> 8294 bytes
 .../binast/parser/tester/exception-006.js     |  56 ++++
 .../binast/parser/tester/exception-007.binjs  | Bin 0 -> 8695 bytes
 .../binast/parser/tester/exception-007.js     |  57 ++++
 .../binast/parser/tester/exception-008.binjs  | Bin 0 -> 6852 bytes
 .../binast/parser/tester/exception-008.js     |  44 +++
 .../binast/parser/tester/exception-009.binjs  | Bin 0 -> 7026 bytes
 .../binast/parser/tester/exception-009.js     |  53 ++++
 .../parser/tester/exception-010-n.binjs       | Bin 0 -> 4817 bytes
 .../binast/parser/tester/exception-010-n.js   |  25 ++
 .../parser/tester/exception-011-n.binjs       | Bin 0 -> 4530 bytes
 .../binast/parser/tester/exception-011-n.js   |  26 ++
 .../binast/parser/tester/exec-002.binjs       | Bin 0 -> 23367 bytes
 .../binast/parser/tester/exec-002.js          | 188 +++++++++++
 .../binast/parser/tester/expression-001.binjs | Bin 0 -> 6002 bytes
 .../binast/parser/tester/expression-001.js    |  50 +++
 .../binast/parser/tester/expression-002.binjs | Bin 0 -> 11122 bytes
 .../binast/parser/tester/expression-002.js    |  60 ++++
 .../binast/parser/tester/expression-003.binjs | Bin 0 -> 10356 bytes
 .../binast/parser/tester/expression-003.js    |  55 ++++
 .../binast/parser/tester/expression-004.binjs | Bin 0 -> 10202 bytes
 .../binast/parser/tester/expression-004.js    |  49 +++
 .../binast/parser/tester/expression-005.binjs | Bin 0 -> 6146 bytes
 .../binast/parser/tester/expression-005.js    |  41 +++
 .../binast/parser/tester/expression-006.binjs | Bin 0 -> 7177 bytes
 .../binast/parser/tester/expression-006.js    |  46 +++
 .../binast/parser/tester/expression-007.binjs | Bin 0 -> 6728 bytes
 .../binast/parser/tester/expression-007.js    |  44 +++
 .../binast/parser/tester/expression-008.binjs | Bin 0 -> 6615 bytes
 .../binast/parser/tester/expression-008.js    |  41 +++
 .../binast/parser/tester/expression-009.binjs | Bin 0 -> 6652 bytes
 .../binast/parser/tester/expression-009.js    |  42 +++
 .../binast/parser/tester/expression-010.binjs | Bin 0 -> 6623 bytes
 .../binast/parser/tester/expression-010.js    |  43 +++
 .../binast/parser/tester/expression-011.binjs | Bin 0 -> 6754 bytes
 .../binast/parser/tester/expression-011.js    |  43 +++
 .../binast/parser/tester/expression-012.binjs | Bin 0 -> 7215 bytes
 .../binast/parser/tester/expression-012.js    |  44 +++
 .../binast/parser/tester/expression-013.binjs | Bin 0 -> 7198 bytes
 .../binast/parser/tester/expression-013.js    |  44 +++
 .../binast/parser/tester/expression-014.binjs | Bin 0 -> 7117 bytes
 .../binast/parser/tester/expression-014.js    |  46 +++
 .../binast/parser/tester/expression-015.binjs | Bin 0 -> 6274 bytes
 .../binast/parser/tester/expression-015.js    |  40 +++
 .../binast/parser/tester/expression-016.binjs | Bin 0 -> 6523 bytes
 .../binast/parser/tester/expression-016.js    |  40 +++
 .../binast/parser/tester/expression-017.binjs | Bin 0 -> 6319 bytes
 .../binast/parser/tester/expression-017.js    |  40 +++
 .../binast/parser/tester/expression-019.binjs | Bin 0 -> 7291 bytes
 .../binast/parser/tester/expression-019.js    |  44 +++
 .../binast/parser/tester/forin-001.binjs      | Bin 0 -> 55280 bytes
 .../binast/parser/tester/forin-001.js         | 297 ++++++++++++++++++
 .../binast/parser/tester/forin-002.binjs      | Bin 0 -> 15210 bytes
 .../binast/parser/tester/forin-002.js         |  77 +++++
 .../binast/parser/tester/function-001.binjs   | Bin 0 -> 3935 bytes
 .../binast/parser/tester/function-001.js      |  41 +++
 .../binast/parser/tester/global-001.binjs     | Bin 0 -> 6258 bytes
 .../binast/parser/tester/global-001.js        |  45 +++
 .../binast/parser/tester/global-002.binjs     | Bin 0 -> 6254 bytes
 .../binast/parser/tester/global-002.js        |  45 +++
 .../binast/parser/tester/hex-001.binjs        | Bin 0 -> 18562 bytes
 .../binast/parser/tester/hex-001.js           |  68 ++++
 .../binast/parser/tester/if-001.binjs         | Bin 0 -> 5066 bytes
 .../binast/parser/tester/if-001.js            |  42 +++
 .../binast/parser/tester/instanceof-001.binjs | Bin 0 -> 4242 bytes
 .../binast/parser/tester/instanceof-001.js    |  34 ++
 .../binast/parser/tester/instanceof-002.binjs | Bin 0 -> 6327 bytes
 .../binast/parser/tester/instanceof-002.js    |  51 +++
 .../parser/tester/instanceof-003-n.binjs      | Bin 0 -> 21454 bytes
 .../binast/parser/tester/instanceof-003-n.js  |  88 ++++++
 .../binast/parser/tester/instanceof-003.binjs | Bin 0 -> 6082 bytes
 .../binast/parser/tester/instanceof-003.js    |  65 ++++
 .../parser/tester/instanceof-004-n.binjs      | Bin 0 -> 21635 bytes
 .../binast/parser/tester/instanceof-004-n.js  |  88 ++++++
 .../parser/tester/instanceof-005-n.binjs      | Bin 0 -> 21583 bytes
 .../binast/parser/tester/instanceof-005-n.js  |  89 ++++++
 .../binast/parser/tester/instanceof-006.binjs | Bin 0 -> 20918 bytes
 .../binast/parser/tester/instanceof-006.js    |  86 +++++
 .../binast/parser/tester/keywords-001.binjs   | Bin 0 -> 6811 bytes
 .../binast/parser/tester/keywords-001.js      |  48 +++
 .../binast/parser/tester/label-001.binjs      | Bin 0 -> 7746 bytes
 .../binast/parser/tester/label-001.js         |  42 +++
 .../binast/parser/tester/label-002.binjs      | Bin 0 -> 13403 bytes
 .../binast/parser/tester/label-002.js         |  56 ++++
 .../binast/parser/tester/label-003.binjs      | Bin 0 -> 2239 bytes
 .../binast/parser/tester/label-003.js         |  15 +
 .../binast/parser/tester/lexical-001.binjs    | Bin 0 -> 6153 bytes
 .../binast/parser/tester/lexical-001.js       |  52 +++
 .../binast/parser/tester/lexical-002.binjs    | Bin 0 -> 6134 bytes
 .../binast/parser/tester/lexical-002.js       |  52 +++
 .../binast/parser/tester/lexical-003.binjs    | Bin 0 -> 6286 bytes
 .../binast/parser/tester/lexical-003.js       |  43 +++
 .../binast/parser/tester/lexical-004.binjs    | Bin 0 -> 6264 bytes
 .../binast/parser/tester/lexical-004.js       |  52 +++
 .../binast/parser/tester/lexical-005.binjs    | Bin 0 -> 6258 bytes
 .../binast/parser/tester/lexical-005.js       |  52 +++
 .../binast/parser/tester/lexical-006.binjs    | Bin 0 -> 6274 bytes
 .../binast/parser/tester/lexical-006.js       |  58 ++++
 .../binast/parser/tester/lexical-007.binjs    | Bin 0 -> 6258 bytes
 .../binast/parser/tester/lexical-007.js       |  51 +++
 .../binast/parser/tester/lexical-008.binjs    | Bin 0 -> 6272 bytes
 .../binast/parser/tester/lexical-008.js       |  53 ++++
 .../binast/parser/tester/lexical-009.binjs    | Bin 0 -> 6278 bytes
 .../binast/parser/tester/lexical-009.js       |  53 ++++
 .../binast/parser/tester/lexical-011.binjs    | Bin 0 -> 8799 bytes
 .../binast/parser/tester/lexical-011.js       |  62 ++++
 .../binast/parser/tester/lexical-012.binjs    | Bin 0 -> 6271 bytes
 .../binast/parser/tester/lexical-012.js       |  53 ++++
 .../binast/parser/tester/lexical-013.binjs    | Bin 0 -> 6275 bytes
 .../binast/parser/tester/lexical-013.js       |  53 ++++
 .../binast/parser/tester/lexical-014.binjs    | Bin 0 -> 8806 bytes
 .../binast/parser/tester/lexical-014.js       |  62 ++++
 .../binast/parser/tester/lexical-015.binjs    | Bin 0 -> 6273 bytes
 .../binast/parser/tester/lexical-015.js       |  53 ++++
 .../binast/parser/tester/lexical-016.binjs    | Bin 0 -> 8799 bytes
 .../binast/parser/tester/lexical-016.js       |  62 ++++
 .../binast/parser/tester/lexical-017.binjs    | Bin 0 -> 6265 bytes
 .../binast/parser/tester/lexical-017.js       |  54 ++++
 .../binast/parser/tester/lexical-018.binjs    | Bin 0 -> 6275 bytes
 .../binast/parser/tester/lexical-018.js       |  53 ++++
 .../binast/parser/tester/lexical-019.binjs    | Bin 0 -> 6271 bytes
 .../binast/parser/tester/lexical-019.js       |  53 ++++
 .../binast/parser/tester/lexical-020.binjs    | Bin 0 -> 6271 bytes
 .../binast/parser/tester/lexical-020.js       |  53 ++++
 .../binast/parser/tester/lexical-021.binjs    | Bin 0 -> 8801 bytes
 .../binast/parser/tester/lexical-021.js       |  62 ++++
 .../binast/parser/tester/lexical-023.binjs    | Bin 0 -> 6271 bytes
 .../binast/parser/tester/lexical-023.js       |  52 +++
 .../binast/parser/tester/lexical-024.binjs    | Bin 0 -> 6252 bytes
 .../binast/parser/tester/lexical-024.js       |  59 ++++
 .../binast/parser/tester/lexical-025.binjs    | Bin 0 -> 6248 bytes
 .../binast/parser/tester/lexical-025.js       |  59 ++++
 .../binast/parser/tester/lexical-026.binjs    | Bin 0 -> 6248 bytes
 .../binast/parser/tester/lexical-026.js       |  59 ++++
 .../binast/parser/tester/lexical-027.binjs    | Bin 0 -> 6248 bytes
 .../binast/parser/tester/lexical-027.js       |  61 ++++
 .../binast/parser/tester/lexical-028.binjs    | Bin 0 -> 6268 bytes
 .../binast/parser/tester/lexical-028.js       |  59 ++++
 .../binast/parser/tester/lexical-029.binjs    | Bin 0 -> 6272 bytes
 .../binast/parser/tester/lexical-029.js       |  59 ++++
 .../binast/parser/tester/lexical-030.binjs    | Bin 0 -> 6268 bytes
 .../binast/parser/tester/lexical-030.js       |  59 ++++
 .../binast/parser/tester/lexical-031.binjs    | Bin 0 -> 6254 bytes
 .../binast/parser/tester/lexical-031.js       |  59 ++++
 .../binast/parser/tester/lexical-032.binjs    | Bin 0 -> 6260 bytes
 .../binast/parser/tester/lexical-032.js       |  59 ++++
 .../binast/parser/tester/lexical-033.binjs    | Bin 0 -> 6252 bytes
 .../binast/parser/tester/lexical-033.js       |  59 ++++
 .../binast/parser/tester/lexical-034.binjs    | Bin 0 -> 6255 bytes
 .../binast/parser/tester/lexical-034.js       |  58 ++++
 .../binast/parser/tester/lexical-035.binjs    | Bin 0 -> 6251 bytes
 .../binast/parser/tester/lexical-035.js       |  59 ++++
 .../binast/parser/tester/lexical-036.binjs    | Bin 0 -> 6256 bytes
 .../binast/parser/tester/lexical-036.js       |  59 ++++
 .../binast/parser/tester/lexical-037.binjs    | Bin 0 -> 6246 bytes
 .../binast/parser/tester/lexical-037.js       |  59 ++++
 .../binast/parser/tester/lexical-038.binjs    | Bin 0 -> 6260 bytes
 .../binast/parser/tester/lexical-038.js       |  59 ++++
 .../binast/parser/tester/lexical-039.binjs    | Bin 0 -> 6253 bytes
 .../binast/parser/tester/lexical-039.js       |  46 +++
 .../binast/parser/tester/lexical-040.binjs    | Bin 0 -> 6253 bytes
 .../binast/parser/tester/lexical-040.js       |  46 +++
 .../binast/parser/tester/lexical-041.binjs    | Bin 0 -> 7088 bytes
 .../binast/parser/tester/lexical-041.js       |  48 +++
 .../binast/parser/tester/lexical-042.binjs    | Bin 0 -> 7085 bytes
 .../binast/parser/tester/lexical-042.js       |  49 +++
 .../binast/parser/tester/lexical-047.binjs    | Bin 0 -> 7567 bytes
 .../binast/parser/tester/lexical-047.js       |  50 +++
 .../binast/parser/tester/lexical-048.binjs    | Bin 0 -> 6779 bytes
 .../binast/parser/tester/lexical-048.js       |  44 +++
 .../binast/parser/tester/lexical-049.binjs    | Bin 0 -> 7602 bytes
 .../binast/parser/tester/lexical-049.js       |  49 +++
 .../binast/parser/tester/lexical-050.binjs    | Bin 0 -> 6284 bytes
 .../binast/parser/tester/lexical-050.js       |  45 +++
 .../binast/parser/tester/lexical-051.binjs    | Bin 0 -> 6321 bytes
 .../binast/parser/tester/lexical-051.js       |  45 +++
 .../binast/parser/tester/lexical-052.binjs    | Bin 0 -> 7315 bytes
 .../binast/parser/tester/lexical-052.js       |  47 +++
 .../binast/parser/tester/lexical-053.binjs    | Bin 0 -> 6943 bytes
 .../binast/parser/tester/lexical-053.js       |  45 +++
 .../binast/parser/tester/lexical-054.binjs    | Bin 0 -> 7538 bytes
 .../binast/parser/tester/lexical-054.js       |  46 +++
 .../binast/parser/tester/match-001.binjs      | Bin 0 -> 21482 bytes
 .../binast/parser/tester/match-001.js         | 106 +++++++
 .../binast/parser/tester/match-002.binjs      | Bin 0 -> 36161 bytes
 .../binast/parser/tester/match-002.js         | 174 ++++++++++
 .../binast/parser/tester/match-003.binjs      | Bin 0 -> 21251 bytes
 .../binast/parser/tester/match-003.js         | 132 ++++++++
 .../binast/parser/tester/match-004.binjs      | Bin 0 -> 30346 bytes
 .../binast/parser/tester/match-004.js         | 173 ++++++++++
 .../binast/parser/tester/multiline-001.binjs  | Bin 0 -> 15866 bytes
 .../binast/parser/tester/multiline-001.js     |  68 ++++
 .../binast/parser/tester/number-001.binjs     | Bin 0 -> 7566 bytes
 .../binast/parser/tester/number-001.js        |  53 ++++
 .../binast/parser/tester/number-002.binjs     | Bin 0 -> 7588 bytes
 .../binast/parser/tester/number-002.js        |  48 +++
 .../binast/parser/tester/number-003.binjs     | Bin 0 -> 8026 bytes
 .../binast/parser/tester/number-003.js        |  50 +++
 .../binast/parser/tester/octal-001.binjs      | Bin 0 -> 12564 bytes
 .../binast/parser/tester/octal-001.js         |  78 +++++
 .../binast/parser/tester/octal-002.binjs      | Bin 0 -> 16156 bytes
 .../binast/parser/tester/octal-002.js         |  93 ++++++
 .../binast/parser/tester/octal-003.binjs      | Bin 0 -> 18706 bytes
 .../binast/parser/tester/octal-003.js         |  87 +++++
 .../binast/parser/tester/properties-001.binjs | Bin 0 -> 23094 bytes
 .../binast/parser/tester/properties-001.js    |  91 ++++++
 .../binast/parser/tester/properties-002.binjs | Bin 0 -> 37649 bytes
 .../binast/parser/tester/properties-002.js    | 129 ++++++++
 .../parser/tester/regexp-enumerate-001.binjs  | Bin 0 -> 14141 bytes
 .../parser/tester/regexp-enumerate-001.js     |  88 ++++++
 .../parser/tester/regexp-literals-001.binjs   | Bin 0 -> 4820 bytes
 .../parser/tester/regexp-literals-001.js      |  44 +++
 .../parser/tester/regexp-literals-002.binjs   | Bin 0 -> 2735 bytes
 .../parser/tester/regexp-literals-002.js      |  28 ++
 .../binast/parser/tester/regress-001.binjs    | Bin 0 -> 7756 bytes
 .../binast/parser/tester/regress-001.js       |  45 +++
 .../binast/parser/tester/regress-7635.binjs   | Bin 0 -> 5244 bytes
 .../binast/parser/tester/regress-7635.js      |  55 ++++
 .../binast/parser/tester/split-001.binjs      | Bin 0 -> 22400 bytes
 .../binast/parser/tester/split-001.js         | 112 +++++++
 .../binast/parser/tester/split-002.binjs      | Bin 0 -> 70881 bytes
 .../binast/parser/tester/split-002.js         | 270 ++++++++++++++++
 .../binast/parser/tester/split-003.binjs      | Bin 0 -> 38042 bytes
 .../binast/parser/tester/split-003.js         | 123 ++++++++
 .../binast/parser/tester/statement-001.binjs  | Bin 0 -> 6268 bytes
 .../binast/parser/tester/statement-001.js     |  47 +++
 .../binast/parser/tester/statement-002.binjs  | Bin 0 -> 6326 bytes
 .../binast/parser/tester/statement-002.js     |  69 ++++
 .../binast/parser/tester/statement-003.binjs  | Bin 0 -> 8692 bytes
 .../binast/parser/tester/statement-003.js     |  80 +++++
 .../binast/parser/tester/statement-004.binjs  | Bin 0 -> 8367 bytes
 .../binast/parser/tester/statement-004.js     |  52 +++
 .../binast/parser/tester/statement-005.binjs  | Bin 0 -> 8644 bytes
 .../binast/parser/tester/statement-005.js     |  51 +++
 .../binast/parser/tester/statement-006.binjs  | Bin 0 -> 9022 bytes
 .../binast/parser/tester/statement-006.js     |  51 +++
 .../binast/parser/tester/statement-007.binjs  | Bin 0 -> 6300 bytes
 .../binast/parser/tester/statement-007.js     |  42 +++
 .../binast/parser/tester/statement-008.binjs  | Bin 0 -> 6294 bytes
 .../binast/parser/tester/statement-008.js     |  42 +++
 .../binast/parser/tester/statement-009.binjs  | Bin 0 -> 6133 bytes
 .../binast/parser/tester/statement-009.js     |  41 +++
 .../binast/parser/tester/string-001.binjs     | Bin 0 -> 7914 bytes
 .../binast/parser/tester/string-001.js        |  53 ++++
 .../binast/parser/tester/string-002.binjs     | Bin 0 -> 7976 bytes
 .../binast/parser/tester/string-002.js        |  52 +++
 .../binast/parser/tester/switch-001.binjs     | Bin 0 -> 11212 bytes
 .../binast/parser/tester/switch-001.js        |  65 ++++
 .../binast/parser/tester/switch-002.binjs     | Bin 0 -> 10566 bytes
 .../binast/parser/tester/switch-002.js        |  63 ++++
 .../binast/parser/tester/switch-003.binjs     | Bin 0 -> 11449 bytes
 .../binast/parser/tester/switch-003.js        |  57 ++++
 .../binast/parser/tester/switch-004.binjs     | Bin 0 -> 26087 bytes
 .../binast/parser/tester/switch-004.js        |  94 ++++++
 .../binast/parser/tester/try-001.binjs        | Bin 0 -> 12926 bytes
 .../binast/parser/tester/try-001.js           |  83 +++++
 .../binast/parser/tester/try-003.binjs        | Bin 0 -> 12267 bytes
 .../binast/parser/tester/try-003.js           |  82 +++++
 .../binast/parser/tester/try-004.binjs        | Bin 0 -> 7554 bytes
 .../binast/parser/tester/try-004.js           |  54 ++++
 .../binast/parser/tester/try-005.binjs        | Bin 0 -> 8284 bytes
 .../binast/parser/tester/try-005.js           |  57 ++++
 .../binast/parser/tester/try-006.binjs        | Bin 0 -> 12542 bytes
 .../binast/parser/tester/try-006.js           |  87 +++++
 .../binast/parser/tester/try-007.binjs        | Bin 0 -> 13660 bytes
 .../binast/parser/tester/try-007.js           |  92 ++++++
 .../binast/parser/tester/try-008.binjs        | Bin 0 -> 11748 bytes
 .../binast/parser/tester/try-008.js           |  59 ++++
 .../binast/parser/tester/try-009.binjs        | Bin 0 -> 12910 bytes
 .../binast/parser/tester/try-009.js           |  66 ++++
 .../binast/parser/tester/try-010.binjs        | Bin 0 -> 15697 bytes
 .../binast/parser/tester/try-010.js           |  73 +++++
 .../binast/parser/tester/try-012.binjs        | Bin 0 -> 12422 bytes
 .../binast/parser/tester/try-012.js           |  95 ++++++
 .../binast/parser/tester/unicode-001.binjs    | Bin 0 -> 17042 bytes
 .../binast/parser/tester/unicode-001.js       |  59 ++++
 .../binast/parser/tester/while-001.binjs      | Bin 0 -> 4573 bytes
 .../binast/parser/tester/while-001.js         |  42 +++
 .../binast/parser/tester/while-002.binjs      | Bin 0 -> 13384 bytes
 .../binast/parser/tester/while-002.js         |  86 +++++
 .../binast/parser/tester/while-003.binjs      | Bin 0 -> 13218 bytes
 .../binast/parser/tester/while-003.js         |  87 +++++
 .../binast/parser/tester/while-004.binjs      | Bin 0 -> 34266 bytes
 .../binast/parser/tester/while-004.js         | 217 +++++++++++++
 js/src/jsapi-tests/moz.build                  |   1 +
 js/src/jsapi-tests/testBinASTReader.cpp       |  60 ++--
 329 files changed, 10509 insertions(+), 21 deletions(-)
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/apply-001-n.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/apply-001-n.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/boolean-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/boolean-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/boolean-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/boolean-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/call-1.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/call-1.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/constructor-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/constructor-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/date-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/date-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/date-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/date-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/date-004.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/date-004.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-004.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-004.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-005.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-005.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-006.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-006.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-007.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-007.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-004.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-004.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-005.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-005.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-006.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-006.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-007.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-007.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-008.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-008.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-009.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-009.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-010-n.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-010-n.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-011-n.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-011-n.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exec-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/exec-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-004.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-004.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-005.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-005.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-006.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-006.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-007.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-007.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-008.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-008.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-009.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-009.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-010.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-010.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-011.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-011.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-012.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-012.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-013.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-013.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-014.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-014.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-015.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-015.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-016.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-016.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-017.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-017.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-019.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-019.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/forin-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/forin-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/forin-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/forin-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/function-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/function-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/global-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/global-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/global-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/global-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/hex-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/hex-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/if-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/if-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-006.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-006.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/keywords-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/keywords-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/label-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/label-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/label-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/label-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/label-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/label-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-004.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-004.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-005.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-005.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-006.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-006.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-007.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-007.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-008.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-008.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-009.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-009.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-011.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-011.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-012.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-012.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-013.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-013.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-014.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-014.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-015.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-015.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-016.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-016.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-017.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-017.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-018.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-018.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-019.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-019.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-020.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-020.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-021.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-021.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-023.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-023.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-024.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-024.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-025.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-025.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-026.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-026.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-027.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-027.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-028.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-028.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-029.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-029.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-030.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-030.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-031.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-031.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-032.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-032.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-033.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-033.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-034.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-034.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-035.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-035.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-036.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-036.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-037.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-037.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-038.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-038.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-039.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-039.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-040.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-040.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-041.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-041.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-042.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-042.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-047.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-047.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-048.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-048.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-049.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-049.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-050.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-050.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-051.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-051.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-052.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-052.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-053.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-053.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-054.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-054.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/match-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/match-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/match-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/match-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/match-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/match-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/match-004.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/match-004.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/multiline-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/multiline-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/number-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/number-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/number-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/number-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/number-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/number-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/octal-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/octal-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/octal-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/octal-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/octal-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/octal-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/properties-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/properties-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/properties-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/properties-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/regress-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/regress-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/regress-7635.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/regress-7635.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/split-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/split-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/split-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/split-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/split-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/split-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-004.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-004.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-005.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-005.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-006.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-006.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-007.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-007.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-008.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-008.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-009.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-009.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/string-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/string-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/string-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/string-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-004.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-004.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-004.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-004.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-005.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-005.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-006.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-006.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-007.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-007.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-008.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-008.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-009.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-009.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-010.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-010.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-012.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/try-012.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/unicode-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/unicode-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/while-001.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/while-001.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/while-002.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/while-002.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/while-003.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/while-003.js
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/while-004.binjs
 create mode 100644 js/src/jsapi-tests/binast/parser/tester/while-004.js

diff --git a/.eslintignore b/.eslintignore
index 2b65ce60e405..680df197670f 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -305,6 +305,7 @@ js/xpconnect/**
 js/src/devtools/**
 js/src/octane/**
 js/src/jit-test/**
+js/src/jsapi-tests/binast/**
 js/src/tests/**
 js/src/Y.js
 
diff --git a/js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.binjs b/js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..925b6d52d433c088dc5154744a079d04e936aeef
GIT binary patch
literal 7935
zcmeHM%We}f6rJ*B1MFcj3l>GFFBV8tX;B-32r4NeQN<3qiJOd=&IFIs$FHzu$8Yc#
zu;c^Sv0}l!9#8Cvoryb1tJ1P*RF8e1=RSO0;e&oi*DF0rI_qy)++}3nyW)A?ZrnNc
zHtUVo&DCZ*?o+R_B=%IoAmQs94?OP<?5gO;cL)o}Zb)Cyc1RfEK^zHE9rb_WeGH;b
zp4Km*GdGD=%mk^R;{{Q`hXi!?^$v}AuoqA!$VFsd37v2jMBVk9z@}NNw(8rB%932G
zEJ-3dt)|$&6>!Q(D99a<aA458kMv+`o7X-KNEq<rh2`ZHf5Bf_S$wwm)Z~%zS`t>Q
zND;0AnFGSi?Yc-Mt@|BlpP_YkYVVq}vhEEKy;gm*@!^SSnX@<K@3S-Hbzs%1x3+4g
z-Z~;2LHZD>^{9_vYjdAUr1}ul5Tr5l=l!*{HUE*xYziaSj{1xy38a7~C!Fp>XbKq8
z;kq@3t0WB7QE{RTOH@UkZUBdfzYWSKoG{*^2`|u4lGUjzIi^tobE#B;u<ig2kyurC
zQ05-cI%JTPUO~2|tQBv?T~jBKT0TR}8)3g0M1&nHy*x}j84SFT?s1O=-JVLXGCv`q
z$BL0|q*Ea2V2D}gaa7P(3J!5^L4|{K1>rlSoaX=GzZOQyP3HxESnx6DsA^}LOz8C-
z?1|9IbqAYq98waEt*LX?LfoK-$`GOjm{l+#hNMhm)L4ZbW(+y2A!~f*<6P9_i2$Er
zO31d4oX(bYD#|eb972AA#s)(2zDCPWm-`DnY%}NxL~U--?eDPtVtetA&5Mp*NorhK
zU>rh!dN^P^nF?pddr350Z1?tTX*?gKv+Qn){3FWBHaO78$BuAAL3@G4@%cimhxe3}
zbyAl;Q+xyS8~NU$mBKR(GU2j5D>|3nOJ7gZOAWaDK<}9Kf56J<dH#n?I*b!J$?A*~
z8u21V#`KNAHGm#J@i^e+AZp`CQ=e`kB^XKeVcNN$j31fmxOQ-f^F8YaurHHU(S%24
zEj*!^Nac8HDp>XDQJ=PL)0wn5>vC;|ar>jX?o6Ik&%<pTcjfM)C2vj}Fwp8oIKoi`
zgaaIBC~L}Ex=s#|Kr6vKZ4g?lq?0N;jzJW`5U{j-r;4boIUoJi6;}>X;6R}OT5=9K
ztTy_w)9Yq$0dt%=R!KsYSu+&`unz#2m_c&TbO3|%^s6iy&~WE!-sb=>$8H^Gb7I_W
z`Xuv>jt>WKplp^jSdv;%Iy|9ZMLA>4#Z@lrjPxf!&~z9@nSR-CnKKjEVcJgF!`oL{
zc4?;p&w7bmu97|<uxu^&K=}pSau>x-#7mxd`IG&<^1S?JTr#vX#%rPcR#c<q7PNm;
za5p$wCdBfPJ#EO382H8mo5l^2U9OI5pGJ#^{50lyM1D0JCHbNFAwq5%30iGc50|vW
ci@)zdJ<-m{t=2pzzZKfaiu{yO23Ps}7ZJ$`^Z)<=

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.js b/js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.js
new file mode 100644
index 000000000000..c96d1be3ef1d
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.js
@@ -0,0 +1,73 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          StrictEquality-001.js
+ *  ECMA Section:       11.9.6.js
+ *  Description:
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               4 september 1998
+ */
+var SECTION = "StrictEquality-001 - 11.9.6";
+var VERSION = "ECMA_2";
+var TITLE   =  "The strict equality operator ( === )";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+
+// 1. If Type(x) is different from Type(y) return false
+
+StrictEquality( true, new Boolean(true), false );
+StrictEquality( new Boolean(), false, false );
+StrictEquality( "", new String(),    false );
+StrictEquality( new String("hi"), "hi", false );
+
+// 2. If Type(x) is not Number go to step 9.
+
+// 3. If x is NaN, return false
+StrictEquality( NaN, NaN,   false );
+StrictEquality( NaN, 0,     false );
+
+// 4. If y is NaN, return false.
+StrictEquality( 0,  NaN,    false );
+
+// 5. if x is the same number value as y, return true
+
+// 6. If x is +0 and y is -0, return true
+
+// 7. If x is -0 and y is +0, return true
+
+// 8. Return false.
+
+
+// 9.  If Type(x) is String, then return true if x and y are exactly
+//  the same sequence of characters ( same length and same characters
+//  in corresponding positions.) Otherwise return false.
+
+//  10. If Type(x) is Boolean, return true if x and y are both true or
+//  both false. otherwise return false.
+
+
+//  Return true if x and y refer to the same object.  Otherwise return
+//  false.
+
+// Return false.
+
+
+test();
+
+function StrictEquality( x, y, expect ) {
+  result = ( x === y );
+
+  new TestCase(
+    SECTION,
+    x +" === " + y,
+    expect,
+    result );
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/apply-001-n.binjs b/js/src/jsapi-tests/binast/parser/tester/apply-001-n.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..f94932cbb4a44f278460e80be0fb269addbe2dff
GIT binary patch
literal 4825
zcmdT|PjAyO6!-X#;J_I!y#a!)+mH~NvPx?kSW#D|C7a-Yke9fvwJfO|ccWj0kH&>N
z;>ZW!*>w`PPD^OhO`Mv>_IrN6_j~_h@!=pKHLFjsUpr(`kKuE410i%8`6E<sb>2HW
zju#CGvZ`{A70{U1em+9zA?&jB<M!79BXLZl(BYVqa}sj22AfFwJ{6)LYv3Trj!NYo
zydnf))*A{baqhX64@<O536okve4br0=8T5D+HKH2fG2KM)f=m-R7*4Zur6*mVTL2m
zwkanJ2XgrW2SY>l6FBF%d+xEbQ|WHt!5|n_Jci?bg_D?Xm>R26WqN_+B03Zq4F3y)
zpO-)oIE3oQ?>ff^b^B<ivc2`@)$4^|dpit04zz0$FTf0oM|2Z}Q-3y%b=V6qNwB1A
zUQU-%4<heu(r<b3GjT+VFHn%uJmE(2yX=`0%qTt$hz^hlaz6tsMrSni(;G;x{(vn;
zcudQRm<(CKnue680`w~v!1pewa_olN`p}t=a>3|)0P<u^u5WH`t%s(}1X>l9Dm@6+
zTwrEy*UgzmK+vrKn%}P$%@g~`DGSXzaCN(Ju=i!lL}m#f%Sm^Fp{igcHA?qZ0rK4k
z2{FfvyO6o(Sg6G6(ih~yudCyNsDW<FZQG_{x*-MQ>M=-D)$ZB$%kAeCKO%AXl#ffF
zsp8t%Ap*0kc0v@aO9qX>K6FcjxludnnI_BB`3+cUq|Q1GF&ky9mqiMCD=1lzMFZ01
zh|yj@OQI?(2|+J1MY`KoAhJNfl%1`GftAd_lr%X3SKxMY7@taBSueH+4R9|MUF%|g
z-pydp{anCoQSzF$(>Q7!mR3d=4)+|-Wq3?BNo4+baD9N@13>MMhtQSS&CDwag>>%}
zOrC<6gs~{6zeuDezq<4Vf$NaV>}089l>kPR$_9>!35*P_-w@KbVB5rGRe;20XO@2@
zu#WrkUe%?oaLg4z6Btrw_~H{R8?~sQabn2V>%FOBdaPYpW}O01ShQT*Ctwq^dX7!X
zaY-~P8+CW;qn+q6#{Z!m9M4$9@4)wnSiRoIag#FQaT~mpj!0vqzz&hQEmiAhW^uKi
zpOn;MZuF?NoT{jaG{adFX^awTO}IcCiZw-3A6?YSj6Pefn(j~we`&iUjBC^1RsH}2
C(igV?

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/apply-001-n.js b/js/src/jsapi-tests/binast/parser/tester/apply-001-n.js
new file mode 100644
index 000000000000..eac0584461e3
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/apply-001-n.js
@@ -0,0 +1,29 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+print("STATUS: f.apply crash test.");
+
+print("BUGNUMBER: 21836");
+
+function f ()
+{
+}
+
+var SECTION = "apply-001-n";
+var VERSION = "ECMA_1";
+startTest();
+var TITLE   = "f.apply(2,2) doesn't crash";
+
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+DESCRIPTION = "f.apply(2,2) doesn't crash";
+EXPECTED = "error";
+
+new TestCase( SECTION,  "f.apply(2,2) doesn't crash",     "error",    eval("f.apply(2,2)") );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/boolean-001.binjs b/js/src/jsapi-tests/binast/parser/tester/boolean-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..a724010a7b3799aefaa8ad782dab6ceca9bd139e
GIT binary patch
literal 7700
zcmds6&2AGh5MKU4h#!d?a0oXLqAd~!ghC~n76_^WA`u5Jm76umw%c{&b=rnU;URbq
zUV$q&E{I29?Dejvv9ocOB!Zr*)b?l3=b3NDvvn~X#B{yhrzBi|$61e)gWzls1iLI8
z1sl!QoA$GImknr8UsZGJag>VnZ+C*=D$J_m<sS%-$ZkwGX*VXEh=?T$Dm1^-U_VO2
zlUP3h=gc%L#uZc)22m1;0swE{3~3^wPZ8w`E+Gfz(5c{2(p$d-+qAbDo#xwCeO3Rj
zzN$emR$I;Ajs)c-R&a+T9$I+U0dJSFn3Ckt+S=olz0`)y;a3%Lb-n93Sb0deJsqE-
zBB9>_dx?a8*m~cd7oiv6=x^GOcb?e9ET6|;%i~en-D!5Vw`{wyLwLI7T|nE&+;U~W
znP6fxpeur9%kMw1H~9;4w~hy#rYQt_TM$7HAPANB(c=HkXl;-<HcQotF8qs{7{i8p
z#P$_1Iu(SA4oyXgg&G#4n{)h)2~st+3555Cl8Dr4x`#100qcl^{JaKTro6+pS<kjf
zDascJbt~F8qJ;2~u`7^z11b)x3`!c)Pa@z^uWy7@%aR0oXg0zmEdbJkh<PivG_Yn2
zEd1W#6&|N63EKiWll|hSW21^P{}W8HE`A(qK6z8d7Cr9Lfz0VPd)Q4pCF&L+wpgtI
zt%*KoM-J?QxYL+EF9Hi7p2OH7SQSW>a4$&|)6l-7<@5L(oO6l(*?GIu?!0fdUfH%|
zDmR%xvM4p1?e5X82p~~{K8lf3va7A~P!OqaI#rjS+XG8RX_4-2wA=$Q8y={a0W~ij
zCWGeS6{_40ADOhPo*psl?gxF6gfZ0e`MU!jdqd6`TU7d9`F%c6DR3U|mCwubYZ*R{
zCk3XWMUTe(d0sV$RFh22?Q2(J{1GNt0q&{)*I;dni5jU*^nUG1g=cB2D|nb8$oPyr
zI4v(xUqDscOJp5q0A?wqo*UlqjV(+|JiKLY@s17h0F}~IBGBV^jL{AEGhN<n?~7A$
zC*v&YNWo;{hK_WX>^BsRS<i-sE$Et<SBnbs+b~asIeH^tQJP-hHi+o<8!;KCRK?E#
zx<dz(J52b%9=@d_*@Rlo0!EoRU#!7<Nv5I``J$pHE=Wc^n3;2VDQlH?Bu!~}&!#)4
zJ^zd8|L=&K;l1+@=?t}R1>b^)!^~LgY4rTcr|1oMPf^SjOEd&Nr(2`8shCltFdc4<
z%1?oJujs3bE5qcS$d*=vq}U>TW@Q)!wSofoq*{4gw|8@80llC91JbjaeG24fG7n!F
z@`~2cdaVft6>kPw%if)iW)yZu&jZMtybmoDdgQ=!xw(gTOc6mBs^@8C#x7|>SG0d(
zYQlIPc9&(%32zd-Lq!3ZEsuDZAq7ErwZf<9wr`#I6(-(*P4iD&&eld+@*z%-x!#?6
z$kA`rBNHANdep6<dQhIz`i6yIiyoy(uV~cKaM7bKKhi^zQdB}CxYYiFp-1ie)C2CM
Mtp}%kNO0!GKaCy6O8@`>

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/boolean-001.js b/js/src/jsapi-tests/binast/parser/tester/boolean-001.js
new file mode 100644
index 000000000000..d2cea72b2913
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/boolean-001.js
@@ -0,0 +1,47 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          boolean-001.js
+   Description:        Corresponds to ecma/Boolean/15.6.4.2-4-n.js
+
+   The toString function is not generic; it generates
+   a runtime error if its this value is not a Boolean
+   object.  Therefore it cannot be transferred to other
+   kinds of objects for use as a method.
+
+   Author:             christine@netscape.com
+   Date:               june 27, 1997
+*/
+var SECTION = "boolean-001.js";
+var VERSION = "JS1_4";
+var TITLE   = "Boolean.prototype.toString()";
+startTest();
+writeHeaderToLog( SECTION +" "+ TITLE );
+
+var exception = "No exception thrown";
+var result = "Failed";
+
+var TO_STRING = Boolean.prototype.toString;
+
+try {
+  var s = new String("Not a Boolean");
+  s.toString = TO_STRING;
+  s.toString();
+} catch ( e ) {
+  result = "Passed!";
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "Assigning Boolean.prototype.toString to a String object "+
+  "(threw " +exception +")",
+  "Passed!",
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/boolean-002.binjs b/js/src/jsapi-tests/binast/parser/tester/boolean-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..a52b8a39dfdd3439994c3e4fee0861d161194ac1
GIT binary patch
literal 7749
zcmds6&2AGh5MKU42n6B=mvAdWv;`p{p-_p2AX-H!BB2K^m78^wh3z`>I+XAzybX`R
zl>-t7cm~E^?|K@0Q)fvc=qcKG{n_(*=9}?sU5th?-KY;J2{&GI*5~9fI2#1PJ`2ae
z=2m;V^R&}rLmJfA)I0S!O2x+4J3(+2-m2s2yM#w%Kc+8eFD9Ibh$RXtG|y@9AxgsI
zSl<EX%t=^`E2t<8q9hUp0A7A8q=|?QBFYt9LJrNQQ^BL8zi|nc=`<VNt(|s#P5)P4
z(;yhDquy^tf^rfoxQ`?rS$Nk0Z=bQ4lH|eq`lHqNsSTUMuPNf{dew6<^CRK*>v$Ix
z3H=7xOC)r+`KB{3LNCD9w>uB_9^1q$pT}Rz<5Ak(-RicQw%ynvJlzt4GuX`Ba&^d=
zU}8L^tIC6S4p#2jYy1Vb%}+y4(-dO8BZ#1f5QED3Xz{-@SQ{jc%~Um`2Y*o$V%Tnv
z(7pmTr-E?NrKy-=p@zliW*>iJf)q_{0^$9UBqDX1?qSRgz&hffKCeKQDetlt>)SRd
zLHPoaZUy^hln_2Pb_G&yK*T|mK}chIAOars2S!J=DoLRGW+6<{0w6tzn73d{18c^>
z!tWhk;jz0ZQClEqs$V=h7OJT7Kfx61;3u)>lQv~+(N8@(lqub254(w{LfrzyHmen&
zH8J4q$bnrDcN(+jMPLEMa}+xSs{*MK?j?z08ro;Hd>(&;b1un0FN5K`&s%Ssdpj>}
z(=n4Tm_Vv1C7bQPr#%rsngn?iW2a(Qo8=)OQr>i;p1yAnEE%LlvbWK42f%E2pvoQU
z!l4{9$F5M~cKO&OU3Kq>S?@zIAW0ZQA)jA5@UA!I8xxbJURHjc4^#r2$7SX7^1NCG
zkK;apsc6%q33r}X1tPU1({lURl@z~&7p(C1RR3!*x6MS2)JmOSyHep<+Ug1(W(YDq
zBR5W`7pTvnrtK%PiZcMSlu^$NZ}`L(CM6!;GOuvQ_IO|#bzXO<^W+I*aKrpeM>pHu
z;xwGdB#AmqFqgQMBYh=%hI%pU*3hsG{StFwQ89iyk8yN8z>0KoZQCHCH)zCUlu{Ku
zL+A?~miLzMhCMt>g|UgVoCS<BbFx^6tCGw^$C5=wM_iDGcrY{P%2HMVuSuHH@UBgF
zPJ8}~>HqJDo8hYS56KL*PX(WXhr>vb7OX7e=SN%mn<)Wa6YC9N7nR&3MA;mpQ7tNF
z)F@1cTch$_;MFVo>f&lJc_y-()gURhNbgx07J^zqb$eW`JdWGDud;x)&;J4GS;{^E
z@-vx-?+bZ3Yd2kMf<d*LVb-!Mr=typz0q@hd5|m6JfTMpJeQYyIL8SZ=tA|}tqkfZ
z?dOX2mu4o6=VAA>q*-zw!7EhMkJ-|QhZ#~2gjW-MPG#Z`IM$o6X#Q<W`lNNSOQ(E+
z(_^kXryg>2TJ?xqB++2j7{XT%YY=yh^q{oC`mm+PO5y{JI{Gkr)a7G(NCpS0t`S^n
df7j5X_F3xzcRtsH(m1QBqsLD8^x#aVe*kq6)J6aR

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/boolean-002.js b/js/src/jsapi-tests/binast/parser/tester/boolean-002.js
new file mode 100644
index 000000000000..8dd55ed6b432
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/boolean-002.js
@@ -0,0 +1,51 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          boolean-001.js
+   Description:        Corresponds to ecma/Boolean/15.6.4.3-4-n.js
+
+   15.6.4.3 Boolean.prototype.valueOf()
+   Returns this boolean value.
+
+   The valueOf function is not generic; it generates
+   a runtime error if its this value is not a Boolean
+   object.  Therefore it cannot be transferred to other
+   kinds of objects for use as a method.
+
+   Author:             christine@netscape.com
+   Date:               09 september 1998
+*/
+var SECTION = "boolean-002.js";
+var VERSION = "JS1_4";
+var TITLE   = "Boolean.prototype.valueOf()";
+startTest();
+writeHeaderToLog( SECTION +" "+ TITLE );
+
+
+var exception = "No exception thrown";
+var result = "Failed";
+
+var VALUE_OF = Boolean.prototype.valueOf;
+
+try {
+  var s = new String("Not a Boolean");
+  s.valueOf = VALUE_0F;
+  s.valueOf();
+} catch ( e ) {
+  result = "Passed!";
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "Assigning Boolean.prototype.valueOf to a String object "+
+  "(threw " +exception +")",
+  "Passed!",
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/call-1.binjs b/js/src/jsapi-tests/binast/parser/tester/call-1.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..c695c8be4ef547bd7005592da25172bb4ad5f837
GIT binary patch
literal 6585
zcmeHL%We}f6gBV10@$(5vK6HPBsSG3Qj-P<3Mp!$ZjqBXsoTjo@;EK|0X_hU4WGsr
zz+Z6famLPgk~(QpO4Uu(jO}CJ$2q>fffx-#QVNa;?v_4t*5`PDZX<-+tUE^KTH|AL
zr`cgcf`X!&6NEGtrEkv>dJMAyd-);e6t_dNM>-+qSWp%zsIK`PqZ1l+r?Gwk&aLyX
z7*|lVi)che3Se(v>yk*&9wl7CMR;Hi9ScsQe(3>h)2vonwf#m=)Zc=l2C=c4YJQyx
z!f~kJPH{ML@a_X%2Z!Oy*Dl-ywx}Ey=-uwXic`$p>Gtmbha(TG2hCMFvRe7H`{j-6
znag+N9|+PVW#m2Bs#R;%tFGO4MtJ5UuoAr+MIA}K?ICA^iSdwZ%M^9-FW}ee*C8iy
z47)T17Gwa#Qw}5P_gscn;2dVDS|N`{46kgPJ^1_x?2QHHqD5jc$3hKjqnmSF#0067
z+62t|Bk71Z*K`kKo&nYw2g&&WT1<G0)mh)QNvX+C$WA9g%QV7#Z0tf(Ye2a{i9tO>
z(i4c&{*e(+ElCpSh1tk<(i$K=9I<MZmIfA#fob07WQE7+<}fxzP9#75nX{1z(?aRj
zAZKQ!x)E2EeGkD&l0_996W3SDpzo0FcVXJprSIXfRmZacXQ;5~lmPEpqKr!7HpCH)
zw+iy_rfY(o*B*zKSNr?=etEY(A1b41-h!~lL?)7~eM~w6foub3#duj6dFpy+z6Bo6
zkWrV3<^oM}TqQ^wrb!1(B}faxVOa{psb!PJc4$1N>xyc!I{WjQu<Zoo`zo;Q6$C7o
zZDqznf}^d1{>Ky?=djPSn2|!;!(pBr*$Hz)K=puA1l)kD&LN-&zokO!D7qB4oxL{I
z@;-rwHL@y9i(l8CS-NpOFYULWAy+|0b{3bBZT05f?`>?}2uenQ-K@4*>cJ7u8~yjX
z1tp{2vQ(Fa#*8Q7a`Lm>Di0_A1JPPA%<_bqMQ+NZLa0Hrh1A*vaj~F#1VU!BShxi+
z>6F<0N{Iwb#v$}C2l4DC=z?MJs>zkR>#)Bh!Bh$D;Q{s5Zy)CbIf<fu;Bv@1C+68H
z3x@gK-c2}>bEpF%Mm*F1ne;%?3V&+b)%PbZ;u!mAo)sxL3M|uYleBL<gGM&K-A7MA
zl3sdt=`w3HYiBK$aZ9#`u5yy;q}zbrxam`=4EX^QpGf<(dAZuA$L6N9o|E@}wxFFZ
zydKNxuIQ2c289Lb^rQ8dd)4Uyhco*7jQY_U&FMK>n@uZ`9>`T<J$6p#FIR{E0&9L;
AM*si-

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/call-1.js b/js/src/jsapi-tests/binast/parser/tester/call-1.js
new file mode 100644
index 000000000000..9ff19555e8a6
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/call-1.js
@@ -0,0 +1,42 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          call-1.js
+   Section:            Function.prototype.call
+   Description:
+
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "call-1";
+var VERSION = "ECMA_2";
+var TITLE   = "Function.prototype.call";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+new TestCase( SECTION,
+	      "ConvertToString.call(this, this)",
+	      GLOBAL,
+	      ConvertToString.call(this, this));
+
+new TestCase( SECTION,
+	      "ConvertToString.call(Boolean, Boolean.prototype)",
+	      "false",
+	      ConvertToString.call(Boolean, Boolean.prototype));
+
+new TestCase( SECTION,
+	      "ConvertToString.call(Boolean, Boolean.prototype.valueOf())",
+	      "false",
+	      ConvertToString.call(Boolean, Boolean.prototype.valueOf()));
+
+test();
+
+function ConvertToString(obj) {
+  return obj +"";
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/constructor-001.binjs b/js/src/jsapi-tests/binast/parser/tester/constructor-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..0fb83e3759f878f95966ec2a96c440197bd6bf63
GIT binary patch
literal 7148
zcmeHM%W~5&6gBVn01Ft{g<U%gO<`HwblNnFFePQ0Og9X}D7NYf94jL$ZL{LL_!Sm>
z0Q>}3wrr`k;yO;rw1HK|k#uzL(Yg2PVe`?@#|`@sBe(H^QIDa4b=9)0K6S^|R=e}A
zyViB+5L<RV>SOyP<PGP!Wj%miwmy6xF@pL&-o}oP7~+Hm5tOUGL+dLE+|yXU0O!hC
zSd>Lj#I;C3cnY9T-*$1p$pOJEf(y_<869#)0<Uokrs=ktz4mU$uFL=Ix&+a&x>5ff
z!ZAaB1b2k|Q4a4Z;O$|rbuz3wGyuSn!zp{Uy81c~pG;Ga2(;zw*8t%Nv3z&knu^5!
z0PHyuyWiUDo)@t<!Sq)1{pRO4d1mHM<j?sLc>|{EwR=0Qyx+PaO6v1IpauB27Hf2A
zIS)DmnV@=x!w{mp%Mr%|h`vZ}IQ`!krcLDgYG^dVfxoZ{F5S@*L460D3^`)FheKZA
zp@h}Zl^s*LunAs!fpAy>SR#@kPeR^<T;<~fZZYB=s#GNdUIgU2vQoEZo9cKX3Df=;
z>~L$y1TY^P`K&go1g|0nW8o-s6S?SSmw*yW1Ws_u$3vV)tBCptP(93>J_<u9T@gj)
zz^idqZBz+*1k=0GQs>RT5KP|&138V8PTs_1`Le&d=@m=ZO$e7cl`s)+%pgwPiw-{4
zB3>9aTk0wbu`HVv_6^F`snS~}LknW0n}~TMk@iAkCMu!ydw{j+x*}6IQD|U0+8lj{
zDMdOxwY%IR0b*n2(liP8r4p^aoF%L12AC2j!j&|Mtz;8VZM_zUu+}FDnYT4Hf3mC<
z?05loEa~NZIcG&tiLWr@LzwYnT!iEv;#09F8R?u6A%88QmWkyOYMrjYBr7WeHT{&l
z>+~xXU#`IX1`C=C%#u;`B(L6(j+kRe0y<SC(XR{ijWxp#R|mW3f)n*%5-F*k;`3wr
zxj^zl=PNJIr+wrXC#)?>eT;(Sq!0Y3r7dCjvI%IC+lfC5oS(=H0)iW@Y;}c09%b0P
zQPEYgU?RE;Occ5P4+zPdK}gT?LK=*GPJ9xaQR@~=N8;39;Q4<U72YiyWCRx-ydAjs
zq`0Pa;EcwIvnVx9$f&^cxyuMrLvkKY-bD0bP~u!6HmkhUWu>guI==oUBTR|E;eI84
zcEN539zN6oJ=!h)hK`S+Z}RFe@faS)?<A%RDXl4cD=3?cuPd_6aIdY6$~_&(w&DYr
z>?DlM?s;U>q)H~6Cn!s6HKZ@CHN6c`@hDrf2T=L9X@9Tb8E&y<YhE$3VZzOv@r>{X
DZqXtR

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/constructor-001.js b/js/src/jsapi-tests/binast/parser/tester/constructor-001.js
new file mode 100644
index 000000000000..b268ae5ed099
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/constructor-001.js
@@ -0,0 +1,66 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          RegExp/constructor-001.js
+ *  ECMA Section:       15.7.3.3
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+var SECTION = "RegExp/constructor-001";
+var VERSION = "ECMA_2";
+var TITLE   = "new RegExp()";
+
+startTest();
+
+/*
+ * for each test case, verify:
+ * - verify that [[Class]] property is RegExp
+ * - prototype property should be set to RegExp.prototype
+ * - source is set to the empty string
+ * - global property is set to false
+ * - ignoreCase property is set to false
+ * - multiline property is set to false
+ * - lastIndex property is set to 0
+ */
+
+RegExp.prototype.getClassProperty = Object.prototype.toString;
+var re = new RegExp();
+
+AddTestCase(
+  "RegExp.prototype.getClassProperty = Object.prototype.toString; " +
+  "(new RegExp()).getClassProperty()",
+  "[object RegExp]",
+  re.getClassProperty() );
+
+AddTestCase(
+  "(new RegExp()).source",
+  "(?:)",
+  re.source );
+
+AddTestCase(
+  "(new RegExp()).global",
+  false,
+  re.global );
+
+AddTestCase(
+  "(new RegExp()).ignoreCase",
+  false,
+  re.ignoreCase );
+
+AddTestCase(
+  "(new RegExp()).multiline",
+  false,
+  re.multiline );
+
+AddTestCase(
+  "(new RegExp()).lastIndex",
+  0,
+  re.lastIndex );
+
+test()
diff --git a/js/src/jsapi-tests/binast/parser/tester/date-002.binjs b/js/src/jsapi-tests/binast/parser/tester/date-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..f79e4756def10a0baceafd9b732d10b198773592
GIT binary patch
literal 8840
zcmds6&2Aev5Z?ZzZHgXR^imWEqN9VLvHNps6$7#CAPyWgjTQlND(GEC+Ge#YaH%+Y
zmA*`oLmr|)Z#^|nkr^&`IbKo{wO$L2FE+F!KXQgM-+Uzdaz0D>et*JQy#H9_W5K4u
zhd~gW=J6spI37M6{XB~D84voqs!u;n3c3I0W)OS<z4~<cQzjC2n({*)rA#oH<e7qs
z&F><3k!10CtbYLKgLPQBP*6!6Bv~SB06P6~%rluhPq<KU8Jn6#7g8kIc>hzFW^^<N
zkAEHZclEdat_Go4Bh~*TkzBA;!M$YZ+`{_|@M0$UcYAw3*nk!Au5wvl&-W3GdC7#`
zozCCVm45^F7G3%D=*g%nS6+jqKOBAk`%kuGw(rNc+w&vZ9Ug}#N4DKGAUp%|8$dgR
zfV?vkxy<Ea#_tqdhRKxg+_ERQfMbtd%>*wBNb!+``KFM1D)M;!-I=2UmZoN?8WF)K
zZZeA+?UB*f!QetNAwyos6&7k(if-0%5fhLrwFyj&=je#SX}X6oUjo*d0MdB?Y|KTN
zpX6iPCdDRyLYiBdevo8LER0<Nat&}da53;_%Ad<XB;$#pPfbY(blXfsopcG19**dm
zr_sQkF|dw%M^t#MZbi!0$R*|1KOGbO|0(_x@ERofJar@%jS)|7Lb&@ZNqM|{C$?8A
z|AW<73Dn$^Zd3<y6n_=*87d;%_7<-E8W4whuLkYOiOA0!*mVG2MG1ld1@(qU-Nol)
zRumn_XDAk?z9?m#=Fy8_!m>C8sanZu8U+W~qcLcu9RCZ59-+IC<DWxTY$-8t10Ov*
zycez!KSO>-iW)BNVxmFKyFi^}XJef)dP7<;l3A<SLtHe(s@6=-UB3r%YMh~fFaVoW
z@Vmws8cZGq4gKLm^bPgqEqxAiY7!31Pyc|l4M3%WI*|*fKRg%i6F?qNC^@uLHhydd
zgJRJip{JD~Lr{JqiK-JLbg6BsLEM_4(M-3F9=~zM@;4Nz@`TOfA)IlI+En;(FfUi9
zwVgA^+$*6|515Q5gOtq+u3~To2m0yqO9496!`UhuY&TPsjXChPivvw2U9nX3a5C;Z
zP>!=a)<LITPCftL`D_Dy)nG7;!xg3E(s;`w{yjDrZ=Ymds&6})np<rBE=hpyJmnj}
zwi(P3Ep&|Gs1q(%aMZVejeV;tv8FrR^i&x@SKKmI&kG9gI_9}2coi{Vg+p8@!+ryz
z`WUUJhIl}GABr#G%>I5rdLBe~!1<+W=-usQ{H*s#X~CUazx2w_^_|(C<I;@on&*U=
zsJ$IHqrqIu6O{scgu@!vb7hO?axonphPx0w*14(-ZD{f;ovL+uwaDr}ouMUJY*sTo
zJc7wDH@>dCKhGk(K%lQHhy+g}N}Ls)sWT-RmmH52gAHL?#oyGs9){z^nR-WYB!QzE
zZF&lR4er1j&vV4ua?>yAFxE~{gp;H&c7TO;Y3^_*G*tJ99p>Z}-yW~SDBYlTan){=
zN1`Jyxvy8~qCJ4H$kk6-4%TQFt6uJ{qP6-@SN?>{xoEt6Rj)s_YNi7`GPs&Y7cx4U
zYHU~XS3}#3Su-7K<0aP)<>vvLfiIj_5&uGs_zK2XGT)AhqI{ND1*dTjNShk9NH;n4
zux@ia(dZV`Vzxjhkk+HNZd;<abgN6{kb#aECIg#yZ@S4DrUbOG-#v9JdiuP=&<*Y*
iqi%GRXWg>qVX~~<>hBGhSxE!3k_Ho$y{nkj|K9=H12G{0

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/date-002.js b/js/src/jsapi-tests/binast/parser/tester/date-002.js
new file mode 100644
index 000000000000..0f379b541276
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/date-002.js
@@ -0,0 +1,54 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          date-002.js
+   Corresponds To:     15.9.5.23-3-n.js
+   ECMA Section:       15.9.5.23
+   Description:        Date.prototype.setTime
+
+   1.  If the this value is not a Date object, generate a runtime error.
+   2.  Call ToNumber(time).
+   3.  Call TimeClip(Result(1)).
+   4.  Set the [[Value]] property of the this value to Result(2).
+   5.  Return the value of the [[Value]] property of the this value.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "date-002";
+var VERSION = "JS1_4";
+var TITLE   = "Date.prototype.setTime()";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var MYDATE = new MyDate();
+  result = MYDATE.setTime(0);
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "MYDATE = new MyDate(); MYDATE.setTime(0)" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+function MyDate(value) {
+  this.value = value;
+  this.setTime = Date.prototype.setTime;
+  return this;
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/date-003.binjs b/js/src/jsapi-tests/binast/parser/tester/date-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..206cfa318f41de9cc31b42acb195b2a1bb5ff0f6
GIT binary patch
literal 8996
zcmds7PjA~c6xaT5zz!P*>@aMAjtPp@8M@Qv23VXFO^`W7Z4|u?jKtV#70ICJrv57X
zHv0y<4%n%u_P!6W_b5_&HfftyWuwg{f<^I1zQ^Bt??*CSIh~~Zush}~K71tdkzm)s
zhd~fr=J6~zI_;kgei=mhga_S@`lg#Eg*?0rgWyZ}s!O{+VIpCdDL>{>$^?^1o++rf
z{#^vmlPsRc`WJ9MScjDh1(n1>k|nYNpu?ZWJd?>)!i9p%*mXVWLW(3C9exJG3{HB(
z(~Ew$qu+Hq8iZmE)c5C!<btIN?gdMy7T)K87c<F!JUF;#0~+9ta#>f8_Yw4Y!G!%e
z9lxO~{{ieBy7I}%<3U@l`~;?cHu&j}pKZtN-jA<$=SQ@Acse{kvF)aW@Fe87fOZUo
zygL!O%;jvt?<(S6T-oq%;ntIv6TyoD0(>B0v}*`F#XDZTcSdNBrD@$&^@!jVuj7iE
z>=DmjfVqWaLJoN$S6HZFDSADRw=n@Tr8a?y(G(p~I8FC3<}1Lu5s-2oLN4ZFn4jk(
z+a{Gu{)8a6;`}Jdn3&ae1(<0db3-PE?3wZ_8Hi*wu9K%uNC<SN9*8<=3y>a;Xgf=z
zfnjZ6#d`-UJZ85dU@PP@;a5K$1HJnR{!{Q81o<>|1Qz9pXJ$gU2P{c>ynH2gS18}W
zY^(rUT$6S*2j(dLGU5}|L$>V=T=@+k_Vcg;4dqzmHxBHIfVWYAAfce%@Tfh0K4L}D
zGCzl6R@WD$tJ6Gs9*kKQryx{~sHQA9!Y>v&trX)=KMs^QZbOX!2T`%3z`*i!adfsi
zB>Mb@RJ1nBEo%4QXBU^xoD5PC^EZ5AIb(Y>f@M_V&Gv|z%{}LAKy!#BGCLLcq~g><
z^e_9Vsn;O))(ca!72O3<snuaM7s~J7Ksb&vlu9+gCR*iw?H>y3QM!Fg+GaZSIH!gn
zMRP@}05mwLFFA91!DG5!0pfv!dTRYH!0=%4S=J8fX?iMv>s|ha>RE35dEAGscP)bz
z!1wT-3MH}&o)7+VoQkD-Kss)Z$!Oe5*|gw_FB3RqxL$rxLA!c*NinykmYE1e**G)b
zfh9yj%w^`9^|vf+Je<6$Xd924C-wY$=d%q|-#e0RJoxXiz*tpfUhWC(U@}X)^tn3O
z0Cts27a=HH+zINO%M}UgJHVz1YSA6;^kim1M{mg0?db|!6Fea4v4Y!cq6~Wqi3;V%
zT%z(=Ztt!77ETi04@l4LaR;0a^)S32X8a~Jx^z$d!UMg%gZ=$qL-@j+=k4v=OG#Pi
zIWBS|+=C4yjA{eA=<UIZHObF~>N#DEN{8VtM2~r{sz%h8o>0q9OSH5$lQd5{Lc^S~
zS?TaF19O1f_$>9oG>h<bgI@d~65Q4(jaIZK(mXb8eHd6Ja_V0X)A3wSsbohOILgwd
zoAkfHAt>nQGHk<T-_j1M*+ynKPKw$Nu+Xm2Ev|%yY9F!1sJ!LN<F%cn3)GBP&3btR
zI%Xy;sdk*xNqYccnXB&EY%~|6JW##dYp~6e&ipZ#Q?YO{XD+8I`Aj=_M6el0monO$
zifvc$o32gztQiis)=Lf_%GW(M0be)|Bwj&{_!|0~Yk8X$MfpDi?vkS$ts@%!-l>aq
zo8tnB3}p*-0%={i>$W9=OSigY4(aHiFzL7`YDmYzzIoNH=*)Q;p&QVd_V!RWIx4Vk
camIvhTXSt%mTvX;2N+x_1KrbJa<@|ZA1|O|`~Uy|

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/date-003.js b/js/src/jsapi-tests/binast/parser/tester/date-003.js
new file mode 100644
index 000000000000..f8f48c6992f2
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/date-003.js
@@ -0,0 +1,56 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          date-003.js
+   Corresponds To      15.9.5.3-1.js
+   ECMA Section:       15.9.5.3-1 Date.prototype.valueOf
+   Description:
+
+   The valueOf function returns a number, which is this time value.
+
+   The valueOf function is not generic; it generates a runtime error if
+   its this value is not a Date object.  Therefore it cannot be transferred
+   to other kinds of objects for use as a method.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "date-003";
+var VERSION = "JS1_4";
+var TITLE   = "Date.prototype.valueOf";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var OBJ = new MyObject( new Date(0) );
+  result = OBJ.valueOf();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "OBJ = new MyObject( new Date(0)); OBJ.valueOf()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+function MyObject( value ) {
+  this.value = value;
+  this.valueOf = Date.prototype.valueOf;
+//  The following line causes an infinte loop
+//    this.toString = new Function( "return this+\"\";");
+  return this;
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/date-004.binjs b/js/src/jsapi-tests/binast/parser/tester/date-004.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..75e32116f50ba886aaca695cd325485fd07f71c1
GIT binary patch
literal 8655
zcmds6PjA~c6xY`M>4qLQ4CtXiQQwxLSknPJZEk?ZNwE~E7tBV1o(9HZZLPB8QFK#(
zm3^}TyX~@li@irt;*0rg(~1(Lxmd6${>b<L_sFiE&r-S9ok$Vyov3`Q#5DRiilWmz
zUPSvx{TG8D2cvu@qwcQxrkf^(-n;W4itfNyT{``hP>DEA<$)ZfLJ6JZnSqMk{~~&u
zWbt{dzX9i?O<1`yP)QsmS)ywIy8KZrGo8Fiq%v@sn7U0DS|!<d?{ipYaM&9j{nGF5
z+IQVu3qr95=KJGBOC?eR_fDj95AQbM#X`&Po;>-%2dsd1jmo-qy<0HnolySgbp3{^
z{0p$JP?fI^e;u@?%1>eIF9zTLb}jVy@73uM<sKdlj}O;7M4&_71+)Wj$j394>s&8p
z^6^;eVKS9I`~}?e@cm55qJRJ&Xjp9ufoJ?q*6-N}?TIvXQ_YMKypk@iXbc3z^A{j)
zp@q^zS?DzqG7;|faS;(PQ(6&(8qZM?1uJ@hFkb=InSzw_Gvs2ahWT+m_GL1;<WC54
zFV6RqOsIvEE5b|znHw@OWY1K-(UD5V6PG+~LPDTNZXs%dOMnbeMB7;!1?)HhYrki_
zB4BrG0=7mj6Mp@dS?KyF_|HIV5ajce2`uU(ftd;6o{J=v@oGz4U7`FBcH;%mvQ66I
z9GIiz`;nX>AM#~ypvrFmv7dKp(2ky{{EWe_9q=X+5OgT0H*(aTf1Ze<XxTr9YT@dO
z;nitAdK*nd7N<Z|D^g9pU?0C&nzWXT{{e{}q1zziUqVz|QDC3}U%ozgHrzmc`tpnv
zHQe0ANP}5-fh@_7#yVoGK^kNvw^wIF+%)*A<xH&Ap8=g3XGkC%z%~{9sS}1eQ$RsO
zeS{?X?bzEvP6a{t%uj!ZV2yy80w>W6RttgK4RM<QC?p!2>2c)>%g-{YQf1S28BJdP
zhq6+3#4_$fPwM!g0f0uj3^>ci*r?ddCwfAUCcRY53u(M&1`YUhbrVl_9iS-Vzs|v`
zD4{4@XRSwE)^fgo!-6M3$!K{<5^O=MG+sTa=07-{ZNZ4HNzMuI{{REyX_3xLzU&86
zW!ja`_4x*{>x{Y#LA`~~QO8oR$x-(J8&yypVJ)kJPfyh@=;{r9^*jY=v*|{g;Nd|}
z6bv0Of}KF3`UIt?f&`d5xQ)GpF8jlP3~U|01?86&zw@+{$+ON&!`^lt{?sX7S7%&1
z5B;#BMhjdIeWJ4iO%*KV19EO1;0+s+9)}vZU5rLXa1JqGpX;g+)ny>mDq?Agb+yUr
zNmpo?E4C{c0b*e6>#ffhpU<-qcKq}*1d-qd!*H{rHF9Pc<BER9B(Od#YtlE>Zh+u;
z(q*nam>^(^(Y9^tYfy*Rwl*~SC3R2Dnwa4vDV!XjM87h(XbB6|K4Ob8dBe>U)JIYS
zHS?=xvjPGg^Adj^LN^@%ghj5td1A6gGhYo-Z{@A^lgUuzHk%8|YAO|)(&cq?Y&}~w
z74zJR(}41IPt5dOu_pxoK<@q;=2z_7w^mW!ZgWQmbZDtY*ddmt+A-#?!;bL0nLv7X
z!**;153-{i`yim+VGRLg{EmPw^AIwz@GlVUC~EqA<+lTTCuawlvS~*)-0+niYku#;
S%BEzKoh(IY`E}*9_W3^r`1AAt

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/date-004.js b/js/src/jsapi-tests/binast/parser/tester/date-004.js
new file mode 100644
index 000000000000..fd8733cbddcc
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/date-004.js
@@ -0,0 +1,50 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          date-004.js
+   Corresponds To:     15.9.5.4-2-n.js
+   ECMA Section:       15.9.5.4-1 Date.prototype.getTime
+   Description:
+
+   1.  If the this value is not an object whose [[Class]] property is "Date",
+   generate a runtime error.
+   2.  Return this time value.
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "date-004";
+var VERSION = "JS1_4";
+var TITLE   = "Date.prototype.getTime";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var MYDATE = new MyDate();
+  result = MYDATE.getTime();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "MYDATE = new MyDate(); MYDATE.getTime()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+function MyDate( value ) {
+  this.value = value;
+  this.getTime = Date.prototype.getTime;
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-001.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..c606d8345fbfeb7256a42cccf4d6285fda744ecb
GIT binary patch
literal 7058
zcmeHM-EPw`6wdfZAi)JU+(qIBG`3D$qEOhnA_k)%+6{4qyvA*<rAg(a>vqF?z!UKd
zT)->v1c+nDv7N?E-JeZE?50)Y`13j6`FFi!I0$gn>tW<q-_xi|QQx`bIL<-jpEz4P
zjn~bm&2}`vj#uIDcmau%>Vx}^a|_<`^zHkI5_AyYZQKqJMG1*Q4&|%gv2#d5Kaceb
za8{;aMU+Dk-ytDMB!GVWj*r8HbO@##E<}ALbevEUcB|Lnm}b4!+IiRTD&m<}5g<BN
zlfS=95=>FR;f_!+EZ{K;{Ako80bbkKcv8g7uq&K3PaJs}wjCi_d|ek|PBwo4_8GFd
zU;oft7Ms^V^m^^>=I3)k<e#%6@+utF+G*|9%RR!<DIWuxAFZ#ibH8*)B<Z=x4bTA&
zu<y1b2$FD!-8exB?nB5F4_&}(>&F9%;}}A}nc;JH#PYc@c55gI)K<Qu4Ue#jI6X8h
zBK;<i02<Pyh2t^}4Y9A}SVRSuLxl>6c884U*r>XNGIs%ML?Icyf-H?`E82~^MXT`?
z^9^FZ5dK>vMD#@I<*)<<IURB|<kbLo5{Hs*Po-6nrx?(xI!HIcDL`5fvF!ZK6m*q>
z((eskVIf^f7)#`|4#=N|gOr)hi~HRHmUh$hQ4`st$Qf5`0B<tK&$R^&aDGbKSuurW
z83!2;x@V2O&P<f6y==eZ{C+O$wy3QcR`#u9{>z+x0d1#oI-Mk)jSGgQ?{KgEX<~S<
zEM-EC>yTq7OYG90wY<3|Lu92a8m3#$<j)rt%v*4Q7`gXCLd_l{+U7IMLd;_p>y54e
zLNaq(^l})s*+{2PcMJ(evH?tc{dn@os1s{ZNA2s)S5xF#oWLq|K>Ebc8O|sxn_2Mj
z0JjZL!X<RXtsrV2s=7XX(0&7rEbG>CIb_aqwh4WCH)Nft0+^*0d?r&`P8tiona>in
z+ajgG2ANf}*T=tgVnu(Fr<Tt=sas~Z7y2Fx!I^nSQPhi~a_P6DkL(g4e>}fJVSy$!
z(NCY*6*|CTp%GA)RA)1`!6(HWW;}dv;KTH%HgjM(5lpIU?DW+M1AzsZ6TG0ztXaRA
zS1z^dDVS7>lD6qNb7@y$K!apeZV@l%_AD@WdCK8*$oXlW5v3$Wj;oyg)=yBbl{eiK
zzii-<+R2@ASu^wvuo=4xsG%4uYBSNfy}v`EWfg7K>}EZcp2E=l-$GhmhNU;OZh95=
z&@EbCciQ=bEAt~A%~C>E-CfThnF-TELW{tiLrRwV-A6_G<`lB5ZPKN)(05W*NmF<x
zpZs1@X1A;crWR1!%2-YRV}aZLw6Vs11OB*(#p4<pBtx1#%PJn%;S(r+n`J98be49_
z;vHkA5^ILrE3sluof>4}PXMuIva(njvzmBn@LjPo;XYTa7AG39VCvt*(v(Zp)KB<l
U6IkXwxY$|7VkuW+N}ET<zs-u~I{*Lx

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-001.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-001.js
new file mode 100644
index 000000000000..d9a7a033df04
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/dowhile-001.js
@@ -0,0 +1,44 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          dowhile-001
+ *  ECMA Section:
+ *  Description:        do...while statements
+ *
+ *
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "dowhile-002";
+var VERSION = "ECMA_2";
+var TITLE   = "do...while with a labeled continue statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+LabeledContinue( 0, 1 );
+LabeledContinue( 1, 1 );
+LabeledContinue( -1, 1 );
+LabeledContinue( 5, 5 );
+
+test();
+
+function LabeledContinue( limit, expect ) {
+  i = 0;
+woohoo:
+  do {
+    i++;
+    continue woohoo;
+  } while ( i < limit );
+
+  new TestCase(
+    SECTION,
+    "do while ( " + i +" < " + limit +" )",
+    expect,
+    i );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-002.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..9b80e1fcd76b00b0e9aae05ef5531336982e6ed0
GIT binary patch
literal 10101
zcmeHNO_SR+820kbFasR=0}R7~(solgF+1*-ZW@L#OJGP^4jdRIRuauRmMc5W_QD_F
z#Dy97F`T*Z2ROiuGrxf0l`L8EN^z7;vb&|dY-TO%k@V<!KlI8`G0zfw7)>#X55Hn`
z!q6;uAqavYjh_TZ-QMT@gZ_wSIEY%}ohTuBaro1FLGT8=6`9>1B1X_K!T0efK@1gy
zrUEL~|L4I8N#i=!Ux2f>3X3uUMdE;@q^JPQ;kz+T3o<5{3Ahx^^rZ8Gk#utSDh$)_
zv<KZUdr?b1i&_%I#OjOpk4b?UN(9_vl*}zWPC-l;Q<C6Yw{L%BV=C;HU@ekEz6jkO
zBWAyDPT`zv{sGt*$mYY&*Zpm=`3g+E)BfV#cUOYQe=m;6mtm+ucW~TkR)nW0Zvt9O
z_xJaOF2e;WrXdOwG{gyx!x04|N#{7s3sm44n2bH>2CD6xW(?;!n0{a33pwKIxzl#r
zC`oiz(PIRUu(mkUG(0T*bszy&$ch2Zn^x$seLas&mcV_eTmoW~IVU=IF5P1>Zv)nX
zfiwCHyfkJ5dQ2zwt_c_O3)sG8{zoK5?1^4iz#S0ybnwyOR}(xg0!AiN?N+6q;y^d_
zK;{<g0MdhqZToM&z)&x+(!E0!9<ysO;|jTq1J%Edf%G<A75TjdEFG8bqb<FM&6!wO
z25)lV*V2L>h@X*>3Z~Fp*@5E0RMwf-`4-h;FYg}&|J<$Owv4R`OZ}RdPcx_A!)jM?
zx|$@Djpqzk+7YV#)5Y+ECYK2@ZcI)C<=87d8-DXvWg>e`*06f#TzY=KgY_NUz(%fp
zQbDb6BSz;7^FmxPo8?9?0Yb5MTJ-5W9q}WbdAj3Ba3ss%v^UF_9~n(zJ>sZ;y!qK>
zxgI0%NS%-wab$*T&Xu28@M(re4k#%J6Y(gaqZ1w1S0A*0y%q#K>#6yWbB42fke5$V
zo{4IJbyC4Ql}oG5#)EIJS)zM;xHRZcc~$lL*<X`by&}yn9~JgSo<}M;v)koS!Z#IW
zHcyHVn~Cu}^>I_oP@dah|5Mr=MFMkYcS@VghPBkVA&V1s=>%1+%$$&inQ&*apma*9
zy^AK)+Fs-XP@9!Q-lyO2!c~0{qU^_mgVS8r9{6{Vr8V$5ZS_GGL&ZXO7Qodhc3CdQ
zN58S;5bLoeOFUPTO?Ah0N(GxxcFFOhIrv^Dv72U_?^J@RXPcWG)1wM=2kzd3`i3Cg
zME}|v{Tue!(&!Px$OzP22Bm%Pz_itBOcU2K*J666;#mtAA0v_+gqR=y!SZ8WvJBA}
zD)UBFbI7+#>s2vo{g&kylW6mb1BR@u)9NZaxsp2LmZS-yHY}wHMyV=_@U5*?Irgek
ziJFMn`zcn(cEa|@z!z5sjt|0c$mj_U>AVQ(I7}$bZiYknC#CQ}K9t4pAy2<AL?&C<
ztsY+JeHI>STlM7EfIVIpZ=)RBYzQ0q4NAm3rCitbdsk>TiA+nv`7;aYnd_Ffm0@`;
z^nPgXyeV3b0L`72<5cHzSe`TF_Yz^`n3)UHV}>3ngt=zVS@L8dyl&HX&Pg_v5X{+m
ztasUtlwnWJPyL$U+S9C+Z(OR68o+XQ>Z3gM@Gj^<Bp~pKfr>aN6j!j)*mzK~^<whx
zIn?q~z6s``l*aPI?rNErs+VuCh+eKc^&*ZJkmMRy_g7gqjy!IOY_^p#duG`yhU3n=
z%=zI1o3fUT;~sn~l*`9$lofNPo~h%W@Ss0}fZl}u>N}psLUrEo$&qYxTo}t1cZOy_
zTHoEsHdio_O=p6GeCi01#xPce(rPnwAlsIFdLdi62diH`$Oc#OOE#_e{-KO+;_nZD
c&R3*%$eE5x)JBfoWI4U2gwt&XC2o`W4}KfYM*si-

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-002.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-002.js
new file mode 100644
index 000000000000..e25557e70bcc
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/dowhile-002.js
@@ -0,0 +1,71 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          dowhile-002
+ *  ECMA Section:
+ *  Description:        do...while statements
+ *
+ *  Verify that code after a labeled break is not executed.  Verify that
+ *  a labeled break breaks you out of the whole labeled block, and not
+ *  just the current iteration statement.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "dowhile-002";
+var VERSION = "ECMA_2";
+var TITLE   = "do...while with a labeled continue statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+LabeledContinue( 0, 1 );
+LabeledContinue( 1, 1 );
+LabeledContinue( -1, 1 );
+LabeledContinue( 5, 5 );
+
+test();
+
+// The labeled statement contains statements after the labeled break.
+// Verify that the statements after the break are not executed.
+
+function LabeledContinue( limit, expect ) {
+  i = 0;
+  result1 = "pass";
+  result2 = "pass";
+
+woohoo: {
+    do {
+      i++;
+      if ( ! (i < limit) ) {
+	break woohoo;
+	result1 = "fail: evaluated statement after a labeled break";
+      }
+    } while ( true );
+
+    result2 = "failed:  broke out of loop, but not out of labeled block";
+  }
+
+  new TestCase(
+    SECTION,
+    "do while ( " + i +" < " + limit +" )",
+    expect,
+    i );
+
+  new TestCase(
+    SECTION,
+    "breaking out of a do... while loop",
+    "pass",
+    result1 );
+
+
+  new TestCase(
+    SECTION,
+    "breaking out of a labeled do...while loop",
+    "pass",
+    result2 );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-003.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..57436770bd007f90b3e4420eb03ed8e7257e2be7
GIT binary patch
literal 11729
zcmeHNOLHSN5T5W_-t3tws?0eg*@7Eo!fqT>YbqpL*t>9}WRKzuJDD+>@n%!}2+r^y
zxN+mo58y%-7w#OW<quGF%NnW2(%AAdj}3>V;u(EXfBL%B-I{tn9K?LLe!^L}`#_|9
z!A^r0f*|Oo;d!vvI{du-al4lecu?Pw@6_Wc%Xi<~41%}dtvVh4h>3`GW4_OOF%vA0
z(nLaq=I<<c93^2H>o36Bn1+=K2^EDwltj4(pwqWPp5)PS#D#=Q*r{1`mWwFq@7{uG
z+Ra9%b#z$YQNPu96bQv?%l8kWoC_99xF;+gT6k{&UYMSpL^0pGbLS%)v%ubwtku<&
zFT$`VOxUl}CCtg@pMbqaHXk*=Y%hz=S77PQ#uxX#`Os!&{Y3t^J|bU+sXDFBLDROI
zD#BBg9{^gIZf|c(UDnQ`{G`TeG3)Y}hqYb`PLd3HEz4QXPr+sENf#iy`E($7mVxWH
z3w$X@u77v>ZiB_K87fEg;3sZ8juPSF>8}9^V4=u6Jey>pf~DwY9gCQNF;tnrM1P1x
zXHL^SjJXY1X99xJeTdRrbkc*gZ||B6F+YLtTkgLXB}|+fy8;YA5Yr(>LtKsdaUO`M
ze`3O_ic<)*X(pm1tpL)4h-JrbG_Yn2)Vg=5!eez4+*l)z&H??WV<NLnmqmWa`hNNq
zo^m!<(xA3Wb%*@S*dkBwW%&bU9%?~H-EVo%;ox#vKf`+{^-`8{2)-zyUgg;i@56u3
zK6T~=%N&f;6iJm9#F#$D{=AV3rm3av^zh5o%jND5cjuRj=inQ;l=l59N0<AH$i;K;
z^D7s2IS->>VMpdWj2^5(E|>|GN?g=W=@?WcY}HA1O^&AbA#X=6E?KPk9@b=u=i#KR
z9?G!e=xI>Y9y-$?sr{DD<~GXa&YB?=not^$eIl<+sVbITsAbgM3d=4^{3yl63gMRk
zA)mPh{%n}^uzyEed58r4w*j>FPP6L%AQiz9le52JcFO}i@UbY9flZ6unW=doy^i){
zLlB9{7KVEj;CK>NtW61ylDQYBy~m~|oZh7U7k12|%#>sX3RT7@H)!rbPp6+?7sCKZ
zaL+cvCx$O-(|$_v(4<rrbiqI%aDJ}i79G_&i88Vb7^Pn;9G1TBv9}XcvN}W;vN7vs
zd!W)&r`0sqb1~_$>%Ooq_?wM#U9e0EYRW5TbWT6eVv}5vlU!rDf<-Zuu8UrM`HorN
zsX4tRcLa;J5?K$Qz)P4>3^ozF;KxPntcTJw=*D0sQOY>yyzBbKW#c&3a&8Wh%E)Gf
zDrPL>g#p&7G)AO~Zg@sdy$)3UPID^g^B=Q2JriBf%n8Hq*EL~SQ1_Hn52zWFiHCy_
zZsN>&QckOM0jCPOqGPPIgDTiEg<Q$2=1Z<T44f1rmd@3N&eyf~s5$6VhCbsV9%-$`
zy-Y!in=#G3gY?aci!l%SDq_hb^IFHoEL@`WdAQ2W_;*9d$=&Y1z^&h|33Zg^`HiC}
zV}TOsuv<^GD_$@|LG}b^q#6PYO+xXy{{QF}r8IhujNp2>llCS`$DH1?x*j~He0X!;
zU|H3j<8PoFE0ORJ=(6vS-+`sZX*#I+_6Dwkj(jU4Dk2Z=t0LdZt~oDMq5nXnz6=U|
z6BIg1>9;GoO>`Ttf;{~yLTXi`{DBdkq09Oj0ka`E(z@L7L7x=%AMgSy{~9J|b-%{A
zt8gSIFp@K>x1o3&wVZi)2;Xm-FQz1s?-oRoOAK0+O%Efqs$cD_Q%ptyR+v2cxxohc
zP&jG$5mx>->PgYyYzC-j6TW>=Z@A=3fUVDE)icM(PU?yK>?V-bH=|^r-4Rz0t4<{K
y*j19KM-`s}s;3yB%l9Mdfuo93Po{j1H&UVe_iF%`9e6czPOjaIj=SC{-2D$jFVlYj

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-003.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-003.js
new file mode 100644
index 000000000000..b482823e12f9
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/dowhile-003.js
@@ -0,0 +1,63 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          dowhile-003
+ *  ECMA Section:
+ *  Description:        do...while statements
+ *
+ *  Test do while, when the while expression is a JavaScript Number object.
+ *
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "dowhile-003";
+var VERSION = "ECMA_2";
+var TITLE   = "do...while with a labeled continue statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+DoWhile( new DoWhileObject( 1, 1, 0 ));
+DoWhile( new DoWhileObject( 1000, 1000, 0 ));
+DoWhile( new DoWhileObject( 1001, 1001, 0 ));
+DoWhile( new DoWhileObject( 1002, 1001, 1 ));
+DoWhile( new DoWhileObject( -1, 1001, -1002 ));
+
+test();
+
+function DoWhileObject( value, iterations, endvalue ) {
+  this.value = value;
+  this.iterations = iterations;
+  this.endvalue = endvalue;
+}
+
+function DoWhile( object ) {
+  var i = 0;
+
+  do {
+    object.value =  --object.value;
+    i++;
+    if ( i > 1000 )
+      break;
+  } while( object.value );
+
+  new TestCase(
+    SECTION,
+    "loop iterations",
+    object.iterations,
+    i
+    );
+
+  new TestCase(
+    SECTION,
+    "object.value",
+    object.endvalue,
+    Number( object.value )
+    );
+
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-004.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-004.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..e2b7f4de99b53c54df059a4e92ca524cd9878d59
GIT binary patch
literal 9961
zcmeHNO>g8h7*6>{NQlF74=WC=mhCJbrz%@^J3EL$WkAgAa^Qg6iDzmx69*^Rwi4pV
zg);}Z^I!N49N;hT3lOgzCw6Kl<IG3fW%tri<M^@P=l!-5WO)+d{ooj*aQ`bt=L{{p
z7d+29qT#uBFdTh8-WyM8g1w+8-U%X-X8Uiy>v?a$TY*0PF=7NAMff3}Mu?$|&{#l)
z>i^U`A#qs8`WtX|mSIsQph)PEm}C`zzWgx6aYkkYGXWQ)h1ztQF%r-BUxj7HgZ^ar
z<tXUMXF*Sb=vZU%{vpXQLy>@cf}-5O;}nGS^q55W&fU8oo0uhbPp}rqC0~STPY^R-
z*SD}Dn|}iKC9?T=@b!38Y`y|pAN0R?@ZE<dGnY@~zn4ek%dpgBI5`}ca_bi1Xq4{*
zT1a<ycZFU0rzAV}ksqNW9O2NPQgD(u$9|fj3@^ZC%thBAdvKO8oTlLV;}Tz(Bd(rX
zeYcOINKF+prtk<WkJE{8@buS#1dxzr6P&h5C}DMUwU2c~;4xH+fY?0eM5k8K9fWxc
zuud5Sqt75pV>Y3ObZ%-*gqYvJ_YL<yATeU+N-mEFAc*M@qam(Fc$RsL%#T%Am2rv#
z-Bt_fBy9oGfrw4VZ!Vy(1gz}dVigX%YjNWWxyS?6zm|oRny!oaan>KwZ+Mn7xe@{;
z@CG;dS~)NRqi1AVCQ%r!?7x&>x2OxRbJf&xE}!pt|9n#AYnf9^tnydKd>Xm@5u{wk
z<#KX#7M?R(6s>>Rn0?e18X=d>$eC9L@XCI*_;{ysiJdm<U#>Bm{XW-Rp}94D;>P_d
zV08BhZSti>8*VA<)jlr)Le{zL`81EGyk*n7H;x1?R|4JKB5iI7bz&Xz<nny-tIbm#
zka-4<$bwiZzK(n3y$C)_@YDh&O+iOIi0Jf0<?H1QG``_^oQGP>STS8afO>l#^9oY|
zbSd%fRUxdl8wb9*tr9icA%ww%DvFk`U;NdHRT3$7`Kq8B*=JO6`n0Q~gew(xmPgqK
z?Zh~CbKC_Jl%^)w|CBaM^RH{xk+zS3wi$woHQe)$7(Ky0%`>0Qsy;X^+fzS}!I;3&
zaTuL<WBIV?sg-4NzZZ>m5i83hGkyOKUd6k!8Kvf4bezr+=XVHcMqMe(`nm+-=#M85
zt7~;$_y;gyW8oG3`cV?XsfC&>fU8cnsZQgo-)?AR9rV!<<=XsjIIB}C*o32(6n~#X
zoVF6XZYBCoWia(hbe&c`s4%yX8XTx^N$73#cec@AK*xrS9x#lwqz*<@>8)H`_ef=x
zO83uHs_OB$1u=Ke$Gmd~M-9~}qmO2An64c}9&vV+d6kSBzr~4(PPBe2VN=QmA!^G~
z8etTd=NVkJwF8Qss?jJnpwE7atz$D8*}agl)z{iZl#9wY!2AfGDxHbou&LwR*FXY(
zEZs+G(}CI_Py=wnx<*}IeL7umt&<cQGU+o5=~$8$mxX?DEAyUjhCbbB9dhH6vP4I7
z+#xSK{lKy_TR?Nzp+ojwVV68l`?pN`R@`J;r?2nMLEa{fZ0*qhN@LUn#NBF)a<tl;
zU=O00fE)g@%R|1n0hP`cQJR?cqAS;NspcG}gE?4A>nXwZjvBAjUcS91_HxT=FXjEX
zc5{B6&BjubHJHsB)s$}3&P8{7z0QMo0R`W;6i3ZC9KokLseIf=NtUznS$TpYKz{-Q
zdK2cCpV4q9GVUeQmM?wenB|^Uj@T<R4bu4BMUL5$h#WFbbL8_2$wEH0q)a(t4H?Fm
vW*2g-;Y$cP$|G9+u0Ref`R1U|viSQmK=5trYB6e1iP}oAosrIR+x_4_KPa3A

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-004.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-004.js
new file mode 100644
index 000000000000..90e376fdee86
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/dowhile-004.js
@@ -0,0 +1,67 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          dowhile-004
+ *  ECMA Section:
+ *  Description:        do...while statements
+ *
+ *  Test a labeled do...while.  Break out of the loop with no label
+ *  should break out of the loop, but not out of the label.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "dowhile-004";
+var VERSION = "ECMA_2";
+var TITLE   = "do...while with a labeled continue statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+DoWhile( 0, 1 );
+DoWhile( 1, 1 );
+DoWhile( -1, 1 );
+DoWhile( 5, 5 );
+
+test();
+
+function DoWhile( limit, expect ) {
+  i = 0;
+  result1 = "pass";
+  result2 = "failed: broke out of labeled statement unexpectedly";
+
+foo: {
+    do {
+      i++;
+      if ( ! (i < limit) ) {
+	break;
+	result1 = "fail: evaluated statement after a labeled break";
+      }
+    } while ( true );
+
+    result2 = "pass";
+  }
+
+  new TestCase(
+    SECTION,
+    "do while ( " + i +" < " + limit +" )",
+    expect,
+    i );
+
+  new TestCase(
+    SECTION,
+    "breaking out of a do... while loop",
+    "pass",
+    result1 );
+
+
+  new TestCase(
+    SECTION,
+    "breaking out of a labeled do...while loop",
+    "pass",
+    result2 );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-005.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-005.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..3e1e3c360f294c87ce6f2ddd74357e174153ce5f
GIT binary patch
literal 9175
zcmeHN&5j#I5FY-CxNt#;+lT`>B<$u#K_YTi#Et`wHU`DsAWo?5Y1^&L&R9L;EO`kY
zfOp^la^%1}AcVx5AgbCu(>3m%aj)$)3CSL8d3w6K>#M4-s;jq^FXk~nYRx!{j=q!W
zRI=0H%^(OyY4j{;_xcY8w+G{N&V$yWdZ!hOEI;}=41!DWR*O!5%%otWnBU{$m`Rq4
zG*O}=^E(Tkh$O1Y`WxiDu})Shl_(JfA`y8hfG*#Qc#?~W;8KZ8*s0lcmP?ULkKTi2
z2HnoE_iev*sGqeCwGb+6px!?gIhQO};-0d2VafXd<VES(OvL>2Yu9esG7H&<3bmGA
z@-3M5lu7$_x`hqV{1asF5zWWlM}u9V`7Ug|+j)5R#~U^>`v>x${Q>z7EH&&6kGr<s
z)FV8d@+wG+(u0Eo<(J`^$Y&u7V>aS3kHT>ZL6R(ZnB^?zrw}ssqWcH?ul<3IwADWO
zx_|Pp-F;;1z5(Fqw>PhUapTLIwzw^z?EW;DJj;MZ2ZgCrWb^X5lLk91j?GjxV+@bD
zAup<;2WcW;;4Cs9@~p{Ov{)+L>|+}hFdb<Xn4B)qXEUej9?E<Ovd$#%`Ztj9xE!X(
z>D0EGV(VXkMlB|7i-gH%My~+59MU7CJ4jJ6pX7lQ)0xRon(|T56|)cp=>kN00I};-
zhzf>A!P4&?Ug5F321YC;FH>sy)3J~-(>Cshnr#<BSSIu#czAS-EL@LLp$v787e$G;
zL5cj_3~+yujIj`;H6ex!6mqo{Ce_}<SJt9S<+bB<{KR;}`bziKM~+H&Lz~<MHlHTQ
zUq--r2;`3O9IBHCM(D%B%y#)%ABa_oaZ&Tagpy;6*H^#kCX7Y~U0jtnXRH4X5+p##
zuZuXp-VBUq*@f{jXIW+o`=7$*sM4uJc*1rWV4E-z-wq=Yg-M!+Gm%4;8u5@#;P@4a
zB!SO3P3Nx+vW_}(17tUINR^>@WP%teQXL+agk7`&=!QH92orj`0DIa-q>|1}&%Z(#
zBh6GA5%<#X@kn0PL8Ti^U?r_>weWM$2obI<e1YJpFxWA8e*ki5-ii)w$r;Iz2=3DS
zTUfqk^93<dL%i~N<Wm6L5aI}}5klmI>7<}SzZz1voG7-mod>Iwfl%0C^_$LpiS4qR
zM70^6UPLt2@MvMZ9awFphkzWhs{=SDf;lu}9i0SqpnCx07NL727@Xs%aCH<E*p%PP
z!y|>tH#jPDw&(`544G4rC-VsUawggoL6;4NqW@8bu5K@&g|5`}7q$RTZ;bA5<(Po5
zS6bun8~%Rys%)#5kZUQgd8s&e?55274B$5T0t@I$&QN5r?EV^uvuxrpv~fXGN1?TO
z^MS6<&&*8ayt`tK_hE5tL3UWiZB<l2Uxp1@MVW{H@46ZG32Zf4oQ~k&0%;r1E}^<g
z!cK_efY=aUAgGM>!fNz&59Q9sj8wQW<jdm%y%)p<J_f^80<q~FOF{QMH`kXVRG5c*
zH1<Ji(kETwwUcNxC@7vrw46k<wX@l=f&2?_5=Svz<0M-oda9~#UAAU9tdN$X;9`B*
zjpk7w{zo9wk2`FhFJ$qoIP9vl@;h(}UK|zo_cd3Dx)!VLN9%ECve9FXdk;P0&VEFs
zbrY}0R_LEBv~nsZBP%BiGO|*->k%i1SYyO>tT9px>9Lw?M?H$3UA>La18Xk$mUX}S
Y{0&6l#tW-9*`*QvdW83YmOJ?V1!Ux?9{>OV

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-005.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-005.js
new file mode 100644
index 000000000000..3c339f493a0b
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/dowhile-005.js
@@ -0,0 +1,73 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          dowhile-005
+ *  ECMA Section:
+ *  Description:        do...while statements
+ *
+ *  Test a labeled do...while.  Break out of the loop with no label
+ *  should break out of the loop, but not out of the label.
+ *
+ *  Currently causes an infinite loop in the monkey.  Uncomment the
+ *  print statement below and it works OK.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               26 August 1998
+ */
+var SECTION = "dowhile-005";
+var VERSION = "ECMA_2";
+var TITLE   = "do...while with a labeled continue statement";
+var BUGNUMBER = "316293";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+NestedLabel();
+
+
+test();
+
+function NestedLabel() {
+  i = 0;
+  result1 = "pass";
+  result2 = "fail: did not hit code after inner loop";
+  result3 = "pass";
+
+outer: {
+    do {
+    inner: {
+//                    print( i );
+	break inner;
+	result1 = "fail: did break out of inner label";
+      }
+      result2 = "pass";
+      break outer;
+      print(i);
+    } while ( i++ < 100 );
+
+  }
+
+  result3 = "fail: did not break out of outer label";
+
+  new TestCase(
+    SECTION,
+    "number of loop iterations",
+    0,
+    i );
+
+  new TestCase(
+    SECTION,
+    "break out of inner loop",
+    "pass",
+    result1 );
+
+  new TestCase(
+    SECTION,
+    "break out of outer loop",
+    "pass",
+    result2 );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-006.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-006.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..7ab5fde070571e7caa03a24269f94f48da7076e1
GIT binary patch
literal 15060
zcmeHOPjBNy6!-FX0U<4d4^SjHp|%T$T?vJXZ5l*SY0)Mu;)L9InwYwFu$?WH_DgW(
z!i^hWfGc-C07Bx9#F;DaO=djLp0PbnoHQ+!sz%9pelzd){>+;<<4!u825hf0VXn9L
zMI4P|_uP5Tah#LLyL9&ZN1qKo9E_qVb2_{HnNHv*>E7=T9p`m;szbX!abw>-3D^M}
z1#ax7eiU*jPkm3EGe7k5SbqV|ojR;2=1{)p_@SR>0Cf1i$HLS<^;yi}Lib!vI!R+c
z9Phmh!wh=eVgLB3vnzh<><SQyHQ>)5`YDUufWtj?gPDf+8sK@+#l#QT_Wk=0bWDl8
z%USD)A)kkCPu*C5oK9guHva(ZHM04n_ju42n=irCd)?0;ee;3N%=(G^bA3d<2ty6~
z!^55~H?;^$qkI+6yl7`<huftNxdfHH@24?K5^(H6>Za@*9F7|s%YHX{X4ee@)s^=c
z!B0&26BX0Kk6!^1lhlpVAxqK<2?Z=gSMyj#1dNbE1UDYfkch-6x`i<J0P7-#Q1dCo
zU=|Of!)UC_!~@8W;MtmU@B5(}Un;pA3@;F|Ap%3x4A^Pv#Qu1qf~JT<2=tyBh?2Ad
zNDCs`j?O6HmJ%?tdxKS2%&x*oGvs-c&%PQ4Qfk^1^F!7TqOWib)4AdT^-NZG#4eO9
zd~I&aA26>F6FNTmmW>P!&ZqSgJcp*9%R%;|C}3_VS8iy|+)}C~XXwoyKLSsW{gFgR
z1Iy(FIGp3W^Kq6_h;?5MUHp1O4CHV#4diFgMV*0YD!h~FZsm63+}a6jI<7vD*w_jB
zwcG(oZ>}&9OS7_zCwKpEb~4z^c=F52;z_IKa_{QR1?5>T!+!w~(#FaCC$n&bWd~Y;
zKqM#|Orauio|Kn0s54t+gP1i1Q8b0BLP^$i3{M~rx%9*W8F#@^N!}y!2RhgNAR3*i
zT(Z7&^DhvBPvz#NQaJ^MlV{Z%yDz66Yy(wi4xDX0<jyDyoMPjFqi=63+Nd}OQCfuK
zTsYGhans8TjP_cR)`n2H!RD1AG_^#@A=ibn&)hJlifGJH(AJ$1z_IUUxT|&pC_RNh
zu2J4a_h(%1AE_DB8Qmo2sa%CM7P!tREh>t3YwTA60BipKn5DD0P%P2hA~$UPh9sNy
ze7BkFP3pBP6Es<cpvYWqE2Z-A7UXRKVp*Ekw=~)ApC16{xH#q(0*gp`7y6vU%so4v
z8Mfw>CkrrKM>$wORAEV~t07ihTy6-51s`1EO%dMUdQI2ihrlBak)vO&eQJ5ISce}$
zO?Dh&6;c5-DFe2;Bn&5hLZ$&CY5}*QCh8QsB72dr@{`V533#h0Z%-a<Rk@5{kCJE+
zA1n}W)x!^FEy%2n+$J7d12uu)`cT;!b?J&|qR~P}m8-18l%Lc?Z&g&LqSDR3iAGBm
z)nZC)QypND)PI3K>&s*752iM?#B%wjA+=lZKF6<+K55&^B3661W8ipy7NqZ2=i(NJ
zYz0eQ!^M{?A<A%5g@(`75_RaFuz-0g0mbr8fIrU5obtSa&d4GXVagTFQr~bKOpzKF
zNZx|<Ln}P4PzFB?TbJP<AV-ry99HM`!0*rTs-8&=jmdi#iiFz0eNsfk#$plCH1c&Q
z^EJ;?_pu(K6o3J9?g%Cdmh*uuvI%FPK5<hOVwFEqB37Y~5`Ql0qov%ao4>P$?$y=>
z7i6<E)#H_=6(%-Cx~SGRE8DklQ)F_Hj0NLEUA0*dvxGTGs&5Fz&2pV<NAc?Jq2O{h
zg!8?wn;3E`?(o0C^1etd9vz^~3+-<M-o#J0Mv=$1+*3G%+`>q;<%jSWif`4MgKiXh
zKAw!a^v-W~#;FcA$!Vu)m4;ieK15s<lWYsx7^<H=Q<J3bcO9~y#*6KB5Xvs4Geyk8
z9;za)P(>Gdfk|kG5T?PFU30{0A))0botZM|e7?%6uUcGbc=`c+YQw`5>{!<to^FoQ
zQR6JQ%?3G}A^RwCwwjC$WtzX&2355AMKR_b!OLRm1&;aYE<A@zi9Fjf=9;3erP}B;
z=P)t`$j=<zqyT%>^Qxf@sVJds{&Uxz!d(|5m4Ab5ZxpE1UO5m{R@`17WNSH(Xv5l7
z;Y}*hVot&cr1mBoY17VQ2q<sMU4;;hIG4hnRkW0yXOj`N{UHIxHgYLJw3zM<l1_z+
so@gm~kxH~;$j6$J%B4g@%_~cD!{`6M1_;dks27zfuU17GDdq_9AJ$VADgXcg

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-006.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-006.js
new file mode 100644
index 000000000000..0a1aa701a68c
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/dowhile-006.js
@@ -0,0 +1,89 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          dowhile-006
+ *  ECMA Section:
+ *  Description:        do...while statements
+ *
+ *  A general do...while test.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               26 August 1998
+ */
+var SECTION = "dowhile-006";
+var VERSION = "ECMA_2";
+var TITLE   = "do...while";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+DoWhile( new DoWhileObject( false, false, 10 ) );
+DoWhile( new DoWhileObject( true, false, 2 ) );
+DoWhile( new DoWhileObject( false, true, 3 ) );
+DoWhile( new DoWhileObject( true, true, 4 ) );
+
+test();
+
+function looping( object ) {
+  object.iterations--;
+
+  if ( object.iterations <= 0 ) {
+    return false;
+  } else {
+    return true;
+  }
+}
+function DoWhileObject( breakOut, breakIn, iterations, loops ) {
+  this.iterations = iterations;
+  this.loops = loops;
+  this.breakOut = breakOut;
+  this.breakIn  = breakIn;
+  this.looping  = looping;
+}
+function DoWhile( object ) {
+  var result1 = false;
+  var result2 = false;
+
+outie: {
+  innie: {
+      do {
+	if ( object.breakOut )
+	  break outie;
+
+	if ( object.breakIn )
+	  break innie;
+
+      } while ( looping(object) );
+
+      //  statements should be executed if:
+      //  do...while exits normally
+      //  do...while exits abruptly with no label
+
+      result1 = true;
+
+    }
+
+//  statements should be executed if:
+//  do...while breaks out with label "innie"
+//  do...while exits normally
+//  do...while does not break out with "outie"
+
+    result2 = true;
+  }
+
+  new TestCase(
+    SECTION,
+    "hit code after loop in inner loop",
+    ( object.breakIn || object.breakOut ) ? false : true ,
+    result1 );
+
+  new TestCase(
+    SECTION,
+    "hit code after loop in outer loop",
+    ( object.breakOut ) ? false : true,
+    result2 );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-007.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-007.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..6e4eae5cd16fa481ce41886a094ae1193b2930f3
GIT binary patch
literal 21270
zcmeHP&5q+l5ccx_FSzY-ZhJt?EI$&`Dm&6nW`Lk!29anvB2V0t@s7t1wzIP%Rvh37
z5I5d|8xO#Z8#gWpi7OW#fE!hIx4WEfJ8dVEv6CDkD{gmnSM^ub)m3G8;>p-!yPY#;
zJG-BU!6>vZtY<9CItiRBYp-|oY5!h-7>t?K*-4)1cy1K${&!?qZ^2U?+Wny&y7r03
z_Sw+0Lpyc@KOyDF|B-d>`c9tK-$3WqELuUBka8W%_1!olK!@)+%#YnumxT#A-@cHO
zj^fbuN4qb=F#Ut>pm%)K+2Qv(JDdom)lZ&3bYm9UUPA7%?M)PVuL3<MxIA+`_RihA
zAF4D3?VUtw9X{l<(Cx7us*lqt)Rg9*KzoVOe0cChe^JtW0j7S?{p`V4@2Qemz99cv
zo*<uxp$5Id;epCGMT8+JUjb@Pu)V#V;8G<yhbRx8j6)VhpxFJ`j@bn$Tmm+h-PdYn
z*Y-TwHR&;gTTJQ`Wz#^9Uj`PV*bd_Xi{cUvIax|w&SM@H&_Z$+>~J(eK}1^C4VZZo
zXkCV2YCZuQ%)&u%7>rb&5(DxRXttu<d#-PXSCTIa%?ns;u)tt7J$4#fp*uR0Mw441
zB=oi%hzjW%NE!%Y(bgFm+>#7txYwY<V0I-+no&-zeD+r}kX)vwzz?OqAAE^>m@2D;
zp;H~|j@YH-CE1%7r4O&m2_2t2VndCBC)4^Bo_h{{IUi&%2s~!{V&{hDOfAK-<bZzD
zk8{UB%x(JbiXiBsnF#vL06}O(a=za!t;2ZZxSK}KYMP?BnLzse+JJOp@LLZ&ebY=l
z{n0QyEe?h20juwt2`fC(&hnV*Ep<bBtp~bV>`egxo8ym{fOb8A)M9VydVy4ejFQu1
zNw4+5Q;WT+ig+qn>UsdF*K0jswb}1Pf^I6xP!EMVsNWQjkc0VB0qD=hm9qdJP5dF|
zCuyn@DM5a545`bDs5t*gHPs+&Y#PnH1ENrTa|8O=Cz!<Vs<GRO6Xk?7xwm?R-k*C$
zn8$E^4QCv!bY6R2Fg%wb_1PKhA0XSP$XiCVB`Jg`E6;B|fRxzC$0U#>P$dg<Uy6$I
zv>#A<$WoBR!>w_M>7Dp0bERpo!I>M8X+W>+F%e~^j~hS?v)m^kv(Jww@v*PT64azy
z3|&D`T<L@*Z<{r8c11}6U8BKeAOR&rD6UkL25Vnz6$C+XrGz(Yq^mx`tw89};4EYd
z*CdU}6{{nzn^iKY5lU96=Pyi)igz-;9%6ZPI~%FN(iwBnm98wU+cNF5JeO#8#`zc~
zjr(pcwQFFlu!1PvBQ;BxX2f!0s_HcSc*nA^_9Qp2W*IvJDWUwKjA!D_@*1a(8_-R0
zB?S7!m5R5;f|=n3udiS<TMS+D^%cwqs>NBLU=HmQ<}pWlym%V$@Md~Y6~(!9NCQiN
zHBE4MbTys`rNqmF@}nmO!g%t|Yy$04`8@XV8<vIB$(h#PX@1OPxMAQ&?CS~E9_rYx
zcWN>aR@vr4SvMd>y>;UgRb`QW58_mI(LFrKNvUFciX)vY4Ol6Gkk}LEaB2hzD&H1w
zE1Fma<!s7&;@T9H9tpXKE2VOcw!-!OCfJHcy4cM+*b3v5{l-?LZ?v@7R#bCAYubuc
zRT@0vR64{rS78cluCV-@%~c#`s~t@$D9jupru*{L?hXje{MT$T`SapG?Y^q2S~Duz
zT!k$-P>D6215JVig++^ZxN1k{)+ubwmASqbYhD72gD=c=?MQRrPr{?$LR>+~iW-~(
zalc*ki?zxAy%qTE-d1^Rr5pH;i`jgezGa9p_at6md+-*o53eg)Ya2PpzvWb-Nz}4b
z*so|eL$nkIpt*e%woY8>5N*_~UjUEI(yaJ0Se9nN8?7#s`N(xMt&YGj=hLTB{V57o
zHqh5L#!90SI{lrpEDf?pnnU-B+M|EK7&XBjW$yo0j3p7Rwn!T@SEWL1<;`3h7&Ho$
zwabQU;y^2E!~boF4Sx;1wDh!g8cf2C35PFD<<i(~Fa)(y(rsg`vZvYx1~U%|Hs2X#
zrR_50n)qOWA?LU0>99@-q-mcS!{MPdB?aGbOW!bI&Jlc$F5<Vl_Bft|;+`nHNCI#_
zL+9JjU(|Ku{;YhRhkw8c7oN9Ge<+7Pp$*INHqG~pc#A$xNJuIleIsp3){VCn+85ql
zf?^GYoFemfrO1}wM@FZTXuL&N(ZieYXas?LQm~P4AP2>K1Mxn1gQh};x8U+9aWJJ#
z9ZL37N0V(teK^g6&!+KKWElgdGTOo$W_+M5t*cGZ3nWme6unAVm{XmJvZY8yZ&3aR
DTALMt

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-007.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-007.js
new file mode 100644
index 000000000000..44adbcafd988
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/dowhile-007.js
@@ -0,0 +1,97 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          dowhile-007
+ *  ECMA Section:
+ *  Description:        do...while statements
+ *
+ *  A general do...while test.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               26 August 1998
+ */
+var SECTION = "dowhile-007";
+var VERSION = "ECMA_2";
+var TITLE   = "do...while";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+DoWhile( new DoWhileObject( false, false, false, false ));
+DoWhile( new DoWhileObject( true, false, false, false ));
+DoWhile( new DoWhileObject( true, true, false, false ));
+DoWhile( new DoWhileObject( true, true, true, false ));
+DoWhile( new DoWhileObject( true, true, true, true ));
+DoWhile( new DoWhileObject( false, false, false, true ));
+DoWhile( new DoWhileObject( false, false, true, true ));
+DoWhile( new DoWhileObject( false, true, true, true ));
+DoWhile( new DoWhileObject( false, false, true, false ));
+
+test();
+
+function DoWhileObject( out1, out2, out3, in1 ) {
+  this.breakOutOne = out1;
+  this.breakOutTwo = out2;
+  this.breakOutThree = out3;
+  this.breakIn = in1;
+}
+function DoWhile( object ) {
+  result1 = false;
+  result2 = false;
+  result3 = false;
+  result4 = false;
+
+outie:
+  do {
+    if ( object.breakOutOne ) {
+      break outie;
+    }
+    result1 = true;
+
+  innie:
+    do {
+      if ( object.breakOutTwo ) {
+	break outie;
+      }
+      result2 = true;
+
+      if ( object.breakIn ) {
+	break innie;
+      }
+      result3 = true;
+
+    } while ( false );
+    if ( object.breakOutThree ) {
+      break outie;
+    }
+    result4 = true;
+  } while ( false );
+
+  new TestCase(
+    SECTION,
+    "break one: ",
+    (object.breakOutOne) ? false : true,
+    result1 );
+
+  new TestCase(
+    SECTION,
+    "break two: ",
+    (object.breakOutOne||object.breakOutTwo) ? false : true,
+    result2 );
+
+  new TestCase(
+    SECTION,
+    "break three: ",
+    (object.breakOutOne||object.breakOutTwo||object.breakIn) ? false : true,
+    result3 );
+
+  new TestCase(
+    SECTION,
+    "break four: ",
+    (object.breakOutOne||object.breakOutTwo||object.breakOutThree) ? false: true,
+    result4 );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-001.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..8ab757348fe2a72cf382c4fdf4aaffb7d1fbe7af
GIT binary patch
literal 6518
zcmds5&2Ah;5FQAGAc4dQp>UaFP=uUFIa!M(yjg@Jvx(T1C4^Aap6T7~q&+iq_t-Iy
zkPCMnfrsD#N1lKqZ<4Csp6S}1@otYjHa{1yXL|bUs;{fQs_ua)3(5Be3(nHLXDXj7
zb`rfEMbUAdo=5u!<0q5dNs<>l8tm9_22yCV_vgn^bO*i~(CJ4^33e>`W1dK+m=Sqq
zp;G^>qn9E}SF!#EoVT`N<;p^dG!mIGH2_`yAmy16Gr^UG%h-uGS{o&@`QCf5%w#m2
z9y}cncHFzcjsu}s6Z`$4FkCTd;ZB(>8+acA9)Fea0)74b!GniQ)Czsa@-}db-hzpz
zOf^5JMqHB5zX1CN`8*nZJL!whcfs@*`r-3OO=51I$J;>S4e^M6PY<Stqo&_9AOfTE
z5u$NzbUe#d{DhsdNuoqy;)!8d%2XPUs+iTgaXe&Fj+Dw<qVWo(k6smuYYlk;s~Ua+
zxoO$t_50Q&w#N8RkpBei<39B$Apt4>J|JkrltD(C^wu6aSc=|{3n-?}1*YaD5}{jN
z4{+uqz&cZ)N?(Iqb2ZHm^Lf)Jt2Do~Men}Im^$}<MW{m{?jY76u#(SAq{MvT_0`E0
zZo_@Q5GCmvAOnc#TgcJD*gLo>DgvzAkj^#ovK-Wp*A{+P&!F4D4W{MuP1WsRZ2vo8
zzv-O(UzJ&cRh>37m@UwOT-X}Xya))BO~g{DeVHdOy^3z{&VKtKvYEZoo%yWyP#7Fr
z1o=zQ@Og%+<pH|L#uq-Ts850PKnW>ji)>S<z^eEu_&Q@k@^m-O^0;o>VzW^BS?0}L
z&&leUuIah>kC2IFuy(oWEA?$$N?CQjFsrUr6%XsbbnaB0dqOZ>jxlzl1@s*f`tljn
zA1Qu<|Ekjjo!mLje}@Gyg!_o|-Wv~;oo|>~G|65k&>am{s2~R~z^Un4pGxNpnMoEy
z$x6*_f);QFJLyfVtW-38p$2r`zaxl{zV>gze=K>HaG#lL?WS+KZ0Y?2WE7QjC3gNd
zV)qGnRxqtm>`>tNnHRj~CRR~JH}jvPqJva*OWMadtzo$N`SA;$n5a<L1Do?Y%_tE8
zl`0@N0#NWi#pKIscJUrndsY9oH<CSR3cUbAFPG1U+$`H7o{r&`Wi7Mr!gn^S$>D($
zhuRIMly?@A*F6f!n4b|1!6@nL^oARZr_dqOln>{*rR7&x4-3bNDh0$&@OkJOj%(Kd
z8Q9XnC8RB}_dbii_xctK9g}c#^wRhWAasieRoO>T1C7RrihpPtcm>FAYENwrU;<Am
z7q#I|Wh&F_-(`x^g{Y7KV6C+E6!&rce0hjVExUO++_R+za3{MeeaqKFR+v(?%HemQ
zg>W8=s;l3&Q=e1HX3OXXTGQK&wOls1k#@Zykd3QbH+DhryV16QAQN@-vdxV)58`g1
gz4E!iEq7kajkAA$29}YHis?(yxskN)#I$F~8xpiaoB#j-

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-001.js b/js/src/jsapi-tests/binast/parser/tester/exception-001.js
new file mode 100644
index 000000000000..987ba0af888b
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/exception-001.js
@@ -0,0 +1,45 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          exception-001
+ *  ECMA Section:
+ *  Description:        Tests for JavaScript Standard Exceptions
+ *
+ *  Call error.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               31 August 1998
+ */
+var SECTION = "exception-001";
+var VERSION = "js1_4";
+var TITLE   = "Tests for JavaScript Standard Exceptions:  CallError";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+Call_1();
+
+test();
+
+function Call_1() {
+  result = "failed: no exception thrown";
+  exception = null;
+
+  try {
+    Math();
+  } catch ( e ) {
+    result = "passed:  threw exception",
+      exception = e.toString();
+  } finally {
+    new TestCase(
+      SECTION,
+      "Math() [ exception is " + exception +" ]",
+      "passed:  threw exception",
+      result );
+  }
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-002.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..2a03114aa34971b4bab34be4985c222a69e171fa
GIT binary patch
literal 6710
zcmd^D-EQPG6b>w~%b&y@E4axe2%+vGE>Ja8+RhH5t1=*F)EfjVH}TAPn<iP?X}3H8
zmvGNR@De-)m%It*Bu;#0oSAVtX?wv<(~0BHKA*qy`Pc(p<Ox3*EI5k~evsK*vh(2e
zAP7#g_$oL&8b6!tPoga6!C<faW{?P_4}SYF2p+&!1KRzBNx@DN{**@vlT3>&Eumuj
zTLot#jhC_h1)SHmVP&#}5^*3>p&I}?{87wPEoOqt5-w%ucG5~qk<Jh9!!VQ4aC-Fp
zc(7;Q4fYHO#hR4g9}CSTOG>y4mJ|-&`+&z^MLfq?KY#S-3m3IU-z#|=m_hGB#|tLi
z&*>zt$>%?SeT#gajDDQ-#pjza^%v^#^DkXuZlA|@fW%wk5#yd7O^-)z+*A;rs{9Jk
zxY8<|WioumF4!cJBG=(WvovNh4o9_S)qXh4QV?Yk>5-IKiz0U*e)KArTq(#67+Ldk
z$j_2d-n?&3<RMEE+qLWw!7FalkCNh%_HP3rN;9dE6_?^BLIX?D?L2k~0S(oJz~sC@
zB2;VW9>IJ7SeFu<>07XDE~nXXHg{tx-R93W1s{r($txRIfL;U!4~7jUoA8+qq?j+P
z#~RDRRQSveL`k{<NDm_VHggOxv;l5Xg~#kRq;!K^Z3)fK8<QVKwp#|h3kZ!-Jb%2N
zr8*cY5399Za%lG;-hd!<X9xJENF&_dX;p(M1Et8?8i_{lp_Q%dQoO??i_R>O+iSHm
zs8VpkOSRfH*W?Mf`8-AcvH)ES<ZG)O8j}Y{Z$SjGnG{Kjfm0~YJ@R9Kn=z5_ct1?D
zuqom~y^z^uYNuHXdi6=iv|QMALAmnH``q1;i5p@QvKuRnZCoTtT?a$2X4hKfqyA0%
zPUV#)1SNQi+6@*^g(Og=&tNA?#INvQeYT*TyXzb%N7nxzIv?{(E4v<QBs9nGm|nPQ
zs8`l`R@>LonvwG&;5F;I+LiVhG94|32`dyYog{~&<9Tn^TBe~J6P-Y3p`Cz~`x4rO
zzbtqf@s+i-&SC4slJ393@6qy?M1FTh(z7c+gvfHH6uL4xF~79V>@H%hD!Q0=M@0uu
z?RLO<n$gV`7e70F!6O~y63cdd)ub6E!edMI$PEt^yav))we7B7qk65HXM62yZb@h$
z^bQJ!YJzQ$%*X5cV3ZZcG1pZQ$Kx?v4y|O?NAO*l)#SXxNkHurUK+J)W%hfIMzXvg
zpi25WaN+{v!Fk9O<-<f?(()IKha1R}D|u+g`v`XfC(Ijw^sGHmX(?D6ZnvL&8vbNG
zE)*&xl50`62dP_(sLmUzT+fN4s=}Y$3GM*d&GG4+J($?EI~k{`r`|lPG^Ydk8c+`q
z*BW;7jB(AX2;e$-+5W26Lze48wp!vZ;D_&FS{qATdrmd&ZVhP~TJzkrwOo{#mUiPI
zkj~Y!X<L&4rnOBKq@!{#3Qenfe_$Hgw?Nal<-V?3z4GrLKsB;a(|s*EH<H$!nD#XJ
E4=f~v8~^|S

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-002.js b/js/src/jsapi-tests/binast/parser/tester/exception-002.js
new file mode 100644
index 000000000000..74ce79a96b2d
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/exception-002.js
@@ -0,0 +1,45 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          exception-002
+ *  ECMA Section:
+ *  Description:        Tests for JavaScript Standard Exceptions
+ *
+ *  Construct error.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               31 August 1998
+ */
+var SECTION = "exception-002";
+var VERSION = "js1_4";
+var TITLE   = "Tests for JavaScript Standard Exceptions: ConstructError";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+Construct_1();
+
+test();
+
+function Construct_1() {
+  result = "failed: no exception thrown";
+  exception = null;
+
+  try {
+    result = new Math();
+  } catch ( e ) {
+    result = "passed:  threw exception",
+      exception = e.toString();
+  } finally {
+    new TestCase(
+      SECTION,
+      "new Math() [ exception is " + exception +" ]",
+      "passed:  threw exception",
+      result );
+  }
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-003.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..f7fe5ad49b047e9d21df6a68485602b5fa80e5fc
GIT binary patch
literal 8413
zcmd^E&5qne5H`Po0|JQ)0!1?6k_gBq3S2gmk=V%~Hd;*(GujJ6QLo)I<HT#5c6&F&
zL+}8ccm`g93$MVD$KXa)yX~%-_RO^BXBWg}y`FYgcYXcUSJmAeS!6NqcBY(#-ET!Y
z5$xQ1)$_cwG@N-y$Ac%s!(otS-0K{uZ#r?5%kHl?J?|~}szbY<G7+(}m_O!0%mkBB
znkZADdC$EUQ4-GE`U~v5vd&g2l&L86q9l^F0XqC~$P*cjBQBJ=gq@p7=Tbz;q<aH~
z8TNal<EMkpf&Q&?pp8&lL-qYhB)MR*GIzn^!m{@c*yAq)o}sUw-@Es~wpv*~P`GvU
zpszv43nuK(=_EG9^G~pSg?OI!zZ>of&o^M|&-44wzOaG0dK_;6h*yLo`aL=xo%C(L
zDIpwL`6XK8xy=1>D*Pwxf(-)^Wzru?mV``%e!t>ue&~;wm~hz_B5k1K7O3}MW`gHA
z1O^N%`8foqf|J+3H%4)f#j)wCdIazjH?c<%aftc10gYTTArTTA-`YcMmRdLS*v17^
zQ|$skT_6y7qw5aNya%=}1<2Ajpx0cC(vx&z`=q4imnQliMF|r#<Clj*1nLfI4GJ6c
zvGhbVnHquBdWCWDsTqiZv<H(8K<rw{(LvuhxQZ1Hvs)3*wdFD&)USJ^A9}W31Yx2t
zRpQzG<q%b#P;MBaZ4*G-d+<7VAX|t3*F_RwVyE>C#tRf7ORFR5y#rBJLraYv#cA-u
zpt!z7`}uuOMfY5Zw&8+&1v)-SP`QkOHq!CP(1!Zt0MMI&H>8mwZjf$j$}u&51m?yp
zig|eGC#hf8ZoZs~^fEEitk}Hxq+=Q^%(@^~`RWXJePCiLtX;N!rM?Y{IIhZH=vC*d
zMLeo^+IJ*o1`rIGGvux}h2kTI;(QD_D2{%D|Eeto?cAE@e}mZKApd=ym$`P$y6{Uw
zJGCX+RcV2dRz{IM1C^_u!Ust2IiMZm4&`bZ*@pG5sAAFLlM=(YZOC<f(e^l{Qi$%Q
zXU};cy-Z*^C1;J~b`(4pA~=}B<Ra5$Yg%DVG2YCp&3ZXFfJNR>n#P<pC^Mb6gDuoP
zSR0wjS;iZPsLi#s>IQKIb@il!Y)I=~t8LQWRtQDoO4(XLSU<}$nj%UMtzdd}Al6+P
zmb%AeFzv;x$hk@;8Ju68@2tvGGG%jaZqjYbyHm({mKtwJrXl~a;7PzucV(K_b&T1s
zD!6|Ky+g^H%LLa~*6g@O`~W=5Se|2zh;<>qG<BlAh!v~oVqPB<Eh@Z!iGn!9hJ(6q
zro+pskKJer)gkn<d_Uo`+)wgw04LN7k@X>br=q$P)$SrX<;*J1RZq&j*7frzP(Q07
zsTHFHt%|L|-l|izQHC9SkL3;7Tfx$UT|RE~=TymoJI+T*dpPO(-<m9|(rSl^{A;{m
z!FVV`!GGi@pu}ar+qb6Ctve5GHKrVP9OAQjh`Uv>3}flC^KM--){XX{O=0Lb_{a9(
zx9|Ahn}p*>x$icj1Jl=Jhb{cTYQX=&ZK96Qv`fQu;T@1zRWj^8D^$R0%XF?ZNdSgU
z#j0zcHN)YWm8RgLaXu%NKlfNB3(=UTeuId87pI$>i&bl<M%t`PSKZch=%AY#&d_y>
z$_47yik?T)Mk`V1MwEK%zEZa>2@cX)Yk}dpZf&9y>6qKsPo!h{uVvFdv(|l@YaQLV
j=7OlKAJpGJ01L!pk4xB`wDn9^<Glh=Y+A&uIcEO><rBGO

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-003.js b/js/src/jsapi-tests/binast/parser/tester/exception-003.js
new file mode 100644
index 000000000000..7bc02a627920
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/exception-003.js
@@ -0,0 +1,49 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          exception-003
+ *  ECMA Section:
+ *  Description:        Tests for JavaScript Standard Exceptions
+ *
+ *  Target error.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               31 August 1998
+ */
+var SECTION = "exception-003";
+var VERSION = "js1_4";
+var TITLE   = "Tests for JavaScript Standard Exceptions: TargetError";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+Target_1();
+
+test();
+
+function Target_1() {
+  result = "failed: no exception thrown";
+  exception = null;
+
+  try {
+    string = new String("hi");
+    string.toString = Boolean.prototype.toString;
+    string.toString();
+  } catch ( e ) {
+    result = "passed:  threw exception",
+      exception = e.toString();
+  } finally {
+    new TestCase(
+      SECTION,
+      "string = new String(\"hi\");"+
+      "string.toString = Boolean.prototype.toString" +
+      "string.toString() [ exception is " + exception +" ]",
+      "passed:  threw exception",
+      result );
+  }
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-004.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-004.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..c8b2db4aad276c6a2ce96e58306b214ca8c2a35a
GIT binary patch
literal 6792
zcmd^D-EP}96xRONVFPxzVY?A}I}B-o0RsXrK;wE?iohLaBR5@9&=PH{QACZTl4cLl
z2iQaGCHfS@uJ$H7hoZ#eNS5hXZU*cojzsYz&&Th4Jmf$ZdCHFlOU~k>pQTtxb`iWA
z1i?(i*TM10_{rpO5{aA#g9G!;AWf7$`umF@_!zz#(C%kUCTy1S$2>}zWI7R<fr{O;
z3eJ-(Ud8$caNgO3C8U8$;vmTqT?5eJPhy_wWS($o;4*gMCattgvc=IyFwA5$oSr-#
z4-V|R!GQ&#SQGR8X`;Dgse!v>Y0<#@4Dk4?i02sVw+|kC*F>$*4-9VuJLr4R@si2r
z=X4Uc<nu4Uev5pbjeeQ*#peew^_S}5i~j_V_khH=#3RN%J(-@4x&`5>%I^`4E3Lx0
zkl_<{$tICZave@I%VH+ua8zkl9fni!boP=*dL*T25#$c~9lgpWR|--C2G;xn($f&i
z>-VjBJY;F=x|$vlyy7nVXp(qj{XO7AX(lz2(qy=fu*C=5Ja!2I{nUoQ<f1?#RBPxS
z!F&!_R}zfrCva>or{YvBnlTx(`J+w1$4SQIwTml2D*}H9zXp#@`CJDwSuCB!TF1gn
z_{I%HmtYT&9z^u*<rrY-0_;+S$Lu;Xx<)Q{g!*xB^25k>%b-sHq4J3r57(1a#X{BL
zq_#^6?H<GX5QE;@0Ddg82sd|H(_qFxA+okYqS1RuWfQp+?l=|Ex#Mwjq4ow!6rAr$
zp?1q9c?4d*$k4qUz&7^rgA)#o$%CQ~Ap+P+inPVPDU|01`8B}JS(5VjFw8_)S8$<T
zN^zCBX;yl^`Af%iT)1^Xwes#=?(WFM?XV8H87qx#T%>7L1VgWS&$`J+^-TLt<+URO
zB{)Ov21_VGQYg{qun(ol@9<xBu%Ml{*Evv*tp7iBek@sZ&S@H=69`ks1-ZoSTwk{m
z>yd1@R&yb`mEoCbX5HJ)IhA4>zvZU5q6KmYg{jqH-Rw&H44ICW!;}?@8;8o_JbKZa
zW1IBu=4WdGp8-{U33$SPD|i-hXH5p$Ig+bB4c%`*Jt&}+<heV8>e=nTgvfHH6uLb+
zJil^|-(18>Ra8xPN5vLiz1^|tvDlM)c;tqM2jSh47NyCoU!!WR>fiQ?+FrfT6{Qzj
zFqD_4&^{Pt`FzTCSsU_r3^z_UGV3e&&SW(?MR5{P`-E3!x^2bxx<?}!^DE*ZXc2uK
zV{w7;I6h>G@?j%4wEPL<VbQ+gN*>zrJ{a!d+`0!y&z%;P2D|pN`!go*KM$Wdj|&qO
z63JPLsm44=-C#sj22xbdiKD8*=gkT30J)vx(>Z%E(X~5Sr>Ul1|CVV^2cl*I1gtfn
z9w2TtZ1;?D&B_Sij(XMp%GX1d>q53#;;-O`pJK$;5?j;Nwzb@%*p_zxu#M|Z)MUiQ
zt+j1iqjTHZD2?s=Hcb#f)x3PPt<6gb+t9uN+QtocfaThmzpsI4B+-ZLPD=aZr9DUf
E1-=}goB#j-

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-004.js b/js/src/jsapi-tests/binast/parser/tester/exception-004.js
new file mode 100644
index 000000000000..41b7ac3aa4ec
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/exception-004.js
@@ -0,0 +1,45 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          exception-004
+ *  ECMA Section:
+ *  Description:        Tests for JavaScript Standard Exceptions
+ *
+ *  ToObject error.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               31 August 1998
+ */
+var SECTION = "exception-004";
+var VERSION = "js1_4";
+var TITLE   = "Tests for JavaScript Standard Exceptions: ToObjectError";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+ToObject_1();
+
+test();
+
+function ToObject_1() {
+  result = "failed: no exception thrown";
+  exception = null;
+
+  try {
+    result = foo["bar"];
+  } catch ( e ) {
+    result = "passed:  threw exception",
+      exception = e.toString();
+  } finally {
+    new TestCase(
+      SECTION,
+      "foo[\"bar\"] [ exception is " + exception +" ]",
+      "passed:  threw exception",
+      result );
+  }
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-005.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-005.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..7bb22fc467a9c75fc8dcdcef3e7ce6f17305f212
GIT binary patch
literal 6792
zcmd^D-EP}96xP=Lw8IAMZo_&b^mZ810viSdUVz4Ru@r$j%tmgyqM#+(R-=d-NhQr5
zq7TrA=u7k|hF$GVb`C{}$B}H)v7B7&CXPh$BhSb0d^}`N7kSDLdUMX=gWsf>Np==|
z90b8c#FxS0(eT-5e-w$F2faP>O)pK9KKSRGAh-)(^=S7KCKEPE`4b+cOfsE_%s|EN
zSp}y_7B6D`3pgLG!xGX!C2^2siLL?Y@JBJvbTUo2G;kR^bCXtDCfV%Za~Nhc=#P({
z4|{v|U2o5VP^^*p{y5QGvedwxv$Sa7eFb>@O~iAI^@oQKe`=yu=zE5@o*ncKbUbIW
z`8l1$HTnD-uy2shlfmz!uK4^Erv6$zdi7(In49PE9*}rLJYwAAqw(>e88;P#rz(F&
zG_JG?r$UC$*f|?TGRbu~(kzRajKe{tS+yUI#q-H)9_fLUqD7Ef@IH8xORf~81`MqE
z8KkEnl-KWD^SIB_)O9sIB6!7J_EAnevi=_Mp)`{kNog`%M`&Rwx|_!~A)uey5SW}5
zNQ7z)-6NQ<0qa77G5rdT&E;4ei&--!V>a*F1bmoeOkTRU0<<FVckpZQ*pyFoAd}hL
zS*&#|%!KdVK$N5%Kzb0-wU=Xnp$l-8Dm-SlBBN{Ma!05icP2lKY`YBl0uU;nc=c#G
zNmVRV9ZqW7q|o*;d;&4(jSb*wkwv(<)0ze|1`3g-6%vi!Ln`aYrErI-h)x}k>kG9H
zP@>>`7Yem&F3Dr?@>z!N<p4IZk6)Z{XiOdyeFhQ0R#K!b_D!KYH^}<{H)To6<NYub
zVO_z6dM?F9=B8Qc`RXqn({bU}1=Y$|?{c?CCT@py$jw-3Y{Mc=t0EYB)qB=eKB{Nh
zcPuX*At=EKYB!ie36esIK81ZKP5y%as)GgXyt&SSa%BDgq4Pt@qEk-O5S>7nIxfg1
zZs+>4l~|8t!?l_Uv053PnP%3#?VM97rtw>DiVIpGhftVW9oE&Zv`?SuXx>j*p}29V
z9L}R>ojJBi@74TlEZ`HMsw)AH_@4#OBJQloKs!fr)u*BR1E>cDw2(ZvXHXrx{kITV
z&Xhv8M~CMZ&heXzSgDGt>Gr7Dz^gYqHa!tLau1K(@bDnKThgL5ndNI#tyTToUQyet
z7rLVKVhe`y@)X(!qb#3~xh`u%9uMKh=}KmO2j7{jCZ{M)0&1V|!b~@<_}+GCBtw2d
zJOnMGt79xKFdoPIOi?~;<c5~_Fdi1|3$Em$9q)tT4$iGRfb`sHQE9Mizj!cV^1;jS
zh4Z*DQ6Z6>rI>2WgVZ%fRAnGV^_)1WDty_T;1-aZIX<1U2NSDyC+jrT)a&0e&FMhY
zOn`u;2Gjw>wT4|iV_dT`0=T1Iw7>FopXIuct(N!)_~Dlrv9-k3bhT|Qw<xxy-9K#O
zvJ*8Kv2kl{+m`6uwl+#*`@T&R1W+|EA8l*%Qo=U0Z-BOO%^hI5cINL}AR0;ZA$ujI
K-SN_%BmV){R-c^!

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-005.js b/js/src/jsapi-tests/binast/parser/tester/exception-005.js
new file mode 100644
index 000000000000..152aebe4be38
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/exception-005.js
@@ -0,0 +1,45 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          exception-005
+ *  ECMA Section:
+ *  Description:        Tests for JavaScript Standard Exceptions
+ *
+ *  ToObject error.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               31 August 1998
+ */
+var SECTION = "exception-005";
+var VERSION = "js1_4";
+var TITLE   = "Tests for JavaScript Standard Exceptions: ToObjectError";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+ToObject_1();
+
+test();
+
+function ToObject_1() {
+  result = "failed: no exception thrown";
+  exception = null;
+
+  try {
+    result = foo["bar"];
+  } catch ( e ) {
+    result = "passed:  threw exception",
+      exception = e.toString();
+  } finally {
+    new TestCase(
+      SECTION,
+      "foo[\"bar\"] [ exception is " + exception +" ]",
+      "passed:  threw exception",
+      result );
+  }
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-006.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-006.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..6413d212c5b6e39c3a490590cb5c06cfdad69b46
GIT binary patch
literal 8294
zcmd^EUys{F5O;x6cmVN;K$ZLms!&>icsPZVxHJ`4g<M6#y&zQW*_&ir$9C77+@(+b
z2uQr~%17ZtARhT9%s6ZBB;Iq@mp?7=a=v(XXJ>vp^P8D<Tg}plAGar*g~v~1GL~%W
zz2$k{MG`K&lhgj=!O<W{Qtq`|`J8qnGIjjRUC(<TX0_?^b0!75i1<SuL`*Uzk~kL?
zn%|lCT*Tq3tiM6dtxd8LnTrykCt{&W0d)J*kjF}l1edwEm`#n+nUW$NAK!s(2Hno^
z^sL`*>38jx7D8nW^7%cXxMWc-ZqA}vMcxM>k6#5mMO(kPfB);M)IxeI$E~e5eH#|e
znXFEyO5707zd-f@@jUPTFxVBIw?Xx1*@LHFRe?D?j<*5C1L25v4^M}^Zq;t;5RP8?
zB}(I&%KT9x{l{$127wf*@&}5=A(NrsEqpdR@`sC*ccn}$&bS5U-K$jcEQ7FsO%<O)
zXy#z@^1U^NJ1mOK(tJe#uegakiibnQBS~e7Nriw^(Jd|1VySea$2KM)mueH39M2Gl
z%xb!WF&}}fO9`a(9k4Z*!=#stt2X6C^PA0iPejb*!r0{@4FR_UR|CIBe55=n#uG!Y
znyoMj?wO4!NP7_J0K~3&91Zl1fpuQtpj}Ngmy(y+p!~Tv_e0CJiy+K#!{mt+Q=!D1
zKYegLPK7ztL5#O;6Ghvb@eY`w8gsy-SsY+)rzH&r4b&mm7D&{32XA=~#C^XwyLiR}
z3qes~Cs7hSHz;nd(*6Whan?$ecEbbt7RY=YBYhbGP59#*<2KZ$hY6L3$|gAyUMi88
z)WXV@!->d<8nCLIX7fSEQ&7n=!5U2qVa1bb{$m}NLh>7lE3aVuQaeqk=#2A3gyl}R
zR*t9-X+nyiC_ioH6&kHSsfGq2<1`pZygmp2$4?q_M_$aIjY{~-9-x4e!uVz$wC*RU
zqO@D9^O<ee9Do!ZlFo`1O_`B>=;h?K5_WG^yf~27yKu@-WzV7wiNmpP_!PvAn230I
z<j09$HnzT+$mBA<K3Z&1^RELFJB8BZs;$)B`m-o%Le6yUP%aD`V<~ZgzUxh(GmGHn
zVgx06BwoUQ#eEB1+_(bhK}JQ&|9|-T9-5Ipzcik_gMPHW+Oq}H>(QXlr1D%gE-Ow+
zE(yWaO2=JaO4oFl3MQS1%`%?za0>T@)18&nd682e!i^*89Ab4>ku=~hW;_n~nrHE{
zE;Ba-Ioy9h6j$o_J(X#PPdguj&!jBNFzsNf;g=@$R1dN6D(X$I4~hm!quJHg&H5sT
z!*hrY2PsHno7<)0tjeeT)?*K)ELyoNhkINtn|B`e;fugpWPJkj@~9>^U7R?bU192b
zjfv#<9TLfEZa|9I)m0-NFkYE<SVr;CmY1xAjqFNo;ov*Ymv?(e=X((8SX{RNsTioO
zxa#@rbN`;d_Tnc)e7?wh;)fb{>Ua)FZ(ye)EU8pSYtYsFpQ{RPA+lK-pgKDsQP(MH
z`YBW|pUc>%8@V>vI}mZBZR<70Gh12!9~M_RarwH#QZ<uSo_qx)i9LDo{nB2>Y7(^u
zxE{0Ijq4FR<LJSf`v9_O<x`{{yCx3wsLeOX!mRrBNRL*pl=Xl;JL*B}{gWQs@PTJ}
WzWLu@;V=-(tq-IY_U6FZgXtgI*pB)D

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-006.js b/js/src/jsapi-tests/binast/parser/tester/exception-006.js
new file mode 100644
index 000000000000..cf9df729c827
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/exception-006.js
@@ -0,0 +1,56 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          exception-006
+ *  ECMA Section:
+ *  Description:        Tests for JavaScript Standard Exceptions
+ *
+ *  ToPrimitive error.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               31 August 1998
+ */
+var SECTION = "exception-006";
+var VERSION = "js1_4";
+var TITLE   = "Tests for JavaScript Standard Exceptions: TypeError";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+ToPrimitive_1();
+
+test();
+
+
+/**
+ * Getting the [[DefaultValue]] of any instances of MyObject
+ * should result in a runtime error in ToPrimitive.
+ */
+
+function MyObject() {
+  this.toString = void 0;
+  this.valueOf = void 0;
+}
+
+function ToPrimitive_1() {
+  result = "failed: no exception thrown";
+  exception = null;
+
+  try {
+    result = new MyObject() + new MyObject();
+  } catch ( e ) {
+    result = "passed:  threw exception",
+      exception = e.toString();
+  } finally {
+    new TestCase(
+      SECTION,
+      "new MyObject() + new MyObject() [ exception is " + exception +" ]",
+      "passed:  threw exception",
+      result );
+  }
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-007.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-007.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..163354107106e1edded8bcad68be50472d9f090d
GIT binary patch
literal 8695
zcmd^E-EQMV6!!A7{7C#<B9M?TK`Yc27J;fziKGF#%BE<O_6DKV)Se`>>)K{KX&WAe
zTkd%PZV`9901`L63FkOt&q+N^#*LF*;HGXo_BZF8`ObIFj9Y4&M*N^P;VeA(RwiS~
z&b=2r&pS)Pnb$t*KN#!}f+Xc$YbSrE6^Tq8{PDi$y$(;c=<BCU3U(IpLmos-G9{8Y
zhYHQ_%zG;0a1rZoz`3&uE0H;r2t5%CRRYlIk3t?RF%n$na4|bKMrTTjczo~*Of%?q
zhDXQ!){ef{+R-2sYmh(R6N*a~<!~1)npW`M06cyb@DzRhXm|IsDr$kglgF*4Cw&oK
zykN5WI5pyy@%$68w;0dU?xR6d@q8Iff0FGzzF!T@_TzXLg1DtPqTj=#VXs^Dn-ap2
zmG=>iXDahYiS!?^3pNO(NR>ZOEDo6r{cge8Y~S~Xvy^wGOe}2Ne$fBg9(iAbsoE!B
z_fH<SyN?<P{9Qo&WbgBjKi#dutr5!ZRVsOwfyBT9Dt-<!mlKnh_pN%^VNqmW&EE*%
z7B?zJx#ggq7_dw+sgPVtJk+oh-Po~?3s{%53rvou7>La3x`Q)s1J<Pkf&T_7AD6?V
zmyD}E<)ZzQO$gc|W^!iy@=(&DPD0&-S{3n;@}w9~OsUe!kBV~7OhkjU0Z4~HG+h(X
zLEku7^4`J<2kVw7V~ISktmRM3L}r=Rp&xp-UIx7h2#0*crja_ue&X@o&4DWXp$vIm
z{CElcP_;$it7#lyqeS~d%o=FwZtOOx_YQP<72qDuj?bR(z@ktTtQ{r6Q^SVUE${DO
zDn7N)^4@Ymz63QN$EaThppJliVQ52rI!q`Y8k^*i@KTA&q-IvJ98N?=%z(Gb$7~#Q
zTm_ZPyA@+;0aje8<tNL;6sq4yTzQ4$m)2=TMKWF_A}nXRv#>;cs1s5IMK5o2udwL)
zm0D;bWJrU8z?T={|M*H{@yK^Z$D=a*<%X&VCk<ntUz$iZ(34=xbyK<*^H;9(f<euq
z8{K6LS@)eSNT5rNS#YDS5HgqnWqTpZ%%VOI>EWPJNF3;@p%Pb#OT**1=Xwv|ModIJ
z-1p<eFAoKLHId0>T%F@ODe0X5x?tkYpme$FEA_2EjiNeQOy3>KnPC@F@C>=@O<-3W
z!Ku#(TJlKz2>%slRrKZB1-}Oc6czse!SfAlKAP70<;`7@P;||ojRl1zm1{F~r^8e*
z=|pUr@mz;fIBPv`tb@*bn&l~6JCjZ!SDVVD0smpj<A58D%%OSNhM5zAJlwxQ7FXK#
z4RvMPFFWsmKBX+nu<T%|;g_cLR2Q)zBu$ZL7m6B1qux>0?Y2P<i|3FV4k##Nt9M7m
zT9sG(DTn^7Kv#6#UKYKaWAwP1@6~zOhp#EuGV5J<F3)Omvc(DM>;^AbTDSH5xj`XW
ztPLm;O&u-b0^<>Bhh;P#+VfJCaNoMnTR3pX`LJ#S<$ME>j?MKBL@EYpD^7Mk_|U)S
zU%T<05k6mJKH;H`J0+e&q*tg@k(LzI(Ho?i|9#cKH6ZJi0cx{DB$n-zwEPsNm)Cjj
z(}`SFsR4*vO}pG;T(h|c@KJVA6X&-(ELBr!)yZE$B;UeZ*E)&JvV3>aqszAM`Vo5{
ztOsoeB6`Rw9(v4j&Q4~lsu_W-d;r#CH)N0=wXur4m{q?s>Cx)hvmUV5RXu1usM2FA
eJ_XI0k^lV#mJSUsmU0s-VXq$A)cP^CXXrn%cnu{0

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-007.js b/js/src/jsapi-tests/binast/parser/tester/exception-007.js
new file mode 100644
index 000000000000..bae0027b5ce7
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/exception-007.js
@@ -0,0 +1,57 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          exception-007
+ *  ECMA Section:
+ *  Description:        Tests for JavaScript Standard Exceptions
+ *
+ *  DefaultValue error.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               31 August 1998
+ */
+var SECTION = "exception-007";
+var VERSION = "js1_4";
+var TITLE   = "Tests for JavaScript Standard Exceptions:  TypeError";
+var BUGNUMBER="318250";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+DefaultValue_1();
+
+test();
+
+
+/**
+ * Getting the [[DefaultValue]] of any instances of MyObject
+ * should result in a runtime error in ToPrimitive.
+ */
+
+function MyObject() {
+  this.toString = void 0;
+  this.valueOf = new Object();
+}
+
+function DefaultValue_1() {
+  result = "failed: no exception thrown";
+  exception = null;
+
+  try {
+    result = new MyObject() + new MyObject();
+  } catch ( e ) {
+    result = "passed:  threw exception",
+      exception = e.toString();
+  } finally {
+    new TestCase(
+      SECTION,
+      "new MyObject() + new MyObject() [ exception is " + exception +" ]",
+      "passed:  threw exception",
+      result );
+  }
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-008.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-008.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..9e6209ca559176801ced6461aa9b9f0e425e4bce
GIT binary patch
literal 6852
zcmd^EL2nyH6y8#xAcVvb!DZDG2%)r6kx(#^8pl;rMFwFj7lf+G?%1Aov%8&{P2&EJ
zp7<U71AYYu4*Uy_yf-_$^XysMyRnlTxYV_G=bL%oeD8a2COuu`2|wt~IExQ{mf2LY
z^WeQ82+p#29vmJIUySxgQI_+dw`bnzB|_<gC!YtwNAOmU4nJj5u(O08@hD-EX_2J{
zDt6yh@LHttBGx~Eb8iz?CJmH`1Ca_{1JLP@W1ea;5nLL$l%2apD=kGjJ$L}qj0XMj
z@lV6vp8c)2XF({|$h?0dG?y$fa2G5oJiJc<k6%SR$5_98^yqsZwL;%By!Gs)_hH}#
zlm6>;5!dANFTlP<K2Ha~jCRH62e9;4>ha4bJ~6k?;{zb^mUzUt$H(K7fgd*&L`zkE
zhiF`B6;3i4zF-$@6iJcmaHLrpGZ}}2O0#M|9L-bBt_D(O4RYLq^}$sxxl)iAFs<h2
zker52UjN>h#eJ3}Zm1a%!B5=f9%ZCO&VLMSD9xlsN_>9n2rVo{ck9?D1awmy0+Z7M
ziBOH9w+QAlz`B%ROV7ctxg2LF+0>88Sk3QE@;wwOlXDkWfJOxF4sHz&oA8Maq?pc}
z!CJq<Jov^<L`k{<$QDHG+Q~7%&;__o6)je`CZB8MvL4i5Z%lp|*>)L(g}!u&mycId
zR7FCy;e@tL0&O3``w)Tdoc_;>G{VA8`x(p^XhK$YM>P5tLRn8O1v^Z#=(S^UbBp#b
zG$**)g%<6a8}bx<e43(jIe;$K@uQOsjj07eA3_9BMvA1tx+zr4()cC7O_)e{ydS1n
zSodzBp2_Sob<3>Oy!=V$bX>T7L9O!j74GiH#8Oy??8i!D8x~1YwZAZ`u2;)^RNv{?
zv79?XP=aTu-CzdIM*_|H1Zq$s-opQ?BLyAYS?7NP<;eQ~L+4BF(Jp%nG)WG}9A6lw
zRGq?OkLQ+Yhr)|8IGv>h|G~$%XQN6>-e*}V7gRzHrnso`p!%GtBO!UD2M|W3u6y+X
zufnB3eWs&XKVgO9#?W#&xSsFK-f?N%kC!f>v))f3qr82%rWK9&n}Vkicf$>|Gcebv
znmzav^oEjK$hEukvmF-)xYG!7rW6(jEC~G46$pP5o78l7RCKWRB@00<t?3VsGFtO-
z^Ru&8kYYhD@!X*2Rh}(qqD5tIksB>guz}K9X+x{`sM@Rgv$^@UKD3aY#AsluI@lV?
zzPxG-Mp>HE3D;#K$>SkhO)X{C7x13RYI5MB&e6Q!g;~2ci0^i2Btw2lJY<(u2{#x|
z?tP{xA2xDB%O5Zw7O$=fY<-5jfg|n>K(?&KAuxqy{;P*oMSl2o_^WfeP^i$)B&xI)
zX}Q6Us_dbtEtikl3V-t#xCLZ4-=}MC!Nj^6wW{walbudPFXDlKl{Qqdu))ckD_x^y
zqHF04v|(X*S}5`1@_W%P%b)u!*M+PswEV3xhVt(ehp@m;kS}YijVW)RHJ`=p!-g9j
zGR!w9GM{%rZlA5l5&N`BH)NplZ#3;w|E|M6XfBoZ;f9OFQjzB03!u}utsS|E(v{qF
LkG~X;*U<k5DeAFW

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-008.js b/js/src/jsapi-tests/binast/parser/tester/exception-008.js
new file mode 100644
index 000000000000..f7efa9fb495d
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/exception-008.js
@@ -0,0 +1,44 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          exception-008
+ *  ECMA Section:
+ *  Description:        Tests for JavaScript Standard Exceptions
+ *
+ *  SyntaxError.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               31 August 1998
+ */
+var SECTION = "exception-008";
+var VERSION = "js1_4";
+var TITLE   = "Tests for JavaScript Standard Exceptions: SyntaxError";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+Syntax_1();
+
+test();
+
+function Syntax_1() {
+  result = "failed: no exception thrown";
+  exception = null;
+
+  try {
+    result = eval("continue;");
+  } catch ( e ) {
+    result = "passed:  threw exception",
+      exception = e.toString();
+  } finally {
+    new TestCase(
+      SECTION,
+      "eval(\"continue\") [ exception is " + exception +" ]",
+      "passed:  threw exception",
+      result );
+  }
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-009.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-009.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..d53a931f8fb59f88eca6725b946088ccb6b25fbd
GIT binary patch
literal 7026
zcmds6TW`}a6b{#M5s23z9`cS*H*V6VP(e#!ok~GVx7W!_+%{U8RF1o@{0^S@XGpy8
z!2jUbb?Vb4ZQU)a*q*Y~_UCi?{GAie;e&oi%TAXPzx<8G9Y%WAP0O;5Vt-^+>djqu
z+x6l;wVaZi<Ag!N%RkmF>pskK@bUw~0&*16kJJkZBRq&B3FYhe#5xWle;Vr#;M`b*
z6*CDH_*M`Fd;);CulqFOK|7#K!bPN~jZQcVqE2}YwsC9KR{d+!DXHI_k^;e4uAJWp
zIAtW1a3>@jWbhsV9zFGFU-<fBV`D3enxdCv+#I#(Em(L$Sav!#;+*mP1=uT$=Rs}H
zEh?UO!1P^r^YC>xFsqN_8U%4gaTI>H>a9jC>o+EZAuHbqG@9_lZpX~tB`3u7SkULT
z%Sq%D=G(QDv&pvYjv`J@YmCJ?bX<MZf3J?cLcl8fpPTz%Dz&{rB7YYUUv0kJdRr`k
zYo~oilLRydGRSEUbWSppPJYi7#3~6xy;QF7;3ukO43o=1K1IM1P8b*L$_8vg76psZ
zwH+66K@=wC0%4tj2t<<Wx`8uK0BguV;dh|)QPzqZaVP7ORPCR6N>B+R!baLJOK3V2
zN+^6#tU}u677IFEU8|Jz3rTsdH^M=>1W1EG6kQaBgSK{X9xDv2n<I@A<Z)@8yynoa
z#YUQUB2h<S>>XQO(8Cb=g*N0e48Fr(X_qsV7BN>ZU)&w-zz$-QsqRQKMMH^D(fNn?
z1DyL#B$%!NmZ91^oeAudLF9#)fpOH!IqDe7uqr(RxIRe|>Tlb26x)-&$>v=a4<l{o
z*+i!AcvBsWD-=x-@j<vCniot=8mshKK+Fm+Blmy_O{gH$KipiLb=5dyNAPC}U`-Bf
z>U8?VYpR5M-D*e%36;mE4__#~*<U$$sX<EQLC*SuQ7X%-$X@^zxL03AOn83@wa-wP
z9z%@VBnX8tffUhUPVvHtJU<;$US^)-0){s^55@5sL7ee>gYxkQIrW?HNv!)Nx#?4w
zCrO676N-quxU??K>vbrgMe({xhq@BT8-k+RLm^V4&8?CI$3x{vhGh%9xDC^$4yXY;
zif*_bfDMt<Q=799N}e(n^UA<H)4Fd6HS6#zT`%w~q)^yj&5ot|gu-i{;0cEuWwVo7
zoj$Skp9Ya9u9onPnrJNH8f@nM9A0mbqWQ%bgDri~E$H1d2Yt1j_#jVfiZns^hjlmi
z`vKje!u0>7T_IU2&dK&=`H5qv_gKDWVQ-eMS$gB?tL~|I7$z}2##g3oJ-Svrz}{RZ
z9^i8_PeT^aPBR_;xiF_Kd=C>J3aL_U;f$+NHJV>T)L?G6qsDSBcMxQ@{X&qLe><qL
cyzT`Jo$W@{(2Sc+HJUBnYGA<~VlDyy0SMmFdH?_b

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-009.js b/js/src/jsapi-tests/binast/parser/tester/exception-009.js
new file mode 100644
index 000000000000..1229bf561444
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/exception-009.js
@@ -0,0 +1,53 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          exception-009
+ *  ECMA Section:
+ *  Description:        Tests for JavaScript Standard Exceptions
+ *
+ *  Regression test for nested try blocks.
+ *
+ *  http://scopus.mcom.com/bugsplat/show_bug.cgi?id=312964
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               31 August 1998
+ */
+var SECTION = "exception-009";
+var VERSION = "JS1_4";
+var TITLE   = "Tests for JavaScript Standard Exceptions: SyntaxError";
+var BUGNUMBER= "312964";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+try {
+  expect = "passed:  no exception thrown";
+  result = expect;
+  Nested_1();
+} catch ( e ) {
+  result = "failed: threw " + e;
+} finally {
+  new TestCase(
+    SECTION,
+    "nested try",
+    expect,
+    result );
+}
+
+
+test();
+
+function Nested_1() {
+  try {
+    try {
+    } catch (a) {
+    } finally {
+    }
+  } catch (b) {
+  } finally {
+  }
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-010-n.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-010-n.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..d6bb139bdc18614dd026a7afe89baec814b4d603
GIT binary patch
literal 4817
zcmeHLO>fgM7|!_ql(=#W7dRm3HX)%+S*5iNtf(th(+w^Nd5zatWJ%>X>vrUC@YA@#
zl|R6d*RB(Lb+%?}wp}<?jpN6DA3yKo_l?8Safs_qfRSJC(Rf7Bfpx>Oti9Mjwi@m3
z2XEaQ#$#+bHSvxUl7!X&KC!Gv@Rp-b-$j(5y%4wXFhmqF5=R2cSN{|18;SgrSib;g
zX&zQg1r+fu5)qaI=*zc#95J#_FcokSI#8QV7$woDeixSU+~%PDvFp_2Gp8m&bSzK2
z-ysZB6biUQ6s88=W5B~lLp<iOzFJ;cHc>P5n&8cmi{6BZhlrZ5>zlYBpFaWn3i;f1
z`(9Oi-hr*V&F#&vt0prG5a}L`DNYhNBab154?rh^A)G%i6jT$1p_(dY4B-)0GSE+}
zg#7M9cnL$44RFHFh_FDA7u3R^tJA`5SZdH7bX+qqou-nR^%T%rarA=OO^TAhW&w>S
zkivG9hM~E_wTpvWrW6OFqm)Z5DHK%+nSi%i6AIq51*VMYAnwE?Gi2c>KOoVKTyKyF
z(PK@y+-<<Z!IHs7L%h!{N=AWlQE5sX=%rdnKebDMEI~xocFhB{Re-r@3i7SQ?#>W=
zjyyH}{BOZR>X;VsrYhyf;~K+tS>RA2oG&nLXs%>hb7^-WgQxjyGw{LJ1qbq<Hd$=R
z%;dB+cHVb)wi|AL-CkXJyS8?fv~9xWIf}TcDY;tbaFq?US>07iB-ulVyybe$e!Ev$
z)%E}|#eFjGGN~?IuaCfc5Ul&T2Su;jQm2qPl71Q`Q<&QWrZg@nUNh9}S4UUEIhW6M
z@kGrOEkISbEGLH7VNH}^lNjMZzrp5i!D}bFoD!m~`reu+Se@s^Pf<skDS@lJW;n4J
zx~fyS{{+Jqy=CU{C3~?<rn7$~0Xh##gXdE341GKvDc`J{))y(EEKVA~G)>a-U@mR<
zRUZDl8sqx{r~d}#zT0ef+}5*o+Y90}^z8s0VjCYpP3_wg!U8*uhA4#^7#_;@y?h-a
z^`al0{-K2PH2n`v+w@xq_Pg*kB9V``P|_k4519+{&zl6{IL|>MT)o+Mf>W<QSr`<%
vyBsXEAvso1ylRl9FKUoR!>>Wk)QxiFl)hJvnwpjabNV1b*i!!aMkc^N)3qI;

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-010-n.js b/js/src/jsapi-tests/binast/parser/tester/exception-010-n.js
new file mode 100644
index 000000000000..46fe72fddb23
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/exception-010-n.js
@@ -0,0 +1,25 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+var SECTION = "exception-010";
+var VERSION = "ECMA_2";
+startTest();
+var TITLE   = "Don't Crash throwing null";
+
+writeHeaderToLog( SECTION + " "+ TITLE);
+print("Null throw test.");
+print("BUGNUMBER: 21799");
+
+DESCRIPTION = "throw null";
+EXPECTED = "error";
+
+new TestCase( SECTION,  "throw null",     "error",    eval("throw null" ));
+
+test();
+
+print("FAILED!: Should have exited with uncaught exception.");
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-011-n.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-011-n.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..8397356dc8f41ffc250635ba4bddcfc1ea417b31
GIT binary patch
literal 4530
zcmc&&%Wl&^6m@w&#ACx2nGFviNQ+oiCQ_RiH7JCt4iyp$G>vcL5w0DLCrP{HH~2Hy
zv1Y?3aAz|1OfzolHg3C$JdZPT&zyVaPCPyy#nAL3AYpTpr9(#coGXsw?4;p=v)<`_
z2v&nZIs(UQ$T40_Gv565z;W*4D9@a}O&BFRF|=V26Gk{q6A2aS@67p5lkhOsAH-QY
z2`gn1iiQqNC@%oa<vSrHobFO!5-uTodea$aG#NH;;xd8X>UTc%yoPG?8Vbb33gq}M
z<-kZR;U**=TX^>n5B3Kz60yEoURkkGbM%Jf%~OkB#fcNb?BV7n&dBF)#J)g2xBac4
zE<SJI*8SGUwQp~1W)>jQ-ybo^GCZSz6ApW*6Uh)1?WKZhkvP^<<%|I~ftG=JS{3AX
z8^g;uVZ09+KPJKwL7q_y|1M4o*Kw(Sr{DGMz)YGdX4YdwYp2OG?zR}oB9})joni{R
z<0OP#nm}kTbLk2ZzNr*K*l;X#mX#{2f>s_P)|8<EZJ;v)>!;mxXooCK<tJvlmGJ8{
zA?(1Audp2Sar9;M(inER!{{*5R;rvy0KL=;nMZdHkQIoi+p|T0t`4veO-a&K*xfOz
zFOX->UwoD<q>pJ4gQ`=0BCZkMnI$$Q!`Z=pOLG--`w`CloTu?Dvt5pk_`2j&&W*b@
zybp$nNKs9`bBY{!r#EZnNCnA=x~c64t*y>xZG{MyV~(`QO8!`%0xyrnTNttbWfO}z
zzpalVPcrjJDymW_9vDkYin1Iv|25IIdQO$PJ(%j5vb3%1;t<4$`l3ZLu!)iR^cOSt
z8V);Dy;o3f-Bw&lwI<n%AEk*lSKrlXpMqV$C&Lj3@D;ny>Yn#;?kv@xPf{AX%P;Ij
z)MF#p>-?u8!Q?`V@l-ONqfo@8beumI%|$9mOb{pTf|8gNQXZ5ET+i<76u?RM=Z^&x
z@D}I3U+Z-J_LEgNh|+N!x)GUx3;S3vhVGQ|2=9Rb8Do8ijp}_`{d!e;F&Q@h2@pKZ
zzVTHud+bBl!{>IUnm0(+rVIw$#}p_EU}-&1Q6hJ6e*O?X@-kHAXt~X+&Qd>8eI<pN
m0cjhg0cpKx4am8gNc9}?uv5LZrd7uYHNGTlsrY|F3I9Jyhr$d1

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-011-n.js b/js/src/jsapi-tests/binast/parser/tester/exception-011-n.js
new file mode 100644
index 000000000000..17f19723db73
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/exception-011-n.js
@@ -0,0 +1,26 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+var SECTION = "exception-011";
+var VERSION = "ECMA_2";
+startTest();
+var TITLE   = "Don't Crash throwing undefined";
+
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+print("Undefined throw test.");
+
+DESCRIPTION = "throw undefined";
+EXPECTED = "error";
+
+new TestCase( SECTION,  "throw undefined",  "error", eval("throw (void 0)") );
+
+test();
+
+print("FAILED!: Should have exited with uncaught exception.");
+
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/exec-002.binjs b/js/src/jsapi-tests/binast/parser/tester/exec-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..bb8d1ab9678f78bbefa6ea0bc9ce0e749117b10a
GIT binary patch
literal 23367
zcmeHP&5zqe6gS_cd?OA$K!p|#$yVJhg$fC!5$*0GEh<ZCRuxjWt;Y6j*3=s(wo^G$
z_!~f6DnM|8D+m4;F1^B~5)%Ic@7d#cY)`!7k3^fqd)O$k{buI9-}}8c&ok3<hkcW_
zTSt`W?VGmMwaKyaw4x}grH_>ByL+E^KIv#ypDL|Q|DKj<IBxsTuNCDS+|}YAzfEj|
zs3zT}nn`Tp8dlF2rAOZ#<$=-D<Fft+IZvG=%d&k@hOQVr!<`7=o8Q%G&ovGWYWw1P
z<T&cI<Jv~A+kOF>>FjLn?|!-0+GM}AHklA!R>!~phT&41n7+7&#2lvNy$14b(e94d
z-=rSZE?&BHIW0Gozv*kP#hQHv9(_pc^zD2%3TpH*$eyD{Z|~gdRHf19q3b(aUtGI?
zDirzO{1o{dG_}9Ge`6;b5t6`s2c!kS-00huYq_I7-9U&o0{Au4t(1T%;NPZ>1ODD|
ziA#^c4}JX6$?rmk-6EzLJ?cN9!A~@DGu{^@-1|iswc`@o-KUP5F+zdENBt->1SC#2
z1Y&oGs0c?mbcw;d3bL;0dSJyZ;!r0&BA-$I0at$(ZjNzr@K{J-*snfufz5i#p-H+?
zrx+Wd<{D(Ij|bzX7q!E#B9|D^uOU)+>qz1f30T$0wl^4M%i9Cx*@hMl0DBN)VE7Jy
zXFe6O_chxlqsXEG7EK?Q(a3$>{Rl!(IWgTyjs>6F=9E=JEjYaGv_e?K2n8p<E*Ffy
z1$~x<G5QR^xIxE*X0zdqM;y;FEW;h(k?e~QJ(A`>1A+j`x?T~M&y~gUMG+534hFG&
zl1oa8LM#s|(Qvhr1cZ}xs31X`xZ861*Le{<a)t>^Qpg4Mf*#qIc@kWx#;sn$CWxw1
zivI;MkB>TuC=qlbn5KkQjNfjWVMGz#o5aI%0pL*u0Ki!bSyyLg{<FUMi4MjmghcI#
z%_);3yk3@9Z$g)lii+e2zP<>juW%ems4X@1e76Y5!`wsHb%Cwo6e5GU(s}7#3Ctl@
z1*2Fg#J#l$h(mJlyc1>+b%^V>rKiHbR$z9lKzRrHfzBn2RVO*GKpRBWypOJo9LKr*
z;gu=^U1`$!3VMa)Q6$hId*X1?16e8F`K<x~Vo~|dJ%GnuogUu7&kK=Ot41QuVu|WO
zOR6Ad<d1wx*=(x=9V!Y!-*u-9Wu;*FZv`;KQeA_rHz5z79sH2lH4U<TNcTNI=a1S7
zQ|0_1Tq_I0U!Yq>%YyzK8D}rqBay78U@t_XRtnC4Eef0^ZJ#rzlP_o2xShPqPP|+~
zKbrfSnI{$C76bGEYT9aZovW%=od#gp#q$P0Tk2pWNaFHyaOp&#43;qw2nJIL31dDY
z$c|QugB##MWna(Ww5LHD8{<3o^t(;1xgJ@kYCt0bh^`S&i`tM#DBvk5V^6Oj%Tw_a
zkc1QbB9kfE&P(PHei8B{MM%m*R}fSzR>~C~S3v8N?E2t?2%uFvK~QFZ<T^;La}qmP
zx*}ir2_zLwr+x6M)g;phUV)?<yg6S3*5H+7%No3TyUL|bmDV+8$-Hj>(`fO+Mo#uc
zt`e+xD!odi=Hg(j^Rmnj=fcH2oCk%Hi79Y?yKJTIQHj(7`y`mw@pD~Co(DmYDzWr!
zvZ!pO@(N7w%FYk*&BvNQJzP70zq`%#wMeT~C&zC>W1hEmOdbq%t4D13zg7)Lmo9z$
z4qYpnFJnbLKB!2Aq6x4h!qHc(w4{}Scoo^lTp^CNLm%R&1=v5A05*~f0Gnfkl5jpn
zGePt&R-F#3Pka=TNTE?XZth(VpACB&Zqwp-Y@sCBX4QusT*uDzZD2Y3C%uH@W6(t^
zjz}l~Yi2g>!j_XXOXch<rc`XVL}^+0MhJGiQ9;ctXRolBb4*<Ah&uNPZg5EVjj=H=
z__}Fn527tC7*(=&_8IRg3U)eHx7<C9i$J6)n$>gYV2GQ2M4-K4bq&BYw+#bl!?2SO
zb_T+3K9e50ifwd{qNiDe$3Bk7(dc5sF(6X&TRU>dyn0nEv*=7<+j6<VVXrOq8>+bq
z?6`tax+9@l<_l%?B;58DjXWgH@Y7#-DqP|!(bG&%N#q8+8TW=KEW~Cv^UqwLf$1fN
zDB*T|FJ(s-s-J&0x38WDM@{945hf#_#rOiu$TsN-aaq(0Bvgn?`e7#<Zpy=bY-ud|
z7(5GDMQ@G~Pf?@efVovuF)bIw(R@Wps8u%NNoM#cF4!WPHjoId5<SeO2WAxBHj-UM
zQ*b-G!rq0SyhMp!=JfEQj#7sUfBXH^#3~Ukl3xXAxkcTf&22dbR7|KX#DXX#;tn+s
zKEj#`MeuN1RC0X}B1KKE;W-x)q_Dc=ibaFwhDm!}_ed@h%#7J`GP9&vXFs$$M6~BU
zqo~OC5>aPSL%{cSe$5?qB#9T9ijri~x<L6g=IzamDP=2BS|p)O$wFAMSW*-2X(ZeX
zlZPN$V!r*M=G&TY<&KdH`L;jIIJJtOhDz{lX6=QSRWt6SXuw`ToYJDXgwX@W&4kes
zGw!3h$Wb${9OJ(1XSl8v<n9g0VsawQ#4@xt{lLOv#46$C)t5!E<`XJodd(+H+W6=(
z50xa^z&Bn@?b(Mc&ddO^#X$*ME^e&JhnXp1hyBbWia&E0EIkR%A^O74BF~)A93m@d
z9uD3O*2GYK56%&G*w0&}53d};-@;W7{_D#>fDLeQS9rc})`Az7XH0!B%C2JympZMO
zUBgJ9I4+iZDs>_+yOu^9CoVDHk6nqS6zmFmL9&+0E@dzjyF-|sa)OhE7j|jN39sxb
e4llk4id~q3)!@)A|Nr~&DDrt|zNxkm1Nnbm8;j=v

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/exec-002.js b/js/src/jsapi-tests/binast/parser/tester/exec-002.js
new file mode 100644
index 000000000000..86d8ccb9a59b
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/exec-002.js
@@ -0,0 +1,188 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          RegExp/exec-002.js
+ *  ECMA Section:       15.7.5.3
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Test cases provided by rogerl@netscape.com
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+var SECTION = "RegExp/exec-002";
+var VERSION = "ECMA_2";
+var TITLE   = "RegExp.prototype.exec(string)";
+
+startTest();
+
+/*
+ * for each test case, verify:
+ * - type of object returned
+ * - length of the returned array
+ * - value of lastIndex
+ * - value of index
+ * - value of input
+ * - value of the array indices
+ */
+
+AddRegExpCases(
+  /(a|d|q|)x/i,
+  "bcaDxqy",
+  3,
+  ["Dx", "D"] );
+
+AddRegExpCases(
+  /(a|(e|q))(x|y)/,
+  "bcaddxqy",
+  6,
+  ["qy","q","q","y"] );
+
+
+AddRegExpCases(
+  /a+b+d/,
+  "aabbeeaabbs",
+  0,
+  null );
+
+AddRegExpCases(
+  /a*b/,
+  "aaadaabaaa",
+  4,
+  ["aab"] );
+
+AddRegExpCases(
+  /a*b/,
+  "dddb",
+  3,
+  ["b"] );
+
+AddRegExpCases(
+  /a*b/,
+  "xxx",
+  0,
+  null );
+
+AddRegExpCases(
+  /x\d\dy/,
+  "abcx45ysss235",
+  3,
+  ["x45y"] );
+
+AddRegExpCases(
+  /[^abc]def[abc]+/,
+  "abxdefbb",
+  2,
+  ["xdefbb"] );
+
+AddRegExpCases(
+  /(a*)baa/,
+  "ccdaaabaxaabaa",
+  9,
+  ["aabaa", "aa"] );
+
+AddRegExpCases(
+  /(a*)baa/,
+  "aabaa",
+  0,
+  ["aabaa", "aa"] );
+
+AddRegExpCases(
+  /q(a|b)*q/,
+  "xxqababqyy",
+  2,
+  ["qababq", "b"] );
+
+AddRegExpCases(
+  /(a(.|[^d])c)*/,
+  "adcaxc",
+  0,
+  ["adcaxc", "axc", "x"] );
+
+AddRegExpCases(
+  /(a*)b\1/,
+  "abaaaxaabaayy",
+  0,
+  ["aba", "a"] );
+
+AddRegExpCases(
+  /(a*)b\1/,
+  "abaaaxaabaayy",
+  0,
+  ["aba", "a"] );
+
+AddRegExpCases(
+  /(a*)b\1/,
+  "cccdaaabaxaabaayy",
+  6,
+  ["aba", "a"] );
+
+AddRegExpCases(
+  /(a*)b\1/,
+  "cccdaaabqxaabaayy",
+  7,
+  ["b", ""] );
+
+AddRegExpCases(
+  /"(.|[^"\\\\])*"/,
+        'xx\"makudonarudo\"yy',
+        2,
+        ["\"makudonarudo\"", "o"] );
+
+    AddRegExpCases(
+        /"(.|[^"\\\\])*"/,
+	      "xx\"ma\"yy",
+	      2,
+	      ["\"ma\"", "a"] );
+
+	   test();
+
+	   function AddRegExpCases(
+	     regexp, pattern, index, matches_array ) {
+
+// prevent a runtime error
+
+	     if ( regexp.exec(pattern) == null || matches_array == null ) {
+	       AddTestCase(
+		 regexp + ".exec(" + pattern +")",
+		 matches_array,
+		 regexp.exec(pattern) );
+
+	       return;
+	     }
+	     AddTestCase(
+	       regexp + ".exec(" + pattern +").length",
+	       matches_array.length,
+	       regexp.exec(pattern).length );
+
+	     AddTestCase(
+	       regexp + ".exec(" + pattern +").index",
+	       index,
+	       regexp.exec(pattern).index );
+
+	     AddTestCase(
+	       regexp + ".exec(" + pattern +").input",
+	       pattern,
+	       regexp.exec(pattern).input );
+
+	     AddTestCase(
+	       regexp + ".exec(" + pattern +").toString()",
+	       matches_array.toString(),
+	       regexp.exec(pattern).toString() );
+/*
+  var limit = matches_array.length > regexp.exec(pattern).length
+  ? matches_array.length
+  : regexp.exec(pattern).length;
+
+  for ( var matches = 0; matches < limit; matches++ ) {
+  AddTestCase(
+  regexp + ".exec(" + pattern +")[" + matches +"]",
+  matches_array[matches],
+  regexp.exec(pattern)[matches] );
+  }
+*/
+	   }
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-001.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..bbc38b49e83cc5ec1f2c0641e99f6be1bf4db9a8
GIT binary patch
literal 6002
zcmdT|O>fgM7|!^H1LA^^5Qk_I(h!3(;52nbTUWGBrA%uzjnm{MUTc;nmE*3P_$T}`
zuH4}_@Y-==w@y>H>js>*#`a@B@5l4Lc9{+O0j`w082Obw8g(e@IX4`~Igb1bXRF@a
zZLPPwsE?g;Nz5q+BxaTGj~(X$%qr{44-h5jIKbQ33lK$&M4^E4)$iCjC80lx^%HQG
zreQ@?KoQ>|Az>MSzJ1-tAtNUQQvnyEo;q~QC<!~2yRc2GR&CcmH_IjYtz42II#x@}
zZxDtl3IyC43I+z=L%_r5eTw54$i8~>X3d06;Y-4BWx4B3Sb2u1IbA=+oCf^?*w<*#
zgW7&;Q3kyYN8fF&9lbXVbNzPweSLQ1yxaA5qh|8f1Hv*ap8;Am3Vp&;5CtxzFQj8c
z-4*wPyY9X)H@SpyYgzoa7-F~wNhqRE<wb6`R#6bBrDBB#pRmd?ow!AA-v`n$LzJ~~
z%nBGvSRGxR<1!SuYDx--b_U!KaV~WWGLHajNI`yfK$kIXM~$dsa!RBaQr*b*EfOMn
zp?Eo5Z_+Su0(`<8N;+L7q*9hR&`Y(EZlo)Kv@pb?6`K=u6~Qd-bE3lHbOmXfAt$n*
z{mj|u-<SD2U^OUmgCHld^cb<!Cl2=!kpTOXJ#l^I@)w-ONT6|_ET;e98imh2+~>k<
za-YMLPXMtQxf!TCM6t`dG#cjMXF)i7E7GPHN*hIg7)0Kw(?y{lK*N<bhdP5TK4WZA
zVN-bsUN9V?G)zJ9NjNJzxtoubmqlvxExtRngQow4S--)s!NM{zUc*}G3f)g%jt(~W
z-3^z~0fw5rTsz#`Ut3;H{&~9$MO=J(w`?9lCQjyS=@R*Q#6enj&rh6m`#UJ!CKP+D
z1{_n{E@fSEimL-v5%ap$01aX+3QZrn|K8*qguc{5WQDg)o;u3Rp;m%=$YWyU{xWB%
zZ9?<k33<6!0JGHF4aH68WMP>rkmWrT$Az*ikEowi(Vi(q|DN4ukl`^M;jviIrfx@i
z4DbMpj=w@GIep5TFLsgU(@5M|c-kTdEKu&jfmoDikqWvrqo@8&s)p`){e1wiGj`)p
zlh!EJX<(K-8(_Z)7kAY-i%p*bHlLf`p2y9RoNRp8^tZnIoUz)(L$y*U$D%rY?h}4v
zsiGL0J`uzYL9BSunKfvvd*>@??f(x*%d)%*#`mIL4?&-mKK8gIbdl?6x9m8*{<@|g
z^$@h&lzVRlIypSd!OIJ63jvrSe0ivrr{x)0@UAcie_q@sRU;kFf_71zoX{@mJE+W`
zslLrtIxJ{#4PaJ}8&jG+UYHW;hHK8K>=yKZ$;<C^@U(dOjSHSs<yg-3SdQeYo(5?=
mD$2155iCdZ9IY*c3>|+SlB1?+<v@PPl!H@VX@qzio%0{16_^?T

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-001.js b/js/src/jsapi-tests/binast/parser/tester/expression-001.js
new file mode 100644
index 000000000000..90b44839ffc6
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-001.js
@@ -0,0 +1,50 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-001.js
+   Corresponds to:     ecma/Expressions/11.12-2-n.js
+   ECMA Section:       11.12
+   Description:
+
+   The grammar for a ConditionalExpression in ECMAScript is a little bit
+   different from that in C and Java, which each allow the second
+   subexpression to be an Expression but restrict the third expression to
+   be a ConditionalExpression.  The motivation for this difference in
+   ECMAScript is to allow an assignment expression to be governed by either
+   arm of a conditional and to eliminate the confusing and fairly useless
+   case of a comma expression as the center expression.
+
+   Author:             christine@netscape.com
+   Date:               09 september 1998
+*/
+var SECTION = "expression-001";
+var VERSION = "JS1_4";
+var TITLE   = "Conditional operator ( ? : )"
+  startTest();
+writeHeaderToLog( SECTION + " " + TITLE );
+
+// the following expression should be an error in JS.
+
+var result = "Failed"
+  var exception = "No exception was thrown";
+
+try {
+  eval("var MY_VAR = true ? \"EXPR1\", \"EXPR2\" : \"EXPR3\"");
+} catch ( e ) {
+  result = "Passed";
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "comma expression in a conditional statement "+
+  "(threw "+ exception +")",
+  "Passed",
+  result );
+
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-002.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..a4cf82517a8870c0e15aefd19ea5d46a4e8b34bf
GIT binary patch
literal 11122
zcmeHN-EQMV6!!9uxB$To;>ve`R?r3Q)hZjQ&32(xl~zqy2?+^Jok`+d$BxF6roBTv
z#y$tnz&jvr5fX2~IpeW?;+eSPBsE>MH%*iAd~?p3@BGXecjRIo@os0z*{FLal8In5
z?+wrME|Sr;cW~4{9y}TZ$((zgJ@rf{3RBtr^K;Mp5T5GL>Cc!5*+s;k@E~G>$uNl(
z)TsQPdN0Cww2JjN;M}_jD-jAR9C=|J$^w8ce>CE;496iC3NB`|Qs`8QFrIYZg=GeZ
zz2VVmzq6-*>+ER|iZxKrpM;VN7Ad$(7A*|Cj{%Qg%>_?WP&WPQ!GmwVex91p`4W4|
zcpbg+n=t#53G;C($%aP#1F%~(>a)Z1!LE$@Hi&*a_~z$_reWH*<6rIB5%nG(4NneD
zy(u9YP!s%l&V{`8_k#c^nuy&}^RQt4Kr+c^;C_m8rAJu(w8x^ToT}V9fS)+`n3yaO
zCAH3T@b8bngi8Tl`#pp+E{4fTGBK^GobV-hhv6UxVa&ue5e{7xZO9}9poov9C&J0J
zj6d3w5$Jxo5Z$g@fOIg#t^*w^=$8r>eyBC23Oh(w!}J0<i<HGz%R=QgZ9_lQOw%vV
za1FJ29}rT>gdFlzuD4OH3Ps;AxPJgbqujOGcQ+aHJy_=K{PgVbeE6fO8`Y)Hm*tKq
z@wPK7l4M^9c5N=3o3i+9Ev^0rLbYUhTxM?SzG8BSmLd%DG6g0SfwM4;etv_>quk9#
z{<ROa&?Lq%UIKUx;^^a2XR511Sa}EZKRq~x`mTh??LeVcnTo~kuJVua7M*lW85B!@
zg?)VsH;PK+nA0)REaDL#hcO?S_!RMnx<m#A>o~kB(rrN+oy}0Z%OosUxVIu~-<@?-
zqTTE0KndhspIM51?GHIUs-INw4TE%x6*v+f&LE4(l76Trj$43mPgxk*I93>{wUGM{
zNYhftMgQVg0iWa1wcfuRP5B8R_7lGV_2pC~OAB`Uc5RuT{A$jF-SP8`rRk3OITY7r
zqEju9C<$J8Qx=aR=qcE$!vlPxGO4z2@(bV^WG?e$355@V$#iGIy7+&aXkFq>Z}p^y
zI@Q#KPZC-&;07cY&w(@ETxV3P6*imYkUCte2?r=FWmW&kj48R_(=hFTi03<ncsgE>
znPVHDS?s1u(ncRZ7nZJ0rE_{r2Gd@|7AaTt-5h#;v-N#LI@Li#<p8E`6s58E-G_1j
zd9_l`{BOO_!N|z*b%D8V>t8vWHOTC31TBZHap1oL3LZ#gk`*haGgY_P_`aJ!L4ymb
zm3=?qGP@|?qdv6i%buTF^fP!4pUr#aRdZyL83OC@K%>NlT)o{xBDRWpEam2&D8+t)
zKxG^f9k$!K?RN`Z$yWo?v2K3|)ccN0DA&2K@~oeXeHQy!MdB}~NtzFYsb8GQeRDr4
z6&)AHUHk$L3Vdn7%PCKB9hh-L0JNbxN{gQPrKz_K(Lv6-jMPwNgj!dnt~vhG6*i0;
z&C-X1MKBJ?#+~J-i#WhjEWL|GB)C9Tby~W!Ld~J)wFey8B%I+6W*%qqi*A*J6>CcH
zhDaz>s;-B(77C%_#q5Gx?tnEzsc?<!-QOXS7<S)~*SB=q-0b)^oQ7$s2UyWOu~5S~
z@S~1uTZFQ8?9CzbPbzJx*j;D`+@%d#=XN$LR^l)o`*iPN>sw~zN|qeW2%yThK0Kg`
zSGuhZB&-QiYZ8`C^Vj^bz4}udYxO?S?Yd?Dz$J<`?7!yEq`T6dxhwI<spCcow57jm
zsNBJA<p6m(4+4%;&yF6&>*n0B97fX&3NFW1Px0B$JvNsMVLjQugvp<xxLGvsTJHJv
zh;ezRe@9oY`VSeZUIFVN`<o1O(73qOgVs|uS#VIP2K5jsR(YRGkDw@K2S5+vYR2ny
zdTh-pPLHBpc;%Xf3{@*lGE^;7^bqDS@(Kc(P(4@aA(SsQUxgtPvwzFHsfWx%jvlZ#
nu=JoMU+NL7x9YJQUJ}bXOX}|<P)GHP^~@WHH>mKyp0oc2;s+si

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-002.js b/js/src/jsapi-tests/binast/parser/tester/expression-002.js
new file mode 100644
index 000000000000..0110f23b774d
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-002.js
@@ -0,0 +1,60 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expressions-002.js
+   Corresponds to:     ecma/Expressions/11.2.1-3-n.js
+   ECMA Section:       11.2.1 Property Accessors
+   Description:
+
+   Try to access properties of an object whose value is undefined.
+
+   Author:             christine@netscape.com
+   Date:               09 september 1998
+*/
+var SECTION = "expressions-002.js";
+var VERSION = "JS1_4";
+var TITLE   = "Property Accessors";
+writeHeaderToLog( SECTION + " "+TITLE );
+
+startTest();
+
+// go through all Native Function objects, methods, and properties and get their typeof.
+
+var PROPERTY = new Array();
+var p = 0;
+
+// try to access properties of primitive types
+
+OBJECT = new Property(  "undefined",    void 0,   "undefined",   NaN );
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = OBJECT.value.valueOf();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+
+new TestCase(
+  SECTION,
+  "Get the value of an object whose value is undefined "+
+  "(threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+function Property( object, value, string, number ) {
+  this.object = object;
+  this.string = String(value);
+  this.number = Number(value);
+  this.valueOf = value;
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-003.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..dc2656b14bf3bc14b01d1945d35c943063c2e4d6
GIT binary patch
literal 10356
zcmeHN&5qkP5LWu%LxH00DJNYDv<O-!XitG-AnWY5yI43u?dDo=Wv;D6mJE_!?;hL7
z==1a?dM^s}EjmL{(paQr`nOJz%X)2+ALr+r;S8m=noSelX^%M@c3y~VB-kW)CkTS8
zY<L%(ocAvJkNZ(J<w3ip=d_bps?OP$LGTI8YSZN}nTXj{!k_UdVS=eROEuK6`Ywal
zaXMVY`WtZWt-{KLhKh$loW`mIpxd7hd8*>;m<tV;vPmVhR3c7CoeyD~{%Ln`{=C<2
zncvzi146O-dj4gsxL}EfyJ5-9!ut&H`0Z41DM4BJ&BKS^efvt<(8U%lZM?SG`CV9j
z!-PGZO0uC*{{-v<8ujJrPyJmP^?eZiqW|cZ?`^{z-j07A&W@<};Cyg-YU@o2u?96E
zo~K->yYOig0Yx*hTWX$`%<n6v_yodFbFPXAXPkCfl2l7|SV!;^=K&L=8KOw%I*<7N
z6ihf55Vb!-I^$xHU1lTOnmP!7hv={Z<Rng+xFf=0h@uUdf&`TCYZZuiG_LZGiDU$N
zP;ErrwFgKKL+m=yp@LzhU>S!-Q>w6sbPY@|k@HMhesyeAxoI2vp=O4D#R<2jHXj3m
zR7|J=muk6<3RNijhAKRT<7Sj%q*MUG8dQB!NlB&g@Z1NW>+_QfI6^B3mts9WC!%3J
zv8xdO2(XI0X3L;i^Bef|J(#vooOq^9bmlA_^6NO|LmQu(>*uCi0X4yOd|PI;GNGA-
zf#Tg{akay}1z~%T21Ohd^#@EY0SapupH!mV>*zrV<Xw+B>M2v~6oS@2so=+7<RI~(
z%$p^S2&bBOx&YzMSe&>xRvPMH#o|984d%fG4%U6Ln+hD`i{D0kirqnTe0iGkb3p86
zVF?<lvB>5Q?8DpjfJHbGir-Fov^##jU{dawp967Moz=R_OtR>8FlOm6fws+c0H5HD
z+M>qR^jE;O$Xp#p6%<YalbPntx%q#4(E8+?S}~0}HB>XtGFma91G1}Ez?oobIt8Z{
zHe2O!bof>i9#B|P>K5J3DMj4VH0^<ig@(%VB(xl~0JlE#<W2Xamnnc<n!3J}uIVxr
zjk^h(Nv;dLDcq|}mfy|Lr5-Bk2(WddC~Jq`1E>d(SPN&#|2F(QjNFu&n_U0K*=&uY
z{SaBp!!;iK_dq#{L_w1as+E7g<SM_6<-;CahgSD0Iy>Emc{sPYkF1*`PhoYA7T;->
z*pRFH?Gmva?=s2l1g90_kf^LK(Zk)|S1WtC`FS%SJq!0IK)oNhf_j~Y#X%eDGd#?$
zLzaelZ4%DMndD|5mSNeQhqhxWCq1P=cYXye1D`waTwM2{$cjwpLiLmuL-cD~Zx^D6
zoJ~g)HKixivU+vNMF8Dl!vwP4IpU!PCIq$iHQw1Qjj*4k555oyo>u9CP428>^SJ$L
z0Y^5;Ye<GX;%t6VS9w^mp%`Bi35AmSS=`n_Ayhh>Tye((H^WdW+}efjACO5byKl(r
zJ@uWNHFAS-EGs?0igxQl4d=m+CaP_b%9gRWfGj?#w3TAVa4~R94q6s=E-TjZF!q1u
z7Gmp1ddQXhaI`akuH$+zL07TVtsW$7NK#7<ESKhQ`Qv)eqA}MRKT&t>nLqG2#hLcs
z@@LdpxTiUm{L>Vh4*F~v?FO+3Z&xuu-h+a4<8^gMJMyMAE4IU2nnS?@nZ;&4|GCSi
zY9^cw{v%lY1&W*J@{aYW&iszyT8|MjRDa-WhTOHN8FY5Z1hZc&>dX*2zV;4`8NuD`
zj@}I7Zq_SEW^73_W=2tUUVCmrhUx_)8LC$sWT@T<nIV)!+Aj)_h55hLL1%{SuEY$u
kub#}HBZ$n%iq~ZFdmsJxF^H^hbIr;XOzGFW>OM&S1yF)3%>V!Z

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-003.js b/js/src/jsapi-tests/binast/parser/tester/expression-003.js
new file mode 100644
index 000000000000..ba5f9c076970
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-003.js
@@ -0,0 +1,55 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expressions-003.js
+   Corresponds to:     ecma/Expressions/11.2.1-3-n.js
+   ECMA Section:       11.2.1 Property Accessors
+   Description:
+
+   Try to access properties of an object whose value is undefined.
+
+   Author:             christine@netscape.com
+   Date:               09 september 1998
+*/
+var SECTION = "expressions-003.js";
+var VERSION = "JS1_4";
+var TITLE   = "Property Accessors";
+writeHeaderToLog( SECTION + " "+TITLE );
+
+startTest();
+
+// try to access properties of primitive types
+
+OBJECT = new Property(  "undefined",    void 0,   "undefined",   NaN );
+
+var result    = "Failed";
+var exception = "No exception thrown";
+var expect    = "Passed";
+
+try {
+  result = OBJECT.value.toString();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+
+new TestCase(
+  SECTION,
+  "Get the toString value of an object whose value is undefined "+
+  "(threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+function Property( object, value, string, number ) {
+  this.object = object;
+  this.string = String(value);
+  this.number = Number(value);
+  this.value = value;
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-004.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-004.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..2a5ba62ca9bb7bbb0d238ede3f9f18bfde38c89b
GIT binary patch
literal 10202
zcmeHNORwWJ6b^4#fDo);l?4mX2z8KHpi!wbw{r*X)m3Lis@Z~X;@gHvlgf6d_b&Mx
z{GRy}Y!MrN0z1xeoY;+>)P1Tmn#Fyjwm<uv^PQK|zF5pNI_OU+Nd`|@F=1pDyd4C=
zb&=c!XBVT(=s^@0a~kw}a!x->xfs0sDhNJ?S$%W)Gs04GozX`$&IltSEpiE!=w}{0
zPxE9I>u<n$YaLd>BvhINX`YH2z})^Kp}9zJQpzM;PG<VhT(C5s3_gHuqVwVS;>oDr
zQ=j#F3dF>U<ov5tP)0Hd_kv^#3-1%aqqlQLIR|0Cy?_6E8@7V)NyYWmuJ6Fg7lhf<
z%~Nct(7yothzfmn{!6qkg}w(zzl^^7^(6H8&++t#a*r>@SLfY?@TBEufCj!ir%c?1
z591i<Suk!x??BD-n)Q(&g3iG8B<Hj@IDK?TvP>_PE*-;1lm>)N7Kp-~>pXn>QxJN|
zz+-=gP)6CfxGE;L$kGY_1n;mM<SfkzyE6`lE{ZxN0)kIQZ$!Y-$yCQ4<;e(iPj6)U
z?*Sk^6tV9hhXRILz?w9Uu<3ES4yM=0Wu&Yh9UEyg?Lt44Owq5(Zl?J>r1=OCxFAf7
zDHrWJszfo-w+!wfBxj4eO|1Q7%lARJCuf(CFKx+8Nk(+3?Xg#%{t!-31v2{#k|zJb
zly~80r4sRslejKlWSI@UA|A}BDgjtf$0wIj_q_3pvNZ16TNM@6QR=_1W37R7gi33X
zIULQjm!}O7?lDO-n%L$)z8?RD(;UgIF=o-*n9i|4w`Jc#m7fFRs0eG&P)u2|bYLG}
zuScwfkx=w@PUHRY^C{tc&-@&-JDoCRqn8!&^I%HyB!kY$l?TsoMq^QDcld`ZN9h!y
zp^)*QGSxphH-8AN)g;HtPy+-Tlx9C_hMUax$nC!Ircu+bDJmWnrXXm5;`(>sOfXjk
zyHg9>t@0GoC&zn0VPz+~WUcYq-<9e&v;d}mQIzq#9kjVg{ahwNb5HX=1F&mV*GnAd
z91;;vhZ$LLDtR}DtBqOv^@zEhhti}6*s_@@8@t~<a1SKbN=c->=QVRb4<&a+<}TB}
zayr`}wI3sDd6>q7{~jnO5h%>yf?}1=S5%bup)?u6jikQbkkRQ&n1^$#Yr&>E$`ID%
zX!UGHi7mN$*xn7h;vwPG4scSi-yl#~y_<)*y>B=UZ~^mbKzjB-KLGW9q5|r58dixm
zlsP;sZbFiWWo;5Jrv;~KAmt(U%%N>lla8JTKudlN-2z=Y@LV+aV8@yu=tA{8EqdoS
zw%jg6k8^fqB~z82P;ISo%N2pS!<MmQvlQYX2F3!h@kQF>MIK`-Yrb|uBzRXOYc;;N
zV$I_^ss|j|CZr)5N@uhAWtz%Eiyd|NhDdlQF5iUhd?<v<7qe^Xc;%%SY94Omn)f9{
z5=-w}^7=q6=XO2Zc$#u82WZjmT1>@x@S}@rJA|?}_EwP9U-PtDuv2JCPRT%RZs*cs
zBMxKh7w_q%8givfj&=l)CEN%m$O6_hs|N`?f>cYwa!LM%Kdx^%bjDg`C(~R9=Fg}l
z?7!j9WUz8Yb1Lzt%QqeL+0ok-V&&ehV!-$o5`-JCTRXEE?^?5FJB+0z6ue?x?c>Xj
zhh#1m%-P$20gLg?NY&e;TQ+^64D$mVYTm-CA$QHG2Az$tff+T5H#LL?ZhYHBjo@x}
z)2;?_H|xtjYOJN{QllszZM+&WhMI+;G1ROojG<=3qlWM#+<ql*EG+-k2~7>z-G>@*
k-!7>^hqI`WHD5?6uXg0`2XJJ0VXIcIVM^4nsyku+56!Xl!T<mO

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-004.js b/js/src/jsapi-tests/binast/parser/tester/expression-004.js
new file mode 100644
index 000000000000..5bf19d9e5f21
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-004.js
@@ -0,0 +1,49 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-004.js
+   Corresponds To:     11.2.1-4-n.js
+   ECMA Section:       11.2.1 Property Accessors
+   Description:
+
+   Author:             christine@netscape.com
+   Date:               09 september 1998
+*/
+var SECTION = "expression-004";
+var VERSION = "JS1_4";
+var TITLE   = "Property Accessors";
+writeHeaderToLog( SECTION + " "+TITLE );
+startTest();
+
+var OBJECT = new Property( "null", null, "null", 0 );
+
+var result    = "Failed";
+var exception = "No exception thrown";
+var expect    = "Passed";
+
+try {
+  result = OBJECT.value.toString();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "Get the toString value of an object whose value is null "+
+  "(threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+function Property( object, value, string, number ) {
+  this.object = object;
+  this.string = String(value);
+  this.number = Number(value);
+  this.value = value;
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-005.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-005.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..16c76c4bf70218318d8e3d56d62a1f949fb366c2
GIT binary patch
literal 6146
zcmds5%We}f6g6*95kf*@!79sE6-tp{gQk&a8bqoPDiT#<h1`sr44uqG9;a!(1c^Um
z%Z|U`+T)CGVkdRdv?^Ui6Who4aqjW812G)LtP=DX4J(H{?Q+^DcL^cKX*ec(_2xnA
zeXElW7zxU1P7p_#sBF9>WCLaec=-|K5j~FCKI_DkQxT<!f(p%dMoyz7oW}YCICn0>
zO1XlHLJ}pBC;;&G^^heZI*Axpa0%@jqcg#yq+59e+q7!ccKu5;DC_@%vIfCeEj7Op
z3C3xx;Ld0~wD6t*9y=d!mSy1V>z$o<HtYnxtO6J4UGKrlGs^Ah*oqYc`WvvXF`!4a
zudQ_j^Z}TD(0cRztsR)_kK;8GQ~KSmw;MIvZ%hbJT0WO(JyuHCs05`8rI<RHc8P%2
z3eL9#6|4`1rx<5y!C9eI8pmd-TG4^On5ir5tVcaR0Y@`IxoERY*r6*t)UX)c*l`&b
zq*7`ZDDMtsATp=x9?r<DjW|foC(vTX+i4^1+CC{2`32=|Rrp?%P(C((5vehg^plvK
z2*RUo&xog%A_=r@Ho`%=0!WWQtXrj}gC*nOB35`<x1dxD<Xq~DPY3;OzO+AtsKLQD
zj2(rAIpV2F67D07ViwNN#H~CcrQ@KBth2s29?~qk8FBmz&RIe<%kA~_Zc^*nd4~;T
zUukn_1xmgE#AaG5Kue;>(~$$aDCFf^xHcb~^F{U5aoRa0J(`3uG^&%P8e6|7XUr^G
z*o>b-2CO8QbHG5!NkB#2t~xjW0G(_%k>{8JSmq$vHJQOadFZOI-Za?=nI>JjTn}*{
z5I$4UGlm!G)*e{jISsIX_@V@OMQCT2;x$z&I=yO4hZ$259>ATcKmXo^mwJR#<=XZM
zqbyCdZRjW@ho^3RCK<PkXdXdcr0t7R|KG)I3GrR7$=^@0&`5Hn$3Nh#Bm*v6S1~S1
z2{YFtH6Hx;KzR%Xi8OC<>|&ZtvGu(kp}^uI-O9fkOymzOENsG4hq-pBO<%!0Id}5j
zFdL5CGRt5cWE|@ixjHS=>%1q)oXGoLm1fM&iE`{G>?d`7N~k>2?S1pOf{W1=Kzg?3
zk}G+qzpI`M<Y~CMRoaAh2p$mZ5My?D1oZ;#m~arIdKxZCy=B|yLiDh6k(guSJfY^@
zo%AJVV&vo(@33OYEvLL5Zpac6UN0-!DeQz>wcu{BK()R>MxV;M&GPqJyEoGV&O+5=
wjtjaTaVrOcw4O5c*c=M$Q5SL0&@2%UW@f)#=}|lMdcb`m>A?%0kes6b54IY~O#lD@

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-005.js b/js/src/jsapi-tests/binast/parser/tester/expression-005.js
new file mode 100644
index 000000000000..c1e76b7c63fa
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-005.js
@@ -0,0 +1,41 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-005.js
+   Corresponds To:     11.2.2-10-n.js
+   ECMA Section:       11.2.2. The new operator
+   Description:
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+
+var SECTION = "expression-005";
+var VERSION = "JS1_4";
+var TITLE   = "The new operator";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var expect = "Passed";
+var exception = "No exception thrown";
+
+try {
+  result = new Math();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "result= new Math() (threw " + exception + ")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-006.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-006.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..d19dd551a8d26becf3efb5d3867e9dc4cc9e56c6
GIT binary patch
literal 7177
zcmds6OK%e~5MJI7Aq3(C7ji6A(DG^}NGp*vK&p^dP1-ARvu?8Ob~o}mef$qj{4s>Y
z2?-?r1v8F!?Z!^xq-jKZiW2XB_RM_q&5V=hopwl<^DRpJ<#iS}8QJ$Pd!Dx)`^R3P
zTwSfbtu^8{_40G#nS2-|eEIuB&$|Op<@MLM2n)z|NLOehB#iJNjs%piz9-&Z5cwyu
zegn>>VOTK}P=W6SQNS|*efzRcBOdGolnJ<q?5jg3oCQ&H`37uLD;4YIwQ7D&{+6GU
zAUak}JYNYoWh4}E2PEtmc=rL19<>=w5-|4J{QSc6-NZyrcbF5t%gc?gz{>}OnUCuS
z8Plgf0DFo)-70O=Cgsy>aP-yMi!ZND$4uXkzozF$w7XueS4yVcIw2gHc@NQAG#Ams
z9AqzKV{BpC^d0(hdJeq>TNO4xRyRKvN*fb#>UBVT^>T4>;f)D*3Rjjg1*vhu=|0Gq
zNM5BZR=q2dFjTLKHyZF0RVt<P#z7s?VF@RU*J;8BSSVq2bajr?n1FRhnm|~ygN{h7
zraKse32?|jz&}A{qpTiR;-+bn5ae&5l!jOqf{3tVWtWF?oo133(jD%xpxIKTNUAyl
z&8m%bC!GPLgCizg^U%PYGBD%4g%u8`8=!g_a<^(`Uo9K`|5XyD1KNa6Xh|%cBaZTp
za34qzQonyBrq^x!h0_=b)Ekq@ba1Fq^r%7G*j<{okKxJ(fLM)l8EB5TSbS)~&IouB
zyEr5i)EnBE96#4dl1!MNb#|=ki<nZvxUuK8NaTmm_NOC?&Vm9y(eu*4(dG}}BJ?Ci
zo7<2TQ%VdB;96l7hMU1zQKg4kQNzQXu4xeaZtq%&lVywy$QX*G&Z=UFhX$_7smmJm
z_b`w(BWxfPz$g`bNjXs`lS4s6f4B(!nZ%(_{EaxAjE8QaKJlZUyWc^}yF)$ot1wop
zrc6lTV|Y%mT(&?~Dh@B=MZz1cVn{j(6`^Xw9m0P9dkFp14sj8rQBh4@qN9u~6|>M2
z8d9MMcflCz;AD(EWTulC=$=1!J{zG88Es5kiFL(7a>YViy*9()gCASv&LK1o{C7aP
z2?yeFw@EdVDNU-rpIs5qBd_ZXU}x6#LiBq_X;g*s0UGrPuyu{<b%$M^(o^WWkIB`O
zdXIsf)TE0s!HK;{5^Bao7*+$Jx{BV_4RHv!^XzyAqwV>Cbez|og7drGS#C+($*qa3
zewXXE3h9rce$PBHqo~KtaZ98{ZU%-KxB)Z)ZOnEc#1P%Hp*kKH6VhV14bkD8g9?%E
zOGl`F4V`Rg(?h18`VM2t#b{N-!3<1)?sTswjna+KRaz<T;I8m1Ja`v2P5<sd>R7I0
zlkPt=ww_U6>X|U)l2xDNn&oCmuGj@rgEaomkZXO|FIR1x)0TQUq+urJrK?;uqb3*Z
Ng;*{Qx%;%%x_?Y`5W@ff

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-006.js b/js/src/jsapi-tests/binast/parser/tester/expression-006.js
new file mode 100644
index 000000000000..2ab13479a1f0
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-006.js
@@ -0,0 +1,46 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-006.js
+   Corresponds to:     11.2.2-1-n.js
+   ECMA Section:       11.2.2. The new operator
+   Description:
+
+   http://scopus/bugsplat/show_bug.cgi?id=327765
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-006.js";
+var VERSION = "JS1_4";
+var TITLE   = "The new operator";
+var BUGNUMBER="327765";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var OBJECT = new Object();
+  result = new OBJECT();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "OBJECT = new Object; result = new OBJECT()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-007.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-007.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..39c1bbdedc646eceaf3a19d9e7b7ec56770932c7
GIT binary patch
literal 6728
zcmds6O>fgM7|!@cAcVvPamsOMpbiNM39?G8?L?<4Otjk(<RxBfmL`?suIpdnpK;~J
zh2OyI)QR2NP2H}WD5oj4{rLTO-Y?H%!$E|rUJs+NdPI{hMSbU%<2a{DICl1%{$cxl
zJ4goD@haIKFCr<cww^oABiQAs$4?L?=rqE097KpBMv^##3gvg|oRc`5#`*;~TZ^y~
znn97!Au(YEfO>s1#4#gh1k(&IMtv!C$|#Au)%$QwyHV>jKl@%q{N_~zh>F$D_O}Sb
z6h#@_1&W3m-V?yXmjjB^6qJ3vyZcUu&EYGV;XHBcZ8&*>sJ>m5Vnu`g1ne6$=t<*C
zdtC;-3!)#k-+X(k8|LQic!R{`dUu+gRzufYC4?m{pK`Pwc4ItpA#@=W69dz(V9-Xv
z`8Gog_aX2y#>rSPMraL1kvy862;e6y<4RT5BAy?DqA5d^b#Tgb(-j&DSQTB$aTOJK
zrW7h5+8uI3q(;>(l;K_*QAjzTAQxlWNm@x)*D1>)KOnrd2;V0$qGPF-!*fjTeka0b
z%%P;)lgU%0A`Y}8FH((k4UiUwSa+7@3c6CkGFDhfR}!iP@+8$4p9cE<`>FjNSPcr>
zFfs&|$`Q+)#NiGQiEudI6E{~Pe}gny0L}VjJv|4{QTQ^z1Ktnmy02i$XMpG@ZUO4D
z9!*9D?1F&*W9z{Q1@#68>*MDUO4Bv-vqQ(SzGQuMlmzEa55-{wjcVRht1Q^(J7x}*
zHsgN)mqSlA<FXD&D9(5=nP^vymw$v#wj1+0CIOZyBzuzKs!kSpmB-1kUvC^V{YG7)
z<Q!Jfj>`%isCPy#oxB_uT8e6S2d=qDh|EG;Q)cs_hEo#coj+_Y0CGv@{Z%ED#@i6<
z+h%(okECvE>flPeKF`*oQm7_ZXVo&dsb^}41-)8?hAGZSK7g^cKY#R9k6JJ~3%7D6
zFCFVU(9~^ytlP59!pLQ1V3s|q|0IhyBtn<yBbJ-9>WP}`Ik}S4?@(5q0p-&J8y6W+
zwV#D+EckDM@&E*4$)wBFgK5^q+V`aOQ6*m`QK)CQT9fY<W|Oxr9QyFuBqzV@(igCg
z@6DflX3b$95^@DpiC5(6bgt%(UDv3}eZoiX8cMP5lT5K=NL0MmPE}V6cUupC*D#xI
z2BhV{^$Lt%R91J-<xP*f`@x;ebnpXz9V#|#ztsJxQqb~JP7HS&<`KZw0ZrVtpu~dA
zXF|0UmxrW5aTB72oMoj*wWTH0yy08)KDm(jU-gC+6UK6N!$J+70GQR&+=7Nq=3E%k
zOLFd4*!UPO&2z3Xo1~L}1{fZ4#ELn+iN!f{idf|rY7gSd$zo`i(IHk%>`|6x*`Q#i
W`U|L7)$K19%tci!E_jGE)~&ze)rS87

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-007.js b/js/src/jsapi-tests/binast/parser/tester/expression-007.js
new file mode 100644
index 000000000000..3e01e0d8c90a
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-007.js
@@ -0,0 +1,44 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-007.js
+   Corresponds To:     11.2.2-2-n.js
+   ECMA Section:       11.2.2. The new operator
+   Description:
+
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-007";
+var VERSION = "JS1_4";
+var TITLE   = "The new operator";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  UNDEFINED = void 0;
+  result = new UNDEFINED();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "UNDEFINED = void 0; result = new UNDEFINED()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-008.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-008.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..f09c68a792ac9181f4be0977fd7a753f1c417fe0
GIT binary patch
literal 6615
zcmds6&2AGh5H|lHA%w&MiPIj7DwHB|K(LKO(;!ksp(3FYC*)?`WT~?od7Y+t6`q5a
z;fA>J7L2{#wG%t3lctf{Q?#}HdFJ!XHy$_Sqah{LuupJQJ!EN*;Q_jh5IRny3EFG4
z4%+Y9-E>G$Sdnu=8fU!v=Q%=;VOD4^Kf)}=$CT`oF2xM<I87u}q`xzC8Yj^-)?dK6
zbrDv|Bvc%sIEi@)U~b=tNW$Zjm@o;K;DI(e<19{k)d#RmyI$)wKDWY(`de60ASPB@
z&Tqz?Fia)f8Kxr(?+M_M^C2Ty2F||P*?DWj7Vs5GT&Q-v11rxkv!|O@tVrl@z}_IC
zNA)l5brE_GOh0J9{{F@$X7fC5FffJRokpiwxBWH)!ZR$N3bZ~65;6`Tbs-f~N2FbX
z(0Up3ZH_q^K;p@W)4AZx&>E&xFO@60@F$}4%5>HvpC5sv8OMxwNXBjIN)HvRiLULq
zj0-|3l?#~lMuLdU>AHtA;?%|rB<B-oF=3swnf7d-q>B86^tLj5FHSI<XupuqnBw>m
zB_|xQxYyU>sia5%ZR?FplCA*KgNSvjv~V!c4larc59=1BYKfdnefjAKzZIqZ7r0^_
z{4CabYUN$ns`a(mw23n#q&1?nD3h?DjQv^PZ)Ekm4-P}^A5n+)m?U}1wt)MHV@e{M
z^ODbv-6H;hH5&>wA>-t{ONQdgX#2hbmCpdNl?Ekf!22v6JFqv;>jrOUBA}oolkWQB
z^AKm*n&Y#>Cb|U6)`O<qQ`E;vMBy%9^c`jt?1>pOix&1Prx3|jFzZsOp~NJhOx@_6
zn}2}IelHQFUIQ#sYj<^on?8Az9$&p_k+ET#aOrZ_tofy&OdsV*`JKy@>7Ut4f<+~@
z<q|d7TvNlm+pkeP%7|om2yNwHerswj^`KLpwLXl(5EEtTK--2(mx$r1##kT54GT06
zk{4-E!Fcg&GJowjTcU_9*9YyVrqGDsN{@elrlTPfw|hP*Q_1Ad<7hnM-vi|#7{t^3
zieo2JakO)P*CQ0BxCpoM?<V2-TNH^}@EW8$Gr8#tm?!2IPcpM~<d)4d+~j)2Se=&X
zb+(e?Ohiju!x^#9L^{?0p%S`2B~%{A?cJPRLGO4yAU$vU0gx~Ht6(=spow}P<eh~0
zgl8Kuvh~tFJ2UJ&Hxj`RY{3N>U~Rx6zD;0{Ft|YNT&SMriZpaM?n3mib5Z$O(&a_B
zFV)@_Mi#&34l9bpa<#&P5s~!V>$yxhWjf*3S$Ke0ptIlLMCJbqviuR=zD=qDr?jXs
x$E%APaci9cX}wRYu{j~EMqPnp49&Lv24-eINUBkrdNts#p=$7gcR^>F`VYHpU&;Ug

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-008.js b/js/src/jsapi-tests/binast/parser/tester/expression-008.js
new file mode 100644
index 000000000000..caf310195bc1
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-008.js
@@ -0,0 +1,41 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-008
+   Corresponds To:     11.2.2-3-n.js
+   ECMA Section:       11.2.2. The new operator
+   Description:
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-008";
+var VERSION = "JS1_4";
+var TITLE   = "The new operator";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var NULL = null;
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = new NULL();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "NULL = null; result = new NULL()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-009.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-009.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..392209cb016b9160ae3878ab88d350a07f9f1307
GIT binary patch
literal 6652
zcmds6&u`N(6b_7^5<*B^5T}UCh9=Y@aRIVQtSit_m1&7~;efoxYs1o{a@=+OSNOL$
zaplH;!L#GUUhQUX*Hvt%Dzp9hz0co!&(HJdXc*(V*T*QV?~}Ag(7?IvIL=WTPMn=q
zXU~7<chezuyc(b5#ZgA<YtJ0#5zO+`<%ftw=qSd!xEmvaXp|-#DwN-ua}p)td8|Kx
zbL%3klyImhbfP4pC4jnpE5r$njw4JsT!IGD=!}vm>DBMUHh!}aw7zz{n)sVn6Cf&<
z&*!%ziV2E2+$oAj8s1~T!)HT+vkaVlwYBwDhb`c1oH$SHx&|vx5z(isRxC*9Z@^w5
zp@+=_e_4dy1=IKZ*Wcgh#H^mj6$+F29khaWQ}<gHgrzK>Ftk2)6FhbybRiT|gVHWR
zXtUJ3PZ7lf2t2Mh84Jb;ZJ;=oOZkc}{0YmrQk}Jk=ZD~EMiHR_&ZtgZ>7jsC(WM=i
zae-w@;Q}JP5hEfqx^CeNJGC)^l=B&KF(yIUPJ6mfJd6B<@YW)HCrS{RNWUDGV~XQ<
zVth;;67~8rd5ToTfHvhuDoIxWX+gxYvov$il@3;^!os?WP%V-3R9}7?<hNjI{{^mS
z2S1IqoLYGgw(^66R_BvWovIPboCIhP7(#Mo%`GXqiN%pI2v>tqY)DNDFv#FOqA14U
z|G?v4ux3R{WLX}cb@7nhD0SZ#pz<joc2c(lb!nfZV*~b$*C$kL++ChN_feKDS)T!!
z$O_FnlQ`|3IDM3aF<kYFwnSCI4x2HxsIr|IfRZ&a%StMt*d(A#T=<Qfe}G<~m#~|F
z1em83Z%c)%K3P;I+kDf(W5qP)(&cVpRh6O)AmK~-ohN+NL$%oin@V!aC1SF=rh#a;
z--yvD!<^$G^qqs*y{o#^f>3_i@;C}ZRFt`;wh6Z~rs8v*vpkL)CN&F^nR+0kj9I8)
zy!cg_zjmC>QO4$Lly*}!)i80TM?Zj1XGqxfpH9k9Qu(tu8VmhfpgaJBXqsOW^<XNF
zcINML5`~&vm|OXG8`J!;3WptdE|RSq-}E`mV{?l)n`t_7%Vrs_a=oBd&nN0-_L}TW
zSkK%*8P?B)JN5+<)g9)&>WIa0TX%0)&|F>*NXw4t1(2UNVD7fNzW(0LdkOep?>hO&
z#!LP5)bq03ipjy<fJ-m{>wtyARbUGtT#)ZfsFvokKr}dRLbR~6ssPRDa@7q?y#E$P
z7QgBa3#N(rs)Yq3EbOV(i<)psb;6u!;f<mq(|&^!<^N8|D&FbEnCZ4Dh73<LV#J*9
ql-;yPY%w-N#A4JW9c5^``ByMA{nb*8>g0<7a~&0f7d##sOVvLZV`>Hf

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-009.js b/js/src/jsapi-tests/binast/parser/tester/expression-009.js
new file mode 100644
index 000000000000..9a997d7fbb25
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-009.js
@@ -0,0 +1,42 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-009
+   Corresponds to:     ecma/Expressions/11.2.2-4-n.js
+   ECMA Section:       11.2.2. The new operator
+   Description:
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-009";
+var VERSION = "JS1_4";
+var TITLE   = "The new operator";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var STRING = "";
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = new STRING();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "STRING = ''; result = new STRING()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-010.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-010.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..988918403d223d43870d24304b8f5479ef43e1c4
GIT binary patch
literal 6623
zcmds6%We}f6g6*<5JF;s#D-ZG6_i$Dg{F~68q`!FR88oH1#)NHWawlj@;FWNEBpzc
z!j=URf5ElKGj?Mqb<#9ayNVLq$G*qsz8s&8hB2x7eS*X40Zn@p571qN&~X}0P_5bC
z?|kS4>5w45BIfvUl(FjHmk2$DS-!sf2-653$7GiTF{YSBX(FIP^*uwUQ4(In`U5z3
zF2hQxfQmvCB@rtD^zEA=Nmz6e5h~ykJWz+u7>$x%^$~2-Y1F&TFKxdffAcF6M91og
z`K^c%iemwHhU1Ze_YCmJ`H+$<17qK9ZEu;d1$;#i=gVF1!OAmC&FT6nmL&8yV6TzT
zqsC!pRfIl(qwjaNzrQz$SwD|!6ehR3+w8U)rro+A9A){OqxFfGkg*4@3$B=2ly(I|
z8>Qwu3^OtS#}kTEzF_sxI*wztRICW#C!+jHH`c+QpMaqm!<2PN#!Tu;3ni?MuFi24
z6L_SQCSckdaUwFS=?=#5TN_gdIeQR`3GJq>v}f8RqR3BhZ^OfDQG)42*@bwFDXt&I
z<b)v__4+D!%233CHq}NtN!I}BK*Xw}G&j&w2F_E3!|CR@YKfeO`tqwqeoKb-Uto%H
z@zYqV$(0XbtM=E=wZ@@Iovx8KsGdeakt<<U=>XFN+{zTld4d996k7t2&XZ&8=5U{I
z6qC@Tz2tLkrNlot&6@PaV>vkw$dK2KrtM2m`2rBzsaJw}tWVRi1$+IxuCYYpf`YtE
zg4OBs0B6~X_1UEpm4`+D5vRc^>f<Dgp`b6C4_yT{K4WUp+@@s!N;br-@}+{}lYlZ=
z)>}9K2o--X;rU(xERt|{l)`nJ9P*EAylIoMb~J9%)oLxi@2q@KI*_!b{GJCY-9o*k
z1jLfua*3R*uc>1e^y@JmWkhg1gzj=MyF=BNIuI&uTU|$S5FKS<sck~-#Z`QvKUUXq
z%cSN&^1LWiFkXD>%-=Z97D!`@wL`n99%{I_(&HZx)zOghBA-o4SJL@&xEcrjJD@y<
z1F<wOa!h9`u6E|<Y668GT)0{J_ZDIKlN1Tt@F=7jG_mO`n8)W9FEi70<R_bTaGmQV
zwR$m7ud<`$cfvd4I?jlBC&I8j2vqmE^|~Pr*X`V+T|*0bGaw!7{ntQ#o>q6Z-g<c>
z;q8d0oBZdEH|Evpm*uz**MheJ6)?OBnSh17bzlb-ToUYTsE)_wUT87ghUjq4dD&+{
zljoIRvcD}3S$yg{EEyvfOBD``aGz&Rk7m*+-3WV_g=dI4VfGu`sQAYq%b((H<)j?4
z#uhndd3}*1_F$($8t>F{Y=(&Cs7*TB&~)doVP@vTq#QNLmjm`BDhDrlAGGGF|NZb`
A`Tzg`

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-010.js b/js/src/jsapi-tests/binast/parser/tester/expression-010.js
new file mode 100644
index 000000000000..f8ad983cc480
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-010.js
@@ -0,0 +1,43 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-010.js
+   Corresponds To:     11.2.2-5-n.js
+   ECMA Section:       11.2.2. The new operator
+   Description:
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-010";
+var VERSION = "JS1_4";
+var TITLE   = "The new operator";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var NUMBER = 0;
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = new NUMBER();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "NUMBER=0, result = new NUMBER()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-011.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-011.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..b61edd52d2096810afab769b198edb0674802dc6
GIT binary patch
literal 6754
zcmds6-EPw`6wdfZ{0NB~#0|MZLlYX4xPq+G+7;2Mv=gm%i@e5b!_v5N+;zR-L3kS;
zgIn%+3yxhUb`z&{yQ~tsno`@J&+m86@jNyjg}CAkF!C$Ml=LYYI=39hIVJwosWw_i
zoe!NJ8DYoU6??oeh*{;!3&(j3yFC5)38Dcy4e=rFg@_^+kVruJ>N|GMgUFx9`U5yy
z%diL)P=W6RQNU6F{rZNFBNm(mm<qTE4VBO_qe0ZK+=pvA^;);lZh5=%H*Z&h=vW=G
zzZo!0Q7GUpP&m%vJq0{`Iifg@LD{$O_V)6y3H+`woF{L+4JR)U&2QJGSks`t0egc6
zJ*j`~lx5JnAo@{f@7w#lVK#5a4F)FHyW8kC>v_HPfUpe9XB=&S-3U)yNL@%pVu-XW
z7_^?oe1{>1hmd$8;#4jeGqi@nP#qN~dhiogd8I3Bk<Sl7(U>91x;SQe)1?|pSRGx-
zaTOIfQ%V&O?T@)3Vx#I7%5bkuC{WI4;9^X>q)GaDodk>gg!Im3cr}O+ohrQ?&M}Gm
zoe-ZfhX(zDB2P(09B4;fq#NlPAT110HcN8_U8UfnsIZW3L8_+6GpbKN4dJ&Ywf_QD
za*oepl~*gP?RK+%u%uR22?;TZ3XA1dT47Uz+{99N4_pI{z&JDzk)BhQ9M0iBp&-P5
zapZ2UrTDwKxZ|9TFMD{z`^UWQYnbvmAhw8`g1T%#$;5zt<Kq+RGwziapT{VUOODSj
zovL~)=8%x|&Yb~@{16)ZWC+otpvre-4lNvBegK0mB~i=a<&h0mIfTp^p<O+K@nvyV
zwD3f00=S}AYqEGbE-VCT%1Dn`Qj**@=SFST<U-G8PpECPaT5D280b`UB}&LE*e5(G
zTN$H?mKWn1V!c5vMB^BXrfCGz>#%qN)}^*+7`T9VvCCEt;T`Dhcy`Rq-^%MM8^q;l
zw{Faz0~lWW5pP`;z$(4tzS3<)%h;Ao3nO!=B6iEhs4k^a`9HDQ3gvONaqE!i{^!9(
zPQOF7a7L655o~G<9t+o4#J>f~0}zOjS@Wa<F6-LD?->c`p4Z>D06Wz#3sH22t2M)D
zVzz*zUcx@UH+lKVn!`*_i4^+nYsTt)Jt%Wx<v!t)cMZh`f)k3hfvE0q?R7;g+-*Gr
zUc-p`e?VH!5wF4cvU<DwE~8`o(VdMc@W~&D<l^?5d{*f`v%HRngu4w5HX!E#O;K$T
z3`;oAglZ`+Pey~{CPWK47ZoAhmX=UO)1+*k5+Ren`VDJR#cCD9LJgk!%<65fq>gX`
z9(@9rCTweLUgOz+1Gu}g4Ygb{(vMs-JOIfRGaqV@xu<fuRuJHF)f86RQZ`I9%sBrx
UDp&K4kqhQJD;JkMQ5s9xKc!uSPXGV_

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-011.js b/js/src/jsapi-tests/binast/parser/tester/expression-011.js
new file mode 100644
index 000000000000..8337b9b76b95
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-011.js
@@ -0,0 +1,43 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-011.js
+   Corresponds To:     ecma/Expressions/11.2.2-6-n.js
+   ECMA Section:       11.2.2. The new operator
+   Description:
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-011";
+var VERSION = "JS1_4";
+var TITLE   = "The new operator";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var BOOLEAN  = true;
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var OBJECT = new BOOLEAN();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "BOOLEAN = true; result = new BOOLEAN()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-012.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-012.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..b2a72d1f0a67f74ca7dc745720b85d5d532efbd4
GIT binary patch
literal 7215
zcmds6%We}f6dm5M03or0Rn%1xLMi1XK^lpK06`^1O<IW+ax*3wn9M{Thcy4eia$eQ
z#g30a;$Dwu?8Z*&q|-?4DoSi0`yOAP`$&b4h9Rw1`jq(9k1XynGVm^Xo_7%Y6R*~6
zy>Gv0cjF=TDrGUJ5(Wvc{=4gWH(^#qU%pRRKn_Csns!6N2oK^&K>6x>;(ZGu|0vcU
zz`1Z7R?Gxc;Cn$7@EkzjzUkA52VVlp1YAT0>d*;iLDZ{WgKgT4dZ)S5s+8q#m9hlU
zvD#w(cEBkkp@92N!jXY@3-IXSkkKRoV;^oj+B9J^__83bB6qz6E58$FPS;PdB%!|m
zdxeDVH+I`a5qbrV{=WU_^AnSp)$_PQ$3(k3&CYhiv|D!wN4LC<Xnk6W=(q$=7oK8l
z@wC+w`g?Vbc>}hp?Y(X7eW*2d3nBF?AU@uF{`}cf6Yd05HgfrBbHeEWG)z2RB`a33
ztCKKPOT~&V{6v*R>3-uNjYwF+3F94_@HrMrSRGxR<0K|v(2*t()*B%aiPdxmWAFit
z8L0O=2y2ve;_bL++9U+|Cn%*MmbD-vY@+P)P_DC=<c0JL_gK*Dt2iW89f2OGjdYSu
z0n&kpq5~cpSW*V&esA##htthby&O4>n)z4DMoUIXZoBwttYXp*l#X_1x7m7YQm6Y!
zi;gv)EAl~z6NsF~Jb_?%2aaew1IKWK2ki$Yu*`U-@9tbCLP#*Afuqo(o%$6!Qi^bI
zNDxxrLaW4E9glx)&T%?V1;Y?M?9w4t52o!)P<aOsTX87|E%82!#}@3|PtRkbjt)f+
zhqPOqe|{uMQm}t^*hHleC@TkH-2LYDN#uu6)@3EA?gcfRF|}xJ={m6KzLH%9g>nd#
z$>Pqs`75aVdJ(273Sg03VM}?qZj(dkbk&=qAq7o3S(=FZ&I)Du1Ih#{`%E8{ZlT^-
z0K}Z!X$XByo$zkI9+FW)1;<0^F$`w+DfFcdgo@i%*O47WM_Jg_9zfcNUVNlWqCDlC
zxtasX^HeBfJp0s{KXaTd5XKg(<X*?R)Sz?42VX(ey&=Q;girFPr1R%+H4gsofN~uU
z#N#x{F&|TQwKG495ei*g(5&?PHsxt!lKL%Z4XWBwY<dso;oPi0H%&)+vRMb$xn9y&
zj|w$jY*EE9-U$}<b&^o?PK05fK&URG^|~Pr*X>+ho<j9|HXt4I{S6>L4XdRs(Y8z1
zt*`ZiwfiqiX=RZOiAr+)zIm7W?Ky6Y&QV&2lo(otCSd08I<SLV9HV|VRLA4uv$Pm)
zLv%Rjyl}Lj$@B8D8FjF}!;+%0SnP0M1Vw;5H2|eix)FBWg*tJL?*4!q#eY#U-9^{2
z^lg(l|KG?lTV|>cO?5xykfjABN9?jG2T}Np|2^c`4DXktHlNdmrh5n)W@2_{<*0dU
Qa=;#r<=`<*QftKf4>7DBk^lez

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-012.js b/js/src/jsapi-tests/binast/parser/tester/expression-012.js
new file mode 100644
index 000000000000..69e39ba47c53
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-012.js
@@ -0,0 +1,44 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-012.js
+   Corresponds To:     ecma/Expressions/11.2.2-6-n.js
+   ECMA Section:       11.2.2. The new operator
+   Description:
+   http://scopus/bugsplat/show_bug.cgi?id=327765
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-012";
+var VERSION = "JS1_4";
+var TITLE   = "The new operator";
+var BUGNUMBER= "327765";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var STRING = new String("hi");
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = new STRING();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "STRING = new String(\"hi\"); result = new STRING()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-013.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-013.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..2c33b5a9c52282454cac85de0787e40eaa58d4d7
GIT binary patch
literal 7198
zcmds6%We}f6dm5M03or0RhC5vl~NuOq(Myx(5i&0NxMZ(#!ZG!W+IQ%$A7Tm&yZNL
zLt?=vaIeQRc48-W(rKi&n<}w=?0bBD?jvPB9E7w|?or}bwprX|r0-qzJg*)5Cth`<
zvDtjn?8F1=m6yewau_7M^7o<V-Gy0Yefb_?0cnTyJ?(^q5gx>mfb!Mn#5)Kge-!IC
z;9NNkD`o;J@Vy`kcn+X%zv0t}2m1kK0xlwbb?Ah%AnI0b!8Xl$t+nx`QC^ncm6s)m
zj@1<Nw*pQX2?g9C35N#WJ;0;K14fesjD7lSWz~eu;Fkq)Wx4A$Sb0d8IbA=+oP_=a
z>;)3KSKnzCMd%GU`et+G>kE^Z#q+p8$3(kZ8?CLnX}9hWj&6A$(R#EL(W4SPU3iMI
z#nTo~=&!{&<{j9oy8E%Q`?*@*DTLIUfVlen_3KwJO}H~qS<mI8$qA=@&@l0Mm8@9B
zu13O8Efp&|@D)`OrTdM8G$LUMCycjf!lzg$VRdwMj<cA6K}VWESa*m-Bv#WMjKK$R
z#6Z12L0F@#6>r5|(<ULvKR_uBv8)CWVJFHi59K<0NnS|zxyOQTPsJgr>In2iZKRWQ
z4v-E+6dmx;z>+dB_j`+1IGk>Z>gC93)XYCxHkva^?%OVY9IKeL1Es@7i5m1s^SL4)
zggC*l-=>y0AQ)bUBjV+bBy<gUg)HbyOoL!P{QY~Er%*D-8NaPdnff55koXNli(2Xr
z-!Wz*+y@eb)Svvk7RTcsIE~>B=kqu)@X+H99bmm++CB%B4*;<dmvYb&@3HvEf}Q*6
zWlYV{q3H2|c8c@QZIUDf`)7-tsH6cEuN}sn1FuISKZHUqD>`*AsN#&VMN^B_zD?<s
z&?+eOc%V#{bJoq*q0;L{n4BnpS+avQ<>9(b4#Cn@Z$^U%nsm0r5ci!Fyz&PmZOK2U
z4@$RCZzTX?PHw(LPS)4d2=DZ2AsHrAa6EvnLVt2+LSO1YsJLx)9oa#2l$l-a2_%Z>
z#Uo)<dCDboH3yQXsZhpv_FrfI!f`f37@MtjdmrmkgU%JVzk#ZI1BMj|Kgpkx&Y#28
zIQYK<%569hkJBW_d`#KZPW)etQ0U@<W~HCEC{J6F)NepDP*sy+(?>85=Vl$baXQkI
zO***F^_;#sD%3@0`*<f<#@9$f%{vi>?SW8TN9%P%9Io5Bpgf0q_hLXg=KD{9{4}hV
z)<mNYiY+M5mR26WEv02e_PuCfEj>0bQolOKUC}d2OOOvkXV3)9oLvWY@QG8T&xY!F
zTzr!j!)=HT=bRRcW;A(PGB%+I)_0gwF=h)K4ve4zaHoEsG)gzZF1k=8P7&SjaHII6
zNhZ4JI+iwVlKxy{OFi|Wv4(~mvPzU3vvi!~h+Q)^NaJS?IX1!j<*3c)w4w0^f`*xx
W%~&~V-kKb+$6`5nN>9`p?*0RB1s8Jw

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-013.js b/js/src/jsapi-tests/binast/parser/tester/expression-013.js
new file mode 100644
index 000000000000..f4986a5c02b5
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-013.js
@@ -0,0 +1,44 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-013.js
+   Corresponds To:     ecma/Expressions/11.2.2-8-n.js
+   ECMA Section:       11.2.2. The new operator
+   Description:
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-013";
+var VERSION = "JS1_4";
+var TITLE   = "The new operator";
+var BUGNUMBER= "327765";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var NUMBER = new Number(1);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = new NUMBER();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "NUMBER = new Number(1); result = new NUMBER()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-014.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-014.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..80dbbd50cb112fdf4c2be739841958a57df43fc4
GIT binary patch
literal 7117
zcmds6O>Yx15M91O0tDg&ryN^V5Xx62NFz0AfS@$3nzZ7E+^m~yyV;GrPSgAmB=~0_
zPDmX17mU5$wHrH$lWrr?Q<T_#_PiOt@k|P|-}7;?(80(p?vSueP}jNYIL<-n4xLi9
z{;Bb{(F%LmDdhQ_g6~DN`0cUd+=E#Kb@@Ib9y;*xCT{tNAnJtyhjQij$T{``_bk>Q
zz_~IFD<mAsa~&`6XbPZiUv+Uny+aQZ4i})VJaj~f7qpAFV4Fsz+^lZb3wiNdAum8w
ztOlQ7^C%|B=Wr*;?`wDu0S}+{2#z8!_UZH0SI>?j9XZ({&$%mzjjzGt6GZgs>Otn@
z^e131kkkFjZX+vBZ^F?l<*kh`t2#4_C-V2=h`a$?HLJ~9MYmgx2+PoXz|cB47vMn-
zt}k52&=6{iC-m3i2)zSamG(Z=_qIxv-AqVjvH9}F+S;4fI@~#^tfUgsporow=or7f
zQd*3HS4O@sm+}=Y_z6pyQsc%#9vNW~MT9nSL?>7%U{!Q^j`Ntn5|1zek#?UE5gARl
zFos=#0RaX72&oN|W>^c`x=mb>zk^h2YFY9EM26BXhv{{4lN=u(Qipi$j?6_u))~->
z+(;$q0w67j$U5mU19Q^AH0}*iVR5<%s+S_iX*2z5*l5l)dDrClQLOBq9;NN=T4iI(
z)1!_DO3*Q~&v&Vr`%7WyV-$>cTFULhUMN4{Sj@PIFUV}DXQ~ZPw7zf9H1&E~W>yCG
z9(g`?C-Av29{(<mN0uJ&X$$w*%U-vA4k{l3Vm-{IpgGzh;lO}>>Ejch_HZk^_}oEJ
zlyQ7E$xx<tULpEn>)7d_!1bZzO3Fhu3QBCo$fAj5Wnj`{sfH4YDF;v{3NPd48&H$A
z1NMZF0JG%qbs6ERO%^H5R&Opu>Bps*^acrI((kcSsV1sbKk%Hgn=TQP)iq^ATb;6x
z`Vr<N_n-mL9p6Myms&8&-7Wo*97IK#Io4L-J;%cMOahXja>-)Nf@Bu9aHotilrWxr
zs?7g)oXwEOW-GBaLse^7aD@j)z^BtAtZ<;i^eU<RS-8d`{w+{$!+~fRzjE};l(=^6
zXEs8iiVHI<{$9g0?iymZ4t+aW^zlufz&tiL>70$y5ua?_!Bwv3jMcMBon@8Ee8Q^j
zGK#S76K>dN5UT6UdesmMcU#we7f_b|ACQ(0{ydN`O1IoPZ>WiSYH9ghE-oyR-{b7N
zw5+>Qb)MzEEH-jW@Fa#7o(`CVy9#U(6;s5|glc(Qb}J2rn-DF|IVl^>X!4}@m}to-
zhfF@z9p==G*;0oEBTNIRRbx&Vr5a(DU1)VoklnA~(fhDzBD=hkF#5iX;(u0HSQ&b)
zV$|4!P{y?XWW<=EIV48Rx~V{Fe@Te3G4U@(O;M)|jdl?f%t-H>ic#HfV!)h_#o(0o
Ir7`9G0~Z4RqyPW_

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-014.js b/js/src/jsapi-tests/binast/parser/tester/expression-014.js
new file mode 100644
index 000000000000..ac2dadaec5cf
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-014.js
@@ -0,0 +1,46 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-014.js
+   Corresponds To:     ecma/Expressions/11.2.2-9-n.js
+   ECMA Section:       11.2.2. The new operator
+   Description:
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-014.js";
+var VERSION = "ECMA_1";
+var TITLE   = "The new operator";
+var BUGNUMBER= "327765";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var BOOLEAN = new Boolean();
+
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = new BOOLEAN();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "BOOLEAN = new Boolean(); result = new BOOLEAN()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-015.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-015.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..87a6c892fbb55b76dcf2f4d93e8f614801940a1d
GIT binary patch
literal 6274
zcmds5&u`N(6wdgKkPs4r1E(A}O;9G_0$G7|oz|)9CR*)^+{SCe(xh_Sb^R;2^Ph1;
z-1skecAVIa)7I&-^5aycwm<v5_r32u+o9u;kE_lABe!}&!ahMm>xN}n-O!y{dyUpn
z`)#`yj<Dra_#DUgB3k|W)UqDHEJs~_iin50KHkSY9}z^oFyK(G{En=1FK}nEege+M
zGOUnrD9^RLz@sUEx_!gN0rk#2OgLPChVsx6C0@|4-i2-2^;)NK+;S@7Kc^x<RIE0i
z-}ERZ$mehu$RBHX4*?HfjtGt-F!uS&oi{pc0$<^dbHuJUVdVuP`gHXaD?0Q$V6V}k
zr}a<mvK)FFj(*hM`TSaU%=-QKV|{*Pc6S<`W?i>iB}4&Q9*lz?%Rsw^d_U4*ui(yl
z%J?=#6b~WoINxL@<mM+kh+N87^x!Wnvr0A9Ae--l(;|up?cj(muu#CN=<*y_F@fo%
zFaeSNm^mWKHQm6NM}RdUAUKDh#F%u#X4uzl;u`V|l3UB~Jug6HD($kE!hmjr4uf|3
z_>5Y_>kp)K3L#=Z+j1k-N!I{r;E1v{ni*(I15@7Tu)^SU3lcR&j)gw`%-QJg7xp{g
zH7ILiKPRzNju<KugF8T;kKOr^SYLts1*g#xC>xV<Iu52$__BvbOpA5fS8(NHKx~C}
z3To2<2`4$&DFOe-#)A<G>J9Fd$IlZKMJ4mIL#DF6@UGeqd*{{w1+EWmYSL1xEZAc+
zGK&_r;_rdU8kuDskWg$AxJ)#wxtnK7beZ+-7TX<~XgvowJ-aZhSz#zHPhf4VRrap^
z>ILuAkIy!@-syV@jY(5OcwYQH69?t$!wwc-g$_})?-5{K9d=1vxRG8V5?mFihG=h4
z^U*lMye5y}YBZdGy;7GN)FU2L-A)yyFr&7ibzq^Nx!kSDsE=?n>IbYdk^n_olU-?>
zYLkIyOe>fn6l6}W*d!rOe$`V-lM7|xpYvIPYL$@+#=`~O{C=p$pOGu<egS`4Bf@%A
zI!$tEhI0m?G2p)e$~`y`4P&{HgiAuY^fxZBYUI_26TnWb%R<dtBNeBKY5bmo-4?uP
z$omD~^ci5YxyiFa)*bQ5vb!eV>h3FYwS^~gC0C8IE<`LQ>|$3#5!PeE4SNkj#p+5?
z(imScuHgpsZ$KJWUiJj26kI(_D#HvhS={YSXln7q)&cXVYmneege?!%@VG4Fwn{sv
zX<KVx@}l}Trwvl0C9}Fv?J8Cl49sBpO^x1nmNap!=)|%NH@#U&UC`Ub&)pv&%KW)I
zTJVl6#&TW=#7MrPDUjMrsu-KYUNM@-8D%JYi&ros{qanU>RuNE`IS-(E_uV^nyod<
FzX4OU@EZUC

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-015.js b/js/src/jsapi-tests/binast/parser/tester/expression-015.js
new file mode 100644
index 000000000000..4febd4c3c935
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-015.js
@@ -0,0 +1,40 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-015.js
+   Corresponds To:     ecma/Expressions/11.2.3-2-n.js
+   ECMA Section:       11.2.3. Function Calls
+   Description:
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-015";
+var VERSION = "JS1_4";
+var TITLE   = "Function Calls";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("result = 3.valueOf();");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "3.valueOf()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-016.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-016.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..0632656da96188c756632a945ea6330a1f3d6f31
GIT binary patch
literal 6523
zcmds5O>Yx15Z&^PKnTGBiBpcPDoBwK2Uvn=nu=6WT9MEb5^{H)#B{S8d7Y*?@;CTr
z+z>bZ1!Kp%c48;>wrNCrs<w8XJu`3K%-CncL4+%Q52LVhK$9*-eeZ_nc}Gb&_O|QI
zz1G`SkPNWrm&G1GA}Oo<c;<NzV3)7|{18!sjv~B+g9uT?ND>REP<^M~F^R)ztUrLW
zb{1Ab1r!NA5)+mK=*QPX95d1(m<qTU_0^?QMoHYQ+=XLWwQ9S*-}KA!e|}kl=vXbW
zzd;zLC=zfdC>k1gj{py!4k%7jF!sgPt2ZWW245DA^W~{G;g=_fn%nhToYSGd0DFZF
zJ*<6hEz6;|;p%&>SKnTnj#<4Qf3MDu-0pV0-Kd#%>x3vk%iUod@C+<fQ52;n>;>Fe
z%NgHdh~Yk@o#30w1Z#fsi>RN9Uj*<ktg=cs)ghbjgVR!mC~M=CEwE6+>geho7cqhB
zq%;B1?vOhowVLi=%wxbBQ4pL@pv0KAlSa}tZ4w&t6O!A=?`;wzI#zahTwy@BL5D#*
zBivygCEcEqPANnjXj2`eJLwW29UQT2jphcHlz}<#Ev#_3-GW5Tktaf*e_9Uu|AqYy
zcn!+hFtQ|;&JjmN;&8i&L^zxuiPaUzzi=BPfo5Z}oQ{KQ6g~~`fNQa7`#D_s6cC$9
zDF-dF9!*9T?3{qtvGL%9f_j64<?-_XrRkFS*`{MvUqn|OCBd=RLva{Eo0_%MIt#Y>
zj+q}VY{fqSu0dv12NV?F1TK@!s`c=X(8qRTUdI$bkwWrbF<iIFL04V%rdSiPljw%<
z03=7>fivEK^3ur0Rxf;6R7t^q9dhbr^*#rX<@6Suagq=vb8Ay0QWKg4N`h>#fXz8T
zp03h!1s%xCrkGLoJ1PjXm~+1;5}_ZdkAAM#tRfclsu3EdSg>XQQ(%AoB&i?gKoP-T
z(>5KYaPn+Im&9o?6(q&|YnD6?PF|#|v+U75f8~5upfImOa~wkBz<&pnd%$*<OxiXx
znPx+5d@n~RbaCNkO}-nLO`eW$*o4O$HA;y?pTj=BH+w;ub;smp#)TzGm%!B~9x0X!
z)mYZ-$78~0*eXh~853dHI}j>fTc(7{A>7W>)FljiR|C><f_VbYU+0y*w6*b47TWa<
zGg>;)9HDvmOY6|a<59^3%owc$I|Tj=eY2rDUY94H#c&&<!#x)joPs7V>LKNDnO!pb
ztDm5fyHMFLRvjEX!qc2Ny=Y0JbR+D_3bXA3W&H{feF%qU%4*e&bn=33dH;|rb`g_{
u9MX6vmTPmEDpzg%(3WQ3C^XE}d>WLiribN%y*SE6Ylkh@&Un4E)~0{K{zfJM

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-016.js b/js/src/jsapi-tests/binast/parser/tester/expression-016.js
new file mode 100644
index 000000000000..9d0bfcef4e3b
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-016.js
@@ -0,0 +1,40 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-016.js
+   Corresponds To:     ecma/Expressions/11.2.3-3-n.js
+   ECMA Section:       11.2.3. Function Calls
+   Description:
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-016";
+var VERSION = "JS1_4";
+var TITLE   = "Function Calls";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = (void 0).valueOf();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "(void 0).valueOf()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-017.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-017.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..afd2dc722533a71d2c89709da600c796a7ff2e15
GIT binary patch
literal 6319
zcmds5%We}f6dm3m5JEy?!79t53Q8rUN@$2g(^RC2(uzdgf;;0T1I|ojJ5BQ|`~{!G
z4zc4exOSYe8#_}^JB?^p(Zu$#&wZSG?U0X01lPj>MsfXsW_^l=!R;Ujj<R?fY_~dl
z-S^!n8{r__kaI$kFkb)pA_yMCtk7J3h-iY22;RXFK@{;MOC?mSzgh4-N#nCve*ov!
zc~}{hP)QslX~J^=bNg0|Q=S|rm`b=54fUZJr%BqcKY(qz%|@@a-w8L=f8mA#F|oRG
zemmiqA|l~V5E)x|PXP~~jwogf$i9BNxn;x7;Wwn=LbdB1Sb2h|J>5LT1r7QOuvci%
z!{+C1RR+BWN8jsietBmbX7zUby*fJz-n~|@-L!d|0Z}3>cgJZYGO*S_gfJWS66S2?
z5#QyA;~}J-j5nPL&ioVy(M#ou2>!x4t4yjM+58BM#yFz9hZ!$ms9;TWeU8ge5IU(S
zAle@bLog?G4>HdHYeGSAK7kTr+RNHm-{vGW<Od|TmEYS*is)4H3WUOdZi5bkb`pHd
z1Df;)S~`^w37~bok!hqWfb=j#)fz1b)-=I9?j2F#ak_#;&5>t9pMN?w`u~OfK3EOP
z+L$;J%Zw3EMG|nkC?Pmr?upeE$iHwJD}fe$QccGpGzy<acqFvg=6(TFJ_p23R?9(a
zd_c2_13M4Eo7i}WfP#91qw3=G05Mi^eD>&6*B9AUlPvlk3{V;qXjA7cwHXE5V#dOv
z!d9F?BwN9(>wtz5lfY!ES#@sy5&GDED(aX9C{sv2=m<ACdFZOI-c;U1h+9lLCPeo4
z`^TC<o<53+^*u`~lc#xI0@&Qdi%ZQl4aB2CgP<|P($XWiISrTJzRaZ_W|cm-IhiP>
z18yBU3lYm_?tVI6Zdky17`aG`id=u~Y*wO}mCMte%oH3ET-nh#(Dq<NMGMQPc`BKa
z>){%Y`1e402nXWXtktoTY0<^jcQry`ii@B%`)*@Cdv3vT2Od21^+Rs@66T4y^H+yO
zbIeX=9atIJwDkpJwSy;mrBsco?n}Za;@;Ol4BI}D#I``F?h5uM5f68J-$1V5f^<C~
zJ-dGKJSJ-E8&zD_UfG^9ed7r$Twhy*wii!oHsCy(O<)hFpQCLqRL|pzq;n8=A$pv%
zsMwUGT-0-^%h>#o^IvlZo!F&He!0rvVG)ty-0KBMkupiRRTb`n1*-ZLJo*GSovW%-
zFWBtG+3{YWM%)6X1_h+`uByhCM5-Ef#fKVN+Ugoh7w`PWp3Ht~Q=_&A)PTEis=;$!
IyqvY^9~dtKl>h($

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-017.js b/js/src/jsapi-tests/binast/parser/tester/expression-017.js
new file mode 100644
index 000000000000..1e357ead7670
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-017.js
@@ -0,0 +1,40 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-07.js
+   Corresponds To:     ecma/Expressions/11.2.3-4-n.js
+   ECMA Section:       11.2.3. Function Calls
+   Description:
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-017";
+var VERSION = "JS1_4";
+var TITLE   = "Function Calls";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = nullvalueOf();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "null.valueOf()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-019.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-019.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..ffa699e488bb803d2ad72111d117148a4f1de846
GIT binary patch
literal 7291
zcmds6%We}f6dm3mA%w(^4Wq7FRj9lxAgx5wP*Rn&Y644;n{ktY=}hEt`uGo4{23A}
zcKikRI-ao;J5wheBIqhgJac>>=bn4*RQRAD(e+A?l3;z8C0#}iz002G?I*#hS8X)6
zTCZB2q))xdig>0Hg(+We-1ofO@Ki;A{Uc!^*^lT3?L>qT9wxDX3e@-1`x?f<DAq5)
zxpWp*!UR+pcwrp!96;Z`5zv^22O(twE+&V{=#;ZC?ylc}ZCdqOyRp-(tjOOgD-uM<
zYKiB!Lrxiq1l$pc1_s_8z@sO9M$;6Wefa3{OA|JOUlD<;$X&0%n@5D1kLy;<7|<Vp
zJ;#84tnanT3g|U3eXI5O^D{Fr^N-^kiHUx<8}047>9<Y@M_S%Rv>x?idhA2#LMbK|
zrp-T~Kj%lxTd-C2!)Eit`)Yl!l%QS*#HUYIS6@6g;m#4tdM+O=PB=XT4HLzyWW_3W
zH4;VYRq;j#exgdEblx~fBL*zxgz+{_d4Y!#R!3KMoW})hI?@Hgx&sVEYIWVg87zQf
z2I~C|+8Sl;WIO4aJ_$ko4oYc=Wi^ZmJ5_#pDA!pfc@aI}9t*oY)rX|2Bha$iNDtCq
zfOH5%*$odJ^p%4-?=7rwu&zM$a^zvx%)eST`uDpeN(amcgUC`?I!7Gk9pT=RFrvZa
zOw4cE_zl(=1vH+Ma>h5*D0<SNeH<-K-)9KrJwR+Geh%vM9!rib*f{|&;uMF3f__6g
z<?(Zuq-n|gY_n6<U&Ik5N;+S?9*KhpX8!DaqO+iiPmH}(c&^z6p-1R4&NUpWVorsD
z32e3Z8qLk(s%X+<t*MpSafJoq&}3R5N@fR4G@{`scxY%ZG=Zha<+UkOKZEwEs3^9e
zwNMrEaA)P$8#woMV;of!z%;YMn(|4ftwZa?c)PTe(Tt-@=Nl7?m}cZ*G#|Q$`o#ho
zHT(`;V|aH!gC?Bb)%YhE^Z=d{43fi^)s(Zxg&N_VUM(Vnl!{dK;i}?r@^y!9wL@M6
zX;fCTkmx8=i_)@9loa7E7-JoRjG2eZwDzkk;@PJj`Ts6vQw%)Q9SAoPU9nJKll?Cc
zPp{ALn8Q!4a_5j52mU*t+ysMoGVBg!F=eTp_&F2-J@dNW0Cw)(IK-rPltyh+UZ7EM
zEjpr6<KeK&Q)Y#}`;1&2)%!9#Jmv)N25KawW=@1-pFpUtVsv#!9MbK4O8pCm=>G%K
zaZq{=!9OC*AI^gQnz#WRzPq^43m2AN`@^9jTM{$l;?ip~p?V4(cSnZ!i*SO1Yey5%
zMsf#koFRcWR7Z2MHkV4Xv#2NOv2<`5p(f3C6GmQrhZ&V)x(4Fl1}Xt}x=fT#=}zc^
zt;Dx@K>P*|;y*Ike=JBH%N=l9@L!NzvyGPe(%3;qE?KU#<ceK8<szz|@gIs@o4|g#
gYU7-?G|nLnGc|8|<*J!AxnS?fa`B7{S8Ln*17^)ML;wH)

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-019.js b/js/src/jsapi-tests/binast/parser/tester/expression-019.js
new file mode 100644
index 000000000000..76c26bcaea73
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/expression-019.js
@@ -0,0 +1,44 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          expression-019.js
+   Corresponds To:     11.2.2-7-n.js
+   ECMA Section:       11.2.2. The new operator
+   Description:
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "expression-019";
+var VERSION = "JS1_4";
+var TITLE   = "The new operator";
+var BUGNUMBER= "327765";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var STRING = new String("hi");
+  result = new STRING();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var STRING = new String(\"hi\"); result = new STRING();" +
+  " (threw " + exception + ")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/forin-001.binjs b/js/src/jsapi-tests/binast/parser/tester/forin-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..b7b533165315ef7ab7dde0445a9d1f5f0d98cf16
GIT binary patch
literal 55280
zcmeHQ&5z_p6?gbv!iq&8J};dkT4iQocVQFFPO>wZB!gyWqn(dS6fN%VnjSMAyJfp~
zGyD;pBQ7~|;0Q>F3n#>p1LDGmggC)1XCx%vv#adqcDY^tY<Ewslvq8spQ~QIdhb{7
zS07u!Y-+RZt#f9Mx8L*JiDzCKpE3+%=#H<9o&Ccf9ld@ua;MDL+6<rBvMoQ@{^y?!
z<E!x07JdEH^el5|v$xpDHa#=2TqhJYPJa8wh2@OXvi<>bUMiC1dZ8$5Y*>yJ!~*E&
z_s7f$tTT&wp*Y99ObYD>p5;uoKM$Wd+S@(ee{#6B$^W*s$%Rl^N8$4aR=_;d4#hn;
z?O8_N4Ul){g6LQ8-1%NsqL929>THXD@YC?pbJNQ{P76>`mwyG>9qRIQ@99xfy8Ijz
zeQ)>iqi5gGYNmTd{---deilA;ynlSKm#sIo2t||p21+|;12D^tjSb5g4E(?h*d_Fh
zto-iv`uFbiik)-k<ekHl$2)sZvvseaTQt$TckeuS?M_x)_p1C7bo7q;dh@FM0jTmk
z2&S)ZZu$^jX8y+I$i3Wv|2BuSi9fZ?VADT$Up#|f8>5N!hBbb8_ujn+_wP5V`n?aQ
z9`k*OR7awhggRyM-=(2u*R<{A)$olG{D~z2f?AhCU_u2$KlOrR<}d1}Tr8EIl%q}+
zFy!+pnBHWD?!uQ=U7<3!K-LQnV&}U6Dwucd9=MZitA#P~=Q11Ku^iL8O6p}`!~_Te
zkOE+U&CUYDvnJ;W3gCeiJHzedLsUsEh*VHS({KYTI7liOyBvvCD3oqN+=(Sez$N}E
z`B2hKeK9}O`rEFz?>v)0vamuw27}6Y&L_j4uu+gyCwyY+q1^=*OFBa+;maW5Gw_`h
z{*5F6h{jj0LcDsxt^n&%<VdYjp^-4;*vy#(=h=3rq7I?Ude$fxv4R-*ck9g<?TR*~
zLfWVRwg!0hsp(uTu7M)H`2xsuSm2M$Da#7%s#e(cSF8xcD>cfSA2-}6b6<s$#*SR3
z9!0%ljep8KH(%#`lq0?||8vEBhh!9@eFtwt(Zt$!VAdoR0~B1k_8r@qC^YXZRvUNR
z%{oc#JGAdGjM{Ke`;K+@9S^kc5O5Wds~)p7Hk8!9qd&d_vk&z$hS-`x>15&CGiQXn
z9Hr<`67XtMpzJRFeBO_OeFc<ToP~J;-_2xU6eMFx#0`@*Sy#z%BrWTX?T#*z+*C2Q
z=>Ua-xv><kPx3;EC@ef%oG5+-x#fw2+0;ZpnRMpEq>8jo3R=1eg%hc$N1kUEWM2;1
z3sS=R=7|c-`K%Z{&R=N-ld`Ocy1xkZJ;g*{PNiw(dZz0zSDL69-2ut5=gtG5HQMpa
z(FLP6j@>Nkqz2ESUWu@t>Q~KM@>^~{%AruRMakVoy+cuSo|8<qTv_k<G1y1OYxk?W
zwrY)KI(loSSf&t)#*#-eEV9E^6}>3Tr!2TfzNZe&_^LeAw`M~n0YXD&L|bl-s6elh
z;>zGR{QKmMY_^a~nYYdOca%P)-=Z_wP^y^C7QezDuKNxI(<GE42nwgGAy7AF(=klM
zQ3Kc&r+@t#KA3UN^Rk+mN{64Z5|b5rr23m{Uw9!`?HsprB425ST%EqQl@y#7Si!~>
zs=a1CR@Sm7p(!U(KjgaO85&{&N!;4JSrHT7&Y7T5UG=i^l^*kb1YI@LagzEaT^b)^
zi^qIvc;Dp28sxrlg3zw%OStdQ>HQYq86x<yAX|B=N}X<()AlWhR3x>r))7j6Kk*1s
zgX$5;sNYp&HB{6X+W!YxUCAVBbO`h6n+Y#Mz2ZuxwyNfa2O2riQ&el71?JV1CH2U{
z1hB|B(!`SZt0_g1cd#H4Bm{I6B}3Wx5LOJ#&GY&;JcrMUx%=}KXpN^{Y7jYrpw(&+
zQFJyqM2Xz<M&9t0Ht?DOuTH9_I?7fEI!f6rd50<J;obFCI!x^DtIJ?z^5(bom6iDe
zurg?2sfbz;p=(wqAHgk(pev{DGVmoGak2B)BWP<fVDniU#l@7@DFd`-#8n@YD#9C3
zETRYnH2cI?mPN_2aKb`uF0_n8YYh&UDTJc2<iUGkf8t8*u+@RDDlTrd5G5&^I(anB
zK0(0O>{GN4#Paa*e13)ZciQbsuuAl`I-Nt)MbY*dN+Wzpll2kVq->+?Bp6K>fwxrJ
zNTp7<({zy`+r*|MDo{XRIbK(QE^(z@Mlpknk~LlANA9y14c97QZFpo*WS5na$zYMC
z=_1v4DkjL%si%%-3}~{4Z*10DFI9m})VH=aa917FDufJ`I#r`{vD0@$&0Zg}CvQP=
zU&)?NzHS&eHz!5*RLqF~4dkFrEtJ*FoJb6RqjNU8*zuTok>yxuCszbeNW)J}-_HsY
zsEqeA?!A<zPFB?9O;BTpnoRcI$yT0fG95j!fZY){5d!Hz_cyxJJ-YTV6DBdb)zy37
z$s+U}sutfGKqym)ra%HWDQa1YqFZ5@{tLV<I?+_PsEF%Z%A>YAgj4PPt=XVz0Thiy
zGfT1@QkjlkCxzEFtyHF74H*!1Tyxw6Vv%MzCHj#NTqY|L;2W8I27SC=zDq&r*oG~j
z=rhx@vp_ON(OhK(GZAIV79yz9>CjU3or(>WhQA#rkKO|l@54;t?+BY23~}f+aA(25
zJ&QNN&bB*ktlC2{Dy#tm&&iw6udJf2{Jtl)@)fX^1ZgYHEHCZXX<N01l$H?e*3>jD
z@L{dGu{sz^)1Xosw2bx7_1{GiSr*L|0|dgozL1?t37qtv(TlV~{aNe7Po;5vn+q~q
zHmw{dS^z!Kx>R_P58$~lfx)wqd2pKCPNHD~l=yAwXk5;_rfj6bTDx8pd>Kn|?j>3m
z-Y3*>U)h<{ZyCnRU}dQkSw&9acOVBXd!ejm*cl|0U`qDP4kYISP~$BVEjl9rmZB)h
zA~CHf*zub?$Hbx}1gln*Oi>bF*Ly`>r!`d--T2Gk!#i^0xCsgeEIr=SvV2@PFo(=$
z<0P?*sXQD17;PCPcC4b^MKReloCR=@;gFe57HLp%rMJy_4d7u@WZ6<Ci6<Uhf(Zl|
z6IZILzSGI-y<{nRM_(b?Jxpj?T&cztY#j$HN`uF;^Zow^<y{jymq0q9ZE>Yq?}ltz
ziVY@xUjj;mF5+wC&{L`*V_Y!23<)P*t@}>JT>p}FDnZ0TA@Q}kPK5}n+lqQxDu4Db
za4fARo{!WHGTs3DeGUi6om~w=$ic?Rv9SZoAGnTvHDDjI(JX*lt}~MCKS$eQ$8~Lh
z8@b2Py%g{1nR=_@!H<ZP9#-EfJ#hpQ5J1Z}ml(hxrbzEcmM*MTT&e6;wBCRB#CmTh
z*6WL7T>Sx@eSGG61KV|{1Jh#zhHV8qu#O8r@M@Z_B(78QQb12=&WkYFdfM=xdSb)h
zO>8(dg+aJuFy-hxZ?xyNv|tGeqZT~pd_i5gh%1L+q0&~--TtvBrus^OsSa^?wU#C-
z0kzbq>YHdo9N;gYg>Wz|64i6Aou{wmIf6`Xn}DLsJrZ>?_lUAG_h?@)jw^IF9acq!
z23<21EQ6Q4pY6k8TlJNf{H5k4#mIvD5#H}Gb@jaHu<DALf6YrO?##CoMG+q?Oru`F
zT33sr0f}p<_lnZIq+yKN$cBRp@k~SCxUigYJSYf5mF6X9QyaFS7oERCTxgS*v?d-K
z4=t}KB~zBK`I+V=86G+r=9YVPn4f&iA<UDy+@<gra|0z&uK6o1r$T0}HD2;5WWF^o
z33iU{7R{BYGfiTFI}#Q^TfSlrX(@)Ca2yh(BPthPqaiu1D;<J^uHz^hzrr7``_5|W
zR06Z-6;qJeS)@}Tit4tao;2C%Otv-ISz#75dRR?%qUWRCP$BrE=T+J&^GJ=V*JP(1
zkhHVRIV!YD5zs46O0S{^)@0{)w8M4P^_Y##G?Ab%>R0MBNmSY@nyMx{mpvIu0&1yI
z)i==sNQ^G}8Zv!!q;*YIune;Ehbu;Q{_1OnflGT+aCDV8JTk37hT+P)mvyD43c#*b
zlvvi=c)(g$i)tKvcAzLtc51TIg5+J9V-=%8d>P~H0okcn78=IwoIQ^kNbK+-3?0cR
zNNtV5!_yb8Cxf@^I)UZPShC<5M?0FtV_wK+%64t-Gl?g|@T-`2(rcP<zR)={$J<L!
zk`|176#TYM^T(~Jpsl8<D!rzu@sXBrv*Jo|%qqIuzd#S|!vg460DJHS(9-31dQB7T
zAY<AgG^sTWKqviWT~{alx0jLhf3RXne|;{NSkZ_vL!XPa$#Yxr{C)}t(sTU~3F~vQ
zEXNAsxvNxJ3g{SfKw;?fvtEOWS}nczJ>6JlFXpw{X`h=EwJb#=ZDk8IeJ++-?{Ccp
zRo#!Gk?3==WEs{n-ll4L3?s2V7fW#v$=#nAGtFPAckE`X!j{hTQ|PsM8~F>JP+c6U
z%_T<^t<S|uO`%d~2wcN>%=}>2^d;Nig`~4S7Yp;w)FKu1T4dlnbtLRvT<KR<F$Jp6
z#S%McM8GxP-Mi{QtxOPCFiQkpg=lF#*Nf<Lu|gtLF`6QM7Mbw-i!%hRo}g65`pe86
z<!+XGTSdJf;MM11xl`r^S5<wQ@&qJ(E*9+dIzBWnnIG#qbk4mvUaAVuv$TR2P<6N#
zE@ypC^ygi38qDO4@f&#goAAC!=SyaF^3?VX{L0BYhbNDB_MRqgmET2|8)h({k>v!L
zdt@F-<{p_ep1DWZ`^-JEIbP--Sxb_+M<^$L?<UmYJuh+(k37#Lr<#zrGfRm1J=EOs
z{_(+HMmO?d3K4m__w;E0$zkS2j3B45S2B~A25%1~TV-&`;cdx*Bjm#)_i}1F*?P*5
z7Jp6V|M)Gm5ZLzF3vf)9sSFNr1KEvRaN~t%1?*jz>%_cc_rRS<-@an0t@9$J7ykbv
V5P|wHw&Hqiys#znT1!4!`aceRGC2SM

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/forin-001.js b/js/src/jsapi-tests/binast/parser/tester/forin-001.js
new file mode 100644
index 000000000000..215de6c4c8e6
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/forin-001.js
@@ -0,0 +1,297 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          forin-001.js
+ *  ECMA Section:
+ *  Description:        The forin-001 statement
+ *
+ *  Verify that the property name is assigned to the property on the left
+ *  hand side of the for...in expression.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               28 August 1998
+ */
+var SECTION = "forin-001";
+var VERSION = "ECMA_2";
+var TITLE   = "The for...in  statement";
+var BUGNUMBER="330890";
+var BUGNUMBER="http://scopus.mcom.com/bugsplat/show_bug.cgi?id=344855";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+ForIn_1( { length:4, company:"netscape", year:2000, 0:"zero" } );
+ForIn_2( { length:4, company:"netscape", year:2000, 0:"zero" } );
+ForIn_3( { length:4, company:"netscape", year:2000, 0:"zero" } );
+
+//    ForIn_6({ length:4, company:"netscape", year:2000, 0:"zero" });
+//    ForIn_7({ length:4, company:"netscape", year:2000, 0:"zero" });
+ForIn_8({ length:4, company:"netscape", year:2000, 0:"zero" });
+
+test();
+
+/**
+ *  Verify that the left side argument is evaluated with every iteration.
+ *  Verify that the name of each property of the object is assigned to a
+ *  a property.
+ *
+ */
+function ForIn_1( object ) {
+  PropertyArray = new Array();
+  ValueArray = new Array();
+
+  for ( PropertyArray[PropertyArray.length] in object ) {
+    ValueArray[ValueArray.length] =
+      object[PropertyArray[PropertyArray.length-1]];
+  }
+
+  for ( var i = 0; i < PropertyArray.length; i++ ) {
+    new TestCase(
+      SECTION,
+      "object[" + PropertyArray[i] +"]",
+      object[PropertyArray[i]],
+      ValueArray[i]
+      );
+  }
+
+  new TestCase(
+    SECTION,
+    "object.length",
+    PropertyArray.length,
+    object.length );
+}
+
+/**
+ *  Similar to ForIn_1, except it should increment the counter variable
+ *  every time the left hand expression is evaluated.
+ */
+function ForIn_2( object ) {
+  PropertyArray = new Array();
+  ValueArray = new Array();
+  var i = 0;
+
+  for ( PropertyArray[i++] in object ) {
+    ValueArray[ValueArray.length] =
+      object[PropertyArray[PropertyArray.length-1]];
+  }
+
+  for ( i = 0; i < PropertyArray.length; i++ ) {
+    new TestCase(
+      SECTION,
+      "object[" + PropertyArray[i] +"]",
+      object[PropertyArray[i]],
+      ValueArray[i]
+      );
+  }
+
+  new TestCase(
+    SECTION,
+    "object.length",
+    PropertyArray.length,
+    object.length );
+}
+
+/**
+ *  Break out of a for...in loop
+ *
+ *
+ */
+function ForIn_3( object ) {
+  var checkBreak = "pass";
+  var properties = new Array();
+  var values = new Array();
+
+  for ( properties[properties.length] in object ) {
+    values[values.length] = object[properties[properties.length-1]];
+    break;
+    checkBreak = "fail";
+  }
+
+  new TestCase(
+    SECTION,
+    "check break out of for...in",
+    "pass",
+    checkBreak );
+
+  new TestCase(
+    SECTION,
+    "properties.length",
+    1,
+    properties.length );
+
+  new TestCase(
+    SECTION,
+    "object["+properties[0]+"]",
+    values[0],
+    object[properties[0]] );
+}
+
+/**
+ *  Break out of a labeled for...in loop.
+ */
+function ForIn_4( object ) {
+  var result1 = 0;
+  var result2 = 0;
+  var result3 = 0;
+  var result4 = 0;
+  var i = 0;
+  var property = new Array();
+
+butterbean: {
+    result1++;
+
+    for ( property[i++] in object ) {
+      result2++;
+      break;
+      result4++;
+    }
+    result3++;
+  }
+
+  new TestCase(
+    SECTION,
+    "verify labeled statement is only executed once",
+    true,
+    result1 == 1 );
+
+  new TestCase(
+    SECTION,
+    "verify statements in for loop are evaluated",
+    true,
+    result2 == i );
+
+  new TestCase(
+    SECTION,
+    "verify break out of labeled for...in loop",
+    true,
+    result4 == 0 );
+
+  new TestCase(
+    SECTION,
+    "verify break out of labeled block",
+    true,
+    result3 == 0 );
+}
+
+/**
+ *  Labeled break out of a labeled for...in loop.
+ */
+function ForIn_5 (object) {
+  var result1 = 0;
+  var result2 = 0;
+  var result3 = 0;
+  var result4 = 0;
+  var i = 0;
+  var property = new Array();
+
+bigredbird: {
+    result1++;
+    for ( property[i++] in object ) {
+      result2++;
+      break bigredbird;
+      result4++;
+    }
+    result3++;
+  }
+
+  new TestCase(
+    SECTION,
+    "verify labeled statement is only executed once",
+    true,
+    result1 == 1 );
+
+  new TestCase(
+    SECTION,
+    "verify statements in for loop are evaluated",
+    true,
+    result2 == i );
+
+  new TestCase(
+    SECTION,
+    "verify break out of labeled for...in loop",
+    true,
+    result4 == 0 );
+
+  new TestCase(
+    SECTION,
+    "verify break out of labeled block",
+    true,
+    result3 == 0 );
+}
+
+/**
+ *  Labeled continue from a labeled for...in loop
+ */
+function ForIn_7( object ) {
+  var result1 = 0;
+  var result2 = 0;
+  var result3 = 0;
+  var result4 = 0;
+  var i = 0;
+  var property = new Array();
+
+bigredbird:
+  for ( property[i++] in object ) {
+    result2++;
+    continue bigredbird;
+    result4++;
+  }
+
+  new TestCase(
+    SECTION,
+    "verify statements in for loop are evaluated",
+    true,
+    result2 == i );
+
+  new TestCase(
+    SECTION,
+    "verify break out of labeled for...in loop",
+    true,
+    result4 == 0 );
+
+  new TestCase(
+    SECTION,
+    "verify break out of labeled block",
+    true,
+    result3 == 1 );
+}
+
+
+/**
+ *  continue in a for...in loop
+ *
+ */
+function ForIn_8( object ) {
+  var checkBreak = "pass";
+  var properties = new Array();
+  var values = new Array();
+
+  for ( properties[properties.length] in object ) {
+    values[values.length] = object[properties[properties.length-1]];
+    break;
+    checkBreak = "fail";
+  }
+
+  new TestCase(
+    SECTION,
+    "check break out of for...in",
+    "pass",
+    checkBreak );
+
+  new TestCase(
+    SECTION,
+    "properties.length",
+    1,
+    properties.length );
+
+  new TestCase(
+    SECTION,
+    "object["+properties[0]+"]",
+    values[0],
+    object[properties[0]] );
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/forin-002.binjs b/js/src/jsapi-tests/binast/parser/tester/forin-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..3c83f781854050e9d1bac3b4068ee9f62065e5de
GIT binary patch
literal 15210
zcmeHO-EQMV6!x;PEFd930&ci4d)3v7wk$WON+X&yt1arLK%zwg!OBUdsi|v6V`odn
zJrb|L9TMW9Ks*2!yaVTq$C=a2*qQveX&3jRQ8M=D^FQZjTua8IfYoa!%p26d;L(tK
zXU<EG<Mg7zh0{1_f8N>Y^rI1TYFpx(THwb?{o$vM^CnzXqqjfxxbO7>w$J*3$Gyal
zLIE{U-(%<04+odA{sx>|v#=sAp!|X3hkh~vppQQourTqDeZ~b`=$$E|<AnR+u>LAM
zrqgP6502WkE%{q*OM+0Wj=28NPZ;+C0r%Vs#v0yhfOi}L^hev<4|T*0c}vKwCLeek
zZhG!<{c=jcg0lP*u&+>-Pg`GgRwc_jKzghBWbfIv5ad5sC&*XeQQd>?VXN38EKTx#
zL_1+FnC0f?rXRX)oOlU41K-f`moU)Qk0Z|F7<{~w;S0-Sli!U_+Vp}z-74<r!%s}P
z7WD!Pmqr%^4tdgLaS?|GCs%YV!vY3N$%4m+V-$33WZi<9w*c#$L)3W;;h6DmbQleF
zt%+#zE4aDl=?y>h_=V!j!B_*q8-g(e(10B$4)=#ADt^k4gg_6}gQyBhfV2?AsslAL
z=qd&$c5ko>3+f6yc7mLS{K;3tgC32;KJJlpyL=hwggtHq+vi!FzXwwVS<rhIP@h~J
z^?qP|gNq1C+i;0yP8QH83b8dBgqw<h(%J~3{;6`d*?Gq8Hyj5aaVgJG_N}0hc2*pE
z_8?jfL-bDtFpq=mDi$eE`w_)MmLef&XT;I-k_%%n=$`m7Ap`E3T$b4keaMoUkWi~f
zG|{Tqs?;;6XIURcG~p;m$I6Z}@nxS>L2Y)fBq@^LRqZku4zl2*(;~d~d$>dk2bLMg
z+i)*u$(V<30#?3R93C>(r$4DElpHFHQWk}3OrlgNx*9WiQaP^Gr20#k)O#kAav!+&
z?im<2@4O~?RCZ-5l2f~CkI#C{P^6mVxK_LBEn!#h=GfJCWmYTCPq0u+qDB-2%nJ?j
zm4WKo#4CRZyZS)cm1KB>?1k=q1N+5MOLmZ`aA<E19;c;`CP!W5o&|&CRH47hDj8F$
zM-e{=pM9(gQpoWWxI#-`EK+VM=1g?iCl&j37Kfp8_J0;fo^||XvW{~1uo>0&j)@`}
zIdYrOw<ewIX|pxQlACVDKY>SUPQ6yO8N2P}QG{_XcmEVRFV~J<OtacE`5t7yjQjmu
z--CPL@9t;0E-0OC^*)Cluw2I+dyL84&GM{aP=2>^_V#`R9B7fiqD6)yrnEVy=MAO|
zYu;|<ztFAJ==$1EPE^~1^asU+HJhqZLs^m&3N?4b^_SNTEQn-F@qh+IW(m2IVoHbw
zPgr+mJyTsjbAlDAnnKMjpr3(EO~(r+h2?D(C`%lOHNBYWvJ`>*5AZY8<fYcSg__Vk
zt!C&YOpYo@Idh$7ZgF*ky%N-8*>iTmD9<6#x<M3;T$p-$Y5<NuZMyD;?gumwSXh2h
zOfi*;mbBxRaQ|DKIuoP?mBnGy1Zqhq&f&gucXwSoQY}$2oG=&>xEq$Z>l6X1%GkY;
zmP8H8zI?lM*Mbv#q--~5LfPP6|CB8<rL>TBkyB8{ETHDM+!C8ixHY0(>c%d1&o5zF
zO9PhY(OhCp*Y{Gcrj(T&*hBKthTmf^-uF2S|69ON)+i+H1Bpk~MLUIPTj_T=m6qoJ
zY|w_|b#W1XdQkAgOipon0xw6$f^VIo862*WFgq2jkHG7vOG?o?ipjj@=yfe7e>WAA
zRV9Y!l+)1i8%&h65PY+$?W&lB?V&0r>uAO|x=bsf@+$$-vLtaq8&xqWUYN*9*Rt$K
ze$uVoQpQy=S;yqCDkjsHiez<A6_e^^tQ%fTW{sv9C0tdc?ij1{RaDP3EZ>NF9^Y0e
zY&0~z5u7WwZa&<B5c>{b(lglF09}S2<J3`GBSoZK!yPg!XH~C=Eb2!;2&$I*$~D{`
zr``!8koshYKx*&g$u(1Kl}kDAP{~z&UQBK?oamFQD3~OgK1O<Ju_Jmyn$(c_sYB!P
qHdK;Wp@-<@+KhLn($1Rr{|%s^sbywSs6ykoi*TXqB8_-jGwVM>b}s7x

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/forin-002.js b/js/src/jsapi-tests/binast/parser/tester/forin-002.js
new file mode 100644
index 000000000000..7d898d6bcf40
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/forin-002.js
@@ -0,0 +1,77 @@
+// |reftest| skip-if(Android) -- bug - nsIDOMWindow.crypto throws NS_ERROR_NOT_IMPLEMENTED on Android
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          forin-002.js
+ *  ECMA Section:
+ *  Description:        The forin-001 statement
+ *
+ *  Verify that the property name is assigned to the property on the left
+ *  hand side of the for...in expression.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               28 August 1998
+ */
+var SECTION = "forin-002";
+var VERSION = "ECMA_2";
+var TITLE   = "The for...in  statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+function MyObject( value ) {
+  this.value = value;
+  this.valueOf = new Function ( "return this.value" );
+  this.toString = new Function ( "return this.value + \"\"" );
+  this.toNumber = new Function ( "return this.value + 0" );
+  this.toBoolean = new Function ( "return Boolean( this.value )" );
+}
+
+ForIn_1(this);
+ForIn_2(this);
+
+ForIn_1(new MyObject(true));
+ForIn_2(new MyObject(new Boolean(true)));
+
+ForIn_2(3);
+
+test();
+
+/**
+ *  For ... In in a With Block
+ *
+ */
+function ForIn_1( object) {
+  with ( object ) {
+    for ( property in object ) {
+      new TestCase(
+	SECTION,
+	"with loop in a for...in loop.  ("+object+")["+property +"] == "+
+	"eval ( " + property +" )",
+	true,
+	object[property] == eval(property) );
+    }
+  }
+}
+
+/**
+ *  With block in a For...In loop
+ *
+ */
+function ForIn_2(object) {
+  for ( property in object ) {
+    with ( object ) {
+      new TestCase(
+	SECTION,
+	"with loop in a for...in loop.  ("+object+")["+property +"] == "+
+	"eval ( " + property +" )",
+	true,
+	object[property] == eval(property) );
+    }
+  }
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/function-001.binjs b/js/src/jsapi-tests/binast/parser/tester/function-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..775b94c1a520c4b87f50ea78f0428594596bf7e6
GIT binary patch
literal 3935
zcmd5<O>Yx15H()~geoB+A&xmx2}t3HmPjGZA*iIN8}%AFS!Zi-c2~C3Hh+~rfW)t0
z>~&%{-UN5k22Rn&_Vdh}c{Afk&I(3a(K*3M>l@Egj;H88LTHpHbM(2_{}O+U$9X|e
z)YN+-Mulwk_7QplyCV1a8Ris^7&#(ihB=lr&ooqGzXke1v*bF~FTlC?H>{j%D4HOe
zQMm+gukR%!lXOA}*Kir0TBC*JG)r5L;hMPH8T3y2QPcbvH4TW173=-SR1%JvhP%LQ
z=Ha~nyi<~PuZremmW`FiZx0XO``C*+nwq`HT>Su!UtsQUcTK6u>QBJlA**NI)A+Vn
z-2>CRov-cT2cMbU6Zw00L_UJ62ED;?*Z14ah`{801!!e*zHSs)LMmr(8WV<7(Kzrg
z*n(I{e@=ve<c}qmWC}9WsYjOoSL(Hc8M8<Ai81^|tjb)c1JwN#92OFDIUquA@X)}z
z=+=%KxzGl$(@Z&R0gzHP6ig_9P_!7CNW^J+ZflkizY^ysYo%+=QSRcYYMhV0ld(hv
zSHN;!$!EP&0lX?bmWgD|U8IX^b^w$L5jY`pIWLHhRulC(pr%B27#0G0n5HNUydG!u
zP6g1Tm_E^=_Raq<m{vVs=4Ao$O<aU;_187MW;@#hx$LN&DZTNE<aE90lS@bO%CPN9
z*CvUrvRPw>u(sZ)yscDdMT~J1^K_=lo~W!u0h#^`u-ZwYDs=~o3bys2v=3LRa(Zpd
z3~YZd;ao;88>R&wyc-U6<rxnB#C1b^r{ey1W%SP63Xw}dLa5HLAwo+Llmqng(?re<
z;O!*)_L_bO9?76d#3<Tz!hLxuQ_62Bp5^0;Bz<_^SoLXEu3#g)%h2L^u~uVd0;%dY
z&eCeGnx)D&lv%47V4YLm8^Nrt3B6g}+}s_Ain+q9uBNDSsA66;tA6;*!kQjfnV5e7
DGAIIj

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/function-001.js b/js/src/jsapi-tests/binast/parser/tester/function-001.js
new file mode 100644
index 000000000000..df45e048d784
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/function-001.js
@@ -0,0 +1,41 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          RegExp/function-001.js
+ *  ECMA Section:       15.7.2.1
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+var SECTION = "RegExp/function-001";
+var VERSION = "ECMA_2";
+var TITLE   = "RegExp( pattern, flags )";
+
+startTest();
+
+/*
+ * for each test case, verify:
+ * - verify that [[Class]] property is RegExp
+ * - prototype property should be set to RegExp.prototype
+ * - source is set to the empty string
+ * - global property is set to false
+ * - ignoreCase property is set to false
+ * - multiline property is set to false
+ * - lastIndex property is set to 0
+ */
+
+RegExp.prototype.getClassProperty = Object.prototype.toString;
+var re = new RegExp();
+
+AddTestCase(
+  "new RegExp().__proto__",
+  RegExp.prototype,
+  re.__proto__
+  );
+
+test()
diff --git a/js/src/jsapi-tests/binast/parser/tester/global-001.binjs b/js/src/jsapi-tests/binast/parser/tester/global-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..543e407d825bd0774882d7a098b583224079987e
GIT binary patch
literal 6258
zcmds5%We}f6dm5L4G4(^t63IRC}oS%iZ%@p6w*SXZjqC56Vu5|WIIjsAFTK@Sg>Km
zUvTa5jNRCoI%yhFR?)=v@qM0qud94Kit$c$fKjw_NYg$=!{BBR1l=^6278UxhxY4s
zFCF2aT9JFIF=2e?+p{2e1iPx{@gqbD>c)5<_hLj5Cut&~BK^&R6Ou&dv3>#0jf=2S
zDxpXekc998z`VW@;e?Z8f~kZ{&`=A_I3-Dc=N??suGcz^gI2Yo{;O6Lh>6vf`<sMg
zied?OisG?__Ym;<aoR=k%dM?fHe?Q6kw&Yk8*jm>Q$+3UrUXkG^Cw`h(U?c|&+Szi
z^Dc;9uYKJ8@=qA@_xcQZ2d?TgI?Z}{M0m#J6M;6s;X4_Z;X(H+?r|IW5}{c?8&S*{
zq<5Pmj)#zTGUjmczcW8;D30|}d7=k@VVzZG{Ci~c1JIOlM0p3ZG7TO1t>w6k3W6t<
z3W)Z{!Vt`<x`#540c%2maNYwGW7<iZY2Wsm<dN@?;8u?Bkp$7H)+-P!1H2794BQ#x
zV;)e_A86`SWF&w#^+l!&t^m@*5Ub{Bp<t*LEaKh~6&})+<Z6MOk$v&$xM)do{{gC4
zj-SO^O{ElM3`stY9f@Veh$krtxVMPJIGXQ?^%coK>$9WaD16q#Bhd}nx-VhMr-0Z>
z!vZwq1DZ}8*hK)Yt@&7Ud_ui(mbN8~D&q4HF}C9P?9i#MFS4tS)80uiKuHuso0_-O
zroek*$IPM9R{Rq%f<+3t4rnN`2~4I+xAXE{sOtSh)G-aPNFmwQ5pL?_!K=P})4~%&
zG@(*S578MAX6%N|h1NxKC^@a~ENM(F%webu$~;p;yf>)DXw0y*;|S)W;r!XkJnCUI
z=}~R+Tn7_n;c(i7zClFlxyeo&@jnYE4<n1n#B-P?w|M?*TK?MEY=Kg>SS!Dunsg$9
zE0se@FruPC<<lZ7P5XJc#v}ecQ0{|3Jk1&zJDGCV&i!2tQJCZ+)XKh_m}ieEIBLOj
zh8`~DrO#oX*qgsA%$g&UY@Xnzt(T0|^JKirX-N1)Om#KHu<esfF(9hjLVHsY4|jXd
z7gsR;Tn|Xko?bMf*@zHshY6lQBTCrD3)@|$gFLZ?|HBRFYys8=%tP7)_VD}#1m{Ba
z6jx-PLva_Phn!^<XF-+A+A1|~<wEAa<_$~o!eZsY!y+Qjxz{6)Qp!}qO|39Cmr&~)
z@Th#>W+e~DYR&N^pjO;0W<Xlcr)q6Zq^ea{d>Bi!W4nRL?AJ22YFk(>xT~XDyx`Hw
HS%CfmU>fbk

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/global-001.js b/js/src/jsapi-tests/binast/parser/tester/global-001.js
new file mode 100644
index 000000000000..228b110c8954
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/global-001.js
@@ -0,0 +1,45 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          global-001
+   Corresponds To:     ecma/GlobalObject/15.1-1-n.js
+   ECMA Section:       The global object
+   Description:
+
+   The global object does not have a [[Construct]] property; it is not
+   possible to use the global object as a constructor with the new operator.
+
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "global-001";
+var VERSION = "ECMA_1";
+var TITLE   = "The Global Object";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = new this();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "result = new this()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/global-002.binjs b/js/src/jsapi-tests/binast/parser/tester/global-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..6e10384cbdb2a51a1f96e60c2a50f32c191c152d
GIT binary patch
literal 6254
zcmds5O>fgM7!KcG2S7+1IORArp$^0Wp{#;+1v*vTv{t(!xA9uDG^reSUH=7V{uvi8
zocI^KcAeO(-OTB_3U;be+mGM(dA}X7@hHO8V1Q9rJ)lXSqM>)w^So{nPQ9H*Yp?yj
z-AhK;3o2qy5RsHszd!f9N3bi<j~^jQP&dN6xECRc7)fFQ6{_#lJ0Wp+9_tt2+_(rU
zp#qA89*GId0rcw|A&wb2CYTDi7!8%sDWfFrSMR|!?Ru@#*lz_D`Cm|xAUalC>~9i=
zDT)N#DT>Ah-b29aM@bh&ueP?{n2;HCMUWQA8*jm>Q$)?}x&%v-`4h0$Naj)fu)QiW
z?||rg?bl!5n#8Q1$KUJYk?Y-QbeeTjZ`~mrUGgbM8({yla7%x``wjP)iF^r0>t`d1
z(-fk+%@D&wh&thNIRD=oo;4Ij>Zmx;gTJr}DqUNLV159arVLTm!D*3(5>`i7a$H6Q
zo+hOVi1x>vh}5dOgECJ5YeFI4e1SxaX(wqWebZ_pjr@T4HbQ)d#E4FnULH>}khUQW
zL+Xt1G4m+t4^-xqxrhU8s*7}zt^m@3h*hU(uAr|J%>CZt6%NuB#A=Q_%k}xE<)VK-
zx8DWUAjrp&C9rfKaZE}a?h_&r4i{TueKqnANMi)hyiHcqaPS<3&w6;on;}#8C8&G`
zh^@rWL47u$$;5)4JK%NfJ-9<by|I?IB}nCP2PjQf?4KPvRrN(Q)lt$r@dhXkBj{4I
zj#?LZhwqp>RM?3hf+ri!tm=S*;+udnS-P#4e}t;uk9i$a0A&ivw(@XYCx^W1ns3TA
z5uE`^HBEqkT<ttMq@c$4ENXN$^kJw7N<ULWtT(7dXq;j}<Ot@X;o{j!KkC4mFsb4^
z(?Lfm?N6J~IB-`zH`yr?ubDqNkX)2%GRCuCo%#Qcvl6wcTo~>qdOqRKm58at8&Te&
zvS}WbI)4tPaqxc!l=~nMOJ<#n8BCdJ7yhm$QRvBqt2O&>Vm5nB!C?!YGt_h;E`0&}
z_}=VYVV;heWQzpXxn9y&TX>>Qimb7!afsW5k99SaV$&u<v3HQDZgcH*MI6lSJYZbG
z{PTZ6IyUu>f&AHw;BP}0O45y&rm1w}IO1~K`y0^K;)!npX6~#5J6QdK<Yq&46qiSx
zMR6OVgPcXxrliV6J(V1`G9j~H{RS1;rD}e;(%`@dk8$So!XuT^m9VE(nDq+M>Ibl>
zc-u}39*yOi<vl>I*fW?0X*`|EwFRCkS8e{GEzQsD8fI!fmC03;VYy(hjB@dU7b|P=
F`3uh!>|6i<

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/global-002.js b/js/src/jsapi-tests/binast/parser/tester/global-002.js
new file mode 100644
index 000000000000..1639a34bb783
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/global-002.js
@@ -0,0 +1,45 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          global-002
+   Corresponds To:     ecma/GlobalObject/15.1-2-n.js
+   ECMA Section:       The global object
+   Description:
+
+   The global object does not have a [[Construct]] property; it is not
+   possible to use the global object as a constructor with the new operator.
+
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "global-002";
+var VERSION = "JS1_4";
+var TITLE   = "The Global Object";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = this();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "result = this()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/hex-001.binjs b/js/src/jsapi-tests/binast/parser/tester/hex-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..f210c40d6b2cccf3877e488290f3b2568060c45a
GIT binary patch
literal 18562
zcmeHPUys{F5I6s!K>7Ct0s^(Cio3Sr0ipCzE=|RuBdsn+U!XnhIeR&CjuY%nn-l#Y
z2)+c*d=y?lm3ZQXkHE}&H(uLoXYDv47x^A8N^Fm3X6N^t@r>;zn~Yt$+dQMBzx%)+
z4SX`RUbHOhWYoW~_V&A9_rB=aqcOFbJA9v}>jZ4~w~l4K1$#Bs!ygjgAtx@qOKq3<
zggGORi|R+;1MA%J`f*v$LCy>FWQ}|-%IRB<=dhUo_4NCF>M`fkp*|Pqkzu5Cz<kFW
z?7jx4>2=yi`}e!e9r0UpM+i}6_4xh=4x>JCxwt39ouuSl1$l>b(3y_GInz&X-n^9-
zE5+|{$2G-SUxFi_5I?=UszphM{sFRA=+K9q!(LSmeHB#iw7+Q`-%fjG^^Uv(UR;qQ
zUjf69_KyxaX}i^kFpSI3L0TA>jWJ;m#9q)~XM{EEk;jPRHNK)##|B(FL*jM<n~Z6X
z{y3qYO@p)o3pgH-;nN@hCg?H3=nxRfJxXW4YoXjGt{WZ7kFen<8UavsiUIK70EYyO
z`0R)VEXP72R+S#<v4{ysslo)}4<_h{Kx?{zF~~Ztem`8`HVJfV#>wU{I4e?KjHSEu
zX=D;7)vEMD@P<mIJ<Rp#!VW1s8HO|-*GkJ3tSUoPT{uI*?}K2EK5c}WU%&SK^s`&n
zw$f)RAv#0n<w)v6Q2CCXnX|x5`1|)uZN5t!jC;y_uXAn7_sNA4MQA8>IlQB&UeS^#
zB0#5Zr0J!D@ZW0&;rp=CWg(0l*wQ8TurkuEoFRrk0Le)V->wM6Sz4Dsv5BYz64BSO
z(i6VJ->PA}f@R-q9M`GX8)T*?c~SHZM79d!Rz(o5E)Ty98e)NvUmmO{hL>M`Z8n6T
zuURTy{(6>3am#|RN$NB#7VuIVF|4UXRD){}^TwdADy!>h-U>CiRG)iEyl7$dc$!W{
z2^v;|+7Ke|CKB=EX+@bB^XGi%8ER=JY%_5@f7ugJuwgj<vrfkUUp-x6GBy#lnFyZW
z%v>3Q@%m`7{yI`IE8JSYH}Pzo5~>43lmt`0F$@rgLG~0<O=<>t*tli>p^jG!PJoHt
zrvo}2r}J?^U9W(sfceK2iNgVa7y>P<+M7bPs^p>9T<Q(j*}|$}RS%<Os!5Cm{r@&d
z8WLuo(cqY1qdTpeK&C2q&mGz4QF|GAEq{dWePUUtbZj`Ye;OBon6hAK7x3wve(rrR
z8aRO7s3^B^xC|qE7{SBX+@+_?@}0q1bTmX4PQy{hXU`(*V&*s=@zoZ80hxF1=w-I!
zQ$0Mr(dg;!h$+V5VWX2DsLiagk5;ma*{njfV6~t{+M-ixN0!TiOMdbu_XF51)jl`S
zG#A8)JfS+FJ8@mvc7s#T93_>KpXxDtOIUgX6AfUeYH4bj*21D#{Rn`HaTmjC6q6BV
zacv<7h?)1y-KyecQDERgq-Pim<BS`}!s%G#F?bbX7110srtG4l!8f84sfJz-kp^xp
zl8_BAT`}=(BVSyPd?zDSeyYAS&@!JQgfLa6p{lsTnsInZEeoQ&ELiH4!S8j;tkV)H
zBl%SmEr*m%eB~}4h>97#$ym^pMamt7+C#*tqzE-YFDt?RS`(~tQ>g)UT@Hesd-0=-
zVMCIA9Z7aO>rzN3*ubr(S6Ai8vZm(URaf&1uDJ{&1Gc}c)cbQyy*2fUrx^^X7whJ&
z?Tprugp6927@*Lw8C4VStb`20meiWIQ5IWr8AKb*yT8=DTk~!?-W^YJ9>^%jySY6O
zRaVWso5sAkVPwF(_eOry#tri~JZH$~FOzW}o?Xfw=cs{I@{zsYp$JLM1(LF=dj?XB
zx6-{w)s)28J-2%k-oY=DxY4tXi*$#Zk>aYt23Z;j!pQh?1Yw{-!3L;-#JtP=S?MAC
zq`K={9@f#79-nZ`#)k4KwIomA801Dq$KOEN+y#)@s#+GFs~*ECQc#Mlj6jY%(KVmd
z`~-_z&uZlJ>5FhiM#wHfqyY-*h9}a<)^`z)OX$l_l>!VLT9{T0n*+!ZkIb~(^ND><
zmvpB>^;x5^$I9DRcZ%1sQ*0Cf8HKa>Sp}*3st^FptZa~gmY-S2Aksn^Q1*s51k!#N
z-r<pWptu41@$@c=O}!cMCrahH=cv6371r2%q~weh2!C#qG0cFqtMU){?makOKFODN
zzol5X%$rrjb}Va?Zxc|~JoOqEu?;WX5--wFj!M0&L~Kj<9Tjnj-f(P7?6OmA(G}!k
zQx1=dJuseAV|zt#@~%*^DdPnfVr%B;Qf$wvN5p3IPU7y~5MccO$FNmJWah%^$>cwv
C5O*;E

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/hex-001.js b/js/src/jsapi-tests/binast/parser/tester/hex-001.js
new file mode 100644
index 000000000000..04c3a97b9450
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/hex-001.js
@@ -0,0 +1,68 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          RegExp/hex-001.js
+ *  ECMA Section:       15.7.3.1
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *  Positive test cases for constructing a RegExp object
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+var SECTION = "RegExp/hex-001";
+var VERSION = "ECMA_2";
+var TITLE   = "RegExp patterns that contain HexicdecimalEscapeSequences";
+
+startTest();
+
+// These examples come from 15.7.1, HexidecimalEscapeSequence
+
+AddRegExpCases( new RegExp("\x41"),  "new RegExp('\\x41')",  "A",  "A", 1, 0, ["A"] );
+AddRegExpCases( new RegExp("\x412"),"new RegExp('\\x412')", "A2", "A2", 1, 0, ["A2"] );
+
+AddRegExpCases( new RegExp("A"),  "new RegExp('A')",  "\x41",  "\\x41",  1, 0, ["A"] );
+AddRegExpCases( new RegExp("A"),  "new RegExp('A')",  "\x412", "\\x412", 1, 0, ["A"] );
+AddRegExpCases( new RegExp("^x"), "new RegExp('^x')", "x412",  "x412",   1, 0, ["x"]);
+AddRegExpCases( new RegExp("A"),  "new RegExp('A')",  "A2",    "A2",     1, 0, ["A"] );
+
+test();
+
+function AddRegExpCases(
+  regexp, str_regexp, pattern, str_pattern, length, index, matches_array ) {
+
+  // prevent a runtime error
+
+  if ( regexp.exec(pattern) == null || matches_array == null ) {
+    AddTestCase(
+      str_regexp + ".exec(" + pattern +")",
+      matches_array,
+      regexp.exec(pattern) );
+
+    return;
+  }
+
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").length",
+    length,
+    regexp.exec(pattern).length );
+
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").index",
+    index,
+    regexp.exec(pattern).index );
+
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").input",
+    pattern,
+    regexp.exec(pattern).input );
+
+  for ( var matches = 0; matches < matches_array.length; matches++ ) {
+    AddTestCase(
+      str_regexp + ".exec(" + str_pattern +")[" + matches +"]",
+      matches_array[matches],
+      regexp.exec(pattern)[matches] );
+  }
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/if-001.binjs b/js/src/jsapi-tests/binast/parser/tester/if-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..da9cb6cb563fde67bd6e9a6a0d84b8e797b46de4
GIT binary patch
literal 5066
zcmdT|-EPw`7&ZSOxPTWxz61g4Htk}XLZ!7-P_z}aX1hgh<F?kkq}a~JUWMo2W%#+{
zCAj2s>c(E3by*2PT($AfvA^S!^L<XB(kZ9SU_wdMd@qu*AjjxBLTHdgXQ<Wfz3p%J
zhsl(ppplIUIFqXR>k&c^U{v5vKO};Y0jIC%kP|@^OX3VFvd<D7u{b)9^&N1oU51s2
z42ngF#Z2V@?(*G;#)^#?6&YMij_szU5-c7!@4zzsPCM+r>je$d7Bmcqi`CD@?=nRN
z;ThZs;b|e>C=oB#*4BNzIc_6kEHKO6fGwO5;SYD0Uy;dg^)h+b+3#1y<Zak`r@goH
zVZ&#pej<O?N8~M7D(r^49Y1bY5hVo)uO$j66tfY=QV~Uu;hpf2>u2;weT?3NrCJBC
zdk1^1&b}Y}3an~zu5WH_ZB#4H&ZnuMQi4tP=SP)U4b9sNeXdP7w^OqjLujJbo!k&h
zxS}Qu#3EEk<ub7tSQp*y<4;1+`No7m#5mQOm4%^~2<9PRoeD7SH;~b&2$S7p?290?
z<j;_Gyu{ODF%f4rE~E_`@*m_g$U&Tr6cTJau_?&-x(0e?7jjAZ3y>v<s5;l_0I>})
zw~zu=l-S)8+slz>c{6`3SZKvO`2|Ap4t^1<nu<d&Lwwd;dGtW=f(_@z229AczZiRc
zr9{mX4gN!lzSgHAoq!-!q`bhMT`85U5;WYDNJ%4~_FQsTuUfk!n*_9_D@Z43n8cEP
zOu^D~Rl7Uhf&4d)wd1d5xi4)5E^G-0D)DBPL@5yOoJDs}EuIXI&NH<9k`=-hJ)5#L
zStvb-E-xDX9nTeO_c6peB8<~$8)JfB;sKVEB;^qnRHY)uYgQ5SQ}BLg+CFzU&P^9q
z$hGQCHIv-AD;`OYp4yq&?Y62K=q?1HYq>U&)Mq0LegK-espE75DWUhOtBMBf0WK>~
z%uzmlj!!34P<SM91ZPX&{~%El3?4!_R!PzMx-nE>fi7GLN|p)SB<w{Mxhq%=T<L|b
z{1%|qpdH&6%;N4%P;L<Jha&Apvu7x&X5WHn)Pt`vwx-V{xCsOAYYCbP`ht6#=`9qV
y=_@EEO;7Qg;6QrcFif8g!l~PwR>$p4Ymop<*9BKA)9X`iIxe}y%<OC7SbhV<pJJ&1

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/if-001.js b/js/src/jsapi-tests/binast/parser/tester/if-001.js
new file mode 100644
index 000000000000..ffc621a32c5d
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/if-001.js
@@ -0,0 +1,42 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          if-001.js
+ *  ECMA Section:
+ *  Description:        The if statement
+ *
+ *  Verify that assignment in the if expression is evaluated correctly.
+ *  Verifies the fix for bug http://scopus/bugsplat/show_bug.cgi?id=148822.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               28 August 1998
+ */
+var SECTION = "for-001";
+var VERSION = "ECMA_2";
+var TITLE   = "The if  statement";
+var BUGNUMBER="148822";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var a = 0;
+var b = 0;
+var result = "passed";
+
+if ( a = b ) {
+  result = "failed:  a = b should return 0";
+}
+
+new TestCase(
+  SECTION,
+  "if ( a = b ), where a and b are both equal to 0",
+  "passed",
+  result );
+
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-001.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..1f10b0947393b9930cfc8473d22aac10e1c81373
GIT binary patch
literal 4242
zcmd^C%We}f6m@x&#{wa-WiiX5E+VmnArc9Z8Wd8*MBO4M<D`a(C-OKA{T03osfay$
zK7nh;89TAlm}DA(SdQ&EzW4at<Lg*VCmE^7=LDzq_dFkQJVv(=Lj63wM2&X$ZSo=+
z<P(D8npzWQv=H_0j}UqQt77~2Gt4ROXXFhTWSC<?bEcqD^If3Nl%>m9-vH-e6IRX@
z6ipFjRFnYr_U)7~L5GxZ1;_B%1YHPD*{FUGwn<veUi-8g*YsFi(;zlhqSkk)ARK23
z?gD312M^#NlvSVwU`<gK>*?FD_5yQvxxMd}6#fA0JyLkq`jAvb;UR?HYQB5@@wv;)
z{)zm#KO*nKR=sww({l5+6%nY!CxAv-Aut<|d>BE&LILI;we7%Z>&t|bqJXka1Quir
z<)&0e%5iU9HgT4jU)3K27$T;c?0f^NSQ-yx%0-V9!ey__P{Z2jCXQWFkp8Gsz<e~7
zL=@iC1Cn_RSThbra{>-bcrWkdBR41IBwwM#oholohWVw*3rU|@96!p)P#{i6=f*O%
z9Z8^Lvyn~G4L}AEQMEVA1S6B+b*c!6?wV>Xk>_?_etP7$rM(~e4t^D@nj2EG)^}O6
z<<TWGOK$Rq-O5=Wd?U{@f|<MVDw|u}sV3Mzs`=$Kt1S8Zkg&9_CN7AZu~N}5p!E(c
zTk5X@WLk9*9YYMzv_$>rRm8|F(&u#a>?I6Y_s!b#vxTD<t?jA~ysg-_ZuAgBHxU}1
z?T7*x4Je2JlrW8NHjsZ&%U6GimSu~yB-+#dCo=Ff5Vk`8W6jFWd>uulE#H`AEAJYm
zor<7_QQt93GO!-P(h=qlW4MCnZ(Wjh;k9XcK*h>aSSU?s@c{ICfbPb8T<a;XrRzCQ
iSE6V9cZ>z;yy5iRir?wcH7&QEb*a@88=70Mczy%!u3ozU

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-001.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-001.js
new file mode 100644
index 000000000000..9bdc7bfe3f8b
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/instanceof-001.js
@@ -0,0 +1,34 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          instanceof-1.js
+   ECMA Section:
+   Description:        instanceof operator
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "";
+var VERSION = "ECMA_2";
+var TITLE   = "instanceof operator";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var b = new Boolean();
+
+new TestCase( SECTION,
+              "var b = new Boolean(); b instanceof Boolean",
+              true,
+              b instanceof Boolean );
+
+new TestCase( SECTION,
+              "b instanceof Object",
+              true,
+              b instanceof Object );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-002.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..293e9645539ddb3fdb5b4264e834523ea11d3b48
GIT binary patch
literal 6327
zcmeHLOOMkq5YF;go(BX7#4ShA9x8F*0HM;hRHCSK5vlfy+{SGUX<Rw(mi`s~4_8h|
zNL*Lq%uisPbz`@7+mME~3moIe=b6vnj3?vq(J;hiua8kse#2;wp@DP3ahx^{CQhZ^
zeC0p&J9LO0uavCuLK5@x={?7}39CGP`!Qk!wL|;@cS6JvCp1c+0`(m`A4n9;Vtoai
zy;WG0B~T=ANJMxFpdVikaKuTMV3xo|XrPRaIU`Z8d<Bm2Yt>f$sOgpDm{*b@I+mZT
zZxD_d3KO^!6pjo$fCE$Jfu?|^gep%?Uxc+Mh?&dvb8}Mo9k4e@;c@M)UlfJ=V0x|k
z`taRjlbOvE`D1fLUWTJu^;V;1`mHM>qZ025v_5vLC=A^yjX-px4yP8mtwCz-<B;Jv
zhPd`Q;&=e@mdFmL<JQ0wHmR-2jt&fA6;8Ut8N&D)I2&`scnineq%ZYQ!s_VCj&)oR
z2~xU%SZ^eVh^?+?aOM_ZjTvN`mym)nYtaVnnLZ_{<P*fW5#|*VAvRHdIU><O!iEG4
zNi)P<?l98ptDGtGkpMbS2k9jJ0muwQ6rG%fgRXLLnJO|^w<KIs<g<LAep=+0Gr#ZK
zE`A=Xm?u)O);3ww<<Z1rO>Sbtdf_ZCzCvk;QDh!G&t{HCRT=wRF+b~Oks*H-92Tjo
ziehYfoT%t0(0U1$%@kM}WLk6(9e@o`wYY8fxf|iJEAQ#yqh~Ng;F&>D2h;9!-1J5l
zj@-PktlG2IVtKRCbue97s4UYh%D`xbfXIN7P2;N*$a&QAw;j>)9T3EfXph?OamP|X
z=nDCVH7iQ<MHHoJ`R|nMmmQJp?Rm)_GKMB9mrbu>iDCgEElsV<bJmYLm0m@4wt$+c
z&$4hxKP6>4bLTO+e%=wK-iI52e@?t^QLs(9=F9c}U;m|*?CFjO^Z_VKUa+pwMGu^w
z7xL+1%XRD0ic|M4gMPPL2^8Kx5<gZvQ|m}R8aiEiPaLEzd*tvle%AKJK@%F!svDHl
zM^9kk4Olzv1zVmg*_E;0nw+!Ug0{_QY|A-I=R(fd|3fuMqtPqpgx^||K#neG%gI@j
NbUCr20cI^Qe*t;C38Vl3

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-002.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-002.js
new file mode 100644
index 000000000000..6b2bb7f4f690
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/instanceof-002.js
@@ -0,0 +1,51 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:
+   ECMA Section:
+   Description:        Call Objects
+
+
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "";
+var VERSION = "ECMA_2";
+var TITLE   = "The Call Constructor";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var b = new Boolean();
+
+new TestCase( SECTION,
+	      "var b = new Boolean(); b instanceof Boolean",
+	      true,
+	      b instanceof Boolean );
+
+new TestCase( SECTION,
+	      "b instanceof Object",
+	      true,
+	      b instanceof Object );
+
+new TestCase( SECTION,
+	      "b instanceof Array",
+	      false,
+	      b instanceof Array );
+
+new TestCase( SECTION,
+	      "true instanceof Boolean",
+	      false,
+	      true instanceof Boolean );
+
+new TestCase( SECTION,
+	      "Boolean instanceof Object",
+	      true,
+	      Boolean instanceof Object );
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..8a2e95ec8461fe1a9af1a92673cd006449f09121
GIT binary patch
literal 21454
zcmeHPPjBNy6nFW%fRMPe5>ZdPl+rGHTZKTI1_&x?wFxV3k(*3Xv#uT4PP^r!AaUg*
zaO8s^j$F8Lgd6WUGoI(nIGH$3l%~EUO2+g2X5M?h_nYVORHO08Wwq)hv-`F4z#j(o
zmGzosSr>l));eyszHL8i_xusFst55kRo4ll+An98^$@PA((W(pz_Bk}cEWnD9oUiM
zd$Fj#{2f{^9j~93^%uz5nJ3E+Vo^@tay%zW1kl?z`^<}+fy07WoM&H2rNbz2ykYHa
zxJ|oJ?=;U^)dT)t^?(bZvfA<Wr%uEI+l|Ft+wNGA_W{UryfCu89`gtLhlfx1Jyo!{
z!9hHARes;sq3^XFsFzbca!%<VAbX8d`l9i?UDTAm1*$jd-yL;7Q)g!V6Zz-*Ch|?V
zRj1iGZK&g>9%1O2?}9YxnX1Sorn2#B6tFOa=x#@L#I7LfVrOH?|Jv}Z+pa6S#yxuQ
z7n4CnhiMSZ@4yft^n$3v!f3__xmYS)>aola5GMH$>|i*?i3qhrHy8{e$xQ%w^9=wo
z3p)O(KUBvQ1IW)1*-CI9JDwff%5hl;F96#B!vLKw8$?#%3@;^eauh;Ad-6tfl2#zn
zU?Pf!XdGZg4lwb1jaL|GHzP<B$rF@Merj&?)!6G{cBF~&4bT&^+XxcpRhXT9seugi
zMHp!E1a&r0ry<t$Z@38EC6&w#gg<~j{>6{17j>Vgq8HSZ2-6_{g2FI~033m4s$M(`
zQ;El}-+L*MU_Sl%7yJOPO3j!IJ}C;l4;0~esRf54fYPCd;2{Mp61|_xA<{7!*biq3
zG#k5`S)!uy0zp;|qOuLtB%ZNqH=7Px@tbNat+bGtTkJ;mjGd>b)PeJZDX?ybO!|UQ
zJ&y1v5Z(wdDStJXdSfuo>mut-KP%AEkdEOvAF0Nneq~^e*^wYDPK6q(_dclixFY#t
zaS4;Ctbui%$_Dc=3*PDI4Mk;PAkP#+$>e*I;OUL%IvJ)i!TF>Mzj)a`>mv?`7GE>(
zsp_-w=v&Z?KD{WQAb*Ni(yH7d^75}BUtuy5b{7Kd73Jj<pXPZa5fch!jRK_W(QV>9
z)LA;0PAJC#om3yAmm4_#EK6v-wHS#a9;mKzSfzRTHBlWx?lfc`uHRsxpotcZjask-
z4V+$P)hc!y>%o^v#Y>n&e3xdKS3tyc7WtE`YG{;|@;;FeR9#}2z5#U=m^S1DA4A`O
zMdQG$>^_22u)7xl2z@G@a&I?b43BqJ1+uaycQPH^lWH^is;D>%_Y~jMP4i^lZ9p6Y
zJkCzxbOH?pVKrT2V=jpbEKvwhoK8r-jBjWcJx8OrHxPuC)NU6DNaT0BW>z+kddINR
zg-OVZl^;Rh1S>gEV#EMMPS{-zfTT7QFu(eOAqNf3T5Xeg|1%){8(xpghXN(<hsV+>
zG~M!L+3I+|mCgH0F2*-N<O@=RT$l~36y^;D70tzFcm~z(e$i%42Bec=U@Bx)F{g@d
zN2c64wOB+pvfLx`>?MF$OHF^%F|M6;XddsBti$XXe#TS4e1KN6j*@lYb~&X`NYTM;
zo&V1lijV|y;@D1+yFAsLJbmt0D$~F!HKai*!#q+n>zLsgRJ+ntWP`4OsWyjoXc$xy
z`rN|eH#PX$S;wJT@!Dk8@kv?hh&Q4e#6tOuGuh-$BWzPhVF9%c$V-`zi3GTm)r~b(
zH#9&>-OeCjm*N>FzCiW4U(8~8<7^JI&=A@r*tvzpZ))(hGmE3U#Vmd+cTbhfVk^o`
zd6<RawiqnRYT{bpjrgXxvki%+_>$lq+aB-}*gfy|fPLtjY!48-tSkPYqTg1PW3xcX
zao5CgHK9*K-GJk64vo@KLIGdX-*k-I0A~hv;?K^OH~3<Un$@MDwbS3@lKvL_Qs1Uj
zZpy;i))m$kz#UCoZ+pHd>2FDY<>T=C%Z4<ePbb5WR+&FaE>UULTY-kt4Xe!M?UrNN
z^8KtMN#IO`f%D1|2d5-Yal*+-O-P!reW#yL$eq+ik*UomaB(7FIu%X-rvAEFOBn-m
zz6S$6X|(Ilo9BfcVuj~;$y-;Pu;Teq#jXtaDJ6*sGI#Ra=_$oJRO5$pI2EjMq7Ib~
z%@B-`9J3(s16A4ze6gNBRtevNDC%GdtfJ06Jmz<}NO|S@*!Nv#dzo*d?j){6=Qm%k
z0<1FGh_-s;6tkf>GCJ;RPDK#?WU_M(j+mRgR>b-(cx5T%f7k61y!$Es6R%>%GxZ;I
z{t)_$ca<|iiDS7w!bqd2Ovr%Yjl2d!3RUR_@*ptXK=vM`8_0nM=>}5gNjH$x$s4lb
zf;VdqP2p{b4O54_@fMsU^%NH(QaNOgw_#$|yu8O-bw_3JrmTk~yjd+<@dngXJ@!d$
zRBe#KA$V8aaYVccJBI2}Z@d*XO$P;0MtxhGH)?7ayk*W=Y!kGIKgV!qyt{}5oSIB$
Rp5+%at*@IH9^O-!^*>m|T~Yu5

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.js
new file mode 100644
index 000000000000..1b3937ac8ab2
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.js
@@ -0,0 +1,88 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          instanceof-001.js
+ *  ECMA Section:       11.8.6
+ *  Description:
+ *
+ *  RelationalExpression instanceof Identifier
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               2 September 1998
+ */
+var SECTION = "instanceof-003-n";
+var VERSION = "ECMA_2";
+var TITLE   = "instanceof"
+
+  startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+function InstanceOf( object_1, object_2, expect ) {
+
+  result = object_1 instanceof object_2;
+
+  new TestCase(
+    SECTION,
+    "(" + object_1 + ") instanceof " + object_2,
+    expect,
+    result );
+}
+
+function Gen3(value) {
+  this.value = value;
+  this.generation = 3;
+  this.toString = new Function ( "return \"(Gen\"+this.generation+\" instance)\"" );
+}
+Gen3.name = 3;
+Gen3.__proto__.toString = new Function( "return \"(\"+this.name+\" object)\"");
+
+function Gen2(value) {
+  this.value = value;
+  this.generation = 2;
+}
+Gen2.name = 2;
+Gen2.prototype = new Gen3();
+
+function Gen1(value) {
+  this.value = value;
+  this.generation = 1;
+}
+Gen1.name = 1;
+Gen1.prototype = new Gen2();
+
+function Gen0(value) {
+  this.value = value;
+  this.generation = 0;
+}
+Gen0.name = 0;
+Gen0.prototype = new Gen1();
+
+
+function GenA(value) {
+  this.value = value;
+  this.generation = "A";
+  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
+
+}
+GenA.prototype = new Gen0();
+GenA.name = "A";
+
+function GenB(value) {
+  this.value = value;
+  this.generation = "B";
+  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
+}
+GenB.name = "B"
+  GenB.prototype = void 0;
+
+// Identifier is not a function
+DESCRIPTION = "Identifier is not a function";
+EXPECTED = "error";
+
+InstanceOf( true, true, "error" );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-003.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..7c92d661ec149be7ee8db05d540e1534c00b3580
GIT binary patch
literal 6082
zcmdT|OK;Oa5H|0Z;DP{&Q;r}6sVEPLx{;bRML}(fnzUE6i8qO<<BisviU@J!hwvx(
zF&shM`3Eq&S$oH|oj4Dr^px1%{dVS?nQv#;7Q=x@OLmVEr}Un)E+>8KqGeev=8UXz
zt^Tg@rqN~tYS~3K#`fGml>XeatlKck#?y}ocS*~m+qCTwPK3*R1?8CMz&dt)Cyw<K
za4t;4Vq8JFj^+BUhyd{NHHZ4b?YNXHIG^;5(ShKu-z{B(Wg68=v$kKii~5~i)F2qE
zp~mmJf^y<1xD(<H6L@z3&-DXA{5EBsr)z8LN!Sp+sED)ms+VBq3E|1%*orv`{Q=l3
zB=o3y&{!6sSHbjZWpC@l^CUB?C-V2|h`a(zHEYe?YSM3<5jpenE})sbEI|1}IkJ>&
zTRo>MOwJp?LizA*{cx{bJy;5_mjUthtM!*jumy;$ej0EZ1fZ4;K?LoCimCFY(fd@n
zs}RpKQ`L+%yrM>=aN^_;M@bh*85d0&hzTBQSd6|i^xIPIvGPlW1G&!JNAUa{)=9V>
z#*%hnoU+H-$8i?Zwy@X~w8g;^5!F#Z_25P4RQm%lGNz?1g_kgqHFKn<Pf3a`$fK?=
zQ^){VlDbd=ERS}C#ocbtY@&KglJJ{`Uu;c|_*{qCqDKdui77$aZ+)a~Y#+?bq&*A+
zw#K;jKX9|nurIQ8V#+}ar~us+qsTYxLk>oBWqb}CS=TBoVl<#8z9F;W?~K+>j&}$e
z{$lVs!*@#WB+**$2=5MM$_Mi@eG9O*97pP2g#;-asn*ShC1p%vJ#X3d2_G4kW+}EO
zCK#BXoO^r;OzCLdEr2pUdR*8neEzag2&+&(!l!3Z_~Bjnd81&KPYY8{Gai5$A!Gsd
z9I0BJwoaKbj}kxZwE->)W9slZ3BL)r#ysOXW<EzTO-}n6!7?j6bX=bqqDPI7mznd7
z@Ezz_(HTK5v(znN_JdTDqpepeM@u#eR*(3O2gk+mXp4D0)k>&I6OY7SVMu~eBMdWb
zRcEes-@ucE*5y=$`!e2Id>EF5DM^qMUY?XF=V_;zSp3dbCvqfx4z<ZZiS%Gx3DKkW
zU#mupjXAp93K8vI#UsOjs$3Yrolbvg{k(K7Wv7i99q;C+m*6h|mAJ7T`n;ClUvT7n
zm*C<Bow5HdDZ%m4P^QiJd6$auF_t=YxI#2dr7E_EFixddFuqZg|8W{;RHRO8oZZXG
zOS%4H$9{RIA#$Dgr_gRFgq~yqg)d;B?6||L(9G^zQ=D;)qrWD4DE&V5s#kwYxoktT
i68D+<oAeKDVft;x=?Z-fl6NZlYm$2XA*0JoO|E}BW3`(A

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-003.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-003.js
new file mode 100644
index 000000000000..1021914e9577
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/instanceof-003.js
@@ -0,0 +1,65 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          instanceof-003.js
+   ECMA Section:
+   Description:        http://bugzilla.mozilla.org/show_bug.cgi?id=7635
+
+   js> function Foo() {}
+   js> theproto = {};
+   [object Object]
+   js> Foo.prototype = theproto
+   [object Object]
+   js> theproto instanceof Foo
+   true
+
+   I think this should be 'false'
+
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+   Modified to conform to ECMA3
+   https://bugzilla.mozilla.org/show_bug.cgi?id=281606
+*/
+var SECTION = "instanceof-003";
+var VERSION = "ECMA_2";
+var TITLE   = "instanceof operator";
+var BUGNUMBER ="7635";
+
+startTest();
+
+function Foo() {};
+theproto = {};
+Foo.prototype = theproto;
+
+AddTestCase(
+  "function Foo() = {}; theproto = {}; Foo.prototype = theproto; " +
+  "theproto instanceof Foo",
+  false,
+  theproto instanceof Foo );
+
+
+var o = {};
+
+// https://bugzilla.mozilla.org/show_bug.cgi?id=281606
+try
+{
+  AddTestCase(
+    "o = {}; o instanceof o",
+    "error",
+    o instanceof o );
+}
+catch(e)
+{
+  AddTestCase(
+    "o = {}; o instanceof o",
+    "error",
+    "error" );
+}
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..1d16ce0406f3c64d759a004b04af2cb0b8bdde05
GIT binary patch
literal 21635
zcmeHP&2r;J5LWnIps3=)jVfF@?Gi$Ef#Q%dfy6OjDtJ@tuy9K$_Sg}tNG?fEHarRs
zz$5T56h|)HIC7+WJfmrOM)p{iU5=wmRL*ExJ=5J^f72RGJsAysc2K`$ZtvhU3I~yU
z<-FoJ&PCX}b&gu??>qaQZa8F4eUIN$_q{kd_~O)YK7hOGwEJ^6^4trb9kZ_QMsDJT
z0T<O%zhmcx7xc2S{suW)vt)%47v=RFFYuC70DXL`$AZM`do1GO0{2QO9Vd|&3=ZCe
z$8?&Fv)0pgeNX(az9)oGSsi}=iI=d*^|`of*B@!}-UE4F5GQWXWnq8!@#D{T16{Cu
zz#gBvx_IuZ(D&Mn^xLT(1*h~+kiEhwecpW5DQimK0M(m~9}dqy)n{h)6ZzNbCh~Q7
z)LHB7q^XaadW5BCz75ipXX+vsn9AnMVZ`DXqPvs03A=)*<Icv?{~N=z;rhPn%6oL-
zUrYrR9i~MvzXd~t(2J5Y7AI3iD8y3fN{>Z`fG{bB;6{THPDE@Ry2W4+Np2#*o9_UK
zS#%bjgads{96)}9$ku}U$P3))R*lO+cmdc37zXI{SwC?iZ*ZxQQ=kwE+EEXple7ep
z786l6MB@N!YJjQV8@$3oyD34MN*<$p`qS{BZ$?2Evm;HEuYsPB-G-1juj2gdOATb9
zFTy}eB&er-eHyr~|G-V?E}3L*A^ZXK2`_$O-Q@g<E_zN)i7*55&nXO(2*43&rt2lL
zFqL@Zhus$n31-uu|G*FMuFQ<7;8UW|`#=$amqu_n1SlN@2p&qnJkk558X_H&h5c}r
zK(mo=m?bKzC=lf3AS&BJP2w5LcC*Q#mA|RR%1U#Yxy^1=PwqTrr4F1QOo0tIX37_&
z>O8`qKzJj-Wc<})>aD@JsEe#N{VYLCOFD+*e5f0T`jv$_rbmLbI2CHC-n*dQqnhH2
z<t0p_vH{jjDqGCMG<c_@w-l9!fg)2#CDZFT!P5uPbuvt4it}j~ar2^mR!1BVExu*J
zXS&bw(YK))eR^I%LH@*7(z@I-^78K>Ut=-~cIN`@CFSMgkmh+L5n~GF3?roL$!+R9
z)LG6hy;zL{I_W+}Z?|y#X_hc}YdI2SJWyTLuqyNP4rFx*xzm6JxPF6$f+1QAHfqBX
zH1fK+RV(f`&V#ShikCEpyjEtJRY1gamW1Q1YH5_E@;;dmbX_=1-+;OrOj~k-kDzbF
zl2H`YwjV+&*xpG1gg#MDxwD-zhDY1F0(sd}IGG9VNwpb$RaTs(d&(<y(;}I76A;G&
zkMmPFoj^-LSWP$BSV*D*D-;40rxQ{v<6GLr%+cuMEd*gD_52(NND`i(+gaH{>K(&M
zA10wFR(=S5Q>+v~i4g-3Ic9eS0Fv5J!u;|Jh5|GUYqfRe{rf=r*SsEA3<WCQ53i*&
zXu9FcvgPr9C!hCMTuf|$C>Ep^xiBAADa>06Dw~T<@eHcn{i4l=3`i%#!c@qrIHyW(
zhql}~vsgqnve+x~{3U=~OHE$s7+20Z46k=8)?xP!Kj$rAF+i(WN5wjDyPQ@ir08I`
z&j0r-O-KqkJhn6Bu1GbfNT2(a$_%hd4QY|eFpreYI;MCA)vhuX*`RA-s`X(V1_qUe
zzOb<TO%1+s*6~=cc&#(*__(Td@Qvseu~5C^OgFjH2wN9YSVFA>@>1?=A_*>4bz?=<
z4Fix;x3dV?g?NUIFHn8%7qeL0IP1eK41_ifc41-pn;LxO%;NBFF^fN{-BT5_*obmd
z5oTezEe4CShPak^Bd-*9HX+fJUlP1y+XH?DyBFOaunT?D?E!L^buH}I%-gC8Y!;|E
z?ut0BA@pgeTX5X<p-~1(DB)}JO2@bfaAsjA@$PJKgU`39Sza1iIsHAV=x@m%^{q?g
zrYfv$Tw!ev+%d%Urss=_{#Nu?y$-*>Y{(G$bTTYymHn&a3YDgP6=*r#u*zKAZUvSt
zKTbQ61kOb0doLY%a7y|XCmx^Fgrxa8^m-|U+{$benb>>+H>Uz7Q_<va>aXjyl(8`9
zJ224WW~cG2bz0gXR(Ot=dUVZ;YeAUQ+*)6pQj(e=cPG!Co>HtsHGe*ZQ^A_Y`cUc6
zEWrrLF^i%w(xolI7aQ4QmGCQwvJRHOD(cL`V}637nD)u_@(#Pe6Df|u&}XjUqgcLe
zV;}C&3U#7O?x(R^%D2b6(xj!R{U?OLb2QMQx0m29SzSyz6-2NJufh3Re5Y|@bq?2z
zQYAX@cuOCgeK-EziS^p>EmbW3-EfESQL6l({6>_|)cfFw{8U1bM2yZN+H#Rpw3}gp
zG|F;{igM8?3P+^6mTe$!FS89~!&J6`oWhW8AjPR{1IhQIAupIkv+<-C(T0FFaWb7~
z!Aa7Oo*^Q&lL18=vI)Z%hoaSVzK3Yad$S{&^;(-~Kuz_ts`N(P206q>bTyr!B$}{e
zte;OOT2a$%zz}8hPs~N5q3|MFW*i_lMiTya1W(4N%cBNxYI2=<nqN${zG-4a=t~?E
G*Z%=>K$S%R

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.js
new file mode 100644
index 000000000000..18de1c8da079
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.js
@@ -0,0 +1,88 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          instanceof-001.js
+ *  ECMA Section:       11.8.6
+ *  Description:
+ *
+ *  RelationalExpression instanceof Identifier
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               2 September 1998
+ */
+var SECTION = "instanceof-004-n";
+var VERSION = "ECMA_2";
+var TITLE   = "instanceof"
+
+  startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+function InstanceOf( object_1, object_2, expect ) {
+  result = object_1 instanceof object_2;
+
+  new TestCase(
+    SECTION,
+    "(" + object_1 + ") instanceof " + object_2,
+    expect,
+    result );
+}
+
+function Gen3(value) {
+  this.value = value;
+  this.generation = 3;
+  this.toString = new Function ( "return \"(Gen\"+this.generation+\" instance)\"" );
+}
+Gen3.name = 3;
+Gen3.__proto__.toString = new Function( "return \"(\"+this.name+\" object)\"");
+
+function Gen2(value) {
+  this.value = value;
+  this.generation = 2;
+}
+Gen2.name = 2;
+Gen2.prototype = new Gen3();
+
+function Gen1(value) {
+  this.value = value;
+  this.generation = 1;
+}
+Gen1.name = 1;
+Gen1.prototype = new Gen2();
+
+function Gen0(value) {
+  this.value = value;
+  this.generation = 0;
+}
+Gen0.name = 0;
+Gen0.prototype = new Gen1();
+
+
+function GenA(value) {
+  this.value = value;
+  this.generation = "A";
+  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
+
+}
+GenA.prototype = new Gen0();
+GenA.name = "A";
+
+function GenB(value) {
+  this.value = value;
+  this.generation = "B";
+  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
+}
+GenB.name = "B"
+  GenB.prototype = void 0;
+
+// Identifier is not a function
+
+DESCRIPTION = "Identifier is not a function";
+EXPECTED = "error";
+
+InstanceOf( new Boolean(true), false, "error" );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..170b78ef4b53fa652b295173d353fe2dc986b9cb
GIT binary patch
literal 21583
zcmeHP&2r;J5Z3a$KvBh&f&y1gyJSPMP+Yc5AaM+s3f|P(Y;kib_Sg}tNG?fEHarRs
zz$5T56h|)HIKqu?c}COnjO4K_yBtTCsGQNXdZxR-{-!mWdNdik?67{p?7`t#;Ew|P
z(t5?RtaE>GV;#5J-*=vL`u><%_5Jvsy6c3|;YVkd^&#9<r`@01fn%S$?1c4QJFp|i
z_hL~4`8%{;INl&F>o1UVZ=Nhah($RA%ki8j5kMc`8Za+%h7Jp2ah`oCl@6o8@kWPl
z!ectkMz{5}UEk;btM79mR8}Xx|I~?CV7sxnE8CqY^4<e^ju%F@*Ju84@8IBzJx>)Z
z9<U!zU7bJoRp@(V2kPxqkAhSB2gqLIls<1h>y$O6Z-DB}#t%om&(xV&|3v<|zKMJt
z9@TAiPn+tvsYe)k=G!1mdZsFJiK%S990x26A-X$}9kEM@y4cxR@_%i3Hf-0GUE>~o
z_!pBwMTcn+%x}REA@qW%%fcvUgj_6@F7;Su2ndsW2zD@<;6#Mlp&JYak>ol6y!j4*
zm<3(`)E}v1iUH(Th-@Xej~&krZsfQugcpEqfMI}6mklE;a7GsrIXMcUpk4VOI!P-K
zX)qCGLo^PsCI^`Ky~ZmHw95(7MDi5nlb@OgeKYa;m>p@Nd=2!3>^6qPc^PJBUuqx&
zeGvv)JV8Ajs?!kb`ZwH!?vhI82Ey+{AOHMk){lCRRnZG-N`z^Ue?eiGL;#LJGgU91
zg{j12*YCfONHCxN{0n}7cco@b2A>p#-Uo_sywrlj5kTq4L-3FS7Kz?3<q+wZ4D5%q
z1e#4;%`8z-MS&nI2T|DuY7);_wVTZbt@uqfmR4HG%x!ipd&bUFR_eg{!4%lALneJe
zs2)f7V+d~qn3TU7OuaD}7j=>Krk@pPX-LO#oDWpvP`@%TM}8y-i&LS7>b(o<J*-K-
zSYE;;Dr;a}r?SC3<iR@~y`iWq4CI+YD4ATR37$TPu9IOZ6P!=F@SB(Ivp(X0Xz?xc
zK39D<9(@~{(We&$6y#6wN?Mg$Mqd66<SR@@!tO$Vy`sE);?q2jBw|XTtZ{&JJ-SJp
zhdN95!U^R#pp)uj^mYTs&$EQaTg#Cs;(_WahgF$pa44!n$el*a!}S|16g1JIu~8eA
zpn=oRtXjoxW8MEcsdx!<h-+n*c?CpFXOTb6s)j~cDen^rLDeOO>1$9|foVfd@Coz{
zSTqT|+Rg(=1v|SDfY7JXDR*}g#_(`QRUj*SawpTlJ*hUMuZoJZa8GfiZdxSsZUf>N
z;Bj^erxR!>2&?HD8*@oiV1+_};&eiaWqd=s=s6mFyn!IBr1pA1Kq9}_GqbXR)LVv?
zE=)pEto#`ICRoXV5+ep6a?0)s03@}cfce!I3^{0M)@qx~`=0>m-|%`|F%+nHKfIPs
zq3M<{%T~wxt!&<3aWTFDqF9g`<ic!Nr7&+OsBA8l;~7-DyG5Hd8IVqffvJ#H#hfa-
z8JlwF)M63Y$a1g9vzGv3Ej4?kV_ZAy(7fKMSclm={EWAN#Q?2h9Tn@q?Q%+?kfMXx
zI{%-q6d?)Z#Ic<scSWi>Mf%*WRHlJdYDj}rhIyoH){)~GRJ+PlWP`4OsWyjoXc$xy
z`rN|eH#PX$S;v7|@!Dk8@u;eG#2e8KVxfA+nQU^W5w<C$u!LF%<fY8lL;_r@>c*O?
z8yX;`Zf6j%OYsa7U!eNjEoQO2aW;opXb5c*?A*fQH#PX$nZ?oVVivzwyQeB<u@&W}
zBFw^YTMQOuHE}KQMqDZGY(t_cza)6ewg>zIb}za;U=R8x+XKWd>zY5T>9<uC*ep<S
z+%<7rP3Y55H{iINL!&g5P{7yhm5y;6;LN~I{N35|248GZv${02cKUl<(ch9k>f4mc
zO;uRiy29E5xTA^dZO<1K{jKP)d>wvw*^nmm>0}tvD)U##6)NR@6=*o!u*zKCZUvSt
zKjs}t0%sx&otKt4I3;<D6HZTRLehNYJA;Hm-b-y1nb~{-HzxvSQ_<{i>aUx%lrb>p
zJ223bW~cG2bynITR>vSyKDy?FHM=(CCzL#@B|8|gUXi}d^P`&W@h=<_LuKywxz!Vo
z)vD%CXK;2{^F$pg9hxCzA%$i^;0LO-6?kkTefSc7D^b?*6Ig4Vd&JE9P&!jS%uXMP
zQQB@-4c3VnrFN3O9M|<QCnXp{KxjUAmSFJdPB@{ZxKeEkBGruD%bDZI=)A2tB}sI_
z>DE0s<8Jz06C1R_2qFJ>!yd!Or{aI&ThMr>{)5gRK!5SEbS5ftJL-d%G>X!QjK#DE
zkV;v)fxL-KH;~Ow=>~G5Lb`zzn$iu#pLs)8$nj?FsV%$>VQ1!)Io^Vkq#h$fL@KBJ
z@it@zny&|WtM050-jwy0hBvEqGv0ujs^?Crjj9bYNDS|)I}eFBVaHHCYmT>~rs<#{
v%BY`<^F~b(g}2N(3~q`R@!ttN8J{j90jDO@ne+T2*ZR7N;o&W?ieLW+b`ysO

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.js
new file mode 100644
index 000000000000..8f02162cabd9
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.js
@@ -0,0 +1,89 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          instanceof-001.js
+ *  ECMA Section:       11.8.6
+ *  Description:
+ *
+ *  RelationalExpression instanceof Identifier
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               2 September 1998
+ */
+var SECTION = "instanceof-005-n";
+var VERSION = "ECMA_2";
+var TITLE   = "instanceof"
+
+  startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+function InstanceOf( object_1, object_2, expect ) {
+  result = object_1 instanceof object_2;
+
+  new TestCase(
+    SECTION,
+    "(" + object_1 + ") instanceof " + object_2,
+    expect,
+    result );
+}
+
+function Gen3(value) {
+  this.value = value;
+  this.generation = 3;
+  this.toString = new Function ( "return \"(Gen\"+this.generation+\" instance)\"" );
+}
+Gen3.name = 3;
+Gen3.__proto__.toString = new Function( "return \"(\"+this.name+\" object)\"");
+
+function Gen2(value) {
+  this.value = value;
+  this.generation = 2;
+}
+Gen2.name = 2;
+Gen2.prototype = new Gen3();
+
+function Gen1(value) {
+  this.value = value;
+  this.generation = 1;
+}
+Gen1.name = 1;
+Gen1.prototype = new Gen2();
+
+function Gen0(value) {
+  this.value = value;
+  this.generation = 0;
+}
+Gen0.name = 0;
+Gen0.prototype = new Gen1();
+
+
+function GenA(value) {
+  this.value = value;
+  this.generation = "A";
+  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
+
+}
+GenA.prototype = new Gen0();
+GenA.name = "A";
+
+function GenB(value) {
+  this.value = value;
+  this.generation = "B";
+  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
+}
+GenB.name = "B"
+  GenB.prototype = void 0;
+
+
+// Identifier is a function, prototype of Identifier is not an object
+
+DESCRIPTION = "Identifier is a function, prototype of Identifier is not an object";
+EXPECTED = "error";
+
+InstanceOf( new GenB(), GenB, "error" );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-006.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-006.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..36ed72efb86a8407430d1f7ad53bb86ad9e5f2db
GIT binary patch
literal 20918
zcmeHP&2r;J5LWnIsDk3mg;Y+vge6(_wq*>7H$bSYm%`q?x)gith*cz)Bqtjlg$LM2
z;8`e&6E|)gInq6z(X>1xc`VB=$I&G!XEd#z>F%$;X^p0lOvXNIHZGVuX#Nz1qsYB<
z-f|r0JRICO$EWQdJ5M_OaLk;>0l%l=dvVfy^UQHRg}WNG`%5?S+;g8jWqsd`+{6n5
zE^45D$IdG+7-VJr4RUto$qFMb${RRd;3cU5`uNiU3leYWv51Qc+)Jf&oJ3wQYQ7JT
z>72B>r_bAs1M$Dcfe=Dvb@=^fUcw^R=i;thf1=6z802|DoVY=sg~Nx3hmUlzQv3m*
zxQ2M@+tBmMjr7~879}V2PmsOF34M9;bEm2aeGgPWX+1mYeWlOL`X}<Q^-biv@Tl%-
z_v}O;H}wchzx)uSDZkW3E-{rSug4LKV~Fie;wJ18Vvai-OaE^S&X()@sw?l&hkr2@
zQgoOWq5J_15dtqtx-3o#MkvHm=}M1fhJYX`hTuk{2~I?89J<9|J^@+R5unWv0K+Wm
zhG*eO9}@?V-ypKJ;6C;OH@Z>dau8ksv;l+xIDIxuoX8tpDBKh%go5_fgXko!K%~V)
zR1MHLz+E-K)b9;mVWC|?kfxHSD4+f`Jm|Yg(8t_J)8sp#C*-y<q|M7XKlf4tS?G%}
za4OQ%^PxTsT-Sf#CUlofDz^}R5Bh}Xzp#GNGi1F5H6_9f$iJX4Od<eBpqV~ok%g(m
zV?XS_Qb;hL{QL)gfOlnPOa-43h295>2)s0c!x2E~C_wN~0v3thuhkIgm@Mpvvjmz=
ze8VhJQDuQ3F9%WC7HSgDShbtY2Ce)}HC9$y$johat$K3jsVa5g{9p=fxiM3|AXVoP
z{s_Vw0Vd<G7E^Bx#${b(z3FEKT3XUE9Or%AIMlB!%uyT((&AL8rFtKMdJlFLU#u=+
z5|s_GZc^D|9*W?dj^0vK9tMg`A(c$8(*#c+L|4f$l_}1rUBu1H_E{fsK(zRt1&?)~
z<)d#yGy3$RfP(yqucLLjRpjM2AYWrL3U(I)>=otZry<SrNFt^b${9yU*OQynd8o5=
zFT7Zd13KwGMsK%p{31&jytNvMG9IX|YFM>-22EKVLhdwT0j}R*p<sv>gN@p-1dY6Y
zZq16jjdSnYwB9AnA+NPr=9LdIoh9Kkt6CamrMyoj1YH*n)7PM`2Gf?D;B)93v1Aej
zyL<N`73}RN0773Xr`+F58N-7;U4gvpDV)p%_oUX0zAEd@(mmysx@noryA6nAfyenN
zoKB#nAgrYuY%C;Efi(&Niqi=xm+>v_V&-V{@fL!xlG^J50ZGDM&(6vgQg0bn`Y;J)
zvGOzMn_{H^N{kqQ$SJ!k0g%*&66RN5FchF+SgUO^?|%ZMf5Yo><xrsJ{qRycgQi=)
zEL$D#ck+3E&Bes_hjKw`kqh%-mBPHGpsKl8foD+d?iOt}WI#F@7N$a0#W_`SGq&Z<
znZ+Wqk>y^I=Pv=|T59%6$GCRZVR*e$vktp=_&IL@%K=)=I%?K|o8`1ZAw>tfb^gEK
zXhKrR;jx_|cV((MW%}H$RAzuxYDkMzhIyoF)=}UYRJ+<#WP7fKsWyjo7#LI<`ohBU
zH#PX$S;wJX@!Dk8@kL$h;M>qGVxfM=nQn2X5w<C$u!33#<fYu#L=s%;>c*O?8wMby
zZf6m&OYsaFU!eNjEoQO2aW;op7zk||?83tGH#PX$nZ?oVViv#GyQgYqu@&W}GR(qq
zTMQOu4RI~;MqVlIY(t`{z9e|dwg>zQb}zd<;34!)w+F~w*1O?w*SxK&#Abn-<F1M0
z8bY6jx&_DG92#Yygc81HuXK#t0B06<67SBIH~3<Un$@MDwbS3@n*LV&QQxLiZtB9?
z))m$kz#T(eZ+pI|>2FPc)$8!P%Z3c0Pbb5YR@uKwu2HGzt3b=?hE?YBb}O-Lc~NvE
z37m;A^j<si;FR<&PCPxQ2}$!+=nYZ|xs%x_GPC&vZcYWvrlQ&3)L%<3Wm?&zY;fm!
zRUh+X<!bJM9WS5|p?&7Mx&sFA6oBI}^qFh;5Rtzse++kM#Szg(evSyY=r)>e0g@)7
zrm^ttLcOT08BI{r%wb+TYL8M@A(LX&_zdc>{NB#Q>g1z2#UXUx=_V>TZEX652^+NG
z>y=piyXB7IGeG%2`BfgDsXw4IKLt*Nt<fZ+4GVs94Vs3v{N7cpwn<5X0096PdF7LB
zAiGSm4dm1HYy(-*XB!AeiiW&s6wSutF+>|Kk!Ftb5-m6n`gt8hq;{N|XhR4#e5NH@
zO@|_gro3{vXx0l9q5(D45BSj=bsOYl3(?hd@Qi4}j<J5ImuN*zvp!Fh(Z9<TjfT~#
kXqj{B))Wl*-w8Y!pDz8i(3y+;qR{%Li4oB&p-5c+2cFTY4FCWD

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-006.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-006.js
new file mode 100644
index 000000000000..9f18c4e103f9
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/instanceof-006.js
@@ -0,0 +1,86 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          instanceof-001.js
+ *  ECMA Section:       11.8.6
+ *  Description:
+ *
+ *  RelationalExpression instanceof Identifier
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               2 September 1998
+ */
+var SECTION = "instanceof-001";
+var VERSION = "ECMA_2";
+var TITLE   = "instanceof"
+
+  startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+function InstanceOf( object_1, object_2, expect ) {
+  result = object_1 instanceof object_2;
+
+  new TestCase(
+    SECTION,
+    "(" + object_1 + ") instanceof " + object_2,
+    expect,
+    result );
+}
+
+function Gen3(value) {
+  this.value = value;
+  this.generation = 3;
+  this.toString = new Function ( "return \"(Gen\"+this.generation+\" instance)\"" );
+}
+Gen3.name = 3;
+Gen3.__proto__.toString = new Function( "return \"(\"+this.name+\" object)\"");
+
+function Gen2(value) {
+  this.value = value;
+  this.generation = 2;
+}
+Gen2.name = 2;
+Gen2.prototype = new Gen3();
+
+function Gen1(value) {
+  this.value = value;
+  this.generation = 1;
+}
+Gen1.name = 1;
+Gen1.prototype = new Gen2();
+
+function Gen0(value) {
+  this.value = value;
+  this.generation = 0;
+}
+Gen0.name = 0;
+Gen0.prototype = new Gen1();
+
+
+function GenA(value) {
+  this.value = value;
+  this.generation = "A";
+  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
+
+}
+GenA.prototype = new Gen0();
+GenA.name = "A";
+
+function GenB(value) {
+  this.value = value;
+  this.generation = "B";
+  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
+}
+GenB.name = "B"
+  GenB.prototype = void 0;
+
+// RelationalExpression is not an object.
+
+//    InstanceOf( true, Boolean, false );
+InstanceOf( new Boolean(false), Boolean, true );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/keywords-001.binjs b/js/src/jsapi-tests/binast/parser/tester/keywords-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..60ae7a7dba8cabdcb3c7d264b512c4a101056d94
GIT binary patch
literal 6811
zcmeHM+ioK@7<M_I9sqGQtdO|dBDg_psMMyB2$TXlVQ-N;<0S4*W(M2oHgCWi@M7G+
zQ}77<zsECn#-7woBP38SGqykfhwnc*Bekvzb~0KrnxFhAs)e8{@){xJs>(OyY<l@^
z`c;}$H6x>Ay=PQ#sZM_XkdXIb*T_Bof(lNr3U<!2f(oj5Rcff*{+8q=FY|4zKLF?G
zF04vuD4r8ua@7I2*H3d+Dn92-Xt<KDtk6;kUM^1FhHKKvcsBjva&&CIjgAe7i<RpA
z7hEwx3k`Qei?xRba3D$_s0BRMrW%>$*J1As75;Yj-aSqD7hwO3CVVk@o*v4CZ-MBO
z@%N{{eC}K3e{IM&LGjsib}{kwb{P@L#CHJgJGOaMiCp@C4>089wiZlEh~-pK#a0kw
znrf{39t_4YEed;7pUB`7vmxXv84<egf`U>}p=L~~9U2-~7v0M75EU>f8WpHmtkDoM
zsCtAl==&NnQa}-%Gk$}0FP<Zr@C?q*mRu$Z43!A>>zacDld8sioLtizDl@@r^|bjS
zpJIN>RKiNk-Fd*YO&aSs6tM7gZY_&;!mCMEl@e}8!nC!+^~%pB6&vdsg832Z4Ac$C
z^}x9~za_1qI{=eQ(Ka7<k{)eUp&s+1-F99nM;bg<U0t(Gfh;JN+H^v=TJ&y1!5+qQ
zEK$ZYoq}D7YJK2J5J|TcRoQYFQTw=tyFJ=HXA7`PTME%GHC0d-OENF$!iIox4d(NP
zQT8&k1S?=e^TX<NH@(h^Dto!ju-)y+7odfwi1n_8!cFX6nJk)55q{a}Yi*Vk<nt6s
z<C>F@Ct3oT)};Gs2xUII^m1Fk#(_;6=p8kO+_R5qp{bnOg^y|B6%(Rz8sNvYK*-RP
zGFSo*k{0@&=z=+%iw~R@_8fBl4CTT;)?wyEOr6j)t&2c|<|ep%Wa2sH;qJ=d?J+FQ
z#Ku-KtV>r|C&`kQc>zOksOh?QCH?HbQAytb?HP>detU6{c#&)90H68b`;}2F=uKJu
zhRSp3&NDRu*;|Jl+14mfQ^(lHjSIS#Ot;K6ytJ%_Uu#^pMsy@7+O4mri*j!Y{SDOg
zdYFA$gEPKsWGL8N5y2NrJ8qZ)^ByS0OQ~p?v1)F$bG15*Z6Z+c)hykVir!APt6`Ue
z15V$wbv=c-eNp11Y5}(AtYM>}$G+a%R<Q|mzo9F_%n?M6K*6+v724XN@1?=tO(k_H
z7TZY=ok5ivj0>ikH&&Kkf^>EU)0ch(`*ge+`u9ySP~#6ryWUKE$cYJ~=QPjp4QNbd
zz%N?4Pe5gSPS|=Eh^*CL!nw7C$KpgSSz>3y<cTf<PZGJT)<s@^s*((oaB>YVEme{U
zDg)!S>&r+1?o1FaW(0?Kh2lW{a&NGi!}c1;C~KLvZf#k+#{oR?umK1|5ucSJLUDKK
zAsw4Ag5GgEjCK^|=5LRmK#vdLeEX(9NJkTT!T%e~+Mu7!df<K7LG_;Com0K19<$=-
fG6&8ZHypU$L#0^>(aJ0hJk^@jfFrfTytd~bpkJc*

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/keywords-001.js b/js/src/jsapi-tests/binast/parser/tester/keywords-001.js
new file mode 100644
index 000000000000..411386100bfe
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/keywords-001.js
@@ -0,0 +1,48 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:
+ *  ECMA Section:
+ *  Description:
+ *
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "";
+var VERSION = "ECMA_2";
+var TITLE   = "Keywords";
+
+startTest();
+
+print("This test requires option javascript.options.strict enabled");
+
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
+
+var result = "failed";
+
+try {
+  eval("super;");
+}
+catch (x) {
+  if (x instanceof SyntaxError)
+    result = x.name;
+}
+
+AddTestCase(
+  "using the expression \"super\" shouldn't cause js to crash",
+  "SyntaxError",
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/label-001.binjs b/js/src/jsapi-tests/binast/parser/tester/label-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..92fc9e5e0842af0be46299acc7457e01809cb8e7
GIT binary patch
literal 7746
zcmeHMO^@3)5asqWX?rMoE>QOz1RJ!sg?5|Rbx;ReC#aoV3)-R`A+o4aQg-)Jpg`|E
zxBnu?{*?mlsXri>+%rQ_BxO-H{jo+G^s)<!;^WNY%p+$M<V6~@v*0PC;n^d>=YlTC
zJA{x453fjfFnlmN8BKZ0NN_CQ3F0Wr&u)B9$S3etU{8NSMMNht`<6{(Drg?@L_&q;
zcSfE?Nm$4F8*q-+VR0d$qL4&MlxqNc`9a8%JeoyJNVtS9jL}&xqGW#dAuKcM_r`;V
z!{Asw3yu|tjWv?*pGP?pG?sABX<Rh$ZUSCRCoH~w=g!wn#0vRXau%os--Sufsc61#
z8?Yspe*yLZxqQ<9VYDwUKLFGFz3=b+_*Ijc!xQ=M;fQ=6mKqPn=l!PNc0_oF<Y$0(
zjv>jyPL|W0Eg&nhCiD)J_AgVxvJBFDR4pKbj_K#l{Or*<HdEz{DLi5(t88~YvKg}v
zTon13W%&vZ6|9YJ?AXNx)Jf$674t$e?R4G4nNI=hLV)0W2TIJun4j}`(<dn;e?W#e
zlDr!wR9qRq2+9oTHs~;DXUt|f5z+jqkxr#X2z1LVWRr9akRC+rTcgpzj&V@Oy(20-
ztXq++8o5+^{nN3K*`_xo{4kfKY`Aktx-@}zFyw28{t&`mMAPc1gkhZl6$5rmdAzPp
z%W8J@-$waw^7pd`e;BQ`s|FHE$jfh>*OVnT*H3<Hx%~%7YQ*N_Rgws2*etpvm2m5*
zwRG{emW`uTG4DaULj%0_?(T1Q^~S%od*{@ZF6S|$$^W{tUY9RivA@J$BSw#OT-n0v
z6_mCb9V{r(f!(f)?*T%-@lEl5kxa3YwToIrf=V=nB6pFsSIRcA9#;#WBlvgMR(oLM
zwIz-gk>i@Yp_N#svCEWA9Z)J5Y{YKNr_anK2PJxSXW_+1L|$EMf~yLeI*u&7OSGyt
zVXy4L3SN;fIM*ugOo{tkn01jy*?_=6B1IZPfz|GiZO)bj{hzQPhJKBXWvu-)M{sAM
zt}9~4&f1<VX#~vDXJ>U+)BiVbeC$$m1ZF2~gFPZ)OWzx+ie!-5p{)$D?RhN2#@u1$
z#YLBDZ5I+uom(xH+KwJp+hrTMapImpHZ>x3Ff+M>*(TFw%9D)!R6t*X&=@*w2_}&%
zg}03br0Vqa+JnJ^^%c6i7t((LPaC9n1*4Yc;&`c*E{;8%XqCyz1()tyonu&EZ?B%>
z$cv3b?pK%hJq}&qq+llS-e>|eA*EE-Qg9m%tvTp-*};bcqrAVca0qSjOmBx=^oxo{
zRr)x^uryCwtL&_P+h+F{X?|tc2XMWd^L5=dG;`2$xMZj<qn>WBGGrG^3c9aO+znV9
zyC6N9F{2@s>5_+6U?5%sYp1eDCVBU^wpBhPuH}sI>>qy#2on^L4lnW!pLJ+QiU+il
zXIyk*&eM}llNNhxJc!s(7d;SH-Agw#&Kds-qov+iqky<A*PMyAkM?J~11!D9c|46<
zoG%~uXqp$oDNQF}{>L!C`gYb*BPro>rk5JSh+F!~qDI{LZb3G_a;Y&_$XTl`)mv($
m<)eifZPuu2pm7GP=W9M2l&UTNo&o{56&01M$Z}KSj{VnJ*1JLg

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/label-001.js b/js/src/jsapi-tests/binast/parser/tester/label-001.js
new file mode 100644
index 000000000000..391732a2d3dd
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/label-001.js
@@ -0,0 +1,42 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          label-001.js
+ *  ECMA Section:
+ *  Description:        Labeled statements
+ *
+ *  Labeled break and continue within a for loop.
+ *
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "label-003";
+var VERSION = "ECMA_2";
+var TITLE   = "Labeled statements";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+LabelTest(0, 0);
+LabelTest(1, 1)
+  LabelTest(-1, 1000);
+LabelTest(false,  0);
+LabelTest(true, 1);
+
+test();
+
+function LabelTest( limit, expect) {
+woo: for ( var result = 0; result < 1000; result++ ) { if (result == limit) { break woo; } else { continue woo; } };
+
+  new TestCase(
+    SECTION,
+    "break out of a labeled for loop: "+ limit,
+    expect,
+    result );
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/label-002.binjs b/js/src/jsapi-tests/binast/parser/tester/label-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..be279c14ee9375841b79828fffde80c8524098d2
GIT binary patch
literal 13403
zcmeHO+m72r7<M_IE)Y-P-hmdhEte%5*et2KXh|0mRY(Y-Niv%?>)6rQX&c&o1g?>|
z;$67m8IZU`;+99?|Hos`?|7Vy<0MU2xmhV5`<wrKn%PD?o%p=jxa4fuJQv|eu(9)s
z<2e0rICEO3ov*t0x`S}SoyMVjr{Q~1+`PW)IPbw*4f^>bCOp>n`Img)Gr?jn3?$T0
z|Bjq1FBs;r{sx>|%dkQrp}e8v1zwy1(Ctr$Jczvuj|&MGu(2jOiiH=9ns353-S$cE
z^kJuQsGc<r6$r)Z%J<K_m<#4hxW~+&7VzE%JfHQs|H+*@pB52Q<U=X5hT8B|_~<bc
z#n&kTE6VaOz}})PAGN>ju1l700O{?MuaAG+2|@m|Jwd(>TlG$RXYIunVQG>d0NNRv
zBp<p_%wj$UuZW7!HEgr}bRu{ZfqQq;4W!ZW?77iDPnhrPPvsW_c*M0=Q3tT_X7oN_
zQN%qS#S1tz__wB`4htA36$?y^rc%;I)-9NMAF!SX2sjTQ5_8cD&%#lWCmBe70}n4a
zdCLo!m}$No3^Ne7Ar3?A^!Y{X2yb+$L#K*H2y~z~qAJ(`q=g{X9ix#!S2LK|y}>Fh
zs9WHy8FCWsv!8~Iw3>Fs{Lq(V*f9H&Wa(G1ceJWp(tp_hi4S7UkhIK+K+B6g9%b$z
z5q<|{pwk!-p!UE|W^(<C&mcw8giGzxLQS~I<Ze;x6vi^3BFC5B$3?7E!4xx*#s+vX
zBt^QfB`@e(ZV(FLEzbxh_AIw~ClOicPAgE3kP6SNjGO9oer>0Fwic)BKzbA2AT5bO
z9hqy_u$0#T=4UR#4SClb(U=NyVFkHxoc}(r(*wvn8}M=tRP|p&O6ayIrO>p^3eJRh
zfK?*+m(i0jJY?z15Gy55ztnc6eg1+eK`wdQ=3;|RRy5qwtdcrdeSa%W`D-Wn#`+qs
z?Q8qAmFC))HEoqA_Z9r8Jk4&)hfodm1{Nrgxbm#x{xlfiER~K`5ea6Y6Bx6Oqw-lT
zm9s^pwrK+Yg`H6sRkHw&_d?k#7AvKSWMcWkpH86dT+-oLu&l8R8A@dmN?ywk2Uogj
z$3AoMr2P0@$3bo7<fYqX4Ta_fT&c-gR$SA~k74LG3UJJ%0jkV-j<o10tc93RdqCOL
zH_X{6lx2emXux2U4CS-pJ4@gSkpiocrWO}U-p4s-BLDPsf_`Jk*DMS#Lqi8bp(?BW
z9CTiAll!4KB{Ner3o@81wIfQ11y64QtQx?~ibAdkX6v?<1@tG_JDU89_6xM5gUvfe
zOR&Ker+$kYCjl|jmeJ`gG;XUT3#i4$Gw-3<?<5CP+oDH@z-h)>_KAAA>>IR=1Otx3
zlGMkC9XQjQ8!6s~_oN-EXi~y}MUgO`#4{aVOf=_c6`YYofFva0XakWbli6Z1Z$)G&
zEmRimYNFH0ON$$6Uy}Vg{E7Zjj)~WG_JTHpbMF%t8Rj@r=mQAmg*0yAPgq~9^ThcZ
zz)KR=J@+CM?uTv~>Rm5zlX&8O<UVtgZ0#N#sfXXE@BQ$Zd+qkodff!by<VIpT4CsO
z7L;})x3UCIZ32$3JkSr(n5^KJA4p+beEwXML_t?QkwVO)%?Ei)djLB(*RCetx=AdX
zN^GUxl=Zpc&D`UhEs(n@TZw!-v-$QKLaVXrz9X#G5q<$3As!>Y=*kzJX7e#|-w`&G
zD|5G@d_a-s)V}Ws@!nw~pa+npF;V9Pr0a)DwPKw~3DU6d2%G73#gc|<K5x(c&Lzv;
zYn4F7yV;SNMvmJqbkd@W>ac2yck?^K{*H8n=U~dUJHmWFxNiuT+#|OghwmH0vRn8`
z54>*(WktBk=yFM-z#^t(e40EyVUu_&j3d=QfGE6<oK^rO$AXILvK~<_8wX%&&2X8P
zh@v==BansvJRoa@`AT7p*qvH4jnLH+ijv+XrH{=(^CxBMi<0~5Y89u8`NLtgu=r-U
jdI{+-9AqWqV)^$wSeNHf>itD(F^@yZM)Ulchc^EM9UAXO

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/label-002.js b/js/src/jsapi-tests/binast/parser/tester/label-002.js
new file mode 100644
index 000000000000..1e2b63adca7f
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/label-002.js
@@ -0,0 +1,56 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          label-002.js
+ *  ECMA Section:
+ *  Description:        Labeled statements
+ *
+ *  Labeled break and continue within a for-in loop.
+ *
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "label-002";
+var VERSION = "ECMA_2";
+var TITLE   = "Labeled statements";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+LabelTest( { p1:"hi,", p2:" norris" }, "hi, norris", " norrishi," );
+LabelTest( { 0:"zero", 1:"one" }, "zeroone", "onezero" );
+
+LabelTest2( { p1:"hi,", p2:" norris" }, "hi,", " norris" );
+LabelTest2( { 0:"zero", 1:"one" }, "zero", "one" );
+
+test();
+
+function LabelTest( object, expect1, expect2 ) {
+  result = "";
+
+yoohoo:  { for ( property in object ) { result += object[property]; }; break yoohoo };
+
+  new TestCase(
+    SECTION,
+    "yoohoo: for ( property in object ) { result += object[property]; } break yoohoo }",
+    true,
+    result == expect1 || result == expect2 );
+}
+
+function LabelTest2( object, expect1, expect2 ) {
+  result = "";
+
+yoohoo:  { for ( property in object ) { result += object[property]; break yoohoo } }; ;
+
+  new TestCase(
+    SECTION,
+    "yoohoo: for ( property in object ) { result += object[property]; break yoohoo }}",
+    true,
+    result == expect1 || result == expect2 );
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/label-003.binjs b/js/src/jsapi-tests/binast/parser/tester/label-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..e0250521e717805f8eea014beb05fdead098fddb
GIT binary patch
literal 2239
zcmd^AOHRWu5H&x+hO=~!LV=bpKvjiQiM^XlQ>#uKY!{UsJ5B?);65CIv17;Xmx5qL
zHdd0EH#6_ecoIFUIJA=q(5!tYMJ{PU_6Z>)kv);l&ER%;HcUkYBxzZjgfpevZ^wij
zqE!;R-&4uxh{H9coJy*hC@oYL-W8d$GF!xYMx4E`u!OWWEcnKeZ!#z~8#Ab_N?L?`
zm6oi`+a|(1X}Pzg<=mUomX)~Q2Wb3A<*Iocv`<ICAscF{p}_dIR&GAl<axqkpB)lC
z!q^sNd-M($>2xvncFEpRRa4i3WW9MMK`B%!KpCc>`QB(1mvMzId1;Cc02Uk@1%*ek
zIE*!sET8BGAQIv{)E2|;z|IC4W0b+H0Ljum)0hjlZSzR^tmz0W51)^V)gEvtF<3_e
zjc7LEYl(kfUEhjv_(1P}(}!Gc)TdR?YRpr7Q5ki;I-b+zGxq%<$6d;KaJ9pq;wJz?
zWsWUaYSp9>hufjaPp|^26iD5B2$SM#u+_hyiMgg1rg;bGKbfCe51*eu<Dvsm-|FK(
z<oFcHlTZn%yP~M5gbhT$qTR~1xpc*#Nh9^T>c43|v>R*V{pFXGkzY(#({|(G6KT%v
wQ)3#Vo+4c1^#+G*fQvMAu?0|QXE(pQ&e!*<`?+S9xj$RzcNWW?y0*za0juoL)&Kwi

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/label-003.js b/js/src/jsapi-tests/binast/parser/tester/label-003.js
new file mode 100644
index 000000000000..934732949857
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/label-003.js
@@ -0,0 +1,15 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// The colon for a labeled statement may be on a separate line.
+var x;
+label
+: {
+    x = 1;
+    break label;
+    x = 2;
+}
+assertEq(x, 1);
+reportCompare(0, 0, 'ok');
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-001.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..3b0f7fec00d51c7baadcbf3f817400234fbfa6ed
GIT binary patch
literal 6153
zcmds5O>Yx15Z&_qAtWTE9ysl>fKXbA6QmI&4Qi_>t=P~ja<gt?>g+~dr)mBQ{|pHU
zi5tIwD`T&B?ZlhZX}1yO6m4ujduHC78N13yLyBwFK1N~fki|WQ2Hq{t^N!<i;??)s
z`@!3w8xOHpt;ji5N)ldMU-!JnFso`VKSGS4V~Tfhmm-EZi6aRW>hHumB~dty^%HQ`
zF2ahLgd(9wBEoY3bNjszN1U7x%p_cd2KvwmXC&&??!z`gv(ec*Xjd!hziLH+m{@_F
z-y$3{L?zrAq9Y4WxPanw(na+3=H`}-nPFF?*Q#pE+pz2mF?+gsgiCt!J7BNSn@7!0
zL0R6s3rF7%w!XZv9kY5r{#u<Mh25RKPOE9#Z4$zflTQJyMI!8XFdL8v@t7qx@D&`|
zJRdTgB%tnqBaR24I>|Vk|6eH22BK6il`B9t6l+nL#yW`kAsCu)#CQiMe1U}u)<oCm
zxQYoPO)3)*>y3mXl0wrRj1f^AGsri)kccts#I3kz+a$BdH;}ib@H#}AO|)H}$T5(%
zAq_+7r1*q;jP&|CbE;G%fL`g1Oeb9fq=O^MPSL_ZUmKY7zJL`Dr&}P^963$(`DejK
z|9)z}2VMh_k7$9gOpZ9_Bmwsk5sJh4kyu@c{0*nE1T-6yavBbiqwskb4@EO%+kOdG
zJ_E#d?B}39@3VMZfSnWYe{4Mjp`hO2Zh8DXL`hOIKRaxq>x*ovY1}>a`X~x1bg5ZK
zZL**)X3Q*F*oprDCR=3IbwERjN#HV7x(he|09Cygi8`hMmMJ9Ln&GBR4tdoz-^?@-
zWme!j!avaEYa22JNdbL^Vav~s>F)uoee!4?UsdAEcC&s{{hAInuVvy)>Gv*5b_fGW
zG{K52zH9mQCc`y>8i;rM4T?qymT?}!wQVr}>Sr!>2&!b9?M@SAX}bRbP%8|Ytv7`3
zOO%Bf#tYjQw9PxQDP19t`1mVO!W%Nt4Dw0Fi>ZryIk9v=5klZ`sv4UZ8AIp(E>;3y
z=hn?aOmWV5)DZ4W)ziW}eYe128(t1{BQH074)Y}KjJ6pY7NjSe-8K6*cfTZ8+jy*3
z%BPUBZXO~g;s(_~iD{8KvotJ#%Y;ae%aX>qm%oOq#?63qEFdqz`3LoVc)9Yo{Rof!
z1F7nFe%hmFf65sfFAQF)D4GOx+)~iO-+<;4cC!JCnC+nd3-VqOs^f8mI13CfLUcH%
zYkTPkHSZ=hr}CT8(xP9gv@KUP9Lx~%=T7e|$|%zavtJQ4DgA~U*L22R(8i>%&hH`0
z^3_>o;lli)#tLrgYNR;f8IabSrW%{WUNu_88DnUc0|sVdKVqp-+v{qexR9#B3*M4s
IO1JvLzmr7AiU0rr

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-001.js b/js/src/jsapi-tests/binast/parser/tester/lexical-001.js
new file mode 100644
index 000000000000..3dbd61d997c0
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-001.js
@@ -0,0 +1,52 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-001.js
+   CorrespondsTo:      ecma/LexicalConventions/7.2.js
+   ECMA Section:       7.2 Line Terminators
+   Description:        - readability
+   - separate tokens
+   - may occur between any two tokens
+   - cannot occur within any token, not even a string
+   - affect the process of automatic semicolon insertion.
+
+   white space characters are:
+   unicode     name            formal name     string representation
+   \u000A      line feed       <LF>            \n
+   \u000D      carriage return <CR>            \r
+
+   this test uses onerror to capture line numbers.  because
+   we use on error, we can only have one test case per file.
+
+   Author:             christine@netscape.com
+   Date:               11 september 1997
+*/
+var SECTION = "lexical-001";
+var VERSION = "JS1_4";
+var TITLE   = "Line Terminators";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = eval("\r\n\expect");
+} catch ( e ) {
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "OBJECT = new Object; result = new OBJECT()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-002.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..a35cb02ca93d0ee66155349dd2938b502f697d9f
GIT binary patch
literal 6134
zcmds5O>Yx15ZzL~5fTy-NSvaciV#XcoKPB-ra?^=g^Gk;k(+fBQ)f5wI!*Ie_-9B+
zNZj}ZTp4@4YbSP6r`<-tDcab6_RPFDGj@fKh7?yTeT>5DA&Ywq4T2j%5FE$hB-m}V
z4%%<q-FS$DN?FdSP?GTK`ja4d0JAFQ@*~6uI;MCJcPV0slQ@!4q5e*SQxb*KSU&(~
z?INt0NhlHqBqBTqFt=}nIO61lU?$-rG|-1mI3rQ7dIz>?*K3`|hgPMm{;QM~h>6vf
z^P7ZYhNy%)Lv&=}2^Ua&PP&M`+}e6=V`kW8>9va5avhePA!biEk8nwEego_kdh@9M
zv0aomZ^6+I+OIypu^qE|KmJ^uABEkWMyFY~?KTPF$;n56)+7-wbub%{2=SODHt-c3
zT0b8$oFt&`Hb)!}Ky{LFIRD=%&l;jsFO@4mHWX`7nZ|mE`5qXWaKv~ACwzg03f4r|
z=eUXqB26k25bKSEBNC_S9>$2MjTz*deMrQZb>e2+vu%=D<SWSAQur=JnoYD_fygnC
zwjm8e>ZJID2aNRkI&-R2B!FJ%jZ7z91Ehx|icZnOz>+pF=e>g!9;aI%)f_oZ_4%h`
zqrX43-v+ON$Vb#6ER!RiIZ431M}*>Vek4{`B7ebYECJ2Nq?m?7<S2aJ#Y52y*|uN8
zm5%|j6_;|*67REk?7+?m_&>HDf>2OzaJM*q9-<^En4cXs(e*_()imy&27MHT6uQ)`
zqc&NvD`w0rTG)wy2PRu&)^$KbiAmrxRl1#<zk{mYi$opM0Lv7TZOw4gCXc-8n{Q^C
zh$1WSP2nHt^0f__f~0^x!La3L&-8Z});_#HkFP56WxH9wseVm|n%6RMru2IsC3}Q{
zB<f&A7T>k}dXwRrKsCg>{TfB11j{%N;o3HsfAuq$dIVK6&UUAXvNYX)1E>`S&DMW}
z?n{(~8O96S7qrcLu_;|4kNEftP$C#I(G2oQ#*3+odoi)}KoLUVajF`d7#Tz7{w`Jm
zVCUA&LQHYac+?Q?Ox4rGJbkyoVGCXkbR#b}eFpO+?Toe=8y2J|o82}0Hg~@yS6g_j
zSIVc5qHZ1{CgKKFLy2jTI<quv2QCvLJuXWc?_T~It{VRaq-Ozn3eHd4@oiC}HaD_r
zvhmy?p$eJFHcx!Pfzl>)l6YLQ0bMlq5c>s5&V}lET%kmV;VwjvbNcp@o>23yO>@e;
z87-~wrRvynCBnlDp>^){sG^KAjWC-NQGn8KxL!@C*9ARG`oz2gQI=24D&;zpi5hcU
x%hiZGyBUzy1Ew0A!(KJ&;*2pg%K-y3v0tpzsO@z%;I5i#@PdaUnZK<j@DKPq!Yu#*

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-002.js b/js/src/jsapi-tests/binast/parser/tester/lexical-002.js
new file mode 100644
index 000000000000..19eb30c0d53e
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-002.js
@@ -0,0 +1,52 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-002.js
+   Corresponds To:     ecma/LexicalConventions/7.2-3-n.js
+   ECMA Section:       7.2 Line Terminators
+   Description:        - readability
+   - separate tokens
+   - may occur between any two tokens
+   - cannot occur within any token, not even a string
+   - affect the process of automatic semicolon insertion.
+
+   white space characters are:
+   unicode     name            formal name     string representation
+   \u000A      line feed       <LF>            \n
+   \u000D      carriage return <CR>            \r
+
+   this test uses onerror to capture line numbers.  because
+   we use on error, we can only have one test case per file.
+
+   Author:             christine@netscape.com
+   Date:               11 september 1997
+*/
+var SECTION = "lexical-002";
+var VERSION = "JS1_4";
+var TITLE   = "Line Terminators";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  result = eval("\r\n\expect");
+} catch ( e ) {
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "result=eval(\"\r\nexpect\")" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-003.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..40c4dc64d15d5fe3523b20ce88417e06beb98a31
GIT binary patch
literal 6286
zcmds5U2oGc6wUZ%NC*iDBzWl~bb<`Q6AIN>SF}!5nP|0F<TYNK%}pxDUDv+?zYHFE
z<6m&?II$b2ty{A3Ayukc+sD55o_p@KJvJT@T=NDP`L#nD^(h)U*Br+=j{K>!+iV|n
z-gbJ?2s@rD=6EECS?%j1$GHcyJbn2Qq5(Q4cn|joqKE}iD4=}xJ9f^3(4WQn0XQ4W
zup%m;0^bS3fMo#s_Dvs$EI0`;6>uRMszb+&24TN;8@A~*>fPqYw&%+KJXeC~SRFCH
z6);Q@5pd^-j19c|fJg8}&_m?K_V(+Sr?Cl}!n?w8p4|01tUO25oUWf@O^1F1>??HW
zQR7pmEQj8NqaSo$eSTv)=IZ_U{p$S4?d~?at%hm0P6$g{-T}0FG#o-cluO9Q#faiK
zhQ#hL#4z7LFb!w_7iMN15u%og6_7Cmt9;Upw8-PTU|`G;WnCOI(`6Y|B&?3E&ha}Y
zaD|j6Ale@bPZyeQVax--noy9Meb8V`yHP9Zn>Gpc_yTEdWcF?lB05!eIb2&nu|a`B
zH3>dp4h{MPC7M!#IM9~bNO#gDKw3DWY<1=aR+NE@SYdIx1u2>#Cla6iETG@tFX^|y
zYmnq)Qjl0WM=Z67!+k&j!T$V6TwQ7W38yg<C?At@dJV2o_@akLybm&MU&ECT0kIub
zGSCVe&}dSCoe}VVY&kfgpx)qKdHg&?aa=M#yL77Ri|D6G)H`zqDD(+5sA)5;vtXCc
z$Sqpfgg1c62ANeIP*8jlxJ;Jr!p(Cfy3G1^gYORQvzY^eo&y**tgsZ9r?A$oZo1V<
z2#o;tE4`%asZ`xf_?SCNrO6UR`d|J%6AkU^!;hC-h4xXr7f|3{0}M(XxshEVQd}LV
zj#zI{CukgFQJF_@H5$&pUg=9Ms*(t;X{U~|GOxCvf#3v~x!kSEtM||?_CwwuDS%ZP
zly}ND-6jjq*w!&iD9E2e$w@<=e(R@HCa;u>f6iws)U2Ffa2_t`>GvW%{+wLV@hSMz
z8ByM;vT2%2Gn}&sjRpTLQ22$3MTzJr!lfZy`kj<nJ@Wd)31DZ|<)P-SQHs;TEO}4C
zej8pi;tWb``UJ4~-1J!??~deT`CZfB`tECTwT&lgrBIEsu0=d1{CZbMF*ai&4BG*r
z;?-qU(pX<KF5w>ZZ$Mhs-^bv5x9V1Bt8dkX`fG+vXPYHH=RoBdw7GavF#(HcY?16s
zM6L+c^0++vo|kq`+eX*I<VCe`PD`XmOJ(><b!@c~VPOW(b!PSAv!tQp1t^hdxckk@
z>w-QndHUXgD2u1>c)^>p94mM;kR!$Fra>C7s&Z@&d*x^mXSAXGy<WqN&F3^ZYI<D`
R6jx0-xa3t!=(o{0{{kI;@#6ph

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-003.js b/js/src/jsapi-tests/binast/parser/tester/lexical-003.js
new file mode 100644
index 000000000000..46d60cb7fbc8
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-003.js
@@ -0,0 +1,43 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-003.js
+   Corresponds To:     7.3-13-n.js
+   ECMA Section:       7.3 Comments
+   Description:
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-003.js";
+var VERSION = "JS1_4";
+var TITLE   = "Comments";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("/*\n/* nested comment */\n*/\n");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "/*/*nested comment*/ */" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-004.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-004.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..4bf2d6454c9b159c9a809470fc93c9edbe30134f
GIT binary patch
literal 6264
zcmds5&2AGh5Z>~SIDmx2fzuvA6-tpfpt6miX;4$5P?4xNgxsu~m^!<W*J+vu;3ar7
zxNznz7<+&0tT!7c-Il^B+SvZ=nfd0Mu{}N+Q(X6k82R->77iF1IX4`~IS&1qv)k$%
zbho?xaEu+VCg*sRM7;j(iQ_zgS)RW92r+_=Dc-|<iWuS~3?!7Vz9Z+91pYkMFTmMY
zh7~diMSO<@gl7Qy_AMU=oSYEMBwT<->d+BqBpB51!ZzJzqu2V_@oLF`UM&I9vAS}8
zn{dn!m2hW>P7FNZ0*cQ`AJG?ETdz#a6uTz9<|SL+gk@)lnbY+ntm(}kfPIDDJZgUG
zR^`pxaP))j%P-f$k3X-@kHYR=tJiLp6T*^{_W<n!o=rpMM<(C}2-!RzGaN;b)m@G_
z9znKArs3@W!nAB4O4U-i0@8(Il}tM8Et2>?7#MNHcn?Rs#KMBKR_C~g2|^wd6A&9r
zgd?It(=Cj71XxoBI<pS~j9D*ihXd0lsUF`Ut&PmyB>`eHWtStg1>_p!7bKJ76YelF
z7%Ig~BuD^ls*UszTmqzpBdV5WVW6uF%y?hG3X9W~q-cg5OMLcOu+jCG^gG}+Nb(6S
zNGzQrmRcm>-XlV>zc><CR~moAX^aHQ$E2D@LueE}@8hv(f=t`jaOGn_?1XLx>hd8A
zrv=y<0sqIALl6q;4enRR&qEYN74x&lW~#o(W}1fmQ)h?*pF($<cG5ZvcEya`qS6k0
z8<=d6S=9jrB_@H(lG0tcd9FlPS>JAn-Jy3jb3oGbGYlJ6Sc;1%ozO+Q!GuzG$K`B-
z-<aDZ@{(mm;`HS2xe#cV9dV}k^0SYkJ;H!+O|T;M-bQw5NO5(b2IBo;gQ7`<WjP+h
zWoWecLZvUYC`B@!rky&<%4FJvu0ce7?mD+7nchK*I0!^jqySdwN_LcOx=j|Iu`OPf
zP>?i*I+KPx{nbyYOkODg|DMlQC{#I>5Iiht<o7~7{(@ZL@mKJtGiIVa<+C)G<~U~&
z8Vmkgpom)%4`ZcKgiAxZ^f#`pdgS$|62Q)^%R?<%qZFr&dHjNc{SLfgsH=tC^eJGA
zx#?R%-W~DD^1G(r`tECTwS%W>rBsco?m{9a;!f8<5jJBY4SNkjB}&Swq_MtTT*Bq&
z-+;6%x(~tmxuR=^N@tlRu86(+40>8Tbxpt``dTFU5^*a+wLGrKy62Uh)3&R%FuAM-
zE@*}HXsOIzseY|i8Z68ZInJ$~ca}7AqVUAh3>Uq5SuN@B;z#bc5M}wu9hJNuCu0Q<
y1j$ITs%enM6KXQHfW66R5offa{3Tw)jLf&QWYqL}GEiJClfflVSW>r*hWQU8EbS=(

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-004.js b/js/src/jsapi-tests/binast/parser/tester/lexical-004.js
new file mode 100644
index 000000000000..853887db3ef5
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-004.js
@@ -0,0 +1,52 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-004.js
+   Corresponds To:     ecma/LexicalExpressions/7.4.1-1-n.js
+   ECMA Section:       7.4.1
+
+   Description:
+
+   Reserved words cannot be used as identifiers.
+
+   ReservedWord ::
+   Keyword
+   FutureReservedWord
+   NullLiteral
+   BooleanLiteral
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-004";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var null = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var null = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-005.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-005.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..880e4d9736188b7a93f1ba122d14c82bf32ae595
GIT binary patch
literal 6258
zcmds5O>Yx15Z&^P00{|+1E(B86-tpnNU)8dX;4$5P?4wyF38Qg$x>%GvYn<m@jv)y
zaN*3qVC?m-o%JSh(rx)TMH}1Co|!jq#`gJmL~zX?U=-92Xxyi0=w0zV?<fwY-cGZ<
z-+9&P#Ut$bRXN8eA>*~L4?XV=%<|3Uhlqygh~Qn^BZwj%#*u^y^f&WP!YG)<`UyB2
z%dlc9p~AomqmX9+=Jw41M?5?ZF_mx;8tOwcPQ$2Qy9wKL8uf1TL))*a|NN=~F|j&w
zek<gdA|l~V5gA)}!UY7Mg*`-`Zf(7=F;ncS^qQ}>yb8-s5w)kAM_ALF-vRp)y?NO9
z*eT1K*Wu{<ooAn)+m5+>KmNEpKMK3M&2Fn<+ieoUk(0Lo?LD4OVj3_T@Ene8oQ)`E
z46?ez5ywNwHpw)c{a=`tbwr3>Dpx?d5Ui8QG}0l7Z-ar1Bg(s&@dXwtSQA~J<2)t^
zc~mAK+8+x?utL)vjJXe36AC)B2Lg;~H*Up!+a{?V-yp56%-#tjM5o#=PiPCsHOMbW
zCc($tqhWub6;nx&0NT_WnNGR@NC!uhEzQEfiZ(FgeE};RPPZUMGvq|#v(JK!{(ecn
z0bYY7ACrQ_GCAU?MFQ>}3JDJ8N8<8I<1aXkl|cEJl+$PkjlyR=JQ7WiZTlLod;o~;
zxRQZZ_<+Wf0_=={|6|J`2nF>9_sZkv0b;CVes<|p*B9ALlel-{4Nw#i=uXp4+GN3w
zn2}qwumgVyOt#3Z>wtz5lfY%FbQf-(E74`vw`*c|=$-8xko5cn!<H3};&KnxayrJ9
z?aDDC48OMbP}-8Egz~uhd&d99O-CFkx%uoNwi{AlTLVl;UAK|l7*bplsE&AVP$y{2
zu&l)+xCssC-=@r^4s}Qd)3(z@S(!<j&@zaS&)ntKWYSyc5Brhmh%~?|Ey=dF&9uqE
zGp?1(5ehP<P-N1Or@!VYwaF`G-=Fi@3RNm65rT&cy7=ALjK3gPeDnqU>5Zu9P5Cs<
zr5VmSgvNpY4k+S^#N$L}G~v>aF8xgks~LIoodmEm>+(?Z)@a3PVV*pn;Ghi;82Vlz
zH+=-yVs847katINviz>;x4HY8Ty5itUMW?htc#F{iMY_!5yN&&q+u^Ws6;(kl{C&*
ziwn5<{2P#t756SU->kTHoJ@*2f{MUb9z!>aClwp8h`SCMzC_uIP#upeQtnA<=XC97
z9ZX(S0O#~UX0&u#uT;ENs|yZhhy>?O4?9b`I8k*HU4|>(tfnq#?vm&2HxOm{yv-K8
z8>_K`rvWumENKR$^?0hr=CD_d7IDTH%3t3NOlH5DsZrbOYM{7Os=+0XS5maCZuvK!
CaO&d#

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-005.js b/js/src/jsapi-tests/binast/parser/tester/lexical-005.js
new file mode 100644
index 000000000000..2f3d3bdd8226
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-005.js
@@ -0,0 +1,52 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-005.js
+   Corresponds To:     7.4.1-2.js
+   ECMA Section:       7.4.1
+
+   Description:
+
+   Reserved words cannot be used as identifiers.
+
+   ReservedWord ::
+   Keyword
+   FutureReservedWord
+   NullLiteral
+   BooleanLiteral
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-005";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("true = false;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "true = false" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-006.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-006.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..2d07274734b8b6123e3a9f62d8973e7280ee23ec
GIT binary patch
literal 6274
zcmds5OK%e~5Z>}eT#$GiIOW)?LMamB0BL}xK~0I$ibTC4C+j9lo!!WGn&ww<=byoa
zGyj6I*SmJso5V@C<#CEOwm*AjzWHYC3LlRMu2u#Z`PE|@^(h*9H$2blM*h^>YqSpA
zuiL$7guO~x&Z&@q@#@#7p7#J|Rm|llhz6)j@ILMlL=g|7P(u0on|WtJ=+9#P1e}d!
zSP_*_f$s%jz*7Ko`-YE09-Ic4O1KaW^`RN3LD;X}g>BmPTBmW;s+84#m9hdcvD$Ke
zGvJsaBH_*v8C!V51q5FNJw%@G?7Xru6YR3|T19Pn6PBGLYEL(hu%<V^1NJp~^Q8W%
zU6eO(!_g1hFFwDt9drGD{BeDL6n1wSoo3y(+a!b|C+`8;M?9TG)Mqx}B^+757*Wg^
zWObV(j)#zKl4&^oKQ}FFh!DM0u7GqQSSOQdq(c(l2Ll;Lly@-W3oKNyCb~YyWlRwA
zs7ye#KNgN)xu!c9^ANBm6m;eQ1Q^p!)QtMJO;SC+L0Vgxy%&UtPPJX0&=!zukYA8Y
zf={_egZ@A(rjj55w5>NXopc3|4vr{VnuUQSZD7j#99B4-Zb6Es$g#wypE(=-{gQqM
zyaq`=COL^^a>P-K1l$J{5bV#7#PyZNUvL^LfwD0vrqK`@g)e$|B$^=G_BCAj2oPIQ
zDFrR@0gWa(*eL=3$Cg773hE8+701tG#8|=n?9i#MFS3~?QSZzfpwK7KohF^M$$~vG
zBeQ5>2mThAY>`>l0SzT4fy-3s&fPpyqKm9=x5VzyJKH%R>Dh&0%L+$vc>-&@6r;1!
zZYji*(oy#d@M3f8jlGxBm^3w%=hfdcaWHN?;$ZO&=m4?(fC73QOi5h0k=`5<Tob5<
zcyCZ6Xw0yz$s@QC4d>sg%%u+XNCwrm(?nUBQQOcuh|tg6>DFY_d*~DUq3Db>z$&fD
zuC~pz$-y(O70eL|GACDTl8`6A<|(zwD`nxI^Vtg3DkBwwhYPy-{m6{JAXg-l)EiOJ
zqw;BzOEa8v2#o{(9Z<woiAS;AXu>5SUHTgrSTpkGdkJ8t)@7mQt<j3p#5{gR!F~%K
zGW7jIZu$(c#oXjUA?uF#WZ7MlZ*%uGx!S@Ly;7=1Q5PZ+6LGPtA%^XkNW*qPs6<^^
zl{C&*j4QYS{Tq;umG?0?Kd<uI@iM9A2rdXv+Jx>FO1cf0$6<#|U!rh%sE)@Kskc?w
zIbHi(2a^{S!a4nr87-aOD;2TT>VtzBBGI|iL(h_KPE?;*pW(_ktE~%~y!g5M9Yk3^
zce4fW$Z9O-sX&e7OPc{{J*KL$IqX%Vd7LqZve$V7li9CmYSi|+8pto1YH-P8mK1NR
GYyJ(pr|+}?

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-006.js b/js/src/jsapi-tests/binast/parser/tester/lexical-006.js
new file mode 100644
index 000000000000..b37fe0d529a9
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-006.js
@@ -0,0 +1,58 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-006.js
+   Corresponds To:     7.4.2-1.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-006";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("break = new Object();");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "break = new Object()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-007.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-007.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..a4f7be41d0ad81167a683f7eb09ff0c1be45fce2
GIT binary patch
literal 6258
zcmds5O>Yx15Z&^P00{|+1E(B86-tpnNU)8dX;4$5P?4wyF38Qg$x>%GvYn<m@jv)y
zaN*3qVC?m-o%JSh(rx)TMH}1Co|!jq#`gJmL~zX?U=-92Xxyi0=w0zV?<fwY-cGZ<
z-+9&P#Ut$bRXN8eA>*~L4?XV=%<|3Uhlqygh~Qn^BZwj%#*u^y^f&WP!YG)<`UyB2
z%dlc9p~AomqmX9+=Jw41M?5?ZF_mx;8tOwcPQ$2Qy9wKL8uf1TL))*a|NN=~F|j&w
zek<gdA|l~V5gA)}!UY7Mg*`-`Zf(7=F;ncS^qQ}>yb8-s5w)kAM_ALF-vRp)y?NO9
z*eT1K*Wu{<ooAn)+m5+>KmNEpKMK3M&2Fn<+ieoUk(0Lo?LD4OVj3_T@Ene8oQ)`E
z46?ez5ywNwHpw)c{a=`tbwr3>Dpx?d5Ui8QG}0l7Z-ar1Bg(s&@dXwtSQA~J<2)t^
zc~mAK+8+x?utL)vjJXe36AC)B2Lg;~H*Up!+a{?V-yp56%-#tjM5o#=PiPCsHOMbW
zCc($tqhWub6;nx&0NT_WnNGR@NC!uhEzQEfiZ(FgeE};RPPZUMGvq|#v(JK!{(ecn
z0bYY7ACrQ_GCAU?MFQ>}3JDJ8N8<8I<1aXkl|cEJl+$PkjlyR=JQ7WiZTlLod;o~;
zxRQZZ_<+Wf0_=={|6|J`2nF>9_sZkv0b;CVes<|p*B9ALlel-{4Nw#i=uXp4+GN3w
zn2}qwumgVyOt#3Z>wtz5lfY%FbQf-(E74`vw`*c|=$-8xko5cn!<H3};&Knx9wWkV
zWxK-Z7{9jnP}-8Egz~uhd&d99O-CFkx%uoNwi{AlTLVl;UAK|l7*bplsE&AVP$y{2
zu&l)+xCssC-=@r^4s}Qd)3(z@S(!<j&@zaS&)ntKWYSyc5Brhmh%~?|Ey=dF&9uqE
zGp?1(5ehP<P-N1Or@!VYwaF`G-=Fi@3RNm65rT&cy7=ALjK3gPeDnqU>5Zu9P5Cs<
zr5VmSgvNpY4k+S^#N$L}G~v>aF8xgks~LIoodmEm>+(?Z)@a3PVV*pn;Ghi;82Vlz
zH+=-yVs847katINviz>;x4HY8Ty5itUMW?htc#F{iMY_!5yN&&q+u^Ws6;(kl{C&*
ziwn5<{2P#t756SU->kTHoJ@*2f{MUb9z!>aClwp8h`SCMzC_uIP#upeQtnA<=XC97
z9ZX(S0O#~UX0&u#uT;ENs|yZhhy>?O4?9b`I8k*HU4|>(tfnq#?vm&2HxOm{yv-K8
z8>_K`rvWumENKR$^?0hr=CD_d7IDTH%3t3NOlH5DsZrbOYM{7Os=+0XS5maCZuvK!
C5bEOq

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-007.js b/js/src/jsapi-tests/binast/parser/tester/lexical-007.js
new file mode 100644
index 000000000000..255a8b859fb1
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-007.js
@@ -0,0 +1,51 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-005.js
+   Corresponds To:     7.4.1-3-n.js
+   ECMA Section:       7.4.1
+
+   Description:
+
+   Reserved words cannot be used as identifiers.
+
+   ReservedWord ::
+   Keyword
+   FutureReservedWord
+   NullLiteral
+   BooleanLiteral
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-005";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("false = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "false = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-008.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-008.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..ac103a3ae5603a82d77f9e95301a3f3687c9ab72
GIT binary patch
literal 6272
zcmds5&2AGh5Z>~SKnMxJfzuvA6{JWNLa>dXX{x4*Le)e?oRFI}$+pgJWIIjs5WE0y
z#+3`=Ef_oAwG(d=Cv3~lDcacn?3wxIo3R5v=o4HHx)_D!1DbRw>Umc@&pS@Sk+)rI
z>^EOG+esgLK}pUDNW^&g%OlUb1G55i`4OTKIwp7rw+W(%M@cN9LjBFW(<lxnvAzS&
z+9IrkN~kFGqB!CifVq7w#4(RPN0>^u81?j_8K+U)Dc^)`n$=3H_P!C6)PF%qftXlL
zIlmrpOc9ZAXNU|eynBF0@Ojim<k`l?tLG=ohE3s1(s6;>^(w49L)4ybo?=CZego`F
zbm&p_uvwHtufx&zn=d|X+K#z=KmNEpKMK2BwN|}q+ieoUk(LhuZFj&26#IvmVS0u`
z|3gB<V%b?e?^DbeWO<V#j(d=Ol6E-zKQ~P)h!DM0u7LC*SSOchu|rbd25T8dl(#VB
zw*NBTC|DC+pW}B-5OS$ZK(sRuj$pZ_I~a2xu!a<LXAcA!(^gVXI<`$xO1?slTWP)>
z#fXlyU7ipckZ+J<kWhj@bB{)yu2xW`M*?VFZ)7^@0w5h6QM6PG1AT4aJXScIZce^t
z$YZ_FK6B{z_v`x&@ERoffaD~W$q`3k5^%dHA~>8KiOZ{#KjAc10!_!Hn8rhB6h3d`
zzG#YU+gEVq13+vfeg^9EE=`6x*ck!;$NobQ3hE7R7st;7#8|=nY|)XfFS5BNN&D36
zqBtbbt)`u|$%1V$V`|adj{GGs*&?&90~$(90+*@MoxAx|i7v9fT@$-QFKy?5q~}K%
zwybazm%FgGjTrW~d`<`WjlG4EmMkNb!`0st?l&$z;ymMv&>mtt5e2eU!GhFtYuN=N
z#WjH{h_|~Hf(8uBQrw4&QE&F;%3SJDhGZ;lJ57|OiL?$KgNXRV)ow*1y@U3!6N`pO
z11!^#Y-!s}n;bmjTDTmcAYpPfCJlM|Yo1b@yj1f2IiD?2q^1-?@NiBOzmu5p7vxHg
zPr#pEpNiI$kJ4P4;G9Ef9Qf~matjW`ld;NZ!lfZy_&ctvX5`Ih6Tr@_n}(XTMk`Jo
z^YLp64jb^Ep|2Hk)5m}<=BAGd)9x6bY<k!9+uVIct~T&cuav4$)ICVVMBL{pAn0~X
zq+y#NRHB?LOB&~!#RXh^{tZaSf-4>Xje={3$z+%#rii=$1bSIK^liXA>N+I&0%6NT
zbv&-fxTl4k)3uv*FnM16o6!cD(b8GHRP9=>EI61U@|!z7>nv#EM9~?`GF<Q`C3Q}3
zH-7AX3sIJj-E7V)vKq^I7*Hemie^As@2F~Q27A?L9%qc9>C3x;$?P{XHEMfZ4dho!
OHMrpEN@}*%EdK&c74Pl<

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-008.js b/js/src/jsapi-tests/binast/parser/tester/lexical-008.js
new file mode 100644
index 000000000000..b24b85875856
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-008.js
@@ -0,0 +1,53 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-008.js
+   Corresponds To:     7.4.3-1-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-008.js";
+var VERSION = "JS1_4";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("case = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "case = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-009.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-009.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..952fefbd972d4c9dadfe711f0ddb459b3cfc6646
GIT binary patch
literal 6278
zcmdT|OK%e~5MJIO4j>^oaM~jXp_UtuG=io<1eJiAsGJaTv(sd$yBpcww)q|0_-An8
zi1-(b9q-y%ZxSaBL7bwE?QcA<Z)RK**^olLHUJXUKd`jV$Z>En2!ew&8U@>}_S??$
zPA?roP}@*@YBc7e{`FoE+{9fq`}jU#F*%^H13gL@5pkL*sK|Wt;3!U_NvxlUb73A<
z$`n)_1#uFK0>BpEiXaj3VGK;cCFIy#nhO>u{rWW&(`h!kt@rKPhW@X%p+Rh{j@rK)
z3t)sQxD!G%2Tz)S!dcuS^zr8AGZ!<*-cVMnX_1%k*a>0ocKZrTTJr~DuhE+O&Ara5
zta%l$-fX;k_4$cwne`j;*ZK^31x0mR-QA|Ew;d6lL3tO^US}d>5bgm7b^=lOF=Y{V
z(a&Mk=Gl+|=a}OiK?EFQ?y0zg;{VDdZ4gS$QFQ{7hk{8hTVs!uzJc0uL73<Q7c(@}
zur|86$9YtcWT{mkte;6k@JiJ^l(~&qrwm!=4bm~NZn~THU7Zw{e8VJn@_ai^2pbu_
z0?9N;-bltspcD>8z~cVE@TVpu3G~PavW@f?AUzDRYND13hDO06?kl3g<90LhwLl&d
ze(_l$Xi0+qj;c70FJrByTuMU5B+qC?V%ag`NlX&%HHj%i(><}iLiu}rc9a|iXFV9o
zmdMq82~*xd#C94MprIJB^t1xI2*9;9AZw0KtT)hGU3`8ZoUb@OyKH3Yi)yWD+B*sc
zB#9{Ys(D{+N5Qt-Q93lUAAgRF;E;l;0|rWNLX+vzT`9a&qE}hpE=%dyNxM0q!t)a@
zJ6d>>i!7ZH9Ay1Iuy89BEQ1%W7)>ulR%oN^zb9N^jXv^D<5B1h;X5(IfNP=_x%Dm-
zBSemC12u@~4H}eW98@_T;%Ia{eY~=ddXysNPghSHW#M3Ygk6L5`owUzWH7zL7O|hm
zrpN#+(v@r(-E5saEaO|eJfSdYDtRV%dH!qP(x|*p0{%OjEl{XREFt4?MkBwI+Wwcp
zl^%RSdj>-$+fy;hb7>;xJY3@u{~jpU@j@aUGmQzj+@*7W$F<e=y!~*3*oAgwsA*>m
z<LrVMzo$Ud#up7US}39S5nJxfUlz*d7~iZcHUGAyFBz+CI5j5~YpiM(l0K0$U4w9N
zeWDb5ibN$#%A!HzJze~T;phK=^eno!(D<dI>$=L0GEZFT`|ttwv~U`_fK}n^k>qp8
ztqRrix-#n?uI!$&a80W=wk<tWo>c><v_iH7li3T^uf<A(hZ-`+h1c`WoJLL-o-sA!
zz&uH-Gy1#nllM#XvU>97Gv1Q*TEzo_Ua4j^3(|Q|)oW9tSFcvZjI~rA;w?<>zMbh+
U*Xnwqx?1YRIZs%Mx1EOh59WySkpKVy

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-009.js b/js/src/jsapi-tests/binast/parser/tester/lexical-009.js
new file mode 100644
index 000000000000..d5dc0ed44303
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-009.js
@@ -0,0 +1,53 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-009
+   Corresponds To:     7.4.3-2-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-009";
+var VERSION = "ECMA_1";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("debugger = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "debugger = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-011.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-011.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..717f1822c139d32948285e3eb11cf43730c64219
GIT binary patch
literal 8799
zcmeHNO>f&a7*_T@>;nUeU4|XB+lFGzf^8Vkx&ao)MO_455qll5%fLvq%~qB?l8Tdm
z&|}a0XFKgU>|gACDN3Y8$)+7QYlj?ViVyjIJ$(4e9huJ)df1s#5+6S1*@Tl>@J0{>
zXIXq19Q6l}hIfZiHm5;nU%k^wn2?8`he7Z$yw$O%KOvlvvxFYgC?T9kmZb_RHqRn>
z#?p8h>o36BTZff#1;yfkrA$@;_VWFhrjm^r<q9q(GqY(SIZG#p@4_;}UU$_0Y0%l%
zzjgLCh>bN=@1HP9IY|`UIZ1K{?*qU~=mm>N^7S_d2QFrby|291(M!Gw)6NNZU$?ig
zr8oZs>}&MqliulYSKfRZw*F{%@Y{E;W3Jzie_x*;(e6=ybkcL}wiCiLCqD(W2f55S
z4Ns|{{G7(&FBy-8i+%;K_Acg}3IQcPltj`Ql%7gETK(Qwqg|3DW~!P2wUba&S+>O<
z75zR~D<t7^M1@>op@y~5%|5PT0&=A`f$&L=ju4Hedl>TxU@bV1&O=~h%17BrHgRoI
zRPqPZxKrjwEG7KX*cBkr0Cxiy1AiuTECbFaQ$wGcj}Yj#S;%(MOMvun#IAW74GfKe
zRo*vbg~#qz)N6%Y@O|~zu#gGUtCD_b*Bs8thB{K_Jcn^7=R8^I9?Tt0nFuA+X~^mC
zIRpL(vpK4S@F_VbBI0Z=?-aj?JD8f03~7prB5sJ?dJp%<#<N(axO5O@sesjyuS!K@
z=ljpADhMcV%r1hm&MN?`jJ~LLy0@f_YQ*Qw8poM5iJ~M>cJ`D;5(0&VEibE0*jCh5
z!=PP_X0af3WGVwI;Z$b1y#voOnh_aI+Ywca=diYucBga#eklbSx^qq>sI@d0CuCw6
zScm2vc%jHBvzQ)&5%8gYFgC4EucIW3o-JqCYSH{HSm79AqHCb=CA!f;>YYy>aakE_
z<(47r&oN}^Cz+cfQ6`X9$<?DyDE+gYUiQVL2w-tJai;1?_S_p<D1@5|;SDV;DCe1V
z7rUW_AZWWgw;lmIp@n)Rs$y>D;vLh%tAF1{>IBi0Ck+D4Cb$il_yJ+f>Pq8XU*F=N
zrZc4;lihTI@XkmtBC52fd-QMN%3FXq$ifOVlvAE9QWv|H(wb}jC;cGIPmnF3PF=&d
za4Nz*CPFl-|Lya0#4nA~Lfv$RIxd)!G)|y(*mNn_Sn2)ndMLfOFksNwbi<_>_g5I+
zR_1*Kb43m}l<<Bic~0-SYiy_Xa6^Uqdq~7FTp}ac0~5-)?HL8HQ^d}^E?zgf3CRUj
zy^%Szsb}r2ZhNYSaK^1s*G?N{<4n2@+<-~CbeY`p&hR7j>n167s0_d+Eu#CzHrpl-
z&-k8Po=|NhQ?aYwp1n(BvZ;O*u+{gh|ITL{oKl-z_qS^)c!b6y|2<INgKU>sp<ztI
z)kE9*Txdl*^1gS)wmF7zPN*!tZP9oDUzbdmK`r_jY#iS$zw*@G(V}8^m#YK1Fj=lx
zL*MSohLzc{ZL4QYu)*FXqJiL)Vc!E$;d!z|R36aYt=^Z=iGDpGJ>~p|;C%bUb!*2C
zx+f?WWB4VgS-J>az_JK!V2_ZmVYVhz&+TH#eYLZF`s!H^lUE&pEjq|{swwM@4zJD5
z1rIZ@z_E+o?&30dYcA&~X$oG3E8a4vt`K*{e-B<jl+}L^#EOsldaU77jUK_wb}7w*
zbiQosv6k%BqfI%Zhj1^oez&!p(^|1+)jrBtOV!%}dI<L@+^?c~)QzGZXg+%N;F^z<
J>JV_$_rG7QDF*-m

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-011.js b/js/src/jsapi-tests/binast/parser/tester/lexical-011.js
new file mode 100644
index 000000000000..b6703284269d
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-011.js
@@ -0,0 +1,62 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-011.js
+   Corresponds To:     7.4.3-4-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-011";
+var VERSION = "JS1_4";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+print("This test requires option javascript.options.strict enabled");
+
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("super = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "super = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-012.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-012.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..7f55206ac98ead7d1b534cc3b8097ba0cc857150
GIT binary patch
literal 6271
zcmds5&2AGh5Z>~S00{}ffzuvA6$(WlBuFD@nyRUyP&HAJxF9#{CQF^&$ab3M9e4uX
zj1x!1TQK%|*G{}ioOD}$PSM8pXV1(x-;7=6!vVpSau1`RvQOhKMSbsz=XpnQF!r|U
z&Arx}Rwo`{uUwLI$|PjG^7WDD-GNzUbNL~nAvz*>8+Qnzh=*|`p#uHQypu2rCb511
z&e|fZm`bQH@WLqM8GyNcJ-`tUk3&o)T!i}i(2UbC>Q-*THmzE<UH{N5m(+jdk^(WY
zT5^6P<d`BN;Z6}5T6n?*1fPW+M4mn0cwu9v*d^(;vfA=0EIUQio^BptMQ?rw>`V0K
zVeOz*lsB)#(f3*#pI_RJxqLtVygWY&yW914qh{M}62g&_4*_jw$cGgB2bf`ciUa>+
zOao@4pTn!QvjN47L5jCH;<yi~CuxVX|8sM+iU`q5<qF6hf^}w@7CU70ZLpScM0p!C
zKF2}@YohCOoW}&AmC6J}yF=j!mTS6$G4}y$L_u_RL5(qO$Bnpa+a#sr8|1i^=38Ne
z=vdq3384Y)1}z5tB>0$nH0<`Yd@4N>K<j!V(@7Tq>EMW>by^tcYXdXh=di-zbaV1G
zLr(NQ`^?$s@7MPm;5A6{A<0QBlOvA8B;a;XNN_Ma5|>vef5B<21e%UXF<pnyD16qz
z1JM!Lwy)sI2Y}d&{S4ISJsOX4urmVwkNt-r6x18sDUP4}h_QnC*`{M%Uu0)Z;?9ZJ
zLs3AWRZZJ!lLcF1#?+#@?f7e8vPEWH2Q-wJ1TIshJ9qP`5?y3{yC!yrM%vB+NzYF(
zY+2zbF85$<2k}nN-}E^h;<xr5N?Wp&P##x*Px#-s_J{)|*Pva*wnGYRtAPor>(;XC
zLyBtxRmF*_1PvLMwRiy6qW<iwmATZR4#{BJcA6+lGie=K1`+a!i`|M$dJp|!HxeC@
z23V#g+0?d~HaU34wQ@N^LB`~YOd9g^*F2>*d8zFCb3R+5N=-?G;NhGuemgefFUS=i
zeF1-Z11fq`K2CFKf^!a`ap1oL$}Kn$j}w{EgiAxZ@HZ)}X5`IB6Tr@_n}(XTMk`JO
z^W-fB2Tgd*(Dw?t>0`habJJIaX?G+io8C43Hg{i<t4%!8E2U}_brBLV5f{2DV%Uy}
zH0%`!m8d7nlE(RJaRE1<e*@C7;@$=4n-$lNlSwg0P!V|l33Rh~<lBIG+;zzC1<IC(
z>Udm{a!(68r)xj!VDh{IIHM0Tqovb&sp7R<U2rf%Bsh0^*jdoUiK>(6GF<T{HFZvN
zm%MeqgDA_lZZ_u;S&ij94XBZPNi!g=msB-2gS~1rk2A*5^!44qWcI6>8nwNy2J%a#
O8eH&rB}LonmVW~iRPU+)

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-012.js b/js/src/jsapi-tests/binast/parser/tester/lexical-012.js
new file mode 100644
index 000000000000..bed3322dde22
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-012.js
@@ -0,0 +1,53 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-012.js
+   Corresponds To:     7.4.3-5-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-012";
+var VERSION = "JS1_4";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("catch = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "catch = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-013.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-013.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..ce63ba5c86efc04e7eecdf0b94e8ade1d1412285
GIT binary patch
literal 6275
zcmds5O>Yx15Z&^PkN^q6fzuvA6$%wd2uLGnnyRUyP&HAxAR#yFCQF^&$o4kPzu?S2
z<HQm1FBp5hYbV|$PMVgFQ?#-D?3sD<X6!Og1_W2iJ&c0NK8?E+^}Q>e=N-kt$lIzn
z_gZgSop^w~a!Jl9laTSs*GHar2WFMc<%fud=!oEL+#!e}9>$S`3iLPgPQoY{$NB*{
zYxA&TDxt!_3!{+d0Ot1f07pDL4l$K*5$fwhGfu;(Te%6_v})CM{X?@{Qva1p3dF=}
z$@z_tV~U7`J4Gb1@PrEpJ_|dDJbS+J!p6+7OVVp)wdGY<c8aJy-8{mQ-uw>Om*~yI
z+Cgho-n<S+-)n7rerY@A^8NVp^86_5Zr9t5nr*j92uDsn1hk!mClvb!m|=Q~1OH=8
z17@S2!>hHk0mY0#inlo8xDTl(X@~Rw3v;xJ2+>RB3dkLTb!M3sJ7n~2u$FN|c^fl6
z!$JjXqU&><#{{93$^=BaiEsofG~L0N`+zm1AUeCC#+bI_M%=Y+l2Y;wa@<PutuR7#
zr0w#A(13P>7K45ge9S!>c6(Yrl^zM8b-j`4qziy_aKx&0S{UeS19RRNu)^VVGx9Y@
zPW3+jEZFGp*Y_LXHAwP=6eO0(5l3MXa62d@IG7%Z%d3;W;51eOO~zz3U5C&peAdAO
z(Gl6UFX74ufY^-v9MtDM8V?Jwa{~U4{f8hF)EnGc9Y6OGV=Lxon~rpSk)1V(J11Tb
zMFD|UHEXL)7Ho+b6N_fH<FA3q7MXP&&`@F$xJ;Gq!p$d2^eXGyHL*K1(sm9=dVYdo
z%L+$vxd&?le2hS>{7s+J1i!U+QR<Q>h4Q)jdn^LR#YY?|y$J0hwjEO7TMdlJoVS)=
zATnGNsET-}S0yN6SXSc!T#WkDFIVPLhe{;FY1?U{EX<{KXc|P&$F6oua_K#Eh}}r^
zL>gd`resswX4>T78Q0q72n9J)C^K2evtRR++T?}u@6Y*cfjTuI5`u>_`uOeGjK3gP
zeDnqU=?$ppPWdRyr7_MqgvNpY4k)+aKs-)`MiVXz>D=G6w3?AOpG^Qew{8+@+8V7m
z4b0Qm6dW|+Jwx9t<fe}STg=Vg6(-%0o@{d0?AzRZNv<~WP_LA#v8t<(h>5t;RT0B>
zOr&A2K&V7TS(G%+mx~Ly`}`Y_jy3l#IDfq6+L1Cz<_If7?>~W#77u+Ju!y}5IX*|*
ziclSoE0XT%%FgN9(>j<us{~Hzgv@B^#9pX;Emj#E%n&KgogR1Q^l_r@q{<A}ym3{X
z(cY!+-R~gE^1YkQct}=b1<wO&q*&ApNb5CKjZI;%8ZF|CF*JFFH!zv~a;8RYud9LL
PVyOn_JYY%Lw)*AYVuSI0

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-013.js b/js/src/jsapi-tests/binast/parser/tester/lexical-013.js
new file mode 100644
index 000000000000..1fc0bf38a5b1
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-013.js
@@ -0,0 +1,53 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-013.js
+   Corresponds To:     7.4.3-6-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-013";
+var VERSION = "JS1_4";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("default = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "default = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-014.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-014.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..eb56f5bb305454b7b6540363a66a23415a134977
GIT binary patch
literal 8806
zcmeHNO^@R=7|!s`1&|OIPC;BiD`r@+5`yiH#B{pau0~}wEz1Q7c@nqvY?>6?nRfmG
zN6!2+u3QlRg7<Zt*o~9c?REzS%`tWS*zecl$8Xw^`8=V=ohc>p@iU%HIGF{n1wn9;
z#n-_}fADnp?J&ybH0T_ucRC3Z^7zv*2;PIYI`;JEgfnuH&{G;EgcHfKR6)h&Sp+Xw
z8n0sg2{;FvurjWoSRAmF$qK+;z8}+6vN5Av!KGwoHZ3G)>E!rrSZ3Jkj{4sZI!F4q
z&XESOv4-mXGbSk~iGsT#N$%jG3lh3y5lO!I^8SOvOX0$n@JGsV9lh%7F!PFV_jP+0
zJ390az`j9;KJT3m_vO$xVe3za_kVuiI_Bp6_}9((5$zuJM`u0PZaX17)AA!gdz{Oh
z)9{=M%CBe~{+RK2zuDPa&N&qVs(dJkq%){Km3FlHy|GNYBuUIvH3P~gp{BTOi#>|^
zU9eV2!sUnx>H4qA8x3otn|-{D2}qaP1i~jdIzlv>?qSRafVJSjJ5PX+DIaBL*~GO;
zQOWO6<4&2Mu$1s?V^@Gg1N04a3>2Esu?#qyObvr-K0=^-W+B^2uK?1+5&NcUG%z#<
zuFDFK-L0wD3c29>>hV^jAKEpCqq3onlsUh`xRZ09tn?7(j;2h666!SM^p~6ge}vf_
zg+h2qu84>@o6E!E7jcNG8Oe~QC@SKH*lqT3e{2dH%M_OmqAV4#I`UO1YV3UfVO<3Q
z<&D`gDC@ieu*&F@YNrP)@~B39-mGz&Nvoc5T6S?sBME`R!j{+7CTuHet6|Vyj%KkS
zbz~|7EA3QfxxE9=GMW(?P1_MwjOVbnlXmBH0)8nq8v12UBnY-N7$;<67+8nqEqI~G
zD6^Ozf)VhcelRv|POp<Bi(af|*m~Xk6<FaIVxnuH@Flv{LF%1P9&uS4Yvq<9?9VY|
z=%<>SB2gxgR>{?)PAL7eonH3cqzGVfKXIn&N%q`3S}25@3gI0sEGXxhbr-v%g&=6V
zKDQnLd!dDTB&uR==Hflm!hiq1jnoOEDNh;%noV$9F!5u;n$?xYyScu_-%V#qJtq5U
z1mT^LE+eY6r+f78;K~mHagc=-Xeg&VTcj>_Eu}Tr{7?Epn4ch9K%KgV@8DE~dq#w4
zRR6o@=ZIe$rG>ib0(D$4C25>M_ps?wu(i_r=5{E(H!xt(+jPUF822X_-c{zkkI+j=
z(^!O$LdkRb&|PIWy@y*W^xqRAPT?9E$sQO{M()69c%3A6?sf6P(M?D$sOpZ)p;tX?
z?|0i%J)|>kjk<Q)C|l>!Jzxh+)0OMwj<<&Ipkp^lu}5V9wrLVQGPc<^d3eV6?DB+a
zqnV0d_4e#t8k0@^tAMS)Y5jXX+v1$s?!v!YQ^6xN9{KNq@(yIX%nB7_60RQF*5^Vk
z+L8CYEw;@ujB`e1@qvrR1Ng*b`V4B(k748ZZuy<3?v556yT4o=(1poz#Txp4SGKIo
zhHYCtV}dRAE)fj`rwscVhzd`X6{7Nh_HOpRf?o9Pfb<mf_(5{@%yp~B4!b8TmSgxC
zC|bG*UBI#oZD5a}Z{W5jRL|{V(S5$Refnxz50lp&fh|hNcB(1tt&XqlP6iJ%u*9*G
z-tOWucpEP0C~693hHKs`tFDoE#a|G9gD9)NAc!^J_Vrl9=NdhNneCFA1?ha<)?+Q%
zt4Eu1Mi1d$YCUgjIj6m1&8mHvv6ia01oRN@QMg}5^{5*~J<xpk>cI^kDAh6G=<k03
DtL`hr

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-014.js b/js/src/jsapi-tests/binast/parser/tester/lexical-014.js
new file mode 100644
index 000000000000..05f0c3cf9107
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-014.js
@@ -0,0 +1,62 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-014.js
+   Corresponds To:     7.4.3-7-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-014.js";
+var VERSION = "JS1_4";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+print("This test requires option javascript.options.strict enabled");
+
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("extends = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "extends = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-015.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-015.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..c0d1fe40b62679d11a87731c0431a171da147b81
GIT binary patch
literal 6273
zcmds5&2AGh5Z>~S5C{pufzuvA6$+IAAxI-=nyRUyP&H9Ga6oR>O-!BL$ab3MC3pbd
zj1x!1TQGLKYbV|$PMVgVQ?#-D*)#LaH)9t?zejPY*uf|&?X#rKP&c>|1i?`f4TG&}
zeXsGR(MozaC>GS5A|+guzCH?qJ20zgFF!<#pd*U6af>2`1W95A6`5}yoRByg$NB*{
zYxA%Yrl3d^keG-Jz}~(Z;aHGkf|-JgQP&)r3r6C0=_YK`sFa)45A|X}|5q$%5F4wZ
z=GTb83{eGlifG@#lP;k6jI<Da_I%@|i<x2<l-G)S%d4>L6ft+YeS{^w`5mw?(VK^r
zgT|`7c^!_v*Vy>{!gb8$`|;=H`BB>4tTt;E*KV5-o}7FLXght;XE;2-9J5m#g&z|Z
zaTom@Uag$<80H*OydjXlT}VAeJDmNWo1<k!sadL4K<-d%GRwBuBcpGFwOk-3nwX0j
z7HU`<-JIh*CP=N+CLq@COGofr(>;v24_E^RqO%KXj9D|OC2iLxB_-b=$DK6aA~9k^
zV^<)B2DBTr81$3kV-YaY?il&hdL)6?%|^D9E&$TQ5v$f|X<%p!%y^%}3Xjvx$kz;c
zr1#lp&PIQ~zTW_^L6Y}rPGZ>{@f0Qrw}S}9(ey}MUY+~}r*RT!GA66(I;2M7vli~j
zj>xrr30FP<#Cj5DprPonWRQcM5%7QPKO~``-r&~i__>cbUok(MY-s9>>a1zfIte-`
zjwrOMX<KcxU`x)JSTwU8e+^7_$ZYC>fs&KJWx90dZaz_>S6Sb#$=#umc5^_{^Aij^
zR(OibJy^>JM6^2LW++%6zjZg!;*#ZrcDeq0ECANMN1kYO586e1n=qhT1#C!tx0c->
zQd}FTjNn9NiuxR@V%&p!QFr>?%3kVGh*UIPJ8hJOsk9C~gN*su&2C95y@v*|9m|%;
z04&mzY#Q5an>;+@Te>`<AZ2n@CJlM|YoF4Xyiof6IiD?1rY1B(@^D5Qzn$3em*h&0
zzJNc29+S<f7^b;2#yOABc<|o?<rW-BBqN<MgiAv@_jgoT?a14&CV-t;HwiUujZvH$
z7Nf@$9M$1D!(1%XrjG$z&P|^cCfzYQ+2pS2x4rw4T&?4QS*cWGRW~6S6M3U6BaYpe
zD8pWXP|1R_C~3U!78h{!`8OavOYU88{#eO%17&l}6IDh&d;<L}9)vDn9(g@de2%o`
zp?V%y=G@bjozu6Y^)Pu>1)S0d+0in2y-@X9tT1?(Av0WfJ?+eC<7C+x2{T;s#zl2T
zcQ<<Neg{!juibpcGqN7bc^uFq`I=@yI&Z0ZYzlkzXdY**p~(xpg~{D_Gd=2hT@U2f
PN<BE|`AVs_(=Pu8Q#|m}

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-015.js b/js/src/jsapi-tests/binast/parser/tester/lexical-015.js
new file mode 100644
index 000000000000..7d8c8e80bafc
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-015.js
@@ -0,0 +1,53 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-015.js
+   Corresponds To:     7.4.3-8-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-015";
+var VERSION = "JS1_4";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("switch = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "switch = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-016.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-016.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..8c60e0ac54f0169e8a138683c23dd4c6fbe13aae
GIT binary patch
literal 8799
zcmeHNO^+Kj7@nnkiVq<nE{MZ$166dXpdit7rEWG=Q>{X^2}R<9yfaSXb}}>A&Sv)?
z^w=~1j1x!1zu<j6p0P8YNt|rDv}lhLk01N}di?mEbmTlw=s{;nNqq2_XA@3l!5cvk
zoM!PwaM&L_8vZzpvYZB;ef3T!VL~2!9tOcj@K(p3{)BKwP7``Wql9oGS(YlO*gT8i
z8B613tiJ$fZyi>~6%>mDmNHoZ*vt20no2filq<ND%*>{R<Sd;WyaUS&d)-n0r$J|5
z|JK>pAU4)ey?@Lk<s?yXXC#?Bc<%#VLeE)5lCQtH{k@A>V(%-jb@Y-qVA>hs?(6mz
zw)EzofPIDDe9}7^?#i2Q!PXxQZ~yk4>zJ$e<KI{3N3?s?A078xyX}PV%*jsy?ZI5m
zISo&!p!|%+;V&7Fg^PX(ulCM!PKAIHA4($W3`$R>9j$(EtkEt>5;IlJfZ9o@sVv)K
zkBWW|tQC@QIif<Yuu#L==w=_6F#)+!n?U$vj*bwGrh6FkF<>n?kj_J3W6DR_aW-*n
zQdIH>)VNdThb$%h!q^oc(ExV?7XyDLbSwkTCR0P7nvW3Zrdh~#(o2B!aKx^88VwAM
zfmPl&WQE7>R@7^ST=0GM*szcZ)2otxXjcyBWJ4V(bDqPvlXIS|bQk81rc8tq>NMo^
z_c;Up2(uhjLim)N5fO2g%Ui`S;ufZ6Btx2_qKF$}x8B43vGFXHDJ~sESt?+4<f~HA
z*!lkRstN+i8?*DEtn&)MDx)u|o$f7ZqZ;vfv&K;-O`<3Xl$}1Mk%T~DVatnZ6Sft#
z)i7w6qggCS9hu6&N;s8SZtuXejAlee({@A^;~ds@((Z&#z%QjhLwDvxf?7+1aY81B
zfpuu!h8K#AGK=XU7y%#Z2V>Lv^g2wk=-G0HtrpGSf)$P-Cb|X+U!ofwq~7`D5to&*
zR&E)>{v1Pwev-K<5@iBum0UgQgwj9T>1AI`iU1au6KATPWY4{(g+jQg5MI;5f^wc&
zcd=_)2!gh|bL$bX6I!T8qAKQQF5WRMy!!WTq)re`^Q1wb*#x%%6F(rVSzT$otLt0*
z({!fPW3rnr5Z)Q-c|?`=bdUZmT=@wg4zjQU4ds+)i`2!grL^Xn|4Bax^AltXs8iSQ
zEu4yQkBJbC>VNzE9PtaIv`{ylqK*ruB#jej9X4GGHdcB+ydFyLO$-<`Hr;S3#{CtB
zx0QJx!d&PA3lZK6C7;u~?i$;vJ={>C{vHx>1eeH2_P~TPZhJ<->lCpwuZ!1>ZbIgQ
zs@_NrZR%NjtJ|LHA)Ik*)V0$_**KGK0ykiiE?p+KyffT~e%&O+4wV7eq(yYk*k;@0
z;ThkP%M+@NWGZ&m+p~9ROg7c80=D{|_22nygHvj=>;85v1&`2p<i7{XyO8ZND>RHr
zxO!+?p9`&MN8b0Y*fz&7&M}q6w=EhE;Omm<GN?sAgN@_6<yW4%J6cri?s9cN7beRU
zYv|iu*|0Jjwr%x{2{zcfL^KebGVBfz6`m(cMCAeP-RgY_o#@vC(o@cV0M55hT(@@Y
zpnHO1F@|4)nx%`-1uTou2KET~8fI%k_1rF&+*do>r>~y%FnQGh*rJ1Mr<$_f=<wR?
zT<|ah3mm)X?Jh2Zx8`z=lBVEgxZ*8y>I!jJ{P*AmL|Og!K&<$vug4lb)#wq-Y?sn3
zNaxG89&5>7J=&BrdI<MY>vvnrIjt3IR_&vVwN$+wpoege!u=|$N8Kpuf##!E53cz*
KsSW{0eg6w)dnnof

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-016.js b/js/src/jsapi-tests/binast/parser/tester/lexical-016.js
new file mode 100644
index 000000000000..419af22c0e99
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-016.js
@@ -0,0 +1,62 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-016
+   Corresponds To:     7.4.3-9-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-016";
+var VERSION = "JS1_4";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+print("This test requires option javascript.options.strict enabled");
+
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("class = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "class = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-017.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-017.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..a1e0e6e591981f371c016327a719040ea662e56b
GIT binary patch
literal 6265
zcmds5&2AGh5Z?0tb3sCI;Iv0jg+dV$5~L9{P1RIUsG6ufA~)+MOP$@wcADk|cnIE%
z6Gy~bF!p-aPP|E+bQ^w7(Z=>?&&)U9j9uo#0l}4W52K)RNaHR=eeZ_nd8ctO_IB#c
zgVwuNCmvw0T#|FjBxJnu^{MAQgjr>C`7xp)Iwg1)cL<`0hjApK0{zXr^Dqh~v3>x~
z#v-hkN~kdK!YJe!fVq7=z!4A6LQExGg!=l>jMFgcR_?+!ty;BR|I{p()PLoY0x_{#
za(*M^m?9$KE)W@7c)|q)Uxpn-UcTCTYh$L^CF!-Y+VUnWyFk>QZXRJpZ+-{tHG1>7
zcGN1$o44WU2d%BoZ*0e`-;Y1n=SN|8yWVcpY`aZDICAm{pzRI$kYfJ`GfXdV;Ge`a
zU^e;{yjr^)P|O&lc#9*B`;dB)b~yV#H%F_85WQ5cfZQQiXO?NPLq^{RYZ*tBw=v^$
zEL5;2x<1EMOb}YBOhB|d6pmoIraKt(2(U&JL}wq=7}Iv#h`Y8;QcAu-j$3KI6Gn)R
zwOyVN8qjXgV$e^5&$vg!Zcodn(jx)1sW&p6bPbRWjwo8Eg@L{{Fynm=D;!QYCtow<
zMDMfDoQ?i|eZK=<gCrl4oWwFY;wVf4ZV!b72eTuwzB>5}PGcp|bWDorI)p~y%MKoh
zj>xus1y?=>#AfVgpg!->c$9;k5%7QPKLnwm-r!Dg{5(XA70k~z9qalcJ8Kem&b=Or
z0s^gS+E$w^*by_P7R_zP-vE;>GV3~^p~NI`nJV46n@^SKBJ0~Nu{$)<b`D5-p1`nW
zg`>DUfVDyFZ~L4M@q2p%B`jG!D0i#BC!BBGdBkawJJ3F2yCDUt)!_W8-!`(lLyBtx
zRT1y>sss%gmW6l#ccT96dzHD=p$N%H+IE^KOVel*`UMg1iCf)@H2Mh5VK)-(kOo+$
zAKBKnnKn6i#<grYLP5IZDoh&k^w&J4HhHPk`*S{9qC`#UgW%zu7JfH2<1fe+pMC*<
zdIKsNQ$9{}X@YYOp>g291Ij%(5RVg$(S%Dwy6`uts%GTP7ZbqFteb|KwMHvW1M}n|
z1qV%d%Fvezx#=^&7IV`lg=u#rC!5|i{Wf=Bk*iHS(krEE6m<&{F%h@9Dq`4<i8Smr
z2$d)%%aX?VUU3cAo__<<vD^y1$jYr9B$Ho`h$8C#bLeC7$hQIWi0hEv3uG-1)$zC@
z-(D1UPS;M>!Q^?>Z$=YjMoZ`PQk84DqTpbL$ZqcRq_d!f6D21RWw_i;3hJEBE_vnt
z08y5&+-%PCu^P*H6i_4idS*acZ>VZ)27A?L9%qc9>5IF8$?W$sHEMfZ4dmBJHMro}
KN-DP1D*py;ne93N

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-017.js b/js/src/jsapi-tests/binast/parser/tester/lexical-017.js
new file mode 100644
index 000000000000..d7d33b4f0182
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-017.js
@@ -0,0 +1,54 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-017.js
+   Corresponds To:     7.4.3-10-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-017";
+var VERSION = "JS1_4";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("do = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "do = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-018.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-018.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..8d7deb8b9cf35de802a770077a28cf6eb5c561f6
GIT binary patch
literal 6275
zcmds5OK%e~5Z>}eNPvXkz-f=53WZ8YywV7orfRAvR83SaNXX5)$x>%Gvb|07FF5nh
zIB`V$3&vjW+KD%blcwcyiZ-@CduG1*X6!Og1_W2iJ&c0NK8?E+^}Q>e=N-kt$lIzn
z_gZgSop^w~a!Jl9laTSs*GHar2WFMc<%fud=!oEL+#!e}9>$S`3iLPgPQoY{$NB*{
zYxA&TDxt!_3!{+d0Ot1f07pDL4l$K*5$fwhGfu;(Te%6_v})CM{X?@{Qva1p3dF=}
z$@z_tV~U7`J4Gb1@PrEpJ_|dDJbS+J%ErvFOVVp)wdGY<c8aJy-8{mQ-uw>Om*~yI
z+Cgho-n<S+-)n7reqlT2^8NVp^86_5Zr9t5nr*j92uDsn1hk!mClvb!m|=Q~1OH=8
z17@S2!>hHk0mY0#inlo8xDTl(X@~Rw3v;xJ2+>RB3dkLTb!M3sJ7n~2u$FN|c^fl6
z!$JjXqU&><#{{93$^=BaiEsofG~L0N`+zm1AUeCC#+bI_M%=Y+l2Y;wa@<PutuR7#
zr0w#A(13P>7K45ge9S!>c6(Yrl^zM8b-j`4qziy_aKx&0S{UeS19RRNu)^VVGx9Y@
zPW3+jEZFGp*Y_LXHAwP=6eO0(5l3MXa62d@IG7%Z%d3;W;51eOO~zz3U5C&peAdAO
z(Gl6UFX74ufY^-v9MtDM8V?Jwa{~U4{f8hF)EnGc9Y6OGV=Lxon~rpSk)1V(J11Tb
zMFD|UHEXL)7Ho+b6N_fH<FA3q7MXP&&`@F$xJ;Gq!p$d2^eXGyHL*K1(sm9=dVYdo
z%L+$vxd&^Hq5Kgt@;7}>6a3cRMX5`k6w2r7@39CN7awt?^dhv2*mg*PZ#6I?bKY8h
zfyi)8peo{>UX`GPVOfm_a53snzg(G19V(Fwr){T+vM`s{p=l67AG_Ku$))$uA$B9t
z6KQ}&nvzXzn`x7SXIyKSBNXIJq0D3<&wkBQYLgerzdz@*1?tp<NC+Oz=;OCzGyZ~H
z@zEFXr#GOYJLRJ+m&Q2f5E=*mJD}Wx1MxT&8cnz?q;r4M(rQNDd^Q2>+`37qX=}9N
zG%!zJQ*h9P_Y8frkefaRY%w=`SD181da}t~vu|_vCAr$fL%mX}#;UGDA|~QWS49ll
zF_DJ71fdcYWl_>NUoI}-?(=UzI@a8~;QaBLYe&i?nIo(Sz5fI{T0Hb^z#{fK<oFzI
zD?)WVu1LD4D?6uaPwQavtP(h-6EdTv6MLcZwOD0vFhis`cY55J)5nRrlPWV@^Tt(m
zMthgOcfW%u%lB?J;~`m%6+929kz!FZAg$L_H8zF4YP5(m#?a&y-oRw`%b6Ory{-m|
Qi=`Tz^MEB~+v=Bp19naEmH+?%

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-018.js b/js/src/jsapi-tests/binast/parser/tester/lexical-018.js
new file mode 100644
index 000000000000..4d151e67bd14
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-018.js
@@ -0,0 +1,53 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-018
+   Corresponds To:     7.4.3-11-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-018";
+var VERSION = "JS1_4";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("finally = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "finally = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-019.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-019.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..ba6774fe3e5fc5665750170f4b008a5f4149a678
GIT binary patch
literal 6271
zcmds5&2AGh5Z>~S00{}ffzuvA6$+I=2uLGnnyRUyP&HAJxF9#{CQF^&$ab3M9e4uX
zj1x!1TQK%|*G{}ioOD}$PSM8pXV1(x-;7=6!vVpSau1`RvQOhKMSbsz=XpnQF!r|U
z&Arx}Rwo`{uUwLI$|PjG^7WDD-GNzUbNL~nAvz*>8+Qnzh=*|`p#uHQypu2rCb511
z&e|fZm`bQH@WLqM8GyNcJ-`tUk3&o)T!i}i(2UbC>Q-*THmzE<UH{N5m(+jdk^(WY
zT5^6P<d`BN;Z6}5T6n?*1fPW+M4mn0cx_{**d^(;vfA=0EIUQio^BptMQ?rw>`V0K
zVeOz*lsB)#(f3*#pI_LHxqLtVygWY&yW914qh{M}62g&_4*_jw$cGgB2bf`ciUa>+
zOao@4pTn!QvjN47L5jCH;<yi~CuxVX|8sM+iU`q5<qF6hf^}w@7CU70ZLpScM0p!C
zKF2}@YohCOoW}&AmC6J}yF=j!mTS6$G4}y$L_u_RL5(qO$Bnpa+a#sr8|1i^=38Ne
z=vdq3384Y)1}z5tB>0$nH0<`Yd@4N>K<j!V(@7Tq>EMW>by^tcYXdXh=di-zbaV1G
zLr(NQ`^?$s@7MPm;5A6{A<0QBlOvA8B;a;XNN_Ma5|>vef5B<21e%UXF<pnyD16qz
z1JM!Lwy)sI2Y}d&{S4ISJsOX4urmVwkNt-r6x18sDUP4}h_QnC*`{M%Uu0)Z;?9ZJ
zLs3AWRZZJ!lLcF1#?+#@?f5HTvPEWH2Q-wJ1TIshJ9qP`5?y3{yC!yrM%vB+NzYF(
zY+2zbF85%qOagz?=X8kQ+IuK%$x=djT>U-af8*LC4wPJjb`jeSDX^^uCZw)g%dQV8
zt_f5{ywj@^G-O!T;sIQX`m?WA=2C|`B!g+&X`(F6q;+T+M93#Db}KUJJ@kj&NOVLR
zV40R=Q`=_R<lq_C%H;?J8IvnAX~@%G^OV};rLynO`D}?QH6;;(hjY64?bwXJAXj|!
z1^np^sOU}kIL)OA&N+m}f&UIDx8OiLPGm+CE)D6z-=wgbkvAVr06Vj88fw-WtvC(L
zleZKcG~qQv-z(&%j{#fEO<xtJ-I1JZde`*Z+<ir^Ht|TWl&VqGMM%U%T<EHZVLK+$
zu$LfIqMj^E8t1FU1>Ai84M@j|dl#H<R$MzyCdC{<Md1A>0E<Vy4VcGWhYVk!Y<Z}T
z#}z5}w6Jr!_OlKq&ntj4`XDn}I<1!~Udz=52Qx&1bEk)$1znt|I*BgB6>m~g=QMZ8
zTlYJNvV7}ia~_e^SkBXc8p)S51JZg)Rbw;Qt48xUV+>7S-wjM=znZC0+v{o|zf`Kh
M1&>!!w5@LWH^S8L6951J

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-019.js b/js/src/jsapi-tests/binast/parser/tester/lexical-019.js
new file mode 100644
index 000000000000..0280b77102cb
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-019.js
@@ -0,0 +1,53 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-019.js
+   Corresponds To:     7.4.3-12-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-019";
+var VERSION = "JS1_4";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("throw = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "throw = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-020.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-020.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..bd74082c9a61646f63217d75f6546cf7219be058
GIT binary patch
literal 6271
zcmds5&2AGh5Z>~S00{}ffzuvA6-q%MBuFD@nyRUyP&HAJxF9#{CQF^&$ab3M9e4uX
zj1x!1TQK%|*G{}ioOD}$PSM8pXV1(x-;7=6!vVpSau1`RvQOhKMSbsz=XpnQF!r|U
z&Arx}Rwo`{uUwLI$|PjG^7WDD-GNzUbNL~nAvz*>8+Qnzh=*|`p#uHQypu2rCb511
z&e|fZm`bQH@WLqM8GyNcJ-`tUk3&o)T!i}i(2UbC>Q-*THmzE<UH{N5m(+jdk^(WY
zT5^6P<d`BN;Z6}5T6n?*1fPW+M4oND*sw8E?2`0aS#5b0mYpJMPdAUSqBp+-_9c4r
zuy)WY%A42W=zFc_pI_RJxqLtVygWY&yW914qh{M}62g&_4*_jw$cGgB2bf`ciUa>+
zOao@4pTn!QvjN47L5jCH;<yi~CuxVX|8sM+iU`q5<qF6hf^}w@7CU70ZLpScM0p!C
zKF2}@YohCOoW}&AmC6J}yF=j!mTS6$G4}y$L_u_RL5(qO$Bnpa+a#sr8|1i^=38Ne
z=vdq3384Y)1}z5tB>0$nH0<`Yd@4N>K<j!V(@7Tq>EMW>by^tcYXdXh=di-zbaV1G
zLr(NQ`^?$s@7MPm;5A6{A<0QBlOvA8B;a;XNN_Ma5|>vef5B<21e%UXF<pnyD16qz
z1JM!Lwy)sI2Y}d&{S4ISJsOX4urmVwkNt-r6x18sDUP4}h_QnC*`{M%Uu0)Z;?9ZJ
zLs3AWRZZJ!lLcF1#?+#@?f7e8vPEWH2Q-wJ1TIshJ9qP`5?y3{yC!yrM%vB+NzYF(
zY+2zbF85$<Cyp5RH+@cr_^rK%(v~bGl*iTI6aF`@J>o#gHE0*H?T`Z7YG6X@y0z^3
zkm8y^Rm3~JDnUbrWi1}SwWvS)YGp2Us6#TCww)%*(o9;1mO+Gk;$pWVliovr*o{O-
zqyd&`Nj9}@rcDl>ajjgAP>?aXB9n$Z{WVXiO<pSd{+!R2s8UlBA$T~ai{FmT_zQBy
zM_<67-hhhUl#kO~n&6y6XdL+OfN~2C#N$L}G~v>aF8oajs~LIo(FCwF>!zV*t<j3p
zz&v?N!9f#VGxWVeZu%Io#oY8&VcH$Z$)<Nrzs=oO<Z2U-^h&83MO}nMOvHt*iWs(I
zA`N>5LM7_SvZQgoT3o=*=ih*Ithjf<`DVqn<786I5mW@;e*)bs9{Dz49(Nrwe1Wp%
zp*kK{q}<cO&gt6EI+#4K0M6)x%xLMfUaEL4R~H=25DCtm9(ERVaiZ!Zx(rvmNll&8
z+$C?_?;y(Zt((nxL{?)tPXlTsU(yUn>m^l<&0wz@&Et$QG<|(HFq!>orbcbAtAYGd
OsRkE3UP;lmy5-+F%<u64

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-020.js b/js/src/jsapi-tests/binast/parser/tester/lexical-020.js
new file mode 100644
index 000000000000..7be919181b98
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-020.js
@@ -0,0 +1,53 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-020.js
+   Corresponds To      7.4.3-13-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-020";
+var VERSION = "JS1_4";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("const = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "const = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-021.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-021.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..dd38b63a2dd7367fbd80008b2ee8adf3d1780f4c
GIT binary patch
literal 8801
zcmeHNO^@3|81_;=ia-bnap8d68>nKJ0^&f^mActf4O&9A2}PXHtUXD*b?kIzyxIK+
zJ@(8$gCiHjzu<kxW6#86C*w35w9+1(@jNr{*E7$&PDf<(m>zbfl!S-RSUO>3=Dp>4
z-dP%6c}M-hkHa5^K{}^i=Rm&Gi6br!KleTFBY3N0PJd2VM9yM*OoNy(BBC^rP@#V2
z-is&+m$Ci^oV|5eDU(o9=tW5+N&s{Den=A$jU&n=Tta4g(_FA9nH;_c%M5$nQUB*b
z=Rp0|IZz-b)=<8G5(&ykEa5IloLPA2f|y=L0g1o*`kM#)=iG)Z;18tZI%?HBF!O>i
z`*m{{8#?qaz}}%lpZ89O+j8i;u=QT|r^mlPusySTNB*-rN4^6~jryaLo^7|85srEJ
zDWE;cM8>FpN;zd0H1vN>S-9Qw>|M?o<s8a<D2SjlC_kBZwEVrcPP-(I^;9_n>L;eU
zx=f25s``DfmJ7nfh;m{3ugn_-YohCYyom|Om&ydfCK)<{*P8BN%*TMWU_d-ifsrX2
zr6=jcwn=iyA5i30ogYOBVOQEN519t|8~7MFG^S(Wv1l^Y6siabf$r;tOeb9fq=O^2
z&DCh2uMJ$46%M;wQLiO(PWa{HjYvPVYYt~+O&v*dUctDPbB?U^5ay1i5%&eusn6)k
zECT-U(>W>y|D0S99<XRG_VZu(KBi_Me43!D2y0@u-oyQ|E^I7QT-poLgv08{SB0uE
z^Zl1q6$F$wjxN2T&PxEJjP8{?-CNQ}72<PdjpI}p^^DWfvvV2<2ox5!xGFbcT2WaI
zgZ5@Liv_77QyN%`ry|SE9XOWJjEG>`j3{F~hqbM=JEarwOCi$GFLNS5u_fL(CKJuT
zDm17q@{H1psUa8vAF2m!)B5x}iqqi5a)zxI&fkI+mLWR28VX;ctqxM>d~%4(%2-Rc
z3}JtkAwxIWTo;KVfs{-xA5}uBpUw0#FDH2b^9zbKRZTMI-qJ!Y+++xEX<<PbOO4Ce
zEiHIn)BU;e2-pfOR3lLqb3GStnHDy@aQ|7yg;lKWbTE)QK{RD?jX*OAt_2f6AyK`$
zQh2*-T>QH`KjNK{UItWZPy6WKz?Gi>;vn@)P+v@0x=3v7N=hrPxz2{rj`I^_3#e1u
z@C}@b>HdsxUaS5$&(9IN(n<?;(;4bGZ%UFdhW26IrJ%La`~GGqy|=Ltpt)&>OET_n
zFubYE`w*d%Z00}m1<U9|dx_1&9_}X>e@_WNhC5^+dSF2jwmmK2Rfd>}*TvgLHzpaU
zvNbY?PW7z0+igyD(9O6tYTId|v`(b^Kn<9qOLxf)uMCf&T{lUvL8SrObch~l+f17r
zJmY$BIYKpYOi8Y4d*&{+$-4Muz*b+g{y(3!IHcO$_BZP&IE2O_{~b{7Lbi)EmoPfv
zs-bOs&ZVLmdDp9A(;Uq>CsgF0w`e$k4@|nrAQ$}%HjeKWUwNwTXb`d6%hds0=q#74
zp)Pktze;b|wAC>t*kA7wUPExwu<wAV@Hkl_DhFuiPVY4|qHhMIqniH!oNpYscIlWg
zcf`b6^uGWtOBcQkSk#~i>=5xa#8!vuxLvHcFSoW&JhYllnwBQ7I{zAEkhy}c>Q-l0
zyJNv2a#-KkLvMC*5xg~5b5t}rEyG25nNnA1yZqk=uOZ6v-v@lfXMHtR^PxtKU}oEl
zW<XjWw$)fe_NvjkoKZu#mrA$WSk7v!7_%y$WQ?V%%>Xrod*t>vQ8j8uQ4Q3eylQaG
Lr%8DRSmOIX<7O#o

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-021.js b/js/src/jsapi-tests/binast/parser/tester/lexical-021.js
new file mode 100644
index 000000000000..a3b4422ccc75
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-021.js
@@ -0,0 +1,62 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-021.js
+   Corresponds To:     7.4.3-14-n.js
+   ECMA Section:       7.4.3
+
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-021.js";
+var VERSION = "ECMA_1";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+print("This test requires option javascript.options.strict enabled");
+
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("enum = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "enum = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-023.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-023.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..39a9aca701bbc3d9a58b34e8d969317678588c8c
GIT binary patch
literal 6271
zcmdT|&2AGh5Z?0tBOxRN2TpqgRZyVf0^5i-P1T?fswOJjkehXrZJpi7cADlLcmm!G
zj$9CL!PxPxop_TtVH?CL+SvZ=8GrN5j04{95nKv77=@(+nzSkEdRIKpJ5Iu(w^OaZ
zZ@g)=k{<Sg4LK(u5#yz=k38=#%nHoqM~Ft~nBZO9B8Va$C9#AG^*8g*qBtDK`UyB|
z^RN;sp`y@>;)rJe=JwSP$2>ZTFqLpI>gq!?PNTS8x(VAfD&=PNV?EeV{{<Tg#KdaI
z`L&2+iim_eN2G7z-2*&=FQOJA&tAORe16Jo*c5(4IxbMVUWJwCh}zT5Q!MGwAAr3=
zhaOc98$~(v1{}Ro{;>V!rR|y3JM!1+9C;nKYF3-Iify;a2uEH%1hl<A?^Em_VutBC
z4*gFF4U45`<)TM1V-V&IjyUc@_(|U3?El<2Eh9qoQn>=+hhQCDro|3XeH*N098uoH
zjNAUpc%xuVbbXG$F+u31G6B(cUpRv0n(koCeZU$}5T1QdWK5e$Eos{}NiF#XL2kwQ
zP81_L)OLA7X+Xb0k3mBTKH(mX+8r&SN{|H5y57ii(j`DTIHG8+76$s-z*($tINgkR
z&5%cepMB=gZ%Kjw4yITaKZ#XL#uS1KLEa}hfn{>UQJ4hW9*PJKr{Bct66NpJ`B7*T
zzG&f|sETacmvH3+K&&Tz2I}(;O$IsG839*TfUKCGkZ*9SIDQ@=#tP<VlMZ!$k<~Rx
zT4!Dd#UX)mH7%`87VL-_6N_e+<gY;yEK$&TKtqX1;4+oEb2pzz(M9IBYhrgOrtKJz
z^!yCNmKBcTA{r7-hyIq&X&=9}cTmcb1%&dq`g_d#M&l!nGirqP5!;O@aIFFcq>fw5
z8i*9v1S%um>XZrUGb}T44;rKH^ybQ3>X3!xRoZr%C=2sw9SR0<;bX1cl04dm>aZP)
zdPoB-QjlzE+f17rJmZ?T9HAgyawR6c^7Pj{r8aq?*!y=rTOdbG2!!C_j2eD7G4EfH
zD>*&|e|kMCDpNj8V`+?Y4p-yAe+QIXa3G$HL`D-Xz0$eAqqJ(?y!mVb*qL>cP}A0E
z#i?OFdQHJ$9o{o^S0Oij4A^3B`lvAJj?u{`cTK;|-IwHQ9S`(MsTxJKLE=tCJ6A>w
z+jk-j+XSH!*<?}DI5!rT(D(cwkdFEG4me-uTl<zwf;mEpYxkc(C5s2X4VcGVhxneO
zYk8=S#}xthw6JrEoHZ@cn7(u{c~<(HQU#ei=%8LGbuE?^9Lx~m&7B@~=G1T^=ZsVt
z+T?LXol)A2-n!qxEz7rVHscXljpaNGsF8d@Ga#*JR5dn*y=pX%Gse(l>uz8&`^8L+
V+Fn-!`H4~u&Uv_!l5N$>e*h>D@3H^@

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-023.js b/js/src/jsapi-tests/binast/parser/tester/lexical-023.js
new file mode 100644
index 000000000000..d5df7ce7d8ad
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-023.js
@@ -0,0 +1,52 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-023.js
+   Corresponds To:     7.4.3-16-n.js
+   ECMA Section:       7.4.3
+   Description:
+   The following words are used as keywords in proposed extensions and are
+   therefore reserved to allow for the possibility of future adoption of
+   those extensions.
+
+   FutureReservedWord :: one of
+   case    debugger    export      super
+   catch   default     extends     switch
+   class   do          finally     throw
+   const   enum        import      try
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "lexical-023.js";
+var VERSION = "ECMA_1";
+var TITLE   = "Future Reserved Words";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("try = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "try = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-024.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-024.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..8f4f5a90348a177c7c5cba6a82810807d58b4897
GIT binary patch
literal 6252
zcmds5O>Yx15Z&_qaX~`jz$r&ig#uMi5F%(A)RZVxBq~SbWZlHn*^RtT)BF|w8C*E?
zFBp5hYiGULIO(<&PSM8pvuEbbo3U$rI-$5;8)4+vk61WlXzbnaJg*=6b8oNJIqbgf
z4#ElcYE?O>MoGl$^CzD75N6fP<;RE-)TekK4=7@YlQ57_zW$E9Qxf=#Sib;gYZX?=
zBoy&I5)hsOnA^8}9B^_%Fq3cr8tX$xoRMHyzYE)Rn~h%UQ>Ru{|JAAr#Kh{#`E9~6
zLsY_@Av(42gbOG>Cj&%ZyxiHfF%#^n^jb}Ac@vhMA!biEkFcRPe*pFsdh@vXxm%Vu
zZ^O|KyRW`p3qSt6IzI}#d#zr(Sxg8=PTm8wk9a-{nIGAJ7a(Nwe8O-PK~{G;;&=?%
zCYgrQ|8vu_fhg5W<qAj_ighxXtanJ_`(R+i5#v1^@d68T(psP6A|?oVR3;!coC-%o
zxu!c9^9ZnJ40PrI1Q@ek*baxbO;SC+Lt0yzy+;DX=Grb#XbZ?S$S+7H#V6cjWH{1_
zsU%1MZR?H95L^PJgCok8W?^7O8<_GwhZPQ|D@f54IhOeJGiRggFX?x{Ymnqqnv+;2
zM;x_Cz<of3Vt;uguC6rxhSOLHl#NL_jfT)Dd_KSv(FEDHZ{W(ufY=EuDQJa{SUAhU
zP6_xwwj6>`P;c;{JboUbC@PtsJvP_%MK;qk9GrS16!;Xn)1;F&S+FN&WEK^6;Jd(N
zi_E$XXecoWT&7BQ?&g^iU1oi|C3c72+0Fq;&o3}+S>Y%y4`3~H(Um^K==6=fffAN9
zAC$Y*-wVz+t~uf~@wMjwMf-#S)tYer#BW>abs@nuff|SpMh%Ll5tfB`0@tAN@~f1&
z)S(E;NZNLqC~MPb8~Ozi?}dxphBSH)&EYT*?T`joryqH%Z8L3h@QiEOa)g3($yJyn
z<jJpjN^SC5srUDMwnmA{=!4*4K?}bhn(-Ip3j5!{pWcLt#+1*KTw36qLuefM?|>ri
zM?8!*MiVXx>B`@@s+y5EA4vc^wJr;_Y>if&Hs<l$3HCeidZ8~Ba?_`PE#@Y#2w8W;
zC(G`de4D#($kh&>>6KD7%DM%Kn26h414Y=5i8O2ngh~{XbxGrVuegM3&%XibSZ;-0
zq~+EQlF2VeL=pAMGw5UStYQP^5!WHTSIAl(s^f7*zCADPoUWa$gULnJZ%GqmMoZ`P
zT9s?PqTpbL$ZqcRq_d)h6D21WWw_ie3Ti=T7e8#jgDA^~?Wo|zSdHa83aF8MJu@J!
qXHzw{guQAsk2A(l_Tp|}M)rG|8nwNy2J-8q8eH*gB^BFhmHz+`^ywP_

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-024.js b/js/src/jsapi-tests/binast/parser/tester/lexical-024.js
new file mode 100644
index 000000000000..be1c3a7b9145
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-024.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-024
+   Corresponds To:     7.4.2-1-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-024";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var break;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var break" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-025.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-025.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..aa3e59877d2d36190013e5c81bbe26e6788c4ccc
GIT binary patch
literal 6248
zcmds5O>Yx15Z&^PxF8{M;FKe%LMatoV5y*KP*b8%k<cr0vu<K=b|c$qn!mz7g9~T=
z1!J#w?ZlhJNw?wS6m4ujduHCe89NlCA;o)PAERjRm?b@i2Enx;2u_n|66`lxN9~vG
zZZgC{SXFaEO1Rh?Jq&_-Fe|i|pCCriDa8l4OA$kYB(Z{u%r_6dk~o^i`UyB&%dirr
zphy&un1~#}-o6pxSdcS<nSzVaz#N(jM&jPyZP=z=uXP$9T47cH7gjZhjn!83n?zuS
zsDe93bmZVk7f^gbx`;mA*?r++X4qBbwNP()9hRLV=1#Ydu%<V^1NH{Jc~bw_F3X!Y
z;pj*0XP=+Dj@i5)e{9Z=((X>9)2zF8+l27s<Q+hJk0;}VMcf6vgd^)0LxwqrtZoY=
z@Bp$+F%9Sc7p7$mQEHZ|6_73zn`E+$^hn~nU?3NWi4NvsfrT2@MmOiUj0sX6wF!vz
zM$!?y&~y)D?gQ4CfzBL)0Atoknn};KNvX#-NNXpv_eqS{#Ml)`Z2`Fk`31?O_)G+h
z^!i3IwFF6^ZL^W>q$_~*a75YCEDfv}19RRNu)^bX3sN*kP9;A7EZFGpm-JiUHAwOi
zEl4bzBc56$;oc!aaWp>?n=6gK;51GG&BmmhMnh^8zUbniY=T_d*Kp+nKx`$I9JC_(
zEEyMI=LGy8TMkJms5iJ<9zTx}=Oy#A!zQM_sAifb-LF9(#Sw+>H0z{o7VOIzGm92>
z;Jd(Nhs>r97$`XjT&7ER;pQ_Xy3G1^L+%c}vzr5oo}XaYvBFbaWTOLJbmc5zuUvR7
zD|t3(XY0SGTyI@+<XO^7&mrOmgaOg&aQe(^Tlr-n!?l5GNOb!(ibfo(GCYJ!&|v;W
z%3kVGf>az`J8hJeNwf{!f{gamHEvB3y@l4W7t3bI0IbrDyf(JkHhFl)w`h4nL9!I;
zOBV9%*FL2&d8Nerb3R+4K+ULw<l%w_{vfgAFUgghegS_5Lnhl&G0AdiigO;J@!-D)
ziWCizqzYpQmxXlcZ(39B$lFgOfSp@63pH<zQJf|g>B|X@TJUyZt`ut1M}RHoW^V|y
z?nqBIyKDAs@4hBiTX<|%D%B|K4kTkD?{YQ7u^SU**bWGlEG4Uw#`{)r1(%+G1JbkD
zN=NEq>xRf?mnWW#dF3(muy|Z?0gGtsk=#o}tq9fgxH8+Gly*+vF4n{3MYV5E3uH&j
zWb{gPYqgT#VTR0Y;q{!eq=AzKCzWKl*iFmng1#<&)P4g|R*%|z!E3P|D|islBgJZF
sK{`*SdTb7R^=J`itfARUyM@W!w=zBIdR-3`S4lm%<jG3uwbLm722k|pk^lez

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-025.js b/js/src/jsapi-tests/binast/parser/tester/lexical-025.js
new file mode 100644
index 000000000000..0dbb3ac63d5d
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-025.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-025.js
+   Corresponds To      7.4.2-2-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-025";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var for;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var for" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-026.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-026.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..3b5d230297eedf3465f14241743b49ac850a6f97
GIT binary patch
literal 6248
zcmds5O>Yx15Z&^PxF8{M;FKe%LMavE0HK1WK~0H5MMAI0&AN%f*^O+cY5ofT3@)7c
z7mU5$wX@zNPPz>rr)XpQ*)#Lz&Db?D9#Onk8(<Xf9kaO4&@i|b1i@(>PJ{hs`>6A>
z(~Czqs8!XR8YNupjUNWVJ(yLqm!BX;&?&_SxJMB~g2a)63e7hUzLF@M#rg?2Tg$Lw
zrl3d|kcfy3z}~(Y;z*D)f|-Jg(9j&33r3>;-fh^X)2MfwAKJC5{;yWmAU0M<&2JHb
z8KMgA9MQ3ZCtX1C1?eIBbZ7U4i<x3qmDg%|%j>Z095HvgeS|f=`5mw~=*^SH$4*(^
zya`7?>OA}W+;z<6{rF>Zew221o84B!wc93yCnxU!+Iu{m#4O}4;3XW{xEL|aIb?N5
zAc2RFZHj3)`@b+P>xfdbRIPw?q1YsoZKOvM-vtA?KumNo7Yi)Zur|6m$7M{A@~BNf
ztUs2H;Dx4p7;_)6CJc1u5Cj;rZrqCdu1!ikzCl_$nY~XU#HPlsKxzxfHOMbWCdFqW
zV5C1Vim4??0&Sa(Y$sg-q=zHQmS$;S#Tc0JzJL`Tr(2Ms8FC`=*=NB<f4`*P0<S@m
zk7+?-*&OlIA_?~n5sJh4k=R^m`~|0R5-1;&avBY(QTU>VN3scWZC}Hc4*;<pS2ECw
z7_fL!fSnQWe{4A<p`hO2UU~dHMx2+-&n}yq`l6a?8uz{i0~Cc6y3@3iwpp+*XXF+w
z?7(+{$qt!K9WYRG61Ys4?!wJ;CA!S|c0=wCy|bGGik_cf*s;P>Tx6pIU34YFlUFXh
zmX$0Uw6pc!Gp@HTIr1#YrRNaw1Hyo44LE)3wXN*3kmA}vbtHO&Iz?lSRT&<^C1^PR
zB4sc2C_yTYuAMf@$|Tx`Zb3$S<{GyqiQYnM*pFm0WB^v_MqV4+Y@0kh<6E>mp&(fb
z^(75?`fH!kn7mTr{W+hlP@r<^AbGf;fj@}t_)Budr(eLI!HCJWR7}%cn&F&BXgv7u
zfg(ji#EHTf!lfZy`kT~LJM#7u31DZ|<)P-SF^bc|B6&H%VH@5q%#}iI`UtS)-1H40
z?~deT`CZd*d-pZD+Qt*JQmIB+cOV%Pd6%mrj@_6j!*)QZWGPvdG~Tz0E4cLh8<3vG
zRytA_TQ@{DyFBq^%qx$fhsBeM3s^*3kK|q=YDK7?$CcUkq_lJTcCj8NFRFcWS|B@G
zCZkuXTdS1>4>M$L3$N##B@LV`IEf^~#cozk7xZ<>qxKt!vU=3!3to%$SiysU9w}Bc
s3(|Qq)njwmt4E7CV-4jm?G`3?-^%o;>vcU)TqX73k|!&r*G{AS8<(f&nE(I)

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-026.js b/js/src/jsapi-tests/binast/parser/tester/lexical-026.js
new file mode 100644
index 000000000000..2711de0892b9
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-026.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-026.js
+   Corresponds To:     7.4.2-3-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-026";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var new;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var new" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-027.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-027.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..a29bed12aad5bc0fb704cec2979e99b70ceab20b
GIT binary patch
literal 6248
zcmds5O>Yx15Z&^PxF8{M;FKe%LMasz5`+qx1~nxL6$!l}H|r(_XE(B)rui%UGq`Z(
zUoiH1*UoyAIO#Tg9HJ<({p^`}^JeUt7>_94s|_#;_l{ZIXJ{B)3xeP@4yVC>vwhTg
z+3Ce29Mr06PK^>S_Qnr`;2zAX*~?E5Bj}Xk1KgvCAwl9uL51cw55AHpoW=SHI9toG
zVy2)-7?6mF48Y#L8RAHgGlH3di_p*<nhQpv{@!iarqif*n;+V>s{XH5)gU%jN6l{$
zff=F-?i|svgC|`;@dfE2`gCXag^QVDSC!Xlddusu>>M$7x_yK-z4;xmH|Wii#>Y-s
z-n<D%Kk7XD{M>cS=Kc6%bAFU|cbnZ-!?oKcgeNEO0NQ&zoy08UF5o2`*|-=n%sFIr
zM<9WRkZp=-IQzdaE$fI<vsA5sbfMTJlWn9&65j;_xj;;GF&7Ig)UY<XImcy8kn*Ta
zK&(HOj^Kr+dl+*cuqF(2<`4uJvu@mq`>st&J-$I&JDI&tBE+V~u0U!F$Ti3>NG8Q+
zB4DIHFp8-qNCIt}jcg}f0i=f`%9dtnV8s}i@xFi+9;aK7q8V}`@!8LUjsAW~zXe`{
zBp=g)#IiZ!sYMd*9U>Hm^CPjj()bHb<0Mc%Cgn65Qls!i507LM<l4T5D<1%2JFaA)
z6)|A(qyRf3;Q!ciNJ2rq!M*bMd5kzOnV(%YHT6X`(=_gV4F)I*DRif4CvCG}U(U!a
zTG)Z_0+Sswn>t{i<RoyJF5QKj=Sp;$_3eh-9eQUs2NXR&!LVb6r?|*Q2fFAAd|tWm
zT2``b(9YI>&$!;Y<jAumm!3n!4+sOIHQ@BA*S50DLW*kx)sg58>J*JRR%Lhum!RSN
zi<G_8qXelqx^~(qE0bs&x&;~SnQPpdBzg<2VLy`1kO5ew8+mPPvu*P5jBnBMgo0!#
z)R#2m>9>7KWAaLg_vd`JLV?PugXH0Y2L2$n<1fh-pMC*<1|ufhQZY?)X@+wiq4D6q
z2Z|I85hn^`2$zO*>3337?a13tB!Hb+mxr3S#wbn;i{#}5hi!PfFjoq-=_A0FbJI73
zygQPU<#$bg+q<vH)i$1(l}a_rx&z6W$h%w}aqPxK8MXsLB}>Vwr18F0T*0O1-+=Ti
zw$hQh*t#LI+2x5RV_ta-JuIG7T)-mQdL;J}Q7c0AJg&^PC#9X!w~O^Kc~R|~(*oJi
zG8w&6-CC_Ac$gt`TX;R^ENS3m!AT?;E_SnWx}dL19<|><l+~j)U+`M2#|j<<^hmLq
sS&+_?sUDldUOigG8EYtiX}2)B`&On$U9anb;wq^JmpoZ1y>=Sq-=6~Km;e9(

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-027.js b/js/src/jsapi-tests/binast/parser/tester/lexical-027.js
new file mode 100644
index 000000000000..0d8ddf079875
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-027.js
@@ -0,0 +1,61 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-027.js
+   Corresponds To:     7.4.2-4-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   var
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-027";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var var;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var var" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-028.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-028.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..c0ef34a00cd7dc9ef0be23f44e5881c58730a81c
GIT binary patch
literal 6268
zcmds5&2AGh5Z>~SxbP!!;FKe%LIK19m2Ct~gPIbBibTCu?yj3Gb#^1$X_`mi6?ika
zaON!-d%bHX-Xu=CEkCDdWBapb=9_QE_W5W?aLw;y6xI%C(xYhLUGqHeI0+}-PP4t=
z+3Ezz5PN=A&hbgac<t+B&$|b+d~^9Bq7gbKcozo*QN*JpmQbPoX5MKOhtpU;0cT?w
zRzf9I6naq{@f^V1z8T_}M<)@c5-vsqeQ3sM6!&VkVVh2)-fezr`&IRyUsWI`R!7cn
zMI2K^B-|MyBMVQsfZ+2eK;-$0S8r_047)15=Bq8Q!?H6(?dj$b*7W9gz`jCn9yUIA
z%JSw-IQo9)<<V=~F<0-$A6Mr`VRyILZ8dDWO+q+w@(!SV#FKGCLuLbBz>$sfA;pYA
zR(Ck!cmUZZnTGTK3)8ZW2+>RB3P=}%buyVoIwbL3FpzOXc^5Ojz(NIUqU&>9!~`La
z$^=AvBjE^EXu5+j_W^56L1*?rfHCbRt)yq$B-P^^q_vgVJ5h}2MBC*FZ2`Fk`31=&
z_=I~j>h-l^DhU!mn|dSDNtXcW;E1xNSr}N+2IjmkV1>i!7Nls7oJxHDS+LRHFX^|y
zYmnq4Qjl0CM;x_Cz<odw!QuQ!TwQ7W1*fqRXf`J0G#Wyq@OglTq6xBXU&ED;0I{7^
za?lFz(_~zLofGhXY&is>px)r1JboS^#!BXAmritjk<Bzof>W=L;*dahnsw493wFee
znMDgba37d#ky+OP4J9Ul%T(zu+<c})ms#I#h~1%gwsSzz^9Y75D;&k;A*_Wix)LPN
z_QxZ<&FKigwKq}%ljntUyZU=72*!0soGQKk>>;)rQJ`D{?8yALkzX4!Tob5{c+jsC
zG-6m5<RM&#2J^2}=2C}ZBqM6uX`-x5r%mV^MBJw?bZgS-Jv52EShPhNV3odPTia&Z
z<lq_C^5qBxX;Y{)S;(_r^OV};l~VA}`D}$!HKP-PhYMQy-NcN)AXjqy1^np^sc2C7
zB+I2K&N+m}f&UID;-18lRBJThvXCzQO{=RJdGoOZuygBXq2{g8iqpb8eM7-v8(uN=
z<w9=y1hB>2>@{K59qGwtcg?=d-Ph!58;|u$sTyV7hD1!nt*(w3wqqg<+XA5yMP*ge
zINvWW;rjD$KsuJ)2jG0G?ApOHdFF^LqF;FmeJvhWY``J{JEZv%c`HJ7Jg&&QXQiFf
zwX=0Fc~KRd(+ru>(z(4-1zW8+IG7=_oI5@7ENSIL=}E;IE_>6$x}d{LAG+T`l;uM=
zTkwLc#tI$@)JU<e8Iaa9sv4WaUNu_88DnVnB5z<a`~6If+Fn-!#r0ARE_ue1%5AmG
FzX4L=@DTt2

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-028.js b/js/src/jsapi-tests/binast/parser/tester/lexical-028.js
new file mode 100644
index 000000000000..2b75204c7fe6
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-028.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-028.js
+   Corresponds To:     7.4.2-5-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-028";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var continue=true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var continue=true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-029.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-029.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..e79fe5f1e264706967fda0b39ca45ed95ed1a421
GIT binary patch
literal 6272
zcmds5&2AGh5Z>~SxFCTzaM~lNLIK1D*hbJas3}pXNYpEGvu<K=b|bITG!MZG@Mdt~
z%v&(_de_c+lQ`+N{G6hV?a!W>Z@w8j;FB@M^<aomSU+U(fT59h#q+%5IGlOAt<FLB
zRkt6Hu@}_joPd&q*S|jSygM)}Fqa=8M$j?Ed$>;#L!88sgbMX{;(Z}eIFI!caJE)q
z#Y{qx&?6DyIe@u+E5s2eCj>JI7om|pbix^l2KAe;O}E+TwLWx$n))xODG(E@E9bWf
z#|%*kcZ%r5!V@l__>A-see(4AOB*x8u1T*2YRjvz>=ZG3x_N{Rz4;xmFVUMv&5zxx
zym=jte$ajP>4oi>%lG4t%k!hKyVvTqo3`C1Asjh*3((%<*)(QhVgsJTk<GI)!$|^J
z-Q|em5oDWW8qWVOP0I$NR4<h)AYCZd$z&Soki@saz=R{ldpO}sEL5;2x<1EwOc3&@
zOh9Zf5spYoO?NQnE?`X==*&I{FlN2D9S>}qq<VaVw6-#Pmqduov|XOi7LaR@Uyw|S
zPq@d(V5k*SNss{A)*G2lx&TNAM^r7%!a!denDf4b6%MCclA<|sD)ISe$wq&_q~8Fq
zL6T2sNn)8CanvFK_YM(?!^M%fywdm!PGcodF(%bC8bYJ+Ss#x@6J*=Ifh+F;Vkh=<
zP@fN3JT1Y_3HU#@9D-0#Z*adlejcJEshFQVHq-S*Hq$ijfANMW3Mq7_Sto6>U{}m2
zELz%u*MZ3vnROk|P+}6eOqK4^%?l;E%KCOq><+!Nodc4d2!<^y9L426tc5PxKbb^*
zk!Jpm&)EdOwzpCelV^r<y!v}C490~=oGZNm?W1ImFd$tMEXh2$m0uh(Tob5)cz@WS
zXp&%AlE-i%8ZEw5nM)nYk&LNrr-`yQp|+uO5Rsp|(rrknx6mdIBGDLWfOR^P9c`Ow
zlY?hm3z#DmBu=T;WFgOf%~NWV*Gj@a=d(46RY55P50^Cad$AdRL9Y1tGx*aRGtr{*
zS(Zz4oO1|`1OFXR#7&9EsoH45Wg%Vpo7Pt|^5%01VCU8qp%$&tiqpnCeMP}x2i`IC
z^+Im?5U|DE>^-6Aj`U>3U9)d<_YJw)!Bf3bszz1!ArTXCuWO(L+c8NE1ECUSWnI!Z
z-!LxV0`zY{Iu>5hik1{!J6tBy9I-|G{YTK-;;C-~mQmOt(N_pu8LH!PMdm%O?3}LM
zt%J$S>fnNQ$c&cG?zL*zdgZ~v43X#D>6vFmGbf5qD$j7?o0rxlJzo0Q{RW~eAG?z!
zugGew<e@-~lq;J7X+5Q?u?6f^qh*{ihKiSY12eJT(A22ybv004G1cITr!1-6R@3|&
DnuhSA

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-029.js b/js/src/jsapi-tests/binast/parser/tester/lexical-029.js
new file mode 100644
index 000000000000..f559b5d050aa
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-029.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-029.js
+   Corresponds To:     7.4.2-6.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-029";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var function = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var function = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-030.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-030.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..5acef3d410c14f60d5cfee0f2fcd7cfb927a6454
GIT binary patch
literal 6268
zcmds5&2AGh5Z>~SxbP!!;Iv0jg;E5kvW=i=P*b8%k*L?o&AN%Hvm1Gxrg;Qjfj5H-
zXWoLb<6S%JP2!~6@^gwdwm*AjzWHYCfRBb0SA#xAVfB#3J%$F}4bSsV;&9^aHd+Vm
z?RGaFVlSx3IRPaJuYP^%c@JP#U@kvGjGz;W_i&dYhB%2M2^H$^#5*HVIE(cYa5k1<
z#Y{qx&?6Dy8GyNcBg7FWrvx(z7omYZbix^ldeytIO}k#}G(NS0iuy08C=e5?E$250
z#|%*kcaG@D!V@l__=0p1eYy2|%f?KxE7EI$+VUnWJ4ei(ZXRJxZ+-{tYxL$({d2o4
zZ{CKZAGBW`zp)*2{eJv$eSQ>ncN(2$-L~5#gd->K0oq4A8OJP4Y`{x6vVJjSI7uL@
z+Z=H`fNYaY!`c6ZX<0**>ZNi8qzlD5nM@-clK4Itm~g~+2Pb@ig$mY0*XOv52|^x~
z35fMZ!VyWK=?=y`1gtRwo!JKg#;g-J<DPAkRF7|v)>dZkk_fShw#yUR0&)%V3zA9k
zDfbxZ^|fLu2@*h?dLz?GR{-hYh_a<w80c#QGu{`l!r^oaQZz%JN__TNu+iTy>36_u
zkmMs;kXR;19JNTmeL#fbaDF7NuQdLG(^v_Vk4ZU=hR`T{(Zxg21lhK);mRj~*oyrO
z)aQK`j|;Ff0{)LJhaeQx8{93ApNA+(O6F&WO>}*c%`}a>XI>vgA%*TV?W9c>?1~w=
zMGHId0GMo%S=Rv#B_@H(ROv3<JXfO2tZ%o(?$A5iIUwnI48xWcj^gqd)<PHUGt5UU
z@^^gBM)<A0krJ3JFO=KW-!nllt~=sX)9cSZO7;i?%GJS+)PEb<wIRhdfoh0%`!$M2
z36=$U2-l&({415Y)S(#3h}w3VC@a%x6Z!@b_n8abnsj;(O=2$+ZIK38r7zjhwwX3L
zc*eDSIYL3&6e>*`^7Pj{r8aq`6#R2OTcK3tbVBfOK`Xx(oADRqich|PKfNIn4Jx0c
zxirH$htN3i-vLG3lXyJU8cnz~q)UIN)zyr=`B(zjnRR)nd26)dG%=sPq2RCuuNeAr
zAvb*n*kW$_nvi$L^kn&6({FS4HM!ctW4%(UMp?HZ5fgE%tDywjF_DICgHVa0vMOnu
z?-y5a{rNW_9n0<`aK2S`?O>Tab3_)=_n$*wi^skVSVUllG+!cbMW~L)6?ylfv~#+4
zwhksQs)BQxAv0P!w^yoQs}%<aGenkirzf5zt(+)5Q*nmN-mI`L=<ucw-R~gE@}WCf
z@Pe$y3LXj6NU^RNkk&J*8k@sjHCn_OV<>--H!u_X{Y;J8URMLf^->KkdB&2;ZMDq5
E0cuX~00000

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-030.js b/js/src/jsapi-tests/binast/parser/tester/lexical-030.js
new file mode 100644
index 000000000000..f5fc09620f44
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-030.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-030.js
+   Corresponds To:     7.4.2-7-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-030";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var return = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var return = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-031.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-031.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..7430834e08b2cc23a5dd02dcfb08977b35171ad8
GIT binary patch
literal 6254
zcmds5OK%e~5Z>~BT#%4BaLN%>p->erutd-_s3}pXNK|n{Zq_7Ao!!WGnnwH+{ux|2
z^Dh{Cy=!N^Nt|>W9;awy`?F`}n{USU`FKQd%^zSC)Q)J}r)cP1@jUM&4yN8-vwhfk
z(doq_?D<tW$0s4<wXY96?=H;p&E?04hUkRgecU66A|A$(gbMUG^G?Gkn8o@DI9toG
zVk)7+zzd_0X8`8*%>YL{{2XE`;UYBDhi06HQNMN*w&^tL-RAqYUseD4RRv;Vb>#e3
z$T3Ak!kr;9w(x`t2tE&ch&*|^yJKUf*j4E@Uu}66mYpGLPdAUSrZ>L>_6EIq-1yKb
z%bVBX=!c!1PtR<}Y~GJQHs?oScemMXHEg?0LO62r7NEVu(@9JNW&>Wpk&W{a#f(8#
zcR1pB2-zl?hO_?*)3S~T(M#nDNEd>2GMPp?B=K!9ka0wL7c;)VLIrE0>vLSh1R;;g
z1VsB|;Rse}x`Q$I0Bb@)XAVGsG3~~!xNqAe)#DqawUya>VT9;Z+vN#u0l5bG1<54%
zGxuoNA85r?5+s1O^+u+XE&<ZP5oJrWFtDNx%y?hG3Ww7zNYM;Ak@)PhV57fZ(r<v*
zAj!w1AhAr2IBJoAdy7JXgZYuzTxt9Tr?C<!ACqz#4WUu^yoX1k39@Zp!<F{|u^m@3
z&<Y>Wcv66!5%7O(IRv4g-r!z&{5(R8mCVmBo$C4`n`sjFPQ3w&0s`G>+DV%%*b_5y
zixzg^&w<GnnROk|P+}6eOqK4!&2uHX%=&gs><+!Nodc4dA7R+C!ckmA^9@~eg<?LY
z(Mx*=r7T%OD1WQJXS{FRbHs6yd(Q!4`ymCcHNb$>aa-AaA;mR;>WKFSb%MqW%St?g
zd(d$HUCLbQP=#bDZ97erm3g!c4TA{y%uQ}h9=(C?upfzjNCT|Wki62inKn6i#<gxa
zLP5S1N=zE^^w&J4HhHDo`*S{9p+@BdLhx`w55FIq@fYNZPriUZy%80iDW9gfG{ZTE
z&^Ykl0YzMpc$|ogCR`fQrN2p8H6w4nk^pvQT^?%Q8m%}j%#+6x9JJy2Lf<OnrVjyI
z%uSyW^6p4Zmftn~Hg{i>t8F~dE2V0bbqx|R5!bmoV%Uy}G;9}yN>r0oN#lI6xP*Jp
zzX9o3Z|{Kfb-lHtWD?8~QiQ$o2s&9jsn~!;%yr1`CAwCG>Udm{aF0tnr)w|kVDh5!
zH>V3SqotF2rP8%pRd6svq&IhZ)LGKQiJFtBGF<Ow6?H*tmppC1hA7LYZMNXeSdA4t
y3#gG|K{Ft&hf_5+hrMdFh%?4e{_1XEGW*3$joMyU1I2|>4K8`Ol9Fxp%D(}LY3f!0

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-031.js b/js/src/jsapi-tests/binast/parser/tester/lexical-031.js
new file mode 100644
index 000000000000..53f0c399c8b5
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-031.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-031.js
+   Corresponds To:     7.4.2-8-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-031";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var return;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var return" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-032.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-032.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..daa962e4b9521b9b21242cef03fc1ccbd31478cb
GIT binary patch
literal 6260
zcmds5OK%e~5Z>}e2!w>hfm4p43Wb*tf^7s%gPIbBibTC|KyKDemO8tU?KI7izrjC)
z3upcXW3PAZtT&01F6D8GHnu-|X1@7mY@d%u1lRllMnP?##(j#0-UZL|4&z|zZ8zI{
zotK?nJi?w|m2-R&GG6;~*Yj?`EZ<yyfM|#g3Esgyf+*r)97(7^e>3kmjDlILAAqy5
z3@fG*Dh#|Z3V8-#Zr==W#KWTyQwbNLp*}R@G>rPStFTR{QSUb2xBaU6&#x*F6RRWV
zw?d97A`<Qdk+Fp*TtM(?*hA#uqo+@7%oMvSz2>VeFT%1DMD6M35!UqPH^4qeZyq#0
zbjtGPWjOj?=kcd!wqwrUkKfPFkHYS5v)gLecAJE7<m5F#dxxi!m<G%SJcA<}rz46P
zgRJgw#PJZaO)?E<{}-lZ9TB3J$`z0<1nXonjdV!j>tG<`i1IFGe1U}u)<oCmIEx8F
z9+e4*_Q%2ztk84^V{QZ1go4iOf&gRMjazZwwn?hTS4e9sv$w+t(W$n}6WRiD4e|?;
zN$?T(XxJZU#Z(d`fHw6;rjvdHq=O^MmS$mKMH`s$zJL`Dr(2Ms8FC`=*=NB<f4`((
z0k1)lk4ZsdnH+J{A_4ang#-ulBXNGE@h6<dN}zm9%4sx&M&Z*Q9*HK%wtWp(-T}mR
zT**Kyd_dz#0d_{f|FPu|go1j5d*$(SA2C)kKf83Q>x*orN!&a31}F*$bf;-2ZL(ln
z%*ZWT*nz(QCR=3IbwERjN#HV7x(heYmFP0-+a<9(^v-q;NP2#RVap0fak&L+157Z-
zm8}Y=WBkhAM2Sn56Uyc4@0kD?R~>Pp<m$7F*iJ}+ZVj*@_1#8xWk_*NpgQ8cL7kv6
z!?GBU;3_nnf1NUyIus%qP1{ZrWo0UDLeC&#K69B{lS*%(LF`AOCDH(^^dwu_Hq#~t
z&$yN@M<_^{LX}BFp8lGr)F!W#et*tqE0n36MhG4*XybQcGyZ~H@!@Cir#GUaIpxzd
zmu5KU5E=*mJD`X=5|0y|(S%Dwy7V`xtY+lRhZ4Zftjj~qTcZ`Hg?aLRf`c}^VCaj5
z-1Ht`i@E7bLf#$8$@06V-{$UXa<z>odZkp2vTi~mCgMg{M-1CBk%m17p%MjURnj=$
zEq=q*=ih*IEV(zq`7<Tg4wT6;M^q8{%6;f(@uXq{7LnH>#g|B15vt>HMb14a?VPS1
zt%J#nD&U+($c&cG>y@h4YK6hU43Xj7>1k(48z;(6BFu2fn-$ds-Cgp){TiYyAGq0q
zmt!?n@Hn7GiZ#uEw4P7Z*c|q%(IU<mL-`B5fywN5Gc{^^T@4i1N;SCT`AVv`)h_=6
DARX(v

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-032.js b/js/src/jsapi-tests/binast/parser/tester/lexical-032.js
new file mode 100644
index 000000000000..a4196950b8ba
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-032.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-032.js
+   Corresponds To:     7.4.2-9-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-032";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("delete = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "delete = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-033.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-033.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..079b441d7d92d9bda3abdc532708fa3a534cbf2c
GIT binary patch
literal 6252
zcmds5OK%e~5Z>~BT#%4BaLN%>p#bd(mI#^#H6;oaiOLbVSvN6tb|bITG=GJE1{co!
z3&vjW+F5TBC*6j}Dcacn?3wxIo3VX99#LHL2N(slBNp`;8hY0}&pU~Nskhf`A9h}K
zdeI1bepSx#DT#S)`pEO{!z|xievBAFClv4F9z_gs5`_{f(BH9lM#5kg>nGrBEyIeK
zgd%}QLc%iubNgn1LrzW!W)dz$Lw)F&GZOY|w_%%3quy<PZ2ML9pI=oVCRRtzZxN0e
zq7v>L(XoXmTtM*!=^^^;`Oc1wnPOL^*L=0*by#+em_6M*!kXUv4%i#?=5gawrz~&Y
zgrgsJUVPcL9kY2q{@9!!h27m|x7D!iHVNU#$vc4d0Z%6p3t}7a5{_(Kj2Mn%$m$M9
z91kJeB-3#Ae_>kI5v6*mTmk7qu}&t_NQWf83kJp<G2X>7UtpnvHPQ7sE@Og_M`Z$H
z{jqRFTxhz3F%JN1!a!#ZK!7ppMy;rC+a%TF8>F?B*?S~JY^v?@gtmZOgZzSIQhdri
zM*0J-m`Z{K(6-*lbkY?-Iyj<iX%+@nw1FA#3s~WBx&<kkAtw@_eHLu=_e=UM@ERof
zm=+|K$q`2_5^(Pkp*WZyiOrS9UvL^Lf$}jar_m4^g)e$|B$^=G_BCAj5D?o@B?GPS
z0gEOD*ck!;$Cg773hE8+mB-H`6vrj=v&*KszQ|^pM!hp{fWm-6cbaz6CJXk&jNGDy
z9r!LV*&?&90~$(90+*@MUATF!M3-6LZiwBXceZmt((^M6TUI!V%RN|2PAhLJoQ?5o
zdjlmbSw1LttG{QQZ(MW4X_9Nt0gCqt1FALP{Hfozvg<;MYXa2~?+xk{jbkhe@d&O#
z!}(V!bE!iSl99CSG*MQj(Khr8BHl9>xix9@4w}P$DB2+nuu4DjM%!lE<lq_CvgHT`
z=~AdLX~@%G^OV};l~V7|`D}#}mD2~o!v!t;eq_d9kSjX*3jXv)Of;r^n&#3B=Nv-g
zz<&o6aX;cwqA{9qX-Jp;CRNppy!l81*qL>CsCjF&;<PYN-cE4PhSv*ysgRpK25d1m
zeMQK-BRN@q*Yw-meNC>m@kFnbs!`T0NW?_k=ISWMc1)yUFF~k8F<F%~&i9Hdxc2-T
zkdEb6=tWj;?I4-_azqqSuRMW17EdZRU=eX0(tC-l6`?vFSLEB%($4AH$vT+4sQS%m
zg3M^?oL;GNtyUBq%n;elot|`-v~Z&2B%%zLyIDb9(Agyq+ixMt@?kq(@M5gS3LXX2
wNU@$7kk+%Q8k@sjHCn_OV<>-dH!x%Sy-bbTURMLfby5v3dA5>@ZMDk30r}48R{#J2

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-033.js b/js/src/jsapi-tests/binast/parser/tester/lexical-033.js
new file mode 100644
index 000000000000..f36daaff80d5
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-033.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-033.js
+   Corresponds To:     7.4.2-10.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-033";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("if = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "if = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-034.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-034.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..b3278d53d2172070ca4eb24cb0e59065c638ef6c
GIT binary patch
literal 6255
zcmds5O>Yx15Z&^PxF8{M;FKe%LIF`OXj?(kpr%BjB2mQ+xmh<cb#^1$X&Q-N!asux
zXZ{6a?}wfBX5*yWQaD8$+s~fyn>RD|#biwJjz7dG*g0g;fT59h!}Gl3D42P>t<FLB
zO}8J7vFF#-9G?;{cD_CKyazDLH<uqFM$j?Ed$>;#LxM!1f(rCE_fAO|%wzomoQ-8z
z5mQhk@JL8R24HUA3UDaM3BgRkg=nM?%>^UjVCODu(``0-t&bhQp8V(66A%-ttLC?f
zzzk6ZcZTT1!jmqb_?+|+eg5LrmW`QW*Ok}&WXqed><lq`x_N{(z4-&Muh5%E%}?E`
zym=dre$ajS<y!dh=hgX9+TCmQ+Rbu8ICAnHpnbrzX~Y6<173iT&GRwCoI_N11rm4!
z(WaP&v;PajvVkboOVtVp7m9T-nXGpR;`?AA7l?@-=Ay*Hg0R--xQGc-9upG~8%(4l
zc%kVI#ykY9DFdC^2LZ;c7qz2-ZIe=u?-15jWbcv?v6;5ZliC7u4e|?;N%4vB7#R$;
zVkQzKfj0F<<`rB5q=O@>mS$;SO&gf;zJL`Drz;833^|tg?6Y8_>o4hdz-tiX6Iu{h
zCPy5#NW#5GgyLZFO<Y}S{0*nE0w{kc)f5_1qwskjk7W^L+rEY?9|2+~s%4-xF=WxS
z06Qb#|5$QJLP5U4{p$F6h&Zp9pFK9y`9&4eH0qyvLlg!Ss?)TRHd(MMXXF-@R^YFJ
z$rhP)9?(#761Xf$-G!UyQgoI1?UvjfYG*qJ6g@w~uw{j#xX9vL3<<Ao*94njdxu0>
zvVchZo%}uLeWTBj$BFx%eZ=<&1Fki}fYfmtS-+6tnm`RC`ojiA6OL6T9z!2ATHH&S
zOC7S1x=Pzl6J=!{Z9>5yFMO_(Ta!ocpgJ6cvL4a^s}v;L+BVZB2hX_XEk`JbmqLk2
zuRQ%VPpM5_Dfa%J&sNA$If0NoEUDr5BJ=(wxuWB*;7@PNWMwL5X)Mig&f#ht`0s!s
z8zd3MBBKeHUg^@`IIWsDZ@!WMc4l23YS9|4IBhKA#}gcM;Q2y#6>8HbfGy{y&j@*U
z#3#$|ntq$RugTR8p6ZoKHL7ZZ<ekWNu7P-gkSoKsK&WIkS(P--jm0JOJ^uz|Rr%Ir
zm?NgV_u5k^W%0DOI2KJ{hX7w9Y()X#cw8BA&ni2oYccC!a#{XcPzIS!)lt1t?piG^
zIG7>hTR6SyEGgn-(urjm`n!2aEvfC|x9zuZ%j#{LmpmFLV+HR5$w;xH8Iab?X)?Be
ly~$`1XN;kI?`~jn`^hXBwY{DU6lcn0aLLP+(rl|({sW9|>G=Qv

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-034.js b/js/src/jsapi-tests/binast/parser/tester/lexical-034.js
new file mode 100644
index 000000000000..b160e3d030a5
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-034.js
@@ -0,0 +1,58 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          7.4.2-11-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-034";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("this = true");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "this = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-035.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-035.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..b5015535d3c6013bfb084d5cf5c3d7d0f8af230b
GIT binary patch
literal 6251
zcmds5O>Yx15Z&^PxF8{M;FKe%LIDaF6e?&M)RZVxB<dBpSvN5_yOHfQ$zS20!G$yb
zg0a`TcGjE3Nw?wS6m4ujd&Y0x%(y1TBZ~KH1B}A`6BhRw8V1*bAUKP|S#Z#7A9r4N
zdhrMcwW^v^qlAn7>BAtn2eWGS@>9eJI-~dy_b6gWkT_CMq50;)R}zKuSU&-0XBAe=
z6ch;q5)qLB*xNTl90_txFjH_58k$3M!AR8KzYW`T8uf1TW4l(>|JAA*#K!8V`7I(a
zLsY?CAUbyNqzfpXk{+T@pY6SJF;ncS@>)%Ac^#HrAm&cDkFcRPzXSFby?NUB)G5oG
zH{s~Vo#&rlx{letAAfAmkJ9dLv)gL8cH4yT<m4Sd`+#SYn1$R0yo4hg(-Fg*LsWMJ
z5_kyFrkIAa{|m#ijwm%t)d~m~icK)tMtTJCT`-Uf#6%Z!vBW|RYonWUT*d?`kJ<#p
z`eW$`UTC_9G4}y$!a!$^K!7pp#;v&T+N9Lu8-%qJ*#{&-Y-a2Vq_%)ugZzSIQhY7~
zM*0Jzm|B7)(5~6YcG49<dN`tNX_f|7jDZ>N3s~WCx+Ni+Atw@_eHLu=_e=UM@EQd9
zm=*+<%@I#6l5p=4p*UQ86WdFTzu+`Z0OjwboI*ot6rT3*NESh^?HjoA0U);HN(NdH
z0~SvTurmVwk0pmB6yzJ+E03Qii1U*9*<~}6UsN$o<KEX`fTEB>b(&VvHVY2qjNGE7
z75E-7*&(yZ0|rV?0+;F3UATEJMVFc1ZphuCc6MVx(eo6B9V<M=MaCFZ(Ur*n1jfbJ
zx{`&1_O||e&i7WABM*~wJx7Qi5(Z3b!0}VJ?PT3TifaSak?0NT6pcAnd3Xd}&~R}l
zWiR!}LFyu1J8hJ;S+on~g1qjzK5j!6y@T4YAIWOS0IXAvyfL=fHhFl)H*0x9L9`SK
zOnT+%uYF2m@>-Gi=X|zChRVr<<l&ME{xG)hUy>_6`vU$9MoiYFVwT3z9Opc)#)JPJ
zD6%~gaUwB>aOst<{7sUoee?Dk31DZ|<)Id>F^bc|B6&K&VH+MVOi!UUeFWHYZu*Fj
zcSmxv{I2P@z59k-ZR3eqsZ^t^CP?0iZ072S7YMmB>;(vw%q8oR#=EV!g0AP^fGj85
z+WhiFl($}a3}q~yR2D~~4eSx#D`c%G96XOJ<Lyal=kzUPJxpGf{T38Kwo^?^ua&vh
zO9~!l$mkYcFFGqqIGJ)1QHI`bUQm}*cFDW;TexNQuFaP`80)cuHvv6TtY;Ra^J=Qc
m7O+>37IDTJ%J=OSCU>99^r-7~Jy4t{_27zEE2Y>@sr(ynp6Lbv

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-035.js b/js/src/jsapi-tests/binast/parser/tester/lexical-035.js
new file mode 100644
index 000000000000..c061c60abad9
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-035.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-035.js
+   Correpsonds To:     7.4.2-12-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-035";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var while");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var while" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-036.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-036.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..5836694ee868559f4d00ebb8d6c62420f5e35786
GIT binary patch
literal 6256
zcmds5O>Yx15Z&^P;DCh0fm4p43I#;f18gH`8q}01R3xgz3AtG}S?cUYw$n5R{s{jJ
zE}Z!njJ@8qv)&|5x-B24Xk+`?GxO%n*ghYR2(I}9jDp%Bjr$Z0y=$K59mm1c+ikWF
zI<Gptc!WK_D(CnlWW4tEk>}lmS-!da2+<H76TF9e1X0ApIFe9-{$}237zMLfKLKZB
z8CFasR2X<+6!Hwf+`bv$h=(U3rV=hfLw#t*X&Ciuw_%%3quy<PX!}+5pI=oVCRRtz
zZ-pFFL?ql9B4Z0rxPajEu!qRA=P$Qy%oMvSz2>Veufwu4MD6M35!UqPcfh_vZyq&1
zcFOYRO*r~N=f&qO+c8(~#~)YcM`3rj*=;p!yG=qka`FzKy~oo@Oao>EUcix!^AW|2
zK~{G-;&=$zCYgq_{|nQyjtJ39<qAj_f^{;PMmi+%T`-VwM0po8zQ95SYohCOT*L$+
zkIDo@`(xn<R%p6|F%JN1LP2NtL4Yys#;v$-+a%TF8>F?B*}Gwc=v3R~32gzn2Kfca
zB>04TH0%$wVk!v|K%06a(@B>A>EMX6rCAtQ(FSI`FJOhk=@z7DhMY)z_F1se-!JL6
zz-y4?V^WY<CPy5#NWi^AA;H1?NL*cM`~|165-1;&avBYxQTV)vN1_R`ZC}Hc4*{_q
zS2EBFAJBMGfSnQWe{4Afp`hO2UU~dHM2wZp&n}(n`XZZY68BEM0g3_w-D%oMn=IHB
zGjfX-cHrB<WQ)wY4rnMb30$U1cj4x_5?y9}yCHUm-r3FpNzYF(Y+2zbF82jAVYsqW
z;dG2&+gm7U$udGYT>U-ce&eDe&XZhx_7U3)DUhuJ7Nnlr$Sw>it_f5}yf>&5G-g<q
z;t^bghVw5|=2C|;Bx7mYX`-x5q)q4;M8s#Va%&RlEwqRINHjzmV3m$!N84uF<lq_C
z!sQ4B2~(&sX~@%G^OV};m6Gqz`D}$El~V}8!v#(JUTnr+kSjj^0{-+yRJ5jin&#3B
z=Nv-gz<&o6aYN#9qB5FrX-Jp;CUw<}y!lK5*qL>CsCjF&;<PYNUQck)hW877t&p2O
z25d1meMiW<BRN@q*Yw-meNC>m@kFnbs!`TGNW?_k=jw=IJ0{YwEf6YEPF5w2^UdNC
zE<XPTq+`JquU$sLwZmjG%n?(>z48QlSv;xOfJM}GNbn`XR)p$!T#<24OFO4)H|t>X
zqWU+d4KkypvwEf4wOUzlFhk@wcY4-Y(!`0PlgKh$@Ma}-L2s8lZoh#j%g1fD;MG`-
z6+8^6kzz$NAg!lUH8zL6YP5(m#!&w9ZeTL|%}kBjURMLfl~N5ZdAgFCZ8gik0onrU
A8~^|S

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-036.js b/js/src/jsapi-tests/binast/parser/tester/lexical-036.js
new file mode 100644
index 000000000000..6b0c3e9edc2a
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-036.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-036.js
+   Corresponds To:     7.4.2-13-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-036";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("else = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "else = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-037.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-037.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..ff6c26bf64799bfc29ef046af0103552d987b619
GIT binary patch
literal 6246
zcmds5O>Yx15Z&^PxF8{M;FKe%LZOHQf)GK|pr%BjB2ll%&AN%f*^O+cY5ofT3@)7c
z7mU5$wX@zNPPz>rr)XpQ*)#Lz&Db?D8B<)Z4KWJq$1EN&GzzW-L2w#}vtYl~IqJUZ
z_Tw=QYE?C-MhO>n{xAsc!K|9S`~)$APANXXeTo<oB#snRXuf&yl|<n@)=$9MS%nod
z1x3PuL_}l&_V%q1M}nLY%oJRNM&{65FcJ;ww_%%Zv(amP?9{6Izgks;*jQaPzfA;Y
zh$^^qL?;fObOFT|q>t#+XU|`{m??Hud99|mybjCG5p$>8N7&Gt-vN7z-aKi3>Xzlr
zn{f1_?%wAYu4A_E#~<7CqqMu%>b0A$-8LaSIe7=rKH%9jW+8V0FX71M#h78vA*;Ir
z2|R*qQ%u9z|AlGUK$M!LY6YYV#U`0-BR!J%E*QuKVxot+SYn}uwb9KvE@Og}M{NRP
zgNbwmFEri5nEQY=WuP;MAi$XQ;&wc6ZBpv-4bs}l?0pg;HZyhwQd>Z-L4H9pDLxYc
zBZHw)Of5kYXxD6HJLw7_JseTCG)n_3#=wmC1+4Hm-I5f|kQ0f|J_|Pb`z8Grcny+#
zLJJbh=7^^jNx1ijP#i9f#P&+#FF1{pK>3)I(`ZPI!WVr!mQ9dr`v$Ij0EnHql7Uvl
zkj2vi?2Lf_W6L241@#8^%j4%U;=E*j_SnqS7u8JDxc@a6q9~-$ou-|%&4PV7Be!U2
z2fhbPcF1h%fPs>ez-7907jB*_(Ph@R8*+E(o!uNz^z6Z~V}+-<$ch17bcIB(U39G~
zSu$u}>%ZqbZ{2a^QIb2)A>s#w0neIn_|$1T*<B&UwSgK)^oI?KCLF6OJcc{aXz@MD
zUg}YSR2W@5ZIrb+v<uCG4EEeDZbJ^egU)ae$zI3+tkaCVF}B$@d3eURW_dzEt`y2k
z8uIklKBX~vt-SklK3k(c<-|eqa7q7u5Zm#W<cd$ffIovVlU=EprMWc6IgikI@ZSSP
zUXDbZ2#g_I8q$@&NlCRMZ@-WLc4l23YS9{_IBhJFhZ7uj;OWBLDAcBp09(#YpAhoy
zNKTgDHT|}C-;k>vJT)toYLs;ak};82xd!6cjfpa>3PL3-$-1QRzEoVno#)?x^sKc~
zW0P9zM#v_YC!7p<<uP=ycv^7*i&*QC+bcA!2-WkrGTEM#c23_O*2CmwrEft8WJk*+
z^jc+Wy^7#rhD>eY^_a7wf0OklQDnH*&8z8>wk~<nehX1nPuhIRTd^K1cn;7b#bRbb
rIuE9LYyo@qXc1?uq5PHI!sPBtnI3h$t_O;Xq#j)HV5Q{R>63p0pSI?%

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-037.js b/js/src/jsapi-tests/binast/parser/tester/lexical-037.js
new file mode 100644
index 000000000000..d42c13170aee
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-037.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-037.js
+   Corresponds To:     7.4.2-14-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-028";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var in;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var in" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-038.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-038.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..a490d4fc7b2a0a911f741538856a303b4d7405fe
GIT binary patch
literal 6260
zcmds5O>Yx15Z&^P5C{p01E(B86$%K15Nso88q}01R3z$!19G!&V(RQhUZ-h}{0;sY
zTsZSD7<;{IXT3?BbXz`7(Z=?(XXeeDv3))sQC#x}7zMR`7WEk#dY3%UJB)&<x7}>-
zbzXIP(Fl8fRnGA#iFxhoeb2iEvwU;;0b&FlQoMtE6fwj}6iTQ-f5+Z234>XzpMbNm
z3@c(1iUb}B3C{q`?VAA(IXNPjNw^RV^`T?VNZ7Akhiy8IdbjzZ?N`-*epP{(SRFaP
zML1@NO1Kk5#}=M&0mY}Jhv?%c&tBS?DRxzQ%~xAqhGi#++0)G<tm)0~fPI19JZOCE
zl;zE<aP+;-)6dUs$6UN0e_Wg&h27m|x7D!iHVNU#$s2(79#1C`3t}7a432D^ju?((
z$m$M991kJeB-3#Ae_>kI5v6*mTmk7qu}&t_NQWf82?oX-G2X>7UtpnvHPQ7s&SHX)
zM`Z$H{jqRFTxhz3F?RuL!a!$sL4YyqMy;rC+a%TF8>F?B+1n&UY^v?@gtmZOgZzSI
zQhdZcM*0J-m`Z{K(5BwVbkaFMIyj<iX%+@nw1FA#3s~WBx&<kkAtw@_eHLu=_e=UU
z@ERofm=+|K$q`2_5^(Pjp*WZyiHj?Zzu+`h0_9^;PNN|-3ZM4yNHjsV?Q6L59w4@(
zN(Nft0~SpRurmVwk1dBF6x18sE03T1D2_|!XO~TNeUZ&Hje5u40EGdC?lkSBO%`m6
z8M#FZJMfplWQ)wY4rnMb30$U1cj4x_5?y9}yCQan-r3FpNzYF(Y+2zbE_YxppN?>J
zRN1O<HpZ{*O_aD~IiXyx{+<bdan%tgO0GV;DBd9q=+*!mQr~T4SB4bV1gaz68`LQp
z$5<BQ5nP3a^RH9pQinn$qiNe|qO44%P3Rd!%x5lhYf|YgG>H9Bv_u+Um7Ziv+h*G2
z;2GD_<p>2SQ>Zd&$kSi*l-lH#((ljtY=ttF(+I)C1#SFJWX4~RD?0oF{`5vnG^c!;
z=F$x3975y3e+LwCN8(YUGn#N|NSFR5mDP;A`A`DbnRR)nd26)dv@lQJPjJwN7Yu!|
zkefaLY%w=|Nyxh+Iaz+!^xNEhO|G`_M6Z;pQPxdJ#6;Za>L|u`Or&8iK&V7PS(P--
zcZ+kl`urP^jwSatIDe+(+JQ1T=7=gHUwH`qES^+sz#{TGr1%nPD?)WVuE@DZrJd8Y
zqjfNOQ3agS2$|8+dA(BgTCFfRm?1KpJ3Z|zY2!rMNrV|Ld9$Lrpu0;RxZgmO<pX!T
z;N@726+8~8kz!3VAg$+9H8zL6YP5(m#!&tOZ(zpuyO|oby{-m|Yo!`o@_Z##+iI78
E1L@7|2mk;8

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-038.js b/js/src/jsapi-tests/binast/parser/tester/lexical-038.js
new file mode 100644
index 000000000000..abcb85790bad
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-038.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-038.js
+   Corresponds To:     7.4.2-15-n.js
+   ECMA Section:       7.4.2
+
+   Description:
+   The following tokens are ECMAScript keywords and may not be used as
+   identifiers in ECMAScript programs.
+
+   Syntax
+
+   Keyword :: one of
+   break          for         new         var
+   continue       function    return      void
+   delete         if          this        while
+   else           in          typeof      with
+
+   This test verifies that the keyword cannot be used as an identifier.
+   Functioinal tests of the keyword may be found in the section corresponding
+   to the function of the keyword.
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+
+*/
+var SECTION = "lexical-038";
+var VERSION = "JS1_4";
+var TITLE   = "Keywords";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("typeof = true;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "typeof = true" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-039.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-039.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..dfc706264557637de7d73d1fc86684715e547538
GIT binary patch
literal 6253
zcmds5&u`N(6wdgKxF8{M;M5~%LftejK&W6{(K=OSqSda*O}sYXCY9r^D}M_A83)9f
z|AJ@7iQPDDoh~asPE~6Av)_B)``)u%Hk}aMa7P&VjZ+#8DH=OB9LE_%{@giicTak+
zdR{caj$0RVToS~r@%6FeJb+oQzWfZ)01XH}!X7~su^<Wsl&`*H=SvX!i&#GaXJ;K&
zL<LmfJ3$z*3_#z$?c<OI=K-byE<|H>=$O$U95(L4HoaD}-~P~b>+(OhE<tpxo|xYW
z7^a8_xC=z41|D|-!Iy!D$n(8}mnLS4T^C++<(4;L*#)BJbo~e$dh<JAZ_%4)t&hE`
zym=dre$w0j^ulz^_Wk%{dw%40_uKtW%d}f3L<vr+RESN?EBLZ?IiWa?A+dW5F+7HZ
z6J*2L|Am>^M1-iNVg+Oj!7870JJsRE%%VKL4<3sdqO6Z&w!%UQtD~!PT*U;gkkSN1
zhg0r|xX^S9V;%z5jDpl0g9c;Tk2=xNv`GlaH^^)wxetR7(YdnA;qn5C4GIjZN$@#y
zXfPZp(UdC0fp*nKx|6N}(!vo{t1~ySrVPw@U%(2B)2+zT3^`Hx?6Y8_zhBkwfY%_&
zr=%dUbdFfc5r=z^0)qYJk=R~!`~{~m5-1;&YI+T>QTWos6W#}zwr}9dM}XLkY8hya
zjc7D0z|IKxKXx6QP*88MR~<i3Q5;vy&pw^2`Xc&i5_w;o5ej_*4Qkp<>nu3rGjfYo
zHsJ@rWP{AA4k#!-30x*icj4x_5?y6|yTx~h_Swt<LC-T7HmtA|7oKC#NZ0nzz<X`t
zOI^v*L3&&Mz2JN8qQei9TzrmEd=yY%S__V!x@{-BFr>ITP!ln4)FfycV^N1Ea1k0W
zzf9>%EozVmq-m#)Qkq4(&@S+BFI?p|WYIh54TmA`h7>@VcI1t+O}ELyGqzRB5(=`V
zP+-!Kr@#6smC2<t@6Y+HM1{)91Lxt24*n?8<Il+z4L*ZEoeAZADVwLcw7@xw&{*)_
z0_7eYh((FSD8i*7UHh99RXy_hGYMd4*5#p=tx<~8!7O<_!G0IsFVvkvZ2APS`P}p!
zA@7dlWcgjwZ+-U-x!T1uwNj`?RhJ+h6MmU%q8OVo5r*x9Q1Mz)mNeGaifg#_{2P##
z)t1L7t+r;2bb6HltUZM;7SC!XU=eREvU`oH6`@)lm#5pa%Fb!q$6A=Ys`xGGf%Isp
zlrB}c%GCr5Gk9_{s|TGm9UQMXi6+C<Zc$HHG<M0$_FIUuc-f9uJQ>Tef+qnvQY>d0
rr15Sl$Cj{Hjuvr78_HkXHO$z2Et8|B*X2NQnUsTT9<7968=dlRD1+$Z

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-039.js b/js/src/jsapi-tests/binast/parser/tester/lexical-039.js
new file mode 100644
index 000000000000..01e4407b32ab
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-039.js
@@ -0,0 +1,46 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-039
+   Corresponds To:     7.5-2-n.js
+   ECMA Section:       7.5 Identifiers
+   Description:        Identifiers are of unlimited length
+   - can contain letters, a decimal digit, _, or $
+   - the first character cannot be a decimal digit
+   - identifiers are case sensitive
+
+   Author:             christine@netscape.com
+   Date:               11 september 1997
+*/
+var SECTION = "lexical-039";
+var VERSION = "JS1_4";
+var TITLE   = "Identifiers";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var 0abc;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var 0abc" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-040.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-040.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..fd39cc1f252e5610d90e799b96fe785fa68aa89f
GIT binary patch
literal 6253
zcmds5&u`N(6wdgKxF8{M;M5~%Lfynp5Gq(#v`$r-XtgVH6R!<(lge?|l|P05j057#
zf5Efk#BQ9nPM4J*rz*Am+3&sYeec;Wn@$LBxFd}G#wm@46pfu*j^hj>f9@Q%yC=QZ
zJujMI$E}MwE(v1R`1;gw9>FYEUw(#YfCdB~VUHk+SP+E*%2(g9a}k98BGym9*;$7b
zQ2`bBP7nqx1JJi``#5C5d4Q>a3(;5|I%YHohmHHNO|RALw?B5>y8O?rOAsBaC+2qo
zhAAQf?h=uyfyZ4y@KxX;@^bHB&%{iz>%wcU-10UoyF}ESt{-7TZ+-{tEqe2;^{H2t
zH}AsHPkQ^G4@}2w-;Y1G=SOaLzuoV&OuKbLl;EUFh1kTrhA&%J6N=*)61&F`!(&J|
zK{lNIUznLqM2K1{RzSuOtnx{>QypH+EXw1D;IWt?%KA8FD=d_-I=VW?bxhz2DNR6h
zIOUFr3r)8$<}qN+C`ipQXfUSzs1prMn}mRTgUmLP`!EO*oh!Q>E-#?ipunJ-1fMg9
z2E&mOO{qd0Xjg5dJLv`>EgVs`I&%YS%D{~G1+1_*-HI&DkQ0^9J_|Pb`&IoOcny+#
zN(vH7=ZK{oakvjCAlP3XiS1R#UvL^Df$}k_rq|#ag|9q3;eC*4`v$Ij0*KwHmVwsT
zh(@yl?2Lf_W7ok61@#7d)$#Kb#c{>_?9;ibFQT6&k$2&YQ0NnAP}62wXTc$#kz2H~
z34aAlHpr~%fP&(az-6*@7jB*_(N)&BJA8L&pUoT)^gM%M!wO4r;W-A4bZs9Eyf-Gk
z)Rin9q_^eY3%=JbI{Yxn#pf8sM*#(<wcz-v+jg=GLyD^dH4*bhO@gK|7Ik<67oqX;
z%ap#<q6UdTns(|arCGEK?E(+?!c}fV7QKhwa2WD#NCA{-N8T#ibek+ZV_UT>p&(ld
z1ttx7`m3K(nOrLK{+!QBRH&Rha2~Gc;Ey6b{+wLV;0yTEnNZ%BvU!?I3!JkEjRpTL
zP#(a6Sd>VNB3v5MwZBPG)g!MzlK^&RT^?%L8l^ZL%#zm=?04b)Lft9Erq2MI&rRPE
z^6p4Zmftn~)_32Kt6e-(D}`!QbqV4z;g`84im@3JVc0$h6|W^_Nn?GjxPe>GzX54k
zZF!8+YHP+wr&kHU+H>e)@vLS77V*|1yVs~%5vt{JdAhx*?3}iJtcA&|ir<nRNRO6E
z=~9KOTurbrgC{q$deB+Z!SRZdXfj;w7WH&RW0$;azk?`?m+g4Pld&8tcoL8!#d4-W
r8t<lZYzceiXc1?$q5QR7!;H<>GC68`T@DnNNjbRY(Mkxm(JB81e@*D!

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-040.js b/js/src/jsapi-tests/binast/parser/tester/lexical-040.js
new file mode 100644
index 000000000000..346345579623
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-040.js
@@ -0,0 +1,46 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-040.js
+   Corresponds To:     7.5-2.js
+   ECMA Section:       7.5 Identifiers
+   Description:        Identifiers are of unlimited length
+   - can contain letters, a decimal digit, _, or $
+   - the first character cannot be a decimal digit
+   - identifiers are case sensitive
+
+   Author:             christine@netscape.com
+   Date:               11 september 1997
+*/
+var SECTION = "lexical-040";
+var VERSION = "JS1_4";
+var TITLE   = "Identifiers";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var 1abc;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var 1abc" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-041.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-041.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..57264e20375fcc7abebb470b315ba9b4ea819bc2
GIT binary patch
literal 7088
zcmeHM&2AGh5Z>~S5E2q6IOPbcP^jPpOVl<EYETFjiF!ruuA3}%b|bITB(K7|@E{-|
z&b$R<?~k3>NxbPcfaodOc>UQkp6?satjk72f@^LcBfoY;qaH;A=bGa<Cy_sO_M7c@
zomU+%8e+$-ig#QR#H{x9k>lKlw_J7lF`@xFA@~4$1X09-C=^h>e2$&7AoORkege+c
zDy)bKsK9rEFkm@=x_r~eAq!3eOa)ws26EFeqe0lK-G*g4je58Fq3u@F|J-T{qGEN#
z`>lXsiim(aM`Wbo-2*&=CxM5^v*#~&bj%F9D!k^VOJ0X*=ZNaBt6Nypo8JL@gWf!D
zeC(9v&0DbbM*aQXr@z9HKQ`yco3K>3*=;qJM?`_3lw62)%nJl%V=|;Tj)B=7h8P|I
z<3zOK{C^`g>xd9JRm=d&5G)C$M!wv<c+*7WyWp{yA<DWqW=kwIP+RWfA|`N&Oie(v
zH{y<njiy@|^8m2M6tw0LL>SX<)QWn#O+rDw0JSxC?*}2GQ)!pO^#vpwBp76q;8W(%
zpx2kGnaU6c+LjBcM{o&{7LF)ep1FY)X<#1rhN!UE-4d4O$cfD7kA{WhF<m75xMf!i
zs$~iFia{x*{|5%Gc`^D1l+mPf9;=*dCcnr)nj8^BYEo6!GNE(0w<sXkU#w-DyI}s>
zoF93X#}f|^c`2dWzJ@Cw0%AL=<e(MSr_tDeolE$}F76wSPdpi7ue|s?LUCMje0J$n
zrbtnelE^!A`Y7}X)OcAvsz$*+e`9Xa(mM79D1s&m<)r8`Z-_TI5ugIqIUvIG*hEQ7
zap4?;TC}o@PQ2GTeyS@u9a3+nf6w?{=@oF7CcT406dwc>BCP@2&(3Tsuemc^6{wDw
z*RK;aim|xK4xyJYSlo|Lr&`?N_|~v)r;1WIinigx&5wJg8?t5;?Ll?b3wb>u0g7Dc
z-$>h3n=CwIo3$*V770vt<k_#fOKGwsu{f~h<>jCAS%C~ytOh=a)br=T6`gzr8aYGC
zD?2vLxHJ=U7Dr<d{}w2BU_&fQBt`~YcBCtRlccJiyxM65?A*F}s6}(6;<PYJ8j#p;
zLkmz=<zmstfX&~{Du;P@Bs-g5HG5W9Uo%$Qcr0fM)hMftz|VxYL+U6t2%Io%2ZV~}
zlA=LlT~=H|-{9YXw9K~rjIwO2^F|G?0)Uk#aEry`iVkRsTMKrtP&E^(<#svUo|d*x
zp0O6C8P%5-CNE2V3+_Pb3X;-=5?8UDU||L)H?wMquDHSRjFV_Gl*qGsy5wS)d>q<^
zQ|4brGL1E=N1S|-F*McE5wo17gB()(^pK7%h~9M66f?@ueA%vG#(KXw9o4;_4w%zq
OI=G@~B?Mc$DgOqosrrWi

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-041.js b/js/src/jsapi-tests/binast/parser/tester/lexical-041.js
new file mode 100644
index 000000000000..9687c7adc472
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-041.js
@@ -0,0 +1,48 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-041.js
+   Corresponds To:     7.5-8-n.js
+   ECMA Section:       7.5 Identifiers
+   Description:        Identifiers are of unlimited length
+   - can contain letters, a decimal digit, _, or $
+   - the first character cannot be a decimal digit
+   - identifiers are case sensitive
+
+   Author:             christine@netscape.com
+   Date:               11 september 1997
+*/
+var SECTION = "lexical-041";
+var VERSION = "ECMA_1";
+var TITLE   = "Identifiers";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var @abc;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var @abc" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-042.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-042.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..47f879d5daebdd7c53c0be93ff95dd359160a195
GIT binary patch
literal 7085
zcmeHM+iue^7|u8&goMNuT=fz(p>AVWP%2ngv`$r-XxT0D8m~3DN#(d}`zkyNZ^8xQ
znz!J$<HT;AwoaFg)2^!2@n`?1??0r%M?;FMl|Dv(^@xQ%h6dg>&+|?~f9mZuT8Hfy
z?QS^4UZpJGsZbK}>eok}cOTxWnA?vLBj|+UecYvpAx^?TLizeR@;;NmpT+tCI2)_5
zLMEYz?~#D;6u>;b;p2dlQ-Ya<3(!DcI^v83z3Oc^rd_Xf8t+<_vih%5Rv;!;TfW~U
z95X~E+!>-H3-2D_Q9L1CM4xT#?%0?Kc3EnzqK>={+s+WPUpKF?rZ&F;_9bfbxc<If
zls0d|)eqa-A9roVT)rN^U!ER?+?__JS-0gj9U_NM>QIPm%ya0nJ{d9`MG)9+jyN7b
zz)5Gr>HnFLSwocSt#SuM48=O0OgZ)C<(pY?d>1qpam08BM|_Ed3f4r|_c)ITf+3X%
zi1kK75mBb-4#GSDtT6+sIRFmEtP?iFo-LCkkS`F~R&ei;0I{i-%M<hhj13G7tV!`H
z_ZaE*HEAjq5<r{!AX7;f0O_EJqS;vpSkeNfexKnL4!2tpr73dE^66v7LE22`aX%s1
zRRmR&e0mi@Dy0912>SEuqFWH1kS0eoBQ=>U>zL35+*?E__7`*6<<*xz;WkzZnzu<Y
z)w;;?c+$l~(Mi~{uc69^fY=I4DQJoJSvbzXPAU9ftlNb{;mHtpi}TMT6h#I5XNOI7
zij*BG4ZEMcJ_>vaEnd=&nqIIc-k968w2j>XPqv)7m=s-Pg?K|43>r{72Bdp_fMrVx
zM{>CXd!ZFAZSOpPX~Qd8Nuxn2Tm3zwdSg-`?h;Q94p6jD7&uxTZl9QJBki~oTob5<
zc(-4pXcS>t$PQtWFjzc|Ft<7sapG#&meWMZ?L?bUZwqVB%tF?5qBqc7^#ajOXn;KR
z{3|V+DU*X{T$7d~)FOUKOrHFjx6~r*7?uWG-d+Aao#jYS`C8!p(6qmBuJGg&gpoI7
zqOs%CB$j4;&cQSe{_lVyNP~wl!)S*~OuF(n&Z(y5%{e1rr_#+sE!v|Qr-^wye#CwY
z27tOLmxn$EZ1HZ=ILxafzS;b#$+LO-n!eh?W4%+dMp07)VG}V8si7!?;G|$%KvW`?
z<aHY7uHpj527d>nW3m;BRLRy38`HZS@r2DwPoRdy<B|=S<+cvNy@J%TP#v!;qU~v6
z_jIjd9YkK1`xcZyrnPiL=gM38Qi6jRBDT5HKy*a`ClXFf$<Wx%(&>`AF8(s~8mufn
zizF1ANgh%BIVNMIrdG1qOf3pX>$`(mTj0HFHOps=rTM1az>Mr^vs$&at`@Shq*`1t
LvXXpl70SN=&ae2H

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-042.js b/js/src/jsapi-tests/binast/parser/tester/lexical-042.js
new file mode 100644
index 000000000000..0defe9708958
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-042.js
@@ -0,0 +1,49 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-042.js
+   Corresponds To:     7.5-9-n.js
+   ECMA Section:       7.5 Identifiers
+   Description:        Identifiers are of unlimited length
+   - can contain letters, a decimal digit, _, or $
+   - the first character cannot be a decimal digit
+   - identifiers are case sensitive
+
+   Author:             christine@netscape.com
+   Date:               11 september 1997
+*/
+var SECTION = "lexical-042";
+var VERSION = "JS1_4";
+var TITLE   = "Identifiers";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("var 123;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "var 123" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-047.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-047.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..483ce6f420cb1da7077a22bf97bcdeab264f2ae7
GIT binary patch
literal 7567
zcmeHM&2Aev5Z?6v7bx0Wdm-FQ0-<mM1SpWM4b-xNI1tpJ5^^d~&=M^%rk4Vjifj}C
z@*I7XK1NP0dg!@t(HSmxNsH?>C2!QC?P;+~@+0T(o8fG#7jwb((;1_a{U=IJ6+KJd
zNRs4OPA-yzqrv0hgW*`tS(5IWIjP{e-hcT;l6(lWQh)hVsyICs?2wHGRaA4C8K{YS
z&y!Q0O)g{o0XVm=!;;EC@kzont}6h4`=bfVG(X`?8Mus|xkKk#@oc*PE^IUGbw@|v
z4bolvE#0*sKGx98?{m!*6$b7(6^j55RUp_oA5-zw-TPmMm?ieE(OPP^d=r*Erz)K8
zA7Mjn{s!1v)aKLP_rtcd`8FK=@$lY{_d~^OUyr|UPmd_~=xEgMg>w525$Tif1KNpH
zL`XT$L&O_svUfgLEYBgVhni}32H|F0jaA=k<FZSIa7)b!h!??JH2G3SL@`R3YpV2!
z<+?#a3+to1bKFD(<VPz4RnrA3BCi!aLYPkgYpH-}9svV0HIjWf4P`R)@iWAA5ZVVk
zqw2!Rl_0qQUjzRFX9{+r6UC=9N12v`5UAre@|E-&AR`pfHaDYy#0gmWeT`Q{oUS28
zE98RXtJj*1{`s8#4rmR6d?9KA%lDB;GD5hAlnXYw+7jE#jeo*vf&f~zNjsGWauhos
zvpH5lq3j!|@-sjjNK%0kJyUX7gIzh`zp>^(hk|^=#_jp%6Po8O`{zhqxcp+OX(7j_
z$&6+b0p)2~O8Z`LfHPJWHJ0GN0wp1I8zuNJfU~8*K$;)RMFy31b65-@uPQz+Yj9Xr
z>8<i`tH2Ey#3f9pbJPI%maTEB-Fz#p)G}=r0&n5&aLWj_V&eD}<n_QruOU<a4_Vs(
z=7m&blKd1bj}`lEVgrNhk-Hy+e&9P|B=pAsU4o{2<X#PG8B80Xf8@|R9df5#aEz^=
z+J)Q!$fCF*ojtPifRL%wL`%Z6j1@Pgop0LR5~X<20BNbKG(z<(a<^|2zZZk3#XD3l
zMZ1Mf2GH=x?dL}{KjaFsWDgjnVlo3tV67n%dl9H7WHa?v)f*|#<sYa^^?245bdfW2
z>6k;$=j`gfk-s#e;5KC390O~o%npP!s_s(C+%OY-3m4&OhF3oau+H6U&&jr?W@1b9
z2qiaFQ>Dqvr+-Q(@><#R@6*{D<@id9M?Y+6R~$;;{^(rt_!-1qGFNyB*B4dr`TC16
zO@#kPpu7hM(y~Yv&f!XvUi)ljA;7MrTZQta^_dIBD&G4{UuLedDmI&b4)bts*)m;K
zM{%;%UCVcW_YHk@z?N>MVU4yrK4=r{Ty<&ALYo-D`ao1z4_+dw2y;jGQ2w)3US!?$
zB`9C;jFDr-=xI)tT+et$D8V|7Rd<BYe7@&J?uGt9Zo_S!ElCJi=h6|La1G(rp++7T
zBk@ja=WNPAzAhs~Zpw>Slv(}`F51`1Y3rqn2r)43byQ>93grvoQ|(QP#2>)QSlyTO
zTT3i?@l&m)HEKudna&O(WbpUM8w;8QcI*nzwxf0a<PEL1Ha*Nd{G(t;LyOpf`s`{4
NuW9TXo(~G_zW^MFl|cXi

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-047.js b/js/src/jsapi-tests/binast/parser/tester/lexical-047.js
new file mode 100644
index 000000000000..7fa084bd3fc9
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-047.js
@@ -0,0 +1,50 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-047.js
+   Corresponds To:     7.8.1-7-n.js
+   ECMA Section:       7.8.1
+   Description:
+   Author:             christine@netscape.com
+   Date:               15 september 1997
+*/
+
+var SECTION = "lexical-047";
+var VERSION = "JS1_4";
+var TITLE   = "for loops";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var counter = 0;
+  eval("for ( counter = 0\n"
+       + "counter <= 1\n"
+       + "counter++ )\n"
+       + "{\n"
+       + "result += \":  got to inner loop\";\n"
+       + "}\n");
+
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "line breaks within a for expression" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-048.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-048.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..5db347b431af79b0b2aba67c99009649ac9c0eb2
GIT binary patch
literal 6779
zcmdT}&2Aev5Z?4RO?xQNOVJaNT#^cf6Cj5oT^opH6;U9lMkM4^prChYi7~YlNGh_C
zHz|-)-lA`kQ_p>e9y+ABOM1DoDS4x|Cu7Cs$C-~a-^{F2wU{$<kWLBC4~_+&2s}$Z
zN|NM+=NHLgfB1a#WR&qaNzy&@PRgiM2khG<`4Zkr{p~NYp!kH5Ba$&Ju%f&$P`P`S
z$r&y3%UFK`&aLaPxG+#OPiR3^1>hgw&q<-^DJ8<d6?o>1mP*iKa_~7EGwOB6{a=RZ
zp8YM|vmid!$h<$GiU`aM+-uAh0iLFSk#m}1_QS)+KZckk_MTxawMTvo+g@W4zV4f_
zC7bU7dxvbk?7bMZ#pb7A`t#AF-yVm=?4HNJcgLgld)yxndZFKbKt#sm_Zn?V(2E5l
z67f^?bfNeRvN1y=GNT!1yg>az5}^|`Jn{xq_s-{nNC~hbg%z1WKAKo0)$fgo+r^Bz
zt!4)#6eBL(d>SIs{0pE!DlF8PNOgsW7S>01cHG1TEuhu~EG7$0glu#@!kMoDYbij9
zo`FOYG3En434Jp9@;fAcko$+Uz~aLBm1y+=K?i{bQDx**C4x?-PE)N&X`qff$S3Io
zKt>SJws>m?k#n$$`-Z59u<nW^u8>znpn7aL=)W)ep8;!-<O|l2SbmH|s+ETO8B<2`
z^*6D*;`tX?6C_amPTFZjv__HhjLe%=cnd1O0mLCk6(~|u!I$kSe4UHP7H@}5i4G{J
zHzaE>K98}KEyw3rT)6sT+HJ<Ovt){koI(Fu_S$|F9O^e}o38B9-vO?MZlg#418{bf
z7+U5tz9^ve4kf`SWC(Rt(5!6IVOzypU1GOT5LYlA=b8bCE!*Q%r};+JdYLvGflu`5
zFouMzn7Z;7mV+ybRN-UTd&&j6k1X?OA3gl(PWh1TqetaKr-L4#H+NPg0Co1!-6v?m
z6{3ZtIYAnQaX!EMAT-n7!kWwRS@h>lP2uVp#Ah{Hl6(lmowPqc!}5p<NcbL*Q(cPT
z1eKiFo~Ajr%&WJmIk2?PH>itMHtjOJki_&)bC_>u>t|$tYees0;wt3JN7*?0JJ99@
z*}r8_KZTxtQs^$$0c_Gn?mORnpCXuv?KUEzAbA@LLwV)pU*AgS@<u}N?{T(4XHiot
z9fwy;UPs)&e;r)><Q4Fl%!QsO)J2tiK7SEc6A}LrD7V2N#aD{w0<OH$YyYmAbKi1b
zg#f$qt`4<sk9KQ?F(B%)a+L+%9Qqx+r{66<57p^dSyn%_eD+V@GFFFV>2?~`Xlr=Y
zccO>zE|w&`6XVzbgi4pTOKnQTbw`hbA7EPje?UeS|9e0_qXj`Hg5WcWmQ+n?fv~CN
zpqRGZ39rwOyvVb3JfQn9n2;q30h>ZPA`-3<ye8C0b9E**H8R$7pMVHEV@H!nsC85L
znl{Tf)@A!fHEpwU5#ff;dlmJK&N}5g;mh+)n#5n>mcIf+O8IRR7P<NdLc>=cyV9(5
zc2PqHU&_6;VBWE7Ya-jOHpP>-RF4l2Q-&W$?P_=<cA>et+Qn<WQ5u~O8ti`nR8N)q

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-048.js b/js/src/jsapi-tests/binast/parser/tester/lexical-048.js
new file mode 100644
index 000000000000..788c3240ec90
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-048.js
@@ -0,0 +1,44 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-048.js
+   Corresponds To:     7.8.1-1.js
+   ECMA Section:       7.8.1 Rules of Automatic Semicolon Insertion
+   Description:
+   Author:             christine@netscape.com
+   Date:               15 september 1997
+*/
+
+var SECTION = "lexical-048";
+var VERSION = "JS1_4";
+var TITLE   = "The Rules of Automatic Semicolon Insertion";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var counter = 0;
+  eval( "for ( counter = 0;\ncounter <= 1\ncounter++ ) {\nresult += \": got inside for loop\")");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "line breaks within a for expression" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-049.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-049.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..53d2a5856246e0912b2898833835b739ee172a49
GIT binary patch
literal 7602
zcmeHMPmdcl6rWQ5gAjrnT&!|wiO{xEFD==Xy4j$nibB;yJs~0Qj5jgsj3e7=c2)63
zxbiLd9KDnaXTAdmo*mEFJD#0&veSSBr_qe<pZ)&*-t(KTS}qtl=*|ev4xS1=6?mS!
zl_beA&(4#>!RX2O;W*_Bl63dXoGznM9sK%bl6(ZSy8iO#SWtY-$Pq~y7Fbc98>q~^
z%jA^i*+r~B0O!V4SX>w=nk6)+ss!-2A7ms~^n?;&;Bq{7hn7mve0uO6Y%}inCWG%s
z-97uQyJtastg)Ftq>2d44BQLMmI0nt0V8KL#q68A_aB6q1@@lNTGwuQ6PCTeBAo6Y
zVM}ek2J9Vb^LhW-xGinI14n-{zW3w(P%*pL<6pbeqn3Lzm<;=&+`dCZ`sCLdZAQ?u
zB_k5?6ZB}Q_#C1!MPo9jDQ7%KgIp4!12o+78mjJ}Ed-GgV8;q8GKY9HzDUaNwSn8i
zjJc&|1q2i$F5G-IM1=VVpaQ9|P!l3mgM=2=M|bDAjtH7Stq535ms%0BR`dvAJ_W3m
z049126ivj05BW5d$?(fB5comtAJQC)b0=4#*#`(62pUM0krR~&I-NOAwIrp1I&LFh
zNpAo$LJ@6~w-yjN0ZYHH@rsDkH3V^qyiNk;Yt2Uge$syzv<5-GWHo{1`$!~PX}Iq&
zWhA@Y61z*Df5K^k0IJ%gol-<|6gf-DqMn7fQ03=<IO3=TMQSGas$GV!>LRkl+hI|n
z9SZUdN!#<!r&!9C{c|GDU4Aj;Hsk4OGQ)YspnffCZQlzH^^D4*#v1*1pd=05MveX(
z;Or<cG|i`cnM3IvQi89L5#&`t)1pX+Wu@M#6uSk3xP<9+t~CI@Wow*rH~&zTTBglH
z;BCD-Tth;wn7r}|@_JyRH;}3Shb-)W{X!}-Nqz>FKj8x1Mm8|eKDzs1=m)+dMnZoA
z&;@9BAKm-52DXT%E#N<P@SP62(=NCUu9xjXeg%;0>IQZ8(XEGQ$`zuyq!~fl0*v#;
zt(JA9#rU~F3`<^x70Tzjn)Hq0w`(-&`W<rix+6of5%ff){rniqBPt+I_JLDME;FDA
z)*33YSAlv;HdAku?UUkM{(*W}rL!KxOG(VNV*zcU`Q@!8e`!R?ZRof;3N}uf9SCZz
zx(i8j%UtjXuENt?U;Z4xCbzGBC)<Xai7nD2l-yKL6(%p9{wbZv8|BY`PG=hw<dr0^
z{ji~7am0Q5Yv<y}KSA6j3!$&!>bwj-Uw;v%iSYjjl=tC4im%g!bGX8!S3a9r2(U}(
zs!+bPK67cY*6%~2E;3h97n@DLfO&du(N(RgV|}vfuEo2*`<A{sA}hDjutr-wA8ixe
zyXs*{LYo-DhCo!hBD_FU5$2BWqWov;yvWK)mkNyL1RV>4PbFGWHKRGgrcNN`Eg>|Y
z?|G4XX@5Ys;XY4RC<Lr?=?G7_g7E54Baf>i@lI>!Y|22sE+a&4%8QqjS^f?#+BeE+
zo282gF?8IksMfX>$``_?+UpdFKY*2Wd0)_PEwRY;f47?Es2!<iIy<N#gC9)ZSkNZ0
oW0!cg9j)^xZ>ZYb^e|=kPr;6c7O?~M+0_nS(b_jW9~9Vs1DDaFr2qf`

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-049.js b/js/src/jsapi-tests/binast/parser/tester/lexical-049.js
new file mode 100644
index 000000000000..ea2483fd8fb1
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-049.js
@@ -0,0 +1,49 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-049
+   Corresponds To:     7.8.1-1.js
+   ECMA Section:       7.8.1 Rules of Automatic Semicolon Insertioin
+   Description:
+   Author:             christine@netscape.com
+   Date:               15 september 1997
+*/
+var SECTION = "lexical-049";
+var VERSION = "JS1_4";
+var TITLE   = "The Rules of Automatic Semicolon Insertion";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var counter = 0;
+  eval("for ( counter = 0\n"
+       + "counter <= 1;\n"
+       + "counter++ )\n"
+       + "{\n"
+       + "result += \": got inside for loop\";\n"
+       + "}\n");
+
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "line breaks within a for expression" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-050.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-050.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..38c0cbdcfdefdad1ccbf659d1cf6cfe938e78830
GIT binary patch
literal 6284
zcmdT|%We}f6rJ)$Y><#xu$m=Rh0+IXP^f6rpr(pKMWSwzJL4t>XB^p1(+cq+@Mo-8
z^9^jcc4lH{JV~5(8ekP=Y#-m}x%av%hXaatt38b3-DA$W9QA`+K@gm>_%hgUw2s=Z
z+YuY!pjy#;s+0)1`|W8EJc3<S`}hgs1f5cRfFp`Hl7uB1DmMQ`@R=m>G}ceRSzCm~
zxP~HeKoTM+0QU8b7$=gP5zIAQg8D{iAvsC9yZ7OmcD>eVyl+)2>9=Yn1+lT(dViBh
z%n{Xa=ZFp+JY@okFGz&wi_KS?E@p;Z(N?RbSKfwW=ZL%8Z4s_$%^!fhLTjGXKeWrT
z=3Nl|sJ->^rE8eg+wu46?5OnaG&;??tG68xo-w%&X!Q%!hqM+UI}7)QlJy}Oqp*$p
zBw~~$VIvWktNe6tyoROg7Xyxk0NA!f689k;btvM=_rkobAxh0reFE}{Vv}vQ6+E*1
zAy`02#AOEyIY+}3)<!pSTt@}PpQ#FncZbRlqEK}YWgY|8hyxKF0z+foVNKR`b<*_m
z9rE5u{e6-kerfay6!`$313v?&QhX)@PP#oqsVPS(pbc}8ZKNB3^e{x(+^rN0je?W7
zFNg{c>E`6{1bJKoCVvYq`u92i9#{>Md`Jrt%Z?FGvQlvG5TQ7p?TOXZ&R-ynlR$Z&
zl+%eQj=~oa9u%|i6-@aA5L+yqfQGWi*{EEG&)dSY!&_lbq5=x)4UWo-&toJ+$?@6Y
zm!`hxZkw{`bI?OcOrd?vT5UTD_SKHup}8&k4n(pO%%%<)D76VpmX_|q%X1~V%=&gm
z-44yQoBx_FPhi>6!joK7j(rKY!tL;DxZ~odypreR^z)SMtuaUmGaic$kvJe6BCQVM
zXJ%WQj1w8I4OBxi>eVP33asn!0LG;L>`}`;>QRHVBV9dhl%=C+1KI`U?x{iVicz!&
zy<s;|-H-uTrX6`>bhCBxu#9ij@`QqHDI}Q8<=L+-rBQjQ%=>#bTcSec=t0HdoDTkg
z+5T6-#ZEtgJ%a&PeW|?6a%n2&JY3@u{~jn0Kp@G+6k`G|bLqn0ag%3z-hM;@?1^@H
zs99$W<211xzpdc71+N=srqGu@18lW7du7O*qqzOdq_A(lVyw3C$eh%yQPvQoe4>WA
z8WPy`iB@bIh)UIxWrN0hthj-x=l_5#r`p=_<%y`g9zKUQ7LP*L>qUX<k=_evtq9dq
zT$OL@rOD~r$a<(eulmhsf^2V@oL;JOEmssg)KJ+iy<T({v~a5Aj7b^hnQ20u)7gz5
zzTbkE^~1NA^P-%t6}$<gE5&?fK|0T>>Dr9wO;?Lz##+kH?G~nRpUcu!*Xrp)ah*&T
M7ra_&#&%leKW%dI#Q*>R

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-050.js b/js/src/jsapi-tests/binast/parser/tester/lexical-050.js
new file mode 100644
index 000000000000..d0079468a916
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-050.js
@@ -0,0 +1,45 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-050.js
+   Corresponds to:     7.8.2-1-n.js
+   ECMA Section:       7.8.2 Examples of Automatic Semicolon Insertion
+   Description:        compare some specific examples of the automatic
+   insertion rules in the EMCA specification.
+   Author:             christine@netscape.com
+   Date:               15 september 1997
+*/
+
+var SECTION = "lexical-050";
+var VERSION = "JS1_4";
+var TITLE   = "Examples of Automatic Semicolon Insertion";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("{ 1 2 } 3");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "{ 1 2 } 3" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-051.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-051.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..fa840f33e0af9c2ca316c15c9a39b9a7cc395288
GIT binary patch
literal 6321
zcmdT|&2AGh5MKWOE=WimI9Z&i3M!S#rA;f^G>D)oAQJV8++8;@b=HyX(B@Tm7~X>u
zXP$uzV`n#Z)|<pB+W@C1Yx}cj=9_QEuBqXGk-b`v;AHQE;9Y_H(e)^bPIxkk4w|iZ
z?d^8V2PCR(m^n2@rP}-UIEo&?teU(07z>I|7&#;{!vZVHQv;RQ|1vtGX)=xV18}Y_
z!s5a}(IlcNRTBVr`({E?MNcUa1}?>YduXWyO}l${V4HTM-f6yX)i$zkwT%qK#cG@R
zM^q7knSuL)+0et&E@0$>#+bc$`D)Y0%&|9&*J|08H(=QpEd1&25iaS??|{8RZyq;3
zwyW~yEjaqS_U5N8-!ZHA<FD2EQQO^Vc8(gp-7X;lIk^UCjSJj|w3djUqWz)beMrU_
zwMn1GobePjQ%Qu*Pk+Zh@O0y1Ac&Lz+g4bSKBS|eBAI+I&D%O=%q}%6AfFhq+2(p7
zAj|K82c*J6b%<1REX-hCbbF3JF+uBRW&#%7p>~8UH9f$Xhk$i1K#1OgLKD&9N4)FX
zWaQ;5<h_^r2Q<ZEWbKNy_<){+K7*z*a;hRhyFDwZnMP@#b-R)4q$_|7a75MGtqnxh
zzzOe5SP^i#IXOH*9@l`$-;#~~ea*iOUV|hbvXaDdIT9#V8tx6Ij3l!ovAWv%6HenL
zP%$RebRt@#$VE&B<tls$S3Uy77Dp3Mq<Vs%SF7+vUj%k|E9^-$p`hN7xH^7*z*1Js
z&yE<``eM3m#^bZ7htq^X`<l1fE(;FyjKZS1E&4Gq*(0;90~Sh80+(f_yL9tHiLSD~
z-PF57bM5E9k;@SbdsYOB%X3(J$_09cchJfGH8j>Ow7!d;Zlf+&NO45dlnBH)A3WXh
zkB~`EQL?koQ{i!LO8UIxo6}n?52*k$Ho(H%v)3j!jvUtos$&)R>I@GhF{OF{H>v*Y
z+nBpFpiG%q`*yl0OA~D!IttB*sk`7MiM9{zV>i_elLc6&W7)N~xi$rOCbX~xLP0{6
zYET~X{MS9DHF>Gz{ChrIqKFj~MDuV?lYhwF_-k_Ulh5GKXdra!sz!M(O>r(DGy(h%
zK)DMCQhcmJmT-AU7ygd>KsWO4I}2b>tSdszT4NRGh^X=N3rSk=0AjBlX45Btt>@+s
z5k+^Dcc}R(+}$t9)fPFoD~)PYbx+bU(f7SNmc);VF>DKjN|&2uNfUhYxPpt({{b0T
zko9w!Q;_{IxeN=$)Nx18pw}hm$OkN=Za{)B5VkVZz~kzSTdVAxq1|qP$@A*pj5f%P
zmd)y=YS(gQA;1is-zw<YXF(IEi_Tb<;nFiLsdIX}@$2|&h_ZPdmvf$-v$2wggKVT+
u(Huzc?KK;l!QO1Nj5E$q@pA8AO8-qQ8}+@O4U|{PY;eKTmeFjlS^f<*g#Vua

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-051.js b/js/src/jsapi-tests/binast/parser/tester/lexical-051.js
new file mode 100644
index 000000000000..1fec695d642f
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-051.js
@@ -0,0 +1,45 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-051.js
+   Corresponds to:     7.8.2-3-n.js
+   ECMA Section:       7.8.2 Examples of Automatic Semicolon Insertion
+   Description:        compare some specific examples of the automatic
+   insertion rules in the EMCA specification.
+   Author:             christine@netscape.com
+   Date:               15 september 1997
+*/
+
+var SECTION = "lexical-051";
+var VERSION = "JS1_4";
+var TITLE   = "Examples of Automatic Semicolon Insertion";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("for (a; b\n) result += \": got to inner loop\";")
+    } catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "for (a; b\n)" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-052.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-052.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..02ce208c76af3d0eead046fe47aa23d7891667b3
GIT binary patch
literal 7315
zcmdT}&5qkP5LVjsFYTc~Pwh#^20^e%(OwF7fvnd-yx6)yY~&hnC9bW6mJE{4u8)0<
zJW(E?m!5jgGvv}CMT=vRvMERFv?oKR_>nX7&CExtCzlIGk9#vp(&MMRm~t|YK8d2}
zqDWWK$#8Tw{&k!b3mWx~^gBJ433>eI4^i|Dyw$_gpA(*u3r0_A!U!iaD{>8$+Gi2H
z%JOs*>mR_mwF|4@8Y)YpEYD;GfR`VpG?&?BM!AN|$=q&QNS@`><1b*D@t{8${xRwu
zng4o61_Wb`_50_Uq?|Af_nNS!gZDMyF?yXPgx!De%TF%m8v96lt!I|}6sEl<+<hHy
zVNY-V4cG_t=JUa`aaZ2_47PqYe)!^N*D;6p<NL$;QQ18iPR<9e-Ix%8oV*KYgKIK}
zv=(u389!ReVh+ie#A7<ol7ba^Jj?~<DnH#7Kfu$2>jkGm0PI*2N#~G`nu@gg-<!96
z!kC?^XFxtNYO@V{At1}Y0uKmDxSUWSw^(RkF}mHyhnS%1r!j%>=~6jDcufy5=3BtJ
z;!ud5K!v7!Qk)l4*Ct(F-ay_vseh8?gs-e!kt#k=&!Ij;O=a{_Mm(F&Y)LgWN&(%o
z3t=bS0Azq8x~|>Iz}OmC@!rFVfZc7$;R?Cz0o9{tq5po({~WvqNxo#B#KIg2ELIBc
zG07NBn<H_!-uVu8<0Mc$Cfz6zRio&2LKprjyoW2l1H@4gSD>++@#3o63Saj{pu#(#
zCQ*cfenXS)`1zCw(J?<Kd}aHKR@<ydUPUvKrwrulT54k!oTxWyleS9qw>~o4K475~
z<H2R7b$b`@yhY!EHGf|{Ugn9P|MeniYQTm=(Afmgs(sg|;yHaHlUbjUrJ%YGF5s9l
zZ$9easR2DeJJPLV7^QU-??Jm(1lc%f?HR>Kpv|VaQX>|ijU4#R+J<ck@Jwje2!sN*
zdJ}wG=&i}EnE&y7)}lkSOV85+$6t}FxOfTvj22w!Lb<9^sb!P{_#Y79FJVKnDD{IS
zTs^dn&!x!1JI9w8fL&QvhiICk%qlU?sVwg{XgY%11*_@xqHrZrst2T?DYC#X|JJ*}
ztMAFx5xufAb=BzV5TatD4pV(1utjFi+OQKSRJWCPu^|EB4wm&daO(JfKn6<b@4@*h
z-f+(qb1IiSkKw8<<B-{Gg=lEvgToZKf?`4ZBgjg66}x~wA_v5ON15}X25wj7?cL7y
z87eFTOy1TFjnG+}z5d0~vN_(WleKFS0cNOdm#uGD)|wAr600i-xY=#Ia>mvNY;2df
z#Bi+z*-L1cjv(9fT=W;%tysEIGwWF0oHx}n!c7M3iomog*{kY{3%9209!K_WSgj({
zRnt@arf}`=nyDM!84NqY3t(qMBpMQb$H7P0TWS-a&89Xf|9(QmsqO&-u%wbcjd}%B
zM89;a`aH6ZEv5{XRv%$2H|U%f5GMVBOO#)Znrey}_No{&=D8X)BYs(hAf2x(W~`xU
ino(b?LPPcIJA^6RTXQq&7JD<`m+NM5$K|!3VgCX=nLr8v

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-052.js b/js/src/jsapi-tests/binast/parser/tester/lexical-052.js
new file mode 100644
index 000000000000..b134b9743095
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-052.js
@@ -0,0 +1,47 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-052.js
+   Corresponds to:     7.8.2-4-n.js
+   ECMA Section:       7.8.2 Examples of Automatic Semicolon Insertion
+   Description:        compare some specific examples of the automatic
+   insertion rules in the EMCA specification.
+   Author:             christine@netscape.com
+   Date:               15 september 1997
+*/
+
+var SECTION = "lexical-052";
+var VERSION = "JS1_4";
+var TITLE   = "Examples of Automatic Semicolon Insertion";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  MyFunction();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "calling return indirectly" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+function MyFunction() {
+  var s = "return";
+  eval(s);
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-053.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-053.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..10394859b5cf6c6e27b63f679536519ccf1d4d6e
GIT binary patch
literal 6943
zcmdT}O^@3)5LKFfq%8sj=&3ysIc2dZHbI(8;24O#F5+O}2DOoEKucVk4J{fZon7C0
z?oa4H>nZ2_hFmhFD3L45HoZ}d?#YlSK5`ys-ptS)wOTUL?aT?zx~~ME3A{+YN|I#C
zvvtxNj$V$Rj#IuQN$13T(_vJqZt`=I{0Lul{OPZ;pm@s2DM=X?SW%uEsLVaf<Sos!
zt61*==hiMPE({dS5}H$00r<-gGm<NMPKhvZIbOI;OC@MN>wX8zj0gS6@Q+dF#J=mC
zSP&m;Y`#CEiU`aM+&j!x0iLFSkxQCl_UpqZk3-B7`^2!;u}j{DY45NIKlitAO*a1n
z>;tm-dhqACEjGV_t-l;Udh=UI%;9<bcsL%l-IL+uY!KS*J4B>U9s%0m5-%XECF1Ak
z`AYEx1Y?TEWI<ETc#ej-Btpk$xZ-CpJ-A#7A|=3%6;@;c;b>fuRPP((wvQQeQ_T#B
zCq`Vf`7A_4`S-wpR9L79k!p*D7S>01`}iCaw0>F>u$Zkh5wg+r2xIO6)`b8edI1Ve
z#Dt&mS!k1ymwzGdgV68M9E-KHE79TudJg&wn##zzN(7zFoupcg(m=;<A)ll#02x6<
z+uE%SM9#p<?;E@#Vs~3&xI!*+K=s(L(EnfazXjGH$XBc(uzVkh6e|t)JEn|en@{3!
zx$^_;CJ3PVnY2@hXpJJ5DOonF@HMFX2@ppdRiH@C1;1!l;p<#PR(J=jNwh;jz9DIQ
z{`m?^*|L95#M<Q-Q*ASzzD?#h&lr@iWvT6ZK~H~Co3yn={|AI#YyFiH-Q@uXr9B=f
zv#Gmr@#m1$XSvQ}4q%@|^2|lIZ&QS>>dj#{yA)3!rN=oVINw;T->NG7a(4Oaqd3EE
z5Hr)gm;oxQ(=92e|F%F$t)6SM82VbfDs*C@*(SIC4a0$cM`ohOFqfXA2N-qH^ymk|
zBtb=@L&wk1{ikTg6;hzDdO()-?fq~kHeJ<;wXc1C{q9<CyLf(q<tY^)U;{9;Jg?A)
zeV{&8>AcVIN)i*5OX$8An>%=aYGeqK&`uv^Z*e*XWzvpuv&AX47>XcyTi&X>lF$5&
zldU}ppPG>95ZTfgo^n4qY3Jh8zaWf~rO@q;T9>hO#pfc9Mz6cW|07WD0E*&;7=^)9
zKjPrI=pFo%_tgWiE9>f0H_dU1b4FBgWk<3RT$;I7)hzl8VC!$o%d0va&0S5o3xD-%
z`s#>WxS2*Z+Ul+Kndm!$K9&s!Yz*sxQ0c6*uhT?#t6!j*z8R2_c^NL6P1M8nE#zah
z5;=k!WRoD-It(P=-y&DgUVt7zw?r;b2-xJv5#hc==9*9=x2xmtsI`4=%R4@o5hicT
zh8v0^e+3ugdllgOC5Z?#bhN9ei^ClyolZf8NJHCvRbaPNdd2@M3{Lqj%r8Z^QBGv>
zr$)oolO1W+H#?{ygWG#MrhUxoy1chu$6?=Y@N_%c<X_%U{VK`Bgc`ekgKI~_6S4!%
QIo1yDxJWf>AC%dj05u5DBme*a

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-053.js b/js/src/jsapi-tests/binast/parser/tester/lexical-053.js
new file mode 100644
index 000000000000..8739afbadada
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-053.js
@@ -0,0 +1,45 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-053.js
+   Corresponds to:     7.8.2-7-n.js
+   ECMA Section:       7.8.2 Examples of Automatic Semicolon Insertion
+   Description:        compare some specific examples of the automatic
+   insertion rules in the EMCA specification.
+   Author:             christine@netscape.com
+   Date:               15 september 1997
+*/
+
+var SECTION = "lexical-053";
+var VERSION = "JS1_4";
+var TITLE   = "Examples of Automatic Semicolon Insertion";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  a = true
+    b = false
+
+    eval('if (a > b)\nelse result += ": got to else statement"');
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "calling return indirectly" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-054.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-054.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..142d4f35c604634dec18f9fcb4536e533cf7b326
GIT binary patch
literal 7538
zcmds6O^+ir5cTr8zyT!01ulJKM=LZS!3AXlJDH%(Y7|x^+ADIpJ&9ST9of##%s)Z=
z4}J_M&fK_jp~~rQJKavlne7?v>?umS{p>2&dsVLPne|Gres95O)_<ntT+t<Yix4uC
z*%dh%jh{}wpQLidNblIb(-T~q{+C}6@)5k%^QS+jiqn~3rz{mzQNv|!p)&VhlNUVC
zwz2*OoO}DQq_R*vBRuD(0`Qj~Wh^)RoHJ$Na=LVz)<*Gs-hUsKnG6Th(a+=Faq+Bo
zT!8pk6Z`%dH%w7s;a*a)Zs4H{1iR!Z6<>Y*-M3B568qSCtye7hHcWd-Rr7U!3)l4K
zUx0m!-h4j%Wzv;5--WF|oqY4_YvITLZqJWs_jEKp8@2~TWK13b+VGMtfz~>a=gH%>
zkxL+BnoQV|r&7o~8ReQO<Y#lmSBTi*<w`NF0d``jVN0N+4MkQx5At?Eg>X~t4B(Ss
zj%_|IB3S+bct9Jf%#>-<Vqt*yZXd5=0_taB0#)-hIzk6ck1*yFz`9T%L{C7WnVQNo
zId9rz<>e3HeS`WZJg4f)*+o!%K+i#+K~n`gH$?II!bxhOQ3&+VE#x1;4M0XXqHFC&
z0~2Rp759Oth}c~Vhb!bw4ygVH7JB_P|2^;;kbEry#PVY#Qmhc}C&~rOcAv!U<<5U#
zHw^;S&!n451T~6Xrfd~f;cK|^Q$QTcqykOMLdlD66~69^$O`WkYZ447$TuwQE<T@8
ztvim-sk(Cc#a7!wrZ32X=9z%<wJf#$C^*44YLi+^^glt8P?feybe9Jl6h=I_tVrF#
z#UDdfpXZpz9Ka!o<dI{yZ&QS>;^wHEU5clVGKK`Jcv=?gFrl)ce7*kbPj?pGA(zY!
zatS(d>;8g1BIMs6s=Ln{=b*F;2azA&Tn7abuFr}Zsdhxr{Tp>q?PAbnRs9ZxKLbiM
zqr?_zGZ;pbx3n{|r1=cy@$=*XP5Q~~=tCwnOVZ>~5^#7?+0@BbJob;nZ^YonHvgYc
zeaaQ&x*?cSir&3O%=$nBYSP6((6we(z*o?yS?+H3_){a*nl*juqa2*a9>RqMkACYc
z?wn}H*3A)4ZYy!>q2zo1&iU+s8o4GFNRgHv!m0G@7z{2s`weJBRtj&%=Bnh<R?I~l
z4X(Q<{v%NC1B#IwxoMKAe#DLcn`@?j^1gZic4b|C>aICXan6|8baz=chW@JSYS=|T
z2W)(|>~q%L5xxMIyYN@PW~`3cg_~(rqpLOyo(Z;-22=+Q*c#Rcp~Ad!XwXDAHg2Hr
zayKBm&%A!DMWSN_BoE+H%`TGNtn`5+sJ=(yLez-dE^_avvwgPZoC8g6%Y-`$B7X(P
z?}M&uhb4%JlS8JPsQ&Vvat_naMxdd)vMsJHRo><^-0yJ8AH)1oaD!5!H{ZSj9m--P
ztZl_0LN-3~6k`};-sRkT>fKMhr{1N^d+HU&#nT<EC`LoE=nd7olOCpSeiSH1o2OX}
RgmZB*xTiO7vqGaB{~s;_ie&%*

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-054.js b/js/src/jsapi-tests/binast/parser/tester/lexical-054.js
new file mode 100644
index 000000000000..1b6e995c361d
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/lexical-054.js
@@ -0,0 +1,46 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          lexical-054.js
+   Corresponds to:     7.8.2-7-n.js
+   ECMA Section:       7.8.2 Examples of Automatic Semicolon Insertion
+   Description:        compare some specific examples of the automatic
+   insertion rules in the EMCA specification.
+   Author:             christine@netscape.com
+   Date:               15 september 1997
+*/
+
+var SECTION = "lexical-054";
+var VERSION = "JS1_4";
+var TITLE   = "Examples of Automatic Semicolon Insertion";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  a=0;
+  b=1;
+  c=2;
+  d=3;
+  eval("if (a > b)\nelse c = d");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "if (a > b)\nelse c = d" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/match-001.binjs b/js/src/jsapi-tests/binast/parser/tester/match-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..075236aa2fd129bbe9720356786f53abaf21b32f
GIT binary patch
literal 21482
zcmeHPOLN>r5Eg_-cvFxQ2k;?>m=xalkvO524YA`;rh)@mlM7I;@oKVGEbnef+EiRA
zuJ9lDBUJG#xWb)+V~Sru_h_^;yED?Z9^QDdQmHtWM&I=GbbsB`Gg31e4t(Bf9&qNi
zz7G1`fE_t6I*zm7caNQo?VT^%pSC;w0e6}W(WdEpVbuEg8^?JQS~c~@AF#k<`#!(T
zJ3b3o<n?<3%2mII&Y{<H$FcqfoEN5H^#cLrxsKQKq7i`J{kF?{k@wK!fq?6=BPDbg
z1zxY)dKJ29Z*A^w-`i<6<h5o)g6LRn(f+O%@qqaP?lJR+2HyLKCz>{nSkyWA<jR%h
zrAMKOo%GQV+H1<L&%xu5SztETMJcG&KLLA&T79r}zg?A9Ujfm#Hov;Hw_<8$_KN&>
zc8Yu%y4u~|y}M<OTek?JaV`K_+;nLW^rL=sJm5>hOfM}2yvv^q78cEpN+@{i$spii
z2yWkwSj3OO9fb)(Px89eZ#S9mt4GBX9k|4mx9Ni?c=>BE@GxRQw9CUNV}ue`M^|!`
z83OXB90CivLsUd)9Xeq!Zv)mX*S*iXAloJjxrJQ>sXPO3N6#6f<Q?cd@H(kP2JPX`
z`OnLcAhOJ=sb*cRM2meLkd{|g*REb$zkcINHY9Ci&u&^rMtj(?tL0V@uw!K?v5EV_
z+|?|LDcOPX7#vL0MT%Bs0GaU8(XVr1(icE2VA5as{e9+7H|%3@CuGJk!;T+I>>3?z
zz#@p&J?Ej%x@sQ6IPhbG)iq^N@-iy9tF9($EMU4QU}JTyQ4Jb0*y`Hq8vfO!w#i2`
z<rEL6oAO^E5vD6+lRz}(N#)yyaeAQ6pojhZQh5(U2l(E7y8NSZr^=lS)At7UQIVUy
z19)+~Vf!7IR~2+FmW><#fX84gEaGfPY0GL3O86QgSu*ef<d_o63L;G*L?V-*Ojj$@
z)3wTw)+<B0UK!Gj%8)Ec-5KQD4<M43&1fXwuFQaMS57(KUMS1APk{`K`5^KLCO6B~
z&}7AV($#8638h-EhD#92wyrya6mSD{VVGRbMU9|<+fQo>0JADf0lxqSnrD%e3!h{A
zmBdJd>bNG<^YRePlFAk1U}@n*x$AIuhP@8%ALv^Nhy?Zj0c<TCh3WefdRAFweeHM9
zg;8H4bb!wUqTFguYff2lO#q9ky^7#avUrVFS~7(4d9NECl!ii9gFPbtq%_i7fF$bO
zJltbgv@;Q<U+MF(;rBa-s``r_nY|bG>_f*v+Z>|~RUcGP=uA9UEnLt+TnjH<NPYu)
zhpHRa#IcNQ>Ozz(Z-V-bI?smJV}V}s#1^n82zz|6FX!`zkrQ~`1GOy|TU84Od|7og
zrscB=nIo;dw4iinTgMa0C(XrekVNUQKDn?cH<L^uZO8;+r_q}YmMHLf5O{GZjiGG7
z1bL~Xce@`cIuKb#fBzBhL=J4rffGf?PO`VId&tDL7?}!+^+p_Snl0&q6QGde1v97H
zj$osE&<;stj9Ll!SuuAamC7l3)|@A1G|@wHS?@{N!+eE@W*r{1^D-w87m0j^Y*2>>
zai(Xq!E5s~qB?P7VR0!X>$Kq#IEa|X7NhGrI7F?}7aTICJTapGacuakjtzBeNKRy6
z)@D62Id@BkBsL6&8E47#+>Q_%FpH$5(sghcEsbJzwUA=xbL9{RhfFIX1cy8QK&=>J
zNH`9S1y*M`aN*Qtda+8k(SnDHe*^6s>#<3!>W*s5;+?rj)Q2*0016}=*~}>D%Jx#f
z(v+}>HTCp$nH0aN1lI*7@B?xVY4F7ef*=8*cA9fcq?NP8)S<r>W~~;?aRDVMJ|<<+
z(VWZ4#Rbykl-eU<_?Z)sn3XPN?yB)QC`lQvq(-Tn92@adUN!y*^i@}llh<g<a7K#B
z&Ie?h_SQ^YyikE5;gaO1&M7(6x%eFo@+7E_C?@jQ4>Tz^0@gX?MT+Kx@l_w$@&}8;
z<E!gFr?KusGJuriUS8JyUVrNnoMx2TBpi|aOnU}BEyjS<JU&6e-5q!xQoR--c2^dl
zok&4s&SW2kXlfK$r-(fZ5uWGp^}c6!Rwd_)Ge5yB;1aRQ-7|gQ1hSpBrJECuS~np`
zmbDzoDHS22*xV)WIg?-Cvm8;I*A+v3&O|q|6G-ogSy`Qn(^68RI_q;LQ%<!InK{l#
z%&F0xh5$9c)#9x1l;nRY8KthHx?GGOH_<gxmy1UqV?gewoJ1oy8X*PJCxL)SasY{`
zL)Ycvx?Ftb3$Z7VPo4lIF{i3iR5K4sQUIO#a;UQ|7snqwBgCQVBb&X<CTG$%vBk^b
zb-B1M7mrG}I#=i==2_HgZS^nh+k&$Y;S>)aBV0<sKEAxk2GKCE7V-Z8-Mx!N-gwE}
znqDK84YNKhCYz+bGA8dMlNp~=l=pDyJ@G9&?J47Pf!b3O$FRrlj2)kncWf&K?V*X&
zV)9M~t!uE8FIvi5DIb`VchhR#8gBew71re~%e%7i?u+>MB4`vHC7J2e*|FCJ{sV#|
B9Mu2-

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/match-001.js b/js/src/jsapi-tests/binast/parser/tester/match-001.js
new file mode 100644
index 000000000000..ab6082a1a7fd
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/match-001.js
@@ -0,0 +1,106 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          String/match-001.js
+ *  ECMA Section:       15.6.4.9
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+
+/*
+ *  String.match( regexp )
+ *
+ *  If regexp is not an object of type RegExp, it is replaced with result
+ *  of the expression new RegExp(regexp). Let string denote the result of
+ *  converting the this value to a string.  If regexp.global is false,
+ *  return the result obtained by invoking RegExp.prototype.exec (see
+ *  section 15.7.5.3) on regexp with string as parameter.
+ *
+ *  Otherwise, set the regexp.lastIndex property to 0 and invoke
+ *  RegExp.prototype.exec repeatedly until there is no match. If there is a
+ *  match with an empty string (in other words, if the value of
+ *  regexp.lastIndex is left unchanged) increment regexp.lastIndex by 1.
+ *  The value returned is an array with the properties 0 through n-1
+ *  corresponding to the first element of the result of each matching
+ *  invocation of RegExp.prototype.exec.
+ *
+ *  Note that the match function is intentionally generic; it does not
+ *  require that its this value be a string object.  Therefore, it can be
+ *  transferred to other kinds of objects for use as a method.
+ */
+
+var SECTION = "String/match-001.js";
+var VERSION = "ECMA_2";
+var TITLE   = "String.prototype.match( regexp )";
+
+startTest();
+
+// the regexp argument is not a RegExp object
+// this is not a string object
+
+// cases in which the regexp global property is false
+
+AddRegExpCases( 3, "3",   "1234567890", 1, 2, ["3"] );
+
+// cases in which the regexp object global property is true
+
+AddGlobalRegExpCases( /34/g, "/34/g", "343443444",  3, ["34", "34", "34"] );
+AddGlobalRegExpCases( /\d{1}/g,  "/d{1}/g",  "123456abcde7890", 10,
+		      ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] );
+
+AddGlobalRegExpCases( /\d{2}/g,  "/d{2}/g",  "123456abcde7890", 5,
+		      ["12", "34", "56", "78", "90"] );
+
+AddGlobalRegExpCases( /\D{2}/g,  "/d{2}/g",  "123456abcde7890", 2,
+		      ["ab", "cd"] );
+
+test();
+
+
+function AddRegExpCases(
+  regexp, str_regexp, string, length, index, matches_array ) {
+
+  AddTestCase(
+    "( " + string  + " ).match(" + str_regexp +").length",
+    length,
+    string.match(regexp).length );
+
+  AddTestCase(
+    "( " + string + " ).match(" + str_regexp +").index",
+    index,
+    string.match(regexp).index );
+
+  AddTestCase(
+    "( " + string + " ).match(" + str_regexp +").input",
+    string,
+    string.match(regexp).input );
+
+  for ( var matches = 0; matches < matches_array.length; matches++ ) {
+    AddTestCase(
+      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
+      matches_array[matches],
+      string.match(regexp)[matches] );
+  }
+}
+
+function AddGlobalRegExpCases(
+  regexp, str_regexp, string, length, matches_array ) {
+
+  AddTestCase(
+    "( " + string  + " ).match(" + str_regexp +").length",
+    length,
+    string.match(regexp).length );
+
+  for ( var matches = 0; matches < matches_array.length; matches++ ) {
+    AddTestCase(
+      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
+      matches_array[matches],
+      string.match(regexp)[matches] );
+  }
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/match-002.binjs b/js/src/jsapi-tests/binast/parser/tester/match-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..772363013e947c229d2d07748285db83a20ccd66
GIT binary patch
literal 36161
zcmeGlO^@WnwFxAAL`0E-kU$7pg2Rk}nPq{?(lg7<FoZ_SY&1RD%d%Q|yK8#QdhEt_
zqgeqLq#W{pkdXKjx#y4|F5Du-FUWg#mHpZ-+s|&h>0W9t-kvVMdiB2R)qB;0a6WUy
z{@}i_Ci{Q$y{T_q^nTat_3n9-hrPq$$;YE>qp>#=y}@oYX5iRCxc}dO_IiJTQ3Lw=
zEz7s9dye=(j2+9jLfdmAP?Pj?(0gFJlSNoR0i4IGV0nH7%AWLW*A5c^bo${$xS@S+
z3qJzqS{EtOLFn7=bpJ`1W^{aXHoSQ<*p+`9>`EXM)+ic(!w!XSIT5%oEN7mBha`xH
z?p|2o`2L$$u3X*uEXc!FbL>Xc8_202hu6Qb{QPi=N<*st8(^=Hs<)0$M{QB{4}kjd
z(I*FYujVPUdP4rPIzs*)raBv*-8jy#n@R*zIQsxC9=bF0z0eCE&cse6rdxeqOvUA_
zzn!0G2?8Hq&U_IBp!TEC3dIGeV<dtwll;3@Z;vd;NnefL7{i}Ls%>=f3@v{e79NC_
zAD)RIELouhOQENDEVBf(pK=M7Kb<2X0`1Zni}@44I+#pO#T0NmvI3#8E|F3B4rWCG
zS}@7+Ys!uxUNb8MqvrO`9c!8*B@NPxFktKUr;|HhzWep|*6lYx?ccc`eSGKZ?dz|l
zq?E&9G%QPgSjLXN0DyM4ZYT5NwD2LCb+?rn&{7|ILFl<}^gpqJV5fiO>RWHWQx5wC
zSm)bgMLsmA3vK{D!@oD)*Dn3Q_pOJiJjI&eL|T#3J>uN|00_E*1<u8qTR63HA;@vY
zO4^0S5L?v2xjPZ(wksxiDoa0@F*eD^jnK^JV2Plae|5ZjmQ$^tKY;i=k>zr?`iTNN
z%@dy*Jf>ivVJKA4cBW{gp?oDfg%#xDA?E5!lx$^!d;pGh>Y^(lHU+H)#O4rdLwxLr
z^RVaJ)B9<79K>NSu6r+)1ImAfDx=r%Mf$qZQVOP9IR*qYen#P;o)n*yMz#ESM@0U>
zqfA43diOpP<FE&D8E`Lr*fcocu!g~5G}ew4ghMdcmw86(2%K?^F^A#}q8grkt}lNW
zBtjL^L|$}FOk?tAfRscc2Ss5>2gJ+7*(f_J4^qDci<Jvf8RX{(I+Ompux?-U_xgqY
z>^;~X?Iilp-@B4m3Cec{`V8r5%AL+^3j=4y%Kr$|PDpw4JWoj_=usqm0;6%>CXq0{
zr{Pq_K~u)@g9j6#XUM3yM#*V>Zjwl4C`JRHyXLBnX*)-_)9`+=mMghY&lcpTso`Ys
zh@E@+4{YqZa%+dSYxy*hP$TGnJ>>+YbZ4HjpU$V_@FOI^l$;DnVmQ;La=hk5H32|L
z_JB$eQz@Cy7&5soDLS+1=5D%;iGZW$?)M1Fb*U%S(uP59Q_eBem>r~i1E#|SDX{S`
z4^o=4%J|_R%{EtW#C6KWkaiPDMM+wdNr~!tv<I&ykfNszHFk>yM?{?&HcnEPVG<f-
zQaadE8@I8N*o?+vnKLMK4Vv<dpRXrYLiwERlLFn~0PjV}z->@~*MSl;O@I9(AQLlQ
zu0hD5^p@&tV<SL;FuaTjJWb$PQ7*`|K961oFBAKqs*IPa;Ke$*uy*n8hjVv~O$W69
z03kuszzq5kE`s8whMLBJopbpI(4vV;#<Mg(s?jb_Rxk|LGXM&9=672HhnN94=%!d2
zGb9XjgXprKHTm%@K#D5cMR3=`y4yT%@&KCxK6JeCgS0*jw<G0UFCRhRfa_l<PZ*vr
zf<U?LjXgIIpU<%ZUiHn;nQwSg8#E-1HKY1pMkOEO_|;eG>L}2r@f5<`E7<#GG#iIX
z%`Pu&?`+T5qGF(F5SL<{Qd7kj>KWCf+=O9h(H5Cr-D^~)D4A*s%Egnp<EW}{m^Bd}
zg_C;Hce>y_!?G~6j$+AOnRbPBRrO^sE-0-FTub#WRas=MsMVmtRsseI@pKew$gxoc
zdpq)?7>VFBAgY+hSy)U{rsIMO>H;<cB!jGFx<^Hl8L?s8pzNH=b4VwyOcaY;vJNB@
zRpf3-R~KD81Id~izLwsi#b6~0F^VN%X?Ia54-w=vjg|Q*nM!$kD#E!>+VDUs@}49H
zLtmr)zS>vhV4Z+&s&V}ncnV`&RSS3rE`Vvd(5-G&<k=V|tIYK4#FmL29y0W|+jas~
zd$T1FehLuY-l?j`q{`n}%wE%rFqz!_(u_L`_m|oIFx?rI!IpTR*<b0@Xj9$Qz_=@N
zV~KHBi$|WSEqvqL6>hP%cM7tBI{jr>3TA$>ncp+cVI7@A3CoobJ;J_W&-e!88&vWb
zGeHaGFdOe1X7iHUd>TZNoXn7M4oTi9Cf7ci*fmLn)#Q2X97?5#;T#&?$Mz#6CQv08
za`;(T?c8#Q>vZf3Tca(MVn?1kvGKe-cMusJVOkE}69xBpRUKw76NB%k*;I;JGp%EU
zgeDcy(#<1fX*SA922VEEpdb;d(oibwq(o^Z-e$+Kjyn#H3@p!kh8q1krcH@=@{A9a
zWUPSaDwP+Ue(3q>aeVBf;fB}92hC>_bU=kwIh3$jU&_3F_Ip5aMSdA`9I{F&b$g0%
zbSasdR(LH5!qo8OS)bm^`0GK6I7OHtp6talV3h<oiY^qpzeiG(CVZp9kfhj36*46x
zma>cIQLh&iN-%INU9S$y+SO=}!x2wTa?@3&I)#J8nwPk|0`xMcupOSlE~E7YTF?Q=
z5%1n@b5@+%VP#9ylUlwS<lMf^1KEY?W1@+6><$mhL*E)d5VQ{xMW&^_Py3NpeP_{l
zeP$Q2j=Kn!02Cyr<e#bDbL+T@-a$=^VL((Jw^NA83H+c!=H}`?jEh1L88hjZp)Xgf
zK%0xgH9!G%TV=O3v0($`mL*L0Sgo$vrRF`??*Zqqw0<Gc$?zJukuItjq3mFQsw%6h
z39iLl7sGYv^rCL{`?Ig=cwib;;tPr?`<tcW7&6$RIGaWlH1I_&N(^2ww2sQeN*h&P
z0*4j(FN(pY?&6;^jVh!7fgzb(E5Y0$A-EmvY1`s$lb9IB0Td4;6H^TDOrMGhTDfAt
z;Me*%i-PS6wR5IT1%8x{*8^zURH)#X)Z-&k+hy8RNWjo+Gh#A&>zL6)mtI*LqR)&`
zL)Y+B+f<unk8?5LG}UIjGZ14@HrAp@+d)l;@hVwcfM*1oS;EZmD$DbpvCXWRQe!~m
zEKQwpC(ruTPo~-of2D}Zh^aO!|Iv8OiDDvu8gpx^%}lk~Z@!MJgZxYfAep&pJf1N(
zlPq4iuPh*SBsIuss?7$`Su`UqYCqD_SLsMj>KNO+n$GMb*KsGw5`co^8(n$I@Z{ss
zwb2+#>cLVL_bO0ZK`Yd_rCxo2jbqiRnSL4ioLU9iTok&m>uN%nZm_B#8G6Nn8o~I_
zN7f83q0`n4ehDu>PdHg!Viq4k@0VS?EQb^xr^)Y8YDULLXTzH(>4~=d4nzI3;n|Jj
z+&B2vt>e>??ydZhD*>0e(q!SAg;r$wO~J33$ZrdOO;LWY+eDKoGf5BmO^Jt*BaqiV
zxt)~EmMz(nU!g*g-%FQ&#l;1o<%f9TX^zH4WqV|{_`kU~kptK;miq!HoWm8<=e8>*
Z>9<m}BUAAj453z~P=4e~%0bHK{{gmV*6{!U

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/match-002.js b/js/src/jsapi-tests/binast/parser/tester/match-002.js
new file mode 100644
index 000000000000..21b832501700
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/match-002.js
@@ -0,0 +1,174 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          String/match-002.js
+ *  ECMA Section:       15.6.4.9
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+
+/*
+ *  String.match( regexp )
+ *
+ *  If regexp is not an object of type RegExp, it is replaced with result
+ *  of the expression new RegExp(regexp). Let string denote the result of
+ *  converting the this value to a string.  If regexp.global is false,
+ *  return the result obtained by invoking RegExp.prototype.exec (see
+ *  section 15.7.5.3) on regexp with string as parameter.
+ *
+ *  Otherwise, set the regexp.lastIndex property to 0 and invoke
+ *  RegExp.prototype.exec repeatedly until there is no match. If there is a
+ *  match with an empty string (in other words, if the value of
+ *  regexp.lastIndex is left unchanged) increment regexp.lastIndex by 1.
+ *  The value returned is an array with the properties 0 through n-1
+ *  corresponding to the first element of the result of each matching
+ *  invocation of RegExp.prototype.exec.
+ *
+ *  Note that the match function is intentionally generic; it does not
+ *  require that its this value be a string object.  Therefore, it can be
+ *  transferred to other kinds of objects for use as a method.
+ *
+ *  This file tests cases in which regexp.global is false.  Therefore,
+ *  results should behave as regexp.exec with string passed as a parameter.
+ *
+ */
+
+var SECTION = "String/match-002.js";
+var VERSION = "ECMA_2";
+var TITLE   = "String.prototype.match( regexp )";
+
+startTest();
+
+// the regexp argument is not a RegExp object
+// this is not a string object
+
+AddRegExpCases( /([\d]{5})([-\ ]?[\d]{4})?$/,
+		"/([\d]{5})([-\ ]?[\d]{4})?$/",
+		"Boston, Mass. 02134",
+		14,
+		["02134", "02134", undefined]);
+
+AddGlobalRegExpCases( /([\d]{5})([-\ ]?[\d]{4})?$/g,
+		      "/([\d]{5})([-\ ]?[\d]{4})?$/g",
+		      "Boston, Mass. 02134",
+		      ["02134"]);
+
+// set the value of lastIndex
+re = /([\d]{5})([-\ ]?[\d]{4})?$/;
+re.lastIndex = 0;
+
+s = "Boston, MA 02134";
+
+AddRegExpCases( re,
+		"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex =0",
+		s,
+		s.lastIndexOf("0"),
+		["02134", "02134", undefined]);
+
+
+re.lastIndex = s.length;
+
+AddRegExpCases( re,
+		"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex = " +
+		s.length,
+		s,
+		s.lastIndexOf("0"),
+		["02134", "02134", undefined] );
+
+re.lastIndex = s.lastIndexOf("0");
+
+AddRegExpCases( re,
+		"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex = " +
+		s.lastIndexOf("0"),
+		s,
+		s.lastIndexOf("0"),
+		["02134", "02134", undefined]);
+
+re.lastIndex = s.lastIndexOf("0") + 1;
+
+AddRegExpCases( re,
+		"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex = " +
+		s.lastIndexOf("0") +1,
+		s,
+		s.lastIndexOf("0"),
+		["02134", "02134", undefined]);
+
+test();
+
+function AddRegExpCases(
+  regexp, str_regexp, string, index, matches_array ) {
+
+  // prevent a runtime error
+
+  if ( regexp.exec(string) == null || matches_array == null ) {
+    AddTestCase(
+      string + ".match(" + regexp +")",
+      matches_array,
+      string.match(regexp) );
+
+    return;
+  }
+
+  AddTestCase(
+    "( " + string  + " ).match(" + str_regexp +").length",
+    matches_array.length,
+    string.match(regexp).length );
+
+  AddTestCase(
+    "( " + string + " ).match(" + str_regexp +").index",
+    index,
+    string.match(regexp).index );
+
+  AddTestCase(
+    "( " + string + " ).match(" + str_regexp +").input",
+    string,
+    string.match(regexp).input );
+
+  var limit = matches_array.length > string.match(regexp).length ?
+    matches_array.length :
+    string.match(regexp).length;
+
+  for ( var matches = 0; matches < limit; matches++ ) {
+    AddTestCase(
+      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
+      matches_array[matches],
+      string.match(regexp)[matches] );
+  }
+}
+
+function AddGlobalRegExpCases(
+  regexp, str_regexp, string, matches_array ) {
+
+  // prevent a runtime error
+
+  if ( regexp.exec(string) == null || matches_array == null ) {
+    AddTestCase(
+      regexp + ".exec(" + string +")",
+      matches_array,
+      regexp.exec(string) );
+
+    return;
+  }
+
+  AddTestCase(
+    "( " + string  + " ).match(" + str_regexp +").length",
+    matches_array.length,
+    string.match(regexp).length );
+
+  var limit = matches_array.length > string.match(regexp).length ?
+    matches_array.length :
+    string.match(regexp).length;
+
+  for ( var matches = 0; matches < limit; matches++ ) {
+    AddTestCase(
+      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
+      matches_array[matches],
+      string.match(regexp)[matches] );
+  }
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/match-003.binjs b/js/src/jsapi-tests/binast/parser/tester/match-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..1422b2f79d54876b0c68d87ce4a3a885164ec239
GIT binary patch
literal 21251
zcmeHPUvJz*5I2<n2n3=}NQe{kAyFX-ZIMuWO_ii63To3T34Lj+YIELP+&cDQ`>IB?
z--XY?m*9mb9(myj3GvJWGwb#3od4X7?f9B&-G^T8ygNHHJM){}+3|Lx;lP!v-9stt
z)jNUT55$r6x@B4WzI|-1Z*BjudwI9#52V#yR&Bbj6Gp4ccP#5;Xw{|N?~1??`>wn$
zd#(sX<oKQ<Wt;Dz_1N+3aaw-?o!6$(@&iT6u`S1Qq7eZ){FW`f$T@IipvZaR$S@s7
zf#da8--cm!H#hdSZf|#&^>5u}O@z|gRqby&kqm^Z$UPD6FhlPXq^FuLABm`U`1Q)l
z#id7KmUc46veI5x4}Au@KM_H;Ic24yR{sFnGt}zc&7Iwo(&}5l`sT*1wTBn7nwh;K
z|DBy8--My|w)SprX62?9!8FbeP>Y)`4FW&%qvL^GQf9i)31nYB9ds761JzLQ=F>qS
z!w}qlHxiLN0(Vp<2qWp=bNzNhxUT7{di3BYX}paJ&+zhhLGUmVL9{2sXo7^AETwMv
zC?&!gNZt2PU_-z{?*`xmAO!Go<w0ZxPXEwgmj(fJ(yN9`$_+zSgz7+=?#c8~GCQ&l
zY$afZJq98IWb>>8SM<Ztq-cgdg$4`v?%NN3{`UFe!o9EWcOG0*UoSmhymrnEMfmTV
zUlRt>pOhh^q&d+t&QT7kQ<-8<OO%WqawEn^@L=5!Bj5X~b8D@$a^ahcmu8~8l$W6u
zXfG2%e~6}Q41vnUu)(uHYt6R5cl~|g#>TcGLYbp575zSgvEP6$V`~S-FdS1~cRUds
z8~ZBbgy+pXPz5k27O^{!ovR%~C2;{tt%jTx$uVqqEeHfv8g`Mc0&rs#YVLO62|gX0
zyAm2IviEpdlt`#oNu#e?fmDxXicbTCT=yyPqoMlyk7O^hAn-y2h>k}XOJ%5G3nj^5
zM07<MZF#nQnl;cw(Uj^oU_#*Z5<mk2BN>wB=}+3d;{2Q*l=^+XQ0i3!J|^bi2JH&0
zc9%xh4+y=IgVBjCQyXUZXA7<*ebCS<_$36_#zbP+Bg3k31MW(%9~~CQio{`(PwF^x
z5B~qb-ffPSs11OB10<P{{bCl<Oy)4>nTaRGPC}jHCGvSH76VQgpw#X_YNm=Bvo6lA
zn_&YLb|6*v0*$GHVaE(jypO>(*^AviC<YI;C*FqEIBt~<H}+e}p`Y4pYj1uj1Nkoy
z#oIvsDrLl)59BQ_!2$5>aH(Bvz{z~Y9aXy{=cYRw*zdGBF%z7i_>f9k;{s^x6b`<_
zzkjZcYCe)hPx_M*t>}AIr=PKeEP3Ge9c-!FMNqp4G6fZ3Tn<$uo6+K>s)l1Y>uKBX
zQE01;my{So7mOYBtCI;z1qjqluU6d?VtiD(<mtxH>tU%Tt=dFNP-;1VD$b*@xD>SH
z?3WB%S3o0G!WN!h#Px02+($`{-vd&Bl@Cvd9C8*zZ*9&#08*-!PlgW#mTzP!>M9B<
z^1AEy9-D#*%<WCC^F8}z-W(i^lR%rZdcGIRpN3fTmsASVk#G8a2dvwyrMQ(j$m6qT
zMmkEgY7j!2R|{(HQeKHowO3BAlWHvMc!EZQM=Q!`j5^Z`UzHoY4ebz)#*&T<c%S5X
zshS=-joU-l<<yzbK21zLLqdkzQ7*ZXC9^>LmiE;zV0zJ9$7anqobg$lT3M<lm+b`%
z72<jbss*t&7pnxbrl?HtLqL8kpdAyY>ZGH<1=W4?L6V_XE=(}<qxhzTE*8(uP@cIm
zSezD3^T;yU#TlMZ%ufA^!DvY@Z$n13I)jjriXeH`vLmBmK;Aw8s~D|DlJ<GaBJ!G3
zZWnDo2?=UW^9r!PL9}QAHhJ@{fiS>CE)1;;IR%N-#u$(_3I6lUmdPC++jkb{C=k2@
z3@<KCD_*0@ZEWFQGKw%Kxp~pra5j^0Ms4tf=AIEDE51$oC*VtFN0_E{GVkc(Ce?M0
zoSZlJsLD2c&vr0xl}Re7bcAs61vhvLaav-c4)U*>r7>l#MHG8=Y~R)*%G@G~w(I)l
z-P*vs+CcreXN0#Gvsg-2#-q=;G%}2jM{#>J^?HUIeqb_d7`xQ{6e<P{2Q~(v!VEiA
zY&w=Q@6PxY2Aok`#*C0YaWG*oQ5+Q|b*Kp4vU_mdUN2b6=(|q5?i$7^!wmCe3(uf6
zVS$sU&L5Q(nKXmS@s92lNDd`ND%QHhZRPoboF{|FiSp)gSvp&N26k#0%QaFOpTb6`
zJzM=b=&MbpG?+}O<Mjnz&;UthQl(A#7#vQpB>AMcTtc0T_jn|mfIcRhh+_|UT&@SA
z_gFS`rNGIrw8{sI%JQ|lh|{=>U>QI`a;nC048;n1QyqF*{2f-+aaohJx8XXt)MX|e
zXs4DSdd-wCM#0-s@y~TxxC|^{I7n`U%UK&%VD5BsHD#tz4F$6n|GXgvaJrW}lYhfB
zs_O`~vZhy>>4t^H2t@0d3j_5toU7DrZKPM`LOlJf;6+INw6IuIKgVO9^a+4|gzTh>
zd-RhDh_73q?&&RJWVCeYn|_3TLoRsIzoKwq_U1MHwCMbwj28cCqNIM5Q`s2%pZfnC
Nj7t5ua8mOj=zk4$_CEjs

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/match-003.js b/js/src/jsapi-tests/binast/parser/tester/match-003.js
new file mode 100644
index 000000000000..24453e621cc9
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/match-003.js
@@ -0,0 +1,132 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          String/match-003.js
+ *  ECMA Section:       15.6.4.9
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+
+/*
+ *  String.match( regexp )
+ *
+ *  If regexp is not an object of type RegExp, it is replaced with result
+ *  of the expression new RegExp(regexp). Let string denote the result of
+ *  converting the this value to a string.  If regexp.global is false,
+ *  return the result obtained by invoking RegExp.prototype.exec (see
+ *  section 15.7.5.3) on regexp with string as parameter.
+ *
+ *  Otherwise, set the regexp.lastIndex property to 0 and invoke
+ *  RegExp.prototype.exec repeatedly until there is no match. If there is a
+ *  match with an empty string (in other words, if the value of
+ *  regexp.lastIndex is left unchanged) increment regexp.lastIndex by 1.
+ *  The value returned is an array with the properties 0 through n-1
+ *  corresponding to the first element of the result of each matching
+ *  invocation of RegExp.prototype.exec.
+ *
+ *  Note that the match function is intentionally generic; it does not
+ *  require that its this value be a string object.  Therefore, it can be
+ *  transferred to other kinds of objects for use as a method.
+ */
+
+var SECTION = "String/match-003.js";
+var VERSION = "ECMA_2";
+var TITLE   = "String.prototype.match( regexp )";
+
+startTest();
+
+// the regexp argument is not a RegExp object
+// this is not a string object
+
+
+//  [if regexp.global is true] set the regexp.lastIndex property to 0 and
+//  invoke RegExp.prototype.exec repeatedly until there is no match. If
+//  there is a match with an empty string (in other words, if the value of
+//  regexp.lastIndex is left unchanged) increment regexp.lastIndex by 1.
+//  The value returned is an array with the properties 0 through n-1
+//  corresponding to the first element of the result of each matching invocation
+//  of RegExp.prototype.exec.
+
+
+// set the value of lastIndex
+re = /([\d]{5})([-\ ]?[\d]{4})?$/g;
+
+
+s = "Boston, MA 02134";
+
+AddGlobalRegExpCases( re,
+		      "re = " + re,
+		      s,
+		      ["02134" ]);
+
+re.lastIndex = 0;
+
+AddGlobalRegExpCases(
+  re,
+  "re = " + re + "; re.lastIndex = 0 ",
+  s,
+  ["02134"]);
+
+
+re.lastIndex = s.length;
+
+AddGlobalRegExpCases(
+  re,
+  "re = " + re + "; re.lastIndex = " + s.length,
+  s,
+  ["02134"] );
+
+re.lastIndex = s.lastIndexOf("0");
+
+AddGlobalRegExpCases(
+  re,
+  "re = "+ re +"; re.lastIndex = " + s.lastIndexOf("0"),
+  s,
+  ["02134"]);
+
+re.lastIndex = s.lastIndexOf("0") + 1;
+
+AddGlobalRegExpCases(
+  re,
+  "re = " +re+ "; re.lastIndex = " + (s.lastIndexOf("0") +1),
+  s,
+  ["02134"]);
+
+test();
+
+function AddGlobalRegExpCases(
+  regexp, str_regexp, string, matches_array ) {
+
+  // prevent a runtime error
+
+  if ( string.match(regexp) == null || matches_array == null ) {
+    AddTestCase(
+      string + ".match(" + str_regexp +")",
+      matches_array,
+      string.match(regexp) );
+
+    return;
+  }
+
+  AddTestCase(
+    "( " + string  + " ).match(" + str_regexp +").length",
+    matches_array.length,
+    string.match(regexp).length );
+
+  var limit = matches_array.length > string.match(regexp).length ?
+    matches_array.length :
+    string.match(regexp).length;
+
+  for ( var matches = 0; matches < limit; matches++ ) {
+    AddTestCase(
+      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
+      matches_array[matches],
+      string.match(regexp)[matches] );
+  }
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/match-004.binjs b/js/src/jsapi-tests/binast/parser/tester/match-004.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..7643a2be422b5fb00c3c86ab6126240c46eb3ec8
GIT binary patch
literal 30346
zcmeHQ&2Jl35I2;MQdD|?3laiLa7a|uE>NVZIH{5}tx}~airZc)6m9GmXWNZ!cGo45
z`d@KC;>sN^aN!0Qu86;Yne}^q<K4IG*|pcP%ge>ee$39yo0;ExGxK&E;h^t{^~SMq
z+Uwu=y^imkR9>%CDu=!HS!Hu)?|$=Ev(@X1N~0cK)9~CNT>ss#RNjND8ua!jj_*2$
zp131gp5r^A+v`T8+WP;X^4#sV$7%fybY7c8tLI0g+;+w7y5Wcbef&;abVK*Z6@Emn
z>zrt&gV1-oo%OfjG0p9*M>`Mq8g+TBQI|w0t!8xnt{V#9@gj0B9B+`I_de2#F0G$9
zVe9zX_3Jlk&w?av^^AI?y@q`B1-Si%<0mhttQ6GhA3%GKT79y;-<*|J-vZXRw;pU9
ze38`5{1y4{{1o{nJnGTTquuSK+|(kN##sew!%J&@zZdqxv%aWBX1Y@KMMs?WtE<Te
z&0oP6z)a_4sqcVFHXq;Hd;DN?dp{|A0VQ7pipOEtzg4dX5GDsf{cz9;`koWkgX7-!
z2k>95)p2jT?X@p&e0B5lo5`n6q4Dk0zAu6R0&O#NLU95CFj6Iqtvqgwlv|GH>06^a
zT5w3{_(nCsh^wgAAawljkqE*J2_;!dUGtGkgbk3o(?x+bfeOY`fGU6<fD2C?g%#iJ
z9BZ_YVHb^UO>;@PVaST$=nH+j8a_&9Uvz*i1s`}v-w6Rrx|Ji(=>(%ekqqGl*K3-j
zJPb$SO8L(SrquJ)FMY1o#gZr!hr$4tRHnVbiSXT)QYPLphQ&XwTy(Ge@aNVND(Fs+
zS}$5b@9>#ug%ya`V8-Fu$WW+4irvMqY{XsA_Mw<CBVmxjfG`4`bQ`8(F{mOwMgYd6
zSWHpH?qYC{>TO1o#U%SV6>)CrRY6DnQoaiYpBNaS7f3L2{0{hjH`MWxK8~SrT%l~V
z+rwzQ<pjbIYN84G8XyM_&)9N?@c?9Y5*BQ_UB^Gu%E^OLSGA>3(T7%)8WGj<0^P+I
z)wQaoVj8z8<Sa;z5%o*7iYz~jtl>WB4Oz@<4Jl&DHJ?dWlduh#fWLokkFbqe!G`ZU
z)UNRH!iy$>+G8St9>SS~KujZw<|d|v*l;DQq>2ft4pV-$3oOFqq_i;4i3tps!w~N|
zLAcXxi_@e7n-m<gCLl1HKd8&&zcU!05<Qh2zkh~Mw?y%~1V~s8lFXQMKETCf?h3e7
z_36kpt8QSxSLJ8azh04uV-k(2I>exFd9jQUAyeR%s=UP5WM>gkIe<Cx=RS*wSpwQl
zYpRsj8$cn<o$b0i=(eyfLQ5n_3F;bsD4CoD>2()s*9`AqW9M(6iz3*G_YBj>NsrFS
z>m?u+g#N*d$RTGy4hlXq<7`Ic5ZIvpWt!0CRM};q6s1B$aNyuVAStSxl2gK)Ua$3B
z&%V(sv+I1jb(3)%jgvq(sI+?BKzujA4792g(kJisIxaYzUITEK!N}vwms&bXwCJP<
zX|APYfMbCIFO`8JI~`FPy3f$hFw%%q(bC#fV6J}Cmy3*$ljV1@^&uU_y@BVcTm~>W
zG9Sg0`la`jG4c!v8D2-Z<Vt3gFt4kA48aAhbu4S4{Y|?pVxP!WAYwZKLxu0c(;+8^
zg(A$zB~39h!AoGOSj`y|rs$xfz$uxu<sivWYnJa(lVr}<uu($RijyN`GFK*xX$Ws3
z$z&BrH=~YCg=a9C)58}MEoL}bnNV$+8ZJ`pA$N9hUxWjnl)=F&l1MV7N=<@xI2mt|
z7n=-pS%d4ZfD|^ks;0LRAb=UU5LQ<V$s=l?jF6QT`b}ob<PH<i)zw*pz@(+#6bxSk
zhF5Ez=yt+m9%z*|XU~Zu%t0<+Gz(|py0KWs93dv06>#uLV;@^zncQeu;i_Tbiu7n(
zxEgQ&Qq2xa2UobnTCJsI15N(Rh(XN!Vlmva;IN3`kTK-Sh+biA*s$1Ou|Xw|F%vY_
z8ocz_&>v)U)90K;s+AWfJ7fW3lsg)#YaPSvf+WLoj{6WGGA)S#5CwOk{RPPhbjz_k
zew@~9_V%Hio_pdNJcep)tJiJ2Sb|R!Bcn2=<KZ?9*h@31pgGMvd|js}C~L*MjxjB?
z=?Kog3Wg%HQf+i38Kjmspr8^arX!>_s8WiVw_SBC;;MsV1JjQ^!;Q`-w2f9)Qbq}&
za;|{2m5JNB@AiCMk{@C;>}!uOXwYvX0Ht>3P{qcvl)2~rCtz_-xQuxY*{P&qPbrX!
zlBa!rSjfwx?`iP5p&6$PGt84MJcCxo1jnS#$B`B3q;J$5GTI%hnwjGBT&zi5O=*^3
z@R%vDiObv_X&0c(ldxPZrS>VjNGy1p%O{{OTZt{P5<898r+7gLB%8dqjo5mzj>9UJ
zs9zeFbEtFmDUW0sp^wQX#xdrmiA~>WJr_mxlr!X;{Y)!ASQM7et|At36~Quql;o5=
zO#PnQ%awKydfJc%%&LbwG(>w3ULzITPFscRqA7@+f11UJb+E~YPGFnM!YyC{;Xq}$
z4RgZ+%uTD9^0}Jd{+SOzyU?e6&+8pJ-hT8xm#jAkd<`Rq?e$}cPDWJ4g>+ii2ptXv
zDV5-#5xE)Wx){)5@{7D3@RvU|je*^)GJJ0zwWeaJIED?*(46gN6%6oc+msk%!SFh2
z6La0H@(}=5gkO|{WnINzw3}5(69U6Bxlw|-LPByi+}E};v&CE%_)W3o#Oa;gtD+{Y
zTr*%;)Z&0e%5sIqIlEN_Ud7AX2WYpdP{XmQ$5*7k%WhR66NX}o5u4Fl#Ec$7`o!K4
zb7qVNx`I`0+ieyv=i-FZcAN3ut7{|5(nb^+J7@^8s1lC_SR+`@7G@5rOh5LFWoFKl
z8iOK7G?j1|{pRm}vfXC*ksE3ww%aWGQ#po;;>i9C;nsGW*>1D{eIHi|`I!<(GPCNo
z+l*ID$e~W#Z8rSQ9AjQI`<a%xOGiSPf;KusDBewHSCWgkl4Kb`O8Lgro<hEj2rH}6
zYD<}t`W-VVau2uFs|vL7T2(bOi($^GO<<eLLiv4Nv~}-%xtgFdM8%XI!QtU8rw=cp
zGxiPs0ylq1MsjkCne5@qdY7}jB(<C-&*SS+3}3#JXK@t@3!<?vKgm;QZi!E3lG~cG
z7cI+ExO|9x%8(FDd@WL*OO|m7x!9{x#?FjwZ<c3LzMvt`nik%KWGqo4&t#wyd8pyT
zSMn@c5B*+{JdC`=yY}QMbO!R(BJz|V`Mo`PHmwmbc6#`)p5(~W$V|#993I@Ertgv7
V5=EcS;4BSPsU|6JQUOx_{s-VUi;4gM

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/match-004.js b/js/src/jsapi-tests/binast/parser/tester/match-004.js
new file mode 100644
index 000000000000..7c17396afa75
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/match-004.js
@@ -0,0 +1,173 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          String/match-004.js
+ *  ECMA Section:       15.6.4.9
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+
+/*
+ *  String.match( regexp )
+ *
+ *  If regexp is not an object of type RegExp, it is replaced with result
+ *  of the expression new RegExp(regexp). Let string denote the result of
+ *  converting the this value to a string.  If regexp.global is false,
+ *  return the result obtained by invoking RegExp.prototype.exec (see
+ *  section 15.7.5.3) on regexp with string as parameter.
+ *
+ *  Otherwise, set the regexp.lastIndex property to 0 and invoke
+ *  RegExp.prototype.exec repeatedly until there is no match. If there is a
+ *  match with an empty string (in other words, if the value of
+ *  regexp.lastIndex is left unchanged) increment regexp.lastIndex by 1.
+ *  The value returned is an array with the properties 0 through n-1
+ *  corresponding to the first element of the result of each matching
+ *  invocation of RegExp.prototype.exec.
+ *
+ *  Note that the match function is intentionally generic; it does not
+ *  require that its this value be a string object.  Therefore, it can be
+ *  transferred to other kinds of objects for use as a method.
+ *
+ *
+ *  The match function should be intentionally generic, and not require
+ *  this to be a string.
+ *
+ */
+
+var SECTION = "String/match-004.js";
+var VERSION = "ECMA_2";
+var TITLE   = "String.prototype.match( regexp )";
+
+var BUGNUMBER="http://scopus/bugsplat/show_bug.cgi?id=345818";
+
+startTest();
+
+// set the value of lastIndex
+re = /0./;
+s = 10203040506070809000;
+
+Number.prototype.match = String.prototype.match;
+
+AddRegExpCases(  re,
+		 "re = " + re ,
+		 s,
+		 String(s),
+		 1,
+		 ["02"]);
+
+
+re.lastIndex = 0;
+AddRegExpCases(  re,
+		 "re = " + re +" [lastIndex is " + re.lastIndex+"]",
+		 s,
+		 String(s),
+		 1,
+		 ["02"]);
+/*
+
+re.lastIndex = s.length;
+
+AddRegExpCases( re,
+"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex = " +
+s.length,
+s,
+s.lastIndexOf("0"),
+null );
+
+re.lastIndex = s.lastIndexOf("0");
+
+AddRegExpCases( re,
+"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex = " +
+s.lastIndexOf("0"),
+s,
+s.lastIndexOf("0"),
+["02134"]);
+
+re.lastIndex = s.lastIndexOf("0") + 1;
+
+AddRegExpCases( re,
+"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex = " +
+s.lastIndexOf("0") +1,
+s,
+0,
+null);
+*/
+test();
+
+function AddRegExpCases(
+  regexp, str_regexp, string, str_string, index, matches_array ) {
+
+  // prevent a runtime error
+
+  if ( regexp.exec(string) == null || matches_array == null ) {
+    AddTestCase(
+      string + ".match(" + regexp +")",
+      matches_array,
+      string.match(regexp) );
+
+    return;
+  }
+
+  AddTestCase(
+    "( " + string  + " ).match(" + str_regexp +").length",
+    matches_array.length,
+    string.match(regexp).length );
+
+  AddTestCase(
+    "( " + string + " ).match(" + str_regexp +").index",
+    index,
+    string.match(regexp).index );
+
+  AddTestCase(
+    "( " + string + " ).match(" + str_regexp +").input",
+    str_string,
+    string.match(regexp).input );
+
+  var limit = matches_array.length > string.match(regexp).length ?
+    matches_array.length :
+    string.match(regexp).length;
+
+  for ( var matches = 0; matches < limit; matches++ ) {
+    AddTestCase(
+      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
+      matches_array[matches],
+      string.match(regexp)[matches] );
+  }
+}
+
+function AddGlobalRegExpCases(
+  regexp, str_regexp, string, matches_array ) {
+
+  // prevent a runtime error
+
+  if ( regexp.exec(string) == null || matches_array == null ) {
+    AddTestCase(
+      regexp + ".exec(" + string +")",
+      matches_array,
+      regexp.exec(string) );
+
+    return;
+  }
+
+  AddTestCase(
+    "( " + string  + " ).match(" + str_regexp +").length",
+    matches_array.length,
+    string.match(regexp).length );
+
+  var limit = matches_array.length > string.match(regexp).length ?
+    matches_array.length :
+    string.match(regexp).length;
+
+  for ( var matches = 0; matches < limit; matches++ ) {
+    AddTestCase(
+      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
+      matches_array[matches],
+      string.match(regexp)[matches] );
+  }
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/multiline-001.binjs b/js/src/jsapi-tests/binast/parser/tester/multiline-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..7c56b53f6e51409086a4a9ce792fdc20db17512e
GIT binary patch
literal 15866
zcmeHO-EP}96xRMbciY7<>|z%~E(&Z}k)&G(Z0p<raq12kQn!oK7DHDQjKtVlWJ#ms
zBnJ8vdz?MQ9-!FeF8UZdhayc{lpM-`jXU4Oh(sQq-|rkAQuVYS2XwpMrNrBQz@iQ#
zJ?BlwagHKy;57DHKeunS-6*C`eT$E&2Y!-nU;WW>YA~v<Pk%(1PmTh5hq?h_B=w_^
zlk(L6iF4wI-YBh?K<AB%Xhn>Z@;%27{d7n`Uw+S{Vd@|IlyPz)=_#g@l=)$2`#o5u
z-P}FgyWgsBiD&gKK}4t3=HvJMlrj=<a;GHd8}vQ_dIz-AJdd|}{UG%NKcpKsZhUPL
zmy2w1_0`4NZ^8Ui!pz}1FB7Wu1<+ogS|2qJ+OtyYyTE#L_ukI4Z%oZBUXcs*&v!uZ
z!@a}(rYX1X5tiQhDNxJ2^VZtXJ=cx{(lN;|UakKu&OhIWr5X=^YCXKyXdaldPoP@#
z(3{`h{9(qS4nV?ak^peFQ<Bmi02+^BI(%M;e7htF)Koshg-2B3l`f(MPNKq+l(6)W
zCaI~gp|c3GI`s+B>TiIm1)<ed5bi9ByqLNtlqIHkx;PC#By6B57a<$cA*44*NdY}h
z9p-nsDkBMGM_H~b(mF}Y==~lj_@@yYY#jMuORwfdXW^jMB|aO}h#Rr6HlRTeooyV!
zk59d|gv3c7WvZ!#rKu)h;4@$#j9A*GECkf>Ipx?7D0rq<u!LM{_**^IDLqf)|5&~V
z|0k@|$0$k)<HjNqJ_1@ho|nPsE=g#Czi>HUz^ZS<;E{?bn<mQ$<SQmA)D)qED6E(g
zPJ^hj`PGxb(`(9rnm_f_Q>kO!tQOK#a{U~tSZno8lqx&&sx3PDow}(LGYp(`FsUsn
zac`jwtOlVPrRVpLP0dOTbK@SsNCTZL;}~-~58Z+_vIvn&>Bih)jOeg~tJ8pI1m!jh
z<W1DAl2!Suv#gB1biw;_cERhdg4Ze9dcC^f{dJ1q{Q&0bNq9~%yigVw7RrcO)77Dv
zP}9mK=-qzkV)H@oLm(w+9>ma>=q2UN4IR%cGKh6`@Ez#Fs17U^z>0v;4n2=e&#TBQ
zW;;=ROic@O8qb_lQ~D4n^+@V=Y4VI<&NC?rf7Qip1d)59vJ93c<NH;=ec?FB^hkBK
zcRWf0J<V~WFrk0+apxsFUi!-WQO5_LR=Lix+z=p-&z~#lbfS}PGLYu&+r>05UG+9Y
zSH?)9=hRh_%X&oq^2+D|3^S@Wi=Z1DDLM4i&DiP(fvojm>7oBfrsS_aXC9`v5YZy+
zbS`ZrE0nNmtbPuGik>|Zt194B%<`JJQfCCoii|Y%&JYV4*coDn1owreFLEEOfv+M$
zj0iKS(NW-%rowWNwD3$@n6TV^@hvrC#h0dmioDf=!}0JS!bXoCOIFdk>oeoBVuY{K
z#r7i7MJ{_3dEfy}`%LTqf>)TCBx@Y#PNpB#6;2U@i<VqgaQzoD#R^>I>1{5A5l%#|
zD=K8?)}^xra0{fp0wSbQ2A}1?Sme=`kh?_L0d=vy8PKqkcFT34Bf{J)Trss+7#i&`
zf6;OQVqFZ*O_4JUl}oxMnvv}-(&n<}uwPa=OuK=U3(-{$>&S)zs-o}?(h}t`+&Qgp
zmNX8F(zpeDU{|k%;`GTd=Z>q4AubA9*k$}KIorR?-sF<vYn(9tTy>PRgkj-{wpG^a
zw`Y)e8~4Xt;?hylLYrgbTBkKx)x1L7h4i6xLs=L-OR{6#$O3WiMocyDGm>zXo1eP%
zV-IeXl^^2i{7!ho@GmG7u!tJz#OG<v?wYwc)HJv1x+pEUoW^`t)_B03+3FMHg?^Ll
zB0F}yPA|GRKFygxT`{gRY~d>i5LUuZ1`rk;yqf-mEIo8}J>+h!wx-!_IC*<i9zhLl
zE{uz1=Jk?u9t-iu8lZ^F%BSg%VF@FYl$0vSaS*-aCv*wa2dgHsY$8vC86_?|2a*<1
z@c*s)5I)wQDEyWoFMoA_vQT7YII*mw5gVS`aoJ!5E}zfoR`Kk!MP-dmF5jwLzKrFv
zl>?L%%;K>gq_#)9WpgmnG8$0sW|tzV*MiR@b2rJ?U>r~Dq7Eq*W3+W6LFEFr7s0|M
z79SzG!~)slT@u5of1y>bz~ql%zWio%+?`WlxYDah;(f{YaGKeTk7UI=+_mLCP}F7_
z-++pD=HZk^F4w%($niJ&w;3a|Ms}m(4JQ5kIih$q2IjRTjSI3G;ru;Z@v7uoIq?=n
gAHBgWUKF2gi<jk><+JGHf3E>)JzPtzUW_#V0rg5Hy#N3J

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/multiline-001.js b/js/src/jsapi-tests/binast/parser/tester/multiline-001.js
new file mode 100644
index 000000000000..9e69022d5d7b
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/multiline-001.js
@@ -0,0 +1,68 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          RegExp/multiline-001.js
+ *  ECMA Section:
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Date:               19 February 1999
+ */
+
+var SECTION = "RegExp/multiline-001";
+var VERSION = "ECMA_2";
+var TITLE   = "RegExp: multiline flag";
+var BUGNUMBER="343901";
+
+startTest();
+
+var woodpeckers = "ivory-billed\ndowny\nhairy\nacorn\nyellow-bellied sapsucker\n" +
+  "northern flicker\npileated\n";
+
+AddRegExpCases( /.*[y]$/m, woodpeckers, woodpeckers.indexOf("downy"), ["downy"] );
+
+AddRegExpCases( /.*[d]$/m, woodpeckers, woodpeckers.indexOf("ivory-billed"), ["ivory-billed"] );
+
+test();
+
+
+function AddRegExpCases
+( regexp, pattern, index, matches_array ) {
+
+  // prevent a runtime error
+
+  if ( regexp.exec(pattern) == null || matches_array == null ) {
+    AddTestCase(
+      regexp + ".exec(" + pattern +")",
+      matches_array,
+      regexp.exec(pattern) );
+
+    return;
+  }
+
+  AddTestCase(
+    regexp.toString() + ".exec(" + pattern +").length",
+    matches_array.length,
+    regexp.exec(pattern).length );
+
+  AddTestCase(
+    regexp.toString() + ".exec(" + pattern +").index",
+    index,
+    regexp.exec(pattern).index );
+
+  AddTestCase(
+    regexp + ".exec(" + pattern +").input",
+    pattern,
+    regexp.exec(pattern).input );
+
+
+  for ( var matches = 0; matches < matches_array.length; matches++ ) {
+    AddTestCase(
+      regexp + ".exec(" + pattern +")[" + matches +"]",
+      matches_array[matches],
+      regexp.exec(pattern)[matches] );
+  }
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/number-001.binjs b/js/src/jsapi-tests/binast/parser/tester/number-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..dea41480451cab95c845c9b34c4344105c50df6e
GIT binary patch
literal 7566
zcmds6O>f#T7|y=G4y&}=wnL7ss*P6KVcJrpmNJbB(Q2?>CqrDw8e-&_QZD;T`#rnt
zzUzL$UMEiMVgn|ni0*`f?Z@xu^S*iGvEd-ZWv_>kUp}FvOHtps>o`uE_+#gw);MZ@
zXm-c|J6<W-<Ap)Y%KNVz=Nats)Z?d!2B;n4L)-}wMJymu0_Dr+*f|d(|0>pRz_~LI
zi_ior@SPwESPr0GU-NOqg0leA1TI2-DRj(e5OvFs;F@N&(yARdyps6OD+v%4tC{St
z2MkjbCU6%h9BOz^0WTW%+nB!D+1b@0Gw4!cG*8@k4^CYms&7{%C}_-IfW1Ovo>sp!
zmu1WcAo@{r_uD(&FsrxY-__ZX>)oog>Q!BDH6ScQ(gn2YWd{#<`o-=Up>89I(6@}F
z5Sv^2Mb|KJ^>RRQ9K&r*h8XTc5+)Id^Z$+6T0vnbk0vKN@E4XjrYdid+fP98m?6qq
zIA$|66tF6~l;b)oaMlzmAle;rL&QeaEtJ^+tPutJ`3$^_X^YfJSJx?Fl?_ODE#nV@
z2+^_B%i){@EDo#;Od8@d=Fp(qlSC@0i34rRi&P_7NWE-&eGSrN(L11o5jGy+MdCOQ
zYlG9*pI{$?`jA?~&=Ah5XDpe4!+k<Qh<)kcNdv8}Q2haEw6LA@$#SYbX9k>6qON-Z
zQ@#Mi261yxm-Q$aMLKqF-~X`z-~k0Jk2}kY&l42KOODSL9ZObEI@^$R&Yd2L{195j
ztgTg};DGO#I5e{zeh;SL411*=mh3B`c*KLrM8Py(z7Msu8}aHP0T!X}JsE|nP8Rgd
z{Yl#2=lZjOM~Y}%rR!C0e(&*=d-DVmx@6C)YEqbWF!Ui&9mfMMwW$LY3<@wC8@;|n
z_gFwZ2C1@kP=-rp+w51haWSomow87XhfLbm>f)<nTR`#ZkT(}Pn#mXzsCE|4z_VXf
z^!18r3zfM~Y}%E@I{zCDAse={(7c$lGpCE5OZB}vcLA&BjFBG^o7FQF#5%o7h=wsv
z%EbUiF#YLc9QCM$ib>(pvqME$xN2@g$>jWa`>Uo+*jpHxXAqv!P|b4vt)q$sI`TDP
z3yb)-aPV3Xg-R}5t@OE$Svt4Hegh__a&nQpxx9pZd~Y_woHR%JdNUcL*|W+L1!MJU
z&$-M|3-<{h8C6h>b%IM2`vF9CpKGrwV&QJ<dB_cnYi<Xm<>=xo7(cDm?w%Xrk(<6Q
zY;JvY)4%hf5Uh)FXWrB0YuaYhBvf^=rF1-k+)Wq(fM9wAnUcUFcIHr|3Dr_up1U(f
zz^VZ(<eXKr3P4S(q@qd6)Xsj@8wxVZVg<&+BAh9h)eL%0=O@V-=3+C*`6q0A4wq)+
zY<fA0(+^;LDa{=jsA9=TR$|TYi9)QH*;9ekz7UDEDe)~<O;M#RrAe=;Fy&QFIXD?!
ZiZHSM?Le&R4iyXLaxNC<jPQ*W^B<MJrEmZM

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/number-001.js b/js/src/jsapi-tests/binast/parser/tester/number-001.js
new file mode 100644
index 000000000000..37ba1b798bc5
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/number-001.js
@@ -0,0 +1,53 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          number-001
+   Corresponds To:     15.7.4.2-2-n.js
+   ECMA Section:       15.7.4.2.2 Number.prototype.toString()
+   Description:
+   If the radix is the number 10 or not supplied, then this number value is
+   given as an argument to the ToString operator; the resulting string value
+   is returned.
+
+   If the radix is supplied and is an integer from 2 to 36, but not 10, the
+   result is a string, the choice of which is implementation dependent.
+
+   The toString function is not generic; it generates a runtime error if its
+   this value is not a Number object. Therefore it cannot be transferred to
+   other kinds of objects for use as a method.
+
+   Author:             christine@netscape.com
+   Date:               16 september 1997
+*/
+var SECTION = "number-001";
+var VERSION = "JS1_4";
+var TITLE   = "Exceptions for Number.toString()";
+
+startTest();
+writeHeaderToLog( SECTION + " Number.prototype.toString()");
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  object= new Object();
+  object.toString = Number.prototype.toString;
+  result = object.toString();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "object = new Object(); object.toString = Number.prototype.toString; object.toString()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/number-002.binjs b/js/src/jsapi-tests/binast/parser/tester/number-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..f8d2838668daf7c2e2ac2b28f07eb990cd1308b8
GIT binary patch
literal 7588
zcmds6&u`l{6xM#P-C+ZE>kiW~MbIT11`Jpn1B>gT2?8gGja&!DVr;FlWKeVxqkm%m
zf?j&xasNTzqe$_^q#fFE17{~eqWJOs`1n2QsUauhj5ixY&XVS-C<cO!qR*o!x+s!q
zba2=?>i*g77h@hZcGNqKEG=bo@24pG4&G|e>E}$O>>}eYc|T)<$+XB7RATST=uMg@
zx3N9|&S!UF6+%I!NtEWPtO4lqhY8PRdYN*e;Bq#yMwe2g`Jnj?EYoebdWR>S#*Tj0
z*wG*qtE=8WP9+yCQ*c)-n>ct+0WY77F1UEHyZf69X`pvh&>DKhFJRUc6YlHOf)#`L
z9<U!UnCI=Y?z)2c6_|e1{q^tP-M~D29RGW`IHKRZ!`^Y*^_vnRkdi+GTKlHY$GH8<
z__7djM=|sl#o&|6t>^AK_lR%%W-NGF!eU*?Bp<;ZR0QPpbMIztu`IJw)r>wo;&zKs
z-vhSx6Y#r~OvoND<pK{iEJe3=+{XnJP3-~`g9!$r^tvA4%nyKdEkJ!<gDi8=D~^kS
z>yr|d?_sw)8~z~8nV4F?B9t5uaS&w?(u`lqNTh?I)lscX2()b%qCpC<dfn;@H6}9T
z9g9L1aysTq(70x`C+C|luU~`ru(Kwahs`uGfx3WjuUMM##O8N4Ko3`@{sn6s*3RZ+
zJvASNfg3?|eP1DzKLTQ>h-=VT4n=XDyV!Mn|BvM#2?Zk0`|IQ9DJ#o0^Rp+WR@BwG
zHY@sXq9MzZ3=WFsP)k{GfN#u9T6h@#144lUd+RW4#n(b1;~`|aUV0b*3rguA$KqiD
zmQnA0%R=f?fO=y-i;I8m%x8yR6VuS8`xS0n_hinx^#;<un0xA)HD(h6{j#8mL&8-t
zji7)*{gqR1*4LPx0H|-lDp^!@!_vjX)?8_fSMzGMSpg0pWvWB1Yd$qQ01B%^eYSAX
ze8C7n#gmXeZqLUw*yc(t-z-uGc#J6tIjt;r?*F6=3K6>i&%<_;NwRaTjs`UMwCMs-
ztp#ItDxK3}vOjEPY*KPnEymD)8O`tE(5V3~s=DP8nW8LRG`FE*qC7tSq8UQ_fFR=z
z;&aYZi&FpSq+*E!`G%-P0RICLyb(e{#Rc7}?vJ^wnzlUYK-<*zEtEPvgZJ=V)4!Yz
zM<rpi95we;C069>?IY(p8!ea<Y#6mz$z6d{j=cq;`VzgTjs&DTxEt~bnl+CDGO%-T
z2Engtb-W+v{5r0_7Pg-6#nofe5`tmf>a0(6W@z?RUlWw(H_$YsPrL=6|6r9%AKwlL
zAkH27=tB)O7dP&L?k^2MfSrp9)(TMb%BXHi8Mn=quCSu4ELU9uB7!m@gWAv9De8n@
znV~1PK$+h`MzL3Hl-c)TR93&faH!fimZ*Bjt5kZ-^K(Lv_@$FTI{$|B*c^WAQ6H<w
qP_^S77v_A%k%_bPBF2>NZv#E*CR7jjYq=iue*NjOJ39N`Qu+}%%d2((

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/number-002.js b/js/src/jsapi-tests/binast/parser/tester/number-002.js
new file mode 100644
index 000000000000..5f4462e043f8
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/number-002.js
@@ -0,0 +1,48 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          number-002.js
+   Corresponds To:     ecma/Number/15.7.4.3-2-n.js
+   ECMA Section:       15.7.4.3.1 Number.prototype.valueOf()
+   Description:
+   Returns this number value.
+
+   The valueOf function is not generic; it generates a runtime error if its
+   this value is not a Number object. Therefore it cannot be transferred to
+   other kinds of objects for use as a method.
+
+   Author:             christine@netscape.com
+   Date:               16 september 1997
+*/
+var SECTION = "number-002";
+var VERSION = "JS1_4";
+var TITLE   = "Exceptions for Number.valueOf()";
+
+startTest();
+writeHeaderToLog( SECTION + " Number.prototype.valueOf()");
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  object= new Object();
+  object.toString = Number.prototype.valueOf;
+  result = object.toString();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "object = new Object(); object.valueOf = Number.prototype.valueOf; object.valueOf()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/number-003.binjs b/js/src/jsapi-tests/binast/parser/tester/number-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..5ff1d672080e763d18823bad698a60f83ae84427
GIT binary patch
literal 8026
zcmds6&2JMq6dzc=IRM%lATdV}f`Z_LvXy8EB2|<k5_&~$#z}@w#*yt%@_%yK!|s_q
z?tj309?#f}ozw|w)pCj^9{>D4fA9HCL(Zld-ENF2Nw(i}HsWLwU5ujWfF<*2r`_G{
zz3L6vltzs$^-d#8h1~vjKZ<U`TMc{rKH(`j$mkn7$OtDgWx0Y%%(I9N(>(bZ>tDdR
za2yun3Mx&aG*4v(U?1O3XfD%XO1Xl|$;1dPBv13v_Ek8h*J}3Ld)>yC{;#p6L2Rs^
zdcTuO%1Nf+zL0F@;N1Ycd^S0t{K>OtFI>nHdP^Ctp-=n+c6}k-echH|O=JEI*r#aB
z{nm%xri^(RMBnW_|Mb!|%<0?l|I@Q0>fLYmJ1tjlJ0Jo>@&TZ=z7FUV(@(@h#^bJv
z(5EVb_l6H2x##?XeOq6roC*Pl^(2vW0y(GxkXHYDleI~*%xqOV2Jja(DQ4>)klNQl
zZy^bneJbP<4K=KdZshnC6_7Nw3WSelXb9m|JwTb;fOW)yeck~rQ{HDCHga`Rq;d<g
z-AVYJG$(v+^oo#jfW(26fk-ntlo3xyW5c7GnGoo)Imk9rfYh62*LxsM8N5@@B$M+g
zT_KFCsP_2$?9=NN&>k{tmU*Jtc1$2IAlzG$W;8MWtsCg{%G7@#jT5zXpKPY)BQemD
z5MABZFy)_s*ky4A8p|<fN4bk#+4pxW{}@m}@^rAd_<T=<*l>LI`P`7Y>T5GLIE=<5
zPcmo}%cj<jf*pLLwrOcI{0|V{C9uX%&9EU~1BDR}Ce!uOd-!W8rK22+hXGiHz5g;%
zXzLWf-q%35{nwq3txtPz4M-WnHrN|x3x`H!2cIDhA|Pp~F>>zJY`t9pf@2^SEzWYW
z1E7#As!HRc`HT^Oigi&pUyCtI?DE$(xCw=G5=-cky`5dSX}Jp9igoFc(M?_OHq}9)
z1Vv?ZB~Wbq5ngaAP+%>^RB7i!yot_TcwI$HN7jFB{f+Wx!LcWrp&{Y0sa&#69Duo;
z`Oc630#wDc2x%%;yPo|vfm8Q&^;|S?c3jz`F)(UX@~SQRWqVJP$icXok(r>XrcYr?
zHd#Drv$qELR&^IH9oZ-=w>FRA;)n(Qe782CQ6FGrgrW<&-es;oTTCCI=nB`SGeQ;t
z@gJZ!76Zu^wGMR`JI|XT3Y%O|t>U>uWieW(Nf(COX1b&fy$kQDhDH>#?z%Y&$sB<_
zG__`|o?J7BKEbhGlL+b(oKh?YqH^wF0qzc-S)IU0?R-E6_QWmlQE_>N4=oF)b}<n!
zEupc#4#jL3lejn`E-sO=>tMTr1xkYv6F-Ex3_bDymPud(2gJ%Tl;}eZ6c=-K$yk0x
zIhWO_HJ}#tiwo{K_6ch;$!Y~9z;nn9GU&U2R?1ewPsT8;Ttdd*!J~KJ(DIWXx}-j%
z5Cu=;QvGtIm%QX;Z7ZV7B#d72d{ELWej>FN-2sqZL{XfNeR^#{Ug%X{G+G-y;}&aU
gJ@%}P!u{BzS6y%G1%GYVi{2@XUOVP{jJLG@0KmLA!2kdN

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/number-003.js b/js/src/jsapi-tests/binast/parser/tester/number-003.js
new file mode 100644
index 000000000000..8d0ad83db006
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/number-003.js
@@ -0,0 +1,50 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          number-003.js
+   Corresponds To:     15.7.4.3-3.js
+   ECMA Section:       15.7.4.3.1 Number.prototype.valueOf()
+   Description:
+   Returns this number value.
+
+   The valueOf function is not generic; it generates a runtime error if its
+   this value is not a Number object. Therefore it cannot be transferred to
+   other kinds of objects for use as a method.
+
+   Author:             christine@netscape.com
+   Date:               16 september 1997
+*/
+var SECTION = "number-003";
+var VERSION = "JS1_4";
+var TITLE   = "Exceptions for Number.valueOf()";
+
+startTest();
+writeHeaderToLog( SECTION + " Number.prototype.valueOf()");
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  VALUE_OF = Number.prototype.valueOf;
+  OBJECT = new String("Infinity");
+  OBJECT.valueOf = VALUE_OF;
+  result = OBJECT.valueOf();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "Assigning Number.prototype.valueOf as the valueOf of a String object " +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/octal-001.binjs b/js/src/jsapi-tests/binast/parser/tester/octal-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..5a3c602eecff39f4a9601c03641763c38a7e88cd
GIT binary patch
literal 12564
zcmeHO-E!MR6c!XHQ0N7`fZO3BnNF<+n9k5~42f&NOzL*xv{%ezHqu5`D@*F`sw6Xg
z1@3_x-iixefY;z0X=SbcoVBfZl8$=Qv3B>{J%8Uh`;(rCLXY-)Q%daqGZr|E%#8O9
z!#D}-b7Oxr{$=uLVg(^JdS=|G=eb<;?{*F2W9ZdWhrb}qB_|$zOf8QvBHX}_q3rB8
zH(t5EoyYnQaNfHJD_}8{Ya6cbiaCHf{m7=ia8F&zVmP17vPE;jT;J*6glQ(j!O`gH
zxM#|5JyU|HSd+N_fh#B@UJUn!cu@)OOTas%&hRWW14|I^{(}cQ-Iu(Koz7v#+Uv=w
zZ@}<3gq6FiOIcB?{{r>~wfbUsIB80&AHmXxgC~2(Uzatrc}3m;EpAAWAA;aVqoadi
zS#H%MG@Ww?&=TkDghYTR`@AEjM0Bjc7sT~DPtj$E+#(^J(AN?5EqWzfcY_-L1a!3j
z{HO8rC;P+0Mznq(5T`<fk4%#TZ${iai5wn!M3{UU{B{h#x|ZX9@7lZHeEV?cyNBgj
z*YI&*B1Sm}=A8&4=nNP!c3wLFUP+w;;(6K7c!UL?XhwLd|7j2{>Xi$^#1Z9UfrJuP
zMbFl;jtH2-qzHsL5h{XLimoBdZNS>I?Ie~4gjYpL%<E?`E0R|(D<;FzRD$c0(P*4{
z#K{&Va{_X}R(Jc?olI-81sXsC`D2}|g;~&y=P(<=`vCBM9^JXq2pHx>09%YT27@x!
zN|lQAoXgMf8~^=Ksii%}$a&^vNql&5tYp@R?fEBQpuuwX)MQ^A*N{q3yb6WLTB5)f
z^PiU%TDY9`*a00zEKLkQM!tnLrCMGh64Zntl$$eNU$d(G(qzE@1G*>$yv77LhEWGt
zd9j~sKz#~OzzN3<!67$Dep-8Jx8%~A!b56=-2**adu5*k(u@deO8GHCIw&K`=u$mr
z-wUi)SyI9XU%X5Dy<-@-=p28HPV*2L2nLj7JTAeiw>AfX<3h+Oq=hsIyE52i!OqB|
zr@~;aGtEZJG=Xb;`!<s<CywhArV`;2n7g~xn1g&FfzxYc;m3hcgu`LM$xCVpBV;J0
zIA1k)HyCNiHS~;HndC*Tjg!VR=!O)TH@e>5v^G)-T(6pO9C==v2w~c}qKb=C$LwE%
z={2}YBka^w>PnVMs*YVcR_{WfqTl7rmic5BvuIl&Zdqo})vZpxY7}Uw5IGfUQ7o&m
z5-s~;?1Q(#S23D%!mMg^6!=~?kt*o*fYeZ{E=_0_e+bt_uGq@-mU?OWzp6)#6<(N3
zt8g`!ix%E)Y^6&^`KrOvri}PFQ#WN4GDwxT98wW6<=_CkVoq;q|EjV`IV7$eB0W8Y
zP#yoe66`(57A?W1_XZmDwahj}leMlH$>Md%cGsi6Bc^&>dua@}BtvVM7j1F*qP3}_
zzv<mYL$=q*KG!uB{L$9h$`!JPzqF|U581Z6HAh)hWs-(gH4n#D%PB4KUPa<vVDi+7
z-eKPTtL5F6cjdz+%^gF^yJ588PFmfbYVfZ1g-Of2^TPz5yvDks2kII|PndV18@<EK
z`*(Zz(K7FH%==kf@rocJ>MhN~=0e$t$JAE+v!vAsRwLS*KQ6(upi~+4XF+KZr)H#0
zsH8AQdx<N3UBgutRs)5Upqf<!dO4pd%$2&5{H#u`zVQaPoG0n|5ZQT^F&9jSo|Q}w
zkDQZdJ=7k<yKOE%4@d}C66v?x3-nts_zPUFEG8B`(vw|k?@ncV&0|p6il!~S9hYrb
z4-_8mDx*qoqh(vU{!!oxrvtf`T;U;Gs!m{K(*pjIJu2N+0WLl+l1(+QJY{R`jiqd_
kI|q`@sGa;HG1*WP2=T>t^4AGp!B9*Vsc+O8zB)?&2kSKR1ONa4

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/octal-001.js b/js/src/jsapi-tests/binast/parser/tester/octal-001.js
new file mode 100644
index 000000000000..0aa1d040746e
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/octal-001.js
@@ -0,0 +1,78 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          RegExp/octal-001.js
+ *  ECMA Section:       15.7.1
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *  Simple test cases for matching OctalEscapeSequences.
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+var SECTION = "RegExp/octal-001.js";
+var VERSION = "ECMA_2";
+var TITLE   = "RegExp patterns that contain OctalEscapeSequences";
+var BUGNUMBER="http://scopus/bugsplat/show_bug.cgi?id=346196";
+
+startTest();
+
+
+// backreference
+AddRegExpCases(
+  /(.)\1/,
+  "/(.)\\1/",
+  "HI!!",
+  "HI!",
+  2,
+  ["!!", "!"] );
+
+test();
+
+function AddRegExpCases(
+  regexp, str_regexp, pattern, str_pattern, index, matches_array ) {
+
+  // prevent a runtime error
+
+  if ( regexp.exec(pattern) == null || matches_array == null ) {
+    AddTestCase(
+      regexp + ".exec(" + str_pattern +")",
+      matches_array,
+      regexp.exec(pattern) );
+
+    return;
+  }
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").length",
+    matches_array.length,
+    regexp.exec(pattern).length );
+
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").index",
+    index,
+    regexp.exec(pattern).index );
+
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").input",
+    pattern,
+    regexp.exec(pattern).input );
+
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").toString()",
+    matches_array.toString(),
+    regexp.exec(pattern).toString() );
+/*
+  var limit = matches_array.length > regexp.exec(pattern).length
+  ? matches_array.length
+  : regexp.exec(pattern).length;
+
+  for ( var matches = 0; matches < limit; matches++ ) {
+  AddTestCase(
+  str_regexp + ".exec(" + str_pattern +")[" + matches +"]",
+  matches_array[matches],
+  regexp.exec(pattern)[matches] );
+  }
+*/
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/octal-002.binjs b/js/src/jsapi-tests/binast/parser/tester/octal-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..3a42bcc33bef51ac10902d1b4981c354cb25073a
GIT binary patch
literal 16156
zcmeHO-EJF26kcfgEffjvK%fY5kx<oc3qqxGf|Asrpw_M8v{y*ccs*HfyV+fK#wC&Z
z3fv=ZxZ@Rg6E1iGu6Y7DXLrUs`{&HsV`E1vMOk@g=FH6b`OevMW;%QvdUU5VqGY)9
zI0~GIoLaA1mNf{5=hogq@B99}z8!?r>a^oN9nWQa=ktzby$!uO>hPx|a>>A>_o?lX
zh;TRXV^YKPH?y9*{xD1HZ=mzaMYMt_Cglz-*LV4ZfI9ubkow#`acLBj^T}ztXvQPg
zcXr-@Y5Lv$qk~7iPFuX|v;`5BRzL3lz~wX|UQF%<@x}#u9{{~W>U7V-c3^Yj-Mn?{
zPU{&f(w1|yWA1gt)K_5m3lbH(t4o=YtA7FQC35v?_pon@tFOb-yZaA!kM9&YvwTKg
z0WL0yk*~qVj}DF=bc_2|H9}K4Zv(YNIX6PWL6d#9!AFE|*n!W9>u)?lmF+T{gtSk8
z98=$>E1|ke<oH{_qrE5J^`1Q3>mC~6`c0rX;yk?9ZZp8mF>4RT4hucP+iVp4bPT^*
zw&Q-|4!6Jf@~hi-zb?)?hmHdhMU*i>-aaRso&qAq%1bBjOQCb0cwRa*9$~{PngX7x
ze;PoGd}W+O{D?9>Wru>SN<Cf2JX=5)CbmE#XN-(srCZn7%ypo(I~*pqv`<)>mBhII
z$5qQh@XC0_WSDd%xGrIh)`>@)bWy@5d<Y#jTU(`nKio}ODY`>%*p~P)k1P8K2(?RR
zg_r8YQae?dX(G~lFb5%nfo&6fz|%Ie_S$rNpb(L3OQ9r8Ov0P8?d?VpIZyR6u_!OL
zu2g=p2K)~4McvP6fF^fv+=M$u_=0YWtRSU<u{D{aWJVK_<K`$WRCXd1mHM9ldAX4J
zUjxYeG03(GAQ2-KPrh7mRwkCxoB^EQQQ!xm*@%tSBf2nH{s&;W@VTl9%Q#NL^1vM4
zEY!AV5I-W9x!swgWJV9y2$#*tE)VHR?m<F?e5&)MG0xh>-dEw{dEVIjB7|RH`27i(
zUuF1hE&_j71v6p_<!e%1eVAWGa5lFlbKq=_QUmjj{2E1HRhn(CaMAx4%*Q@;t}GD*
z<rc4<Ao_Of+gMvr%M3^fY6BsZ9Zp$w?Lzf+CKEq@0xt^AM`HpU6H$krh0~*L4N@4U
z!e_^^A#zwL5qYY)mv&7o%@jRMlS37Wp3S{7bX=!|+at=32_|`p6oqxEnzQEx_VYAA
z!j#_hYT3^lmW7MXWQ7h+vLw(DEJ)3>I2B)B;(8D`E@U;+FwMde5>)4)+6EOekDhQV
za-C5+T6~G(8ehIlcbD0Y>yt=LZ`Gi=y<JW-mr%y(wX(7I1FmcihXsRY)aF(g;V$|4
ztT|kRmWEhE&uEFqk|A{*Xg`K-2$5N#>(wYLEhUHbsu+7?&yy|$rkyZKE=oStF?$OT
zy#`ikn4P*x-JO;0u&%9s3Wkb$ml0d4lc~+3Yyr4Mxn;s`b>XvGfd&f^Q=uk-<rS<*
zq*f@I5bNM|&{eeN%w}d4I&SzzI+423^&qLiR$Z9T%pD=Q7GlL_$~P$>`BeF+vBC?T
zX&GJ3<)VbQjIFe$mCtG{jmwCSwdlHxoChh>mP5+Nky1bgt(d@@>|YiZDTjqhhX_rV
zBvi#;SAe|%-l73md45a-zUq9YXrk7df$W<IvMrDL4j<`Z?ZObQCPHh77iF>dtu?M<
zXW3sDhGehdeb&_#{L;kQ%28qseQ8_)CfT-H6{)PUFiC@}n#r-*d`bhns|dVPL@t%+
z665Z#4emC$D=x5TelbYg4aZZ?Caa&P8n~-nFlmr?l1yO9t(+B2sA~v4LEfoqbcvDo
zw<h_~Aa6b7#q*$BEgmF5y{VaO&V`+rrnajO9?S-?8rE(;U4pqF$&Bh;kPPBfkF*Sy
z<mPCKxI))8RAp*3kaG#DST#u3)0x~{QkBGOb!zplFR10jNl%7|&a;fUU^>*SWO}&l
znjGt)!yeq<W#aWd385q*-(_whUxUH#<8nnXG3~OJ=u%lb73~$50!1r|ws417v|&7u
zyTGZ8D%_D3ZN>OUA(zVzWLh$ThiECwz>20R_$7Ljs;xpef4E3ARowOyt(6r^(O#7Y
g63xh+>>)AHP+<tkDd+hAXD}3<h188o!IxXfe|Ju8y#N3J

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/octal-002.js b/js/src/jsapi-tests/binast/parser/tester/octal-002.js
new file mode 100644
index 000000000000..309fff473e17
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/octal-002.js
@@ -0,0 +1,93 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          RegExp/octal-002.js
+ *  ECMA Section:       15.7.1
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *  Simple test cases for matching OctalEscapeSequences.
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+var SECTION = "RegExp/octal-002.js";
+var VERSION = "ECMA_2";
+var TITLE   = "RegExp patterns that contain OctalEscapeSequences";
+var BUGNUMBER="http://scopus/bugsplat/show_bug.cgi?id=346189";
+
+startTest();
+
+// backreference
+AddRegExpCases(
+  /(.)(.)(.)(.)(.)(.)(.)(.)\8/,
+  "/(.)(.)(.)(.)(.)(.)(.)(.)\\8",
+  "aabbccaaabbbccc",
+  "aabbccaaabbbccc",
+  0,
+  ["aabbccaaa", "a", "a", "b", "b", "c", "c", "a", "a"] );
+
+AddRegExpCases(
+  /(.)(.)(.)(.)(.)(.)(.)(.)(.)\9/,
+  "/(.)(.)(.)(.)(.)(.)(.)(.)\\9",
+  "aabbccaabbcc",
+  "aabbccaabbcc",
+  0,
+  ["aabbccaabb", "a", "a", "b", "b", "c", "c", "a", "a", "b"] );
+
+AddRegExpCases(
+  /(.)(.)(.)(.)(.)(.)(.)(.)(.)\8/,
+  "/(.)(.)(.)(.)(.)(.)(.)(.)(.)\\8",
+  "aabbccaababcc",
+  "aabbccaababcc",
+  0,
+  ["aabbccaaba", "a", "a", "b", "b", "c", "c", "a", "a", "b"] );
+
+test();
+
+function AddRegExpCases(
+  regexp, str_regexp, pattern, str_pattern, index, matches_array ) {
+
+  // prevent a runtime error
+
+  if ( regexp.exec(pattern) == null || matches_array == null ) {
+    AddTestCase(
+      regexp + ".exec(" + str_pattern +")",
+      matches_array,
+      regexp.exec(pattern) );
+
+    return;
+  }
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").length",
+    matches_array.length,
+    regexp.exec(pattern).length );
+
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").index",
+    index,
+    regexp.exec(pattern).index );
+
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").input",
+    pattern,
+    regexp.exec(pattern).input );
+
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").toString()",
+    matches_array.toString(),
+    regexp.exec(pattern).toString() );
+/*
+  var limit = matches_array.length > regexp.exec(pattern).length
+  ? matches_array.length
+  : regexp.exec(pattern).length;
+
+  for ( var matches = 0; matches < limit; matches++ ) {
+  AddTestCase(
+  str_regexp + ".exec(" + str_pattern +")[" + matches +"]",
+  matches_array[matches],
+  regexp.exec(pattern)[matches] );
+  }
+*/
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/octal-003.binjs b/js/src/jsapi-tests/binast/parser/tester/octal-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..c1c1dd331e5158404cba2a717276213a6ac90add
GIT binary patch
literal 18706
zcmeHP&2HO95N4aE{|yQhJ@sPr6eEZf*J)7%ii22D3KxkJSWYf&VXVou#DpSQa+TUZ
z9;8pv2Pn|j=pn~m`WWd9xvO3AM;cM0VyC=Vuy%Jizu(LbchwQ&(BnIuA!p9c<0u$J
zY-GJ_S=MpjoLRej`#<(?_3a?!R;QiJ>3D7|cK+yD)`u{wV=jNnB9|R|{2sSG7BS%l
zenQI8|HsyI*LS9A{R?#7nMW&#5>l>XxxOnV1kA_pIoucSiOZveoX<v@=~zUrKiK&I
z9@Fo25BDDJciQs1PFoT&Y4wx&4_v_`<|X7_FmIfr_XW^9;Dg?2*bZ#Lyz4h^Y`31p
zdD`k3?L>PW`RGfq`~{2h(@j<?YV{S+UZYl@_73{1((3!bdawKN?$I}S&8%OMmq3ea
zQsiY2{BZB^K`$@2=@CTd+yZK;b8du8fG7L$h8QxjVF$iouD|gJUA7n7EaZLu>zMmC
zKNqgMMvZ?2I@*2m!~T<pyS;;zX#F}+910QMYPVy+&2ij59uMNsW1<}ogWrzezm`34
z@3_wG?VI0iZLikH0f{0W$AG+j!2}-xA|}quC*K!BXP0@NUYe}1;VZ5I&-6b6(4t;r
z!6I?UW0BYEB#I?jle*?(84)mrNfB5y7^5QMLeUArTmf2l9Vd;YE{ltzB*FF1-?J<P
zuc@q<E>o!l`I6CSop@}ZnUXmHF`)JHjjb)MH8}zUAc6d6nXH8@w($||+2nRzpG9Zd
z9v0>+C<P$3Lpt{OiLfGfFx1&t@`h-6O_Mf_TLZ~HEmb2^Of#iC&}1$X1!Nbx7YIX1
zxGXq+#%*DR5o$}ERdqZxR4U$V#tA<BDUdpef>C$KqHf^uJVB+A#FMvSdM@ehLl{M_
zty~$VOaxPlWqmXGw;;ZW_Cht9L9han7+P#Pv=mj-4G3aRPxrhfRieFT8OTF>Er;3w
zUzS)Hu<wt38*6>D>_<vatB0@+7{%p#2~&>*Cnf{&-=K>e5ECANYa%}2r(r%m7UcC~
zAO(1Mv?6l2bCG#tY1TfGtgVV3#ue=9`03J|eFl_9OxQynAF(K6XL*VeVN7f6dV&31
zM-C##?A_~M-&z(bbSh8polKL!K(L@xj+4?@Cpq)U4}yUUA*bV)nj(?MmoK$+Cef-n
z5^3JPT}<;_rnVJ@24W3A<+hewp}P7^QrcsfmP=^_OqdyYnS5uOaeq7~FUZN}nmSBR
z5RnjeCYMynl={uJ3&-l$fG+6SQ?aT8PRA_T7JyrBe<qcQ`S7YyKu{rKD(n$(yMsG~
zye}p`cm;eFi|8p~su~>yUSFAA1D6D~QWG+<s6=ut#EPqV0~L8Ify24Uw1_T|U9|A#
z$~avx%Bu!Tt-GPOFJ)vhNRhW3a50XIh7Nee1m4vAqO!<n-WM*B(5Oh5NO@5K_8Mf1
z24L0u90GhTvP~hP)&&Due2ul)^0+?`LmJlBhHwiaG{L-Ri~2=tQpL`?cNZ(NJt6yC
z)Ku_$Q)?Tq_6h#dqypUPZ?;NWSw&?ML94{(Shbwe0PlGO-WeuWPV^Sz?yIH*Z*W&0
zC?oC|6z+!O8D|B|?P*oqBj7bw%se?0liv)ykv{U9l=U@qps)!w)vs())uj6pr^gD<
z=^F@wx2LIUX53{{RT2b~<0mSinbCPscMNwR_M7HW(>%hX(8SDz$7(iPB1orSB{u6b
zkd6pzmmjyQhPQ;^Uwyj?dud7;`Shu<LVcQ;kx>c0@slc9`uN`5jQ%}5Etlmo4Ao+z
z%rnSB*X9wZs<-bIi|J>CuvpBA7f+8B5A^>7#>shUmey*nNnlmrxg)or8aH*>4SdJN
zlV7<LFv-~&=HZ!hIE6g#6wNZPmUlGFn5@+nA*;tsjJc*okGFFsMWty;Lcm_!@|$A&
zqHI~sy_<A%9=nAUA20)=n(YZ;^k$$<x%cEV-CxR`HEze|-jKT=MEV$5x}$|Ff=Lb<
zhYlv7(&M0}VzarFczy9tU~x@(8T(}Nc&tu)N^zzrgd^-~nXF$H(f2a>x}zC4878<V
zS$G1i83m5gi^<)S#EW!WBRP;bxd@{+DA}$Mmh;z24(JhhoGEV+mkS@Qd<~Dtd9IdH
z#}rQD=lp2pS0GH&yiv`YWkR&XWosZwh=S&&G{VT{PZ~B==&Mf?s0a#O7*>d#FvN&o
zXk6|_%zn;mx-+->DrRAgRjsoL*27|P=G&>uMZK)*3a=_kZAB_7;D6ttB6%dOF(qf2
zAY%UL2WWdz)+oSHpJi(h2~rwRQKy#zxw8+y#-Z;zCpG>C%uC7-S$h^sRs6bX4%<`~
zZUGC3uj&Um3hKfN%q^>!dbpaSGE_r})zYuKEQDj|g_b;q#a|j~oOMrA>a+B|j2tid
zVFtq*x!-Y-V~7y_<h`uUMsf(voB4eWgJA9_Obmiq%#}m=&XXJ{ziurjq}$Y~JCjo*
zQ?F#@NKvOi4$a7Vat20M?!u=*I18$BsN{zn<Y?*T7dc*5y~$xzA8ylghAL^nr&y5u
Sy#q_l$erg;g^9BeTmA$2hr}2F

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/octal-003.js b/js/src/jsapi-tests/binast/parser/tester/octal-003.js
new file mode 100644
index 000000000000..a73d7d40e232
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/octal-003.js
@@ -0,0 +1,87 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          RegExp/octal-003.js
+ *  ECMA Section:       15.7.1
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *  Simple test cases for matching OctalEscapeSequences.
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ *
+ *  Revised:            02 August 2002
+ *  Author:             pschwartau@netscape.com
+ *
+ *  WHY:  the original test expected the regexp /.\011/
+ *        to match 'a' + String.fromCharCode(0) + '11'
+ *
+ *  This is incorrect: the string is a 4-character string consisting of
+ *  the characters <'a'>, <nul>, <'1'>, <'1'>. By contrast, the \011 in the
+ *  regexp should be parsed as a single token: it is the octal escape sequence
+ *  for the horizontal tab character '\t' === '\u0009' === '\x09' === '\011'.
+ *
+ *  So the regexp consists of 2 characters: <any-character>, <'\t'>.
+ *  There is no match between the regexp and the string.
+ *
+ *  See the testcase ecma_3/RegExp/octal-002.js for an elaboration.
+ *
+ */
+var SECTION = "RegExp/octal-003.js";
+var VERSION = "ECMA_2";
+var TITLE   = "RegExp patterns that contain OctalEscapeSequences";
+var BUGNUMBER="http://scopus/bugsplat/show_bug.cgi?id=346132";
+
+startTest();
+
+AddRegExpCases( /.\011/, "/\\011/", "a" + String.fromCharCode(0) + "11", "a\\011", 0, null );
+
+test();
+
+function AddRegExpCases(
+  regexp, str_regexp, pattern, str_pattern, index, matches_array ) {
+
+  // prevent a runtime error
+
+  if ( regexp.exec(pattern) == null || matches_array == null ) {
+    AddTestCase(
+      regexp + ".exec(" + str_pattern +")",
+      matches_array,
+      regexp.exec(pattern) );
+
+    return;
+  }
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").length",
+    matches_array.length,
+    regexp.exec(pattern).length );
+
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").index",
+    index,
+    regexp.exec(pattern).index );
+
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").input",
+    escape(pattern),
+    escape(regexp.exec(pattern).input) );
+
+  AddTestCase(
+    str_regexp + ".exec(" + str_pattern +").toString()",
+    matches_array.toString(),
+    escape(regexp.exec(pattern).toString()) );
+
+  var limit = matches_array.length > regexp.exec(pattern).length
+    ? matches_array.length
+    : regexp.exec(pattern).length;
+
+  for ( var matches = 0; matches < limit; matches++ ) {
+    AddTestCase(
+      str_regexp + ".exec(" + str_pattern +")[" + matches +"]",
+      matches_array[matches],
+      escape(regexp.exec(pattern)[matches]) );
+  }
+
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/properties-001.binjs b/js/src/jsapi-tests/binast/parser/tester/properties-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..f520e8914f2bbe7043267ff27b287004f5abc42f
GIT binary patch
literal 23094
zcmeHPO>Y}T7~b;zQE@;>d>pDAD%20+B!~#La#A&EKtXLlb=m{5izfEO-FCfecGqpv
zj}xjmAP$`P0f++^_#xauf;%S;`~=>2cg8#Rj<c`VW5-{Yy4l%zXXcq_o|$>)oh^o~
zro-2ZcR8!Af8l#|pEa!KEX&&WYDd<__ReRe%cZK<<W_MhdZ*~vLAd_xwq?BuZxz+-
zx0!FVeTQG;RfqX3v^_U6RZIR3toycG>$LSR*g2JD%kv{scFnR~J8T<Ji{GwsH?$9I
z?nmZa)<`NHgud<8*I$NWN?V(|+n?_gm&CK;k}#s$Dn;*Kw?pnTCo=bdIjxkvcfj6F
zUf()wE;W4s$q#KFEG{pv6z&D-0%So;5rjoi{_|kt0rS(ZtM$nV?O$MfgwWpJx>+&>
z?MqPgt<4)(zxptZ%;<sqZ*)Mu2u1B~?_S?Zw_9Zdk)db68VqYe%?0mZA?EACwi|@Z
zt@5$p=^vwm_f;rr<JPA;w{C1~-82F*7z91)R+9lZ3UcD}AOQI+g)HO^khN$O^Y(MC
z{%tbHNwP*cs_=*>s-^OWpq2;~ki-vnc@Q4cLSa_5p44NICg40In!x;e3xNo<O(!(w
z4X|~!R*Tuc$pRhmBVGO;1QW%lV`|&s50fStfEEjgtI``+6;I-5e*w&%yK?z_+Nf%5
z!}A=@TsgZzo;IkGwWE7|2fEd_tH)JF%$Krm@>i{6(m4~yw?N0Ym>Uul90yGn!eYd=
z4jfib27yo=e4%h5>2>iq?%8f-QgI{ls@uM<3+Akn%jhm4J`ojrW`I?=THY(yDvwv6
zrl^Ih%6jrtM+hRfw590mbrB3}(6J~#rCrH)<%)+yyptgmlJ)w`tJgOMc!rbVUb$4c
zayB895H0LvJ9(<>F(S=$h3L!;#+Tuca^_j~vjLX94OF^wZjUWKs$4j~cc=WY9Fz~r
zZrQI~ObDjXu8};|@q|b_QmH!ogYhs+x4NtoX*=^g{K)_h(QUR@zE*j>^1<rUz4F3h
z1?Sj=Y=VNgYN(r$zN``n^dk}^AFaA_WpQ`rS@@#?7M?~Hf)-v~{Bn8mQYF22i1=ql
z1ACV>H0EV-sEcw$de1!belWm1^lu(MIePLaC3)xxuiIugrzvG<WFxX?&N)0|lE)ro
zf82KlIERb>a%*{cbtOeQ)Hy?()0ILX9aNwn|J$5x$RgE=WzzfmtpT>77q)!((W;hf
zbu;>wE`z|deAF2ZKWBa}HO92%OCRf*W@h&gF|DJFp)qYZ{2V8yVG9R4l*8@_`#z8R
zq~%sI9zzYyKuZu$(S%TqM$kLnV^~W2i%w|?QjQb0&lAS$*hnygJ)t@K?z6RMCBqF)
ztV_mVC0fatT!>bjG`ivpPK9T~@v8Te<2LM<<Aa7OE0%?O!H&s${7&v(hbqEJF&=v3
zIdK|`=$QC-*sb7(rK2$$w#)pZq)E{m7<|D(2w-yfL1_7Q{caM!r1%>ZFQkexq01;E
zg6OWqaFGJa%fi~4h!iP6WK-ycM@=3jq~XvFz<hh1yzn6aYimi(RQ#@aq0%4trni5O
zS3^q#Y#p`N-fAvGs1wX&>$zI5e67isi%@yo@$?E~P^(Qag~29mrX^h|$t8dLw3>~s
zG(3?(1~jSqdn%>seIQIB^kQMt%aur^v1u+@(Wy9LsJ;ToOW<kP<`bZNxd;syd)cBP
zJOk48&s0j+MU<|p=Z1c(3JXK6ctJ8O4x@D17@O-CRlji7>>J*EVw5k}G)Nd3<QY)0
zKc`Z~&c-U%Xxa|%Az@M4T)xCEpR!LU41Elkta^Pwn@@!D<s#I7>{nkTfM-Cqrr5>B
z4|!FqS(q>vEVF`zP8d3_`E(~=u4z!KY;<Qps!qe)I(^=FoQMj6*Yc~HQwZ6seR@O*
z=Uzh_ONJIexPZt)h2YN3d8hhUKoCLfIQZ$dW#+m%7E?;kMrx05dT!0elU=6X{luYw
zr#KdK@X{DuB8@h@{OcCpC6zb%RXYSFBrqp-#>#7Jn4#l_j*R_6$;!T_n7>MLXtaO(
zzi^+N86_v2*dE^39b6>5sSB($U;i0!9ZsJRV%yuk{&VNkLqhhnO6k0(iP+6O4rAvg
z#l>_32irugz}{F&cevWoM4`|qsg5>-)k|k_#2TFuk3wu8zz!2d5PvsCd$W>g2s=<y
zB?*-LRXcRVfMtZ<5Zh@KFin*tQ1bT#0n3OoItjouRgyr--wwd~`c}rcFNo*Ih3oNW
zsit@vSa-aArVGpyv{u<ooDemttXdg&*5fuX3l+jPa8g(LZ%w7kBU<U(b=UK`KKN3n
z=0v`0Ce=ye`)j~=3Nlm7`8TJM^VqS4M#~9p$9Bzn`ZUX;NuoRkg%W_7Gahi7q%iY{
z@eT{ZZMVh`)7#7eL|(H*nl#1}fa$?_@mOuJ`UzLuipPJ0zdF7O#A`e7oz&!mVv(ox
zJ$Mh_mHt}%zv?}S-KnyZ<nPIpn$cwR!1icz{CJZ!!<Mgw;Wx<qt^&hxSC)mNq^FZs
zr1$vxq)638Mu;Rl3QB#sR-|dZ7^>t-eUw#6ONEh$G;D@8LQbTo&m2WUm$OGa)veT(
z49dDpJngmAQ8FpxTs%c=HA6?qqs)d%9?b-!q-yRYh*YGOdJ#=2NV!-hp6br5lv0B9
kXEsGDLfv`aPbBo%^v7c}`u7TC#Y)OyoJCF@{q#cfKhR!VWdHyG

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/properties-001.js b/js/src/jsapi-tests/binast/parser/tester/properties-001.js
new file mode 100644
index 000000000000..b0ee18e209ea
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/properties-001.js
@@ -0,0 +1,91 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          RegExp/properties-001.js
+ *  ECMA Section:       15.7.6.js
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+var SECTION = "RegExp/properties-001.js";
+var VERSION = "ECMA_2";
+var TITLE   = "Properties of RegExp Instances";
+var BUGNUMBER ="";
+
+startTest();
+
+AddRegExpCases( new RegExp, "(?:)",   false, false, false, 0 );
+AddRegExpCases( /.*/,       ".*", false, false, false, 0 );
+AddRegExpCases( /[\d]{5}/g, "[\\d]{5}", true, false, false, 0 );
+AddRegExpCases( /[\S]?$/i,  "[\\S]?$", false, true, false, 0 );
+AddRegExpCases( /^([a-z]*)[^\w\s\f\n\r]+/m,  "^([a-z]*)[^\\w\\s\\f\\n\\r]+", false, false, true, 0 );
+AddRegExpCases( /[\D]{1,5}[\ -][\d]/gi,      "[\\D]{1,5}[\\ -][\\d]", true, true, false, 0 );
+AddRegExpCases( /[a-zA-Z0-9]*/gm, "[a-zA-Z0-9]*", true, false, true, 0 );
+AddRegExpCases( /x|y|z/gim, "x|y|z", true, true, true, 0 );
+
+AddRegExpCases( /\u0051/im, "\\u0051", false, true, true, 0 );
+AddRegExpCases( /\x45/gm, "\\x45", true, false, true, 0 );
+AddRegExpCases( /\097/gi, "\\097", true, true, false, 0 );
+
+test();
+
+function AddRegExpCases( re, s, g, i, m, l ) {
+
+  AddTestCase( re + ".test == RegExp.prototype.test",
+	       true,
+	       re.test == RegExp.prototype.test );
+
+  AddTestCase( re + ".toString == RegExp.prototype.toString",
+	       true,
+	       re.toString == RegExp.prototype.toString );
+
+  AddTestCase( re + ".contructor == RegExp.prototype.constructor",
+	       true,
+	       re.constructor == RegExp.prototype.constructor );
+
+  AddTestCase( re + ".compile == RegExp.prototype.compile",
+	       true,
+	       re.compile == RegExp.prototype.compile );
+
+  AddTestCase( re + ".exec == RegExp.prototype.exec",
+	       true,
+	       re.exec == RegExp.prototype.exec );
+
+  // properties
+
+  AddTestCase( re + ".source",
+	       s,
+	       re.source );
+
+/*
+ * http://bugzilla.mozilla.org/show_bug.cgi?id=225550 changed
+ * the behavior of toString() and toSource() on empty regexps.
+ * So branch if |s| is the empty string -
+ */
+  var S = s? s : '(?:)';
+
+  AddTestCase( re + ".toString()",
+	       "/" + S +"/" + (g?"g":"") + (i?"i":"") +(m?"m":""),
+	       re.toString() );
+
+  AddTestCase( re + ".global",
+	       g,
+	       re.global );
+
+  AddTestCase( re + ".ignoreCase",
+	       i,
+	       re.ignoreCase );
+
+  AddTestCase( re + ".multiline",
+	       m,
+	       re.multiline);
+
+  AddTestCase( re + ".lastIndex",
+	       l,
+	       re.lastIndex  );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/properties-002.binjs b/js/src/jsapi-tests/binast/parser/tester/properties-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..e657089d33e6b87ba8671797fa1ef9142248436d
GIT binary patch
literal 37649
zcmeHQOK;>v5ccwZi38%m3GIRB0!en4=V~^)ne2cDZ34<95fUp_j;Av*IQC$B_8|oS
zfFHu|;0Sjl;LM2wcZ5Wjr+Zws+i^|Lc#?Q}4{OCeUEN(>_4U`)54Ymc&|~YZBWCy4
zKM#XJXdhdTSeA7V^dDO7?)Im>Ydt3zGOM+k{HEo(QM~@|kCyc+|5XcT-?u~8KJeHr
z=6H5!$8O*!qWbCIk@b!1_p`G8=5j7n$qK?ml-svl-;E~%aPi$f^JDkWWnm)Dw~y0G
zM{(%-gY_qQF}=>_Zuhh8)~a~dS`|XDtX}f_+iuK4+e^gVv%OJ4-b-BG4jXhH3|EIC
zS5g?eEP7{c?aIp6QLzA7&}yQ>mMH&GF5{jZ7JrWGqp8~8x$Fh1cE7XJo0n>z;8pKz
zZf)GXQq;`i75UHN6!|zWYPY+4yHjj8wg{qyzRaa@w-%;(F*v+9w%3bYKZ<SNVQ0cl
z|6H7UpXNoi_deO)+iG`q=AvS-)XP`iy?XVdqPQ6>m4iyiqKJcNFScWL%)u@3Wj1-Q
zM8Qql^U|zI4u`*DDRyBiB48#cjGIar@3JU9p@l*$mY&vQswQmkRu6n=a4Nt8m;^Jn
zV?Gpk>@c=McW{)B1OiO~?XIV_#I+%`^)a41WOpy80%QkbL1Pb+g98kfLp$apg>M~t
z_8^*ci>ML^z2j`$NQI)h4$`->sQeQbohsxkX!KTqdk7Q}9DL23*b;-`!-*<z8|Kyz
z1VLcDo*l(qzt0|&s~T4?=RnXZ;Xrmc7=cx$J&g0!s*Ei=J}Oop7f(<IxX>`TUz8&)
zF5x9V@LxfrGt_RIH#~G5Y4hM^8A8PWhJQDeWQvygMw(d=Bw4Ne6E|DaA#^*LpylVe
z9ya>@F-UCMk!plZ6#XmLGK?J=MH333ffSJ+6v0Vq8*8~81Rk^f((b>Y?Dt$QFc3M3
zAQV#dbKNd9ep;KKj^{P9Z{-sklBT<!IwMd_LU6ODWCQ@jckW+Gffx}2H+?G=n1AAu
z&z3@K^({`!D!PFHo*IOp?fQ23Fje$4RP>#+H*v2S>^dEeakG?T;NGF}m47&)7rDxw
zSZHcLQ!#g4OCh)dnW#7%uVx@B6;4YeDh14xO2<l`jd2uM?R;pBfe#U0CfMZJo}$zZ
zAI;@YSJQD&<+oGvr>B5FUHWeA?GM+!PX!|qb)3GH#pRzEHZ-xhCRSQEiK^%ef|nW+
zWvNz|U@pDXfg0>nhD1&1VFK$%vyrF@rzMgoHE>F3#N9U=ld6i{<fK!Hmtj&(VN&J6
zUTlQ=7}8uO^=^^cV3keDq#)4$)k-Q-a44YR1J|&qvQeIgqAL2qu&7C_ADbsZEla|p
z)=em?zb^Mckwa0#*;rJC(-K)!9yAI3iOO*1vCc*<%dn}Yu&KJSq`7SBy_EW>yjX)x
z-D#&H1)CbrhQuF}S)nXXKJhTQTmh+yP9SgwjewNy!b+{txh04mm1C831o@nUL+Exg
z!Q{x4<>%S9`BXT^6qE%clS;?Apv;spoH_qox95y|&bGVf1ovz%3wS>rvQ>^@SO6Rj
zs@1c2K&7G+2#{=80PiL_r9Q7K>Cyq^)35+Ikx=0rh6Su=c2U=gRZBq9%Qw1|Y|Wp8
zm)5kKf-r7~4fP)w79e625J4<CL{+P2aiFW{1VV3Wuz*>1_`a1|4R!)Ee=$3JwGM2;
z;({|iuzB)%GlDCSV-#P`wyaX&v`u9v1~%ly5d>R2uk#TM>SjL*nqUgn^kF*wsitfu
zcCv`rNku0R+;hRK37vhz4rW->`Dab&5V!<{{1bP%=2EAwr4U?UQLL%LX$@-<7fzu`
zsez5WD<z9Er*&mRd6)=$IE^)_V57M!PKv97u*wW;S_EsV=mf%0p~0GT2d-KJZ%Yu;
zzE!&4HV>)T5zjF@nQ`Aqg>y8Oof!8#of*gp?%6;V0Czm{#g5BsCU}C_{i2tgh`mq`
z52$TChnqS$<vw8H$;L%&*4D-sclS4L?<uY$%@3UN?}iMZ|M6u|ooi2sX4TXYv`L0t
z+t8Dv8L;5)%ydgDMC0SBFKGRE<U4RpH@>kOB=Kvuhx`Wb<EZ=^aO~s+C?N;ce$w<h
zST_yX%#a5?p|}!x%GQDu#m%l7QWV$0X-H9=<kgVk6}2n217TrpFL1s|@3?|~Ir%R6
zo2!=fEdNzz2iMt~ctI8Uy`FFjGTiD})I|aozwmWVSnA9)riO)Lg3D1nf;b4lE#fNx
zFBh+07Z-@H@H>9vAbvPxNkUN_DmIWiVgPQExkk3+!Y$2{ilBh&izby6trI%08qcxM
z>5aL1xd@d9)-(=b7R>@zn;;4zY!gc>N>dpbL29*jrQrJZJLV_=*o~k7Gw=JMLDe6P
zgsRuL9#`UE3~Xw+5{WcxGLV&g_J!b7aJi6FJWaQH0Hl|T(10@!TQm(X0d)P<Na%VC
zpvwvTI2<|rD;G-e;>kQ>mZZ~s%-|OlzhKmyTD^K;q?fA+5Jpz=5}?>`jYP3m#wd0?
zbUjuAVM&^SFAn7JQMx(J7~$J?PB4XP^*~53R}-L%q~Ilhtp<m<*aPM$F$)q5V9gh>
zAP7U(s~+y?<!S<2Rcm(%pz1k3wl*&s4+GIk6pTVgu?iu3b;>v^Vcn}XUz!sEg78h1
zRvH}6eVIpxnrG`UUz~(<-*}Ta25T-DffJOR=dNK1Z)ru2WAmjS6O=dDKyR!TJA6LC
zrh>`Y>ZOvn8Tfq{HdxsBo4nwqu$XGu9(*;Hf7~~TJF#y^@Qq*jiA0TdR%|&SwvX42
zS3+>T$#s>uIz&Oxfr=_gMad_YykLb@?5-fTbFK<gR7omIK2K3$6&p!TLt%<4Nkz$L
zMqyKZAN#Cx9<w5}-b(h}G??iRyx_oA?Y$Cajjfw7b1gw-Eaj|QJuv+$tu&bFzu3rG
zZNl{3fgglSy}wR{=0tl}465hJ-k;(2PSH$*ZT^Ku+B|gZ%JImHUC;IB8_ZGAqVr_(
zu<wtc7-R8VPr;CdHs3H}dF(K@LU(YK&LYJ$?u5t&0YWJOIwJK?EZ(!Dxa;@XgW@!E
z29Q@!r1NI+1jUqCym*Zp-0p6F+Pl_sxOs3RfjND$6J|1_SE-tsr=mD8n6apRI~*S_
zVf}6Um__3Crag>Dp?oK6mN5Aj`O3xXP+eiVC!HJ-KLP5X+?p@a0ZiI^pKR}KwL3eh
z&7oAqDL0V{>nPdd@gf08X#SiXO3Lql7D*7h?{zkJyPs_rDgp<`cDuW`JB1X;wcpw4
zsd7PDVclPpR=V3pq!$;7L_%(oAl|BYH_CummUvr6Tu>(Dwc>5br3xqy8rx7F#c&}~
zA>cL)?ibWrvbkL3%A=lm4LXCfy9H^AbAQ<^=tJn)1oUywYy$dTRW<>A6(XB}E{e`3
zpgS6~3FsQ4Yy!FgKqP=wpu<t(t!mvxB!PmX*bZYjHB(R+XcFR}g@lr*#`rW|^8XE<
T75YblL=^%+9rGTkM$-QQ*;1fY

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/properties-002.js b/js/src/jsapi-tests/binast/parser/tester/properties-002.js
new file mode 100644
index 000000000000..330fe4bd54da
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/properties-002.js
@@ -0,0 +1,129 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          RegExp/properties-002.js
+ *  ECMA Section:       15.7.6.js
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+//-----------------------------------------------------------------------------
+var SECTION = "RegExp/properties-002.js";
+var VERSION = "ECMA_2";
+var TITLE   = "Properties of RegExp Instances";
+var BUGNUMBER ="124339";
+
+startTest();
+
+re_1 = /\cA?/g;
+re_1.lastIndex = Math.pow(2,31);
+AddRegExpCases( re_1, "\\cA?", true, false, false, Math.pow(2,31) );
+
+re_2 = /\w*/i;
+re_2.lastIndex = Math.pow(2,32) -1;
+AddRegExpCases( re_2, "\\w*", false, true, false, Math.pow(2,32)-1 );
+
+re_3 = /\*{0,80}/m;
+re_3.lastIndex = Math.pow(2,31) -1;
+AddRegExpCases( re_3, "\\*{0,80}", false, false, true, Math.pow(2,31) -1 );
+
+re_4 = /^./gim;
+re_4.lastIndex = Math.pow(2,30) -1;
+AddRegExpCases( re_4, "^.", true, true, true, Math.pow(2,30) -1 );
+
+re_5 = /\B/;
+re_5.lastIndex = Math.pow(2,30);
+AddRegExpCases( re_5, "\\B", false, false, false, Math.pow(2,30) );
+
+/*
+ * Brendan: "need to test cases Math.pow(2,32) and greater to see
+ * whether they round-trip." Reason: thanks to the work done in
+ * http://bugzilla.mozilla.org/show_bug.cgi?id=124339, lastIndex
+ * is now stored as a double instead of a uint32_t (unsigned integer).
+ *
+ * Note 2^32 -1 is the upper bound for uint32's, but doubles can go
+ * all the way up to Number.MAX_VALUE. So that's why we need cases
+ * between those two numbers.
+ *
+ */
+re_6 = /\B/;
+re_6.lastIndex = Math.pow(2,32);
+AddRegExpCases( re_6, "\\B", false, false, false, Math.pow(2,32) );
+
+re_7 = /\B/;
+re_7.lastIndex = Math.pow(2,32) + 1;
+AddRegExpCases( re_7, "\\B", false, false, false, Math.pow(2,32) + 1 );
+
+re_8 = /\B/;
+re_8.lastIndex = Math.pow(2,32) * 2;
+AddRegExpCases( re_8, "\\B", false, false, false, Math.pow(2,32) * 2 );
+
+re_9 = /\B/;
+re_9.lastIndex = Math.pow(2,40);
+AddRegExpCases( re_9, "\\B", false, false, false, Math.pow(2,40) );
+
+re_10 = /\B/;
+re_10.lastIndex = Number.MAX_VALUE;
+AddRegExpCases( re_10, "\\B", false, false, false, Number.MAX_VALUE );
+
+
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+
+
+function AddRegExpCases( re, s, g, i, m, l ){
+
+  AddTestCase( re + ".test == RegExp.prototype.test",
+	       true,
+	       re.test == RegExp.prototype.test );
+
+  AddTestCase( re + ".toString == RegExp.prototype.toString",
+	       true,
+	       re.toString == RegExp.prototype.toString );
+
+  AddTestCase( re + ".contructor == RegExp.prototype.constructor",
+	       true,
+	       re.constructor == RegExp.prototype.constructor );
+
+  AddTestCase( re + ".compile == RegExp.prototype.compile",
+	       true,
+	       re.compile == RegExp.prototype.compile );
+
+  AddTestCase( re + ".exec == RegExp.prototype.exec",
+	       true,
+	       re.exec == RegExp.prototype.exec );
+
+  // properties
+
+  AddTestCase( re + ".source",
+	       s,
+	       re.source );
+
+  AddTestCase( re + ".toString()",
+	       "/" + s +"/" + (g?"g":"") + (i?"i":"") +(m?"m":""),
+	       re.toString() );
+
+  AddTestCase( re + ".global",
+	       g,
+	       re.global );
+
+  AddTestCase( re + ".ignoreCase",
+	       i,
+	       re.ignoreCase );
+
+  AddTestCase( re + ".multiline",
+	       m,
+	       re.multiline);
+
+  AddTestCase( re + ".lastIndex",
+	       l,
+	       re.lastIndex  );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.binjs b/js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..d598f086e8c883009bde180203ff4079b5dbd298
GIT binary patch
literal 14141
zcmeHO&2QX96nCHn3I~ut0)dcRai9g-6vBnD4eF*_8q}t!Nqea(<nB&3CXQ{!&c~|o
zKX60h#$UjZKZG0N#)Ts%P8@j8JL7rwjP0?ryD1+zWaS;td-HztzGt?V9>f7#>+Ldc
zwDviV#@yR?o^l-LQ8b!3{f*7fwpO=>QOum)a`sLy@RM{cUU8fk;jJE>e&6H1_b6c3
z*)Z_9m-<ndks7Jz#M$%1QIXc~Kxe6mR>U(>{>bq|Kg|hH_8TJ>rv8r4ct$St_SK@3
zl>6a$?O9;6HCW%?xU<<?7T@)j1rbVXD|`QzpEB+R8M#9*IMC?50`xc=v*Y*@3lH|;
z<&<5za^-!UxMZ@N!PgVKpN9E|9@k%|Yv~B<FF<>Nu-+fs-I^7w&%n|L>$k6c@qv!a
z;(`2YaX_90R@)ofw+6c0R3j|4^BtgemyJ0~5->$~n<c5c6LEJSR23}31(S~%Pkol?
zEEf;;uZx5F9I)!&`*ic(?f&4dE_(;KQEOLLKKk&=icanXP!5h`v4dMFxR-r!a+zI&
z(-Gerz2UkS1ZrwFV+da{<-@3m7QPb!OHz-gs7Eyt3bK^CTE|I5z^Eid@c0<KZI~uT
z(Jh2|31}U0aPK!E?lHa{-HOJ#Oqs9#9-OG=NBe&0@rjblK~IjB<fRa)0=APn+#m0%
zKqVYL5_(rLq9DzIqy-SOj)*9rs|3vT-k=p0tE=&cIpt|U%^wYnItI|Qrj0MtnoVAU
zs5N8(o9u|F8%{WxIit6N-~cqMcPj^VVM)uG#bVBM*{Mm+8go?VYn*!%oox=a;J>&$
z@!Vn|H-wIPLjF8Jjsa_qs(vHl8=(qpXMiIK0F`wVmD<7;qQx6bwF8v~N7E0Y;hqww
zxfc8lTnWBas0Ed;QlwA>R-d(8gH&}KVrW+c+QinY%CaajeeMnS7^R5|jvjr<hN%-z
zQ{YM0Tp|-o@s*ZL`CpGtkGF+xVJrw(I8JwUF{C*1lZtgG1CZ=grlfgAkpr5AkMjVz
zrY2Jgq6nE}<9loZH8Cx=DN74!o&#y*p6c?nBvxT|)o9FC7K|7f81;h8UB4TAhQ+Ql
z04V_#aW8)q+a;gr?kT-%<zh;O5vrtBRWVl^ZitE&_`U#gc%zY2KV4rWgqbnE2HT+-
zqXn0WU8LLcFVIDENg-6TAS>yQ0{*$flUU2osyPVfw8si{#k6h8Mw`&MRE2G}me=7u
zd{_1j%iCaHFy%VfkJE{=6QHFnw(xo$rqvu|+7P~r3A43nStuSlb<E?|y~L2TXY&65
z{4n_{<RKQMtxMoJROptSythCs?p}36cH~Yo*$WpxcA5AlD=F{`-RS9_TJl;4Uf3nP
z;Kr^Wy4=0!K6cpyc6pj1JOrkXT^V0j<M-SwKCSWx@k93;Sd@5AUyI2YHnC~$4`rhr
zSl6oMTz#-XuPA&Lnq-wnS=eef<0}O=G}n{02+)|)*3G^f2jLKpe&{I>cE{l8W>&RO
zQ&C5^t#vu`BLIik72HV2Tw_k<OgA&w-t`kD2S`|NYZm%$opaC)nI&E6QsxkvP4Gx|
zR2-AKqv3$M$8ZR`pUh0_8_~`@%Xh%LOJ;{_#v@bRZ&PV4Hm{~+F>O=ZZo|(n8=`!<
zD{Fc3{1eEmnR=PlY&yIMZ|o(8Q#J~3KZ*k8g>~Uj>Y%_<oGYM%J#0Ei-q=ye98N&r
z?hK<aVP75Ksgf7Kad!x3OnD40tgYjb2P)(FioQ%KWX&>RM8FxOCb~XnX7VQtYg>PM
z2_70v3jX=BzFfKo7UoxN$0f~?kCgtsx>GGUZrt&Y9eMVaD~V7+WPBL;qg;ZeLIkzQ
z^yG@<CtX?VFn<2Y595}*+1hQOUKcuOOZgoa32pv4%|;7Icd2RHdhs*he>C$`$%*n)
z_)<gBd3sLdZE#qc6mxJQ{|u6r_2nX69o1{g<zZli5;yl^n(0uQ?c;TBc!G>6B_alh
z+BIzu-Sm>{K8N#)0hqS*z14<ISJ~07PPLhH1g3=%r4U0b9Oh{@bLL>CmP(5SvF!Y=
z8g!Rxg9V7qIRqtWxkkJz>3RW&3pW!tzb!fXWM-B|*JLTAIkXC!ESqY9K1ro9Yb~eJ
z^0F+Q(^Wl?{?&>Ex?3k;t}S}h#WA*OhtR5Rs&_ip6zCQ&DaD~EcSFQNU)soJLC&UE
zNaZT!&xk-F$Af41`vc5L%qo9UVwUSe^I$5W*GN;6Eka>oTHDO=+Zkq#PgHyEf1`w7
zAhZql|3RaK0GdRha(;DoZW)^20M8*$bPOT7npe)ddl_j-0)t@1Noh@fJpHlCn=m&k
z(~{}0Krp>2MgDC4dNy6~R3t4woz*nd3Rt<+LbUG1=>eAq%#E;3K+0EvraW}U!mV_B
zQ2<(TmtKrwq$^*)6GO&qU5p{S(r+Qei1{p745CNC?4yRG_EQxxwX(r3#!-hzf1EHh
z<vU{76z9c|o@Nt9<gOo~RF24E$b99AP$Tzu2(_{+5knO>{Rug8T}6D0vS1Rde1#am
lZOjrCZKUB2{?w&p|Gx$r$Utgho!ZnYN7D{hh7+@Y_!|?M<SYOH

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.js b/js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.js
new file mode 100644
index 000000000000..d1f3f213e59f
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.js
@@ -0,0 +1,88 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          regexp-enumerate-001.js
+   ECMA V2 Section:
+   Description:        Regression Test.
+
+   If instance Native Object have properties that are enumerable,
+   JavaScript enumerated through the properties twice. This only
+   happened if objects had been instantiated, but their properties
+   had not been enumerated.  ie, the object inherited properties
+   from its prototype that are enumerated.
+
+   In the core JavaScript, this is only a problem with RegExp
+   objects, since the inherited properties of most core JavaScript
+   objects are not enumerated.
+
+   Author:             christine@netscape.com, pschwartau@netscape.com
+   Date:               12 November 1997
+   Modified:           14 July 2002
+   Reason:             See http://bugzilla.mozilla.org/show_bug.cgi?id=155291
+   ECMA-262 Ed.3  Sections 15.10.7.1 through 15.10.7.5
+   RegExp properties should be DontEnum
+   *
+   */
+//    onerror = err;
+
+var SECTION = "regexp-enumerate-001";
+var VERSION = "ECMA_2";
+var TITLE   = "Regression Test for Enumerating Properties";
+
+var BUGNUMBER="339403";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+/*
+ *  This test expects RegExp instances to have four enumerated properties:
+ *  source, global, ignoreCase, and lastIndex
+ *
+ *  99.01.25:  now they also have a multiLine instance property.
+ *
+ */
+
+
+var r = new RegExp();
+
+var e = new Array();
+
+var t = new TestRegExp();
+
+for ( p in r ) { e[e.length] = { property:p, value:r[p] }; t.addProperty( p, r[p]) };
+
+new TestCase( SECTION,
+	      "r = new RegExp(); e = new Array(); "+
+	      "for ( p in r ) { e[e.length] = { property:p, value:r[p] }; e.length",
+	      0,
+	      e.length );
+
+test();
+
+function TestRegExp() {
+  this.addProperty = addProperty;
+}
+function addProperty(name, value) {
+  var pass = false;
+
+  if ( eval("this."+name) != void 0 ) {
+    pass = true;
+  } else {
+    eval( "this."+ name+" = "+ false );
+  }
+
+  new TestCase( SECTION,
+		"Property: " + name +" already enumerated?",
+		false,
+		pass );
+
+  if ( gTestcases[ gTestcases.length-1].passed == false ) {
+    gTestcases[gTestcases.length-1].reason = "property already enumerated";
+
+  }
+
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.binjs b/js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..ed112879b60626265f2fca3a93b2151f56d07e00
GIT binary patch
literal 4820
zcmeHLO>fgM820!^oOb4t0~aJlH%<s;mA0;jPGg|8Ox%#$xT%M07uzY_U*o56;2-c4
zka(RqvDc(qvW-fUI8;><`|<1Neclf{)X9vIb~qt8YJZd>mUxQpA%un^I!F7x<HP>D
z{z%LS3R~%zkWr=EpEnVD3Zp`Q`YDza4;eWiBZei`RPYoka?c8Vr98Tb^#^b^uEG*B
zg`yFnoazF=U%nR+uIZQ(nZj{Abw(>KDUaKaVVQonGw6Ld4qNtJ*s>r#RzDqoL^Y9^
zrEqi1k`mraz&j!fI>M|Y_}r{7xN1oflf`U{Wz*Hx_V&)}GgV$OU%8cX8d`(y1Lz#f
z@^Ih4YjXV)u-C}-Y4@amTU<W^)4QGbdtcs^nOQ%Pzt>0PLs)9i8yt1Z`}P%4Q?kzi
z?S#Y$L}<`m%p_3?G#gl{->yg<eqUovrVt;g`XD&$x|M<4!Hl`7=?n-kMqK#$`>ql8
zCQ~Vmr5+Ha%Pbb^v9Lb6v!l@#_JGxxn+-bvWC9y9DP%^-W{iwAk~E&UWM<>v#OJQF
z(zm9@Ud`+ZFZw7om0|*JhLs|bGiI5p{Mm<hJ8neTlGjZQvR=nBP7IZ*QY|$&c?MW}
zQDnT|!HSf(ljh$aK%H^Xg_>5AtG6(()e6)^BrFPsB*4K)OpVd60xmQ>LQP0xjuhGt
zY<(!3<Fi@QfXkfa!~H{+jR~2x<sGF2AHslA@u}gy6_U19Gne4<qusT?`Mavj7a+^)
zD)S&yraqq$F%HD=jEuCWQ}aG>AF@`BL;;k9v0zMmhqeiX$}57#XZE&LDtJUqFNOU=
zU?|WK!w56z%Q#dNG=g@Ed`nDW$@^2^tbNL{Ja=xdn}SX9*<F!?KV1e1b!|)+D9>1h
zQ7Y>{O^9TkC_-f8Lb|y@G*sxlfmbpE3#*EzIFBx$)dsL*Oj%X^xF+0{<tS^UbEETr
ze>EqDyH%YwZ;%6avK(Nmlc`6N=tS}W^E@L!3eXc0r0D?KLtv?_1)s(S8d&8t9}Z4W
z{{tSpRCQ=wRsJl0K8+2$l2wATldEE;0c;&-H-KA}KXNPAR`iV%ZgvQHU~+%0^M~D(
z?^ypL#+Z^l!zDm=*FvIWxb1NLahe8y!MG>z%kLFdcEReB%Mtsns<*SBDvqZfVCe?H
Uep?c?eY@hIX1`W2Seftt0uneaCjbBd

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.js b/js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.js
new file mode 100644
index 000000000000..cb2448d1ec59
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.js
@@ -0,0 +1,44 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          LexicalConventions/regexp-literals-001.js
+ *  ECMA Section:       7.8.5
+ *  Description:
+ *
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "LexicalConventions/regexp-literals-001.js";
+var VERSION = "ECMA_2";
+var TITLE   = "Regular Expression Literals";
+
+startTest();
+
+// Regular Expression Literals may not be empty; // should be regarded
+// as a comment, not a RegExp literal.
+
+s = //;
+
+  "passed";
+
+AddTestCase(
+  "// should be a comment, not a regular expression literal",
+  "passed",
+  String(s));
+
+AddTestCase(
+  "// typeof object should be type of object declared on following line",
+  "passed",
+  (typeof s) == "string" ? "passed" : "failed" );
+
+AddTestCase(
+  "// should not return an object of the type RegExp",
+  "passed",
+  (typeof s == "object") ? "failed" : "passed" );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.binjs b/js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..a3ccf7cc93a6876e15a53bf9977b885a4db8373d
GIT binary patch
literal 2735
zcmcgu&2AeZ5T^fskI>6rTQ%7z$7*HCv3+pmxK-B5wZdM!A;qu)Y}qf?hv~h?K0>4p
zEH<R9)omU52n^rMe0(!Qrk52Xo$Q9-qVq+HQsM=Aj1ZcNVuLP*<4^g=d?qS_veepS
zj4Ivv@Cu>lV3mc}ud$?f%1EEg7?xO5!7Wtb*9v{3ytt2b2RM)Zh9#thq6MOy>K#Dn
zepnE$>6{X2;W%FSpp}-Cmz@{jCLi=B!_VU^b$eOrKtinC+K;Fv5;F_8!fYAgy#u@v
zS<@M2J;7JTzu+pBq$KO=gw@y8$=TWY>8*-AZat@#)650*1VC3<#^zyw|H<_az&;|^
z*MqD4p}0138}u%_U(aJ^j!)#T;}Q7`Tup|P(ICz{R76Y3z6G=^QZAuFlfk-@L@Cg0
z;-vntBK7#W#+odkKCJqnIGo?cLhfP4{8f7c3XBn7eqr7%${v~(QW{G=Axg(A?$qO8
zLv$a<At{)K>Qcb6TpA)&W9luEc>`G8qA;oSup)6fwwZhfm!^^2YtStv(uaF#nsgKB
zV^$~ry%N{c;K)3o$s@r$5z|{T(}|cTdQ*`E^aZ?~#-WAGwhZPe1f%7$A<q!(-z3u)
z+P|xvD|G^>k}&C{-ZZ|=1?5<7f{TV<V~;gVCr0KPNm}0c;pF=HYcQi6^v7pJ%snY#
z{550Sd1K^KVGYBFqdCK+*NTHQ2J818%5B3gMD7-ibFGEGOrNd8iJ`WY5{BLa@+ClO
zk=vQNA9M@urr~bsoP|F9BOFqdW)L3MSgbf(^%R#>m_+!wGNIIK80_``i4<e_!T6`Q
zW&IQE44d1(!ro@!M9}n@?x^uE<jxvKPH-!l>h5e$n{}r#SMFesI_f{sA1e3_x(R$!

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.js b/js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.js
new file mode 100644
index 000000000000..5b256dd22d9f
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.js
@@ -0,0 +1,28 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          LexicalConventions/regexp-literals-002.js
+ *  ECMA Section:       7.8.5
+ *  Description:        Based on ECMA 2 Draft 8 October 1999
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+var SECTION = "LexicalConventions/regexp-literals-002.js";
+var VERSION = "ECMA_2";
+var TITLE   = "Regular Expression Literals";
+
+startTest();
+
+// A regular expression literal represents an object of type RegExp.
+
+AddTestCase(
+  "// A regular expression literal represents an object of type RegExp.",
+  "true",
+  (/x*/ instanceof RegExp).toString() );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/regress-001.binjs b/js/src/jsapi-tests/binast/parser/tester/regress-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..c013b642ee7c044cfbd4fb47d044306be14c3461
GIT binary patch
literal 7756
zcmds6O^?$?7&e7|K-E?~bMc`9R;U|5s*sAc)g}bAXg8qEE|;oWP3&36tYcf_3EGtq
zcYX+ef(!qHd(|sPj=b-9oEgXC?BruZ+e@r?W}bQ9=lz_q$H!Srx4a=G!PYaDhK!7y
zuN=o2q`{ff-swH*|K9i0j5=OR%<<wV=Ue|=cbxBFmZvX&PFO?+F?~q=m@vYlG!amN
z`ky-|Q4&<K{sx>&=V7HxKt+KQB@v$h=-clEG~v;4M45m~$VdsDa~37x*0-=tzuP(3
zdD`<@@}1X`AUalG%-@YTWh54GFG)PE;r$GF`!wvHW<bvAuXpa;-F%VPk;@%gf;&%c
zd>IzMB&<GN7i2+BKLGX`Iep&U@2`r}Z$R{JXK(xHUY(is6ZvU<M1Boh9qb(JcI$fU
z9%1R4HvsKP-(@tUr<qF<f0$wjxM||jQO3{Q5#j#O9gM^JcI&5kjsAKSh-n`_?j7#6
zyZd$B7ohqIAl|$C+x<G&5=25yVKmPnhxR$)bOgCgL^N1azBeYp4vAy6RIKpf6;-KA
zSI{D5B3(Hrj33aP&(Ki9>gY<2WmLdoBvl|R93v6AQFRMtegv%TAShCHhvd|dtVND~
z54)mSEA?%PTWi4{rd&}W%2+yhL4EFI3<@jbXGV1jA<Ghkn`MMUJxZM8n1qS~Sxrz{
z^6J$<nMe-6d%%}}jK$7^I7FwX)UN}TE-q->gK4$0W0|nba>|lf?xMSwCGJlE+(Kqr
zo2bF9n>RP=TIjev@G%zoCG)6HrTC+uj`Q&kBbVEZku%NOxSGZye3i-8!_^dZCJL3H
z%S0&ZxLlG!_u_Nsmq+8o$0k$nHxUV%#0>h+QQq9d>h`v9f9t&Q0JuOADtW_V18jPV
zQa#%@EugLe6h!;cir`SPm?j|~E-l#)042H(njaC2lRBdGS=~JCIQ37IdtxG-eKy$z
zYvHVl4OZjn)+yh@PTzxwP>ZmvVkN3`A+kgdP6>EWs3_Bp62kN>gEO#{5Dw?0m>zS7
zMd45#lVtYCK)tOts<6CzNXz_;oZfPkRHi&-LFajHZ-TXy5L+O3W3wp=OvsCsd<!*K
zm?&mN_WxNYi@NwIWh&#~xlCL-V1;tVSpe;La|+UfYQe+%JJ=9IwG#8wSgX4bktun0
z1Wq+YAl;;CEq!J36p3rDTaINCnx_QUxwnWVybZEa{=%Z!q9V?zlTA>UhSH%Ag<GpC
zSsYW!l2RVLCN`G^1#|c9hKjPR0ZdZP-3z>d;H`y{(ozLEPNH)it=HcRyoJv4KiUf{
z6W|U0bpeo;{lLG!V?i%*H~v(au?(j2sfYeW1ga&I7<GTyN!ez^KcS0Uq*&;;`aC?d
zwwSDNq57?`YqV0Vp~W(t?zAsV;0%)jQ&Lnub%)izN}&f8|Di!DE&^!KgHJzGw=FKr
z6NNxlF0&d%=Th!Dc^0p~qzGSf?{ln%*|5O^#p@2q_?Q{3@)}Hnu~#;Wv+h}>;Tn(4
za=hVsUo(5{1E3r;e1Fka)jn~_F}&@m-i*otQzs^eW~3W!@$?0b9BR0bm!nO`U^$G^
VPF=JW&Mkg_fl)n38o4&d_h&BM%CG<c

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/regress-001.js b/js/src/jsapi-tests/binast/parser/tester/regress-001.js
new file mode 100644
index 000000000000..9282cd806175
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/regress-001.js
@@ -0,0 +1,45 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          RegExp/regress-001.js
+ *  ECMA Section:       N/A
+ *  Description:        Regression test case:
+ *  JS regexp anchoring on empty match bug
+ *  http://bugzilla.mozilla.org/show_bug.cgi?id=2157
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+var SECTION = "RegExp/hex-001.js";
+var VERSION = "ECMA_2";
+var TITLE   = "JS regexp anchoring on empty match bug";
+var BUGNUMBER = "2157";
+
+startTest();
+
+AddRegExpCases( /a||b/.exec(''),
+		"/a||b/.exec('')",
+		1,
+		[''] );
+
+test();
+
+function AddRegExpCases( regexp, str_regexp, length, matches_array ) {
+
+  AddTestCase(
+    "( " + str_regexp + " ).length",
+    regexp.length,
+    regexp.length );
+
+
+  for ( var matches = 0; matches < matches_array.length; matches++ ) {
+    AddTestCase(
+      "( " + str_regexp + " )[" + matches +"]",
+      matches_array[matches],
+      regexp[matches] );
+  }
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/regress-7635.binjs b/js/src/jsapi-tests/binast/parser/tester/regress-7635.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..87be12f962e36b289af66c076bbeb7844789fb14
GIT binary patch
literal 5244
zcmd^D-EPw`6b`@R_l75kKtkIMl|X>RvPx^$p`opVwc9Q78n-jc;>vM13gQvC;i-5A
zE_ezafaA=LPv@jfyQ*U1DvEzTpY!?rI*@~YM61COC1Lfw;5|W3yz8Fl9rAGK)wY`N
zT5nn%-ltwrN!J7sOJw!?BhPyXs{*|JfCxqoBf3F55fMZ(9;Z;D{ZG7O7Kfu)zX9jk
zBrGmcC>DAwW-<f7$8Uu+maNODNa12~VuenmU~#Xy1jn=*_4d|oGpOjXprS!ARx4e<
z%_J2hO5sjPG;r|l0UnDJN#YLWT^G_oS5ndfec}z+bxMT097`}GnZE#gfn**u_FD5I
z^EQaysPC+QeC{%{cq0ESj>ubZRC}wv-Ej5B7E#hB9|PJR?FpJB;DElQiS)Z%__aar
z3yUJ+KY9J?#Y^|7#Z$aMTfGaU)b`&t_jhWIJy-V`Xub)Eb0@O#xv%f7C5fab5YSR@
zrrCII<g1e?vRl&~9T=iEUSS1G#7RXLL^UDXU_CBfnW<=4jJ`RDJ1X+yB%lHwMDD_r
zg7=q@PQh(*?#hL6Y7y@okFuDT%|^DMYzIeVRF6{^W0u`xuWD4j3Aels4&95DO;`X=
zaRJ#GvMprDh<2qXSntRtNS$(2N?5amVXaFLeg}5TBia{SPGEia@DuG|`NnZ#c*W9K
z)&2!;HaONrl|?*N&;u%fbUDmy1nW?O(NZQ{0!KM&dM$F;r}lmgv*tUcbmQ;afSNA`
zpYi%?EGA-TH<vZ*qWTMqRD#9v`c4T}c(sNv^ToJU^{LGMLf}^hssld}y@3i9$*dN7
zAF$TLP$hsmNpfr}Eopy3U{MN>^Z_Lcl@{#l>TKadJYQb%zkXZwO`!4D(qEW(mRUHA
znQ64pR^ST8^#V+Ejq`|-*i`l)LPk*Dz5HK>dETWM9?TchH)B__1ZJ|Ju0$P^(}`gv
zn)J;2+Z?JT6+TSa<657gG5b#63tDNfR&@AriRkbYNQEZZ?}E?A^vpK|FR!e^7;^au
zmwmMyzJ&Fb$Y%v87c4OQ)xLpUWIh(B<hWcTqPi^A!IpL_tOTyjl_=-`5W>!T6B;(*
ziO43%)Gt54!UwR{ywwz@L0woEG?seSsRi_Se#Fp|xsOzOF6XHL?Q&jY^xOq|(4z&l
VBbrUz7EsT+_o62XN~zq;@)wAct+xOG

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/regress-7635.js b/js/src/jsapi-tests/binast/parser/tester/regress-7635.js
new file mode 100644
index 000000000000..7ea94e037ae9
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/regress-7635.js
@@ -0,0 +1,55 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          regress-7635.js
+ *  Reference:          http://bugzilla.mozilla.org/show_bug.cgi?id=7635
+ *  Description:        instanceof tweaks
+ *  Author:            
+ */
+
+var SECTION = "instanceof";       // provide a document reference (ie, ECMA section)
+var VERSION = "ECMA_2"; // Version of JavaScript or ECMA
+var TITLE   = "Regression test for Bugzilla #7635";       // Provide ECMA section title or a description
+var BUGNUMBER = "7635";     // Provide URL to bugsplat or bugzilla report
+
+startTest();               // leave this alone
+
+/*
+ * Calls to AddTestCase here. AddTestCase is a function that is defined
+ * in shell.js and takes three arguments:
+ * - a string representation of what is being tested
+ * - the expected result
+ * - the actual result
+ *
+ * For example, a test might look like this:
+ *
+ * var zip = /[\d]{5}$/;
+ *
+ * AddTestCase(
+ * "zip = /[\d]{5}$/; \"PO Box 12345 Boston, MA 02134\".match(zip)",   // description of the test
+ *  "02134",                                                           // expected result
+ *  "PO Box 12345 Boston, MA 02134".match(zip) );                      // actual result
+ *
+ */
+
+function Foo() {}
+theproto = {};
+Foo.prototype = theproto
+  theproto instanceof Foo
+
+
+  AddTestCase( "function Foo() {}; theproto = {}; Foo.prototype = theproto; theproto instanceof Foo",
+	       false,
+	       theproto instanceof Foo );
+
+var f = new Function();
+
+AddTestCase( "var f = new Function(); f instanceof f", false, f instanceof f );
+
+
+test();       // leave this alone.  this executes the test cases and
+// displays results.
diff --git a/js/src/jsapi-tests/binast/parser/tester/split-001.binjs b/js/src/jsapi-tests/binast/parser/tester/split-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..c9118cc73707008c915e4dfb7a429e9e9dae4cd4
GIT binary patch
literal 22400
zcmeHP&2HO95N7)Sduq`F1p=t2*iCAs0eWa48;BhTaFM!g<fbTsz+j|}%!DFUa+Sn~
zJVRfg57Beqp@&|3ZO?sz9y+t!6-VS!98$Dn#k^QBxtyJyo%!ZxhwRDe#1~t=BjFCW
zzKg<9<c^(J9LISO4v(Gfz5TEI*ZYHTBAi}Vjp_MbEVsTqaGbYcRF6J>*Nr^)fiG@~
zf$v7H^uj=q8m9lp&SNha&eQrA=v*kH6-J7bH*~zflQRNz`n{nDr1#Jhks=qk<CN)G
zMqV)5dK0GU@9rGzeY@Z5>TA8OCPHcT)%e?<6p`yIa!*`;nxpp#&=Z5Pdw8vzJkgCO
zz9&Dwdi9HqM{#}%GgVg!v8OqB6{tLMqx^8nQBC3g1+-65xOaE&^qUgy8^HSR&Nnv>
zujM6k`hxuL^aS}jOm(n#aC<kuZmJPX9sLZbB||qRQ7A)sJP{j8P1ib+7>Q?-E1i2+
zd~fW@`<?atluL+u_t_*8aSS-nm#!3Juur9oFsHt5HRK)F_tQt!69c#;QuCu?V3<83
zRV>{|9*9^jSfM6Msi%A_vjhZGy#zNJO;HfBb?J=7ybrW)42OLLnjJS57MMxU1z_bh
z7&`~iOr1fTR4OtSd2vzkFzEp~SZ<tv@G^jlg1mHTF{v9-<Q}K{mS~)>v@aF9645(A
z4wqU-L<p)D(bo_TQkpDY5>w1b$#0C3*BB*>&DE6CxG|nAimknJ2JmM8YL+SIsg|u8
zIy^rObl4Y9QwcSI;}{X#5hI|PR|B(6bbFX)^B#~5#M4efdd=bkDbW^QmWOc!suo@_
zk(xO}oBpQ8vkbhTu$POUFpQ9uL#JEQV1PLwO$U(@<Zu&6565wFj!EsU!I0=H5JfH|
zV$et2NrIO=?o?z|g`xu2FT;|IkHMIV(`0lQ3kxDv<m_EsBnFj-E(TEfm1_4$$!`1M
z;Bl&(<#mG}Keg;YGiu&sjE%B@7#q_C46*aFP~qd>kf>qqJ{LZ2dx0C#@DoQs{X}iJ
z<BNyViM-KKTEfs#F<R;6bfP&apI4Gh|BXAp)=6b&gHnbuEwXYONhWt_@tt*@ap#$|
zQD!i^(DH3GncRK^+^%m7!T{8AIslC7Y;JZ`$iriOI}Cl{28ETg3p0n;gofkJZ*HcX
zQJObHnF5O{9)=GdiGg&W3IgURkF5!KruM)Fm3p%=HhPg((&aKpVO>cfd@3-bDdtz<
z+8r2&a5RT&4EiO$Et6hVWF8@zsAcgID$+%vl<0ScaU&}_QL1UFH$)MNN|i3QwlOw?
z=feJIT^Kq4I04_ygx%JKWs*vpkuhcY7TDeThA)DVJmSH`iGg=%OieL_VbtghPJUsn
z50qPH(g$+3pW&=(9wq(*)91p1EUjkFY0)XG6REuYQj6IMgQ15d2A7@}VZw#g3di-~
z_%?upClxq|pQm{KWR9^Zon>$zDmV}-<KgmLxYR<*oH$xYS!GDkwn9y&o_@D#u)=Dv
z{Pr^<oEH%>nOJl7o1C9(SVwnK+MRPNjMBspy_f1zQeJ2}8KMg+?5Cn)&3aR22i5N|
z;VF4$tUHZeIXJTQ9nhuhLzhG34NM^j9-Fz|nVj`_9kNuB_c9*4XZP3)<zz3u9y&5O
zc#-BoclQUS)M?ctsjrzTx9M@2?YQ1r%yKUm6uB9TUnqW~RFuog#}gMIcgz`5y2{kV
zSE06Z5#-e#Pnh1;We}r4Wmkh_Uu7o-hf#5@t*mVYs<{dj%5wc)>Shc!nO}-gCxLs+
zEk|9r&*O4CatDt^odXrd`kHoX)%`^6)wK!D8BJ(dI#5t6)0e50(ib7XYG#3rv1s#K
z^bDF>LIXnlq#;HO_u&nNOh;-5#^G4=YJhziNq%DHoc$)3mu2BPOpgF&Sg_RMbU0Uq
zxwFsJ>9s3;2-1b_lH1sFFUlLa{{)4=%I{o3jRC9pOtMpXjHlbdAXRd*Tag;-4KUV7
z*OEm$jXhN4O05yNV$_`(5-as-Hjt^>P4(MFON76w>B@6Zi#A<p)0H+|!2qD>?Zrae
zw4q*~FUu>PypynzWI$gDklLs+8T}Xp1FdwV4XEu-8zgVWnUY%?Pg3`HV)e)dV+{1<
zobI$=VVsIj=>oZG*;wcGg194-Ra9gX0|%nujael!e17}fegQ>ogNrt};5)>&p&U9|
zjITDo6w8=C8=-n7f(r~=Ah@W~UdQk{=pc(oQfb!n&~5qgjFul4ZM!k1Oq^gYQ>|#*
z3h>)BR3dF#!R*r+h^(AfS{Nu*TCJj6z@W!ce@&B;eo5O3z6al;s`_-Tt6HZULytro
zN}u~sx@~^Qe_jk>4+?b949-j2nIW`}OjU7YjYpY*(F;#uY{3YV+m#9U5yU!en?~~K
zKZe3I9VFO~kF|@mDPa93lr~Q~qj?fb2MQ7;+X*W9UL{!f%iN~Xf#uch6ro`#?QB7M
zFSttuy+;8H$>kk)BBznHd8P{we*n*$&Xw{$i^N%PE%>CK9)Z|r{UC_GZ>g^9I~WsW
zzgeYkq4MXxMoI`~z5z*|%6(>2-zz*k(D!Y58JRHC`k?Qq^Su1Q33)DaY@_cK`U^@o
v|5e7hySa7@eb*Yi=zF#(Oy9D6$S7%=Qh$Gf{ZN^W9=+VA=c<0zuC4z8jP7zt

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/split-001.js b/js/src/jsapi-tests/binast/parser/tester/split-001.js
new file mode 100644
index 000000000000..f8e2c762a20b
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/split-001.js
@@ -0,0 +1,112 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          String/split-001.js
+ *  ECMA Section:       15.6.4.9
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+
+/*
+ * Since regular expressions have been part of JavaScript since 1.2, there
+ * are already tests for regular expressions in the js1_2/regexp folder.
+ *
+ * These new tests try to supplement the existing tests, and verify that
+ * our implementation of RegExp conforms to the ECMA specification, but
+ * does not try to be as exhaustive as in previous tests.
+ *
+ * The [,limit] argument to String.split is new, and not covered in any
+ * existing tests.
+ *
+ * String.split cases are covered in ecma/String/15.5.4.8-*.js.
+ * String.split where separator is a RegExp are in
+ * js1_2/regexp/string_split.js
+ *
+ */
+
+var SECTION = "ecma_2/String/split-001.js";
+var VERSION = "ECMA_2";
+var TITLE   = "String.prototype.split( regexp, [,limit] )";
+
+startTest();
+
+// the separator is not supplied
+// separator is undefined
+// separator is an empty string
+
+AddSplitCases( "splitme", "", "''", ["s", "p", "l", "i", "t", "m", "e"] );
+AddSplitCases( "splitme", new RegExp(), "new RegExp()", ["s", "p", "l", "i", "t", "m", "e"] );
+
+// separartor is a regexp
+// separator regexp value global setting is set
+// string is an empty string
+// if separator is an empty string, split each by character
+
+// this is not a String object
+
+// limit is not a number
+// limit is undefined
+// limit is larger than 2^32-1
+// limit is a negative number
+
+test();
+
+function AddSplitCases( string, separator, str_sep, split_array ) {
+
+  // verify that the result of split is an object of type Array
+  AddTestCase(
+    "( " + string  + " ).split(" + str_sep +").constructor == Array",
+    true,
+    string.split(separator).constructor == Array );
+
+  // check the number of items in the array
+  AddTestCase(
+    "( " + string  + " ).split(" + str_sep +").length",
+    split_array.length,
+    string.split(separator).length );
+
+  // check the value of each array item
+  var limit = (split_array.length > string.split(separator).length )
+    ? split_array.length : string.split(separator).length;
+
+  for ( var matches = 0; matches < split_array.length; matches++ ) {
+    AddTestCase(
+      "( " + string + " ).split(" + str_sep +")[" + matches +"]",
+      split_array[matches],
+      string.split( separator )[matches] );
+  }
+}
+
+function AddLimitedSplitCases(
+  string, separator, str_sep, limit, str_limit, split_array ) {
+
+  // verify that the result of split is an object of type Array
+
+  AddTestCase(
+    "( " + string  + " ).split(" + str_sep +", " + str_limit +
+    " ).constructor == Array",
+    true,
+    string.split(separator, limit).constructor == Array );
+
+  // check the length of the array
+
+  AddTestCase(
+    "( " + string + " ).split(" + str_sep  +", " + str_limit + " ).length",
+    length,
+    string.split(separator).length );
+
+  // check the value of each array item
+
+  for ( var matches = 0; matches < split_array.length; matches++ ) {
+    AddTestCase(
+      "( " + string + " ).split(" + str_sep +", " + str_limit + " )[" + matches +"]",
+      split_array[matches],
+      string.split( separator )[matches] );
+  }
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/split-002.binjs b/js/src/jsapi-tests/binast/parser/tester/split-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..918343cc2e0648f6ea57a586bd626b8ccc7b089f
GIT binary patch
literal 70881
zcmeHQTZklA8Sd3+qAuQp8jP%HB%5S+lNA->WU{-HiA<c#hUwW2F@&L}yJn`cJ>8w^
zn$3=cJP2MM^Wd8ij3D^tgFXpC@HMD!0euz(Z<u!l|NqoERe#kvRrS}kt9xo6wwdm#
z|D5w*zW;J=E8g*RWUsCq+SYLOId^j4T1UP2^?JR%$?&9iZDZ@1{^R|@WNP<TE{SJW
zM$XJzed+9(-k0I275e&3%XO^1k^PiC7+J36Ig_y<H4Oir^=>)iVU*UtfzFvMS`$~0
za)v!;?05kI+Wf}Q9(&HdW4nUf*g6V3J@Z^=e6V^qG}B*S+u69jwQ@;*w{l4mp|twq
z`Ax^OU27!B-L^)@8om2~o;^6Sb}wJ@-?%iJjvVj8qmN#``0`9|LN#?sFmXlp;Qc`5
zw&m)N(;gLM?q7g*gUr3TzTK~ixgUhCudh9Ob@#H)ndTY!-{u(k0cdJxV`p<+A2-zq
zrj9-Y)ci*;PTh$&@lK}pMWLn-o^$O3`_A-{b1yzJa*iDDrE}-?CQGn-{m#_2XEVTo
zzGr#%5!k0tMrc!hZ#3jJYcvX96>kjSD?2nl$_9qne+XDG^DNifv1eY&2qjrcJ?uxB
zAt0d2Az1FgF*0Ii96Dn#XMxt*<Y;QSb|1k;ACCZ+pTc9<Yy_d1DuW7mXpcq{oi^nS
zlN$D7G}1{)5DfHdnYjOEYq*c#-!Xr<%2d{BRUesur_=oTG5@e*{`{D4a39Nz`9Et7
z=BI#ICjdyb44GUC%V@~Mh|e(CJRT42eP?VBPZ#|Bq%{@*9fA0I=4bsuhQG|p|BKe}
z{=?7{kv({awrig*DZB?`*UBwh_N!qUDU!0PazQMS_<^m?W|0MMoBC5e6pkB`U(Tu_
zle-GlgM%^V%Y=hiFN2CCR2ZQuII{P>p6eVOhDAYX_9%xZLcUNKe`-SMVS+l@d)Xd%
zJ*bcXVeiD4oELkG;WAK+TgOLxc18`5K?=Q3Q055-pC%dxRrHRcWW=Lbj8VnjV)Q=E
zN~l&aNX?DCX#xyQW5H@v_k)RQHL7~iGRe#Yf?WkQ*U=lwb*?i=oD2BM|IWVg%g1l8
zB}Exj!=Uw4TF^fH`_Gd}w3HT5n(dSRy)Xt^p?u!)4mYvBtfPlu`*(oni0P41Wv2#2
z4XC_39g0Quoer6%C=o~^P?BGVdRI;t4sCWg6fKVA(II?REfG*|DxM}t6{MQjc`wQh
zMg*FcE3`C-p(EsZuNO`k^8Bhpo*c+?V{Ex6A#jM;F{lT?%7T68PESp<2bd&_0(SvS
z-JUpMVfIWk>Wl{HMo^RLd@8`L4{>=Hnv?kg)QH5e>Y9_Lndz0P3t@6Z@iMj+2D4>W
z@vydH3L4O}mS>n)rQK#YGE}SS<kfK4LDV1#32*i~Jf)WiqE?D2dt_1v{>Fcy6QNz>
zd7vxd%P~XGPm3gS!5GEh!th!WrL;qUYfDupZ(i?oUd^PJL>;KSnN@i-o4v`hOs(ft
zsb6>gD2Gaw36v02L!T6lk~%-9R?K&PPHYN5ZySk<0zW4aF6Kkk&lLX_-{1Wec%TK#
zOju{GKVecs<25Y$r0iyD?v`cPDRC;K`OYFqGZxfB*Mr1Y+1jZP+MgF#XbEWy2^TvN
zX6(mm97SVxmmortiFP7fOcCCbSPxM6N}cQC$1+O@q#vJy2oVruy-rPzQ9WS<VOVeT
za&KFE`glCR{kL>0E>eR1v#@c@I+`W#@6Fl2GTYG@!^i0^zjUt`3Ul^U>;klL_^@tJ
zrzVk^61_H>3~q(hH>^XZZ;Src=XyQ#L6JFyf?!b7(nki*ahJ4M?YH}w&L+yA))l8K
z)E35)M^VEyuCQe=nWv4)xx_!I6c$*&3_H8&$cpM0gZ&6wKCbL0ENm6hHSVHikgre?
z=dLI<O5r0Qg{#9MZp&V?W`?~2LI`hx=hEsbWonQQhp<M~?bMQFR+Z5IJ$NqUodPAw
z!;-dPBFXF>dM$abf!;+ET}D^4Y)_7yGJx4z+$3}U-1&<mdwgJ;Of_}5wmIF<;b#Cc
zgJp<(EgMuu6jRZl7@2*+GhBWI_=kx^B&v+ls^)+kjC#aTAi4=rC10D2hYsc!7Coo~
zF&a~qo;89be+(yn^ahjh%zot<5B@OaKV=YiHS8koS_4MXj6O9ysAep`gSFHhW(+6_
zvAP*GR1yn5{go?z?7WI5pLulE(-SvLq7h-l5nci*j;BL}iNvg$8bKWKn8%B~4GlJg
zp6Jy5#2F3_I|}hh@s5rrRyl?@1B6tM2cP*_UItiK!j97pGjuc0_!;C<oRMM;?cfce
zOJO!F){O=0LX#GRVo>{VLPEgkW7d#O9nD=<`Z@$vnhJ*l4UG#QvU44-g~OKxO2whV
zCsXmVxor?@m(8gKBxMXWL2GLu$uI<N#e<n2Emk&%R&@Tw5I2?8t4|733|<xi6((O1
zAztEj^qOl8ZrMdP$}@%-hB4&>&m!z<XmI6YH16OM(ofT@207Ffv>`F<ph`;*f<+bb
z|AvUnpJ1|wTX5QH=r}~c@+Ejqcr6(#CXU1pZ<MVBpZ?cnd+`MH0?kt$wrU6}iuG?H
zI@a7gVBVFy{{)$6VE_X-xPFE~Dx<nb1<arpsCPpB#AJzi=NG^K`EGtu90Z#ltJYQn
zs!;h5hZ1I<6aoqWd`sb1PIa7%a;u)lKWX0!<}GcQ4$lZxYMdxzPFJ2*P>t)G`nv+X
zt5K-DeEGdDUnW-+)R5dR21#aqhoNpaM|%L1L(=xuCxwC>ynMtk-)$mUMSv)~SfHmE
zdv>$QaDz#0kzZJ^D4)_}6qz+eo{-K{-6%L8(#<9Z6%U#CW09hpP0l*~l7Vockz_>5
z3|cHBF(76G2++*nsHrzFsD@xoj!L;u33JjAyV+#Cg-cZ`gM!j-H=CR_o6Z0fL*X~j
zLIaL0?`-l90H#G<o+3=as?6N8<DY|{(8|b*k<oR%RF{CE0E2}Z>Bl5>bKayF!a%)@
zGO$8G3I$7-9e1<yk(I*?t*J7Q&kAEqD%j1=iz`<F7K2<>u}OVWi|uCTQ_Fot*we_e
zf#zoCne#_~1BKI~DF$9(vc9|P9Xf_PZ>gd(NM$&zoYc~Se#82byz}wD{dTYSF*H)z
zt%7yADa7PjSRSWU%`OjYrmrsoql2h1ut#O_V+_3uLMGSY0gV$3)k)LBgnDX$`a@hK
z%w_0zH7nk$I&Z0Xqqi#{vj?Sa*hM?L>blm6-mG$1!KZI`c}hMT`{5F2geS3efNU)a
z_ZwBY$q2*7ClW3YVrXLu^iWAKC?O=K-6$u?QL4F@n4bf_YBpD}C@{aJ8mJtw{7P5C
z2yePmdRJG(v3(5PLyorhl-?(=gn^$AD+*<(z++o&P|Xd;1=Dl3<lBl^@M#DciY%th
z8)m#~@*T@*oHfQB_ki4YCO4e1_f^9Tju7n@Jffi>!%9-HJ}K}}Dpp*jlvYwzFBqKc
zm=r8dtGd`TBTJ}lwhKj@5%)5LjbUcy^nFykd4iod+nMp@Z%nEir&XN@r|CX62D#9;
z#6m`a5S+$?7^TJI!4^e<)uyveM1o%cjv`YdIc>X~O|9iY1c|KdDSH0^ypX8f6r35@
zl7LVO>eVNux@~*M?l?@4kc3(uA9Rbp!0d*B2da5#vXm&Tv8C}tk)ZEVb8bg^SDOc_
z77lO$F{Z(udpt0oX(!nn;r0+t<8byJ+ZCbC7&dMNY9jp<dbn--0E}Kod6NL!g$_*p
z-qy#KlT8`IRGd<ul=?DqEEc*W4y6>87R1CbY49d}apk10FiNyppH%b|?OGnZu*xYp
zLOsfcdAKdvKJCT=Nh1SpBBRR2_%4(bC9p1(B<o4$VUyL?KNiTG(LZJsLJC4_?&ANy
zpnip?L$^5PV+M8K)qOO@#aM`f?pKB=Dq{-IFre=-TE}HB{prZ@;Bvfy;dVTs=f8u8
z(5Xfk%^;4tQa)ZqDjDT3j>h>Gn-uay*hc2<nh15iSbVk)d6S_$*CvyZZH+f!HMR>k
zZsR{yXo@p~GGQK|D%+>sXjjJ3x!t95yYV_Rvu6Dcm=GFX1P<f0s;gPQlI|RsIGj=w
zDNxGZwD#<gJq*ith?67y(mxbYAq+KTMn}<`k0ujCUn!yI51o-6ZCaGl#c_<LmSYfz
zvWv{5o(ZO7X*0Rwk$27+;*kXl?W$2WLx8A!O@za)ZIO#AKrAfR)GnXEP-}*lo_C1%
zF7Uq9As&;>2K|-rrW7##NfokbV{K*RmmBx~2-nAGy0ef*YPiaQsz+_bUj{%h^dF19
z_IS849@=;Gm?5tB>Tf#0g%cX8-N4F-7ZyNlFb0?owNw125|{d<Vp}lS%CItqrlY+W
zgl^(ZZZv!Q)4d+fBu1k9g)<D~(2foQRBMWc9JQKLMxlqH8@Q-#HgX0AEmQg-N<nYH
zbC|V6<jkO-pnH_FOe*DKm3FD*yelKMDy3mfNltO+S$vn1bb_TTU00tGstp%7leQx)
zfzTps&7Qu*c*VHV-z2841S{4rtj-UiQ+$X?VC{lrrWbP3qXf>>iZlWfOWIni`!P&>
zX>*57$I(f+SdHXrLswSP#TY|Tr<gmW{}uR1E!0~`V>N_~IXzH9_^NDIeNw7$ZJOtd
zk4ecLiTKriQ@NcX`s6~t>OjSdbr(|F8PHtANjwbEq3km{7V{bSMr6JP{)T^yooiGJ
z+a<v+-^pBx&E0H7g<LCJtMXe377!qp9FY2(j;}2dMs2YH@}`+|Il|WE$-FA?d+i`W
z<<l<gW;(fySZjXXH=|>fdEYAZNNT~tD??XHm$ew>)zoKKOFx2*X(7OgnQ-Q*kO}KP
zYYl=J4tfcK1Erl5cbKqmuyjRDeNw9PDAM{%nQ1TRK30^l|2M2jOu6XJh39axOdZ@D
z(+s((62B#ra^zbw0ZYCm&WU_WC$`NCv6pu=%^jD=TFk%vE4?DBl=sk@KRjqy+)L9o
z%p&6_H#C2eSFIRbe$Pf*ws_|*6+iSTL#a5vwwt+5{F_j7M)-`(U&U!vvrZhBe!2Fx
zJv$zG>GL_QT=h|2;n0yCnYS=0uU$G)C2mmBq)@|*FNlLwRAizR{3)r*ucaGB+_`PJ
z>C$Z<P%*f|S6&9O0vm*Lhj6j|1RxmJy7k;(^x2Ot%febKU2UW1dg4@FRr?ze7ZOhR
z6nNkQKx-IXrnGY*94Q5d+Wd8;#>1JBrK2idYBDDQ3IS;wPfy%%uMdjT89SaIfgMkW
zmS_7rj%WsCnv{(DU8WEJJv6B4N1RqQJ{+5=ZDP&mcOF+##t2r-M!<k?1{0RYluYVA
zmkWFnxNhoSSm_F_5?{CPOx3+8CiAQ5aNXKVWf_jEHeE!PX0*+)CJvsPgj_3IEA?0z
znyUt<KB;4&9s|j6YG(JrbNDQ+nNiF(yEWQs?qKu!-plrY7MQX9sf#6M&#}XUA4JoC
zf-FH>>Eu&*&VS`Z{C>+mi7v^A<fshILLnyaHKGG9<3|#%O{&f6DpgHCR!QB9Mfp^0
zP%W|4SRe?>!ODmjik1h$Ojcf(@+a@uqC#a1FmY9i8clk2fVS2gqQ&}FwiDj~eG#xl
zrVI$I%5M{_GaGYrC*Bu6Y1ji6kNTMzM8k(vXB3Evp$tQf(JPfN<K?pU{5eg#f>$P2
z>D-w#G-_|PO0;~*GnYgS!=n{Vgoyamiz(SC6LKWns9lC+LKMRkzoA}C#m}T-fCYu&
z1*jQR(nKwHtec~-YHDx3rJ{z9vM2u0#ETpeS%G<mGUiZgaj05zXnQdxcVKe@8!tru
z8Zr8Yw}U2~deX|N$!a{{;Lvif8fIpd<%&?|AK>0J;gqqoHaH#wOsPS~5*w<LtyG0-
z!dsRqJY!M?CbpS4o}D8#;j5*<si0}f3S(wf4d^>)FU=J07A|*4EG$s|M`vD<n{wvW
z6jw78FlD|qFnig)`kQtqw-)BAjy?$q#PU~18B#(y*Pd6H<l9x_po)~TCihVgOm-m*
z#YYo5GrBAOXP_<@L7#<25mFMSK1k(`bggvdj@(n&>W((I$QP@i8TSE}i5|w`)P0%)
z<y}_$_s{ftccb=Dv|l)viYjPe5FJy|$d!TGSW1Jme$OTbreq`_pdPuaCgPuT)CFtf
z-vg{eo<_7HPOF;LHF)B{%sI%C-ef#<JgDqjqfj{o?1{Q#xXzng<7|qQ%4BWj>LVEg
z%uyDi@{PTQGE3jlPhY+<w%n5#JA)lkuxe!AxuakGM*K;*r0z^aQF3=GuED|Iz5|s_
zqLaIwXQ3@RY))Bvb8_H7be+VBk-hKrT<74>3$h^DBW&Qc*Fs>X%&moJQT4@+CLL;1
z6c}rp-#|owTQ3ZkUQqrra2XZG+Doa4HvrDG%Q3rv-USL3XuN!$zSaqSWaqnKyiG!{
z%}mmw4yry3L-_<~;&a#g8#@~}*LOFzp5EBn*m)s@wYYM||E8^#QP!mTGh+md0I)cf
z)bZvGxbdbJEwsvAUdaI^8EIx33aNop0f%0)4eLyc3zd$ksM4Yw9}4Y+l4Nv@8Tncx
z8kwLcmzBWuJEm&Goyy!ZmL&J#RuMziq!dp$=rOQavzRVwF))RpbjV0UDiWLWiT^1z
zTZu(|QibnuVYo_5a1Rv5g#-~%W-qt)PbaU2%u~9iJ_RJa4qA*zSRn1}T`^uN6mzI3
z14ANxC49Mni8Q@rs*MGU+$$q~2y)iYe-2=S>h^HL!7#;fw=?P~CU=Ws)S{me(4lkQ
zpdpC~y@D?)@Z3><aXnMbXCwn?Xq;L5`{6lZl(G<J2xWa%1?|dl)8SLr)!uN%z|p!B
z2JU~o=3fLe+_H}1dwbr5K=x}WddUntW8>;@xMR<}HETwWDwn?-rsCx<XW`AY$<fqu
zZE^Q&=mq5i_r@N0-ti7Mog;^=V3JSjQM&vAi(*^WmPXoCPLQu;ln3NfD8g+c*=_p(
z09*SBUm&ZvBpIBH>aVZuY+Tp-m~@Vgd=-b#7ssI)+ad=@$rn%(I~zNj>)P|?$vo1<
zo9o+sQx~xhySv_@L&}cwH5@P5Iw-%@ij?Gg*vn$<nZCzGzJ#sE*D=YT5>I}Szhm!o
zT}3|V+sWiBh6IifBg>u0^G@^<EcpxeJAN#!{0aFJxtW0wgYOemKYCduc_nrhiTniz
zPqHG?bR-s)-{Vmhu+h((cqdbxWk`#x;UF#ODuI+{HrTu6(KJ}TgZz!%m_vWT+o3h}
zK=Ya5FT0PW{B~LU4NXhDXXdHssAstzqMG(HiqG$v_7g&y|I@A@uRVZ3g_AVe52$+H
zq;Iz8gwsSMdr$=Q_GRA}iT@t}q(>Aj57vnYi`;;8A~GFJI+hC~t46$3Ttl{*0m=kK
c__SI3b<0mOVx*y4MNu8j)U_g76N_N}4-o&^Q2+n{

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/split-002.js b/js/src/jsapi-tests/binast/parser/tester/split-002.js
new file mode 100644
index 000000000000..8f14e4facbd5
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/split-002.js
@@ -0,0 +1,270 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          String/split-002.js
+ *  ECMA Section:       15.6.4.9
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+
+/*
+ * Since regular expressions have been part of JavaScript since 1.2, there
+ * are already tests for regular expressions in the js1_2/regexp folder.
+ *
+ * These new tests try to supplement the existing tests, and verify that
+ * our implementation of RegExp conforms to the ECMA specification, but
+ * does not try to be as exhaustive as in previous tests.
+ *
+ * The [,limit] argument to String.split is new, and not covered in any
+ * existing tests.
+ *
+ * String.split cases are covered in ecma/String/15.5.4.8-*.js.
+ * String.split where separator is a RegExp are in
+ * js1_2/regexp/string_split.js
+ *
+ */
+
+var SECTION = "ecma_2/String/split-002.js";
+var VERSION = "ECMA_2";
+var TITLE   = "String.prototype.split( regexp, [,limit] )";
+
+startTest();
+
+// the separator is not supplied
+// separator is undefined
+// separator is an empty string
+
+//    AddSplitCases( "splitme", "", "''", ["s", "p", "l", "i", "t", "m", "e"] );
+//    AddSplitCases( "splitme", new RegExp(), "new RegExp()", ["s", "p", "l", "i", "t", "m", "e"] );
+
+// separator is an empty regexp
+// separator is not supplied
+
+CompareSplit( "hello", "ll" );
+
+CompareSplit( "hello", "l" );
+CompareSplit( "hello", "x" );
+CompareSplit( "hello", "h" );
+CompareSplit( "hello", "o" );
+CompareSplit( "hello", "hello" );
+CompareSplit( "hello", undefined );
+
+CompareSplit( "hello", "");
+CompareSplit( "hello", "hellothere" );
+
+CompareSplit( new String("hello" ) );
+
+
+Number.prototype.split = String.prototype.split;
+
+CompareSplit( new Number(100111122133144155), 1 );
+CompareSplitWithLimit(new Number(100111122133144155), 1, 1 );
+
+CompareSplitWithLimit(new Number(100111122133144155), 1, 2 );
+CompareSplitWithLimit(new Number(100111122133144155), 1, 0 );
+CompareSplitWithLimit(new Number(100111122133144155), 1, 100 );
+CompareSplitWithLimit(new Number(100111122133144155), 1, void 0 );
+CompareSplitWithLimit(new Number(100111122133144155), 1, Math.pow(2,32)-1 );
+CompareSplitWithLimit(new Number(100111122133144155), 1, "boo" );
+CompareSplitWithLimit(new Number(100111122133144155), 1, -(Math.pow(2,32)-1) );
+CompareSplitWithLimit( "hello", "l", NaN );
+CompareSplitWithLimit( "hello", "l", 0 );
+CompareSplitWithLimit( "hello", "l", 1 );
+CompareSplitWithLimit( "hello", "l", 2 );
+CompareSplitWithLimit( "hello", "l", 3 );
+CompareSplitWithLimit( "hello", "l", 4 );
+
+
+/*
+  CompareSplitWithLimit( "hello", "ll", 0 );
+  CompareSplitWithLimit( "hello", "ll", 1 );
+  CompareSplitWithLimit( "hello", "ll", 2 );
+  CompareSplit( "", " " );
+  CompareSplit( "" );
+*/
+
+// separartor is a regexp
+// separator regexp value global setting is set
+// string is an empty string
+// if separator is an empty string, split each by character
+
+// this is not a String object
+
+// limit is not a number
+// limit is undefined
+// limit is larger than 2^32-1
+// limit is a negative number
+
+test();
+
+function CompareSplit( string, separator ) {
+  split_1 = string.split( separator );
+  split_2 = string_split( string, separator );
+
+  AddTestCase(
+    "( " + string +".split(" + separator + ") ).length" ,
+    split_2.length,
+    split_1.length );
+
+  var limit = split_1.length > split_2.length ?
+    split_1.length : split_2.length;
+
+  for ( var split_item = 0; split_item < limit; split_item++ ) {
+    AddTestCase(
+      string + ".split(" + separator + ")["+split_item+"]",
+      split_2[split_item],
+      split_1[split_item] );
+  }
+}
+
+function CompareSplitWithLimit( string, separator, splitlimit ) {
+  split_1 = string.split( separator, splitlimit );
+  split_2 = string_split( string, separator, splitlimit );
+
+  AddTestCase(
+    "( " + string +".split(" + separator + ", " + splitlimit+") ).length" ,
+    split_2.length,
+    split_1.length );
+
+  var limit = split_1.length > split_2.length ?
+    split_1.length : split_2.length;
+
+  for ( var split_item = 0; split_item < limit; split_item++ ) {
+    AddTestCase(
+      string + ".split(" + separator  + ", " + splitlimit+")["+split_item+"]",
+      split_2[split_item],
+      split_1[split_item] );
+  }
+}
+
+function string_split ( __this, separator, limit ) {
+  var S = String(__this );					  // 1
+
+  var A = new Array();                          // 2
+
+  if ( limit == undefined ) {                   // 3
+    lim = Math.pow(2, 31 ) -1;
+  } else {
+    lim = ToUint32( limit );
+  }
+
+  var s = S.length;                              // 4
+  var p = 0;                                     // 5
+
+  if  ( separator == undefined ) {              // 8
+    A[0] = S;
+    return A;
+  }
+
+  if ( separator.constructor == RegExp )         // 6
+    R = separator;
+  else
+    R = separator.toString();
+
+  if (lim == 0) return A;                       // 7
+
+  if  ( separator == undefined ) {              // 8
+    A[0] = S;
+    return A;
+  }
+
+  if (s == 0) {		                          // 9
+    z = SplitMatch(R, S, 0);
+    if (z != false) return A;
+    A[0] = S;
+    return A;
+  }
+
+  var q = p;									  // 10
+loop:
+  while (true ) {
+	
+    if ( q == s ) break;					  // 11
+
+    z = SplitMatch(R, S, q);                  // 12
+
+//print("Returned ", z);
+
+    if (z != false) {							// 13
+      e = z.endIndex;							// 14
+      cap = z.captures;						// 14
+      if (e != p) {							// 15
+//print("S = ", S, ", p = ", p, ", q = ", q);
+	T = S.slice(p, q);					// 16
+//print("T = ", T);
+	A[A.length] = T;					// 17
+	if (A.length == lim) return A;		// 18
+	p = e;								// 19
+	i = 0;								// 20
+	while (true) {						// 25
+	  if (i == cap.length) {              // 21
+	    q = p;                          // 10
+	    continue loop;
+	  }
+	  i = i + 1;							// 22
+	  A[A.length] = cap[i]				// 23
+	    if (A.length == lim) return A;		// 24
+	}
+      }
+    }
+
+    q = q + 1;                               // 26
+  }
+
+  T = S.slice(p, q);
+  A[A.length] = T;
+  return A;
+}
+
+function SplitMatch(R, S, q)
+{
+  if (R.constructor == RegExp) {			// 1
+    var reResult = R.match(S, q);		// 8
+    if (reResult == undefined)
+      return false;
+    else {
+      a = new Array(reResult.length - 1);
+      for (var i = 1; i < reResult.length; i++)
+	a[a.length] = reResult[i];
+      return { endIndex : reResult.index + reResult[0].length, captures : cap };
+    }
+  }
+  else {
+    var r = R.length;					// 2
+    s = S.length;						// 3
+    if ((q + r) > s) return false;		// 4
+    for (var i = 0; i < r; i++) {
+//print("S.charAt(", q + i, ") = ", S.charAt(q + i), ", R.charAt(", i, ") = ", R.charAt(i));
+      if (S.charAt(q + i) != R.charAt(i))			// 5
+	return false;
+    }
+    cap = new Array();								// 6
+    return { endIndex : q + r, captures : cap };	// 7
+  }
+}
+
+function ToUint32( n ) {
+  n = Number( n );
+  var sign = ( n < 0 ) ? -1 : 1;
+
+  if ( Math.abs( n ) == 0
+       || Math.abs( n ) == Number.POSITIVE_INFINITY
+       || n != n) {
+    return 0;
+  }
+  n = sign * Math.floor( Math.abs(n) )
+
+    n = n % Math.pow(2,32);
+
+  if ( n < 0 ){
+    n += Math.pow(2,32);
+  }
+
+  return ( n );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/split-003.binjs b/js/src/jsapi-tests/binast/parser/tester/split-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..ce86209d718ad3b09a210323f8be3f32d97964c7
GIT binary patch
literal 38042
zcmeHQ&2QX96nFS6AS5IZNJvPF1X4powzMb8CeWl?DOK2_Y$%7Sirn4Fu3N`myxz1q
zfdpqHPH^DB|G<qaXRZjrt-uv=MjUw09<Rst*!%pk$$rcwtE}zknK$qK-p9Oo+i*t%
zlWjKoOz&=f<k&q&Khhr4H0`e4J<+yyS~uEP+8ukqv_{>#r(qgHck|xYn)WK()es-Q
zr8|ax*JRgN$J8C&HEhcx)eZk2YWEGR8>RI(&{>&8%XU0cMprW|!yOY4U%%63mTMdu
z%<;%s`cXLOq3ak{Z}Vw*O}n|hzjL$IsPpd{bxuU2)%Nb+HC*QCrbq5rH%AG2$O6_m
z(hn}x{U_?ffoZsJU%YsE{oXM7ir`gskBJRFg2#c%vF;>q7e`c(xxWGJQ)KR~=3cuh
z<~{{OZ*G5h_25#HGpEnU|4xsQPr|GAclLLi$$5(sL6p(AfSP~n`oOVW+dUbubx%ys
z*BsVk4+m?t+iRwAWVm-~tI1cEV0H81z+uB7;6U5eU3LWe=?NpelYcK&<ZazF!$-X*
zI`9<>)lXytLG7Ob77Sh8arfEK&6pu4D^d@~QDzDVsC){#(;FcphSI4MCi6Vdy4vlw
z5ooscA(Oz2hc17?OP_#yBM?oL8I-_2Gfg|mERi`a_8{a>1?z+wzsGt&Gx^>?48`{o
zXY(wOwb+AN8flT_Rmag!Vv}N~C%WN^dHg*FSVcY+;V&X`KRHKnAjG*LB~}?Fa|S6%
zWRRQBKqTV-ayE+G3|DmC)cBq0tFf;afwO~HHPBt~d@SwI)O(@W4}B*JMNSYD{w;h7
zh{pdZ<5QtGR5$C{wCHO32*@GHB5I1P=vSj%K&cw`AomwkC0>H5fo0o8SA<PAa9v<U
zQ2-_yxH;5}7I+tq(FwHKmpeal3-D3|#<(KM?w?D1%_&U3D`AqD&6qGD_C(@flon0<
z=Y1*O$3+XDmb+3n;R;@@5~Jfn>qp#y3Iv~`D$JgbkW+@=0DGkX5wlt1veIN&`=F!@
ze+%-9{zBy4L??dge#R0igQb+AFrc3+s|=4o5tP#{;s4y*7^PM+*MVkZUQlYq_mG54
zf{JBvKkX-Ftt4pqv86j=G8Rn=Y(>J>B5Vi37Q&(NPz&<ukX`YkTrOLf`aZUe?l_OM
z67kGp8Vfg%2?Pore2UH_J*H765d3f%3+LVhey&ml5?##`>KJ3CluAfk$)w7;1o8Z5
z$|y(#jj%<E`@JKp3--Zcp#dPtT6&U70s7nky4oTimvj+fS#6O+d04P#f*24<a|eZ5
zctP0tlzBHqepgFL#ZVYSeF;pRa{7A#3tk9;P*wo6tiIX5O4xXyoyT;<gbh(J0<<Vi
z73?RrfC$o#MEp6BSyGy{ggYqLrXPMRKAxtC_?d1u;+P~NF2Z~cWs%fJEupe}rIclA
z_TWsnBd4w`1=UUxhb*Dm{i@V%YHC+{yK)V5r|1cUIZ`{Nz<72r$dTl%S$hC`dMaqg
zvx#})sCnKPRp(~F{f<Pvf$AXUNz8gdd{Ie3ObUJvOjY=j7hj0sA2?rHUv1`+PODs2
zhOU68dRCjg%1AApkwWWR?wC2oI&SV0=GRA72U}%`T{Dmpw7M8T7mcG~dMggmGazUR
zbzA&hU_~NsBhbg=+rExx*Y^-ec_;Q6&L2wsN>jtOA26_kA(I>|&&kB+kQSc3KhW{0
zcyeq!3nP-<GVRX&@Zd3;&FuCnpS&(vf!QmZLtemvP3)?God}Y=@QSql0RJm-7+}lD
zs_it{p{qGYuOD`L;l=~C^g{Te2$z?YWSiEk2F31tE##f7e1V{vSz0b5NgN$&d~KCC
zCP@xbMwu|!OwE_kB#!oF813qM$F@K$M;*YZ+QvrBt6QWEeap5@rdz2MCo9rowW3Oc
zE5ET3j!e{=YqlE#i+6&}zI%^#T&S<cQfv2QTo)}q6>HIgFCg_dDfTwPLT5>(IB)_f
z3>Q6w4;dCnO7Q97+8*48a1_~PCeWW?+hSS#oP$S57Q`}r3OVT_QzpoFY~TT}#21B<
z7Ft7OA<NYeh%9Y{#h{t6pOpy{+Qb!wp$ywigk5FA{1z-@>mXAyA}`N@-mR{i%<8$4
zVgMQ8se$)IpIXEaf>NU~nEu3+4RkkW(gsqNpJ1#Cc3k`uUY~Fa;<T!1XNgAHYuuMK
z^P<LV+g8`W6oW3d)x(esvlW_dVy`FY&*wP~?9&mp=?hNNiFC@~KAZ&uR~hrr5qC*J
zN`xH>Qsx;_xUPsQQ%t^<7|gL4lwW>=hjSJlQ{WPgKm8+^9M;jCOl)F&-FCvj53QHi
z%-OR-qd^x<P-<ROWNX}-5*tnb2roP(%Zz!aBi-%vW$jtTsl+Pc;jyvl9rKyr&s~;0
z{4Qg$8*+<H5Ki*si=iW71ZSxp;_80v33ZtD@bhay2ZOZM1sLUCNJ(-NCZEavK&Zq~
z=H8xIf!HyjNZ~9)6~~)qJ-723@Jnq^1U~^#1~F1Zc0NcFvnDD7Rb2)OdAWK!G&2D<
z1)m~DO#}CcOO7CRhc?PBNAKKcMK)9j^Q+pZ<+l@sXQu+184YMiGLVuh<6nzfD*j#!
zXicgsoAwN<nok2<e7_)ubzAU5E@2aLFX*VjeVzltoniSj{P-k5lkunjb=e_YfgvD(
z1;x9PTwH;{&HkuPuUskTNrEpxAaD^P2{i(&R=9IKVP{udT*AOms6m7(saldqXP^%`
zM>Ww3$zUOG{nIaRE>Qi`2`r=vFjRn{s<hB#r~NEjD$>bts!iwRT8-wq6972_L`w|v
z6<`V!z6nJ;s+O$d|J+xQAPc=e(O69_dsv}IfFeVwCHoHU^SnuMf&`JQ*5k+$@TfDL
zbC~Ef2m)TIMlNqvT1Pn+)2&KVnaku)sAhp<2`e~X<=+U^Gw)b%mQKGAj$o%IMvXZQ
z3QFPhC#KSt?&gAfCKN$R$$yF>Td*Rb4i?<YV`kB+rdH6yZB;BNjXxDSO+N8M0QoG}
zKooESDQes_zxBtQAtGOj1+>aYDI*2R)$)QwP|LFb${?s1fBKmSzPYB#4#nnMxMifu
z4ky)I5(GWVTM7hG)VKvL^!o;4$b^47uZ4a;K-Hq!hg<r6IF-~>Nj+)%y}3y0A%N9X
z(PYE>tv`Yxui9hH^sr=}LGhAM71%9&U`LXsl=P#l&T6N1qkW~_fyONW6AN8_`5sJ9
zEWea;lE;WrXFj^0E!A9so9F~n3R9;vtO;w4j7S-s|Mj*$a7T``l(r5JzlgHJnKilU
zlHZuoO^)Az*eh)h#;;?NFSdKnui%R9u^vPkVW|MWgbUqnZtw5hY$dKC!Tp{6-Dctn
zK6R_P*Oonn!;}^$2!o05H3>6_<<$9=l)?<*xmZ~UzmjUNM7pl-xY%?}I!(ASS~AL?
glx1i6rDWqm;cc=XQuLL_`@0F;6BV(*qRRp9f3_h^D*ylh

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/split-003.js b/js/src/jsapi-tests/binast/parser/tester/split-003.js
new file mode 100644
index 000000000000..e887dbe0e917
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/split-003.js
@@ -0,0 +1,123 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          String/split-003.js
+ *  ECMA Section:       15.6.4.9
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+
+/*
+ * Since regular expressions have been part of JavaScript since 1.2, there
+ * are already tests for regular expressions in the js1_2/regexp folder.
+ *
+ * These new tests try to supplement the existing tests, and verify that
+ * our implementation of RegExp conforms to the ECMA specification, but
+ * does not try to be as exhaustive as in previous tests.
+ *
+ * The [,limit] argument to String.split is new, and not covered in any
+ * existing tests.
+ *
+ * String.split cases are covered in ecma/String/15.5.4.8-*.js.
+ * String.split where separator is a RegExp are in
+ * js1_2/regexp/string_split.js
+ *
+ */
+
+var SECTION = "ecma_2/String/split-003.js";
+var VERSION = "ECMA_2";
+var TITLE   = "String.prototype.split( regexp, [,limit] )";
+
+startTest();
+
+// separator is a regexp
+// separator regexp value global setting is set
+// string is an empty string
+// if separator is an empty string, split each by character
+
+
+AddSplitCases( "hello", new RegExp, "new RegExp", ["h","e","l","l","o"] );
+
+AddSplitCases( "hello", /l/, "/l/", ["he","","o"] );
+AddLimitedSplitCases( "hello", /l/, "/l/", 0, [] );
+AddLimitedSplitCases( "hello", /l/, "/l/", 1, ["he"] );
+AddLimitedSplitCases( "hello", /l/, "/l/", 2, ["he",""] );
+AddLimitedSplitCases( "hello", /l/, "/l/", 3, ["he","","o"] );
+AddLimitedSplitCases( "hello", /l/, "/l/", 4, ["he","","o"] );
+AddLimitedSplitCases( "hello", /l/, "/l/", void 0, ["he","","o"] );
+AddLimitedSplitCases( "hello", /l/, "/l/", "hi", [] );
+AddLimitedSplitCases( "hello", /l/, "/l/", undefined, ["he","","o"] );
+
+AddSplitCases( "hello", new RegExp, "new RegExp", ["h","e","l","l","o"] );
+AddLimitedSplitCases( "hello", new RegExp, "new RegExp", 0, [] );
+AddLimitedSplitCases( "hello", new RegExp, "new RegExp", 1, ["h"] );
+AddLimitedSplitCases( "hello", new RegExp, "new RegExp", 2, ["h","e"] );
+AddLimitedSplitCases( "hello", new RegExp, "new RegExp", 3, ["h","e","l"] );
+AddLimitedSplitCases( "hello", new RegExp, "new RegExp", 4, ["h","e","l","l"] );
+AddLimitedSplitCases( "hello", new RegExp, "new RegExp", void 0,  ["h","e","l","l","o"] );
+AddLimitedSplitCases( "hello", new RegExp, "new RegExp", "hi",  [] );
+AddLimitedSplitCases( "hello", new RegExp, "new RegExp", undefined,  ["h","e","l","l","o"] );
+
+test();
+
+function AddSplitCases( string, separator, str_sep, split_array ) {
+  // verify that the result of split is an object of type Array
+  AddTestCase(
+    "( " + string  + " ).split(" + str_sep +").constructor == Array",
+    true,
+    string.split(separator).constructor == Array );
+
+  // check the number of items in the array
+  AddTestCase(
+    "( " + string  + " ).split(" + str_sep +").length",
+    split_array.length,
+    string.split(separator).length );
+
+  // check the value of each array item
+  var limit = (split_array.length > string.split(separator).length )
+    ? split_array.length : string.split(separator).length;
+
+  for ( var matches = 0; matches < split_array.length; matches++ ) {
+    AddTestCase(
+      "( " + string + " ).split(" + str_sep +")[" + matches +"]",
+      split_array[matches],
+      string.split( separator )[matches] );
+  }
+}
+
+function AddLimitedSplitCases(
+  string, separator, str_sep, limit, split_array ) {
+
+  // verify that the result of split is an object of type Array
+
+  AddTestCase(
+    "( " + string  + " ).split(" + str_sep +", " + limit +
+    " ).constructor == Array",
+    true,
+    string.split(separator, limit).constructor == Array );
+
+  // check the length of the array
+
+  AddTestCase(
+    "( " + string + " ).split(" + str_sep  +", " + limit + " ).length",
+    split_array.length,
+    string.split(separator, limit).length );
+
+  // check the value of each array item
+
+  var slimit = (split_array.length > string.split(separator).length )
+    ? split_array.length : string.split(separator, limit).length;
+
+  for ( var matches = 0; matches < slimit; matches++ ) {
+    AddTestCase(
+      "( " + string + " ).split(" + str_sep +", " + limit + " )[" + matches +"]",
+      split_array[matches],
+      string.split( separator, limit )[matches] );
+  }
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-001.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..6b06c09c12642fe477212351360c1f68c963ce9b
GIT binary patch
literal 6268
zcmdT|&2AGh5Z?0ta{(c7;Izk96{JPtf|iIj4Qfyb6^SZt$j!RR(#>vUJ53|R1MmvG
z8C>DQTQK%|*UoyAIO#TsQ<Sy+jpy&18GCFr3~|-#W8_zlNZcc6;9PSY=Op$g&VHly
zw*9i*jfdFrDq@cp29#C5J$9V?u*=hrA0rZ=lMo-^ZionCK^zGvU;U@fSrGZtSib>h
zV-Z$N1XSQVK@_kIKo{Team0et022Whp@F(IWh97t)!QJZU9WW-?^|9)e)B34M8|52
z{mp=3f<ggzj>3_F_W<xHLktf<^wXW4-DjVv37iV32-A5|?sYhOj)=KkzsHIu{R!A>
zH0g2uL%S@K-h!*wYwz|x?V6TZzaf9E&yY7kRHxBt)=j<jh_H;zha9bs-P4%3S%jL%
zm#}F4Vn{HhkmT(&14PW>?0aFB)=(I#qvAvtK4Fzxy0#WMeHSzZ4GHUD%I0V&VRdwM
zkISgQ*;1;2NN>ccfEKE5p$sRKF#*~+1U|;36F1|YsgvN5?~vd|j_(H%A`_*T!&wH{
z8`u~aG{mROAwjRN2vm|02ijJGbR%5>q=g~MW@@gWs}#)Qz91?rZZ{`aGvtKqv%dv`
zRwVZypo-!6JXSgNl9Mqc`6w(%EImdnNr}U~K|zT9*`8Qmk^HkhJ93V~7hOE$J&~#V
z3Z{Gnh^^SoKwZ`+@wfmx3&6ECA8U?Js5iJ<UVI)QN=uH<4w<O>B6{mE?w&b)6!{@E
zt7&7cN5MYdkvlZEA%6jkV32~U0}6_70+Y$oT_`+PqRXsrH@I|YrOg}=;rS7k4J|Cm
zg^we=+u01Z+%NaOni3?lWC<bdEk93LUmJV)b&@gY5YdBxK&;h4fz)st+4zv+>OeKb
zy8T*+Mih%mJcO}mFnhGpk6KhA;Yw3a9cAe_+J=UKJA7)eTQQFIpgZhEydP2k%QPgf
zly16C7M8KCTb59eFNGA7x;*{WZ>dyXD);`K&6cQ9IfCGEIH!j{h;{$-;EGQ^gFT%g
z;hia)q`5Q|a~7_#h<^)|J8&TuCnTc+E_La`-=wVSp4T5u06Wtz4>jwIVw@&s$y*Bc
zTkx8prV1hS31IWR>4QSv9Lde{Qq%vs^c7>Zg~#foV2!fIAnp@B&eagbrcZ=o&w;3T
zHCZ-jtOtuLn0x*YNXvT5`2y;#D7OXGR*x@BMDBHW6B=1Oc1^Dr1+GPUFQBy|RLkq~
zeA_DRp1fqusx!JREmWRY{bn>lx&)QeOI5Drih_k2JiD3Io6dq3j+dN-lwnGqCe%5d
zUGmWV8oVqXy6K!3WVu%GDj-*i`AmZ}UQp%QjOdlCMKPl-<tKLylbR1^a@DlDTqv%S
Oa&f`Cm0)b6RsIX3LhbYb

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-001.js b/js/src/jsapi-tests/binast/parser/tester/statement-001.js
new file mode 100644
index 000000000000..087f3f74d8cd
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/statement-001.js
@@ -0,0 +1,47 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          statement-001.js
+   Corresponds To:     12.6.2-9-n.js
+   ECMA Section:       12.6.2 The for Statement
+
+   1. first expression is not present.
+   2. second expression is not present
+   3. third expression is not present
+
+
+   Author:             christine@netscape.com
+   Date:               15 september 1997
+*/
+
+var SECTION = "statement-001.js";
+//     var SECTION = "12.6.2-9-n";
+var VERSION = "ECMA_1";
+var TITLE   = "The for statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("for (i) {\n}");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "for(i) {}" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-002.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..cfc1b8b7e7485104438a10e3b4c4581f894de9f0
GIT binary patch
literal 6326
zcmds5&2AGh5Z>~S5E2rC0~dU3RcH$01Zf0KgPJM|6^SY#gpiwc6VuIZ<aL@xz>DxY
zJOxKih__(u^{$<GlQ?N8Kc^^b`?F`}n{UQ0@_sKMrDBI*zqHSyHp5--g6DaMkw5gd
ztM$Fc(?%=m5wBQ~bBY0tdFkt2&$|J$isteI%qTt#$PQ@*m|;$%P(u0of9xI8&>zM6
z4mc~bup%a*sPEB`@(jS-zUq^Z(<4flgbQ(3A3ElYhV9Z-*rrh_H><De#e(`)EGQ5Y
zt0CvtC?^aD67B>CeGBg<;Kdws(uJ)bZf-udQB(AS^jlGFdJz_$U}jG@53!&>zXA3+
z`tzXjy0I*OUWTLZH6FcxVms#i{rKbj{3z^hR-3hoZMR7XM^@euXdQx%BDS$XLzFSp
zMn8jBE2lk1;uw;=k!FCT9m&4uW@#A*fnF+CwBQrbxn)}Hkki+}TCkAuCW-kJ3l*%1
zuFr866NFkS6EJJ{g%rfOraKsO3$O+ZWM>!jn6PG4i`uqLQcAu+j$3KIO+(Cv+AdEB
z4X8J$F(_z2j=0BYyQ2kE>5%|h*BhBm`VEi{j##!*3j>ihFynm=D;!QYC0{e-MDMe|
zIUD```hEqx21(uzauUnrh@&tGxR;m)#Gf3A^Q)6T;WSnPjmKm;eTUE}a@rz2(G%IW
zFW}1CfLM=E28wuxMS~pdjDY`R{~-tk^@g;T$IpEn$4lmClMQu!k-c>gwT`_G4*dX{
z)wHoTS+Ff;j4hhlkiP*YTV&RCKtqX1;4)RZb2lF=(aWrFm&ESSO4~Ug>G=tUEh`+w
zr2uP1%Y#-Cbk>MIKs^M_5AV=;4Sht3jG^@{`Q>fz-81yrK7~@BENN6s)aQ{18CN55
z<m9Tfi{l;2fR7b0GIj1scEw0>O`tO7txh?>{g}vV-Gi%Bck=biT<TD%WVmfRO_aI0
zwhm2&AjQb#Z$YlTfDW=9ik?XW%+s`NY1>Sj96aM%+Z>@Fr*dT|4SD)&o>H4USAPCE
zpUqLn#zaK$a7v%Q6PfWB<cbbIfIqz+6WuExrnxl2Ifu|V@ZSOD8XSm6i4bYRr6Ha9
zo0MKN^5(+|U}x5iLrq$v6{kjc^4>!HI=p!3n}^)=9$<^P>AS<YJCc))@0$KMcVCdJ
zbu!Q^rD`nesw83}u6$)26FVl-uw4);QE}!ajq~N>H{6Z>4M@kDd>@?OjTnKNi$fHJ
z1a(RGkTB?5(+<QAoyj`KeFPWKDzw04fNa1#Iy)r&46(~Ybv&-f!nLKH)3ph9FnL-{
zoX{GX(bAbdS3R4rR5+L+a-KWA2F+;fL?KF~8t#RoGCQT;OP<J|LzLwcc|7IqS&ikq
yC#aEpl`|l%=T|j0fxT)pk2A*5_?_RtjP0j3HEMfZ4dho(H8|tNOX|4QK>q?eX9H9K

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-002.js b/js/src/jsapi-tests/binast/parser/tester/statement-002.js
new file mode 100644
index 000000000000..7ac633058bd5
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/statement-002.js
@@ -0,0 +1,69 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          statement-002.js
+   Corresponds To:     12.6.3-1.js
+   ECMA Section:       12.6.3 The for...in Statement
+   Description:
+   The production IterationStatement : for ( LeftHandSideExpression in Expression )
+   Statement is evaluated as follows:
+
+   1.  Evaluate the Expression.
+   2.  Call GetValue(Result(1)).
+   3.  Call ToObject(Result(2)).
+   4.  Let C be "normal completion".
+   5.  Get the name of the next property of Result(3) that doesn't have the
+   DontEnum attribute. If there is no such property, go to step 14.
+   6.  Evaluate the LeftHandSideExpression ( it may be evaluated repeatedly).
+   7.  Call PutValue(Result(6), Result(5)).  PutValue( V, W ):
+   1.  If Type(V) is not Reference, generate a runtime error.
+   2.  Call GetBase(V).
+   3.  If Result(2) is null, go to step 6.
+   4.  Call the [[Put]] method of Result(2), passing GetPropertyName(V)
+   for the property name and W for the value.
+   5.  Return.
+   6.  Call the [[Put]] method for the global object, passing
+   GetPropertyName(V) for the property name and W for the value.
+   7.  Return.
+   8.  Evaluate Statement.
+   9.  If Result(8) is a value completion, change C to be "normal completion
+   after value V" where V is the value carried by Result(8).
+   10. If Result(8) is a break completion, go to step 14.
+   11. If Result(8) is a continue completion, go to step 5.
+   12. If Result(8) is a return completion, return Result(8).
+   13. Go to step 5.
+   14. Return C.
+
+   Author:             christine@netscape.com
+   Date:               11 september 1997
+*/
+var SECTION = "statement-002";
+var VERSION = "JS1_4";
+var TITLE   = "The for..in statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval(" for ( var i, p in this) { result += this[p]; }");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "more than one member expression" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-003.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..c77fa4f7e1e8fb83aa578062499b3b9ca0b78c2f
GIT binary patch
literal 8692
zcmds6-HzKt6n6P5AV8H+Z;%kaY_)2)2r40(u3)oSb*m+<ny5Djp;>!28P;n@<4Ly>
z;t_ZOo`V}Mcn~hRLc9g%jK}tg$MKH6Nhs{i%CYC0^ZT81W_oHqi}+q|%2~MgR3;P2
z&b`+>&pS!Ng|~k+d_4Mc6eKh5^>+0)y-1{L@7GT}?>+dcN0&cmQm~VVAMhYzk|~kI
z8Y(QGQ}0Z~;WE~rfOG9KtVC)k5qcsPssNzdAB8+t;#6>{;bL}P3Y{t`;>q51*k&~7
zkB^=Vd%Nbh-mU?mSR?)Yu~1yHNW;Bg(cHp&AMjGe6hDWp@7%lhnT?vG?`pgC%%-oy
z!WT^1pHm?^+Vc;<-l9F951x(IWzRQ3^v9!5zyI7e%=Yd0*Y@m)dXJCB#{*k$8W4_A
zc@xp5+&@j^-Mb?8iwL#RuVB@|%bDb93Q0c7GeCzOFMhAh(mso#a;aVsz)!r)Evm6Y
zPQL@%f`(F!d8!&TG_VxCl;bKYAX^$0n4HX!3esBD9hA8NSQip#=MnHRm*eC(nb<mM
zD)|L++)DF(5i_|c_41HtfW3i@fk7jFsyrzs(~>|9A0g0Axe+ze1|S^_v2LbD1^rUN
zBJOLV!a=%*d@YbOzAqkYHhT5>{VlK>B>6n5Nh}&8j>Lp;hfG8~T<wYN)ycm>8Y_XS
zK3PxSfgHtO27HD+k*#|NQ+^1D!^AH@eKnQIMGbZlfd9w-0|N@`4G-2ApHEqut~ox(
za#7Y7-CIXVaOO=}97fQr=8ZLtf_?m=vZ%2k{{kopxqclD`E|&OEhPqSlQbv9kYA8`
zh6}FNFT4#1-z=V-{7@S;MY<SoY>$q91G%<jbyr#+LNg;pkdHwiU=gfquv6*PGSJZg
zkkF>FEOw)*QE4F8*?ql%yThPo2c#y?-$6RdLmOz1HUQ~Zps}jJ)ZpKOaw1Y6W{2dq
z|Kq#1J*Y!kU}wFAzw=Pze>?l`K@D~uS{?SlVECy4(qwbKL-9YWjdVkL@`0$?Gjs>p
z;RX+faJ-P3pC7UGKuF+|0R&GGv>Nn2ti|>D;E(Y`2+y?NwF#-$Un`C$a$%{IeWrqG
zKVtKgYxbYPvCH}DqZ_)^q080D*zEh(b!rESl(q+zr6Uu34b$f&#(Ap*XfyCUEOn#O
zI9R6EUk0NC6fmAsF{03=%B|S*-?LeZ9=JmB7>5lt{~)3M$KXnIarb5tCttNFGLqWQ
z!OITu?|_2+hDtJ$ECVjj=1c!KQxjkp+Et;bwv^6Lt?c=jt7SUNTT#8~NAMkfOR0+!
z4Km59yXMby_l~i;-1(tnO%z=Dm<4@;$3=aXQjLtvTCqbQD(nZA8fpi3J0DzZpvwO@
zARYUKkHPpSEcEfv>JH9Iekwu^6K~!fl29~`qcP{W3r2!}3x;QY;oE?9!R!zNmrz|D
zs-w7=kGIz*r|bCapmI}1T+ww=Z*^pdc7?)04a|7e`W*Ri9tU``LodE?7>C=cmDgxg
zdk4Xqr&bEqx+PnHs3`3c({*&nhT4m6C4LMuOsNNGXxB<=I0rA_xv#zmbW6d?{EW%F
zbd87-!QWR_k6*_Sr6#XJ!?!P4aK^hdUM;;+u_4+k?^1Fr<^QQOE6Y}x{)U_BpK&#p
zm20lN2PveXyF2KZ3vI}euBOeJtG=#lF4+#7tPHCCsQWV*`2%!Mnq9WnQ<iyI+a{TJ
zHMc7S((c;`q;(l>-mR#}=51XaG_Npl+~#$%Q)*vFnzwd+F)z?q_LN{=*3gc5bIE<7
K?qsbagnt0_l>w6g

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-003.js b/js/src/jsapi-tests/binast/parser/tester/statement-003.js
new file mode 100644
index 000000000000..7e257675c4ec
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/statement-003.js
@@ -0,0 +1,80 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          statement-003
+   Corresponds To:     12.6.3-7-n.js
+   ECMA Section:       12.6.3 The for...in Statement
+   Description:
+   The production IterationStatement : for ( LeftHandSideExpression in Expression )
+   Statement is evaluated as follows:
+
+   1.  Evaluate the Expression.
+   2.  Call GetValue(Result(1)).
+   3.  Call ToObject(Result(2)).
+   4.  Let C be "normal completion".
+   5.  Get the name of the next property of Result(3) that doesn't have the
+   DontEnum attribute. If there is no such property, go to step 14.
+   6.  Evaluate the LeftHandSideExpression ( it may be evaluated repeatedly).
+   7.  Call PutValue(Result(6), Result(5)).  PutValue( V, W ):
+   1.  If Type(V) is not Reference, generate a runtime error.
+   2.  Call GetBase(V).
+   3.  If Result(2) is null, go to step 6.
+   4.  Call the [[Put]] method of Result(2), passing GetPropertyName(V)
+   for the property name and W for the value.
+   5.  Return.
+   6.  Call the [[Put]] method for the global object, passing
+   GetPropertyName(V) for the property name and W for the value.
+   7.  Return.
+   8.  Evaluate Statement.
+   9.  If Result(8) is a value completion, change C to be "normal completion
+   after value V" where V is the value carried by Result(8).
+   10. If Result(8) is a break completion, go to step 14.
+   11. If Result(8) is a continue completion, go to step 5.
+   12. If Result(8) is a return completion, return Result(8).
+   13. Go to step 5.
+   14. Return C.
+
+   Author:             christine@netscape.com
+   Date:               11 september 1997
+*/
+var SECTION = "statement-003";
+var VERSION = "JS1_4";
+var TITLE   = "The for..in statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var o = new MyObject();
+  var result = 0;
+
+  eval("for ( this in o) {\n"
+       + "result += this[p];\n"
+       + "}\n");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "bad left-hand side expression" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+function MyObject() {
+  this.value = 2;
+  this[0] = 4;
+  return this;
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-004.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-004.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..f91dfd20bc69d53739f1e0288f1d85f223826a80
GIT binary patch
literal 8367
zcmds6-HzKt6n6P5AgC%(Z;(J%uUf6zEfQCduF7V!>Q+lyHBoO6LbLX4GOX8*#*=O%
z#3S$myb4dkC0B^I;GD_WKJiSPi8ommt|G^tZ_YV$&Ue0<>8R->;d`AiXYt+(nT;en
z58eub;3SJ@!TwSI+2HFzludZh+11~45|OLD?291y2)^pj;jfq!>?Gj_JW7~kN@S^q
zimT^5I1_2Si1jDn+*pN`New09K%_#I0Cf7Jn5Rmd3NAHV%FZjJb0tMO+PewU40_$+
z(er+1*ZkMnH6RpgpuayBic6MgxYsP1T6iA=Uapwp=P>nyM~}X;Q49249k-5|^lcdU
zno0X}YDCL;{sGum7|&O|mxE2k^Ib6g+2G3`uSFdHy1F=`-@~Kfaj!WcJhSo+qK$cY
zn#qR`MH-eFYNKBwJ9}>?lIJ-T`Jku(op!wZ-&v(ymL%0sJtBg?cvV}p1Uzc`1Mn6+
zlxoOx)!?C{$}2lA;{vj!ae>Lv6saJ0y6)l3ZNR#aKs!%?kGULX$JxmCNmI#hP~%pa
z?~9blS>;!NL<8&%Yzz#V@KY5?F&b9{YWN6&cB+Z!5^Mp|BM_TrYIHEH94zzRkrf`+
zHPmZ~Jm>rJ(J|5W=lAy@YEb0U#8Fr@M?8rM;SQNdc)WZiuC7o14c1r%R9}<L=nmv4
z{wCrR)I_%LEkgMzAojDc1P#?#W)}|ZG6DaO`U4XR`VEgZm!B_Ko^LomhjLc+7p<+6
zEIJFuER7QotA((pS+I{^)CM&Q@>}l&S|D#ikl%!=xT3<qX|m>m=<^HG&v3xy^uqgq
z@ZIeB$xqI#Da*yIMhiNstgRLh&4xrZg2}n$HDR<#RROsXaM-}uf!3t(J6MMXF67P@
z+Wr<GJsZy_;2o&p@LqVA-3>t!XZOROKeWR^OVAS<iFn>3!=1;#!Xp2E^20X{>>{&T
z%z=yZi*0RzXmYfCTufa$AKlMmg3X_y=gqh5JnqA$IX8blW%+@SP$fM`oib&0#(V~2
zb;c0+NXuA%bfer^7nV^|x=cmmZo;NH*CKTSCkE%sPaWt`4}pfpaXVrZWo?Sx0WFO|
zTPTy3#r`d9oJJ{b6)J#rwEE-9H|mo|WPBx^ClrvH7mrdaE0@<I$bT<pYsj}6i(?)(
zw5x-Ru0JMMru$Mbk+^A7v$E`H{5+P%BmX^6uvMyTPJ~s$71g}*cdj_8<&=K_yY#LO
zwQLN!HODySYLT-F6}6O~C>_i#tIt|I)7e|*>Y`}bWG}}x!IO?I%c)1kX6@J^5EZuk
z1)}m;Ztp$!78?0~1JY9yd=9}sVR4A(Ee}xUhq;J3Y}N_^XcrUBInP-z6T*A2@8cJt
z4d_Z{j~rM*buLs-bFp^sZ_G~Lou7xxO&xKGw4$rkk|EY>6drD1#jCZCKo6&BgohIJ
z&IZp6;i6^f4G{I-!?5NJ7X@2elFh(Ww042%S}w?z<VCv{KZJcm<p+3Z_evT#k5#}U
zOMQpsSAu;w$Ce^mdIP3S3W6t=#&<D9<;isreEX6`XS|K@T60xuF?21WD_XT-$eRn7
zkMq#q_6z+>uBNhfLsQ&Rl=6$Fl829l(S{u9=*tScrWmc5?lSw?Um?i1VD932)=gP?
z!zHqL=eQU!Z``_#Kw9^x=G~HxY~H&1pm~LfLpJ4PK>bLc%#_<VY38lnU(5^i%-$uK
Smk!!7Z&qA&X(ekNA^Zcs)|TV|

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-004.js b/js/src/jsapi-tests/binast/parser/tester/statement-004.js
new file mode 100644
index 000000000000..056e0452ede3
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/statement-004.js
@@ -0,0 +1,52 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          statement-004.js
+   Corresponds To:     12.6.3-1.js
+   ECMA Section:       12.6.3 The for...in Statement
+   Description:
+   Author:             christine@netscape.com
+   Date:               11 september 1997
+*/
+var SECTION = "statement-004";
+var VERSION = "JS1_4";
+var TITLE   = "The for..in statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var o = new MyObject();
+
+  eval("for ( \"a\" in o) {\n"
+       + "result += this[p];\n"
+       + "}");
+
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "bad left-hand side expression" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
+function MyObject() {
+  this.value = 2;
+  this[0] = 4;
+  return this;
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-005.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-005.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..165dcc1a11393fe53dfd410555fd934845914403
GIT binary patch
literal 8644
zcmds6TaOzx6rOS`ATCuAFGz@ycxkn2x0T?9rYqQNR^4hzt0w9TLdZMgP0Y^DL>{Nx
z2=T@%e}G@YU*VA_#J}Ji$DTPEPZDQxQA=K;8IM1o`}u6Q)OeKegVvC<_~5C`29jL{
zZv;Vbmc^6c@TB{=_f0R#Mm%Wk>u*|#$koAbUj)Gi@KuXWf6k;}X9+*zQNkosB1<(?
zTt4T)g-GLBtiJ*0+A^$6YA6v0A{D9tpv#}cJXPXcaH-)^c3BFYD=E^!!F5=s*J<}p
zo^)IL=3Q&wfKaTS{{B=bE?J`CUa(~B;C%>qxnhc6!qRu{-TT@_wdniWZY{Iun=tVO
zlkVqKh=%t33$S-+&*z<Iy-nHkZ4mu&@BU9;xrW)j9sk*#9Z~Q8N&mFt>P-W}Gb%qt
zv>^}AGkN!}NW&sRUGz1q+IcyWJkKG?do}}f*zw|hZI-rKl9W^Rj0j%wGPkJ49y$FU
zXbT!j)#tfdprL`K=%pO%sDRbdsKDf4jHMv2Roz3G8-R5sq3k?@ddy`%JIw~JPP&x*
z0XgoZ`JqUeoRoS6SZJVnLp6p9n(%WKNHG|e1=Q3d1llVXqDI;Rq=z9kU8zyQuvD;!
z`<kfmkZwV~7Rb|jUp&?<^y=65cfe|p<m03!v1p8V7AAx{W+LJ7d{6AIPyP$iI0;ns
z$!2&5)+qim;v?iluI>#?`3WF)v#<aS)lg<vHP}S}{vY`V1{Cxg9&Ii@pRzpPaD4XV
zr0g%6TPIm`5e!)xCqPy$v8GXQh+kADEhOY$LP^3}zX?Kq9kOCaiGj;xixZ;DuSh?`
z3G4BNcLCx1$&<66Yon$}7vqfv<*1albRdcifocd-t;@dyE;UGzJ(K{ewC{(d8EGVW
zbTi*7-vw?XMPzqHpi-fTV>TlKm84W_CA(Az<0jeGTj&+o*p-&Edgx;LCwL7VH<MFa
zphH`L^lZo<gLbe>2yfjFVV{uQ4u5&ywFUK|C+<zao$`io?;*4%k^eCI@qr6%&D~%L
zjDufmq_vPHaf?T@gn3ODq=y`cI(-HrFg?fMaTiV!a`XBT%a4SF($RsqDZ*ce%V#iG
zhYR7<w6^Jwt`)}(Rx&C|o2h8nPS`l-I`v0zjB+{uD27h;$a7tUTqjVJmHW;fG#xbB
zOpY|n^jE(EdKh^TC9y8I|J3rYoy}I@w3QN$ak!v|A7!)yVsK@;SqCGDJ6Sa;(vI5C
z!!;i9?}38+L1oiI=q8hO?cDz<4X2XR`UBX7c2$UZb5N}*#wk~`HOo@Vx%G(?4W^P+
zSGCV{^@g!J%jD3pCJNR*HbI}@@lTuOR3js^R_quG754j?LgnFZ?}Lafbn({%(vuT>
z4#q!YafpXdcX00$<|5{>gSD)fgradAjXBR%FcQLBuo>o8p$k|S%pNhYq}0`+dWws=
zdwXMYF6uqhmL4iE+7ry7R&<4i6=JnU;h_d*yjuBO_;{Q~cv3?zvT$<^w@-7g#i;fk
zf-T;KQm~aN*#tyIX=f^3Lx*gMk~M4beb`5odVq#*ucU_a@B*IW>We+U6s&B3F?naM
z1yLgSed}=ix(ZQhveI^VOCC9tEV|%Lh}Vi<sn`(hWm$@~lKrR7tW29@`Wt?xf5z2V
zR<5lq2PveXt9$5Zg<i73^wrmw6fRkAo&D_ZVC0X`J^A$VyuM_a!CIPR#%gX$2&Bu~
z2&8klY{uqvWHVaV2h9)$4%w8G3DtWJvQq9|FPc%eznB3umb*(ZgEeKxj4ZkT(@fSm
GLii84XY=s@

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-005.js b/js/src/jsapi-tests/binast/parser/tester/statement-005.js
new file mode 100644
index 000000000000..404a157e98e8
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/statement-005.js
@@ -0,0 +1,51 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          statement-005.js
+   Corresponds To:     12.6.3-8-n.js
+   ECMA Section:       12.6.3 The for...in Statement
+   Description:
+   Author:             christine@netscape.com
+   Date:               11 september 1997
+*/
+var SECTION = "statement-005";
+var VERSION = "JS1_4";
+var TITLE   = "The for..in statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var o = new MyObject();
+  result = 0;
+
+  eval("for (1 in o) {\n"
+       + "result += this[p];"
+       + "}\n");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "bad left-hand side expression" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+function MyObject() {
+  this.value = 2;
+  this[0] = 4;
+  return this;
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-006.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-006.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..f5bc9952a0ecc69d2b3b825803b27bc8c5a1bc2c
GIT binary patch
literal 9022
zcmds7&5k2A5N>`KBtR>zxNvH2pb<NZ1RPL^V6rnJt0BAEM0-V^ZYS|hPdjouJDVFX
zzzcBa4Y=?q962H0f-1-EuB4sBo#}~onM;(|{#;eA`dn3>j-Jml-t9~|OS?~$oG5k`
zy%|N(g-jRGNq_KY`0X%}Gahx0&74jq3f;Z;X%u|`vpRJ7Go}Q)$oNB^WK1zFWNx6+
z>U$AgiacG#`WtZG*o7sPff8vXa-mBAx_v+8xfWx=m4VCIRV8$xmB=UEJFw00v^VNM
z9(0cFZ=GWcLa~Ns{<+XxvCP1|VA;He_aWdFnrVIoTYvH3!8dhOhkk7A*0Gzu1q)v=
zRi93U*wdbW0rmmy`Rw%Ruq}JO1EN0~e);oPb;BIqj{h9aj;QyjKRQ3H>rEXZ&?`Si
zv?-6rQr*8V^0@TSI{FQ)dirvvcu_!*4_yQpx8vpS-YD&{EUT896$$*rtJtC%2gLOI
zpe<;q^oSRFi-s1KqE~X<L<M9^s{&J#IZ{F4RXsqNyMT4AfOdWaKIUp9&*h}9lcAE|
zAjWH9ej;+F7L{HR5)H67urV-b#>YBRVlu4=)bbGm9aS4qBi#aIfFasuYE&?;6fFJT
z;}rqYZHd<sdCB+XSI<VTKEJ;UR)Zj)XP&^KJ`zYw2zSOr#?#FwakzW(Uy!C2K<j7H
zPTqkW#a||ThB;AP_dQH`4-f}3E<s~GRr1<{T{__ZG5<h^g8POi?fK^uRunD!=SVH8
z`^DtenM^LDDa+Fgl2w;jQ!hBd8EcESCggvBDUj>iNXYL%R2(QUa2vTjAO`%J+-JDp
zX8FQ<fbi4e@x^nm*OcL6PvdZO^e4!5AghPc`T&v{B@$N#fq<p6wqU0-srn>$d>hb7
zg0ivxq+zno)`1o0FR)dJsc{ZeoW1}JND^?h$G1z%H7DeNO_2k}(z7i!TVr<l9dxM~
ztcuEtsBjVxvMmg}miqx}hDnZDas?2YrXqPBeOK`XRVu(Zp?-g&SaQj!e7LbRlo8Do
z=F@uNRc<sD1yKuDmDAk0H<Wpo7g;!mZuyFCLYp`~f!xwfYfyqE287$Px5Lu`bXTe>
z$GGw*FwZy%sVS%<`V-<E0*7w?HEfQD<Qgn%X0sxB9l$RawMLKWWZKKvyx_)DXVBfc
z+T0<dO9Q+TMdg)Gdyk`OI&cI$V9Y^fsT}iQ0gJlbe!K=48BZRFDd^6Bt!>tz)M(a<
zc_{ZG#DJp-@c#f5OzX5<7NYfFazVB6b4dd9<lCdobFLfGCZz*EJvl|F#Cyi~YJ!cd
z(N;GL&jh=2JyuYStjtESE)W%Fek*lLz;Ornhi;*L^?E=C_GGYGyv%H3QN+2_amvRc
z_m#lZ*8<Ve1LDu1H^Hyt%~45#1I~U2#rZ-bP+X*<&s&po+nv);WpCnQF>D6q)OMeA
zhdr60*#!}Bav15lahv{Zo+sEiqwk7X=Rj!|R3!!ow!JApP1(41T7al1?Fz%~c_25b
zowlT6`(5qr*E-l%H}9-rA-L9_Km}J`Y2iEmeP6!ty3lZ+^ju%96FFD~x@JSPmuq)8
zE4fc<t+izvOn*1b^iR2-E7A!<H20ELN<()K@H{8<j`A{8-_T@m$9AY$NGbg*O#BFs
zqFDalf}fu3pf?q=W1fd90$I<^2xRSD-;Qm#eeJ04&a*?PJn09J1?x{tWT&G3vTH}{
YcZnT9W7R7GJLsVpJF?^H)tiR@2MHHv{{R30

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-006.js b/js/src/jsapi-tests/binast/parser/tester/statement-006.js
new file mode 100644
index 000000000000..24839d847a9e
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/statement-006.js
@@ -0,0 +1,51 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          statement-006.js
+   Corresponds To:     12.6.3-9-n.js
+   ECMA Section:       12.6.3 The for...in Statement
+   Description:
+
+   Author:             christine@netscape.com
+   Date:               11 september 1997
+*/
+var SECTION = "statement-006";
+var VERSION = "JS1_4";
+var TITLE   = "The for..in statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var o = new MyObject();
+  var result = 0;
+  for ( var o in foo) {
+    result += this[o];
+  }
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "object is not defined" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+function MyObject() {
+  this.value = 2;
+  this[0] = 4;
+  return this;
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-007.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-007.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..f873474cbea4987859fc239ea04e19ccbabbfd20
GIT binary patch
literal 6300
zcmds5-EPw`6wdfZ2nh*^3$AhrOsGR3Awj8NUC}yKWg^vXk(YRFAdM@>UDsFP4R|Cj
zxr4Xh*l}VvPE)tb#?MvN*#7Ku{GIO{pC+45BHU_@FbZ0Slnf~vJ69aXIVQo}+3ofZ
zyjPx2CfI2<#GGanCam@Cf#ckPSxtTU5uzbFj_@A#BSaAkNi3iO^*?dGgmJKl^#gFW
zR$&n;pu)fj<B;V5`u5!b$1FSvF%@tz8mmJmjE3>BbrZJnI_*LCL%-RO-<k~xqGNet
zelKL0qDa7<qG)R1-37daA%@4W_0yf5mnLe4-VlCk%1y7r!c#=e>G~ly^yhcLzC?c>
zbv}A^`SUs){lI(n>4oW-%lG5Y%kv|*d(a*9I;Pz^AuL%5vFQv(*!2m-Lp;T9PEiy7
z9B%ELO(;$hh;lCr0l_<*e=iNwHi{y(RIKpf6IQ{cn`{x(x4~Snkg@?zScQcWR!3Lo
zIFAWjE~N>G4yRlTl2X$xjJXF`GYY!14}y&8fb_`Fv`J{mR|s+=&UeEY(YdnA;YtJY
z4RQ<;8sQV>&~P|X3MvJO18u8~bSGT^q=h5umTGRGs|?I}U&0ED(^Uj)j+_d9{<mbK
zzhB^QfY%_%r%_2@=^U|CCJy%=g%J*x-^Ar5%3p9ABY=u`QcvN*H42~kc*2V!)AkKq
zc^?q_#LYonHlk!!f}Ioae=I;ap&;L2zdn8*q9m!Ap94Bq`9&1h5%Iq`BNPV_RI6EK
zt+Qa4&nPUatjM1OlMOPfJfNWXBygEb-KCosQgog9?Hb=5YH2eD1U-*n*s#J<TzHIS
zCC_UUU+PL84$|B5^MdcSR}Vi-`U=`d$zDi-X&pFz=C-Z;^^oD}KyAeQQ9DA@1dBX8
zfmhLZ`O8XQYLSD)MVfZ%C~LE58_ETK-3#x!4O#RKYQtg7t04ujPC4>M*{0iM;ThYk
zWeEk*QYtXnm1n>DDV51<Mc$wD*%}$DAP<~}6&3s*(eIy=iyVIje>xM&>ryt)VrhYM
z7FT1ze+!gba3DrfiBW{hu5{&ZnpE|h*Lx;_om*FgTDC?hP7kxRm4bslG&9tjLTvgF
zu=(7qrBHN7da~lK*?)ca4Y}IKGqqBvMqQ5}ekc4f*G368??f2pfl%>WvMy<?pA{GI
z>iIVyEwk+taDJ9;T{2}!7+{y2xF~i-*NhjsRgDLofR<ZwTDXs(&c!p=q(vFCE#iNL
z?v<fh9+wB?<J!(?Tj^SuT$LV|R7v`6si0pgwXK&mEX?5H&#YQLD{4HRlTy`&$KRsj
zR+N5eBm6DgvS@@S6&+?dR?;+(BjtjpK^jd~Iktqoa<q&y+EDRfuVE%;KTVFBUY7&q
PiBt}*Xln^cH)`qM2JHN_

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-007.js b/js/src/jsapi-tests/binast/parser/tester/statement-007.js
new file mode 100644
index 000000000000..bb561b691a5e
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/statement-007.js
@@ -0,0 +1,42 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          statement-007.js
+   Corresponds To:     12.7-1-n.js
+   ECMA Section:       12.7 The continue statement
+   Description:
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "statement-007";
+var VERSION = "JS1_4";
+var TITLE   = "The continue statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("continue;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "continue outside of an iteration statement" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-008.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-008.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..a2b521f4985583dcc6f6154f9f1af1b8652ce0e4
GIT binary patch
literal 6294
zcmds5O^?$s5Y6(95E2p+2Tr*GTA?ly2Lz>p?G|lURaud0ugGn@t=TlG9Cy3@D_r?i
z9J#^2VC*=t8>gw$?Us*I)!2UajNiN&Pn}IC0dCYs82OE38VxBLJJ%e?=|}$D*>87`
zyw~0!nqa416LabTiCN>@BgeT1v+DZt6GRE>2lxOF0z?rbQ7E8%^*?sbNa!zO{Q#Vu
zRag-fP{emgNLU7-Z{PND$jB+dRKSI3tPUMBO2T2|Hf-ayn!WbNZoMYI)oT(&$MVGd
z4q=$0K){`&U~1sq2fUaehR3k=^S!-SCTfaa6Mn19O|Qekb41PQ`XScz=Xb!~qCZbs
zpS(@^^Cleq$b0emrRkXM`|;=Y{K)O@wR@eGX}3-YOIAW`I=vBg`xK)ymxOLcQ4{_W
zZf#vmD2`)@axV=5!8@FNFAUQr3IerMtQf#2tb$87*&?X#g1KNJWj!3T5(_1)j;_ve
z856i%N)r$rPPrDug{E5=^8m1B6m;hh1R2v_)QN_sO+rh)LXaDAzE46#=gKaJD-Fmu
z$T3K0fKQo2$#A3;R0<LY+Ep9rPPzg}3rB2Ps=0x#GBD$P0V^y{R}!!paw7QI--3<)
zeu2LQUV|W?1_gnobHq}aINS$B0_-opiR~rIUvL^Dfbw^;nZko>6uubX2``FF+t+aA
zLqP0CZU*YI5shXA*ck!;#{z^C3i1seY>uDDD2_MG&mNtt{343$AR3%GBNX}pRI6!a
zt+QaC&&Vw*t;qL)$p)EK9#Bwx61YsJ?!wJ;DSDIn?FQc+YH2eD1U)?%Hms;1E~4al
zV}eUj$znmeT7F(|y!PbbCrO?_hbTTE6lm6hv!_1W$({}=t`5{hY%ppDXc}XYgeUMM
z8ZUoV=}RpVkhn$DP93E(g?6D<;CH?7s9Tdl@1ZaphP)I~099&{x5_r%CJWElrYuV+
z2$e#0Nv}Np)laERt`v5E&Sw?UQ%)N=4@=7TgGj%BPOhl`1^nquC@)IcJdLFV&RJZI
z1^+Ej?!bXql<12hTzaJ|f0K-=-@M*10qo4WJk+u^N^v@vC4Cg^ccGJ^9u#8J$AHb}
zru~GxJCc*-cTNB6yRXUBE}p5CLNzw^0^)bVUvf<pWAjdgVaFg;Jdso-jrE)23Z6Xw
z2Bc-GeFDx;x(m^i#l**Mbn2qe75y?^;+C}>boN>9$2s9Xg$ftXT$2+;w6+NT6{1&!
zYI$59jn6iAPTLyS!sN2txTHkVZ%ajdrMy-xWmuTOW1m?ydsY;9JRv2L4bQ$sxh<*t
zk{0+oxMk4-k4t*Xa;%_TAV-STPJ=Yst8#1!d*x^mXSAXGlU~D&%}$yeHN7qeinFL3
NT+z@HdTtcbzX39A`F8*S

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-008.js b/js/src/jsapi-tests/binast/parser/tester/statement-008.js
new file mode 100644
index 000000000000..a71fc266da37
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/statement-008.js
@@ -0,0 +1,42 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          statement-008.js
+   Corresponds To:     12.8-1-n.js
+   ECMA Section:       12.8 The break statement
+   Description:
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "statement-008";
+var VERSION = "JS1_4";
+var TITLE   = "The break in statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("break;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "break outside of an iteration statement" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-009.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-009.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..1b521624dfe9c5996172b36505896108f4073533
GIT binary patch
literal 6133
zcmdT|&2Q5%6wmmcxFGRyKpb)eO`|F|pj2#K(TYl$XtgWy60Z$Qlgf71^-l$HM&iHV
z*>PewPFuGNMVzX}_V4+9{oZ?Suw)YAW@Chr-#j7lkf5=1!*QIm*q=Fvo!-a(o4yxM
zu+ylCJ&iD+ta;;!<J^Z`4gL5jA^|!J@e%eyL=X$&NI?1OKXopG$e+jh2{=2euwo*h
z0^bRufaL(X_>PYw7Mur|2)GE1)ukyTK{RaM1u^}0YtZ@JYt-boMoog~Sbed-8!${z
zDBvzpm>78X0I&Y)<?H?Weq;h>z%^mAhLm>`&Rim5Zr9~+Xv!aey+u==w!ieNGUXk(
zdb{=M;A`Eq%=QiWYkP*g4Wb5}LAPz{tw)4qL_XqZBkU5)5)!$TA%@407bf^MjM~1M
z5KJlLcR#}yVTbeYr3u<XVW^IZ6CQlRDy?*dEz)@xlm!h58(_LjLkX*+t9x8W1x}Pw
z1w@7kH#99(-9niMfHft+ILAQ6m<-}>JT$!~sALy%+(`4oAVOrO^l~`S0C58m19^t{
zoH-;IjudxFKH@-oN|0_Oi(6OCsE^?`?nVKe$8(9dH>A_=a2dnSMXYKn6Q@7OsU$3k
zW8Ec|G{E6LpdiG)@@&yS+bc`Iw`WIA3HZvx6W)E8x^H00hk)3N-5k_qBN9(buygxv
zt=w-pK7rn`S6zIbAWAEa&jFb!Iu~7R7<(7a2t|GfZDH2J>QQjWcN7jSZGG!y<f~{`
zL2>2)lgUb1D!fn;t1KtCxO8Y*%^VQnIe=w@+APV1bAH-iyfx7!tK`WbZ7n~~Sza41
z_*K$j;~3GSfIytJ;qsZ$cJd}Y!_|RWh<T${h!ToL(VM{VF<v~t=tnIooN%M5r;f6A
z4DCT}=FXlQpEiu418BsC5pO*dz&f@6ozhL$$-*+WHOmqTa;21BGM8t+`Yn~pYvtX)
zv)LN;sXz`q4wtmcN3rgI9$fL+H?XHOA-oA>vn-e9V$Q-f7V&R^!Y5@Grv#${E_3P1
z-?XIap4Xoy06W*N2({>pVw^5!>5B#Sd+=tU8h9b}DPZ%x+4x>GM|!iO)a<`5eZyGo
z;i)<)Sfi?mgZqR}PAx>S=@X$?8;FWml68Z|dMx-0Q_KGWX<2KZf$`-mA190kK6c}C
z7rEz2<W<(<@<4E(Ltl%ht{Dhrv22m?E10ef)zT(B1z%KlPhQ0ql^#8PEmU4s5Et}C
zx&)QxYZbHg>V$<FJmHzui^__wj#r_Sr(tNG=h!99Ui!lP9=t4GnCX(ITe(*9geF(Y
uDNchlo-pOwg6Ng2Wig{I6$g0@lbX*}a@DlDTqrM{a&g70ksxuSd;S9tO2kP3

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-009.js b/js/src/jsapi-tests/binast/parser/tester/statement-009.js
new file mode 100644
index 000000000000..9be1de747d75
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/statement-009.js
@@ -0,0 +1,41 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          12.9-1-n.js
+   ECMA Section:       12.9 The return statement
+   Description:
+
+   Author:             christine@netscape.com
+   Date:               12 november 1997
+*/
+var SECTION = "12.9-1-n";
+var VERSION = "ECMA_1";
+var TITLE   = "The return statement";
+
+startTest();
+writeHeaderToLog( SECTION + " The return statement");
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  eval("return;");
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "return outside of a function" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/string-001.binjs b/js/src/jsapi-tests/binast/parser/tester/string-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..47330264d8ad85cd782ad6894bcec1085903520c
GIT binary patch
literal 7914
zcmd^EOK%e~5MJJ|14xJih{JL#s^~-FMAIUg7SXCoD-!jJ+^m}{-R?$Sr)~ZU62F1p
z!-YHIPcZg+*Y4U$CXYrbNRgtf?QcA<Zzi)9-t9zmqtd1%*f?NGi;+|BrssJ_Nzn5)
zcWS%!clBn{p<ZQK?x{p!$~V5h^t?x~t70BMBrGIH5#6HAh%my#B$iNt{+)U!VH{k>
z`UN;QhG8X4LWO}B#vv~NOz}Gbjd^$+QYPVIa;h(#au&v|je8)bzFlqX?AI#G>RDx3
zftXlzxqmO@l#xinosp<(;XMSr4Cc+s%Bl^SLoZ9CRg}bAaO#XOd%JmqF^%~XuxDt@
z!|l)YX&LhlTz$8``sJ-{nAzL$&+P0d^lt1l_O@-k&456L<a0pFwk~y8!V})>&?TN^
zk8BAOSa$oO!)Tg9me)Dq^c1pBh8``RJJYmEqDUW=Cz|kx>f|!DMkMtE&^YCU@di!#
z01XwaiLUQ4i3)-)l?sHly222tQ+0$gPXOzj0q=YQLZ+;d>?JK*CrKyYAkVE--wb2I
zdRi|}kPXl`&@oVGM31@0!d6=|sNy66w5SD{M!Et>gdwI))j~mED_F$6BPtNL8<4XF
za>n_^PlurS=lHu|HAwPq<VY+tMv&wr;69QtqCtO8%&u1chTB*PRQAbq8V|uy^rA^S
zqA9X<AH$SS0kM|&1*p&4EID^z7XkP$_8=mlpx)5t^y2e?r0JC7v%z}0zR2b}N}4BL
zo5Vo`-D=)hn^CYSc9aec?8sv<h2Z*29l5Rp8cIYwm`s&!r|=I@)myQsV;W$TLb9$S
z+|&udtHPiAo4e4WYlu96O{f|@H?AgBnyiPAa*w_`<0zM3{x<KUFEbB@-bzfziGWL_
zZXR@m&<gOL)9X`o4+82w+-i7RYT9_T#&J9wjCTs5t_ZMxJ-DeP0!q}9qP4fvBoEUO
zQE~pr!OP#Ku=&abgh7RGFip-Z0uXs!3`ZiMCUd&#)J)%-10%3%!83#6rAm0SU5!XL
zrLxF$V0LucfBs~OL#Qarot-5n%E+~L5eltf)$3ntF=3A|vdAFXrwtqA`fEoOBlPie
z!WM}5M>u#ch{7Znp;q>LkMeBbOoJMXeD&l-{@-~4`^4US_F6WF`%iivvnET78LO8&
z)oG53giplCt4dO86P#4+)oss%&t;-QxEnouxq{iye+!A6p*#bBX64^s_hWkQ@5|nP
z&9`H~3|}PrdqDRy_+n}da<bEoiSk-`^TKQU9<Fpk-bVzvzW}ohP!tD@2=5^*KEZVb
zy&w&MxaXj<YWfxl)vwsAJ}y@~|28FzNq(c%K!h5C%s6VyKcqR;^#cZe1M0^Q*!UQP
z=Ji9kq}+U`*~>+_RGJ~EB`2R6$FgM5@vW8|Q)ac|=6<y(q**WK)LNg=SF5goGY&fb
fbs7iD;bk05?bkDE)pn>_aCaPPamZT|XHowP9B&ak

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/string-001.js b/js/src/jsapi-tests/binast/parser/tester/string-001.js
new file mode 100644
index 000000000000..68bfe181c9c7
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/string-001.js
@@ -0,0 +1,53 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          string-001.js
+   Corresponds To:     15.5.4.2-2-n.js
+   ECMA Section:       15.5.4.2 String.prototype.toString()
+
+   Description:        Returns this string value.  Note that, for a String
+   object, the toString() method happens to return the same
+   thing as the valueOf() method.
+
+   The toString function is not generic; it generates a
+   runtime error if its this value is not a String object.
+   Therefore it connot be transferred to the other kinds of
+   objects for use as a method.
+
+   Author:             christine@netscape.com
+   Date:               1 october 1997
+*/
+var SECTION = "string-001";
+var VERSION = "JS1_4";
+var TITLE   = "String.prototype.toString";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  OBJECT = new Object();
+  OBJECT.toString = String.prototype.toString();
+  result = OBJECT.toString();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "OBJECT = new Object; "+
+  " OBJECT.toString = String.prototype.toString; OBJECT.toString()" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/string-002.binjs b/js/src/jsapi-tests/binast/parser/tester/string-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..732b8e6cf1fb5bee1212637e8b8b5afca253d837
GIT binary patch
literal 7976
zcmd^E-EI;=6kh+e-k5k}jEP*CHjSkkuPns~#YjV-5z<>TWv8%q*(I|>DX-$o_y9hE
zH{R=0cxHBXXJ7^xU?Ei#60$ox-<;p?oIP8hgT9Z8g)T;J@q~mOf_lzP$8pX=cjT0+
z_2cH-W;^U-r;z8*6nrnD#c$6X=OH{*P`95V;-NDiAK|u-2%=sXa41(^N6v*8xZ_wq
z0q4d%tdMXh&vm@OqbY!TeAUGP_0By^I9z~wQs{^hFX$BS!7<HBxm9h{3wd#`kQX2-
zR+B$p^C%|B=Wv(EA82@6fEUBO+~0q#LnhF9ZnT0p@fPg5L_~jFm0(F@{s8O^8uPUB
zshO2A?||sX%~zk_=!V(69e;1mj!f@XwN<O=daD6p8In%`Eq-*bPeK~fQ6KN|;BB1i
z2drS&%2l7>D1sz!QbchNl8;9oPVXDDw2XXTZsj}La0|=aQkAyI=?9>2L=mAa9MKsX
z3Ro3g%CU+Hj4g!<h;#<b5Rp-J3uPVw){p@0d;~tmq!re}j;<4Dldq8GTBeu00FjZ@
z%VAst><w%T4C>=^>JYEfl>{m%i2?1(gH$7}0n)+{Su-_LFeepE<K7Sz7Shc~*%UdZ
z{Pfar(DkSIyI?g)@_}ziEHy?fxrxDjK%S4?>7LkJsr&`fXbCjwlWh79#!>jHjr*)8
z(sf_Ll#c<i9_CWe9PN^DXuwVb@Ly~}SU^F&!R_qg^8`gv#_`!ABUxW~Z|#Te3#W?$
z*N0{`X{^;KD6uCdHqC6vD_{!7^;tCJTaXnSN(|<}M(G$@^4VEY$3vy4G2vEg8u+<q
zUyOm1W{hyi5{x8el|E!bL#&FP$>{a>&`xy%)<8&rMJo8AG@=?zN1=+x0x;yNJJ29P
zYd}XvVJym^t@kXTSiPUyrLL~jT1^pGLFt1ekW{fPOu>pp+Pdp#OQKpCIKfW-Rmo*Y
zUWb^rup^63o91P)H<GnRkPQ`DXug!M6Q2vZQ(do)ff$X&*U&1(lOF8WVb&twd3dMs
z9G>GvM7&`bxnh2gTt>9rE&FH?Va|ko7%cUs52sYAEeypuSx+$)W#LM^3uTyb>{uoK
zXOqXm$jtLl_^fKJYWcs;W(#!r*MxH{;@`r-_rbw5oL2o(UJ<_4u458VJ+JZ&V5jZL
z<ko3>BuCXSoxxF00bAv$NpqO#DUm`weaToIZ)>w0Br%_`fmj(uSSL8H*o)ha1HW;i
zvT(QcXl4zQqyHAta>DWs{24b9xx-w5hq(st^bd0J&14V^i!q=+BR<fhMGbUIIap@J
zy%!uce)jf`;RsVsSsukAJ+}?x571VZ-2`kA<8!FoglZ`+<CvYy<eXJoRkvBFJgZ$6
zJz=7D@~@t-Bm*v12rblLj7F`#1Z33ceg}`Tv3>G&&(!Ef@#jarG%<A$OGZ*vw#CsU
z<3=nQ2GL^0TmZx(J5Bp^C)TEfzF0K{oU+mI-l}Yzd>d0XM*0^Vv8p>%ESTF4v1oh+
M5^HllvKXuW9~<8ukN^Mx

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/string-002.js b/js/src/jsapi-tests/binast/parser/tester/string-002.js
new file mode 100644
index 000000000000..b68f2a156a95
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/string-002.js
@@ -0,0 +1,52 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+   File Name:          string-002.js
+   Corresponds To:     15.5.4.3-3-n.js
+   ECMA Section:       15.5.4.3 String.prototype.valueOf()
+
+   Description:        Returns this string value.
+
+   The valueOf function is not generic; it generates a
+   runtime error if its this value is not a String object.
+   Therefore it connot be transferred to the other kinds of
+   objects for use as a method.
+
+   Author:             christine@netscape.com
+   Date:               1 october 1997
+*/
+var SECTION = "string-002";
+var VERSION = "JS1_4";
+var TITLE   = "String.prototype.valueOf";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var result = "Failed";
+var exception = "No exception thrown";
+var expect = "Passed";
+
+try {
+  var OBJECT =new Object();
+  OBJECT.valueOf = String.prototype.valueOf;
+  result = OBJECT.valueOf();
+} catch ( e ) {
+  result = expect;
+  exception = e.toString();
+}
+
+new TestCase(
+  SECTION,
+  "OBJECT = new Object; OBJECT.valueOf = String.prototype.valueOf;"+
+  "result = OBJECT.valueOf();" +
+  " (threw " + exception +")",
+  expect,
+  result );
+
+test();
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-001.binjs b/js/src/jsapi-tests/binast/parser/tester/switch-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..8fb0718c119783214fd073991c0e492be268cf0e
GIT binary patch
literal 11212
zcmeHNPmdcl6!%j86p&D*_Rd_<0=or4r7GR-CJnG?8>%K-aX?hFGv377$xQIf>~1fJ
zdp`l(`4D^#ZU}MY#DR~%dyYN!WIVGo$u`>3xg<(#|LpgB&(H5YyOX4|fbMiA)b)2B
z@o3E5DS3?$auoT`NOynm_3-Y{i)NH`wnU#!z~W@*`3HpDgkBwU_!E~i_b8wbs28~0
zO;{8PC}01M$q5VnJl0=;vvCnt#03=d2@6@00hrV8`!r10F{50-h3-@@I!-tX$2)Jq
zG{b&xwExYZvnBuQY)KFkYbg33u!M3q5OAk%kQVUX0lfH(CEnzt?d{t|NCmwmNbATM
zufeEOmlwO6D_D}uKLC4;WIpLX9$priZ^F|1y@z{GKPfV^ej@)~ACYgsRHOaTLBA-s
zX%RJT@)n{^s57@qCr;diPGM&h!PigfpX(#_ZJ4Ti_~qd6VYmOdDEkt`qJ4gP`?EWr
z-zmbaKxO}Y#%Uabvm7c_i5*O{|E=Dx=LUfuDn@wl7u7z>6tRYHM8d#Wcrv1Km9a=z
z6J4)k6%p{%ks`Q!oTAOfR?%w+a|5u>IJobx;9R486dgq4qSl00{sr7+!DDt==<;V;
zE`mNAPC+=;;3Nv@aY8s7PxL_~T{{A8>WNH}UI1hbA};&HLjfHvU}pCgtEjQM3eT4z
z&yUXRr)46ormJFp7#9phTwvc!LZ%sXLYvRUPy?`g&O8-)Ky$VQ6a}VHEp$ii<N_5O
zPkws3n*}*C5>Z&{+r)fH>HHBSy@*abKjh#089ycwwa6tcxn)tZFg`-G@iiy+dp)?d
z+~UqA*EK)Q$^A|bZppQfdqeZnoZLrxa7(U*+*_KT=Hz~>2mgP`J+mEX-6#sE8>;xA
zaG-6haFV?etXiY41y=FkQspjNgj6pucqQnZ+KhCN27$8BmP;%=)=CI|w{dw`m54&+
z;Fz5gl`dySE3?tp0q`_pewMFoG|e?y>-Q!VDcp0L#%k8-&~<NTnt93GHZFd(aueES
z(zw#}MH+f|uV7v=AQIdQ%;3sl8kgT&m{CTJ(nPHt`!h^k$T@3(W8H&=v(!>&Yq(4-
zO49Qg^(;^_G%^vpLFAq2DhaN=`l9F8_lT%{<s8S7cN4$CY-l)@SeJ9rgS0?ZH4QAZ
zn0zdp<S;7pq004T-_7rE<|Uv!-9C#w&Zbab3=`NwF<rXGSz$zCssBJl7kS9hJzr7}
z<`ssEJCJx$7}Fn8sJCXqH{?jnw+Xr}sCUU?(jFAV$03%0H9*}OEE@IZJ?&XdS!(Rf
zB~1q<x1>2n^&>MRxuAv2#a!m<S}IwNQR!-RCal$>Gb8W63OX}PsMT4S&YayWg1QPi
zGwO1!&dPMQy{gX8$ypAsmhm#icUNT`&(<YkhLY3BaI~$?%5-KHl2zoOz6ERA@#TM-
z0fmmDbTo=efz&}hKCp*=^h}Qw0pn#|&|iniF|o!-REKKHbqhgmg0W$4my2I(1aP&l
zykEeLe9hedK8O{I`(Xz@Cr%hSN1VDR@rMqk1ddiq?6{mdVLCmcJpR~mMAqoA*eQ}`
z>bnL_73qUgLqo)>TyzPjvixl!ZdQx6WxK}nMYQ($b4JKs=j8+H58#cU&cB4!y$}7c
zuX?O!O$YKDO|8I`(R?|%hN&+Q9^H0{@bkZW?kq{Um5@DH{<{VtB@e4)$<ey`WLsHD
zMK)U=gUA-UvoK~XJVTUiHj6Z7TPVTEmXe21vb9*Zk_{I;Ihvb{_`C;fqDGX7RdHq)
I-M$6>1Ma5_;s5{u

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-001.js b/js/src/jsapi-tests/binast/parser/tester/switch-001.js
new file mode 100644
index 000000000000..44e72985dae4
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/switch-001.js
@@ -0,0 +1,65 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          switch-001.js
+ *  ECMA Section:
+ *  Description:        The switch Statement
+ *
+ *  A simple switch test with no abrupt completions.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ *
+ */
+var SECTION = "switch-001";
+var VERSION = "ECMA_2";
+var TITLE   = "The switch statement";
+
+var BUGNUMBER="315767";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+SwitchTest( 0, 126 );
+SwitchTest( 1, 124 );
+SwitchTest( 2, 120 );
+SwitchTest( 3, 112 );
+SwitchTest( 4, 64 );
+SwitchTest( 5, 96 );
+SwitchTest( true, 96 );
+SwitchTest( false, 96 );
+SwitchTest( null, 96 );
+SwitchTest( void 0, 96 );
+SwitchTest( "0", 96 );
+
+test();
+
+function SwitchTest( input, expect ) {
+  var result = 0;
+
+  switch ( input ) {
+  case 0:
+    result += 2;
+  case 1:
+    result += 4;
+  case 2:
+    result += 8;
+  case 3:
+    result += 16;
+  default:
+    result += 32;
+  case 4:
+    result +=64;
+  }
+
+  new TestCase(
+    SECTION,
+    "switch with no breaks, case expressions are numbers.  input is "+
+    input,
+    expect,
+    result );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-002.binjs b/js/src/jsapi-tests/binast/parser/tester/switch-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..1906560b1d9b725689ae1af03e40752e1ea40d5f
GIT binary patch
literal 10566
zcmeHN&2rpC5FYazI8dRALvD!5frE>(i(_hIoL!cRQ)WrAOAcHpSsL$7MJp{M$#yQh
z08apK!gFxrzzxn^xYIqFzm-O^v}-30)@8RO&Gbxv{WIO4G|2K*L=OfF>W2qUc{1nz
zlDt6(IZ477WOy`rGJP-&k`*O`Juzkwu{1ll|0y9K!l;2g{h801e-hCzX%P9`&sY)*
zQK7j`$#WKm>$3g?IXjohO1KckLc(H}X#w`~M<I<fcFHIh;$nYkHl1di#q)!AVVUW8
zG&}lcGT4*%276M7Eo&;qAG3^dKN8~3{3x%;dmrSb=PU~rpY88|UKOcC?+MTba>X}c
z)|t<%!|fex2<9Ik`z3<;Z2ax?s=#~)wmu$x{pg1q0p#B=56HJ+soBx&c--s}Eq(GM
zl(wK=;g?>T`59e8WK@N3;hp1)6{l$m5k6J&h1*em-x;DKKZ?v$F(ZIm)C86t0xbgi
zJx~@j<k^g-O&U5v-0Wi;6);sw6?{I=5$M#ZdJARlf~<26Ip;AXW6EdAaWb!3O{9`v
zA;v3VK4h`aUl_dzCK^cHkcuIFM)WizoXr;|d&+!-f_BY9wh695WD6j!I!&X3o>5Ty
zy~8V7?5-hPwd5k->r2N%#!NTG{qQiGio?tuOhTs>3__n@JNPHy_nZalxP-?#1QZ0e
zQ<a9Jb=FQ-oKMKTLwz#K<5S5}|F+E66waSO(aYeh!RMbZG(I*E?ZCa;gIiPD3Ev~c
z;L{!4V>7w;Tt{TzG5B-`_pzDWgX;j-itO&-KD`a#p1X4HFi9fn$La{H<lLPtlI`Jb
zK-F0olu*Uos%Qk)A>Qunx)pFPT~0d5qeyvZk0la1t!mcaU08nC)GI-Ad&(||>gcr7
z%7*DJ5O|ibP`4C2UCZI#`-4S8m+`a9VlDX(Ox^q1GOt<M#?5cXh@fv~oym}|@;E@g
z)~0Sz67a1npmLXKJs)gW87;c!RuTIPEL~}fS_sG1oW-l$K?QZ(CX$i#VnqXoC|P&f
z5{FR|JU5Lz?!B2n|LX%H=$W;|u_5RC8?1(o(<tj|2y}!6h`&5?z+&T3I>}*{&Y>#x
z>HqHBc)?Pv!yU3T;A{yLSe!u!rF3H&uEB}KR-b?iBMxhD7h4*^y25cW0!fg>Dg7}A
zN>D4`5hJnQF4(qW-VOPVN5I+6V`M3ffVMOtI`!^DlUZ$DTEymtu7jF8+8nDv*N!AN
zRB8+DZEkO+n(bI*jIi1FFs_oo4CKajQ6A(ONv1pf<bPu`t2Hg#%r?@HQ{T#^0FZ`7
zPb+eUy0m9sn~5!t>%&qcBu7|!hq~ZW#?k+;z-AWH)Z47iX8YUP40D*{tP_a$iO>-x
zHiMxKE%|S!vKyKRtu)>TRb5coOlrx*rTV0FX*<A%1;d1%o0*~vxvDqRcOcTSZO1y-
z6oM+l3vc)rvH^CEYt?a!^04(g-)nd!-I7`O1k_5!3sMh$7harrCs?bb4?ItFogPcQ
zDlE1|TL96}ekh<jN^I(7HxO0V|CJnBZC2j47qUMq!^5MvhVHkZA80s%Z?{bUCj9DS
z7>8rkM^w&sLX50bAg^%gOO(eJp+@=Q_Q+plId=kbAJ9NDMFHXrAW2x(kuLJF<BJCQ
z#2xVRA+A{Y08Bn}`JA;{iKLNFYQE-?Ppiz9d~nHkGlf%#--obc(U!@XO_;e=cRTri
D!sR^Z

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-002.js b/js/src/jsapi-tests/binast/parser/tester/switch-002.js
new file mode 100644
index 000000000000..3e08630bebaf
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/switch-002.js
@@ -0,0 +1,63 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          switch-002.js
+ *  ECMA Section:
+ *  Description:        The switch Statement
+ *
+ *  A simple switch test with no abrupt completions.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ *
+ */
+var SECTION = "switch-002";
+var VERSION = "ECMA_2";
+var TITLE   = "The switch statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+SwitchTest( 0, 6 );
+SwitchTest( 1, 4 );
+SwitchTest( 2, 56 );
+SwitchTest( 3, 48 );
+SwitchTest( 4, 64 );
+SwitchTest( true, 32 );
+SwitchTest( false, 32 );
+SwitchTest( null, 32 );
+SwitchTest( void 0, 32 );
+SwitchTest( "0", 32 );
+
+test();
+
+function SwitchTest( input, expect ) {
+  var result = 0;
+
+  switch ( input ) {
+  case 0:
+    result += 2;
+  case 1:
+    result += 4;
+    break;
+  case 2:
+    result += 8;
+  case 3:
+    result += 16;
+  default:
+    result += 32;
+    break;
+  case 4:
+    result += 64;
+  }
+
+  new TestCase(
+    SECTION,
+    "switch with no breaks:  input is " + input,
+    expect,
+    result );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-003.binjs b/js/src/jsapi-tests/binast/parser/tester/switch-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..21fd56d2cc4ac2a0e62963189770566c5049302c
GIT binary patch
literal 11449
zcmeHNOK;;g5LVxhLs1mHS4GiF7DX2ArC4|aY+M&jk)}m$?6sgJu1!RiTuP3U{UJr)
z{ZYN`p~wD%-aA9lA{~xp#!|e&+Lr(^rH?b;42PUg>=d(U!jC#*&f=r*WHyp)61*G)
z!7z)jg5#63ulo=BQ8wj4=TJS<Nkm>8{d5on@4{0Z`}N063N}pm7d%RsWQE951r?kB
z^Wa>h@iNvwfb-HitV}8>5eFg_MFn6_e-iVw5Kjb`3NB?6V{~3fk&ceufNA=@?%?Fx
zv(BOZt#hbBY^=U|{!|oPvP8jMuw>@oy$yKzTolpxll%8Sb0HVdhl;e0p79lU>w-!5
zaod6o$$SRbTO{*w@B4mRWWElj_qyLa`r%WTne7w#@Aim%4W=5L3{HEl-*!fL=H&Z`
zHs)cOmtkJ8f=^&&xZn*)?OjeK&vRJe{RO^CJ6`=xF3~Pa67#BhBZ8l}Sy;Bi9t-*{
za27n2#enB^9%@({-PqB@1uT`?1tv!`BswQu_izRa>Rdw2`3j0LmxJsy8@W+arQ}yw
z<IXZa7Accg#;*Vi4U}#u#ZW#I{-g+`7>!N!)b$8~?wN^fl5PRggNU}vG&&d>2dlg%
zvcki<n&ny{m-W8-mzc<e>8_+7Zf1S8nbC`>Ogwl9bAD;#_pD492Ihvr&NojaOl&rc
zTr9oOzJSF4(vbL}OV$R&tCQhQ@&0o|-U+fc;2oC^f%M|0`)>_tk6TIiSHX&d9V;|V
znZMXG?>3%Zd+YBFbAH|m^LV_O?^@FT(UAJfR;b4g_;TmC|Fa?YSFLc5J;&AVk^fgi
z@}IUs{+nRM)925=I%PG|Bk;gb+*peEa+XG@mfFH8B7xdD1tE2kuU2F2v!qAw>a`D%
zt%e6U?i?bW&IlpqhGt?R<d;((5m5TfYa<>fS#)mN==JjTv-biejx2St8!E1UgRPi2
zwOH-Q*GLP<ZnK1-#pc7aiv~21s<a4H$>3G*d~?mZR1cN|5sN&MVgk}sT7XiP^Nr=P
zn)Fhpe*8`lU?EuwL}^kN=2fx<uFW9I(wzS|1F4Qw>O9%Qm=o1cnesUdIyteS;`0b(
z)=`SWq5<$#_HZTKduU>8CyB>`ZaLppFjgg;w(eR}YukLg(IgHM`)Fd&$ZuabKrnV^
zqDdUd_tC74Cc)U9i6+t8?xR^7O@gt_qKUH*TjrkrTKW&nuIteLyf-@HBg{UUwb3LP
zbE2v!td7y!JGKyCcJ|S%jV8g^orxy#m1iH#+GrAtt%+t$hhcgw)5hZLphoBmFJ#Yn
z#^>fu)oHeMDFi!O{2q@jth=SC)c6k!M7e0G@%3o$ysuf@!YvTbCi_EhD_3_CLijrl
z(<~fH&d&1(VW_00P~^nT4!ihz5K*HnEHdeah;;(i22iU+pKFP{FqV?Ytec#e&*jZd
zki1IGk;i9nUD8N1Dz83(=kVFZy+u+EP)}C7-ogUgNBa`#7N%a~JW3)foG*XwvS~4s
zBq1Mx`KX{S2q71c*3(ugt$G+!?%JI{Jwh*dJ%}?pcP{l9m2=i?*OXa3vf=`r9(Cnx
ZJ+S7gTA38;??bQ{Irrg=cAZZ0{{b4CgoywE

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-003.js b/js/src/jsapi-tests/binast/parser/tester/switch-003.js
new file mode 100644
index 000000000000..5ceaade69884
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/switch-003.js
@@ -0,0 +1,57 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          switch-003.js
+ *  ECMA Section:
+ *  Description:        The switch Statement
+ *
+ *  Attempt to verify that case statements are evaluated in source order
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ *
+ */
+var SECTION = "switch-003";
+var VERSION = "ECMA_2";
+var TITLE   = "The switch statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+SwitchTest( "a", "abc" );
+SwitchTest( "b", "bc" );
+SwitchTest( "c", "c" );
+SwitchTest( "d", "*abc" );
+SwitchTest( "v", "*abc" );
+SwitchTest( "w", "w*abc" );
+SwitchTest( "x", "xw*abc" );
+SwitchTest( "y", "yxw*abc" );
+SwitchTest( "z", "zyxw*abc" );
+//    SwitchTest( new java.lang.String("z"), "*abc" );
+
+test();
+
+function SwitchTest( input, expect ) {
+  var result = "";
+
+  switch ( input ) {
+  case "z": result += "z";
+  case "y": result += "y";
+  case "x": result += "x";
+  case "w": result += "w";
+  default: result += "*";
+  case "a": result += "a";
+  case "b": result += "b";
+  case "c": result += "c";
+  }
+
+  new TestCase(
+    SECTION,
+    "switch with no breaks:  input is " + input,
+    expect,
+    result );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-004.binjs b/js/src/jsapi-tests/binast/parser/tester/switch-004.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..cc3af70a45719503ae28e8d9e19ba254dc8a589b
GIT binary patch
literal 26087
zcmeHQy_4HS6xZ<$L%|FTEhZGq5SUBIFmnXwnDfPfV=fMJzDtpY(b;=G5m_>loJ$G{
zhJu2Eh5|B_{6};QLrG0T&wHztw9-DwYxzs|>561*NpE+5@3-&0efw5!2IG;<cAMwS
z?C*Z*xdYD}8qXMpaq9M;7_EcO7u}oPo;zYjbDQ7Ov@Ji_{mC?pD{xm+e*C`aS>~zD
zZnK_kdS+m`4j0u=KKsT)%ju_O{S9)qCdqO=F3Rc~mSY960J-^tK63)=%wirF=a|E!
z(|+Jt&S3XNXr|lVKR&qEX>N<}n%hE%EUU}!KePhonKl>q$h60byjMV;e_;i^^AE0F
zyP=AVL~nD@nxe&L;i*Tar`|62pd^@og6t)NdB1(sofnudK-b&*clW;fP(^0>K>o8l
zAfJb(jt`Cx+v>PwMrd;K4U~4y8X+$meqaV{2s1+!zI;&sS{|q`LsPAj&pIb}TkRut
z>?MFje%`qL(Z@SGs<;`TY(E}(%=f`qb|Y2s8O-AENo%)n+II3Nf1(FpvBXBnL)5U1
z2pEvX3yzszL>3`dmY(!umLZ_m5koM&!5BH~lS9`S%xfU)!UOaDIruf^9lM9_K-C(z
z%1^;uDi*V4Ii~j{8JB@J8@wQRHSk0>I|~fY8k{GNNSJmMbTw&625A8zHGr76$HM_O
zk^#oNCs?7;y8_D>OAcLU{E=uVQPWiP+k;6raFAw+fNAu6D}h1Qv&OKIO!qny%zcMl
zNd21U<Um8#84phx5rS~E_uvL)O28A$vwFEP5j+Eb|9%?BQzGceYA*ULW0nkbO*Hr%
z4D~_#=w3nrYFH~&;SK2EBo(5*qNqOV{uD|p8KFAREv08!S@Q|^v6;P9swfQE)E@9z
z)}d6S8RX@REKhr(4HZ6Wk;{)IE4QUWE1Q+Y&cB5!ml)anl)IMZ_W0;zWgZiwsFv&6
z%yd-7@yT_Qn#|&nT$j0ZDSRacd3W{>yA{?R=`AzbgHg=lE!S?&;d=0-bGv=#pwqss
zvR<~cCq;`TSlymkkBw+a7h@>A5k^vvT&o|qu$9UwW};3~38E`;2qQkrJzP8V5th!$
z;b9C*Y%1hob;h<GSr;8><Y!AllF2*Fb6tYj)Gp7a(kTdTXrIDO*l3C+8fz}Sh+Q-M
z$`_X7q%S$}lbJjP@U*ba1^)MvjGw}QYob3v;^wO0w~{K*41F}=FOasm(0@lkuMwKb
z7IzAK&rI8As?*(Ee7~je)rh)E;EPF%YnKVzSz?vR%Uw-YW2{08+gwurs6lFEV`@_$
zKEt1sz%EJg>z9e*zW`)q!f~xF5KV^X%Gz9l|3JZ>@rnw;lXO!FW}_Jiyz!;-jU>4>
zNr~v2swF6ae2%2eCHK!1xiyyf2-Jk_o+*?^NZMS;XJz{7+?Y;C+FaOYVLGuxRMNN*
zk~SCe_rOXh0n6ex3YWceRDuH7#XdVT$2L{=6>c3bAh*8iMDjaTBf^|Ep=t&|p|{pn
z!mZ^p0L!kz_(OG;e3mV~Af)DoE;p_$pBsfGd8BdBNYiB;`Pvcy)Daa2M<r|WSTt4#
zd;vRkY4e@2)5C)-@|hNt1P4(@aK>fm=O2`rvVU48>sM%6iC#1Yk6Q<pGa3^fe#&m5
z6=RP_tVf6vWRoSfY`6C?DeA<&7oRNJdEekgxT*c!Y<ZyO$)Z1?H6%`<tof80A}mnG
zPsUI(9-0eKkOqYket2pr-ujQDurMeSm$mBo!hQ9$BKnr!^Q<A1x;p_(E}xYyw=bX<
z@9OvO8pi8cMTA}2hjzJ=damQMZ^lrL9hZpkXNQy}E?K-VOUXA<_iFi??>Q5sIA|A)
zi})fFu;npRnvfyU!jpZ`?L|I=muGODAszwPQ-e^P+@L1oah?+SGERX(O#$NYVGd%k
z7KIXIT~t~5MB=AbKI%BNNfn(T#R~*tl~TS&T!O<O60No33l&cwwvLJ?@{YCQ3l&cw
zRw>1AP9BvL5l^!ytF22PdcFiU+hG@toT3sDZ$!LYY51{9K9U)m%oaT$883Dsz%tP{
zC!$*ukqCgX92JR}bGRf1v<iW+Ml6JBCAzkmbKvWm0|W>1L0dQVPbjXg?Lcm1Gy%Cv
z5h3FMlre3^$-a8hE8s+nU!KaRYtgC{ePnb^IeV_;hqYxVEIa0u^Q!Tyq-9OdPDji2
zBrlxgG-#DF=o;!TIJZ;J|6KhSpjIgYXl%lBE!UeE)Eg90{nVMDDp~l9h84!5V^19%
zsr9X36oqbhfjS^lDSfZ*&0A#BD8oM_TT}xRTS88`^xC1$UQz}p%3jiM?~3shd=&rj
z{qd!5o-QtXiNy%OswKYxj&rmw=b%`L<s6vGB;N{HDN<_0ySeA_H~}nh0rjRzY{8`>
zu8mMW=4NQy%C%o-v8m~w588a^er9h;_HHG&H5ccj&{5-ifUww1ErsM{`VUMALYJ!V
z)G$zJZM9wlzkql4YL>&j4P6v(@P?AR^M>O#PO);&zu9Q;Lf(euH&j?;jcNc<P`4Qo
zZ%T<p<-sLH<(1TCh#YlRd@VO5|AYZ9KElsXP#jitvwjDDCm<<&<-B?e?!$YdMGING
z$?uFK?x+VVY<j}r(dXt2KKy#$90g;K1mpoc{H6p5f+H0n2_MGcO*kpO#oZa=MeO1#
zPDPO?SDqv?K;kK!^y#fqae)eK#U&*wk$RvQ14&$$7hx-%%PZFxPh#IQ@AMZ}u<z--
zrno>GJaI8+k4s!d6qTQ1klIT-WO0F-s^Su17sM6php)aRUTO<#f)%tTypKJcOZ?wY
afJLuDBhlQOhHBL&(;^g)GSkYXE#v<IIRM!J

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-004.js b/js/src/jsapi-tests/binast/parser/tester/switch-004.js
new file mode 100644
index 000000000000..0572874a6b47
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/switch-004.js
@@ -0,0 +1,94 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          switch-003.js
+ *  ECMA Section:
+ *  Description:        The switch Statement
+ *
+ *  This uses variables and objects as case expressions in switch statements.
+ * This verifies a bunch of bugs:
+ *
+ * http://scopus.mcom.com/bugsplat/show_bug.cgi?id=315988
+ * http://scopus.mcom.com/bugsplat/show_bug.cgi?id=315975
+ * http://scopus.mcom.com/bugsplat/show_bug.cgi?id=315954
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ *
+ */
+var SECTION = "switch-003";
+var VERSION = "ECMA_2";
+var TITLE   = "The switch statement";
+var BUGNUMBER= "315988";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+ONE = new Number(1);
+ZERO = new Number(0);
+var A = new String("A");
+var B = new String("B");
+TRUE = new Boolean( true );
+FALSE = new Boolean( false );
+UNDEFINED  = void 0;
+NULL = null;
+
+SwitchTest( ZERO, "ZERO" );
+SwitchTest( NULL, "NULL" );
+SwitchTest( UNDEFINED, "UNDEFINED" );
+SwitchTest( FALSE, "FALSE" );
+SwitchTest( false,  "false" );
+SwitchTest( 0,      "0" );
+
+SwitchTest ( TRUE, "TRUE" );
+SwitchTest( 1,     "1" );
+SwitchTest( ONE,   "ONE" );
+SwitchTest( true,  "true" );
+
+SwitchTest( "a",   "a" );
+SwitchTest( A,     "A" );
+SwitchTest( "b",   "b" );
+SwitchTest( B,     "B" );
+
+SwitchTest( new Boolean( true ), "default" );
+SwitchTest( new Boolean(false ), "default" );
+SwitchTest( new String( "A" ),   "default" );
+SwitchTest( new Number( 0 ),     "default" );
+
+test();
+
+function SwitchTest( input, expect ) {
+  var result = "";
+
+  switch ( input ) {
+  default:   result += "default"; break;
+  case "a":  result += "a";       break;
+  case "b":  result += "b";       break;
+  case A:    result += "A";       break;
+  case B:    result += "B";       break;
+  case new Boolean(true): result += "new TRUE";   break;
+  case new Boolean(false): result += "new FALSE"; break;
+  case NULL: result += "NULL";    break;
+  case UNDEFINED: result += "UNDEFINED"; break;
+  case true: result += "true";    break;
+  case false: result += "false";  break;
+  case TRUE:  result += "TRUE";   break;
+  case FALSE: result += "FALSE";  break;
+  case 0:    result += "0";       break;
+  case 1:    result += "1";       break;
+  case new Number(0) : result += "new ZERO";  break;
+  case new Number(1) : result += "new ONE";   break;
+  case ONE:  result += "ONE";     break;
+  case ZERO: result += "ZERO";    break;
+  }
+
+  new TestCase(
+    SECTION,
+    "switch with no breaks:  input is " + input,
+    expect,
+    result );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-001.binjs b/js/src/jsapi-tests/binast/parser/tester/try-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..6f46fa05719732865f6495f810f59397a41fafc9
GIT binary patch
literal 12926
zcmeHNO>^Tk7<T!F10OTMfs^6Du)}OK%f|sGglW?N>0|@bWP9x>iIRBNwS(-m4YR|6
z3mmxuGyDOLT=^Gp;=+MHz)#?P71>fO#gUyfyY2L{-B|K#>3N^`Q>w<(iBD_QF(rfA
zS1cSca_T(cI8HAd%$)sZ`>^wIryowJQ?2khRo{!^+O1v3c?o7!)z^;+^GMI92ej`K
zMq)1vxTt~r9XSuYV6Z6bFOajdN><3YC~x3+ffuI&)Xz5uG>E;SM;R9vkW;znC}v(T
zsyz#z=``xy=9leiMLerkgb-C$htF?$F=fQ(;?9Ua)#QOVSV~q<BCx`ts*2$!VeT1W
z`gHZXB_aG9WN#6|<Hk{EQxHA_OK;Tg?w!1+BeQ)V|J@#tPs69W&2Foq?^|VrB@<sk
zX=CcfZ01HWiRmdAgD!auL>m_qMxzLfx|7J~oTKS;qgB?4@5@*D8+~|0r7fwuwXosm
zVW+S|7I$fsw?iRTl`hw@&KA%+iY*W}nj+AVaqAYFc^PD#GjKCsfd8ee8@9rct~KsQ
zeg*^AY<%Af2%E`$Ip}4;TZ8unkLlB4>@aUMmJU-mBNX(m{E!OLC5W^DV$+@(H|WX@
zro1<>!eVtfwwg+wJNxvf;X@^z`|BpfXJu_BKE45{HQUE~t>(eW;okAyNweK;eBL-Z
zfk*c?<ESe5i2$OhH*k4Ob%!By?~^mK>yu!#+YDklqRj1w0dRHN2Ock1V~GeWZRK(C
z0o--7S(~080t#aP`kpzzeh2i>|19KPmLUR7?ET$4AKdxyBVD@c0W1unC{cu>@~q=(
zE9N(oVl03}f88c4vQY~;Hwvkxi9ENIo=G8Xh}O*OCwV<gNdtF6P1O)AreAwv*C6_6
z9_L<O)&Xha(7SMw+$cp@Nj+|-4rph=lVt$MAihv{p~4*JzfV(Do3!@WE$-TL<XcdR
z#*xCh%&|NRBCJlou6BU=)r7G{V0aGRYX(E?n#@wGOYKL+d~IP{<2lk{y(01{kPsKH
zA3vK0ee7zf4K9=fU8xB)yiTL#U9*BfzX(zTn}qNXCL$aQZq!1P+@f?o2o<WU-S@-(
z1DPwMo#*!ke}qI+^9Ci2Zx0#{qX0{6DWFJ=`-$A5x+e>Ou;k;hM@ldSn@oEH_r0m!
z0CvW}iT0?W0OH>6a&({UGW&M{zo8@qX0T{V4pwaR>nZ5UAwD!t1L#7f!C!qFdK?~r
zR9vHo?!$*tA*#@_Z3~q7<`SBeRqjEk(iOiD_U_Yu>`WN;X5yI<77J3Mv$;#+v4kMe
zk_v@|AY}K@5A$kkPO&!3E8|{rtS1vCN-TVdS(>0It3gW$y~tR*Z3#Nlh6{V^UrZYA
zj#+pvO&l4ZrSk<9SGYhG@=Xy*IhBHyrN)%tk^EIxSQwY@O}HG<c*-*U?{$I6GnMr*
zNU+!xj3uDoUe;8kllBwn7d>;)#3@HzD&H&|2*!7MF@d<CyK|GeisoV8!2vA>jD;O$
z`^J`Mw10pcEe>R5ZKel}=Q~iY5Z`>hqk_C2hCU@hUOOklf6;@$oaJoQS!|chqzlA1
zdZ+<sOoD+AXUu$!-Z${S<YatdX+^d555TJ-EK?-85}X9I5odA6k3YJs895CroB9S$
ztMFW6T(&NqE<d+P$tSjMvg#5JwNB#xxbBl_M0qX5YtQ9HnTorGTjKoEJ(4P=a4`Mz
zhTQzfJINJFpBJNj&5wI@4Xs@hQeCECtVZO`5?Z}xg!G&LZqaz&XrY5P+~tv&@r`0W
ziF1?dHCfv7Nok)e*}z&Xe*0RmxO{v?h!@)NI~u+T&TDwOM1-oUl5r4@ROOpI+k>_P
zUOidc4za6>`AMBb2CL!R`vI~`E&a0azt%S)%62?ZjoZ8XVR<;MMD1g|Y4?t+J0q15
z7C`1?>L!j^E);79_m;jmlSqq2<`n@2_nVh{E%D>(7o?>W$~A9n?9tz^vZU^nv9VXV
zjk#klc6pWM&s<)6*;!qtD$I#mD*Y{Nbw%V{Vq+^pAuey8??5@7lkdC*^KfpG?<`x4
zMc$*79NYQ&3JB1pE`ebFxK1X}cQdAe6kdK!fyK7X7|kz)n@>l@px$j41KOn>@f<yH
z_QXaE8Kb)LT8FPk5?l;n49i>+79-{iL=3KIgo#<WChaP>7&FBsF@$T%oE<15nU=U1
zQCyF9!A<#Mwsjzekn53t<yVZNnikJ;#Q?W_Bcz!V1TlZbW!$-C@qcfF=ojF#i7^&r
X-BMz0o<O-YK}}wUzD${y(J%cERryIC

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-001.js b/js/src/jsapi-tests/binast/parser/tester/try-001.js
new file mode 100644
index 000000000000..931837cd3f00
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/try-001.js
@@ -0,0 +1,83 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          try-001.js
+ *  ECMA Section:
+ *  Description:        The try statement
+ *
+ *  This test contains try, catch, and finally blocks.  An exception is
+ *  sometimes thrown by a function called from within the try block.
+ *
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "";
+var VERSION = "ECMA_2";
+var TITLE   = "The try statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var INVALID_JAVA_INTEGER_VALUE = "Invalid value for java.lang.Integer constructor";
+
+TryNewJavaInteger( "3.14159", INVALID_JAVA_INTEGER_VALUE );
+TryNewJavaInteger( NaN, INVALID_JAVA_INTEGER_VALUE );
+TryNewJavaInteger( 0,  0 );
+TryNewJavaInteger( -1, -1 );
+TryNewJavaInteger( 1,  1 );
+TryNewJavaInteger( Infinity, Infinity );
+
+test();
+
+/**
+ *  Check to see if the input is valid for java.lang.Integer. If it is
+ *  not valid, throw INVALID_JAVA_INTEGER_VALUE.  If input is valid,
+ *  return Number( v )
+ *
+ */
+
+function newJavaInteger( v ) {
+  value = Number( v );
+  if ( Math.floor(value) != value || isNaN(value) ) {
+    throw ( INVALID_JAVA_INTEGER_VALUE );
+  } else {
+    return value;
+  }
+}
+
+/**
+ *  Call newJavaInteger( value ) from within a try block.  Catch any
+ *  exception, and store it in result.  Verify that we got the right
+ *  return value from newJavaInteger in cases in which we do not expect
+ *  exceptions, and that we got the exception in cases where an exception
+ *  was expected.
+ */
+function TryNewJavaInteger( value, expect ) {
+  var finalTest = false;
+
+  try {
+    result = newJavaInteger( value );
+  } catch ( e ) {
+    result = String( e );
+  } finally {
+    finalTest = true;
+  }
+  new TestCase(
+    SECTION,
+    "newJavaValue( " + value +" )",
+    expect,
+    result);
+
+  new TestCase(
+    SECTION,
+    "newJavaValue( " + value +" ) hit finally block",
+    true,
+    finalTest);
+
+}
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-003.binjs b/js/src/jsapi-tests/binast/parser/tester/try-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..22050d00b2cc12240d8c5621574e581a94c67185
GIT binary patch
literal 12267
zcmeHNTW=dh6y8#xTq*>wMM$d%BoGh>q9PPI0eiD)46YN!PF0?&i9NAbUGJLRb<^<7
z69|3)4~TdE1kd~gc;t_8&UkibwzHS<HEraF*0FczoSARFbDgP1<B?1Essl=Td&hy_
z56IAX$uNvFzjtZW8?A5JJMFGNqDHmC-l@7y814Q2iDA46Z&l^t4@lsUGnekuu1f+E
zIljk4^~Cqkc<gw+w5)$Y&W$oze!xUIJ;U*wC=np5Z}g}aIp+=ym^hCN#iYY1aJ>HB
zEl|_8txn^pRju&fsueComepqOH=T$E#AV{15O<s@FA6R{-P+n#<;8L<46!O#cN3=Y
zgaqpAvicd3{AaaDKCn;Pi$d~Mn7VD<uRZ!)MP~It{<k_HUjbE}MyF}3>y{azNyv9l
z+JKrsN;8Z|M2BD#s^rxpdK)Z!MMnNQU{F83*E+plw@=iy&w%O|AaM{yqn%161YbA~
zH-}w+xC#F%XXAc2a!FJP2mZw)__o>YJ6}1y-R;k|?|yk#RX+#x_R~>7!w}qRJKkD`
zDNTOQ^otg8T``o6=)zA_crzIi4KIoS1G$2zL&G9+aj~*=F^_qcfboehfdu_Aay-mj
zy2fJO23Z#YIQm0~fHdg%O~0@18gt>lWpTLfcqF(K>oU;6L%f9e2QkZ~=aCUO{ecKs
zJPx2Sd@K~nAT2?p1`vymjkrKlEHL4H1}ijXSKuZS$&)yne9cfKw&{7H-)%st6I{0a
zA&mx*qNsqeRs9IBA?s85mS#+N4aPk+cg>A~v!RMl5zqHsO1wDjfpLjdC8%Cwkbi~s
z&I&Rn!_gq{FU*ZI-=7X=w3JkOc_Yb5dG45?f1Nn}(;RT4vzox2k$4wS`gwpF=P+LY
zei>Ikb?iMDdtI!_<njz9K}|J+a%~vq*L*Uf8qQkNsr>=U6?@YV{|1bsNzPO3(lo@O
ze`H+BbidpJWd!Q3-+e3s2ri+xTE6+7VIX5u-h0MaRD%St?_tU#1Wc22><YZ(HEH04
zyXtrz4GtjXaotNHD0WY>K+WLv0SG;)HJUr-eq-Nk9d*pZM#pTlTK0)~&}h|~&F{>5
z^T_&E)fQ`wKV|KWbFn{|kfF60UEd4o_hW$0ATCt)9@IxkfJ==o?<5qHMiw?TTTa12
zppSU5*@8yuj{#+iMBRb9doo0tTzQvs#opfmrkM6a%Ra_dj%n3S?;Unj9WgVK&q?wk
ztCl-lAU>f(GK9aJ8Z)i^@2z(<o#4dHFbqG(wRU@{TNiJoyoJJd3O|81C&Eg?1bNui
zI$vf^%Xhv<r=9tnFV-_jg95$p85)c+AYRXf=Il9!59bH?D{d*v5Krwc{{jt)yG%`i
z1!y*f1*_g#pj|)HrNKEbs>Oj;Mxnq^t&I7@Hau1U)W`?Q(y*M`B`cwlju~(!6Q_Jg
z!hI*8-N=Ty$6S$0BhH$+$n*6AckpVR!@@JOmHOsol7b~5mP^JVWr;E?cJecJnNJ#4
zfPAH@Wyw;ec4_Ye_Nqm`z$xuI0eYsxv(f};E-tRCk({lItC1a6u}+dEtJbj&b?em<
zp9g*=4tk;;$hR_1Y3C4;B1LBWZPIAcDx$p>oTZBs7M3;Kf$1?HC7ox;ez3exJhfZA
zKEZn7nfywFwM?BE3#k^p5F=R=a8b!FHfHc#(juWuM?Po9%3mP4M!-@H7L8D^eL}W`
z1H2`O)a<(8%?zv_J~WH791Q?VD+azxGQl)wiS?5CkvhZJQ_dhV-=<_?8p|$koN_-N
zPd5IP^$2qjwKdB<lSX(FE#zTWYG^;N4Gpi=X;OG?XoXkuGz_h*=X_1gY#q<o&D6D-
z6<=0eXgn*<U~>$uq+G#pHhb$Yvxd>^A(l)Gd)SkS!NuHkO*Hx0BBN*=#C1}^8YZ`=
z|Advk1v29<K+cWDu;9`%f0l7Aia*KDgZab!1A0lPa=n*7%gf><+1brVX?)hnpfo<4
zUHpZd>xcX)vOIk^f<MSUvE>g-ZUIh;S@!?$ARkeW_b#(2kW{L*2!EKL74jGIqM0;4
L8>b1Il}`EpaW{ZX

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-003.js b/js/src/jsapi-tests/binast/parser/tester/try-003.js
new file mode 100644
index 000000000000..9244fcb5d9a5
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/try-003.js
@@ -0,0 +1,82 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          try-003.js
+ *  ECMA Section:
+ *  Description:        The try statement
+ *
+ *  This test has a try with no catch, and a finally.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "try-003";
+var VERSION = "ECMA_2";
+var TITLE   = "The try statement";
+var BUGNUMBER="http://scopus.mcom.com/bugsplat/show_bug.cgi?id=313585";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+// Tests start here.
+
+TrySomething( "x = \"hi\"", false );
+TrySomething( "throw \"boo\"", true );
+TrySomething( "throw 3", true );
+
+test();
+
+/**
+ *  This function contains a try block with no catch block,
+ *  but it does have a finally block.  Try to evaluate expressions
+ *  that do and do not throw exceptions.
+ */
+
+function TrySomething( expression, throwing ) {
+  innerFinally = "FAIL: DID NOT HIT INNER FINALLY BLOCK";
+  if (throwing) {
+    outerCatch = "FAILED: NO EXCEPTION CAUGHT";
+  } else {
+    outerCatch = "PASS";
+  }
+  outerFinally = "FAIL: DID NOT HIT OUTER FINALLY BLOCK";
+
+  try {
+    try {
+      eval( expression );
+    } finally {
+      innerFinally = "PASS";
+    }
+  } catch ( e  ) {
+    if (throwing) {
+      outerCatch = "PASS";
+    } else {
+      outerCatch = "FAIL: HIT OUTER CATCH BLOCK";
+    }
+  } finally {
+    outerFinally = "PASS";
+  }
+
+
+  new TestCase(
+    SECTION,
+    "eval( " + expression +" )",
+    "PASS",
+    innerFinally );
+  new TestCase(
+    SECTION,
+    "eval( " + expression +" )",
+    "PASS",
+    outerCatch );
+  new TestCase(
+    SECTION,
+    "eval( " + expression +" )",
+    "PASS",
+    outerFinally );
+
+
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-004.binjs b/js/src/jsapi-tests/binast/parser/tester/try-004.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..aad744afd13e0a8bcfbad0dc7540f88c43dc60af
GIT binary patch
literal 7554
zcmds6OK%e~5Z>~B9Dpn0u<EG@l~zD6C{$|Gpr&d=MWTuuauYXMy4j7qPTSo08*t(X
zSAGf-7dY}qnDKhoPVH=+M+@quRo3gz^ZaJUTjKp*NLNc8N?NPCEN(N>^{#lHw;#6#
z-g>pRRexD;#y#qlmc%=yFi807_lKT$7v3uA+xG|y$bLvSXfq^?@F0!^R7?F%yu%=B
z4P*TVoVl~GVkV%1mKQ_;&jIw~t1TMw;2@w(z(u61gibgMqW0=dIHq1HH>z)Hr6u{S
zv?M`vth#uAJK&U&P{19Luy4iVY_Pbz{KCY`aF>L|O7gg?Ai@!0=Ii?L6I$}u#aeQ&
z^0q!JOWpv{E9ITF_s>krT)ZLwT$~}V!%>ZDW4mJNtw)4oKt4dU4)q}@{e%-vyO0wm
z@)Q=Wob(t?63Fd(hA;Ai=FhFkStenqwu&81ctll7>DoG^@@>!*G-SL%lOhcztd6ea
zm_`L8NvQ&1?LHbhv8wK%%zeN*X23R^K*N+Z;_bL?dQI@iXP`=hE!TsHuz}LcLzV&3
z1`-D14Cw*)SkUe$-jrm7Ku^>`x{=NS(!mh3CTLX9R|@8FZ;1*A=?Zc+M^4E;|7kf$
zx#@oizdK;11{*ZuGU3gRX)dADJlGOreyHR-(h|CLhw#qR-KvSMN8Luum3hQ*@%{(e
z<X(?qIP<}z8Fo!dP<*^Y44?^YTI3$Tv;puHG@mp8M1*x%d`#KG%Hv`uIL6d15T{J~
zz-s=A2`HPc+$)zS4}VPI1|Rk|q#NdwxJ!LTqE_7X=}D9JuwkE{jdLC;=U9*VhYrJ%
zFkS0`T*AlhI$rmqCR$jZjt~h(njTC`-DLF0r8A@hMIqZtFPnB2^t1(UpdE&|+yNQ)
z9GRFh*>o}2!?<~<>KpP#@kF@@*oH_#3x$H~S+8X+1n1DSII<DiT(XgAAKfrhSXsj4
zoR(G^9bBK+L7?15`4;)|w0kZtmYrIYPoSz%nH&s_{hXNVr*;{Ruk@q`or(!Hi|qIY
z)y~imS~is%BEvB0ybe%$2$vw)h0Tz&$4$$hwzO0&nmQkI6D%NSL+jydFgCU$9F!Em
zIFrgNWm{b*2S=lOK(c;lagPplYDz_$&T7O%s;3ZaN{1{dMH<&&*`PlM%?d(zL<^K1
zYYR*5x(|g(>12~68v%pRu7LQNW9RZ~vkY(8jxa}*L()&EaIh$FqYHq()j?+wYNj1^
zl(Eata{x8$ufp__#rfn$&b*!fpM4Qhk+)5G+AYym4Q_MQ^@=zYuAozwX_pyP3yV~;
zTu>Pv*>62sCiHWS9;=;#o@YfCINRX8R+%KaMp9;>*he5I<dkt+IOiLdbLgec0n)KO
z6ZIMBYr)q7M4D5N1c$^ZVq6QNqkvdye9P=*3s(mri~5l<^)0HMqe@IMDX0XWptR^M
z?$|(Q)I7X3P4VFa%rNt$kISUT`z&Llg7TPtCHn#b-oqS~42AiM*I+6J<pO$Nzf_Ws
zt+^`KEO(J|#ZDd?q%j-HwNbscw$=FLBiC&4rY)WBz2wq}JAAo{)*2qO<pR20n?mJN
iOJ2&AGj7+@U=@Gg0Wt<b=CC3M6q?zZG~x)Oarz5PaDpfR

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-004.js b/js/src/jsapi-tests/binast/parser/tester/try-004.js
new file mode 100644
index 000000000000..dbc5545596d5
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/try-004.js
@@ -0,0 +1,54 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          try-004.js
+ *  ECMA Section:
+ *  Description:        The try statement
+ *
+ *  This test has a try with one catch block but no finally.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "try-004";
+var VERSION = "ECMA_2";
+var TITLE   = "The try statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+TryToCatch( "Math.PI", Math.PI );
+TryToCatch( "Thrower(5)",   "Caught 5" );
+TryToCatch( "Thrower(\"some random exception\")", "Caught some random exception" );
+
+test();
+
+function Thrower( v ) {
+  throw "Caught " + v;
+}
+
+/**
+ *  Evaluate a string.  Catch any exceptions thrown.  If no exception is
+ *  expected, verify the result of the evaluation.  If an exception is
+ *  expected, verify that we got the right exception.
+ */
+
+function TryToCatch( value, expect ) {
+  try {
+    result = eval( value );
+  } catch ( e ) {
+    result = e;
+  }
+
+  new TestCase(
+    SECTION,
+    "eval( " + value +" )",
+    expect,
+    result );
+}
+
+
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-005.binjs b/js/src/jsapi-tests/binast/parser/tester/try-005.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..e1320df37a93baf488a0f25bdb68dc66499e5de3
GIT binary patch
literal 8284
zcmd^E&5jdC5FQc|2;z`j5lF+Hh!8AF#08m^Sg#|D7K5<GA(yDvZtQ{ajOl6bu5WpW
zT;K`v3VDr4xg^KDNUC~zrpwzsvpwq{A#&N3r>DQJ-><7`T5>*%`Ce<n*=X;jNXLRr
zgD-+0I7&y0V87dY)_>F=rZXP2cGWwrILhSS&$oi$I=t1Q+g~#gv7?wD@L|jZlTn%|
zsFC@d1@EF{w2bu+;9NQnD-{YV8U;}j$r6Ab-yQKpMsFf66kNilM(9k6C>ifvfn)le
z_MrQs*V@(3TDuyAV)fPghmquh#R~42#d9Z~6pMQg9z3-13fx^~v6epWOAz6h3Hx<=
z`~@xf_jWD$y7Q{PE=zt5qIcTQpZxNJZJF&G^55+l@+&xM&>b9hY`tkjcn0Kmh&JIN
z1Z9{>CixU{!bV=fqMg&3;8_N_-7oM}e(>_SGdbHVj?GrJV+fD9NhzwWM=E~<nu3Nx
z4tQ3lp@yaCMvhffK$6rdFfpE^p);rI9?E<RSSJG5<|)uH7lZUL9ot@0Jn|8!(qhZ~
zC}Cn@^a_w=fV6>xfjDFSMg}4pPYiErGD4uc<{)aM4M2JrV%-Fd3Wi3(GVUEw;UQg3
zu9nC-*_S^Z2N^egD&cnxtTYgdLE2_=II+#8blL%1V$3gH`JS|dZhg+=<o?U9jZUNP
zAeF{E>bUgiEg#BYCNP}k;-VRLSxZoVyhjY630zu~9{+3u;CImcq5+^HY$DPVF77=1
zzTOF*F?AKhX|p-7TIediK3g~Zxq=%)*gMc}*vZl<4+Tp`=``f0Lq5ZTeP=z+xoMo^
zJjRXyT_u-kv@znuD`B<L1Gz*tt~!32CquL_?T!!$TACSjOVg~n<)RGfK~c!I+RL_`
zRbD)UH_#4CT<(F4dyZ{P?K>*wew+^9nfncSqrRiO2iTTKN(+O6>qV{Qya+Z>w0N=+
z+FY}dZ69iw6|Agb$`r{dj)K#E9Rw<ERBq8PuexV@v5Xngf!^CT>ZcmWw_Sn!ip#k;
z(=pXX@|k`K^JiVn2AY&_+oWeB&_x+!*o2v$2lG>w9Yg|3K#YPSpf8m}n*z5gqE`ai
zUYL7T;2*#!RsrV0C)l>A@s*uK)NCF|IHlpIGw_BD<??9LOW-#s>MRYRGci|yx=0W<
zm_X$c!>q5EOHx%D-#&l2lGb!0=6sANuz((cI1hgU(~)t4^8f?Tq#=K7Y)f_WbPq^2
zj~(uzP#Y$f8ous<`Ot(-3y+!*t|%M}VsM2eAsUdSbYi(h+iKZl&>6R5HqW^7r7GE~
zOB%Y>!*MFAjN1!AC`#jy{_%em(ib;!VeIn%`pYVGZ+@E{a+%lveAI*Q6J}tj4!r^I
zsq7%*IZnbNm#h?2hez?7MvGydM%2~gCuXN&;&l}r*sbHFw#_oCk(OC0_A78Z)+SB4
z!Fy)7f$m@fke&^Px{BdezY~%G(dML);E@=0<my256cBIf&@oMLg{y~<b)`o`eG#ha
znyk7_)=vr`MCHwM&ZULZ{hUwWL*X)?<d55I2K`3CF*SvB{x$axARYV!QGBDcn=VaA
zxPWt96LNY1olU2r`mr-L^_pXtu2<Y#K_IQ+hF+_xqRCe4o26cJg%?>m8!mdO;v<w^
zMQbh3iSz<;JQ<_tr;aq#E9ZP3%41XgeGkZrLx~8><(OWm^GvP%oynulwwkj40I>{b
A3IG5A

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-005.js b/js/src/jsapi-tests/binast/parser/tester/try-005.js
new file mode 100644
index 000000000000..b50c5bf53665
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/try-005.js
@@ -0,0 +1,57 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          try-005.js
+ *  ECMA Section:
+ *  Description:        The try statement
+ *
+ *  This test has a try with one catch block but no finally.  Same
+ *  as try-004, but the eval statement is called from a function, not
+ *  directly from within the try block.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "try-005";
+var VERSION = "ECMA_2";
+var TITLE   = "The try statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+TryToCatch( "Math.PI", Math.PI );
+TryToCatch( "Thrower(5)",   "Caught 5" );
+TryToCatch( "Thrower(\"some random exception\")", "Caught some random exception" );
+
+test();
+
+function Thrower( v ) {
+  throw "Caught " + v;
+}
+function Eval( v ) {
+  return eval( v );
+}
+
+/**
+ *  Evaluate a string.  Catch any exceptions thrown.  If no exception is
+ *  expected, verify the result of the evaluation.  If an exception is
+ *  expected, verify that we got the right exception.
+ */
+
+function TryToCatch( value, expect ) {
+  try {
+    result = Eval( value );
+  } catch ( e ) {
+    result = e;
+  }
+
+  new TestCase(
+    SECTION,
+    "eval( " + value +" )",
+    expect,
+    result );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-006.binjs b/js/src/jsapi-tests/binast/parser/tester/try-006.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..237641e6393ba1f5ef525bd576e91490e294d554
GIT binary patch
literal 12542
zcmeHNPjB2r6nFVkKnMg9Cr*1Tf|3d(B%*DkX1hSDkW|@K;Y2m@PIgTkdpn+On*#^F
z2A_iu!WoWm<}>i#c*cI-89U?Mb(+v#vWmxke}C`a%=G1A9`l|4jI+tkLy=AeI}2V5
zg5WrvoCmvm2M<QuqcENGpueTw>BmtfckbQ}g7@I9KK=X=6A?R(`F$S7OfVUxi6S*A
z|IdQcD4A4g{RMPxTtq7sic~ZSq9l?90m^=F!V?*tL|iCx2|Fu=&ZLNv>CRigW;7g(
z_YM#GTl!glOB12AM(X|jNOHkqMeZq!7fyOooZr54=PR3@p}VCl*4OM_2N9k!VZTn<
zuV~3XFV~WfhDW1KS@I@`J{)|1@9`J5WiH>4e_x&<-vn0Uz489g)|(>26ObPwwHfaL
zD0`V?lAl3L*p%0>=<xYm@GOJa9vS*7K6vrm8Jq(a$K|K$ix3|1GNh=s9-;gWXbKt%
zIp$fDhMFv;UdpkK3Ya9d3QSBFXz0wTx`#3!0Ig>NvdwpphPfE0`{~s7n#v=;L8`Q}
z<!+QPabD^bV3vWT4M`XhXUtDzAfoB4%$qtHA)!x8M$||hkn}LbrV}(O*eew*aPL5c
zhjb0GT2RiDeeth@(Km}E#M(&9B>D?#TW!&$p79X$eIO@iB7HV|9`ZRdvu!|0?#5|&
zS_Z?#_5W9R#X{j2IhIs#-9&~nFgk!(2P8erjo~}|aWH&{jm6{9_-OCo+h&7%rgL<}
zwkLkuW!U?vB<TYAq{lz=PzG~>c|)E%JvN?28TkypDqb^)r?B!c9R|E=tqxCYiy4}=
zzj?4xmb7DaiDyWy`^}0S+P@%^6*tSYHq+~N21@KPioDWOX(rija9;cN_YyMXyP!mp
z7HZhyR{+vBJ$?p0w%mNg<w7iVO^x~SWs2w*7s+KltClX_s-eXUx~XmubK+Q>{}9QU
zjZ0;yUtIV);85;ObFQZ4O$mg(HVAa6DnyM)IK^WZQ`r&lEOXdb&3GKAHf<V)9_6HU
z<CCT_XG!g#f1}tP&{MprAItx0IjOj%Gp-M?#MJ}VA8P>X4Fpyiv$b*6u3S_>1u|G&
z(lUJV^jCnZGc;jQ(pkam=TXRdL>QV>wjQ}%6&)$T%rl3r!n15+qmNIn`Uf~$xynO#
z%u}jaT^mox{bX^$ROTTOYRl_qJPkAI;?|?y*HDhoRh7iPVs5(!8%NUww@OL^ZT2ee
zmWHP~U6o;`0Usu`sn{O=^`PjYTw1qP>G_|#=b~WIzG>+qPpYrnq>hg~Fz>Y`K%LZG
z<NG$`JyW{M)MH$!iuO<NiZ$wa_Psbs3pEwO7#(Gw*VLBfW<l$2#Gs~l75J`WKg^=x
zjEAST4_!v|z-Vp#HuQ?$7dO}%;L?5OZhEeZ2i8MZlz7+~j|KCMNr&qkrfs`Xa}x$e
z9NjC;4UD>F*~HajBpb|FGKt}E+0{6=?y54NYo!gG_^X`trmQ*_aPeK!gfw-uR^iMw
zD_*Sx<Y^u_&|JihLquwxcAIe?j6IT4kwi?!cOahJ&;X<s;IuwnpG4IfGMo)!w#c~Z
z-_;Peu^A2ngWCa51!#@dFJCIOdf>0d$QE!`$6Uo<1gFS3Kd0H}GOtd2asbzL%JXx@
z^kaAr-!)ffmL<+5vjo;`Dfbn#Qn!sIUR)Tk%mH+z*w{69d-xTLvDY1^4$ewDAnDmk
z>un#bptpL>sbjU>0uReKH7gX29;8;B`#p_?Jx%Wu+e#*ssIY@HnM8PlfYJLq*#F`#
zV8CLyBA38LqaaL^j6Yex-cC`3D4pwIb<a_rs@1M7xDH0}8oymg=^*$!An6f&ot>Ox
z++C&X93HmVU`}fVECVp}OJmMc?7FVLZaZc3jSjfG$c09c;<uR{LM88!;C4v0N6H@$
z*c`4CIQymt@bO2;I?Hc8H{)5q<lgGii_V@xuVJZLy1+_E+D(pL)CGI_OqnpWj=;&9
zb@f=UIfg32&v8<sSFQaV{k-<vPp`YegDfpWP%okGnSFOvui_p}^@L3?G#zg1R~&tV
oUU5dBUPFL1TtCf`s{Z~CZ=%kZ11-d4Er9A>jRG!P-W~M+0S43LH2?qr

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-006.js b/js/src/jsapi-tests/binast/parser/tester/try-006.js
new file mode 100644
index 000000000000..0a85200a1522
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/try-006.js
@@ -0,0 +1,87 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          try-006.js
+ *  ECMA Section:
+ *  Description:        The try statement
+ *
+ *  Throw an exception from within a With block in a try block.  Verify
+ *  that any expected exceptions are caught.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "try-006";
+var VERSION = "ECMA_2";
+var TITLE   = "The try statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+/**
+ *  This is the "check" function for test objects that will
+ *  throw an exception.
+ */
+function throwException() {
+  throw EXCEPTION_STRING +": " + this.valueOf();
+}
+var EXCEPTION_STRING = "Exception thrown:";
+
+/**
+ *  This is the "check" function for test objects that do not
+ *  throw an exception
+ */
+function noException() {
+  return this.valueOf();
+}
+
+/**
+ *  Add test cases here
+ */
+TryWith( new TryObject( "hello", throwException, true ));
+TryWith( new TryObject( "hola",  noException, false ));
+
+/**
+ *  Run the test.
+ */
+
+test();
+
+/**
+ *  This is the object that will be the "this" in a with block.
+ */
+function TryObject( value, fun, exception ) {
+  this.value = value;
+  this.exception = exception;
+
+  this.valueOf = new Function ( "return this.value" );
+  this.check = fun;
+}
+
+/**
+ *  This function has the try block that has a with block within it.
+ *  Test cases are added in this function.  Within the with block, the
+ *  object's "check" function is called.  If the test object's exception
+ *  property is true, we expect the result to be the exception value.
+ *  If exception is false, then we expect the result to be the value of
+ *  the object.
+ */
+function TryWith( object ) {
+  try {
+    with ( object ) {
+      result = check();
+    }
+  } catch ( e ) {
+    result = e;
+  }
+
+  new TestCase(
+    SECTION,
+    "TryWith( " + object.value +" )",
+    (object.exception ? EXCEPTION_STRING +": " + object.valueOf() : object.valueOf()),
+    result );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-007.binjs b/js/src/jsapi-tests/binast/parser/tester/try-007.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..1a7d5b74195dc3106bc2097b90c53930f6888e8c
GIT binary patch
literal 13660
zcmeHO&2Jk;6yNauArOcg7kmUkNr6M9$c>b^E*OQRicQ4@Rh#wLUb5LWv+FiK^uT|C
z_^UX>l_Tm2apt|*nVo0P?0VMrrfuk@u06Z&^Y=dH&7_^prV-n3PnbX4zsHj?_b<Gc
zJkL8zhI8+*cl>RCuOB2+=CyalGwmo$v;8Muc-}kkRGYqj-{+x!7O^`lh<xs6VG;{c
zL;XGV&ck@PNb66av$Kj;!Ud^t=!J2Z6$B{z-jKyvI0_jT<YNCq3!P>>jK}-01Dk%g
zGw7Whw|C`l?OjQP(&~%nkHU;`KN92~`q9ivFXQtYH*elD=_$Iq!eVX7?qv|+q0i07
zDf=}o`N!2-@_zTUzb#9?2BLR6-yJ;o(zMLg8}jd~GvuqlYS0@Tbxpk~A{+tvAyS*L
z7J#yqW`4#lASU)&tx>{ngt5tD1Jiadr<|oJ1bJUE5`n^s->p&F@uNt;D&7d-C#GYI
zs_hWdZ-UC8D$fQi%_=mMWGQtm$0jOZwv;OPd^|&or&iS+lz9(mJ>rmdzJYwq_#in-
z#->gpq5K9p(@2|#VeIp{*2}|m1KAt0F=Wt)jWUmi<B3k7GAkjWPc<WIqy|Vj7-HL*
z8Wn751q<9;P~jk5MbH+M^Q>QdwJ^Fnivui@v|ggWpvaY0U+NhLLEi;(*@P#Lx|ac)
zA~Vwll;mNQ1m`*!RyP8_z#|3<2gp%V!F3fG*1%{0VhxaVFgJ#8_lHjR9(EWH`h(Nn
z@z>P`cg*YPh&@OA*2}PWl8mGa<ddBJ#DdJ5a?Bgq-0HExBuvR`@K*7dLOg|)gXu8f
zMUQndGA*WPmVV~JMp@F<)h3=Iwdp%+wrWp6CL?Z^X>F(JZ48v}gAPSrX^Auw?^QUj
zejj`V8S-sVB2Ef5Oz{^0Qa3$*20k|2e9E#JU+S7F^W*<1qMu$Q>wLCYx>&7-7BlF!
zy1_Sq)_~9NCcI~<+rm<hZ2&uFQ14ZDF80mak_ek^kmy8|2s2iMNVuQJHfCWq;8^Fd
zv6`?bN=(``4jt-A?an7jBId`XTmGG5P9XR5s(>tim2y&XwKJY0WbtPYS-)?9tXB|O
zN#t(~ta=4w5mg|A(I+kACr^L{x*CHMmL-`M)M$@l)*-~uq*?7vx2>ilCD`>$VQP4h
zZf*19lC1s$&PK9w&>a(%XjeDJ6LKHTEcv~rH&9zvzRQy^qeN?O_CA7wgsxi1>}w{s
z0~j5RV;q)f0(GVpx3%G^PS47ArUD--w5iyeAx=?LpOmt;ZmrsL&E2yqSfmB1Ast-g
zNcDxA#7UBaK{1Mg2@B43uq)%K&zdeO&9;i3`lNJU#8BB`+RBLyHKVHh+MLxVjr85x
zwdx;$&gMJs=ct@0;Mxj3ImQLEm@TNZ^n$@1-znJ2m#>&T6<Ohn&eNOeEFCuHCpP>!
zq&z$b%_p#yoM#!1)SXBjz|;<B6bn5ZZ0U7(fU9Rn)|>e8FoNTB+y0<-Kn9?h5s+fE
zp;@E1$RX9XPC=0E)HEl>&W4_$q-tB{S5VuqOmC#kf*!$*mKP*(%6^_f(`@(2nx}tA
z|8_}3{e9JeBFvaZ;iY-FBTp3(%h`O&5<Sx2S-{;P_k(jrcK|4g%K^j|{pCQa1VGEV
zkD|bF;Dwn4c7Ng=&_t+WKnd4|*S{dW0WV#HHO%lKrssyXsBdUn;NSwp65KbKMV2#u
zYMy$t@@ob_g_q*fQZVY)_4P?mx6tD_#996w4!rVW&4$NtT}xk^5KQqhivX@nC-{Gw
z#&gLET_w8}4M?-hsmdKc3nrb&pQTI;HpFymYr`$ngP9qF3Q#*!d<8_2?m~{fwwb~q
z>693`Cgi}PMY&#nb-`aGG?8;2BS$Q&86y-HB{3q|QtoT|xw*3@(PTr{)A3WPk(5~|
z_9IjUV<73^SLfSB4O}B>fTUxu@fKi89VdR=s?Hq_M#PF-x>K<L%u!1009&7!(y7Ry
znC&F-FvMF;KD|?jGak_{`w`sVjo}vLs>XS}ZT^NfqKY_>avUyFs?UR3H3#JlL{9@G
z9o*U2tsIOW*Q;XJ1RyFks81RL4z8%$TF7ovQ7%67x=I;cU5ER0xUT4{5q2d_eg1RD
zpTe~#Yoq@;y!-*Yul`1&IyU5Pz*@uQ8YY#cOZ9Ta-c-;<<Gzht#QbZy`XX0R8sqOF
z<eKFagV3~`*~(SptU~@?dILeO+X^#TTHZy=CDbo9@6pRu?6MZm`sG5^JsbImCB@4X
v>!nY*h9Ic83ZDm{`1dh9DY`)NX8A2#!rJ&#Ah}iv5^J`|r75yQ9-;pMso6zK

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-007.js b/js/src/jsapi-tests/binast/parser/tester/try-007.js
new file mode 100644
index 000000000000..93e08a0a1765
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/try-007.js
@@ -0,0 +1,92 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          try-007.js
+ *  ECMA Section:
+ *  Description:        The try statement
+ *
+ *  This test has a for-in statement within a try block.
+ *
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "try-007";
+var VERSION = "ECMA_2";
+var TITLE   = "The try statement:  for-in";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+/**
+ *  This is the "check" function for test objects that will
+ *  throw an exception.
+ */
+function throwException() {
+  throw EXCEPTION_STRING +": " + this.valueOf();
+}
+var EXCEPTION_STRING = "Exception thrown:";
+
+/**
+ *  This is the "check" function for test objects that do not
+ *  throw an exception
+ */
+function noException() {
+  return this.valueOf();
+}
+
+/**
+ *  Add test cases here
+ */
+TryForIn( new TryObject( "hello", throwException, true ));
+TryForIn( new TryObject( "hola",  noException, false ));
+
+/**
+ *  Run the test.
+ */
+
+test();
+
+/**
+ *  This is the object that will be the "this" in a with block.
+ *  The check function is either throwException() or noException().
+ *  See above.
+ *
+ */
+function TryObject( value, fun, exception ) {
+  this.value = value;
+  this.exception = exception;
+
+  this.check = fun;
+  this.valueOf = function () { return this.value; }
+}
+
+/**
+ *  This function has a for-in statement within a try block.  Test cases
+ *  are added after the try-catch-finally statement.  Within the for-in
+ *  block, call a function that can throw an exception.  Verify that any
+ *  exceptions are properly caught.
+ */
+
+function TryForIn( object ) {
+  try {
+    for ( p in object ) {
+      if ( typeof object[p] == "function" ) {
+	result = object[p]();
+      }
+    }
+  } catch ( e ) {
+    result = e;
+  }
+
+  new TestCase(
+    SECTION,
+    "TryForIn( " + object+ " )",
+    (object.exception ? EXCEPTION_STRING +": " + object.value : object.value),
+    result );
+
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-008.binjs b/js/src/jsapi-tests/binast/parser/tester/try-008.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..0c3174f12fef9a2fc9ae0c9f8c4f00fed8bb614f
GIT binary patch
literal 11748
zcmeHN&2J+$6rb|hMM8iO7fwMOSU|g3aY9w7Xw$F+Wdk(Xo{)+=agy0iXM)FR8)*-S
z3rFq<@qcjTpFn~We*{R}c+c^Sov|}<KBnEW>|v{k?dSJ?@6*q&@$o36yR{)Dz1=TZ
zJYeL^d&cv;lejnW_M7d`Iy)Ud9#OAW6?1A~knr8cd!F|S%&O_jj|dCMNk|W<9}-4*
z5J!SkPkkreX%O{hY5f6owieNfnIIMPydVmAMnK=b*`pB;`T=EvTtv<k(+OumG}wI+
zw&^tL-R9@*T2=m5t4bm|t&W)A3OHpX6y(lHIJVN`Y;xz`y$?-#Dc!0-tR}a67FakZ
z%$%-ozao;qUoDbHjl<5SkbD7HZ`2>`9e-dVbM-*}b9F#I4_kGc-B!btTek>DgM0_6
z4QU08vXXGZ=^6OMj`$3s3aR*U1a>&~d2F%3HE?cRju=f6@c2%;tMD3{{cd&HItfFy
zRIKpfC#oDx$H2kCZ-M+EH{)HJa1+r?LP=JquJ~9-1Pq;01i}Vmgg>#0?jX#oK<k1*
z4Ehv;GiBYl6%S0AM0EKP0;mx~_k)PAiIU61*aM*)LNkQZkoLL9g27NlQyHR=(EDm5
z9i$RSIsmchu#Ey%lz>H6;lN#i2WOP0DIoi_nBOPk$j6MSC(q}APsn&9NTz4W{EVzC
z$bnx(vl($Zpq3aQ82t%mpdrs>cL&OdgvgU7woCGeeoQZYIzmWHYBHtjMEAqkKUJQ)
zxP<xgWs8tqHp$UIvfhwHy%6e(v<6yh<NLsy;j79^)&4k%76;Hhh`ECZql_Z3jGKR?
zu+?Qch;@31Wqk68`rI2aj30brMWQ<l5{(U5l}$@6U*BXsgR)V~r4!_PQ?d9Zq&1}e
z=@Hg}3bm9C;WurVWN3CxG3}8f-PYy^TFnmp7%E7Y>Z+&{?horB87EX&kBB%M3pm1#
zO~`ZxmiFGS|92vB99z@6qz-gd<eUhVC!NR^{Z@+<4qQ7JjRTc!;GW0R;@Pyo)D`Cb
zojRY6j(#F`^)7u4iZ%UiQ9jM}wAY5Cs;Uyjrf<SLoSPmS^KcZ01)XCRk(bIWZF-?r
zifUj}p%it3<$0YX^8)G5P)T6%vupw4Tqu@M$Cg0S@z96Gk}T+MS4=C{jlscX3W~VY
zPjrfoJYp`cylXONBUz85UVw!k(GQ1sc;R3+9toi<6T#Wm!_zGNW(?I&mgRKT9E4p^
zXX?~ei*(ms6O~|=C6IJb)f;H#?W4U`^WeDI?l$f>4v*pM;bs~qXrDV4=dszR1G5fJ
zWTSk8Y)n?3sTA4Y&8JMzOy=I%HqtY72VJpg`WmEGk!g!)ZKnNPt_fGsK_WPR2fd0o
zg;)A9t2`p-<Zei!!CjdmO6vh$T?gZu4`aHaEPZg<h8o2%w`O0}W?7!ovYSeIwi+DT
zf&mm~TDj)f=)<7*__0dLGlH$yJVcsr&1oy-jutr8si<5nEINc~tT7)DK2#8-0Y-<y
zfe^;~ei#>Z)kR<|zeBJB<8xYeHYirrpd*Aq(k7OhxhsOsCh*e!{iiLRbcZayP%e)C
zpWY5+sZCd02^CfeBpsAmZpOR5qHRNcx23J?d$1fMdmK_eX1R;ELi2J^oJ#?_da0Ls
z+NNM!q2;Nv<*Z-Q;)Z*9ZIQ*-G9yqvn*2;xqz!kBEb!+(Re<^MZ~J5GGl%^+4k?M!
z#W*u9Fmfu&K4qBFqty+B@;i{!fYQM&u&}bGC>@U+s_3sG#irP9WxAMih|-DOKyXiN
z;O6WUrlfFWXy{_+FtknoZ-VzNh`NepVpp{p_3?Goq_~`YYN7qj2JOS5Hxlrur5{|H
zwVL)&;!Xzk)>3i#@7rJf@atcmipyz)E%1V;E|S~=i4A9X@=t@9C0gx*muyd(j&sL4
zv@>}yPs;(FV~0G62WxEBXU>rY`P9s_zr|G~YJYlP2JOAs`?BfJbuxnL*LsKcHY|P}
z)~9!94u=ux*!Ey52d#yg95Xa8e>WQq+Jc#aLfgc6sVc{?HqSj7lq2@5HI1b4WK)jK
z>!``$IoBj|)YAOWMsjC*jbdUx)RUv8`N#nj(7eypcFXlL<j8`TbW;-)|NjCT;9Jz?
ZZDy{D(O%}MvQS|Ql!CD5z_ph|{{oew)8_yH

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-008.js b/js/src/jsapi-tests/binast/parser/tester/try-008.js
new file mode 100644
index 000000000000..d47ced0ae331
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/try-008.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          try-008.js
+ *  ECMA Section:
+ *  Description:        The try statement
+ *
+ *  This test has a try block in a constructor.
+ *
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "try-008";
+var VERSION = "ECMA_2";
+var TITLE   = "The try statement: try in a constructor";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+function Integer( value, exception ) {
+  try {
+    this.value = checkValue( value );
+  } catch ( e ) {
+    this.value = e.toString();
+  }
+
+  new TestCase(
+    SECTION,
+    "Integer( " + value +" )",
+    (exception ? INVALID_INTEGER_VALUE +": " + value : this.value),
+    this.value );
+}
+
+var INVALID_INTEGER_VALUE = "Invalid value for java.lang.Integer constructor";
+
+function checkValue( value ) {
+  if ( Math.floor(value) != value || isNaN(value) ) {
+    throw ( INVALID_INTEGER_VALUE +": " + value );
+  } else {
+    return value;
+  }
+}
+
+// add test cases
+
+new Integer( 3, false );
+new Integer( NaN, true );
+new Integer( 0, false );
+new Integer( Infinity, false );
+new Integer( -2.12, true );
+new Integer( Math.LN2, true );
+
+
+test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-009.binjs b/js/src/jsapi-tests/binast/parser/tester/try-009.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..de1e54faa0038e1717d16bff228cc06b1781a049
GIT binary patch
literal 12910
zcmeHNOOGQp5bou*yoDBV;glP@Aa+*V7=@8`vH^mI%xV%X+(u5~O`7#|2X|*@=Kw#1
zD?<Dgu3UkC0EiO@ZdAG5-PLKg$DP+?MsrD&*e<)uUwu_ByBW`>g6}maoQ?J#%5W^%
ziT9l6d4q6t=IwX7U-Wi+!*I&I=8o#q6n+%%{c+dx-h^IFI{XonJ{t)BfDZ+eEcU}d
zi5lg<BkzeHjEb^;2RS#+lNCxO${%@t;K!K&I(=uvgV=xUbE(7y>?B`w6iYuC@7;uH
zdhJ%fbJ%U}=>M8KS_qZZQ~eM8m`f&<xTj3ajPhc6_TjyIAD88&a(9%)ntHnDVF^!}
zEO)2VFKEf%Hfza8?W5kREcp^Fz1{lq{_#g;%WU3||835YFTzy)PXC}?)|(>25s>ep
zv<YtjC>v4CVtxWXv8#UiL4!3;C%)i~fe43B%JVH@=k~Ly<WU43-%DpzUc<BhjV{|_
zLgYi$h#~yNb4Q~#aB%QfK!4C%#(f^e77evnDm`DvGAbZ-Y899q&(QplQFRAp-U3;t
z5;*8{AZIT7;Xybq>!jG_2O!WAhwl3UlV`bJ9&!&*IZ!juso;-ePx|9Y&Ze58P|yeY
zMAS%Y5b0ouRns;q*vJ*kaBo0`!|E&^oJmeXK=#ux(Snr!52#Yw_<32Y37!bY_SdcU
zLkyqCz5Y?B`&rqD6fKUVbqfVQ8}cb;42^gq!_#2bvOk*(sQ+%xx^Kf&-NWOx82BBO
z9X9xSZJZO$wh-v6pm$%Mb%L)j?3J;qyz)D6pOOc4`Dw0>$~;#^>KLJ5O^1VT_|Ooc
z)RHhGMy@Vo*N)DFY&79Qgk^Q9YdY{6=J$Pc#>_YEBKN~ka28Z1%{Q`4TRU(@hv&0n
zz8RMaThaDm>(?c*#Y8w^b|5%l>or(KH(U%@Ff_}ksvxu}L?Ll3m$AM865`s)>Zh|{
zh|!WBwNVnBkEd|-K8dQ&?=@M#g|GgEnM-`-fCA(yb*^3-Pj8?Vk*iX}EG-caq;RB}
z2?I%M{-T!L$0JqFP3Koo{)X);*=#|YyALO?ae!xyTtJ;<|C8KWRHp|am4_;YDr$LC
ziKmG8EOSFTsz31~vJ4oNbxXaKc3%!A>yv1boU4`ZG%^6UpK`DG_TcGE`5re^wM=Go
z*m4JdP9>+`6jaw6WvYH!DNUP?TG3&jTtucDWMWNHUp5g%I+U)8)}&p>q)~x}OC(<i
zmz8yHI;VprYG=!J1ICZ0TvFxdMKVguP8sV`MJ}d(Q@?U>i9%0`(d;|PJquR9Ixw%7
zxYxz_&nAo?@pvZZ>dIRP@`VaG*EnAlov-Kg<5WR9gh+yEV4+;&5Hc`$CK+{}f7@83
zt~dPxyu0N`3`Z+f9mFWfc4tDQwI?ua7XC7e>dxtJI#$&O^Dv4>9XyjK$w7MYO$WHw
zx(cJ}?%?;3TbGap)x+Xa)pedXVZlhi-M4YMbtnD{aI-4tv}#@QEyjqBII8kCx=9YA
zoK8F`&eCr>$9A1h95lA&`Bbrs$uBn;dL3=GBA{6cWGSqwz6-k|IU~g>BRj4pYi+T3
zIB5wsi@4$sRg7HO84Ib<aE((?wJy^QKq&HkA$VU||8#(Fg^}lRRxtX;@I|vlTxjz9
zfXB(no{zfl>MMV6p+NmE^uxaC3#@qs&36TvzKc6XDuSA7L1eA(KJsO-3_g}=vB=<B
zN_ijHAJglCi#Q<3`Ps%AqQ)9TI$ppcncQxaGkS^w2jf`}2U->t>A1SrVRd(Pwf6R%
z#+~vyO{i^!!N|w^CPtrYVS=dAWG3L9WB{+tykQtb{M#AaL>TkX%aGjJQXP|R)_^nz
zcwDDEdj&eWm|fUZVbcK+Hol-d;UH>(th43}Rv)W~$BV~dx;UCZ0DWaFm3nseZJ!QF
zJ`n|P?TWca@^_0(p=xQ&N8X3Q_~b3kN9-Vql9%h}`n&E|S)bMI#+a<zaNp;iBI_1&
zlAs%HHy^r7RT)h;SG+OMt+?dUQ*+&BLOp4kuN#s1qVg+Y-HNGB@kNGiuv|*&9>&6e
nZZmk5Zb1N8-uWg-RG&XVPn5G3=-8lP1%T0;lT~N#l=$HP>#kmC

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-009.js b/js/src/jsapi-tests/binast/parser/tester/try-009.js
new file mode 100644
index 000000000000..d3e0ebaa23b0
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/try-009.js
@@ -0,0 +1,66 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          try-009.js
+ *  ECMA Section:
+ *  Description:        The try statement
+ *
+ *  This test has a try block within a while block.  Verify that an exception
+ *  breaks out of the while.  I don't really know why this is an interesting
+ *  test case but Mike Shaver had two of these so what the hey.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "try-009";
+var VERSION = "ECMA_2";
+var TITLE   = "The try statement: try in a while block";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var EXCEPTION_STRING = "Exception thrown: ";
+var NO_EXCEPTION_STRING = "No exception thrown: ";
+
+
+TryInWhile( new TryObject( "hello", ThrowException, true ) );
+TryInWhile( new TryObject( "aloha", NoException, false ));
+
+test();
+
+function TryObject( value, throwFunction, result ) {
+  this.value = value;
+  this.thrower = throwFunction;
+  this.result = result;
+}
+function ThrowException() {
+  throw EXCEPTION_STRING + this.value;
+}
+function NoException() {
+  return NO_EXCEPTION_STRING + this.value;
+}
+function TryInWhile( object ) {
+  result = null;
+  while ( true ) {
+    try {
+      object.thrower();
+      result = NO_EXCEPTION_STRING + object.value;
+      break;
+    } catch ( e ) {
+      result = e;
+      break;
+    }
+  }
+
+  new TestCase(
+    SECTION,
+    "( "+ object  +".thrower() )",
+    (object.result
+     ? EXCEPTION_STRING + object.value :
+     NO_EXCEPTION_STRING + object.value),
+    result );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-010.binjs b/js/src/jsapi-tests/binast/parser/tester/try-010.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..182f449ab696c139a86b558f5be543e3d99f328a
GIT binary patch
literal 15697
zcmeHO&2Q^O5I5f-B=iJ`1LEKVw+gi&ai9vJZC)M?3dvIwJ#nktWSf}h+R=LR`of97
zfg@Lh;BSHpcO*V8oSE6Iz3X`GtP?v;+w{;jS$n)Q^PAty&aP{0I`K%oHYU!n{+I?M
z>ReebT9$PY3}@C!tMgUwur~-M#H#J{Yigbwvih%|S=Ix%s;1ul#G$Tp;gN@A;5pP`
zZs2oKL-{$hp1S@pDeHHT^TIM&0p+6Hq2>B6iv_5UZw-mh+)I~GF3xwZ<fKDJU4K-6
z4Ia~LHu|k@r?xM?tL+ORs;nNrzU?wX9gmB9=6F-BJVs|99ejL{mKVw0=N7Ap$Grqo
zc;?Xb<?7>CwB&D_wd9lLS+6Whz6w)sHoiVS|0Hdh%^UK+%^C6)cvQdDZ#UC=tB5cJ
z<cBD2Ol$z99WsZJD~O3h{?YYq2miV7g2B`D!`3iz^ZA65FobaLMUUhmL*nnX@!D`a
zPu|M!7{FIVMww~=gXn$(ln13L>ywb>Xeh+0(&aqXQ2}{VsNm4i6m1`BRX0!u+4Y(N
z0i6Of6WR~j!6>a0r<NaqJyQgF;`$DqNxdv29^i4{W#CeeTr!Kgqp_q?!A~e?Pd-RB
zQUxLn3{f^`qk^_nFvh(G6$Z1*3Ex=qod4sGng^}O_kV*bDaS9$DkpOy9Gl-XnvXGe
zp7;7^t<INeBdTaIWURMQ@bdwgV7XwkF%7Q$!yNx?E}L#J3A_VF=ycC3G4OjRJFrR0
z#^oAWGR?LyD5irBWCAkm(^(p;JSzWy@JU5bhg?f-c-dJNspFJjGTn=B$v~5#_>}4}
zpO@jfL}_gpOz+Np9mi8>_jy32wO1q6fac!hf@8UxmDhnxO5H(bH4byLtnZsgaV0M}
zB4*s>1T6i1o6!5`_Mx}626{gLH*&n%G0<$NTDwzNh1uE|E{Ni{q6ftCw-CtI=?=)e
z({QsiTmg_<zF!iM%ckR^fnmnTkM19k|JpuAZkNx<CjlEHA%|<zXHno8lqy9<8ew@G
zNE!SXbr+&uY{C48WhE=z8+kPK2e>#>+qx(Tda)B|^InD7z2buNGbxWh)xp^S7D$;x
z5)P=#SDI@h7aNugN_n4@C8~cNlp+dxaZ^vTx)4>d>XQ@f1<HzddEfsBP&>6aS+RIN
zhL+*T$0nH+P^3%sxwMw5)5AcOhbjepxn)f#w!hfS(nU{y?1suT;I8<xXc?hCqzu4S
zEmtRBswlmVyh8F@wRhZAd9kdsqJj5KMCwHE9HiT~6V}u+q|S=w4$2j&6TNd#mV+|$
zjv&s0{E0qaCNgr6F10CJ*E%+jZdGTcZg-pBqpOZ^s|Bi~%q?{FnFdfTTG1BH>OVmW
zz$}nxIr2_SGD}38T5)Pr6}g$+q2l`z+fpCk&JjOUAj_BtlbL_#jm(7A?+(lhH8l!j
z{1+X@&j_2+g<b0{1o=waLpz+8Md#Hmc9(5Wb%7&N#B7i;Fn7*ZJsNV+kVw&G;2|Iq
zlUyQUY*%GuXr-(QL*>|o4iV@bC%`PGR&R$!nM|W-HGTre8aw{bgR^Rva8Sc@zk~mD
z>(atJ_b)V2%5qJy6FRFAj-j8j(5xETP*hge#>AI5fN|_#>}B*i3^iT><j6XSBaiSI
ze*XDFZn6r~M`lw!v02D7FcDg*3^uy6kT+WB>U??MA#WXJLcXMBXTxEGal><_A>q``
zyXvK_9x;-a^r#CbnLS-GecyrdpmLz71ueRD{<%%qd~1dbJ8<S*o;c-&-urMJUK^c1
zUxdT*voSk#q>E@Z*)5cZXkbm|v@1bJMA$nfQay6tndqPrtf>~>F%f^?!F0QFt7`b8
zO3)E8k&2QP<FLAeU#|l<<I5opC)AWgJQbdTuTneQ2J0;2*A#BUGI{A?37xlZgJLF|
zN-Ba49G@#vUtN`ytyK~RU|UiDC~{8xcRmYMFZEU=r}<}ibtG9y&cALr6KIobtIK1!
z8N1U_b(y~%BVI9D+Rhf&WgOraqnX<UVq6=LVodYaju_E1gc!`*h!dA&9AOfpIH%NG
zlVU70=ES(Jr>hJt_ISh)&L>R26DLNI=#mG*6p4#{vgA;rpCE=bTUugd$=hsmfb!oz
V!<0}?C5XzyM6TzxL9Pw%{{c6e-3R~x

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-010.js b/js/src/jsapi-tests/binast/parser/tester/try-010.js
new file mode 100644
index 000000000000..5ee472c3b73e
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/try-010.js
@@ -0,0 +1,73 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          try-010.js
+ *  ECMA Section:
+ *  Description:        The try statement
+ *
+ *  This has a try block nested in the try block.  Verify that the
+ *  exception is caught by the right try block, and all finally blocks
+ *  are executed.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "try-010";
+var VERSION = "ECMA_2";
+var TITLE   = "The try statement: try in a tryblock";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var EXCEPTION_STRING = "Exception thrown: ";
+var NO_EXCEPTION_STRING = "No exception thrown:  ";
+
+
+NestedTry( new TryObject( "No Exceptions Thrown",  NoException, NoException, 43 ) );
+NestedTry( new TryObject( "Throw Exception in Outer Try", ThrowException, NoException, 48 ));
+NestedTry( new TryObject( "Throw Exception in Inner Try", NoException, ThrowException, 45 ));
+NestedTry( new TryObject( "Throw Exception in Both Trys", ThrowException, ThrowException, 48 ));
+
+test();
+
+function TryObject( description, tryOne, tryTwo, result ) {
+  this.description = description;
+  this.tryOne = tryOne;
+  this.tryTwo = tryTwo;
+  this.result = result;
+}
+function ThrowException() {
+  throw EXCEPTION_STRING + this.value;
+}
+function NoException() {
+  return NO_EXCEPTION_STRING + this.value;
+}
+function NestedTry( object ) {
+  result = 0;
+  try {
+    object.tryOne();
+    result += 1;
+    try {
+      object.tryTwo();
+      result += 2;
+    } catch ( e ) {
+      result +=4;
+    } finally {
+      result += 8;
+    }
+  } catch ( e ) {
+    result += 16;
+  } finally {
+    result += 32;
+  }
+
+  new TestCase(
+    SECTION,
+    object.description,
+    object.result,
+    result );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-012.binjs b/js/src/jsapi-tests/binast/parser/tester/try-012.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..7974cc3db15e2a835305ff4ec9d52af0da448127
GIT binary patch
literal 12422
zcmeHN-EQMV6!!A}Cj_@3BvXL^p;duOfU0ao;=0>FHmw?W1y^XAOcSfFUB=FK!y|yi
z18{-3MZk0L4!|8R!a3uyXS}xKaemsS%1zV6o^xi-eCInqGmU6`;nAJOh?2q1Aq$3#
zoEuLWhH(-MCPu5>{j#^+>jxLqXl(L#8lD?QJM^w$ybNzO)Zq^abIFNEcWK`vj6`nW
zb5R5NJv7c-e~^{+56HPwB`aWDlshn7-;GiMs`~bT`jLC;QpUyk<XlcVjF{^Wcb*3|
zJ==2H2i?Y|_^q)igs8H5{QZs_QARv2?h*0Eh4Lacx%<(_pXB8wayPlf8baOEFoj2i
z<zH9T&uGcNuhx<e?W5kJEcqNv-L@Vyzr7KL{O{@v`7Ee%+D^xwjtEUazK+sH)C5qP
zVMHQ&4nC2WeD%=$_v$SABB*K|-|rqjXxT^kwX1%nX;lR0*4C$=f3{d~+K(?74MU*G
zUb0o3YH0d<A<tRF^W;!Iq7Oe&$xiALHCPc124G>4L&Irc5n@&8avt+60ppEW0%5~3
zVm2&Xy2fH&16h|0h<hI*8f8w<35IzPa7z9eqE0UGv|OLCiCmX~gbncz;u*vskDf*b
zbB7}tf&{Olpbw=Y)ksSasbPpk$2we~DHoVhNC7G|W;ccQQps`LOurT=lG}7s;P(nx
z$zhXTa89EUq#SvJ@m2i@uOaF)`I9Cay#V7LoA=C(k-L!>p8;MFc$E01Y0RB8_YpbD
zt+e$|bJ!Yl+-SstOLOBS2-fD-fc6h_m>W4OHuu)bAshK|zBv30uD*5%-W&UUEVb0C
z3nf9RbOBY^d01Y`sa&DK*_zz;D=5!#n}+z8U>r?TpXvLrAr5JhW2umZ1>va{Xn8^Z
zOvaJwBKWVj3<D9HA@LbQQWNsPp^ur56i_GixF_wUu1UjAxT~)3Q?>`0kLOLKpd=co
z0ySgQyC8J0+3swcyX{@Gd*GP+ZO3ePyY`W}*X}kuoo~!m=fL_ZuPxD<e5%^pr*eNV
zFGFuJ`hg$P@5W#{gLqJ|`%w1GnmtYjjXIUuXgLOgK#o{#w4jp)W3aMCqW&nqd#Z^v
zvGS(CioLrHNHOiNE&C8VG^W)&zQ6C}btK40KjTDERjoFzKzs^^bclF4Gp4Tp@2qze
zT3H2cF$_P4&0cS*TbFF5x`mQEB~PHw$*__lK^=Cz<jdV@`Q&?W?94~LnER!D3S{3C
zbQohq{DB8O*Ha81?)UIt(kWI=T$?W60}$otGBX7pp!pOQtojVrmRF5cfLuR5PkI%F
z3+_T2gSq{r_JY^b*AnEWpV!1+9#}A!sI8<6Ej)kGXD}7yGurNnh8}LoqPk(Y4hkHd
zXJU@I9z4z=T_b0#O4Uo+2}Mb_a>9f&i39gO33pva`;iTEPy9ydRtTeOI#6x7>YnmE
z$MVQHq&y$zHPymODx4b4Z;m>F+RXV*5p%9`=Dg0c@W}AG@~pYAxGs81wk|1pws~P3
z=Vn&ZvG#S#;tDPWUP*XUHhJsO<}?u*P!v*lhemNniVnJP5--nlc;I;hg!90ooSvvW
z7-vK&zYBF4t#zxlFF+qxsY;nKV&AfYK|kAB0O}TC{w}?g8^=@FMdeG_|G`sGi-am1
z#hf`R|A71q4VLNSXyi=V=W$CoE?k00&E^gsonr#}zBxV1(J)|T(kXUH1(@b6--cP5
zA8eaA(=oIU2PUs5OkP-e6O&iE`2{5WG=s)+ms5plSf#psTat{cdZagHD_okk<I`ZG
z4!c%A{B7-rcxO)&;j7_?X3h_JbIj~xvpM#{0v@>uZdlb9zokz2=h_KxofB>dCsd+g
z?1d{54X5|hOB}HxvBkonR%=QPlj>nqZ9x?i!#;d0AMOli3$FNQi(EuwmK0%A)(~Ip
z{v9UxD#%Q(E0<iR6lGgsPAi@j-0%`lij!>du>6vNqBD2%SUf9B5f$0Rtzu<7htCtI
zo67iNbcq*AZc>V;nDb@tcZdhYr_SPG#f8SWQs#eu0r_b4WbdZ!PURjf$4)VtbDiA(
E0hRT(U;qFB

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-012.js b/js/src/jsapi-tests/binast/parser/tester/try-012.js
new file mode 100644
index 000000000000..3ee7d10266ba
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/try-012.js
@@ -0,0 +1,95 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          try-012.js
+ *  ECMA Section:
+ *  Description:        The try statement
+ *
+ *  This test has a try with no catch, and a finally.  This is like try-003,
+ *  but throws from a finally block, not the try block.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "try-012";
+var VERSION = "ECMA_2";
+var TITLE   = "The try statement";
+var BUGNUMBER="336872";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+// Tests start here.
+
+TrySomething( "x = \"hi\"", true );
+TrySomething( "throw \"boo\"", true );
+TrySomething( "throw 3", true );
+
+test();
+
+/**
+ *  This function contains a try block with no catch block,
+ *  but it does have a finally block.  Try to evaluate expressions
+ *  that do and do not throw exceptions.
+ *
+ * The productioni TryStatement Block Finally is evaluated as follows:
+ * 1. Evaluate Block
+ * 2. Evaluate Finally
+ * 3. If Result(2).type is normal return result 1 (in the test case, result 1 has
+ *    the completion type throw)
+ * 4. return result 2 (does not get hit in this case)
+ *
+ */
+
+function TrySomething( expression, throwing ) {
+  innerFinally = "FAIL: DID NOT HIT INNER FINALLY BLOCK";
+  if (throwing) {
+    outerCatch = "FAILED: NO EXCEPTION CAUGHT";
+  } else {
+    outerCatch = "PASS";
+  }
+  outerFinally = "FAIL: DID NOT HIT OUTER FINALLY BLOCK";
+
+
+  // If the inner finally does not throw an exception, the result
+  // of the try block should be returned.  (Type of inner return
+  // value should be throw if finally executes correctly
+
+  try {
+    try {
+      throw 0;
+    } finally {
+      innerFinally = "PASS";
+      eval( expression );
+    }
+  } catch ( e  ) {
+    if (throwing) {
+      outerCatch = "PASS";
+    } else {
+      outerCatch = "FAIL: HIT OUTER CATCH BLOCK";
+    }
+  } finally {
+    outerFinally = "PASS";
+  }
+
+
+  new TestCase(
+    SECTION,
+    "eval( " + expression +" ): evaluated inner finally block",
+    "PASS",
+    innerFinally );
+  new TestCase(
+    SECTION,
+    "eval( " + expression +" ): evaluated outer catch block ",
+    "PASS",
+    outerCatch );
+  new TestCase(
+    SECTION,
+    "eval( " + expression +" ):  evaluated outer finally block",
+    "PASS",
+    outerFinally );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/unicode-001.binjs b/js/src/jsapi-tests/binast/parser/tester/unicode-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..537e8e34c2bb7819af0fbd313189daee41993b1d
GIT binary patch
literal 17042
zcmeHO&2A$_5FY;j1mePtgONCFv=ApNPAkhRC!3Xmmh2LTNQj@%ndvyQ8IP@=@sdcq
z2!bc!DLBIua6vo*RWsew?fFaD(*!#^ImEJirn<VizOSmQyL<6$8t{JaoHMWgR7^&K
zjh&Yr$2pyNSI*A<!RN#KLw7RePOqCh(+m74?*I9~ao&TcdgklLO!(|H;19VQFu`Jf
z5+<TN{XKFn{Lq`1^%ux_={i{xk%;m=#}EBD6JU0~@9{A9&wMTtaUmOPrK4E*;i&%x
zbTi!BJ=%YA(Cf<IdR-~Rlr>DAf9%IxupklloCULjybnO$As_8sPP?<vcPAeIbZcvS
z^I24su6pSv_Up;cUjYHnnJ7MPDzl_r{{Y!HXxHPt!=Wv^z7DGI?S3&hxmUEz%^ULX
zn=|BV(AClY(c``1xJ{2By61-=E#yCTQWw3`nX(uhI{c(_7O+v&*(i3>z_<Vc!J`O3
zKa5$-#{kB}{do3!DQb6F5a?HvH(dCMYpj_ACt&<77<3df5g+j=t{I^eYf9I8G#LW2
zryK$kqZt|^DjhmuFvzh3&r2t8mqomUSrS6|8hS-`n<M1(HN|46m-GN9aez!INk)je
zZ)aOupKWWi$tGxlr{$L>jQJ)A>ZYA^tq4Sh8{Cwn1DH+WyUL>2_gq|n@9_7}gHj9S
zUdAU?OjWQmopB%pyV4$+Vkt;)rQIo+`vZ_vAbKK2RG3djDWzBb>+QnM_ZF~&*h}5o
z2wAqlgVZL$bI%TXkP`-m#%jV%M<jX@MN|#~D}tXV4e(Pn>O5l7tWTL&eVS(0P+z;?
z(*npwXsmK2(@9zYrOVY@1|SY|Z!3G-9_ehzb^yw<x9yRg_=D>m$T&@%%chnXf{4;q
z6GVp%qEOAiU#LKIWC2IHjMz4Wu;SAl*g;QD)dt8ZTl$rWTTSS+3m~Vg+DR@R9KTqw
zp(I+wh*P@kYk||x3LyFLbGs@BHmYuUZ?qk7UQGhd>eUO@96D{$0QMG2w%Eu)=gT(e
z;Kr-Dx+eymJY%%+=6{Gcn0q(ds6t|n7v7_KGz(qaSvNP?Q4;KoPhr!2998e!o33Va
z@9Cp5BojKoMTg)cemT_@i!xs(h<Y1DLEt>GBo1Sf+$w9V+B;G;Tk_Cq0S`y<d1KYE
zYyihG_+?{B?}DT;i`{b`oiN<EDoT`@py`A=!Nk4L)o$dq`eP>?cC^vi=U8*~3g<ZG
zuxpDO(70z?v_-NT@GFc2s{wO^+3`ar%xyn>0*>FnaT+)R6Y#Ux5&r00pMa6+BGS=a
z-O-$t*FvOakP|~G0==`zFS&b18&7eN`ZSG6Q1e>Am&qmSiv`$?%_{hp2_`5^Wt4}L
zSYs_Yjx{-b#@*PN3iQzUD%;OCEtWgrfgmTHj##cY;&3g+3FIPlo@(Dokp2`NLx9d9
zouFxL7|N}zO_LKu*Uh<dqg)T_XR{~m51Phtq!82PVIZqMK^Pc~dw*`Z*Esh{FzX@-
z7Lm)=jeAkwjm?UDsSF$hvl26~<+!kA-u?<QZ_Sh|C%VPN`%6o_E%B=R1`7lVB;M()
z<~*;Nl@N%xHnlQkwbYwsa8Y`RVttd|lzMC3h(NuMCPF8>sYtkyf|WdHHud1>dvy`R
zbgU(Bb^KPgmdMMpcUwjlb&3ldb11n}0ia>#Gg(NJ&rADCS0Y`1X;KpDX~j*2i3C9!
z{Bi_A(11`=TX0OIMW2*uivB8bYrWP>*Z!&~r7k&Sb1o+rSNeA=YEp#ZBSTkCfO0ES
z%Z00nKR_3SWw{=u2KhRyXn%sqZL5hYvuMH@6)yW9h$Nt(U3d49M>f9EM6R%}K1~iF
zSae}tA!eya65r9Z+!4&Z;L8+K3FEULHWs$n^5bhu7OPmYAUQxq<}80UL2BMA2he1B
zg95brta=BLmdb#<H{A#4-T|CN$=!?Vz;j7_mkCMvFv@S{T%-0)sIbDrM@p`kf%NBH
zHjQVZbXI-`+r1C(t1Iwz2ZrRtRo3*4i7i~~mu<K}%iX9p-YQ&Lmu<y0t|2a00-kG`
zTU^SPvb0+^)sVG(0-d&Sbifdt-^r3q6}O;eYvmTDY_G~XWHVYPcXA~~QS$#|Xf<J1
JIeX=d@h`)hd>Q}%

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/unicode-001.js b/js/src/jsapi-tests/binast/parser/tester/unicode-001.js
new file mode 100644
index 000000000000..ab6fbd372ee9
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/unicode-001.js
@@ -0,0 +1,59 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          RegExp/unicode-001.js
+ *  ECMA Section:       15.7.3.1
+ *  Description:        Based on ECMA 2 Draft 7 February 1999
+ *  Positive test cases for constructing a RegExp object
+ *  Author:             christine@netscape.com
+ *  Date:               19 February 1999
+ */
+var SECTION = "RegExp/unicode-001.js";
+var VERSION = "ECMA_2";
+var TITLE   = "new RegExp( pattern, flags )";
+
+startTest();
+
+// These examples come from 15.7.1, UnicodeEscapeSequence
+
+AddRegExpCases( /\u0041/, "/\\u0041/",   "A", "A", 1, 0, ["A"] );
+AddRegExpCases( /\u00412/, "/\\u00412/", "A2", "A2", 1, 0, ["A2"] );
+AddRegExpCases( /\u00412/, "/\\u00412/", "A2", "A2", 1, 0, ["A2"] );
+AddRegExpCases( /\u001g/, "/\\u001g/", "u001g", "u001g", 1, 0, ["u001g"] );
+
+AddRegExpCases( /A/,  "/A/",  "\u0041", "\\u0041",   1, 0, ["A"] );
+AddRegExpCases( /A/,  "/A/",  "\u00412", "\\u00412", 1, 0, ["A"] );
+AddRegExpCases( /A2/, "/A2/", "\u00412", "\\u00412", 1, 0, ["A2"]);
+AddRegExpCases( /A/,  "/A/",  "A2",      "A2",       1, 0, ["A"] );
+
+test();
+
+function AddRegExpCases(
+  regexp, str_regexp, pattern, str_pattern, length, index, matches_array ) {
+
+  AddTestCase(
+    str_regexp + " .exec(" + str_pattern +").length",
+    length,
+    regexp.exec(pattern).length );
+
+  AddTestCase(
+    str_regexp + " .exec(" + str_pattern +").index",
+    index,
+    regexp.exec(pattern).index );
+
+  AddTestCase(
+    str_regexp + " .exec(" + str_pattern +").input",
+    pattern,
+    regexp.exec(pattern).input );
+
+  for ( var matches = 0; matches < matches_array.length; matches++ ) {
+    AddTestCase(
+      str_regexp + " .exec(" + str_pattern +")[" + matches +"]",
+      matches_array[matches],
+      regexp.exec(pattern)[matches] );
+  }
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/while-001.binjs b/js/src/jsapi-tests/binast/parser/tester/while-001.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..8ca95ad2805f27e8aa7e69554aadb6a20c8bc72c
GIT binary patch
literal 4573
zcmeHK&2AGh5MKTYoZu01<A6{K$7+da(jbCDKqM;MkehW9tL|>FotC}|&%$ePLE^xh
zFypn?4(o0<O^7&fNwn+rXMZ!_d>+SYG3T@u&nQV+??g5g<Se=wMbSx?Tt@BQ;Pvoe
zIL_uYikteIm@}zb-yTHKJ@_j2rymo+$O)%Mbj*n$ie;&WO5C%IPFb2PWBml28>_G~
zp`ln3v6QI-z+b+X&{VMrqe8=_<jieaD#6le>n<!a>~==Iw}ZH8-o;G=;$sc<_kE_Q
zAY8+p6TT?n-3Ppj8RPWH{{GW4qD5}%n8jwnTQKRIi1O$D2Cf;)AAr5XSRQxZ54RP|
zJ=l7;^XBl=vvOp1AIM+33*;SGYSbI`yJg<KB5Fz!3Nx2vLn@-^8Pr4>cY}C#zsv=d
z5^8&B@wMV;@jh6b9m2Vrs%MPh6?G-$bFERzSbD%vs1cP_3=OQ0?)I?>1vE)Rfr#k>
z11*EpYmj+}NfY2UufT?>7-juzTF#nwk*`qRr3!Del!!~mD?*O}(*_d;<K%RrBEhCJ
z=bOfg5a_X6$PdzAfUFUSZ5uQaY&e32?gOf*vAc>&Es%4oFCGI6xioDeKV-I91!1g@
zvJZHCT^%7y#FxguLf|$KP-|EJ%SAfI*2M2puw0<ExU%Q*+1JoXWn_J<HqXYVP6ey`
zuJ0g0-0V`{b<KPnf{Ra6^eqRlj&VG9s_{A1hz}n1aEL5;z_@*=nnxb$U{0iT`?0G1
z^WO*8!e5R(iYXU?ZFc<$?JVPzq_!!9MGL#P>nwe~Zf+TrG%DbKZs96on`O-HgfPBd
zZrg$qudYI=GClcH#=P53aEkdjlx<f+PEu&mw7M-C&<i(HXMbBQ1>VlEHR=!<uy=h*
zeTEHUe3t}QqkOl0NWXwR=v$O)Sq~aXmOfGqiq|e^W8FxD$%YFmK1~P@QS>vrv61*-
zH6m1Ha7K7mM8$vJIQR?sw{Hkh$!+Y^>&#gpfApbzdANw?CnZe=aHE#yb%)H=LfCiK
zE;WZekQH|4wuFPHp=m&aQZi$KZp(~>we3Nc?xkidlovB}#eKqzmRk)ou%dI%ld69|
TLP+${ZDv+cuOt{E5f;^Nl_Sf1

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/while-001.js b/js/src/jsapi-tests/binast/parser/tester/while-001.js
new file mode 100644
index 000000000000..88fd8dfe840f
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/while-001.js
@@ -0,0 +1,42 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          while-001
+ *  ECMA Section:
+ *  Description:        while statement
+ *
+ *  Verify that the while statement is not executed if the while expression is
+ *  false
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "while-001";
+var VERSION = "ECMA_2";
+var TITLE   = "while statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+DoWhile();
+test();
+
+function DoWhile() {
+  result = "pass";
+
+  while (false) {
+    result = "fail";
+    break;
+  }
+
+  new TestCase(
+    SECTION,
+    "while statement: don't evaluate statement is expression is false",
+    "pass",
+    result );
+
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/while-002.binjs b/js/src/jsapi-tests/binast/parser/tester/while-002.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..19ca8c9db45f7ed60477891c24c917320f46ff12
GIT binary patch
literal 13384
zcmeHOTW{k;6n42^ga8Qy4<K1ZtQH~E3JD~3)1Yk{v|YL>kh1%@n#7Z2sA~t0({82x
z13ayG<p=N|c;pfB&I5vn72<_o!8!JfXB>~6$*oOy`;sWWd_L#Qcdp~q;?dBj_1b_E
zul`jO_9JrSJmok}C-hF8?cLU`_O*6598#yYkz7;r8IS8fZ#vE^a8*se{SJv3>G*Vq
zc6}0&n1w+C<*DD?Ib?yC$NC#^)+S+vQ3Az0hXpLo0QAT2dNhbxkI^WB3&@cYn#U0f
z`t|4GG3{pKV0XV&+YrZU8v;bfYA4t4v6x20PvDM;KPuq82zVz0=F^WhH$N^SO5}~i
zW;OA^r{Sh!5*07k1(?y6e**Ry+VW2GoA#n?`5cJeY}~$aZzT-*=<E#nEIjI9_h7GC
z%?L|Mz6xjwC0!nqm>z*o6mjPuX7m0qqMU<ow<UhUIGP<dI%k9UzPdHJqYH<qaw(nt
z7Osr02O3840p(R18k}3nF^>uuB!vnj>W|RS+^D*RGOyvHMG$RnLKvpeLAV$8i>sDI
zk)Oc53m(4B0ur4ny&Q}&5VRo(L*VpjFLol<AE>w~LJ<Oes2-#*!4e=X46*0{jS9L-
z!Ho9?R#-?^;i(yN8tSv3h6kx-S{3@C)px?Xn8=E@N)-Cd#JUzeQMx4Qc~Sm=rG*e^
zzw;gK8XP<k>pc()sh%rCECc1+a9<iIX%@O%#@%4#`$a40uF--kWN82(nbXTf*RQn{
zW*1-}td9KH-E!A^g!$K8J_tv?=LTWy4#+WeDV87*(mfT~xyu4KRifjE-NWmhh?2vi
z^r8Tf0*?QDOi20(gk*I192?G`qz~sH>ARqgiKL^zqdgW-uejDa`@XG83y{Zq?7kzD
zS4Lxz8=iqjABRjmVJ&Z0$aoR!R{4RXn=X;1Kipc7Ke$h{L;Sv)QTzQl9OBIqhuExk
zgw|xX&cM<y7s}G>MHR*a_2XGw{IHsF`=2>z`c4T=F^6AWU;m)E)H?mfnx#c{8W`14
zh@t=qw{F8}P&=POEn_y^2027zk8G+kMqyn|OWey`U^m#RuHgS&&0O&L98UHY5YAK_
zwaA3&o<*yNUByJ4C!D|-DCQgDU^I%Sp5J^i3c5I4*5}NK1jFGW%$<*T`S4l~KNc*o
z?L+^7rx*HA3w*SoDzLMdIi-|{VrblFK;fnFTL;_5R#VL`Fg;c87W@aRQ!tMj9Vn<o
zldK!hIuiZiH(>VI4{+M10HzstZ7CIX*qu<vLzTj0@Zbz1oTJ63Mqv&HjB8@RUD;)(
z=Es5&F9U=}c{gH1q_`4R;>mAacnjPTrb#sUt)nW%E*HqF%iWu7zOKx(&_yyhvRoYb
zeYr@J_W51{FXD20!W7hm33W?aI#C6hTpv;L>friDswqmyTj#y!>{8?8nejd-ieV==
zHnOlXZUm;m*Wg%b2b?q0wAtwE*BuATg`8Z<n^z&&Sz0Nb7#FRio5!+7MS~0pw_vvp
zeiye4l)*4<VmX(V1M-Cd{e~rFZwq^2NT6A1QEju?iUA8Ds;I4-$pUJsJY)<n)B4RX
z;LHVop3!g4Z^H2x@Svc@MObj#oHjOakxM@zDWOTyBz2SU9Tvf!TNB1avYcJZdXo%K
z@KvYnjAU5e7R?Kw6}}(PAly(_CAs7wTvNyf7XD|wQ@w<Z^d&%Ario9%pvSQ9(>rzJ
z0g1)lql&BU3E|pC<yEnV*`e-b#I0M}7+ujYAeN4&JDeqAd2-jm8e!luY&wblrVjS)
zNlqs|ybKq>{<G5!15UpmK?^R!L#~v9cUKsUg;X%GZO^fMc<?|GMHg;X$|L61LVJFT
z*l=EHUN@M9n3GB(6XWJu+$&eii@U^X0AJZ*+&IZi!v7;Ue<90(>FU3<Z89zBIoiH$
zvi%}>o7YxqEx&aynIeGVOF4?ZbAnB1wag0Wf~)AN+Arj>O2x+5e6FR|uOQ%3ORbAg
z#?Lh1or0!jX6e+i@GwkZWy6It>MwMO_30Use7Z&@b*3^rtZ!00c;!CbQKDW8{yV_M
z;RYGTqbPsO*dwL?jQ9*HjyC{P&Wnw6GM@e&p<;VUT!GT%l9xDc>^{Uf!&|E2jJX}s
zAPevFi*smnZJ$aUEv2${m)3TPqh(cxIBiJS;*6=P(oT)@Rh&Z6wW*dkTJrX|I9t|g
yi_;jx^1GJeL}gAE*GzcTJ0)xK`6E0At)Vli@aGkQTDh`wS$y2Asrwh^0sjL=(-{c>

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/while-002.js b/js/src/jsapi-tests/binast/parser/tester/while-002.js
new file mode 100644
index 000000000000..a3c315bf2064
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/while-002.js
@@ -0,0 +1,86 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          while-002
+ *  ECMA Section:
+ *  Description:        while statement
+ *
+ *  Verify that the while statement is not executed if the while expression is
+ *  false
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "while-002";
+var VERSION = "ECMA_2";
+var TITLE   = "while statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+DoWhile( new DoWhileObject(
+	   "while expression is null",
+	   null,
+	   "result = \"fail: should not have evaluated statements in while block;break"
+	   ) );
+
+DoWhile( new DoWhileObject(
+	   "while expression is undefined",
+	   void 0,
+	   "result = \"fail: should not have evaluated statements in while block; break"
+	   ));
+
+DoWhile( new DoWhileObject(
+	   "while expression is 0",
+	   0,
+	   "result = \"fail: should not have evaluated statements in while block; break;"
+	   ));
+
+DoWhile( new DoWhileObject(
+	   "while expression is eval(\"\")",
+	   eval(""),
+	   "result = \"fail: should not have evaluated statements in while block; break"
+	   ));
+
+DoWhile( new DoWhileObject(
+	   "while expression is NaN",
+	   NaN,
+	   "result = \"fail: should not have evaluated statements in while block; break"
+	   ));
+
+test();
+
+function DoWhileObject( d, e, s ) {
+  this.description = d;
+  this.whileExpression = e;
+  this.statements = s;
+}
+
+function DoWhile( object ) {
+  result = "pass";
+
+  while ( expression = object.whileExpression ) {
+    eval( object.statements );
+  }
+
+  // verify that the while expression was evaluated
+
+  new TestCase(
+    SECTION,
+    "verify that while expression was evaluated (should be "+
+    object.whileExpression +")",
+    "pass",
+    (object.whileExpression == expression ||
+     ( isNaN(object.whileExpression) && isNaN(expression) )
+      ) ? "pass" : "fail" );
+
+  new TestCase(
+    SECTION,
+    object.description,
+    "pass",
+    result );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/while-003.binjs b/js/src/jsapi-tests/binast/parser/tester/while-003.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..accc07368888cd6033498c6374bf77404c2883cd
GIT binary patch
literal 13218
zcmeHO&2A$_5T50KK?pb?aUA6k1tFA$l{hSpQQ~;DLBT=T+U15io{rt@WX5!l6C&+9
zAg&<s3i}Ma1P26%y&=Sb0|$;&&2&$<(>-?EW9J8D4{PoGd{bTZ)z{V4y^U-<ifOYk
zq$Fy7&eH)W$H8+!5FDn_S+KL$`Luhl+fPR{Xl&-sG-4*Q=CjQpcpaW<n6E!1oRPzr
z?$UltILTO=<WQ0Rw+J4yB$~wf9dK^V!b*7##iD>EEGq%b&+kPv$=DI2Jcmoju{K&{
zoF#+i%kY_QyVct}=rlIvwZ^6dF|oS&^ZP8LoWwcY35mxR-fh4;9kQ6df9K9!8&M%|
z=00o44?Yhsoe*w6ZW^$lFMkE>3-sl~_7~k{`SK+&z1{k3`>PLa&s@ACpIw|IUxZKf
z_Imqmd)y`?JSq7GpyiYdMMg4u3^`%r*6?Th+YzTiKyG&xe$F^rUUw#Ei^Q>hHGiWI
zm#9uDbF3bzjHw4B<XMl3X(N=dCc3tx&Ja)}<q!xTjM34;IdqS~yoo{Mpf(RchAHo*
z`{}@rTCO5LKzdslzQYp2&-Azg)EE$L5MdC`m>y*TXM>^EO({hP^q&5Z>7*4vdN^X)
z0*wO<^#DuWJ6Pdi-IPo%kqfCW|LORU4%1bkA9{T^eS{O4?W=0mb?B)cOFlg>D<815
zkOmzbeogz11kcU-2cAQ!Pn02^LirB7R|q97r7L72%=p;hg^AQi)0mQ^vO2g`r=&nB
z0D&FHS-2IhjffCyAKO8Z6-7z2|0nBya%tV=v+my-tb4nHbsyL<HYwME`GvE7CFKAW
z{`~#P4fC2FIzC(PwqbU+X4%VU-j86@qI$Ou1aawILQlh;LeVykNG#~PGpM*S)yJ?%
zOKcNzg}Vz+SYeT`sN8@@$}+4%AI;42oGor-Id2o>QTXd>%JTgh$q@o+s*<CqKsM$|
z3nXd1^$jkEt7;!b>l+@===Dr5YM)+B9^bCP<Eo-|ZOGPaO<jOLxau9Ur9fS6Nv)s3
zFMzAExtkOB$4MVMr)Cosk)ZQAf~M-RsP4>~;q<72d>2{2z}Ky!!vh~Z7)@u2C(4ZV
zm?w&`ZIR0;({Vd-+JCGU=CfPje?oLD_vm%8hC+YnrDj>9m>=JU#@ZmkR+0wD!99C9
zTY88l>~3n};gHgNRUM2t0%vDVV|qg-3^U-Z@-f#0<Pn9}03xEI&)Enmu8mcA>en>h
z1Gj={3Qhf*sCr;G0g9SxYocr(YxgWQNRC8S!BM|AL7KIR^(thMP`!7Ts7V)^p7czj
zDQGG_F3B`@30*3oUNsFecNTr$xwxruc7xymj7Hg+=sbFO8O!=Yd>x5ZbnzzKH1BNm
z^sOMka$&+Qoy}K4>^!|xG(l}IneOpiykpzoh_Luxs5iw#$da&F@*Sd+!&Ay>n50=q
zajO@$&K$LiVzT-*ZFz+4bM0T8WwH7z$~ColZoaUh$=<`gs35d#dQW%pVzq;Z5z{ik
zbdv|vT+@~-c5@efe?abIgqM+Kt;wxXgk9D?3Mv88*$#0oHNU}aOT?~2z<sB{^V=kn
zS0=r7I3-5C4<50q+!<3Ida#(z9uTq1IBZw7!RHD_?*=L6sbABK1tofQE$LTaRJgU?
zBEnI%<@EUup0VZ{k95V^)$0__3ihB^0O>gieFUREflZvFvoITyOwK)8hQm`L^xP9}
zh+#U8qwtW1cJ`XgxeobSTcACCjH&48)4CGQ6A}51o3PVk&`Oht;gXh^hg`5Lke2`?
zhI3>IloUZfO$7aB3=4cE4-+#89Q$CP{aOrs7ymeEJb9vxGzqdO<q>mhsT~CmZMdwe
zz;u|0nX@V=7vpLLcYWO*+!YoNc-n=D4sjfn%;o<X+`pF9!+dH~EXrH~y+q%4UA|ui
zZzo5qMy-C$ESW<<aqXq)TNBK!#tPJ<;?wG?S8K>)Jrz5(`BF=*pTWSDmRi@Lidd+9
zJO@qP%rZIekzqK2RkbcE$hqwGg=w+bXG4<Dw@@k6pb8J`n*t9`s~7uKH0r>ydm%5k
z$S520$!pFvQt_V(zJ!Vc&qt|lwDUZO&?ot=-CcQa%Ep#_0)upZbKL;87ANwa<NT+*
z<6bQpkk(0gc@JY^G@9hqN~Rlc8LKjRwW=tQw;l7jyyGgmj9cgFEN`LdMqMngR-DV0
zcdHie@-|A`<d&(tF?Gt8&&)VPU2r-7`+N8ddc!1IRm`VGwwA}wyS0!3t6lIPFAdg`

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/while-003.js b/js/src/jsapi-tests/binast/parser/tester/while-003.js
new file mode 100644
index 000000000000..b47d09a7a0a9
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/while-003.js
@@ -0,0 +1,87 @@
+/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          while-003
+ *  ECMA Section:
+ *  Description:        while statement
+ *
+ *  The while expression evaluates to true, Statement returns abrupt completion.
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "while-003";
+var VERSION = "ECMA_2";
+var TITLE   = "while statement";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+DoWhile( new DoWhileObject(
+	   "while expression is true",
+	   true,
+	   "result = \"pass\";" ));
+
+DoWhile( new DoWhileObject(
+	   "while expression is 1",
+	   1,
+	   "result = \"pass\";" ));
+
+DoWhile( new DoWhileObject(
+	   "while expression is new Boolean(false)",
+	   new Boolean(false),
+	   "result = \"pass\";" ));
+
+DoWhile( new DoWhileObject(
+	   "while expression is new Object()",
+	   new Object(),
+	   "result = \"pass\";" ));
+
+DoWhile( new DoWhileObject(
+	   "while expression is \"hi\"",
+	   "hi",
+	   "result = \"pass\";" ));
+/*
+  DoWhile( new DoWhileObject(
+  "while expression has a continue in it",
+  "true",
+  "if ( i == void 0 ) i = 0; result=\"pass\"; if ( ++i == 1 ) {continue;} else {break;} result=\"fail\";"
+  ));
+*/
+test();
+
+function DoWhileObject( d, e, s ) {
+  this.description = d;
+  this.whileExpression = e;
+  this.statements = s;
+}
+
+function DoWhile( object ) {
+  result = "fail:  statements in while block were not evaluated";
+
+  while ( expression = object.whileExpression ) {
+    eval( object.statements );
+    break;
+  }
+
+  // verify that the while expression was evaluated
+
+  new TestCase(
+    SECTION,
+    "verify that while expression was evaluated (should be "+
+    object.whileExpression +")",
+    "pass",
+    (object.whileExpression == expression ||
+     ( isNaN(object.whileExpression) && isNaN(expression) )
+      ) ? "pass" : "fail" );
+
+  new TestCase(
+    SECTION,
+    object.description,
+    "pass",
+    result );
+}
diff --git a/js/src/jsapi-tests/binast/parser/tester/while-004.binjs b/js/src/jsapi-tests/binast/parser/tester/while-004.binjs
new file mode 100644
index 0000000000000000000000000000000000000000..81253bbc76fee0f6129e5689f5db17f4eb5718b7
GIT binary patch
literal 34266
zcmeHQ&5z{76>kWT@F9p2DM~~nyb=+RT{7$!M5|_CXBc3j*&*7Q-5hd2?sm<zv)*>g
zcJJ(-kaFS}2~No$0GHfyM?n4t6a_eN;GQcIQSzQ$<$89N-DQv4{juJ|wx->FuJ`JF
z|EkLUXgcxOW`D$NXY==ge;nAidk^+{y@BuC>uv4s|L)+*!O)+uUVkJ0P2Y3FX!G#T
zz1~mYSABZ>O*?SyfydrpL(dNE$o0oDDM$Vt_HMajCrj&Vp!2{iT7D3da-E(#cB7O4
zef+M&#*usEvLGfmwr|Tphf&~;k2ik^k2%=cKHPn0zrVr1>u+!(l-5D~`#m>ef$hcQ
z?%3W`q4y}zI~lnid-0{0E~yj+<&9Woeg427z)g4TK>ax#KuuZx8)&yE%bPpb51NwY
zBQW%x?Q2)xy`V~_eL;THo**BFM;-1S?(L|2Q;jfG$)|u?tddq3*%7-9HlfmOU!GsJ
zCr>oWts8Ic-?+B5b6w@VhD=d4FP?w-l?#_ua;FgG&fQ7C!Vui#ftae;cv<?r*3WI*
zo+odO?-;^YOnN8EqJdXLfq}9F(IE@Vl!cR})a5u%!ve+|&Vn5rPf=$>E$ar%{1|AR
z1mL*ehKR<3Lx0adR%b1C$bSV-sW{6mcWejuBwsyr*AV|8o<R)q*iqCA+~bi9LENh&
zp|kQqR7i6mX&{KEV;wSRNd{BB*Jy>o=t`VkN;!#|>7SYh$!R)``XOhhx1cxtKVT;C
z?)hRF30A0bEF%kL5qL#r;o|DgLRmt&BC}8yFPE5whrl63m1E(X)A0~%9$Nlj@PL}7
zu$ZErz`$#wPj~z{y;Jp@(%SO;;VtPCXBTvrfM@(wrl70oo327mb3Dc<E(uf#qpwQd
zC{G6R!9)#Gs;Q?*V<;)ZTpIOYVuzs|kMQ96Pf9!v16kRlG9^kNs%Uz{mhXGa9v4=d
z4`@r&%2WI#%rEL=W{R(~Xd2}5PmzPwO~J}$K?siWFSSHU4P!DZ&x6-S&3*;E9@(yU
z#TvPhHS`^3*+<ZMu!4AUj0!m}Pb$`}fZ4<cz(djr6|=w_6Pde6%SU?)|8WB(>O7X-
z(}Kgr(x@b{qob*8kMBbctk~nq*}~%>A%}&-z@1?5Q(YyMk)hu`12prxZ@FX3wvx`q
z0Hd4wq*NvOBk7Y@POfE6lrq+MH=s1f$ctF~O-EEy)cfp2-Wlg2O|=Am1nPvXjcq$*
zs@B9+=C=@UFxqEgqd~%9Tx8Fo2ViJS6<nAB!!ylYrxAuDEl#(ndKnC|%yxLl6T?hD
zlV$^b5CuO#HPqnAe|*||S`K5H;y%Mc)ym<6U-Wv9<xQt1eDOb^gPC8(4D+;_fr4f#
zG8KxU0zU^sPa@Qb8;u}bdG>&L%z>N^kg4&M8KrWGCWZ-Og$csEz@mS(CvEhTNnxgG
zkJXTLv8%`#bPHm995l8irIliwVa0|D`wC1;Qh7M8V~zdDVt3ha8Zlahc)mY5XAPzi
zq+p>7#YwEyY9MW2^8aX0fpLOem1nBD`v6=7?ogERa6@6pXb%u>Sww$Yq=@zsZ!4P!
z*wBiVwYc|UkWHY`MI(l0P|jWT#?L9RroJ2tRl*w+2T<Q!BAvolN@s_=M-<fA0`$s2
zLIuVl90DC*&Pedi%*qP*8~#1}dfM{R5vg2i|5Mlcl0uRigX3Z4ZKs7vSYum4IO3B^
zdYk7QS>_UR&~+gV=DE}obYrL~;>C6LWPoiZPx&?I69!o3T(R=qy-G<TpV=lFcAON|
zl@*?+W)dNTe6l&QEwt0|7hn~+&6HS%wr{j_ZVsJ}`<A3(8vg{$r|42&07oNJ1D#Vg
znCzLwv5v0cV6VbptrwF5gBKK#U0J-!U`KwyEc`;c$B{qv9BaTtapG9ds~qY^WWXr~
z{F1;*ounauNbv=;@zn(WYG#d?<h@!STP=_jl~C>EuAnJLY1a%<3-z_1fyg^wyJ=`R
zE9J#56EBv4wQ**h>GdUk3%e@BcbRzxLy;AyE!1=j++b<myQbFpd1sxt>BCUfR?0eG
zR;?4dH%brF3YFAi+09c^?i85kj8YN9d4g~OzLG3iW6nP8nUO26V<6&v_#H0R6}wjo
zQ^PO;ERZf~l#*{rn#I4>dL88&WjVn{M6M@3sk5V~-MaGFGGeG%OPi5+RmAX*KkM}n
zmClr)d6ds^^Vs)52dBA|*772T&%)5Ph~WSiZ*_2C)Jz+$I8PETgnLWweAW(ir9PC~
zE;Zo;v+a({B*yRBGkh7QW_UtFG0OFx0(CuRkrnwF&=s+);$)<Ty3Pq5!?iXizCZGP
zb+lB)Dq}WhLEErpk@4)+A+~nbR(}C8NEvKy0WOBAQ^7A~q85IPio9maWPQ+=XF%e~
z@`ht5!m|cuTXBe0l~zbH{j9$-OpsWUNogjCT+mL6KaJwGCH_&|306wAZk|leHb|CO
zH4~)_f<4#k2Go0@ZQ75zMo@)D5H<h=*mUvAa$`+T!&m`px&!O7j_xH6-vUo#aW7Ns
zRH#ZDW_88(LWy;~SYBeK3w+}6`f+E1YifeOEHT0I8i$(A;%rcp^b|B)>3D0V-U|(b
zfA4H?O>OW@#s-Ie5U?RG^@iQ1M}dEP)`D)T*o!knO;%fAi2Q3h>^i8xU62|EbyMU+
zwuwm7l1DpvjrbGg8f9@lNXN4C)H1T6IbtKDHC2&~_Zmbt{tK$N!pH_TImMC)ig1jr
z=~#R}s{@nR05_Ah>&X)@p=%VK+S3Z6HG0K0!MKHNC?gJ4a7=A@1;vPF-;(9axI|+Q
zmtPGro&&4TZ79R-9k3-uVwwDKi`WSiSKu|Yc5goWe-Nrp5RQR=PaQCoQe}|i+$w<_
zUxHH39psoHZJmkNEVkAM=QxvEor-hdQtDZ8maFiLycr%+yrEI!GFEt6nu#gDNvCBH
z__vtoJjU5jvY{5&hKhb<c{4=leK$v9BY86ctGH{MO1wGM?%F$xKRMMfAEYS9r6or>
z(ES&n97*M+-?}UmoF*`a(kZqYO02^=!emWshjnl{Q0*{OwN*024(s42&d22|E8j=I
z&|vsUhjrA%I+i^cUd#l;Xk<sS^AOV3gJr`;Q^va!j#}3*S9sK9ySx+-<4ixx*Q;S;
z$z<QhvLglSi0HJ8erQhTrUANgGi&nm=Js`TC&6v@YqUUDsd2x4_(yjVT=FupTqxpI
z&^!UWmXA3j8yp3%)N|&}L4b%`+&FCw<7`<(WVdJgBAOEtglL)3NpO`z=ieGU3w%`$
zD677gr{=*YnDTbV<)yC}LkO?%g(R^%`T!)R0DbCtazID%Yt#*{FaXp{ZnA`@zpcsq
zGy~8Tx3NXYN<YhsYMmvdw{np;Ao+#1%wC854F#6jk7?NAU!#NLYP78{FFAhnTbR}O
zL^g3qxjeW?90whW=m9OXfqy4Cq0Jmtx<3y(`_F4B@RK@&#E+zZu8D8>v}>o=Y^N`~
zZ|KfB%f!2yDeXc7cXtY5{NnmG4BXu@XK9n1X4iF~q3)P7^6EC;u*JR!>2#8BNpp{X
zD;JWJ(pkAi%Qk%`G-G`ub|nhX%jD~Adjc=C)ShIw0XP2?3m85uTxqO%PdvFQwz;b;
z;l1K2VM=o^0d6%{$p$3NRRYlQt0-ornBv#)l)l5=!@V7eW%Dcg7oZW6H+QZd?7p+F
z+&Js7KOBzoK3Yy!_Yy9C38e=WMgE2J{3;fi*|+bKkt*$1^0fRhMC56j_51wljQ7PS
aS{ncVA&d)UEcB;rE=ncdv{dyA0sar<K%R^M

literal 0
HcmV?d00001

diff --git a/js/src/jsapi-tests/binast/parser/tester/while-004.js b/js/src/jsapi-tests/binast/parser/tester/while-004.js
new file mode 100644
index 000000000000..393e680e518b
--- /dev/null
+++ b/js/src/jsapi-tests/binast/parser/tester/while-004.js
@@ -0,0 +1,217 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:          while-004
+ *  ECMA Section:
+ *  Description:        while statement
+ *
+ *  Author:             christine@netscape.com
+ *  Date:               11 August 1998
+ */
+var SECTION = "while-004";
+var VERSION = "ECMA_2";
+var TITLE   = "while statement";
+var BUGNUMBER="316725";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+DoWhile_1();
+DoWhile_2();
+DoWhile_3();
+DoWhile_4();
+DoWhile_5();
+
+test();
+
+/**
+ *  Break out of a while by calling return.
+ *
+ *  Tests:  12.6.2 step 6.
+ */
+function dowhile() {
+  result = "pass";
+
+  while (true) {
+    return result;
+    result = "fail: hit code after return statement";
+    break;
+  }
+}
+
+function DoWhile_1() {
+  description = "return statement in a while block";
+
+  result = dowhile();
+
+  new TestCase(
+    SECTION,
+    "DoWhile_1" + description,
+    "pass",
+    result );
+}
+
+/**
+ *  While with a labeled continue statement.  Verify that statements
+ *  after the continue statement are not evaluated.
+ *
+ *  Tests: 12.6.2 step 8.
+ *
+ */
+function DoWhile_2() {
+  var description = "while with a labeled continue statement";
+  var result1 = "pass";
+  var result2 = "fail: did not execute code after loop, but inside label";
+  var i = 0;
+  var j = 0;
+
+theloop:
+  while( i++ < 10  ) {
+    j++;
+    continue theloop;
+    result1 = "failed:  hit code after continue statement";
+  }
+  result2 = "pass";
+
+  new TestCase(
+    SECTION,
+    "DoWhile_2:  " +description + " - code inside the loop, before the continue should be executed ("+j+")",
+    true,
+    j == 10 );
+
+  new TestCase(
+    SECTION,
+    "DoWhile_2:  " +description +" - code after labeled continue should not be executed",
+    "pass",
+    result1 );
+
+  new TestCase(
+    SECTION,
+    "DoWhile_2:  " +description +" - code after loop but inside label should be executed",
+    "pass",
+    result2 );
+}
+
+/**
+ *  While with a labeled break.
+ *
+ */
+function DoWhile_3() {
+  var description = "while with a labeled break statement";
+  var result1 = "pass";
+  var result2 = "pass";
+  var result3 = "fail: did not get to code after label";
+
+woohoo: {
+    while( true ) {
+      break woohoo;
+      result1 = "fail: got to code after a break";
+    }
+    result2 = "fail: got to code outside of loop but inside label";
+  }
+
+  result3 = "pass";
+
+  new TestCase(
+    SECTION,
+    "DoWhile_3: " +description +" - verify break out of loop",
+    "pass",
+    result1 );
+
+
+  new TestCase(
+    SECTION,
+    "DoWhile_3: " +description +" - verify break out of label",
+    "pass",
+    result2 );
+
+  new TestCase(
+    SECTION,
+    "DoWhile_3: " +description + " - verify correct exit from label",
+    "pass",
+    result3 );
+}
+
+
+/**
+ *  Labled while with an unlabeled break
+ *
+ */
+function DoWhile_4() {
+  var description = "labeled while with an unlabeled break";
+  var result1 = "pass";
+  var result2 = "pass";
+  var result3 = "fail: did not evaluate statement after label";
+
+woohooboy: {
+    while( true ) {
+      break woohooboy;
+      result1 = "fail: got to code after the break";
+    }
+    result2 = "fail: broke out of while, but not out of label";
+  }
+  result3 = "pass";
+
+  new TestCase(
+    SECTION,
+    "DoWhile_4: " +description +" - verify break out of while loop",
+    "pass",
+    result1 );
+
+  new TestCase(
+    SECTION,
+    "DoWhile_4: " +description + " - verify break out of label",
+    "pass",
+    result2 );
+
+  new TestCase(
+    SECTION,
+    "DoWhile_4: " +description +" - verify that statements after label are evaluated",
+    "pass",
+    result3 );
+}
+
+/**
+ *  in this case, should behave the same way as
+ *
+ *
+ */
+function DoWhile_5() {
+  var description = "while with a labeled continue statement";
+  var result1 = "pass";
+  var result2 = "fail: did not execute code after loop, but inside label";
+  var i = 0;
+  var j = 0;
+
+theloop: {
+    j++;
+    while( i++ < 10  ) {
+      continue;
+      result1 = "failed:  hit code after continue statement";
+    }
+    result2 = "pass";
+  }
+
+  new TestCase(
+    SECTION,
+    "DoWhile_5: " +description + " - continue should not execute statements above the loop",
+    true,
+    ( j == 1 ) );
+
+  new TestCase(
+    SECTION,
+    "DoWhile_5: " +description +" - code after labeled continue should not be executed",
+    "pass",
+    result1 );
+
+  new TestCase(
+    SECTION,
+    "DoWhile_5: " +description +" - code after loop but inside label should be executed",
+    "pass",
+    result2 );
+}
+
diff --git a/js/src/jsapi-tests/moz.build b/js/src/jsapi-tests/moz.build
index 8f4e1484eca8..61a5217d3d2b 100644
--- a/js/src/jsapi-tests/moz.build
+++ b/js/src/jsapi-tests/moz.build
@@ -139,6 +139,7 @@ if CONFIG['ENABLE_STREAMS']:
 
 if CONFIG['JS_BUILD_BINAST']:
     UNIFIED_SOURCES += [
+        'testBinASTReader.cpp',
         'testBinTokenReaderTester.cpp'
     ]
 
diff --git a/js/src/jsapi-tests/testBinASTReader.cpp b/js/src/jsapi-tests/testBinASTReader.cpp
index 26d6daf44f76..0a8200988e0d 100644
--- a/js/src/jsapi-tests/testBinASTReader.cpp
+++ b/js/src/jsapi-tests/testBinASTReader.cpp
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
-#include "mozilla/Vector.h"
-
 #if defined(XP_UNIX)
 
 #include <dirent.h>
@@ -19,25 +17,38 @@
 
 #endif
 
+#include "jsapi.h"
+
+
 #include "frontend/BinSource.h"
 #include "frontend/FullParseHandler.h"
 #include "frontend/ParseContext.h"
 #include "frontend/Parser.h"
+#include "gc/Zone.h"
+#include "js/Vector.h"
 
 #include "jsapi-tests/tests.h"
 
+#include "vm/Interpreter.h"
+
 using UsedNameTracker = js::frontend::UsedNameTracker;
+using namespace JS;
+using namespace js;
 
-extern void readFull(const char* path, Vector<uint8_t>& buf);
+extern void enterJsDirectory();
+extern void exitJsDirectory();
+extern void readFull(const char* path, js::Vector<uint8_t>& buf);
 
-void readFull(JSContext* cx, const char* path, Vector<char16_t>& buf) {
+void
+readFull(JSContext* cx, const char* path, js::Vector<char16_t>& buf)
+{
     buf.shrinkTo(0);
 
-    Vector<uint8_t> intermediate(cx);
+    js::Vector<uint8_t> intermediate(cx);
     readFull(path, intermediate);
 
     if (!buf.appendAll(intermediate))
-        MOZ_CRASH();
+        MOZ_CRASH("Couldn't read data");
 }
 
 BEGIN_TEST(testBinASTReaderECMAScript2)
@@ -54,9 +65,11 @@ BEGIN_TEST(testBinASTReaderECMAScript2)
     const char PATH[] = "jsapi-tests/binast/parser/tester/";
 
     // Read the list of files in the directory.
+    enterJsDirectory();
     DIR* dir = opendir(PATH);
+    exitJsDirectory();
     if (!dir)
-        MOZ_CRASH();
+        MOZ_CRASH("Couldn't open directory");
 
 
     while (auto entry = readdir(dir)) {
@@ -68,10 +81,12 @@ BEGIN_TEST(testBinASTReaderECMAScript2)
     const char PATH[] = "jsapi-tests\\binast\\parser\\tester\\*.binjs";
 
     WIN32_FIND_DATA FindFileData;
+    enterJsDirectory();
     HANDLE hFind = FindFirstFile(PATH, &FindFileData);
+    exitJsDirectory();
     for (bool found = (hFind != INVALID_HANDLE_VALUE);
             found;
-            found = FindNextFile(hFind, &FindFileData)
+            found = FindNextFile(hFind, &FindFileData))
     {
         const char* d_name = FindFileData.cFileName;
 
@@ -92,25 +107,25 @@ BEGIN_TEST(testBinASTReaderECMAScript2)
         fprintf(stderr, "Testing %s\n", txtPath.get());
 
         // Read text file.
-        Vector<char16_t> txtSource(cx);
+        js::Vector<char16_t> txtSource(cx);
         readFull(cx, txtPath.get(), txtSource);
 
         // Parse text file.
         UsedNameTracker txtUsedNames(cx);
         if (!txtUsedNames.init())
-            MOZ_CRASH();
+            MOZ_CRASH("Couldn't initialize used names");
         js::frontend::Parser<js::frontend::FullParseHandler, char16_t> parser(cx, cx->tempLifoAlloc(), options, txtSource.begin(), txtSource.length(),
                                                   /* foldConstants = */ false, txtUsedNames, nullptr,
                                                   nullptr);
         if (!parser.checkOptions())
-            MOZ_CRASH();
+            MOZ_CRASH("Bad options");
 
         auto txtParsed = parser.parse(); // Will be deallocated once `parser` goes out of scope.
         RootedValue txtExn(cx);
         if (!txtParsed) {
             // Save exception for more detailed error message, if necessary.
             if (!js::GetAndClearException(cx, &txtExn))
-                MOZ_CRASH();
+                MOZ_CRASH("Couldn't clear exception");
         }
 
         // Read binary file.
@@ -119,13 +134,13 @@ BEGIN_TEST(testBinASTReaderECMAScript2)
         strncpy(binPath.get() + sizeof(PATH) - 1, d_name, namlen);
         binPath[namlen + sizeof(PATH) - 1] = 0;
 
-        Vector<uint8_t> binSource(cx);
+        js::Vector<uint8_t> binSource(cx);
         readFull(binPath.get(), binSource);
 
         // Parse binary file.
         js::frontend::UsedNameTracker binUsedNames(cx);
         if (!binUsedNames.init())
-            MOZ_CRASH();
+            MOZ_CRASH("Couldn't initialized binUsedNames");
 
         js::frontend::BinASTParser reader(cx, cx->tempLifoAlloc(), binUsedNames, options);
 
@@ -134,7 +149,7 @@ BEGIN_TEST(testBinASTReaderECMAScript2)
         if (binParsed.isErr()) {
             // Save exception for more detailed error message, if necessary.
             if (!js::GetAndClearException(cx, &binExn))
-                MOZ_CRASH();
+                MOZ_CRASH("Couldn't clear binExn");
         }
 
         // The binary parser should accept the file iff the text parser has.
@@ -143,7 +158,7 @@ BEGIN_TEST(testBinASTReaderECMAScript2)
 
             js::ErrorReport report(cx);
             if (!report.init(cx, txtExn, js::ErrorReport::WithSideEffects))
-                MOZ_CRASH();
+                MOZ_CRASH("Couldn't report txtExn");
 
             PrintError(cx, stderr, report.toStringResult(), report.report(), /* reportWarnings */ true);
             MOZ_CRASH("Binary parser accepted a file that text parser rejected");
@@ -154,7 +169,7 @@ BEGIN_TEST(testBinASTReaderECMAScript2)
 
             js::ErrorReport report(cx);
             if (!report.init(cx, binExn, js::ErrorReport::WithSideEffects))
-                MOZ_CRASH();
+                MOZ_CRASH("Couldn't report binExn");
 
             PrintError(cx, stderr, report.toStringResult(), report.report(), /* reportWarnings */ true);
             MOZ_CRASH("Binary parser rejected a file that text parser accepted");
@@ -169,17 +184,17 @@ BEGIN_TEST(testBinASTReaderECMAScript2)
         // Compare ASTs.
         Sprinter binPrinter(cx);
         if (!binPrinter.init())
-            MOZ_CRASH();
+            MOZ_CRASH("Couldn't display binParsed");
         DumpParseTree(binParsed.unwrap(), binPrinter);
 
         Sprinter txtPrinter(cx);
         if (!txtPrinter.init())
-            MOZ_CRASH();
+            MOZ_CRASH("Couldn't display txtParsed");
         DumpParseTree(txtParsed, txtPrinter);
 
         if (strcmp(binPrinter.string(), txtPrinter.string()) != 0) {
-            fprintf(stderr, "Got distinct ASTs when parsing %s:\n\tBINARY\n%s\n\n\tTEXT\n%s\n", txtPath.get(), binPrinter.string(), txtPrinter.string());            
-            MOZ_CRASH();
+            fprintf(stderr, "Got distinct ASTs when parsing %s:\n\tBINARY\n%s\n\n\tTEXT\n%s\n", txtPath.get(), binPrinter.string(), txtPrinter.string());
+            MOZ_CRASH("Got distinct ASTs");
         }
         fprintf(stderr, "Got the same AST when parsing %s\n", txtPath.get());
 
@@ -189,6 +204,9 @@ BEGIN_TEST(testBinASTReaderECMAScript2)
 #if defined(XP_WIN)
     if (!FindClose(hFind))
         MOZ_CRASH("Could not close Find");
+#elif defined(XP_UNIX)
+    if (closedir(dir) != 0)
+        MOZ_CRASH("Could not close dir");
 #endif // defined(XP_WIN)
 
     return true;

From b03980beee34c15105740c5ca1626c238ed045c9 Mon Sep 17 00:00:00 2001
From: David Teller <dteller@mozilla.com>
Date: Tue, 24 Oct 2017 12:38:31 +0200
Subject: [PATCH 194/219] Bug 1377007 - AutoSpider now exposes the directory of
 js/src;r=jonco

MozReview-Commit-ID: 6hROX8YpnCn

--HG--
extra : rebase_source : 8d8e5c5a9e471d5294ade810b2a6dcbe92e66130
---
 js/src/devtools/automation/autospider.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/devtools/automation/autospider.py b/js/src/devtools/automation/autospider.py
index 03081738d2e4..f4d634f95aa8 100755
--- a/js/src/devtools/automation/autospider.py
+++ b/js/src/devtools/automation/autospider.py
@@ -32,6 +32,7 @@ def directories(pathmodule, cwd, fixup=lambda s: s):
 DIR = directories(os.path, os.getcwd())
 PDIR = directories(posixpath, os.environ["PWD"],
                    fixup=lambda s: re.sub(r'^(\w):', r'/\1', s))
+env['AUTOSPIDER_DIR'] = DIR.js_src
 
 parser = argparse.ArgumentParser(
     description='Run a spidermonkey shell build job')
@@ -388,7 +389,6 @@ def run_test_command(command, **kwargs):
 
 test_suites = set(['jstests', 'jittest', 'jsapitests', 'checks'])
 
-
 def normalize_tests(tests):
     if 'all' in tests:
         return test_suites

From 322d9410d26f97ff230183ac0228911f3e8efc0b Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Mon, 4 Dec 2017 14:07:50 +0100
Subject: [PATCH 195/219] Bug 1413051 - fix aboutdebugging addon tip icon in
 RTL;r=ochameau

MozReview-Commit-ID: 3aMuHiBHhVG

--HG--
extra : rebase_source : 7a59d3f888f888d220a7f0c469875bd61ae64e62
---
 devtools/client/aboutdebugging/aboutdebugging.css     | 11 ++++++-----
 .../client/aboutdebugging/components/addons/Panel.js  |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/devtools/client/aboutdebugging/aboutdebugging.css b/devtools/client/aboutdebugging/aboutdebugging.css
index 5fd30d584256..c97cbea3496d 100644
--- a/devtools/client/aboutdebugging/aboutdebugging.css
+++ b/devtools/client/aboutdebugging/aboutdebugging.css
@@ -219,15 +219,16 @@ button {
   align-items: center;
   margin-top: 1em;
   margin-bottom: 1em;
-  background-image: url(chrome://devtools/skin/images/help.svg);
-  background-repeat: no-repeat;
-  background-size: 24px;
-  padding-inline-start: 32px;
   height: 24px;
 }
 
 .addons-tip-icon {
-  margin-inline-end: 1ch;
+  width: 24px;
+  height: 24px;
+  background-image: url(chrome://devtools/skin/images/help.svg);
+  background-repeat: no-repeat;
+  background-size: 24px;
+  margin-inline-end: 8px;
 }
 
 .error-page {
diff --git a/devtools/client/aboutdebugging/components/addons/Panel.js b/devtools/client/aboutdebugging/components/addons/Panel.js
index bd3d3d8e6391..45ed4c982a27 100644
--- a/devtools/client/aboutdebugging/components/addons/Panel.js
+++ b/devtools/client/aboutdebugging/components/addons/Panel.js
@@ -171,6 +171,7 @@ class AddonsPanel extends Component {
         sort: true
       }),
       dom.div({ className: "addons-tip"},
+        dom.div({ className: "addons-tip-icon"}),
         dom.span({
           className: "addons-web-ext-tip",
         }, Strings.GetStringFromName("webExtTip")),

From 78a38b2e85f3533073fc6b23ed94509fa0c70793 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Fri, 1 Dec 2017 17:42:42 +0100
Subject: [PATCH 196/219] Bug 1408939 - enable
 browser_webconsole_history_arrow_keys.js;r=Honza

MozReview-Commit-ID: KvBrFRMW0W1

--HG--
extra : rebase_source : c8e3541dcf68da377c472d817f710e2c84823789
---
 .../test/mochitest/browser.ini                |  1 -
 .../browser_webconsole_history_arrow_keys.js  | 49 +++++++++----------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
index 31f107c92ac5..8f024df94980 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -291,7 +291,6 @@ skip-if = true #	Bug 1404392
 skip-if = true #	Bug 1404853
 # old console skip-if = true # Requires direct access to content nodes
 [browser_webconsole_history_arrow_keys.js]
-skip-if = true # Bug 1408939
 [browser_webconsole_hpkp_invalid-headers.js]
 skip-if = true #	Bug 1405340
 # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js
index f6d5e75baf34..9d243673b280 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js
@@ -7,44 +7,39 @@
 
 // See Bugs 594497 and 619598.
 
-var jsterm, inputNode, values;
-
-var TEST_URI = "data:text/html;charset=utf-8,Web Console test for " +
+const TEST_URI = "data:text/html;charset=utf-8,Web Console test for " +
                "bug 594497 and bug 619598";
 
-add_task(function* () {
-  yield loadTab(TEST_URI);
+const TEST_VALUES = [
+  "document",
+  "window",
+  "document.body",
+  "document;\nwindow;\ndocument.body",
+  "document.location",
+];
 
-  let hud = yield openConsole();
-
-  setup(hud);
-  performTests();
-
-  jsterm = inputNode = values = null;
-});
-
-function setup(HUD) {
-  jsterm = HUD.jsterm;
-  inputNode = jsterm.inputNode;
+add_task(async function () {
+  let hud = await openNewTabAndConsole(TEST_URI);
+  let { jsterm } = hud;
 
   jsterm.focus();
-
   ok(!jsterm.getInputValue(), "jsterm.getInputValue() is empty");
 
-  values = ["document", "window", "document.body"];
-  values.push(values.join(";\n"), "document.location");
-
-  // Execute each of the values;
-  for (let i = 0; i < values.length; i++) {
-    jsterm.setInputValue(values[i]);
+  info("Execute each test value in the console");
+  for (let value of TEST_VALUES) {
+    jsterm.setInputValue(value);
     jsterm.execute();
   }
-}
 
-function performTests() {
+  performTests(jsterm);
+});
+
+function performTests(jsterm) {
+  let { inputNode } = jsterm;
+  let values = TEST_VALUES;
+
   EventUtils.synthesizeKey("VK_UP", {});
 
-
   is(jsterm.getInputValue(), values[4],
      "VK_UP: jsterm.getInputValue() #4 is correct");
 
@@ -148,7 +143,7 @@ function performTests() {
   EventUtils.synthesizeKey("VK_DOWN", {});
 
   is(jsterm.getInputValue(), values[4],
-     "VK_DOWN: jsterm.getInputValue() #4 is correct");
+    "VK_DOWN: jsterm.getInputValue() #4 is correct");
 
   EventUtils.synthesizeKey("VK_DOWN", {});
 

From e85215e774a81896bb4442e3c1caafe23e4bb041 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Fri, 1 Dec 2017 18:29:30 +0100
Subject: [PATCH 197/219] Bug 1408934 - enable
 browser_webconsole_deactivateHUDForContext_unfocused_window.js;r=Honza

MozReview-Commit-ID: 8k5ISUxEPP7

--HG--
rename : devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_deactivateHUDForContext_unfocused_window.js => devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_unfocused_window.js
extra : rebase_source : f33fea6e792868bf9c5dcd18f8709953d69a3ce3
---
 .../test/mochitest/browser.ini                |  9 +-
 ...owser_webconsole_close_unfocused_window.js | 44 +++++++++
 ...eactivateHUDForContext_unfocused_window.js | 99 -------------------
 .../new-console-output/test/mochitest/head.js | 19 ++++
 4 files changed, 67 insertions(+), 104 deletions(-)
 create mode 100644 devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_unfocused_window.js
 delete mode 100644 devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_deactivateHUDForContext_unfocused_window.js

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
index 8f024df94980..b8d75e9906b1 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -235,12 +235,13 @@ tags = mcb
 [browser_webconsole_cd_iframe.js]
 [browser_webconsole_certificate_messages.js]
 [browser_webconsole_click_function_to_source.js]
-skip-if = true #	Bug 1406038
+skip-if = true # Bug 1406038
 [browser_webconsole_clickable_urls.js]
+[browser_webconsole_close_unfocused_window.js]
 [browser_webconsole_closing_after_completion.js]
 [browser_webconsole_close_sidebar.js]
 [browser_webconsole_closure_inspection.js]
-skip-if = true #	Bug 1405250
+skip-if = true # Bug 1405250
 [browser_webconsole_console_api_iframe.js]
 [browser_webconsole_console_dir.js]
 [browser_webconsole_console_dir_uninspectable.js]
@@ -259,7 +260,7 @@ subsuite = clipboard
 [browser_webconsole_context_menu_open_url.js]
 [browser_webconsole_context_menu_store_as_global.js]
 [browser_webconsole_copy_link_location.js]
-skip-if = true #	Bug 1401944
+skip-if = true # Bug 1401944
 [browser_webconsole_csp_ignore_reflected_xss_message.js]
 skip-if = (e10s && debug) || (e10s && os == 'win') # Bug 1221499 enabled these on windows
 [browser_webconsole_cspro.js]
@@ -268,8 +269,6 @@ skip-if = true # Bug 1408932
 [browser_webconsole_ctrl_key_nav.js]
 skip-if = true # Bug 1408933
 # old console skip-if = os != "mac"
-[browser_webconsole_deactivateHUDForContext_unfocused_window.js]
-skip-if = true # Bug 1408934
 [browser_webconsole_document_focus.js]
 skip-if = true #	Bug 1404368
 [browser_webconsole_duplicate_errors.js]
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_unfocused_window.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_unfocused_window.js
new file mode 100644
index 000000000000..d6dd67678e64
--- /dev/null
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_unfocused_window.js
@@ -0,0 +1,44 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// See Bug 597103. Check that closing the console on an unfocused window does not trigger
+// any error.
+
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
+                 "new-console-output/test/mochitest/test-console.html";
+
+add_task(async function () {
+  let tab1 = await addTab(TEST_URI, {window});
+
+  info("Open a second window");
+  let win2 = await openNewBrowserWindow();
+
+  info("Add a test tab in the second window");
+  let tab2 = await addTab(TEST_URI, {window: win2});
+  win2.gBrowser.selectedTab = tab2;
+
+  info("Open console in tabs located in different windows");
+  await openConsole(tab1);
+  await openConsole(tab2);
+
+  info("Close toolboxes in tabs located in different windows, one of them not focused");
+  await closeToolboxForTab(tab1);
+  await closeToolboxForTab(tab2);
+
+  info("Close the second window");
+  win2.close();
+
+  info("Close the test tab in the first window");
+  window.gBrowser.removeTab(tab1);
+
+  ok(true, "No error was triggered during the test");
+});
+
+function closeToolboxForTab(tab) {
+  let target = TargetFactory.forTab(tab);
+  return gDevTools.closeToolbox(target);
+}
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_deactivateHUDForContext_unfocused_window.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_deactivateHUDForContext_unfocused_window.js
deleted file mode 100644
index 400b96607087..000000000000
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_deactivateHUDForContext_unfocused_window.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-// See Bug 597103.
-
-const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "test/test-console.html";
-
-var tab1, tab2, win1, win2;
-var noErrors = true;
-
-function tab1Loaded() {
-  win2 = OpenBrowserWindow();
-  whenDelayedStartupFinished(win2, win2Loaded);
-}
-
-function win2Loaded() {
-  tab2 = win2.gBrowser.addTab(TEST_URI);
-  win2.gBrowser.selectedTab = tab2;
-  tab2.linkedBrowser.addEventListener("load", tab2Loaded, true);
-}
-
-function tab2Loaded(aEvent) {
-  tab2.linkedBrowser.removeEventListener(aEvent.type, tab2Loaded, true);
-
-  let consolesOpened = 0;
-  function onWebConsoleOpen() {
-    consolesOpened++;
-    if (consolesOpened == 2) {
-      executeSoon(closeConsoles);
-    }
-  }
-
-  function openConsoles() {
-    try {
-      let target1 = TargetFactory.forTab(tab1);
-      gDevTools.showToolbox(target1, "webconsole").then(onWebConsoleOpen);
-    } catch (ex) {
-      ok(false, "gDevTools.showToolbox(target1) exception: " + ex);
-      noErrors = false;
-    }
-
-    try {
-      let target2 = TargetFactory.forTab(tab2);
-      gDevTools.showToolbox(target2, "webconsole").then(onWebConsoleOpen);
-    } catch (ex) {
-      ok(false, "gDevTools.showToolbox(target2) exception: " + ex);
-      noErrors = false;
-    }
-  }
-
-  function closeConsoles() {
-    try {
-      let target1 = TargetFactory.forTab(tab1);
-      gDevTools.closeToolbox(target1).then(function () {
-        try {
-          let target2 = TargetFactory.forTab(tab2);
-          gDevTools.closeToolbox(target2).then(testEnd);
-        } catch (ex) {
-          ok(false, "gDevTools.closeToolbox(target2) exception: " + ex);
-          noErrors = false;
-        }
-      });
-    } catch (ex) {
-      ok(false, "gDevTools.closeToolbox(target1) exception: " + ex);
-      noErrors = false;
-    }
-  }
-
-  function testEnd() {
-    ok(noErrors, "there were no errors");
-
-    win1.gBrowser.removeTab(tab1);
-
-    Array.forEach(win2.gBrowser.tabs, function (aTab) {
-      win2.gBrowser.removeTab(aTab);
-    });
-
-    executeSoon(function () {
-      win2.close();
-      tab1 = tab2 = win1 = win2 = null;
-      finishTest();
-    });
-  }
-
-  openConsoles();
-}
-
-function test() {
-  loadTab(TEST_URI).then(() => {
-    tab1 = gBrowser.selectedTab;
-    win1 = window;
-    tab1Loaded();
-  });
-}
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
index 46f56470ff3b..d9fa31e68f72 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
@@ -433,3 +433,22 @@ function simulateLinkClick(element) {
     element.click();
   });
 }
+
+/**
+ * Open a new browser window and return a promise that resolves when the new window has
+ * fired the "browser-delayed-startup-finished" event.
+ *
+ * @returns Promise
+ *          A Promise that resolves when the window is ready.
+ */
+function openNewBrowserWindow() {
+  let win = OpenBrowserWindow();
+  return new Promise(resolve => {
+    Services.obs.addObserver(function observer(subject, topic) {
+      if (win == subject) {
+        Services.obs.removeObserver(observer, topic);
+        resolve(win);
+      }
+    }, "browser-delayed-startup-finished");
+  });
+}

From 44c10c01b3102413b5db2db368efaf9563b91a49 Mon Sep 17 00:00:00 2001
From: "Francesco Lodolo (:flod)" <flod@lodolo.net>
Date: Mon, 4 Dec 2017 13:12:57 +0100
Subject: [PATCH 198/219] Bug 1326030 - [he] Update icon for Morfix
 searchplugin r=mkaply

MozReview-Commit-ID: 4Xv2F1wUcEB

--HG--
extra : rebase_source : b27c97564b7b677b97d413ac02596fedd883170f
---
 browser/locales/searchplugins/morfix-dic.xml | 24 ++------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/browser/locales/searchplugins/morfix-dic.xml b/browser/locales/searchplugins/morfix-dic.xml
index e5572475f9f1..e9077e7269a6 100644
--- a/browser/locales/searchplugins/morfix-dic.xml
+++ b/browser/locales/searchplugins/morfix-dic.xml
@@ -5,32 +5,12 @@
 <!-- milon.morfix.co.il MozSearch plugin
      Compatible with Mozilla Firefox 2+
      Tomer Cohen, September 2006 - http://mozilla.org.il             -->
-   
+
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
   <ShortName>מילון מורפיקס</ShortName>
   <Description></Description>
   <InputEncoding>UTF-8</InputEncoding>
-  <Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+g
-vaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gkdCRktdt52QwAAACR0
-RVh0Q29tbWVudABUb21lciBDb2hlbgp0b21lcmNAZ21haWwuY29tUau7swAAAxxJ
-REFUOMttk91rm2UYxq/7eZ/3fZO8SZqlcflct2at/YjokDJBPNAyHW4Hgw31wP9B
-kP0Bngw2QWHsxFOPdjJPhG1MEaqIddOWDbqxOmrStE3atGk+lrxJ3o/neTxYtlXx
-hpv74Oa64Oa+foQDpZQCAALAAPDhJADiQCsieqGh/4g5gCCAmO85cdFvhZVUJM0R
-O2AGGsTQJFAPgP/chA6IdQBxr7MzIde+m9Vqi+OsUxwl4ULo0dZecK4kXvvsYTqb
-faJpWuO5CQeAXrerBa1QzKuvnmD3L79n7P55grqVDKRrASAO6qfZcmV/69bY2utf
-BkLH37jfdBpNAJKqb09TMZM2kl9cyR+tfnNB37pzBv3GEQCaAgQ9O8sA4ChQ8fF+
-9IdL5vTNTlquCiUG2sUwo+ZGVTemvUzSXniX7NqbAPi+jcqDCisZnLXCpjIARAkI
-jZiOXyw1d5YIVWn6fQYACsCxSFUjuxYFoA181H4pmUsL1uc//n7k65/7RvoJABtA
-iGvInrS8XGptKjxWn2EcAJ6mQiogGgTpAkC372GjTIWVs+c/fliYmR11/thN4dFX
-efiuxYBgBH7o7NxpY/7UB8QBQHZcLJRT0zFnaqrbE/H1QWyCItnruUzW1Q2DfCsB
-MAOAKxXg+hKOyTX/cDKp+A1KKxUPQ7fzj47K1pzrdNHCYeTe+vSiETAPOY1iRt+7
-Ow7hWgAcV2Bvs2PVzEjcJkaSz9+4Tp7jUDqTIfb420uB7dtzuqoaJq721E/XFEkn
-Rp1yGsLVQahtNdVff4vJ4ju5XDcSjChemJkBAO5sL0eM+vejrL2SgvQPvUypYlBK
-Athp2Hhwd8u6xyfPrR8fHx+AoPgwksrr7Qv96UYPwm0PGWAApFQYeAL17bZa/W3T
-uree+GT59Pz79WQyKRhj4MMvuvKVk5srzfyi2N3dAxAeGvgKsEvt4HZZ5Ivs1Y/W
-z5z6sD5bKDicc3WQBVJSBsqVamxp8ddou93ShzsJYo5hjdj5Y2OdyYmJQSKREJqm
-qf+jkQAw3/eZEPIlrgTFGJOapiki+hfKAPAPFp9sbyN2GzAAAAAASUVORK5CYII=
-</Image>
+  <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAEAIACzAgAAJgAAACAgAAABACAAFQYAANkCAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAJ6SURBVDiNpZI7aN91FMU/9/H952URunQQE0qKhpYiFtFFRQe36iJa6upcRIoIulRXncW1gw5KKJWCIKhRFB9FEQpW0LZ2iAEflERo8s/ve+91+MXn6oWz3MfhcM6F/1kC8PD+k0ci67mqWgEoles15Vlb4IClPFJVc5VxVSIvrv2++t2/CB649cQxETknyGKSiAhmhqpcUtHbQPZXFZlBJb9l9nO70zzz2fbb6wC2NHfkNUHvKwJVxd1wV9zbATObUxNUBRkxr2LHROvBg/N3vPvj9uUtlWJBqL1jx5vTWqM1o02cNmkjWsPdEAP3dk9lexnOqC3NHl4X1ePmNu9u42JzmjuTyQzNG2b+l2MFVCVZHFqc3bhg16ffXjt4y9FNNz8+ynd84kzaDGJyUdReQvIbUb0LZLYqqSooZqrY9JHYNkQFVUVNcXPMdcPdTp796pUrAE8efmbTzV/tOiCqIEEVTyiAaJmIgMiYgjqm7fuzjy5c+zsv+RxJRHTMHhBhWf/7GFVFUSTFQ2v8Y173C8rowl4HthwgAkyTyqSyyEhSOmtrZ/pTd59eyl5PZ/ZTPTqZSY4eoFXvjPZGkCZkJpFB9KCKfuLQqeVhd7hgZSt96PQeI3kkVbWTwus+SinJSEICRFAGtGIQ5DEbbGU7bpKR9AgiAlKIzPN24+cvHCCrtiSCTlGAlRKhN7Eqw+kx7KlLCBhi93Lm8MLHrHUF2Gfty4IPK4XowXQYhmF3562hOL+zu7Peh6QPQQxJ7/2Dkunjn2yuXgUwgB+2L00X9c73cG7PzH2Qp9//5c03rmx+fWN5/uinEf3eHpER8aJ4PP/Rr6s//ZnEH4VnUn6KMJ1eAAAAAElFTkSuQmCCiVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAF3ElEQVRYhc2WW4idVxXHf2vtc6bJ1FwmVhqoSVD70DKpEPpgpRpDUaQ+iLZMaksf+tAYoUIQERQRCr4Z1IdQhYpGLC2paUuJFcT2YaSTlkBCq21iKcHamLb2emYaE2bmfHv9ffiuZ86M9k03Z/Nd+M76/9Zlr73hfzys+7B78627IH1ZaKewywwEIDCHokDHrprngaMczQB7PjKzVeHbXNqeIclsyYe8nq14V/3h28ffOXbhAwHcvOXmjRdjww8Fdxs+CSqVux+a4WZZxg9Stoci8R0z+yLoasNQhSqJULwH9pIpThTKDx1fePTkmgB72NOLqSvvc9LXQ3kV6UrcHTPHTAtYOt8znxYiFM13UglggFTGL8dwPuA3Qy8OnnjvsfNjtndv3rsb7EnBBCvEW2HD3DAMd8PMERrJXxkAIbUgklAEyAmGLwXsmxscnetquOArYGuK1zO5k1L9bCR3PKVmpua+811yLDmywOhf4/iRz07tvXEUQLpmZdi7wmMzeSWSGqiUKsBqNt91/mcu3NJVFvaLz6yf2d5qmS2Oek4Tcq9n8tY7r711Ui9VIKkBa+YIeGlPBO5+rU3Y9xoAxDNeZbMUXulx6qQhNcZT530TkZRwL4HSGhGUCdzu/NyWmU+XAOv0aFi8YeYtRLnk2vsqEmVUWvFaNKVxb807NupCrmYifSiLuwDSqxfPzG+/bOc5Qzd56k16lVer89mNQEpj4e2nPsn7pJRGUzi2RoyyT1RvFFMf3XT9kQRwbun0mR0bpl90/EsppfVN3n2ld3UNlDCYXcD5nSmOyXTajA+7+VRJ0hFXi1E3K7ApDYdP9hrI7C+QWDCzqdoDG0mDN6FNnhD8tdfr7dvyr8WTh84eWgK4Zdc9O3pL6UfJ015JzX+rsNSVVv9Izk1e609k77uZd0VHxKtrWVx2KfXZ/+DzB4/X4gCPPXffq/1l7RM65Z5K4BX1VDc0zJD8hgaAdZ24WZlMs9F3hpG8j9z+cH7jpmdZZTx49tD75nY4eV0TlceVTZqLMHS1j/y7EqFTQnVR1V4kT5jshdnZe4vVAKpxRgq8Xlkdm3UarNwqtvraNjrej92vsmN1Ryh11NYwYwC9/wKgzp2q5/+sDYBzveFVtdMuvRGTwmBpFECtkLrvyi3uA8nPTH9rC2Z3hnID0AVvlyII3mwBFivZUmt0S5UIgSKIHBSxevrv2PXtHcn0c5PtjIgGvuKvDSNRZ+hU0wcW18FEBrmw5nTTQrV7fYyF4WufPPApw2/Pw3yLiW05Su9VN52xCFYQZk+1jWgR1FNLHEIWRBhmAVGecrIHhdoI3Hbdgf0KO5gsbcixTI5MhIgIIgKFCJVT1bNkiFggp04nBEIZizorUXWvoD50mRmRS8MAM9fe8wUV8VPM1i9psRSLKFNWAYRqkCghJEyGFLOX3t/095EiVBPqlfmvjNUCIcG9noNvIl9f5KIBU6gCqY9k4/ayigL88CnuH/ZGAUoxCwMcLEbaklkJUOScv/qJf16Rs67D2oNpGe42At1I1NEpvdfjT8/rCYAGwBlKWCgEXhabwgiEVWvGzMgWZEUeZp/suyZFbgpTtB7X4Y6o3wXIyMqvKdv34bd5FMAuHxRcmkdUOe40zno7MCMXBaZ4u7gYA98YC45dKUVzKo6q4luAaKKhiIsB35i78PDLrePVmJ3/9bzLnil3KY1UcoTIVRiXY3kBsxNPDe5fyDmfVEDOmci5vVb9oilYQeRYCPLdc4OHn+imfaQIe/CTUD7npA59bVgoIIr41e//8csXAYbBj4fF8rsKI+cgRzTiOedSPIyIOK0obnt68MgRVozUfXhl6fRg27rpP2PcYPgVTUMuLzmTH/Dh8nf/tnhmCeCVC8+/8bHJ6bOIGyU2Nqug6iWhGEj5cM9j/5/mH3lupTis2OLqsefyma3FhN9lituBKbC/mPEzH7z1x1lmx/rw5zfd8XH1OBDErZI2h3hZ4nH1ODL3Tpvv/8vxb8af5VHCgdKPAAAAAElFTkSuQmCC</Image>
   <Url type="text/html" method="GET" template="http://milon.morfix.co.il/default.aspx" resultdomain="morfix.co.il">
     <Param name="q" value="{searchTerms}"/>
   </Url>

From 20ddc8dfaedf93f0bedb7ccc553ded89cf0f909a Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Mon, 4 Dec 2017 18:01:09 +0200
Subject: [PATCH 199/219] Backed out 7 changesets (bug 1377007) for failing
 build bustage on Linux pgo and faling Cpp's jsapi-tests r=backout on a CLOSED
 TREE

Backed out changeset 9428a4ed7dec (bug 1377007)
Backed out changeset 4407b43a8aff (bug 1377007)
Backed out changeset 65a37a7f78a5 (bug 1377007)
Backed out changeset 276fe6d9b716 (bug 1377007)
Backed out changeset 1de46e60ffba (bug 1377007)
Backed out changeset 893e303e17ec (bug 1377007)
Backed out changeset 081a241e25d4 (bug 1377007)
---
 .eslintignore                                 |    1 -
 js/moz.configure                              |   14 -
 js/public/RootingAPI.h                        |    3 -
 js/src/devtools/automation/autospider.py      |    2 +-
 js/src/frontend/BinSource.cpp                 | 2517 -----------------
 js/src/frontend/BinSource.h                   |  274 --
 js/src/frontend/BinToken.cpp                  |   29 -
 js/src/frontend/BinToken.h                    |  201 --
 js/src/frontend/BinTokenReaderTester.cpp      |  536 ----
 js/src/frontend/BinTokenReaderTester.h        |  357 ---
 js/src/frontend/BytecodeCompiler.h            |    8 -
 js/src/frontend/FullParseHandler.h            |  104 +-
 js/src/frontend/ParseContext-inl.h            |   96 -
 js/src/frontend/ParseContext.h                |   26 -
 js/src/frontend/ParseNode.h                   |   28 +-
 js/src/frontend/Parser.cpp                    |   98 +-
 js/src/frontend/Parser.h                      |   36 +-
 js/src/frontend/SharedContext.h               |    2 -
 js/src/gc/RootMarking.cpp                     |    6 -
 .../parser/tester/StrictEquality-001.binjs    |  Bin 7935 -> 0 bytes
 .../parser/tester/StrictEquality-001.js       |   73 -
 .../binast/parser/tester/apply-001-n.binjs    |  Bin 4825 -> 0 bytes
 .../binast/parser/tester/apply-001-n.js       |   29 -
 .../binast/parser/tester/boolean-001.binjs    |  Bin 7700 -> 0 bytes
 .../binast/parser/tester/boolean-001.js       |   47 -
 .../binast/parser/tester/boolean-002.binjs    |  Bin 7749 -> 0 bytes
 .../binast/parser/tester/boolean-002.js       |   51 -
 .../binast/parser/tester/call-1.binjs         |  Bin 6585 -> 0 bytes
 .../binast/parser/tester/call-1.js            |   42 -
 .../parser/tester/constructor-001.binjs       |  Bin 7148 -> 0 bytes
 .../binast/parser/tester/constructor-001.js   |   66 -
 .../binast/parser/tester/date-002.binjs       |  Bin 8840 -> 0 bytes
 .../binast/parser/tester/date-002.js          |   54 -
 .../binast/parser/tester/date-003.binjs       |  Bin 8996 -> 0 bytes
 .../binast/parser/tester/date-003.js          |   56 -
 .../binast/parser/tester/date-004.binjs       |  Bin 8655 -> 0 bytes
 .../binast/parser/tester/date-004.js          |   50 -
 .../binast/parser/tester/dowhile-001.binjs    |  Bin 7058 -> 0 bytes
 .../binast/parser/tester/dowhile-001.js       |   44 -
 .../binast/parser/tester/dowhile-002.binjs    |  Bin 10101 -> 0 bytes
 .../binast/parser/tester/dowhile-002.js       |   71 -
 .../binast/parser/tester/dowhile-003.binjs    |  Bin 11729 -> 0 bytes
 .../binast/parser/tester/dowhile-003.js       |   63 -
 .../binast/parser/tester/dowhile-004.binjs    |  Bin 9961 -> 0 bytes
 .../binast/parser/tester/dowhile-004.js       |   67 -
 .../binast/parser/tester/dowhile-005.binjs    |  Bin 9175 -> 0 bytes
 .../binast/parser/tester/dowhile-005.js       |   73 -
 .../binast/parser/tester/dowhile-006.binjs    |  Bin 15060 -> 0 bytes
 .../binast/parser/tester/dowhile-006.js       |   89 -
 .../binast/parser/tester/dowhile-007.binjs    |  Bin 21270 -> 0 bytes
 .../binast/parser/tester/dowhile-007.js       |   97 -
 .../binast/parser/tester/exception-001.binjs  |  Bin 6518 -> 0 bytes
 .../binast/parser/tester/exception-001.js     |   45 -
 .../binast/parser/tester/exception-002.binjs  |  Bin 6710 -> 0 bytes
 .../binast/parser/tester/exception-002.js     |   45 -
 .../binast/parser/tester/exception-003.binjs  |  Bin 8413 -> 0 bytes
 .../binast/parser/tester/exception-003.js     |   49 -
 .../binast/parser/tester/exception-004.binjs  |  Bin 6792 -> 0 bytes
 .../binast/parser/tester/exception-004.js     |   45 -
 .../binast/parser/tester/exception-005.binjs  |  Bin 6792 -> 0 bytes
 .../binast/parser/tester/exception-005.js     |   45 -
 .../binast/parser/tester/exception-006.binjs  |  Bin 8294 -> 0 bytes
 .../binast/parser/tester/exception-006.js     |   56 -
 .../binast/parser/tester/exception-007.binjs  |  Bin 8695 -> 0 bytes
 .../binast/parser/tester/exception-007.js     |   57 -
 .../binast/parser/tester/exception-008.binjs  |  Bin 6852 -> 0 bytes
 .../binast/parser/tester/exception-008.js     |   44 -
 .../binast/parser/tester/exception-009.binjs  |  Bin 7026 -> 0 bytes
 .../binast/parser/tester/exception-009.js     |   53 -
 .../parser/tester/exception-010-n.binjs       |  Bin 4817 -> 0 bytes
 .../binast/parser/tester/exception-010-n.js   |   25 -
 .../parser/tester/exception-011-n.binjs       |  Bin 4530 -> 0 bytes
 .../binast/parser/tester/exception-011-n.js   |   26 -
 .../binast/parser/tester/exec-002.binjs       |  Bin 23367 -> 0 bytes
 .../binast/parser/tester/exec-002.js          |  188 --
 .../binast/parser/tester/expression-001.binjs |  Bin 6002 -> 0 bytes
 .../binast/parser/tester/expression-001.js    |   50 -
 .../binast/parser/tester/expression-002.binjs |  Bin 11122 -> 0 bytes
 .../binast/parser/tester/expression-002.js    |   60 -
 .../binast/parser/tester/expression-003.binjs |  Bin 10356 -> 0 bytes
 .../binast/parser/tester/expression-003.js    |   55 -
 .../binast/parser/tester/expression-004.binjs |  Bin 10202 -> 0 bytes
 .../binast/parser/tester/expression-004.js    |   49 -
 .../binast/parser/tester/expression-005.binjs |  Bin 6146 -> 0 bytes
 .../binast/parser/tester/expression-005.js    |   41 -
 .../binast/parser/tester/expression-006.binjs |  Bin 7177 -> 0 bytes
 .../binast/parser/tester/expression-006.js    |   46 -
 .../binast/parser/tester/expression-007.binjs |  Bin 6728 -> 0 bytes
 .../binast/parser/tester/expression-007.js    |   44 -
 .../binast/parser/tester/expression-008.binjs |  Bin 6615 -> 0 bytes
 .../binast/parser/tester/expression-008.js    |   41 -
 .../binast/parser/tester/expression-009.binjs |  Bin 6652 -> 0 bytes
 .../binast/parser/tester/expression-009.js    |   42 -
 .../binast/parser/tester/expression-010.binjs |  Bin 6623 -> 0 bytes
 .../binast/parser/tester/expression-010.js    |   43 -
 .../binast/parser/tester/expression-011.binjs |  Bin 6754 -> 0 bytes
 .../binast/parser/tester/expression-011.js    |   43 -
 .../binast/parser/tester/expression-012.binjs |  Bin 7215 -> 0 bytes
 .../binast/parser/tester/expression-012.js    |   44 -
 .../binast/parser/tester/expression-013.binjs |  Bin 7198 -> 0 bytes
 .../binast/parser/tester/expression-013.js    |   44 -
 .../binast/parser/tester/expression-014.binjs |  Bin 7117 -> 0 bytes
 .../binast/parser/tester/expression-014.js    |   46 -
 .../binast/parser/tester/expression-015.binjs |  Bin 6274 -> 0 bytes
 .../binast/parser/tester/expression-015.js    |   40 -
 .../binast/parser/tester/expression-016.binjs |  Bin 6523 -> 0 bytes
 .../binast/parser/tester/expression-016.js    |   40 -
 .../binast/parser/tester/expression-017.binjs |  Bin 6319 -> 0 bytes
 .../binast/parser/tester/expression-017.js    |   40 -
 .../binast/parser/tester/expression-019.binjs |  Bin 7291 -> 0 bytes
 .../binast/parser/tester/expression-019.js    |   44 -
 .../binast/parser/tester/forin-001.binjs      |  Bin 55280 -> 0 bytes
 .../binast/parser/tester/forin-001.js         |  297 --
 .../binast/parser/tester/forin-002.binjs      |  Bin 15210 -> 0 bytes
 .../binast/parser/tester/forin-002.js         |   77 -
 .../binast/parser/tester/function-001.binjs   |  Bin 3935 -> 0 bytes
 .../binast/parser/tester/function-001.js      |   41 -
 .../binast/parser/tester/global-001.binjs     |  Bin 6258 -> 0 bytes
 .../binast/parser/tester/global-001.js        |   45 -
 .../binast/parser/tester/global-002.binjs     |  Bin 6254 -> 0 bytes
 .../binast/parser/tester/global-002.js        |   45 -
 .../binast/parser/tester/hex-001.binjs        |  Bin 18562 -> 0 bytes
 .../binast/parser/tester/hex-001.js           |   68 -
 .../binast/parser/tester/if-001.binjs         |  Bin 5066 -> 0 bytes
 .../binast/parser/tester/if-001.js            |   42 -
 .../binast/parser/tester/instanceof-001.binjs |  Bin 4242 -> 0 bytes
 .../binast/parser/tester/instanceof-001.js    |   34 -
 .../binast/parser/tester/instanceof-002.binjs |  Bin 6327 -> 0 bytes
 .../binast/parser/tester/instanceof-002.js    |   51 -
 .../parser/tester/instanceof-003-n.binjs      |  Bin 21454 -> 0 bytes
 .../binast/parser/tester/instanceof-003-n.js  |   88 -
 .../binast/parser/tester/instanceof-003.binjs |  Bin 6082 -> 0 bytes
 .../binast/parser/tester/instanceof-003.js    |   65 -
 .../parser/tester/instanceof-004-n.binjs      |  Bin 21635 -> 0 bytes
 .../binast/parser/tester/instanceof-004-n.js  |   88 -
 .../parser/tester/instanceof-005-n.binjs      |  Bin 21583 -> 0 bytes
 .../binast/parser/tester/instanceof-005-n.js  |   89 -
 .../binast/parser/tester/instanceof-006.binjs |  Bin 20918 -> 0 bytes
 .../binast/parser/tester/instanceof-006.js    |   86 -
 .../binast/parser/tester/keywords-001.binjs   |  Bin 6811 -> 0 bytes
 .../binast/parser/tester/keywords-001.js      |   48 -
 .../binast/parser/tester/label-001.binjs      |  Bin 7746 -> 0 bytes
 .../binast/parser/tester/label-001.js         |   42 -
 .../binast/parser/tester/label-002.binjs      |  Bin 13403 -> 0 bytes
 .../binast/parser/tester/label-002.js         |   56 -
 .../binast/parser/tester/label-003.binjs      |  Bin 2239 -> 0 bytes
 .../binast/parser/tester/label-003.js         |   15 -
 .../binast/parser/tester/lexical-001.binjs    |  Bin 6153 -> 0 bytes
 .../binast/parser/tester/lexical-001.js       |   52 -
 .../binast/parser/tester/lexical-002.binjs    |  Bin 6134 -> 0 bytes
 .../binast/parser/tester/lexical-002.js       |   52 -
 .../binast/parser/tester/lexical-003.binjs    |  Bin 6286 -> 0 bytes
 .../binast/parser/tester/lexical-003.js       |   43 -
 .../binast/parser/tester/lexical-004.binjs    |  Bin 6264 -> 0 bytes
 .../binast/parser/tester/lexical-004.js       |   52 -
 .../binast/parser/tester/lexical-005.binjs    |  Bin 6258 -> 0 bytes
 .../binast/parser/tester/lexical-005.js       |   52 -
 .../binast/parser/tester/lexical-006.binjs    |  Bin 6274 -> 0 bytes
 .../binast/parser/tester/lexical-006.js       |   58 -
 .../binast/parser/tester/lexical-007.binjs    |  Bin 6258 -> 0 bytes
 .../binast/parser/tester/lexical-007.js       |   51 -
 .../binast/parser/tester/lexical-008.binjs    |  Bin 6272 -> 0 bytes
 .../binast/parser/tester/lexical-008.js       |   53 -
 .../binast/parser/tester/lexical-009.binjs    |  Bin 6278 -> 0 bytes
 .../binast/parser/tester/lexical-009.js       |   53 -
 .../binast/parser/tester/lexical-011.binjs    |  Bin 8799 -> 0 bytes
 .../binast/parser/tester/lexical-011.js       |   62 -
 .../binast/parser/tester/lexical-012.binjs    |  Bin 6271 -> 0 bytes
 .../binast/parser/tester/lexical-012.js       |   53 -
 .../binast/parser/tester/lexical-013.binjs    |  Bin 6275 -> 0 bytes
 .../binast/parser/tester/lexical-013.js       |   53 -
 .../binast/parser/tester/lexical-014.binjs    |  Bin 8806 -> 0 bytes
 .../binast/parser/tester/lexical-014.js       |   62 -
 .../binast/parser/tester/lexical-015.binjs    |  Bin 6273 -> 0 bytes
 .../binast/parser/tester/lexical-015.js       |   53 -
 .../binast/parser/tester/lexical-016.binjs    |  Bin 8799 -> 0 bytes
 .../binast/parser/tester/lexical-016.js       |   62 -
 .../binast/parser/tester/lexical-017.binjs    |  Bin 6265 -> 0 bytes
 .../binast/parser/tester/lexical-017.js       |   54 -
 .../binast/parser/tester/lexical-018.binjs    |  Bin 6275 -> 0 bytes
 .../binast/parser/tester/lexical-018.js       |   53 -
 .../binast/parser/tester/lexical-019.binjs    |  Bin 6271 -> 0 bytes
 .../binast/parser/tester/lexical-019.js       |   53 -
 .../binast/parser/tester/lexical-020.binjs    |  Bin 6271 -> 0 bytes
 .../binast/parser/tester/lexical-020.js       |   53 -
 .../binast/parser/tester/lexical-021.binjs    |  Bin 8801 -> 0 bytes
 .../binast/parser/tester/lexical-021.js       |   62 -
 .../binast/parser/tester/lexical-023.binjs    |  Bin 6271 -> 0 bytes
 .../binast/parser/tester/lexical-023.js       |   52 -
 .../binast/parser/tester/lexical-024.binjs    |  Bin 6252 -> 0 bytes
 .../binast/parser/tester/lexical-024.js       |   59 -
 .../binast/parser/tester/lexical-025.binjs    |  Bin 6248 -> 0 bytes
 .../binast/parser/tester/lexical-025.js       |   59 -
 .../binast/parser/tester/lexical-026.binjs    |  Bin 6248 -> 0 bytes
 .../binast/parser/tester/lexical-026.js       |   59 -
 .../binast/parser/tester/lexical-027.binjs    |  Bin 6248 -> 0 bytes
 .../binast/parser/tester/lexical-027.js       |   61 -
 .../binast/parser/tester/lexical-028.binjs    |  Bin 6268 -> 0 bytes
 .../binast/parser/tester/lexical-028.js       |   59 -
 .../binast/parser/tester/lexical-029.binjs    |  Bin 6272 -> 0 bytes
 .../binast/parser/tester/lexical-029.js       |   59 -
 .../binast/parser/tester/lexical-030.binjs    |  Bin 6268 -> 0 bytes
 .../binast/parser/tester/lexical-030.js       |   59 -
 .../binast/parser/tester/lexical-031.binjs    |  Bin 6254 -> 0 bytes
 .../binast/parser/tester/lexical-031.js       |   59 -
 .../binast/parser/tester/lexical-032.binjs    |  Bin 6260 -> 0 bytes
 .../binast/parser/tester/lexical-032.js       |   59 -
 .../binast/parser/tester/lexical-033.binjs    |  Bin 6252 -> 0 bytes
 .../binast/parser/tester/lexical-033.js       |   59 -
 .../binast/parser/tester/lexical-034.binjs    |  Bin 6255 -> 0 bytes
 .../binast/parser/tester/lexical-034.js       |   58 -
 .../binast/parser/tester/lexical-035.binjs    |  Bin 6251 -> 0 bytes
 .../binast/parser/tester/lexical-035.js       |   59 -
 .../binast/parser/tester/lexical-036.binjs    |  Bin 6256 -> 0 bytes
 .../binast/parser/tester/lexical-036.js       |   59 -
 .../binast/parser/tester/lexical-037.binjs    |  Bin 6246 -> 0 bytes
 .../binast/parser/tester/lexical-037.js       |   59 -
 .../binast/parser/tester/lexical-038.binjs    |  Bin 6260 -> 0 bytes
 .../binast/parser/tester/lexical-038.js       |   59 -
 .../binast/parser/tester/lexical-039.binjs    |  Bin 6253 -> 0 bytes
 .../binast/parser/tester/lexical-039.js       |   46 -
 .../binast/parser/tester/lexical-040.binjs    |  Bin 6253 -> 0 bytes
 .../binast/parser/tester/lexical-040.js       |   46 -
 .../binast/parser/tester/lexical-041.binjs    |  Bin 7088 -> 0 bytes
 .../binast/parser/tester/lexical-041.js       |   48 -
 .../binast/parser/tester/lexical-042.binjs    |  Bin 7085 -> 0 bytes
 .../binast/parser/tester/lexical-042.js       |   49 -
 .../binast/parser/tester/lexical-047.binjs    |  Bin 7567 -> 0 bytes
 .../binast/parser/tester/lexical-047.js       |   50 -
 .../binast/parser/tester/lexical-048.binjs    |  Bin 6779 -> 0 bytes
 .../binast/parser/tester/lexical-048.js       |   44 -
 .../binast/parser/tester/lexical-049.binjs    |  Bin 7602 -> 0 bytes
 .../binast/parser/tester/lexical-049.js       |   49 -
 .../binast/parser/tester/lexical-050.binjs    |  Bin 6284 -> 0 bytes
 .../binast/parser/tester/lexical-050.js       |   45 -
 .../binast/parser/tester/lexical-051.binjs    |  Bin 6321 -> 0 bytes
 .../binast/parser/tester/lexical-051.js       |   45 -
 .../binast/parser/tester/lexical-052.binjs    |  Bin 7315 -> 0 bytes
 .../binast/parser/tester/lexical-052.js       |   47 -
 .../binast/parser/tester/lexical-053.binjs    |  Bin 6943 -> 0 bytes
 .../binast/parser/tester/lexical-053.js       |   45 -
 .../binast/parser/tester/lexical-054.binjs    |  Bin 7538 -> 0 bytes
 .../binast/parser/tester/lexical-054.js       |   46 -
 .../binast/parser/tester/match-001.binjs      |  Bin 21482 -> 0 bytes
 .../binast/parser/tester/match-001.js         |  106 -
 .../binast/parser/tester/match-002.binjs      |  Bin 36161 -> 0 bytes
 .../binast/parser/tester/match-002.js         |  174 --
 .../binast/parser/tester/match-003.binjs      |  Bin 21251 -> 0 bytes
 .../binast/parser/tester/match-003.js         |  132 -
 .../binast/parser/tester/match-004.binjs      |  Bin 30346 -> 0 bytes
 .../binast/parser/tester/match-004.js         |  173 --
 .../binast/parser/tester/multiline-001.binjs  |  Bin 15866 -> 0 bytes
 .../binast/parser/tester/multiline-001.js     |   68 -
 .../binast/parser/tester/number-001.binjs     |  Bin 7566 -> 0 bytes
 .../binast/parser/tester/number-001.js        |   53 -
 .../binast/parser/tester/number-002.binjs     |  Bin 7588 -> 0 bytes
 .../binast/parser/tester/number-002.js        |   48 -
 .../binast/parser/tester/number-003.binjs     |  Bin 8026 -> 0 bytes
 .../binast/parser/tester/number-003.js        |   50 -
 .../binast/parser/tester/octal-001.binjs      |  Bin 12564 -> 0 bytes
 .../binast/parser/tester/octal-001.js         |   78 -
 .../binast/parser/tester/octal-002.binjs      |  Bin 16156 -> 0 bytes
 .../binast/parser/tester/octal-002.js         |   93 -
 .../binast/parser/tester/octal-003.binjs      |  Bin 18706 -> 0 bytes
 .../binast/parser/tester/octal-003.js         |   87 -
 .../binast/parser/tester/properties-001.binjs |  Bin 23094 -> 0 bytes
 .../binast/parser/tester/properties-001.js    |   91 -
 .../binast/parser/tester/properties-002.binjs |  Bin 37649 -> 0 bytes
 .../binast/parser/tester/properties-002.js    |  129 -
 .../parser/tester/regexp-enumerate-001.binjs  |  Bin 14141 -> 0 bytes
 .../parser/tester/regexp-enumerate-001.js     |   88 -
 .../parser/tester/regexp-literals-001.binjs   |  Bin 4820 -> 0 bytes
 .../parser/tester/regexp-literals-001.js      |   44 -
 .../parser/tester/regexp-literals-002.binjs   |  Bin 2735 -> 0 bytes
 .../parser/tester/regexp-literals-002.js      |   28 -
 .../binast/parser/tester/regress-001.binjs    |  Bin 7756 -> 0 bytes
 .../binast/parser/tester/regress-001.js       |   45 -
 .../binast/parser/tester/regress-7635.binjs   |  Bin 5244 -> 0 bytes
 .../binast/parser/tester/regress-7635.js      |   55 -
 .../binast/parser/tester/split-001.binjs      |  Bin 22400 -> 0 bytes
 .../binast/parser/tester/split-001.js         |  112 -
 .../binast/parser/tester/split-002.binjs      |  Bin 70881 -> 0 bytes
 .../binast/parser/tester/split-002.js         |  270 --
 .../binast/parser/tester/split-003.binjs      |  Bin 38042 -> 0 bytes
 .../binast/parser/tester/split-003.js         |  123 -
 .../binast/parser/tester/statement-001.binjs  |  Bin 6268 -> 0 bytes
 .../binast/parser/tester/statement-001.js     |   47 -
 .../binast/parser/tester/statement-002.binjs  |  Bin 6326 -> 0 bytes
 .../binast/parser/tester/statement-002.js     |   69 -
 .../binast/parser/tester/statement-003.binjs  |  Bin 8692 -> 0 bytes
 .../binast/parser/tester/statement-003.js     |   80 -
 .../binast/parser/tester/statement-004.binjs  |  Bin 8367 -> 0 bytes
 .../binast/parser/tester/statement-004.js     |   52 -
 .../binast/parser/tester/statement-005.binjs  |  Bin 8644 -> 0 bytes
 .../binast/parser/tester/statement-005.js     |   51 -
 .../binast/parser/tester/statement-006.binjs  |  Bin 9022 -> 0 bytes
 .../binast/parser/tester/statement-006.js     |   51 -
 .../binast/parser/tester/statement-007.binjs  |  Bin 6300 -> 0 bytes
 .../binast/parser/tester/statement-007.js     |   42 -
 .../binast/parser/tester/statement-008.binjs  |  Bin 6294 -> 0 bytes
 .../binast/parser/tester/statement-008.js     |   42 -
 .../binast/parser/tester/statement-009.binjs  |  Bin 6133 -> 0 bytes
 .../binast/parser/tester/statement-009.js     |   41 -
 .../binast/parser/tester/string-001.binjs     |  Bin 7914 -> 0 bytes
 .../binast/parser/tester/string-001.js        |   53 -
 .../binast/parser/tester/string-002.binjs     |  Bin 7976 -> 0 bytes
 .../binast/parser/tester/string-002.js        |   52 -
 .../binast/parser/tester/switch-001.binjs     |  Bin 11212 -> 0 bytes
 .../binast/parser/tester/switch-001.js        |   65 -
 .../binast/parser/tester/switch-002.binjs     |  Bin 10566 -> 0 bytes
 .../binast/parser/tester/switch-002.js        |   63 -
 .../binast/parser/tester/switch-003.binjs     |  Bin 11449 -> 0 bytes
 .../binast/parser/tester/switch-003.js        |   57 -
 .../binast/parser/tester/switch-004.binjs     |  Bin 26087 -> 0 bytes
 .../binast/parser/tester/switch-004.js        |   94 -
 .../binast/parser/tester/try-001.binjs        |  Bin 12926 -> 0 bytes
 .../binast/parser/tester/try-001.js           |   83 -
 .../binast/parser/tester/try-003.binjs        |  Bin 12267 -> 0 bytes
 .../binast/parser/tester/try-003.js           |   82 -
 .../binast/parser/tester/try-004.binjs        |  Bin 7554 -> 0 bytes
 .../binast/parser/tester/try-004.js           |   54 -
 .../binast/parser/tester/try-005.binjs        |  Bin 8284 -> 0 bytes
 .../binast/parser/tester/try-005.js           |   57 -
 .../binast/parser/tester/try-006.binjs        |  Bin 12542 -> 0 bytes
 .../binast/parser/tester/try-006.js           |   87 -
 .../binast/parser/tester/try-007.binjs        |  Bin 13660 -> 0 bytes
 .../binast/parser/tester/try-007.js           |   92 -
 .../binast/parser/tester/try-008.binjs        |  Bin 11748 -> 0 bytes
 .../binast/parser/tester/try-008.js           |   59 -
 .../binast/parser/tester/try-009.binjs        |  Bin 12910 -> 0 bytes
 .../binast/parser/tester/try-009.js           |   66 -
 .../binast/parser/tester/try-010.binjs        |  Bin 15697 -> 0 bytes
 .../binast/parser/tester/try-010.js           |   73 -
 .../binast/parser/tester/try-012.binjs        |  Bin 12422 -> 0 bytes
 .../binast/parser/tester/try-012.js           |   95 -
 .../binast/parser/tester/unicode-001.binjs    |  Bin 17042 -> 0 bytes
 .../binast/parser/tester/unicode-001.js       |   59 -
 .../binast/parser/tester/while-001.binjs      |  Bin 4573 -> 0 bytes
 .../binast/parser/tester/while-001.js         |   42 -
 .../binast/parser/tester/while-002.binjs      |  Bin 13384 -> 0 bytes
 .../binast/parser/tester/while-002.js         |   86 -
 .../binast/parser/tester/while-003.binjs      |  Bin 13218 -> 0 bytes
 .../binast/parser/tester/while-003.js         |   87 -
 .../binast/parser/tester/while-004.binjs      |  Bin 34266 -> 0 bytes
 .../binast/parser/tester/while-004.js         |  217 --
 .../tokenizer/tester/test-empty-list.binjs    |  Bin 21 -> 0 bytes
 .../tester/test-empty-untagged-tuple.binjs    |    1 -
 .../tokenizer/tester/test-nested-lists.binjs  |  Bin 90 -> 0 bytes
 .../tokenizer/tester/test-simple-string.binjs |  Bin 34 -> 0 bytes
 .../tester/test-simple-tagged-tuple.binjs     |  Bin 81 -> 0 bytes
 .../tester/test-string-with-escapes.binjs     |  Bin 44 -> 0 bytes
 .../tokenizer/tester/test-trivial-list.binjs  |  Bin 69 -> 0 bytes
 .../tester/test-trivial-untagged-tuple.binjs  |  Bin 63 -> 0 bytes
 js/src/jsapi-tests/moz.build                  |    6 -
 js/src/jsapi-tests/testBinASTReader.cpp       |  215 --
 .../jsapi-tests/testBinTokenReaderTester.cpp  |  318 ---
 js/src/moz.build                              |   10 -
 js/src/shell/js.cpp                           |   77 +-
 358 files changed, 97 insertions(+), 15336 deletions(-)
 delete mode 100644 js/src/frontend/BinSource.cpp
 delete mode 100644 js/src/frontend/BinSource.h
 delete mode 100644 js/src/frontend/BinToken.cpp
 delete mode 100644 js/src/frontend/BinToken.h
 delete mode 100644 js/src/frontend/BinTokenReaderTester.cpp
 delete mode 100644 js/src/frontend/BinTokenReaderTester.h
 delete mode 100644 js/src/frontend/ParseContext-inl.h
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/apply-001-n.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/apply-001-n.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/boolean-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/boolean-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/boolean-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/boolean-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/call-1.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/call-1.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/constructor-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/constructor-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/date-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/date-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/date-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/date-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/date-004.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/date-004.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-004.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-004.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-005.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-005.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-006.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-006.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-007.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/dowhile-007.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-004.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-004.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-005.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-005.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-006.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-006.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-007.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-007.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-008.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-008.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-009.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-009.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-010-n.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-010-n.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-011-n.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exception-011-n.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exec-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/exec-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-004.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-004.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-005.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-005.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-006.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-006.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-007.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-007.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-008.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-008.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-009.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-009.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-010.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-010.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-011.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-011.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-012.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-012.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-013.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-013.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-014.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-014.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-015.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-015.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-016.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-016.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-017.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-017.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-019.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/expression-019.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/forin-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/forin-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/forin-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/forin-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/function-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/function-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/global-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/global-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/global-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/global-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/hex-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/hex-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/if-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/if-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-006.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/instanceof-006.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/keywords-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/keywords-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/label-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/label-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/label-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/label-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/label-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/label-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-004.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-004.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-005.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-005.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-006.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-006.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-007.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-007.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-008.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-008.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-009.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-009.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-011.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-011.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-012.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-012.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-013.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-013.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-014.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-014.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-015.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-015.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-016.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-016.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-017.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-017.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-018.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-018.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-019.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-019.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-020.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-020.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-021.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-021.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-023.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-023.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-024.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-024.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-025.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-025.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-026.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-026.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-027.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-027.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-028.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-028.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-029.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-029.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-030.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-030.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-031.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-031.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-032.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-032.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-033.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-033.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-034.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-034.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-035.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-035.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-036.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-036.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-037.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-037.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-038.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-038.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-039.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-039.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-040.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-040.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-041.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-041.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-042.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-042.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-047.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-047.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-048.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-048.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-049.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-049.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-050.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-050.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-051.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-051.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-052.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-052.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-053.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-053.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-054.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/lexical-054.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/match-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/match-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/match-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/match-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/match-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/match-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/match-004.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/match-004.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/multiline-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/multiline-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/number-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/number-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/number-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/number-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/number-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/number-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/octal-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/octal-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/octal-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/octal-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/octal-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/octal-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/properties-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/properties-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/properties-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/properties-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/regress-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/regress-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/regress-7635.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/regress-7635.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/split-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/split-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/split-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/split-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/split-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/split-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-004.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-004.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-005.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-005.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-006.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-006.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-007.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-007.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-008.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-008.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-009.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/statement-009.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/string-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/string-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/string-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/string-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-004.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/switch-004.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-004.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-004.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-005.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-005.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-006.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-006.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-007.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-007.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-008.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-008.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-009.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-009.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-010.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-010.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-012.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/try-012.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/unicode-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/unicode-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/while-001.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/while-001.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/while-002.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/while-002.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/while-003.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/while-003.js
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/while-004.binjs
 delete mode 100644 js/src/jsapi-tests/binast/parser/tester/while-004.js
 delete mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-empty-list.binjs
 delete mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-empty-untagged-tuple.binjs
 delete mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-nested-lists.binjs
 delete mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-simple-string.binjs
 delete mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-simple-tagged-tuple.binjs
 delete mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-string-with-escapes.binjs
 delete mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-trivial-list.binjs
 delete mode 100644 js/src/jsapi-tests/binast/tokenizer/tester/test-trivial-untagged-tuple.binjs
 delete mode 100644 js/src/jsapi-tests/testBinASTReader.cpp
 delete mode 100644 js/src/jsapi-tests/testBinTokenReaderTester.cpp

diff --git a/.eslintignore b/.eslintignore
index 680df197670f..2b65ce60e405 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -305,7 +305,6 @@ js/xpconnect/**
 js/src/devtools/**
 js/src/octane/**
 js/src/jit-test/**
-js/src/jsapi-tests/binast/**
 js/src/tests/**
 js/src/Y.js
 
diff --git a/js/moz.configure b/js/moz.configure
index 5dfa23b2e8ba..4075cb516d9c 100644
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -408,17 +408,3 @@ def enable_pipeline_operator(value):
 
 set_config('ENABLE_PIPELINE_OPERATOR', enable_pipeline_operator)
 set_define('ENABLE_PIPELINE_OPERATOR', enable_pipeline_operator)
-
-
-
-# Experimental support for BinAST
-# ==============================================================
-
-@depends(target, milestone)
-def enable_build_binast(target, milestone):
-    # For reasons unknown at this time, BinAST causes timeouts on win32.
-    if milestone.is_nightly and not (target.kernel == 'WINNT' and target.cpu == 'x86'):
-        return True
-
-set_define('JS_BUILD_BINAST', enable_build_binast)
-set_config('JS_BUILD_BINAST', enable_build_binast)
diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
index 9b64ff5ded3e..62d3f0f1cb68 100644
--- a/js/public/RootingAPI.h
+++ b/js/public/RootingAPI.h
@@ -867,9 +867,6 @@ class JS_PUBLIC_API(AutoGCRooter)
     enum {
         VALARRAY =     -2, /* js::AutoValueArray */
         PARSER =       -3, /* js::frontend::Parser */
-#if defined(JS_BUILD_BINAST)
-        BINPARSER =    -4, /* js::frontend::BinSource */
-#endif // defined(JS_BUILD_BINAST)
         VALVECTOR =   -10, /* js::AutoValueVector */
         IDVECTOR =    -11, /* js::AutoIdVector */
         OBJVECTOR =   -14, /* js::AutoObjectVector */
diff --git a/js/src/devtools/automation/autospider.py b/js/src/devtools/automation/autospider.py
index f4d634f95aa8..03081738d2e4 100755
--- a/js/src/devtools/automation/autospider.py
+++ b/js/src/devtools/automation/autospider.py
@@ -32,7 +32,6 @@ def directories(pathmodule, cwd, fixup=lambda s: s):
 DIR = directories(os.path, os.getcwd())
 PDIR = directories(posixpath, os.environ["PWD"],
                    fixup=lambda s: re.sub(r'^(\w):', r'/\1', s))
-env['AUTOSPIDER_DIR'] = DIR.js_src
 
 parser = argparse.ArgumentParser(
     description='Run a spidermonkey shell build job')
@@ -389,6 +388,7 @@ def run_test_command(command, **kwargs):
 
 test_suites = set(['jstests', 'jittest', 'jsapitests', 'checks'])
 
+
 def normalize_tests(tests):
     if 'all' in tests:
         return test_suites
diff --git a/js/src/frontend/BinSource.cpp b/js/src/frontend/BinSource.cpp
deleted file mode 100644
index 85c23a5203d6..000000000000
--- a/js/src/frontend/BinSource.cpp
+++ /dev/null
@@ -1,2517 +0,0 @@
-#include "frontend/BinSource.h"
-
-#include "mozilla/ArrayUtils.h"
-#include "mozilla/Casting.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/Move.h"
-#include "mozilla/PodOperations.h"
-#include "mozilla/Vector.h"
-
-#include "frontend/BinTokenReaderTester.h"
-#include "frontend/FullParseHandler.h"
-#include "frontend/Parser.h"
-#include "frontend/SharedContext.h"
-
-#include "vm/RegExpObject.h"
-
-#include "frontend/ParseContext-inl.h"
-#include "frontend/ParseNode-inl.h"
-
-
-// # About compliance with EcmaScript
-//
-// For the moment, this parser implements ES5. Future versions will be extended
-// to ES6 and further on.
-//
-// By design, it does NOT implement Annex B.3.3. If possible, we would like
-// to avoid going down that rabbit hole.
-//
-//
-// # About the AST
-//
-// At this stage of experimentation, the AST specifications change often. This
-// version of the parser attempts to implement
-// https://gist.github.com/Yoric/2390f0367515c079172be2526349b294
-//
-//
-// # About validating the AST
-//
-// Normally, this implementation validates all properties of the AST *except* the
-// order of fields, which is partially constrained by the AST spec (e.g. in a block,
-// field `scope` must appear before field `body`, etc.).
-//
-//
-// # About names and scopes
-//
-// One of the key objectives of the BinAST syntax is to be able to entirely skip
-// parsing inner functions until they are needed. With a purely syntactic AST,
-// this is generally impossible, as we would need to walk the AST to find
-// lexically-bound/var-bound variables, instances of direct eval, etc.
-//
-// To achieve this, BinAST files contain scope data, as instances of
-// `BinJS:Scope` nodes. Rather than walking the AST to assign bindings
-// to scopes, we extract data from the `BinJS:Scope` and check it lazily,
-// once we actually need to walk the AST.
-//
-// WARNING: The current implementation DOES NOT perform the check yet. It
-// is therefore unsafe.
-//
-// # About directives
-//
-// Currently, directives are ignored and treated as regular strings.
-//
-// They should be treated lazily (whenever we open a subscope), like bindings.
-
-// Evaluate an expression, checking that the result is not 0.
-//
-// Throw `cx->alreadyReportedError()` if it returns 0/nullptr.
-#define TRY(EXPR) \
-    do { \
-        if (!EXPR) \
-            return cx_->alreadyReportedError(); \
-    } while(false)
-
-
-#define TRY_VAR(VAR, EXPR) \
-    do { \
-        VAR = EXPR; \
-        if (!VAR) \
-            return cx_->alreadyReportedError(); \
-    } while (false)
-
-#define TRY_DECL(VAR, EXPR) \
-    auto VAR = EXPR; \
-    if (!VAR) \
-       return cx_->alreadyReportedError();
-
-#define TRY_EMPL(VAR, EXPR) \
-    do { \
-        auto _tryEmplResult = EXPR; \
-        if (!_tryEmplResult) \
-            return cx_->alreadyReportedError(); \
-        VAR.emplace(_tryEmplResult.unwrap()); \
-    } while (false)
-
-#define MOZ_TRY_EMPLACE(VAR, EXPR) \
-    do { \
-        auto _tryEmplResult = EXPR; \
-        if (_tryEmplResult.isErr()) \
-            return ::mozilla::Err(_tryEmplResult.unwrapErr()); \
-        VAR.emplace(_tryEmplResult.unwrap()); \
-    } while (false)
-
-using namespace mozilla;
-
-namespace js {
-namespace frontend {
-
-using AutoList = BinTokenReaderTester::AutoList;
-using AutoTaggedTuple = BinTokenReaderTester::AutoTaggedTuple;
-using AutoTuple = BinTokenReaderTester::AutoTuple;
-using BinFields = BinTokenReaderTester::BinFields;
-using Chars = BinTokenReaderTester::Chars;
-using NameBag = GCHashSet<JSString*>;
-using Names = GCVector<JSString*, 8>;
-using UsedNamePtr = UsedNameTracker::UsedNameMap::Ptr;
-
-namespace {
-    // Compare a bunch of `uint8_t` values (as returned by the tokenizer_) with
-    // a string literal (and ONLY a string literal).
-    template<size_t N>
-    bool operator==(const Chars& left, const char (&right)[N]) {
-        return BinTokenReaderTester::equals(left, right);
-    }
-
-    bool isMethod(BinKind kind) {
-        switch (kind) {
-          case BinKind::ObjectMethod:
-          case BinKind::ObjectGetter:
-          case BinKind::ObjectSetter:
-            return true;
-          default:
-            return false;
-        }
-    }
-
-#if defined(DEBUG)
-    bool isMethodOrFunction(BinKind kind) {
-        if (isMethod(kind))
-            return true;
-        if (kind == BinKind::FunctionExpression || kind == BinKind::FunctionDeclaration)
-            return true;
-        return false;
-    }
-#endif // defined(DEBUG)
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parse(const Vector<uint8_t>& data)
-{
-    return parse(data.begin(), data.length());
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parse(const uint8_t* start, const size_t length)
-{
-    auto result = parseAux(start, length);
-    poison(); // Make sure that the parser is never used again accidentally.
-    return result;
-}
-
-
-JS::Result<ParseNode*>
-BinASTParser::parseAux(const uint8_t* start, const size_t length)
-{
-    tokenizer_.emplace(cx_, start, length);
-
-    Directives directives(options().strictOption);
-    GlobalSharedContext globalsc(cx_, ScopeKind::Global,
-                                 directives, options().extraWarningsOption);
-    BinParseContext globalpc(cx_, this, &globalsc, /* newDirectives = */ nullptr);
-    if (!globalpc.init())
-        return cx_->alreadyReportedError();
-
-    ParseContext::VarScope varScope(cx_, &globalpc, usedNames_);
-    if (!varScope.init(&globalpc))
-        return cx_->alreadyReportedError();
-
-    ParseNode* result(nullptr);
-    MOZ_TRY_VAR(result, parseProgram());
-
-    Maybe<GlobalScope::Data*> bindings = NewGlobalScopeData(cx_, varScope, alloc_, parseContext_);
-    if (!bindings)
-        return cx_->alreadyReportedError();
-    globalsc.bindings = *bindings;
-
-    return result; // Magic conversion to Ok.
-}
-
-Result<ParseNode*>
-BinASTParser::parseProgram()
-{
-    BinKind kind;
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    if (kind != BinKind::Program)
-        return this->raiseInvalidKind("Program", kind);
-
-    ParseNode* result;
-    MOZ_TRY_VAR(result, parseBlockStatementAux(kind, fields));
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseBlockStatement()
-{
-    BinKind kind;
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    ParseNode* result(nullptr);
-    switch (kind) {
-      default:
-        return raiseInvalidKind("BlockStatement", kind);
-      case BinKind::BlockStatement:
-        MOZ_TRY_VAR(result, parseBlockStatementAux(kind, fields));
-        break;
-    }
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<Ok>
-BinASTParser::parseAndUpdateScopeNames(ParseContext::Scope& scope, DeclarationKind kind)
-{
-    AutoList guard(*tokenizer_);
-    uint32_t length = 0;
-
-    TRY(tokenizer_->enterList(length, guard));
-    RootedAtom name(cx_);
-    for (uint32_t i = 0; i < length; ++i) {
-        name = nullptr;
-
-        MOZ_TRY(readString(&name));
-        auto ptr = scope.lookupDeclaredNameForAdd(name);
-        if (ptr) {
-            if (kind == DeclarationKind::Let || kind == DeclarationKind::Const)
-                return raiseError("Variable redeclaration");
-
-#if defined(DEBUG)
-            // FIXME: Fix binjs-ref.
-            fprintf(stderr, "Weird: `var` redeclaration. Check encoder: ");
-            name->dump();
-            fprintf(stderr, "\n");
-#endif // defined(DEBUG)
-            continue;
-        }
-
-        TRY(scope.addDeclaredName(parseContext_, ptr, name.get(), kind, tokenizer_->offset()));
-    }
-    TRY(guard.done());
-    return Ok();
-}
-
-JS::Result<Ok>
-BinASTParser::parseAndUpdateCurrentScope()
-{
-    return parseAndUpdateScope(parseContext_->varScope(), *parseContext_->innermostScope());
-}
-
-JS::Result<Ok>
-BinASTParser::parseAndUpdateScope(ParseContext::Scope& varScope, ParseContext::Scope& letScope)
-{
-    BinKind kind;
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    switch (kind) {
-      default:
-        return raiseInvalidKind("Scope", kind);
-      case BinKind::BINJS_Scope:
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::BINJS_HasDirectEval:
-                MOZ_TRY(readBool()); // Currently ignored.
-                break;
-              case BinField::BINJS_LetDeclaredNames:
-                MOZ_TRY(parseAndUpdateScopeNames(letScope, DeclarationKind::Let));
-                break;
-              case BinField::BINJS_ConstDeclaredNames:
-                MOZ_TRY(parseAndUpdateScopeNames(letScope, DeclarationKind::Const));
-                break;
-              case BinField::BINJS_VarDeclaredNames:
-                MOZ_TRY(parseAndUpdateScopeNames(varScope, DeclarationKind::Var));
-                break;
-              case BinField::BINJS_CapturedNames: {
-                Rooted<Maybe<Names>> names(cx_); //FIXME: Currently ignored.
-                MOZ_TRY(parseStringList(&names));
-                break;
-              }
-              default:
-                return raiseInvalidField("Scope", field);
-            }
-        }
-        break;
-    }
-
-    TRY(guard.done());
-    return Ok();
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseBlockStatementAux(const BinKind kind, const BinFields& fields)
-{
-    ParseContext::Statement stmt(parseContext_, StatementKind::Block);
-    ParseContext::Scope scope(cx_, parseContext_, usedNames_);
-    TRY(scope.init(parseContext_));
-
-    ParseNode* body(nullptr);
-    ParseNode* directives(nullptr); // FIXME: Largely ignored
-
-    for (auto field : fields) {
-        switch (field) {
-          case BinField::BINJS_Scope:
-            MOZ_TRY(parseAndUpdateCurrentScope());
-            break;
-          case BinField::Body:
-            MOZ_TRY_VAR(body, parseStatementList());
-            break;
-          case BinField::Directives:
-            if (kind != BinKind::Program)
-                return raiseInvalidField("BlockStatement", field);
-            MOZ_TRY_VAR(directives, parseDirectiveList());
-            break;
-          default:
-            return raiseInvalidField("BlockStatement", field);
-        }
-    }
-
-    // In case of absent optional fields, inject default values.
-    if (!body)
-        body = factory_.newStatementList(tokenizer_->pos());
-
-    MOZ_TRY_VAR(body, appendDirectivesToBody(body, directives));
-
-    ParseNode* result;
-    if (kind == BinKind::Program) {
-        result = body;
-    } else {
-        TRY_DECL(bindings, NewLexicalScopeData(cx_, scope, alloc_, parseContext_));
-        TRY_VAR(result, factory_.newLexicalScope(*bindings, body));
-    }
-
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::appendDirectivesToBody(ParseNode* body, ParseNode* directives)
-{
-    ParseNode* result = body;
-    if (directives && directives->pn_count >= 1) {
-        MOZ_ASSERT(directives->isArity(PN_LIST));
-
-        // Convert directive list to a list of strings.
-        TRY_DECL(prefix, factory_.newStatementList(directives->pn_head->pn_pos));
-        for (ParseNode* iter = directives->pn_head; iter != nullptr; iter = iter->pn_next) {
-            TRY_DECL(statement, factory_.newExprStatement(iter, iter->pn_pos.end));
-            prefix->appendWithoutOrderAssumption(statement);
-        }
-
-        // Prepend to the body.
-        ParseNode* iter = body->pn_head;
-        while (iter) {
-            ParseNode* next = iter->pn_next;
-            prefix->appendWithoutOrderAssumption(iter);
-            iter = next;
-        }
-        prefix->setKind(body->getKind());
-        prefix->setOp(body->getOp());
-        result = prefix;
-#if defined(DEBUG)
-        result->checkListConsistency();
-#endif // defined(DEBUG)
-    }
-
-    return result;
-}
-
-JS::Result<Ok>
-BinASTParser::parseStringList(MutableHandle<Maybe<Names>> out)
-{
-    MOZ_ASSERT(out.get().isNothing()); // Sanity check: the node must not have been parsed yet.
-
-    uint32_t length;
-    AutoList guard(*tokenizer_);
-
-    Names result(cx_);
-
-    TRY(tokenizer_->enterList(length, guard));
-    if (!result.reserve(length))
-        return raiseOOM();
-
-    RootedAtom string(cx_);
-    for (uint32_t i = 0; i < length; ++i) {
-        string = nullptr;
-
-        MOZ_TRY(readString(&string));
-        result.infallibleAppend(Move(string)); // Checked in the call to `reserve`.
-    }
-
-    TRY(guard.done());
-    out.set(Move(Some(Move(result))));
-    return Ok();
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseStatementList()
-{
-    uint32_t length;
-    AutoList guard(*tokenizer_);
-
-    TRY_DECL(result, factory_.newStatementList(tokenizer_->pos()));
-
-    TRY(tokenizer_->enterList(length, guard));
-    for (uint32_t i = 0; i < length; ++i) {
-        BinKind kind;
-        BinFields fields(cx_);
-        AutoTaggedTuple guard(*tokenizer_);
-
-        ParseNode* statement(nullptr);
-
-        TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-        switch (kind) {
-          case BinKind::FunctionDeclaration:
-            MOZ_TRY_VAR(statement, parseFunctionAux(kind, fields));
-            break;
-          default:
-            MOZ_TRY_VAR(statement, parseStatementAux(kind, fields));
-            break;
-        }
-
-        TRY(guard.done());
-        result->appendWithoutOrderAssumption(statement);
-    }
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseStatement()
-{
-    BinKind kind;
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    ParseNode* result;
-    MOZ_TRY_VAR(result, parseStatementAux(kind, fields));
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseStatementAux(const BinKind kind, const BinFields& fields)
-{
-    const size_t start = tokenizer_->offset();
-
-    ParseNode* result(nullptr);
-    switch (kind) {
-      case BinKind::EmptyStatement: {
-        TRY_VAR(result, factory_.newEmptyStatement(tokenizer_->pos(start)));
-        break;
-      }
-      case BinKind::BlockStatement:
-        MOZ_TRY_VAR(result, parseBlockStatementAux(kind, fields));
-        break;
-      case BinKind::ExpressionStatement:
-        MOZ_TRY_VAR(result, parseExpressionStatementAux(kind, fields));
-        break;
-      case BinKind::DebuggerStatement: {
-        TRY_VAR(result, factory_.newDebuggerStatement(tokenizer_->pos(start)));
-        break;
-      }
-      case BinKind::WithStatement: {
-        ParseNode* body(nullptr);
-        ParseNode* expr(nullptr);
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Body:
-                MOZ_TRY_VAR(body, parseStatement());
-                break;
-              case BinField::Object:
-                MOZ_TRY_VAR(expr, parseExpression());
-                break;
-              default:
-                return raiseInvalidField("WithStatement", field);
-            }
-        }
-
-        if (!body)
-            return raiseMissingField("WithStatement", BinField::Body);
-        if (!expr)
-            return raiseMissingField("WithStatement", BinField::Object);
-
-        TRY_VAR(result, factory_.newWithStatement(start, expr, body));
-
-        break;
-      }
-      case BinKind::ReturnStatement: {
-        if (!parseContext_->isFunctionBox()) {
-            // Return statements are permitted only inside functions.
-            return raiseInvalidKind("Toplevel Statement", kind);
-        }
-        parseContext_->functionBox()->usesReturn = true;
-
-        ParseNode* arg(nullptr);
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Argument:
-                MOZ_TRY_VAR(arg, parseExpression());
-                break;
-              default:
-                return raiseInvalidField("ReturnStatement", field);
-            }
-        }
-
-        TRY_VAR(result, factory_.newReturnStatement(arg, tokenizer_->pos(start)));
-
-        break;
-      }
-      case BinKind::LabeledStatement: {
-        // We check for the existence of the jump target when parsing `break label;` or `continue label;`.
-        ParseContext::Statement stmt(parseContext_, StatementKind::Label);
-        ParseNode* label(nullptr);
-        ParseNode* body(nullptr);
-
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Label:
-                MOZ_TRY_VAR(label, parseIdentifier());
-                break;
-              case BinField::Body: {
-                if (!label)  // By order of fields, `label` MUST always be before `body` in the file.
-                    return raiseMissingField("LabeledStatement", BinField::Label);
-                MOZ_ASSERT(label->name());
-                ParseContext::LabelStatement stmt(parseContext_, label->name());
-                MOZ_TRY_VAR(body, parseStatement());
-                break;
-              }
-              default:
-                return raiseInvalidField("LabeledStatement", field);
-            }
-        }
-
-        if (!label)
-            return raiseMissingField("LabeledStatement", BinField::Label);
-        if (!body)
-            return raiseMissingField("LabeledStatement", BinField::Body);
-
-        TRY_VAR(result, factory_.newLabeledStatement(label->name(), body, start));
-
-        break;
-      }
-
-      case BinKind::BreakStatement:
-      case BinKind::ContinueStatement:
-        MOZ_TRY_VAR(result, parseBreakOrContinueStatementAux(kind, fields));
-        break;
-
-      case BinKind::IfStatement: {
-        ParseContext::Statement stmt(parseContext_, StatementKind::If);
-
-        ParseNode* test(nullptr);
-        ParseNode* consequent(nullptr);
-        ParseNode* alternate(nullptr); // Optional
-
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Test:
-                MOZ_TRY_VAR(test, parseExpression());
-                break;
-              case BinField::Consequent:
-                MOZ_TRY_VAR(consequent, parseStatement());
-                break;
-              case BinField::Alternate:
-                MOZ_TRY_VAR(alternate, parseStatement());
-                break;
-              default:
-                return raiseInvalidField("IfStatement", field);
-            }
-        }
-
-        if (!test)
-            return raiseMissingField("IfStatement", BinField::Test);
-        if (!consequent)
-            return raiseMissingField("IfStatement", BinField::Consequent);
-
-        TRY_VAR(result, factory_.newIfStatement(start, test, consequent, alternate));
-
-        break;
-      }
-      case BinKind::SwitchStatement: {
-        ParseContext::Statement stmt(parseContext_, StatementKind::Switch);
-        ParseNode* discriminant(nullptr);
-        ParseNode* cases(nullptr);
-
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Discriminant: {
-                MOZ_TRY_VAR(discriminant, parseExpression());
-                break;
-              }
-              case BinField::Cases: {
-                MOZ_TRY_VAR(cases, parseSwitchCaseList());
-                break;
-              }
-              default:
-                return raiseInvalidField("SwitchStatement", field);
-            }
-        }
-
-        if (!discriminant)
-            return raiseMissingField("SwitchStatement", BinField::Discriminant);
-        if (!cases) {
-            TRY_VAR(cases, factory_.newStatementList(tokenizer_->pos()));
-
-            TRY_VAR(cases, factory_.newLexicalScope(nullptr, cases));
-        }
-
-        TRY_VAR(result, factory_.newSwitchStatement(start, discriminant, cases));
-
-        break;
-      }
-
-      case BinKind::ThrowStatement: {
-        ParseNode* arg(nullptr);
-        for (auto field : fields) {
-            if (field != BinField::Argument)
-                return raiseInvalidField("ThrowStatement", field);
-
-            MOZ_TRY_VAR(arg, parseExpression());
-        }
-
-        if (!arg)
-            return raiseMissingField("ThrowStatement", BinField::Argument);
-
-        TRY_VAR(result, factory_.newThrowStatement(arg, tokenizer_->pos(start)));
-
-        break;
-      }
-
-      case BinKind::TryStatement: {
-        ParseNode* block(nullptr);
-        ParseNode* handler(nullptr);
-        ParseNode* finalizer(nullptr);
-
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Block: {
-                ParseContext::Statement stmt(parseContext_, StatementKind::Try);
-                ParseContext::Scope scope(cx_, parseContext_, usedNames_);
-                TRY(scope.init(parseContext_));
-                MOZ_TRY_VAR(block, parseBlockStatement());
-                break;
-              }
-              case BinField::Handler:
-                MOZ_TRY_VAR(handler, parseCatchClause());
-                break;
-
-              case BinField::Finalizer: {
-                ParseContext::Statement stmt(parseContext_, StatementKind::Finally);
-                ParseContext::Scope scope(cx_, parseContext_, usedNames_);
-                TRY(scope.init(parseContext_));
-                MOZ_TRY_VAR(finalizer, parseBlockStatement());
-                break;
-              }
-
-              default:
-                return raiseInvalidField("TryStatement", field);
-            }
-        }
-
-        if (!block)
-            return raiseMissingField("TryStatement", BinField::Handler);
-        if (!handler && !finalizer)
-            return raiseMissingField("TryStatement (without catch)", BinField::Finalizer);
-
-        TRY_VAR(result, factory_.newTryStatement(start, block, handler, finalizer));
-        break;
-      }
-
-      case BinKind::WhileStatement:
-      case BinKind::DoWhileStatement: {
-        ParseContext::Statement stmt(parseContext_, kind == BinKind::WhileStatement ? StatementKind::WhileLoop : StatementKind::DoLoop);
-        ParseNode* test(nullptr);
-        ParseNode* body(nullptr);
-
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Test:
-                MOZ_TRY_VAR(test, parseExpression());
-                break;
-              case BinField::Body:
-                MOZ_TRY_VAR(body, parseStatement());
-                break;
-              default:
-                return raiseInvalidField("WhileStatement | DoWhileStatement", field);
-            }
-        }
-
-        if (!test)
-            return raiseMissingField("WhileStatement | DoWhileStatement", BinField::Test);
-        if (!body)
-            return raiseMissingField("WhileStatement | DoWhileStatement", BinField::Body);
-
-        if (kind == BinKind::WhileStatement)
-            TRY_VAR(result, factory_.newWhileStatement(start, test, body));
-        else
-            TRY_VAR(result, factory_.newDoWhileStatement(body, test, tokenizer_->pos(start)));
-
-        break;
-      }
-      case BinKind::ForStatement: {
-        ParseContext::Statement stmt(parseContext_, StatementKind::ForLoop);
-
-        // Implicit scope around the `for`, used to store `for (let x; ...; ...)`
-        // or `for (const x; ...; ...)`-style declarations. Detail on the
-        // declaration is stored as part of `BINJS_Scope`.
-        ParseContext::Scope scope(cx_, parseContext_, usedNames_);
-        TRY(scope.init(parseContext_));
-        ParseNode* init(nullptr); // Optional
-        ParseNode* test(nullptr); // Optional
-        ParseNode* update(nullptr); // Optional
-        ParseNode* body(nullptr); // Required
-
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Init:
-                MOZ_TRY_VAR(init, parseForInit());
-                break;
-              case BinField::Test:
-                MOZ_TRY_VAR(test, parseExpression());
-                break;
-              case BinField::Update:
-                MOZ_TRY_VAR(update, parseExpression());
-                break;
-              case BinField::BINJS_Scope: // The scope always appears before the body.
-                MOZ_TRY(parseAndUpdateCurrentScope());
-                break;
-              case BinField::Body:
-                MOZ_TRY_VAR(body, parseStatement());
-                break;
-              default:
-                return raiseInvalidField("ForStatement", field);
-            }
-        }
-
-        if (!body)
-            return raiseMissingField("ForStatement", BinField::Body);
-
-        TRY_DECL(forHead, factory_.newForHead(init, test, update, tokenizer_->pos(start)));
-        TRY_VAR(result, factory_.newForStatement(start, forHead, body, /* iflags = */ 0));
-
-        if (!scope.isEmpty()) {
-            TRY_DECL(bindings, NewLexicalScopeData(cx_, scope, alloc_, parseContext_));
-            TRY_VAR(result, factory_.newLexicalScope(*bindings, result));
-        }
-
-        break;
-      }
-      case BinKind::ForInStatement: {
-        ParseContext::Statement stmt(parseContext_, StatementKind::ForInLoop);
-
-        // Implicit scope around the `for`, used to store `for (let x in  ...)`
-        // or `for (const x in ...)`-style declarations. Detail on the
-        // declaration is stored as part of `BINJS_Scope`.
-        ParseContext::Scope scope(cx_, parseContext_, usedNames_);
-        TRY(scope.init(parseContext_));
-        ParseNode* left(nullptr);
-        ParseNode* right(nullptr);
-        ParseNode* body(nullptr);
-
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Left:
-                MOZ_TRY_VAR(left, parseForInInit());
-                break;
-              case BinField::Right:
-                MOZ_TRY_VAR(right, parseExpression());
-                break;
-              case BinField::Body:
-                MOZ_TRY_VAR(body, parseStatement());
-                break;
-              case BinField::BINJS_Scope:
-                MOZ_TRY(parseAndUpdateCurrentScope());
-                break;
-              default:
-                return raiseInvalidField("ForInStatement", field);
-            }
-        }
-
-        if (!left)
-            return raiseMissingField("ForInStatement", BinField::Left);
-        if (!right)
-            return raiseMissingField("ForInStatement", BinField::Right);
-        if (!body)
-            return raiseMissingField("ForInStatement", BinField::Body);
-
-        TRY_DECL(forHead, factory_.newForInOrOfHead(PNK_FORIN, left, right, tokenizer_->pos(start)));
-        TRY_VAR(result, factory_.newForStatement(start, forHead, body, /*flags*/ 0));
-
-        if (!scope.isEmpty()) {
-            TRY_DECL(bindings, NewLexicalScopeData(cx_, scope, alloc_, parseContext_));
-            TRY_VAR(result, factory_.newLexicalScope(*bindings, result));
-        }
-        break;
-      }
-
-      case BinKind::VariableDeclaration:
-        MOZ_TRY_VAR(result, parseVariableDeclarationAux(kind, fields));
-        break;
-
-      default:
-        return raiseInvalidKind("Statement", kind);
-    }
-
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseBreakOrContinueStatementAux(const BinKind kind, const BinFields& fields)
-{
-    const auto start = tokenizer_->offset();
-    ParseNode* label(nullptr);
-
-    for (auto field : fields) {
-        switch (field) {
-          case BinField::Label:
-            MOZ_TRY_VAR(label, parsePattern());
-
-            if (label && !label->isKind(PNK_NAME))
-                return raiseError("ContinueStatement | BreakStatement - Label MUST be an identifier"); // FIXME: This should be changed in the grammar.
-
-            break;
-          default:
-            return raiseInvalidField("ContinueStatement", field);
-        }
-    }
-
-    TokenPos pos = tokenizer_->pos(start);
-    ParseNode* result;
-    if (kind == BinKind::ContinueStatement) {
-#if 0 // FIXME: We probably need to fix the AST before making this check.
-        auto validity = parseContext_->checkContinueStatement(label ? label->name() : nullptr);
-        if (validity.isErr()) {
-            switch (validity.unwrapErr()) {
-              case ParseContext::ContinueStatementError::NotInALoop:
-                return raiseError(kind, "Not in a loop");
-              case ParseContext::ContinueStatementError::LabelNotFound:
-                return raiseError(kind, "Label not found");
-            }
-        }
-#endif // 0
-        // Ok, this is a valid continue statement.
-        TRY_VAR(result, factory_.newContinueStatement(label ? label->name() : nullptr, pos));
-    } else {
-#if 0 // FIXME: We probably need to fix the AST before making this check.
-        auto validity = parseContext_->checkBreakStatement(label ? label->name() : nullptr);
-        if (validity.isErr()) {
-            switch (validity.unwrapErr()) {
-              case ParseContext::BreakStatementError::ToughBreak:
-                 return raiseError(kind, "Not in a loop");
-              case ParseContext::BreakStatementError::LabelNotFound:
-                 return raiseError(kind, "Label not found");
-            }
-        }
-#endif // 0
-        // Ok, this is a valid break statement.
-        TRY_VAR(result, factory_.newBreakStatement(label ? label->name() : nullptr, pos));
-    }
-
-    MOZ_ASSERT(result);
-
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseForInit()
-{
-    // This can be either a VarDecl or an Expression.
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-    BinKind kind;
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    ParseNode* result(nullptr);
-
-    switch (kind) {
-      case BinKind::VariableDeclaration:
-        MOZ_TRY_VAR(result, parseVariableDeclarationAux(kind, fields));
-        break;
-      default:
-        // Parse as expression
-        MOZ_TRY_VAR(result, parseExpressionAux(kind, fields));
-        break;
-    }
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseForInInit()
-{
-    // This can be either a VarDecl or a Pattern.
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-    BinKind kind;
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    ParseNode* result(nullptr);
-
-    switch (kind) {
-      case BinKind::VariableDeclaration:
-        MOZ_TRY_VAR(result, parseVariableDeclarationAux(kind, fields));
-        break;
-      default:
-        // Parse as expression. Not a joke: http://www.ecma-international.org/ecma-262/5.1/index.html#sec-12.6.4 .
-        MOZ_TRY_VAR(result, parseExpressionAux(kind, fields));
-        break;
-    }
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseFunctionAux(const BinKind kind, const BinFields& fields)
-{
-    MOZ_ASSERT(isMethodOrFunction(kind));
-
-    const size_t start = tokenizer_->offset();
-
-    ParseNode* id(nullptr);
-    ParseNode* params(nullptr);
-    ParseNode* body(nullptr);
-    ParseNode* directives(nullptr); // Largely ignored for the moment.
-    ParseNode* key(nullptr);  // Methods only
-
-    // Allocate the function before walking down the tree.
-    RootedFunction fun(cx_);
-    TRY_VAR(fun, NewFunctionWithProto(cx_,
-            /*native*/nullptr,
-            /*nargs ?*/0,
-            /*flags */ JSFunction::INTERPRETED_NORMAL,
-            /*enclosing env*/nullptr,
-            /*name*/ nullptr, // Will be known later
-            /*proto*/ nullptr,
-            /*alloc*/gc::AllocKind::FUNCTION,
-            TenuredObject
-    ));
-    TRY_DECL(funbox, alloc_.new_<FunctionBox>(cx_,
-        alloc_,
-        traceListHead_,
-        fun,
-        /*toStringStart*/0,
-        /*Directives*/Directives(parseContext_),
-        /*extraWarning*/false,
-        GeneratorKind::NotGenerator,
-        FunctionAsyncKind::SyncFunction
-    ));
-
-    traceListHead_ = funbox;
-
-    FunctionSyntaxKind syntax;
-    switch (kind) {
-      case BinKind::FunctionDeclaration:
-        syntax = Statement;
-        break;
-      case BinKind::FunctionExpression:
-        syntax = PrimaryExpression; // FIXME: Probably doesn't work.
-        break;
-      case BinKind::ObjectMethod:
-        syntax = Method;
-        break;
-      case BinKind::ObjectGetter:
-        syntax = Getter;
-        break;
-      case BinKind::ObjectSetter:
-        syntax = Setter;
-        break;
-      default:
-        MOZ_CRASH("Invalid FunctionSyntaxKind"); // Checked above.
-    }
-    funbox->initWithEnclosingParseContext(parseContext_, syntax);
-
-    // Container scopes.
-    ParseContext::Scope& varScope = parseContext_->varScope();
-    ParseContext::Scope* letScope = parseContext_->innermostScope();
-
-    // Push a new ParseContext.
-    BinParseContext funpc(cx_, this, funbox, /* newDirectives = */ nullptr);
-    TRY(funpc.init());
-    parseContext_->functionScope().useAsVarScope(parseContext_);
-    MOZ_ASSERT(parseContext_->isFunctionBox());
-
-    for (auto field : fields) {
-        switch (field) {
-          case BinField::Id:
-            MOZ_TRY_VAR(id, parseIdentifier());
-            break;
-          case BinField::Params:
-            MOZ_TRY_VAR(params, parseArgumentList());
-            break;
-          case BinField::BINJS_Scope:
-            // This scope information affects the scopes contained in the function body. MUST appear before the `body`.
-            MOZ_TRY(parseAndUpdateScope(varScope, *letScope));
-            break;
-          case BinField::Directives:
-            MOZ_TRY_VAR(directives, parseDirectiveList());
-            break;
-          case BinField::Body:
-            MOZ_TRY_VAR(body, parseBlockStatement());
-            break;
-          case BinField::Key:
-            if (!isMethod(kind))
-                return raiseInvalidField("Functions (unless defined as methods)", field);
-
-            MOZ_TRY_VAR(key, parseObjectPropertyName());
-            break;
-          default:
-            return raiseInvalidField("Function", field);
-        }
-    }
-
-    // Inject default values for absent fields.
-    if (!params)
-        TRY_VAR(params, new_<ListNode>(PNK_PARAMSBODY, tokenizer_->pos()));
-
-    if (!body)
-        TRY_VAR(body, factory_.newStatementList(tokenizer_->pos()));
-
-    if (kind == BinKind::FunctionDeclaration && !id) {
-        // The name is compulsory only for function declarations.
-        return raiseMissingField("FunctionDeclaration", BinField::Id);
-    }
-
-    // Reject if required values are missing.
-    if (isMethod(kind) && !key)
-        return raiseMissingField("method", BinField::Key);
-
-    if (id)
-        fun->initAtom(id->pn_atom);
-
-    MOZ_ASSERT(params->isArity(PN_LIST));
-
-    if (!(body->isKind(PNK_LEXICALSCOPE) && body->pn_u.scope.body->isKind(PNK_STATEMENTLIST))) {
-        // Promote to lexical scope + statement list.
-        if (!body->isKind(PNK_STATEMENTLIST)) {
-            TRY_DECL(list, factory_.newStatementList(tokenizer_->pos(start)));
-
-            list->initList(body);
-            body = list;
-        }
-
-        // Promote to lexical scope.
-        TRY_VAR(body, factory_.newLexicalScope(nullptr, body));
-    }
-    MOZ_ASSERT(body->isKind(PNK_LEXICALSCOPE));
-
-    MOZ_TRY_VAR(body, appendDirectivesToBody(body, directives));
-
-    params->appendWithoutOrderAssumption(body);
-
-    TokenPos pos = tokenizer_->pos(start);
-    TRY_DECL(function, kind == BinKind::FunctionDeclaration
-                       ? factory_.newFunctionStatement(pos)
-                       : factory_.newFunctionExpression(pos));
-
-    factory_.setFunctionBox(function, funbox);
-    factory_.setFunctionFormalParametersAndBody(function, params);
-
-    ParseNode* result;
-    if (kind == BinKind::ObjectMethod)
-        TRY_VAR(result, factory_.newObjectMethodOrPropertyDefinition(key, function, AccessorType::None));
-    else if (kind == BinKind::ObjectGetter)
-        TRY_VAR(result, factory_.newObjectMethodOrPropertyDefinition(key, function, AccessorType::Getter));
-    else if (kind == BinKind::ObjectSetter)
-        TRY_VAR(result, factory_.newObjectMethodOrPropertyDefinition(key, function, AccessorType::Setter));
-    else
-        result = function;
-
-    // Now handle bindings.
-    HandlePropertyName dotThis = cx_->names().dotThis;
-    const bool declareThis = hasUsedName(dotThis) || funbox->bindingsAccessedDynamically() || funbox->isDerivedClassConstructor();
-
-    if (declareThis) {
-        ParseContext::Scope& funScope = parseContext_->functionScope();
-        ParseContext::Scope::AddDeclaredNamePtr p = funScope.lookupDeclaredNameForAdd(dotThis);
-        MOZ_ASSERT(!p);
-        TRY(funScope.addDeclaredName(parseContext_, p, dotThis, DeclarationKind::Var,
-                                      DeclaredNameInfo::npos));
-        funbox->setHasThisBinding();
-    }
-
-    TRY_DECL(bindings,
-             NewFunctionScopeData(cx_, parseContext_->functionScope(),
-                                  /* hasParameterExprs = */false, alloc_, parseContext_));
-
-    funbox->functionScopeBindings().set(*bindings);
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseObjectPropertyName()
-{
-    auto start = tokenizer_->offset();
-
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-    BinKind kind;
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    ParseNode* result;
-    switch (kind) {
-      case BinKind::StringLiteral: {
-        ParseNode* string;
-        MOZ_TRY_VAR(string, parseStringLiteralAux(kind, fields));
-        uint32_t index;
-        if (string->pn_atom->isIndex(&index))
-            TRY_VAR(result, factory_.newNumber(index, NoDecimal, TokenPos(start, tokenizer_->offset())));
-        else
-            result = string;
-
-        break;
-      }
-      case BinKind::NumericLiteral:
-        MOZ_TRY_VAR(result, parseNumericLiteralAux(kind, fields));
-        break;
-      case BinKind::Identifier:
-        MOZ_TRY_VAR(result, parseIdentifierAux(kind, fields, /* expectObjectPropertyName = */ true));
-        break;
-      case BinKind::ComputedPropertyName: {
-        ParseNode* expr;
-        MOZ_TRY_VAR(expr, parseExpressionAux(kind, fields));
-        TRY_VAR(result, factory_.newComputedName(expr, start, tokenizer_->offset()));
-        break;
-      }
-      default:
-        return raiseInvalidKind("ObjectLiteralPropertyName", kind);
-    }
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseVariableDeclarationAux(const BinKind kind, const BinFields& fields)
-{
-    const size_t start = tokenizer_->offset();
-
-    ParseNode* result(nullptr);
-    switch (kind) {
-      default:
-        return raiseInvalidKind("VariableDeclaration", kind);
-      case BinKind::VariableDeclaration:
-        ParseNodeKind pnk = PNK_LIMIT;
-
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Kind: {
-                Maybe<Chars> kindName;
-                MOZ_TRY(readString(kindName));
-
-                if (*kindName == "let")
-                    pnk = PNK_LET;
-                else if (*kindName == "var")
-                    pnk = PNK_VAR;
-                else if (*kindName == "const")
-                    pnk = PNK_CONST;
-                else
-                    return raiseInvalidEnum("VariableDeclaration", *kindName);
-
-                break;
-              }
-              case BinField::Declarations: {
-                uint32_t length;
-                AutoList guard(*tokenizer_);
-
-                TRY(tokenizer_->enterList(length, guard));
-                TRY_VAR(result, factory_.newDeclarationList(PNK_CONST /*Placeholder*/, tokenizer_->pos(start)));
-
-                for (uint32_t i = 0; i < length; ++i) {
-                    ParseNode* current;
-                    MOZ_TRY_VAR(current, parseVariableDeclarator());
-                    MOZ_ASSERT(current);
-
-                    result->appendWithoutOrderAssumption(current);
-                }
-
-                TRY(guard.done());
-                break;
-              }
-              default:
-                return raiseInvalidField("VariableDeclaration", field);
-            }
-        }
-
-        if (!result || pnk == PNK_LIMIT)
-            return raiseMissingField("VariableDeclaration", BinField::Declarations);
-
-        result->setKind(pnk);
-
-        MOZ_ASSERT(!result->isKind(PNK_NOP));
-    }
-
-    return result;
-}
-
-
-JS::Result<ParseNode*>
-BinASTParser::parseExpressionStatementAux(const BinKind kind, const BinFields& fields)
-{
-    MOZ_ASSERT(kind == BinKind::ExpressionStatement);
-
-    ParseNode* expr(nullptr);
-    for (auto field : fields) {
-        switch (field) {
-          case BinField::Expression:
-            MOZ_TRY_VAR(expr, parseExpression());
-
-            break;
-          default:
-            return raiseInvalidField("ExpressionStatement", field);
-        }
-    }
-
-    if (!expr)
-        return raiseMissingField("ExpressionStatement", BinField::Expression);
-
-    TRY_DECL(result, factory_.newExprStatement(expr, tokenizer_->offset()));
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseVariableDeclarator()
-{
-    const size_t start = tokenizer_->offset();
-
-    BinKind kind;
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    if (kind != BinKind::VariableDeclarator)
-        return raiseInvalidKind("VariableDeclarator", kind);
-
-    ParseNode* id(nullptr);
-    ParseNode* init(nullptr); // Optional.
-    for (auto field : fields) {
-        switch (field) {
-          case BinField::Id:
-            MOZ_TRY_VAR(id, parsePattern());
-
-            break;
-          case BinField::Init:
-            MOZ_TRY_VAR(init, parseExpression());
-
-            break;
-          default:
-            return raiseInvalidField("VariableDeclarator", field);
-        }
-    }
-
-    TRY(guard.done());
-    if (!id)
-        return raiseMissingField("VariableDeclarator", BinField::Id);
-
-    ParseNode* result(nullptr);
-
-    // FIXME: Documentation in ParseNode is clearly obsolete.
-    if (id->isKind(PNK_NAME)) {
-        // `var foo [= bar]``
-        TRY_VAR(result, factory_.newName(id->pn_atom->asPropertyName(), tokenizer_->pos(start), cx_));
-
-        if (init)
-            result->pn_expr = init;
-
-    } else {
-        // `var pattern = bar`
-        if (!init) {
-            // Here, `init` is required.
-            return raiseMissingField("VariableDeclarator (with non-trivial pattern)", BinField::Init);
-        }
-
-        TRY_VAR(result, factory_.newAssignment(PNK_ASSIGN, id, init));
-    }
-
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseExpressionList(bool acceptElisions)
-{
-    const size_t start = tokenizer_->offset();
-
-    uint32_t length;
-    AutoList guard(*tokenizer_);
-
-    TRY(tokenizer_->enterList(length, guard));
-    TRY_DECL(result, factory_.newArrayLiteral(start));
-
-    for (uint32_t i = 0; i < length; ++i) {
-        BinFields fields(cx_);
-        AutoTaggedTuple guard(*tokenizer_);
-        BinKind kind;
-
-        TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-        switch (kind) {
-          case BinKind::Elision: {
-            if (!acceptElisions)
-                return raiseInvalidKind("[Expression]", kind);
-
-            MOZ_TRY(parseElisionAux(kind, fields));
-            TRY(!factory_.addElision(result, tokenizer_->pos(start)));
-            break;
-          }
-          default: {
-            ParseNode* expr(nullptr);
-            MOZ_TRY_VAR(expr, parseExpressionAux(kind, fields));
-
-            MOZ_ASSERT(expr);
-            factory_.addArrayElement(result, expr);
-          }
-        }
-
-        TRY(guard.done());
-    }
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<Ok>
-BinASTParser::parseElisionAux(const BinKind kind, const BinFields& fields)
-{
-    MOZ_ASSERT(kind == BinKind::Elision);
-    MOZ_TRY(checkEmptyTuple(kind, fields));
-
-    return Ok();
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseSwitchCaseList()
-{
-    uint32_t length;
-    AutoList guard(*tokenizer_);
-
-    TRY(tokenizer_->enterList(length, guard));
-    TRY_DECL(list, factory_.newStatementList(tokenizer_->pos()));
-
-    // Set to `true` once we have encountered a `default:` case.
-    // Two `default:` cases is an error.
-    bool haveDefault = false;
-
-    for (uint32_t i = 0; i < length; ++i) {
-        ParseNode* caseNode(nullptr);
-        MOZ_TRY_VAR(caseNode, parseSwitchCase());
-        MOZ_ASSERT(caseNode);
-
-        if (caseNode->pn_left == nullptr) {
-            // Ah, seems that we have encountered a default case.
-            if (haveDefault) {
-                // Oh, wait, two defaults? That's an error.
-                return raiseError("This switch() has more than one `default:` case");
-            }
-            haveDefault = true;
-        }
-        factory_.addCaseStatementToList(list, caseNode);
-    }
-
-    TRY(guard.done());
-    TRY_DECL(result, factory_.newLexicalScope(nullptr, list));
-
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseExpression()
-{
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-    BinKind kind;
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    ParseNode* result(nullptr);
-    MOZ_TRY_VAR(result, parseExpressionAux(kind, fields));
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseExpressionAux(const BinKind kind, const BinFields& fields)
-{
-    const size_t start = tokenizer_->offset();
-
-    ParseNode* result(nullptr);
-
-    switch (kind) {
-      case BinKind::Identifier: {
-        MOZ_TRY_VAR(result, parseIdentifierAux(kind, fields));
-        break;
-      }
-      case BinKind::BooleanLiteral: {
-        Maybe<bool> value;
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Value:
-                MOZ_TRY_EMPLACE(value, readBool());
-                break;
-              default:
-                return raiseInvalidField("BooleanLiteral", field);
-            }
-        }
-
-        // In case of absent optional fields, inject default values.
-        if (!value)
-            value.emplace(false);
-
-        TRY_VAR(result, factory_.newBooleanLiteral(*value, tokenizer_->pos(start)));
-
-        break;
-      }
-      case BinKind::NullLiteral: {
-        MOZ_TRY(checkEmptyTuple(kind, fields));
-        TRY_VAR(result, factory_.newNullLiteral(tokenizer_->pos(start)));
-        break;
-      }
-      case BinKind::NumericLiteral:
-        MOZ_TRY_VAR(result, parseNumericLiteralAux(kind, fields));
-        break;
-
-      case BinKind::RegExpLiteral: {
-        RootedAtom pattern(cx_);
-        Maybe<Chars> flags;
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Pattern:
-                MOZ_TRY(readString(&pattern));
-                break;
-              case BinField::Flags:
-                MOZ_TRY(readString(flags));
-                break;
-              default:
-                return raiseInvalidField("RegExpLiteral", field);
-            }
-        }
-
-        if (!pattern)
-            return raiseMissingField("RegExpLiteral", BinField::Pattern);
-        if (!flags)
-            return raiseMissingField("RegExpLiteral", BinField::Flags);
-
-        RegExpFlag reflags = NoFlags;
-        for (auto c : *flags) {
-            if (c == 'g' && !(reflags & GlobalFlag))
-                reflags = RegExpFlag(reflags | GlobalFlag);
-            else if (c == 'i' && !(reflags & IgnoreCaseFlag))
-                reflags = RegExpFlag(reflags | IgnoreCaseFlag);
-            else if (c == 'm' && !(reflags & MultilineFlag))
-                reflags = RegExpFlag(reflags | MultilineFlag);
-            else if (c == 'y' && !(reflags & StickyFlag))
-                reflags = RegExpFlag(reflags | StickyFlag);
-            else if (c == 'u' && !(reflags & UnicodeFlag))
-                reflags = RegExpFlag(reflags | UnicodeFlag);
-            else
-                return raiseInvalidEnum("RegExpLiteral", *flags);
-        }
-
-
-        Rooted<RegExpObject*> reobj(cx_);
-        TRY_VAR(reobj, RegExpObject::create(cx_,
-            pattern,
-            reflags,
-            /* options*/ nullptr,
-            /* tokenStream */ nullptr,
-            alloc_,
-            TenuredObject));
-
-        TRY_VAR(result, factory_.newRegExp(reobj, tokenizer_->pos(start), *this));
-
-        break;
-      }
-      case BinKind::StringLiteral:
-        MOZ_TRY_VAR(result, parseStringLiteralAux(kind, fields));
-        break;
-
-      case BinKind::ThisExpression: {
-        MOZ_TRY(checkEmptyTuple(kind, fields));
-
-        if (parseContext_->isFunctionBox())
-            parseContext_->functionBox()->usesThis = true;
-
-        TokenPos pos = tokenizer_->pos(start);
-        ParseNode* thisName(nullptr);
-        if (parseContext_->sc()->thisBinding() == ThisBinding::Function)
-            TRY_VAR(thisName, factory_.newName(cx_->names().dotThis, pos, cx_));
-
-        TRY_VAR(result, factory_.newThisLiteral(pos, thisName));
-        break;
-      }
-      case BinKind::ArrayExpression:
-        MOZ_TRY_VAR(result, parseArrayExpressionAux(kind, fields));
-        break;
-
-      case BinKind::ObjectExpression:
-        MOZ_TRY_VAR(result, parseObjectExpressionAux(kind, fields));
-        break;
-
-      case BinKind::FunctionExpression:
-        MOZ_TRY_VAR(result, parseFunctionAux(kind, fields));
-        result->setOp(JSOP_LAMBDA);
-        break;
-
-      case BinKind::UnaryExpression:
-      case BinKind::UpdateExpression: {
-        ParseNode* expr(nullptr);
-        Maybe<Chars> operation;
-        Maybe<bool> prefix; // FIXME: Ignored for unary_expression?
-
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Operator:
-                MOZ_TRY(readString(operation));
-                break;
-              case BinField::Prefix:
-                MOZ_TRY_EMPLACE(prefix, readBool());
-                break;
-              case BinField::Argument:
-                  // arguments are always parsed *after* operator.
-                  if (operation.isNothing())
-                      return raiseMissingField("UpdateExpression", BinField::Operator);
-                MOZ_TRY_VAR(expr, parseExpression());
-                break;
-              default:
-                return raiseInvalidField("UpdateExpression", field);
-            }
-        }
-
-        if (!expr)
-            return raiseMissingField("UpdateExpression", BinField::Argument);
-        if (operation.isNothing())
-            return raiseMissingField("UpdateExpression", BinField::Operator);
-
-        // In case of absent optional fields, inject default values.
-        if (prefix.isNothing())
-            prefix.emplace(false);
-
-        ParseNodeKind pnk = PNK_LIMIT;
-        if (kind == BinKind::UnaryExpression) {
-            if (*operation == "-") {
-                pnk = PNK_NEG;
-            } else if (*operation == "+") {
-                pnk = PNK_POS;
-            } else if (*operation == "!") {
-                pnk = PNK_NOT;
-            } else if (*operation == "~") {
-                pnk = PNK_BITNOT;
-            } else if (*operation == "typeof") {
-                if (expr->isKind(PNK_NAME))
-                    pnk = PNK_TYPEOFNAME;
-                else
-                    pnk = PNK_TYPEOFEXPR;
-            } else if (*operation == "void") {
-                pnk = PNK_VOID;
-            } else if (*operation == "delete") {
-                switch (expr->getKind()) {
-                  case PNK_NAME:
-                    expr->setOp(JSOP_DELNAME);
-                    pnk = PNK_DELETENAME;
-                    break;
-                  case PNK_DOT:
-                    pnk = PNK_DELETEPROP;
-                    break;
-                  case PNK_ELEM:
-                    pnk = PNK_DELETEELEM;
-                    break;
-                  default:
-                    pnk = PNK_DELETEEXPR;
-                }
-            } else {
-                return raiseInvalidEnum("UnaryOperator", *operation);
-            }
-        } else if (kind == BinKind::UpdateExpression) {
-            if (!expr->isKind(PNK_NAME) && !factory_.isPropertyAccess(expr))
-                return raiseError("Invalid increment/decrement operand"); // FIXME: Shouldn't this be part of the syntax?
-
-            if (*operation == "++") {
-                if (*prefix)
-                    pnk = PNK_PREINCREMENT;
-                else
-                    pnk = PNK_POSTINCREMENT;
-            } else if (*operation == "--") {
-                if (*prefix)
-                    pnk = PNK_PREDECREMENT;
-                else
-                    pnk = PNK_POSTDECREMENT;
-            } else {
-                return raiseInvalidEnum("UpdateOperator", *operation);
-            }
-        }
-
-        TRY_VAR(result, factory_.newUnary(pnk, start, expr));
-
-        break;
-      }
-      case BinKind::BinaryExpression:
-      case BinKind::LogicalExpression: {
-        ParseNode* left(nullptr);
-        ParseNode* right(nullptr);
-        Maybe<Chars> operation;
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Left:
-                MOZ_TRY_VAR(left, parseExpression());
-                break;
-              case BinField::Right:
-                MOZ_TRY_VAR(right, parseExpression());
-                break;
-              case BinField::Operator:
-                MOZ_TRY(readString(operation));
-                break;
-              default:
-                return raiseInvalidField("LogicalExpression | BinaryExpression", field);
-            }
-        }
-
-        if (!left)
-            return raiseMissingField("LogicalExpression | BinaryExpression", BinField::Left);
-        if (!right)
-            return raiseMissingField("LogicalExpression | BinaryExpression", BinField::Right);
-        if (operation.isNothing())
-            return raiseMissingField("LogicalExpression | BinaryExpression", BinField::Operator);
-
-        // FIXME: Instead of Chars, we should use atoms and comparison
-        // between atom ptr.
-        ParseNodeKind pnk = PNK_LIMIT;
-        if (*operation == "==")
-            pnk = PNK_EQ;
-        else if (*operation == "!=")
-            pnk = PNK_NE;
-        else if (*operation == "===")
-            pnk = PNK_STRICTEQ;
-        else if (*operation == "!==")
-            pnk = PNK_STRICTNE;
-        else if (*operation == "<")
-            pnk = PNK_LT;
-        else if (*operation == "<=")
-            pnk = PNK_LE;
-        else if (*operation == ">")
-            pnk = PNK_GT;
-        else if (*operation == ">=")
-            pnk = PNK_GE;
-        else if (*operation == "<<")
-            pnk = PNK_LSH;
-        else if (*operation == ">>")
-            pnk = PNK_RSH;
-        else if (*operation == ">>>")
-            pnk = PNK_URSH;
-        else if (*operation == "+")
-            pnk = PNK_ADD;
-        else if (*operation == "-")
-            pnk = PNK_SUB;
-        else if (*operation == "*")
-            pnk = PNK_STAR;
-        else if (*operation == "/")
-            pnk = PNK_DIV;
-        else if (*operation == "%")
-            pnk = PNK_MOD;
-        else if (*operation == "|")
-            pnk = PNK_BITOR;
-        else if (*operation == "^")
-            pnk = PNK_BITXOR;
-        else if (*operation == "&")
-            pnk = PNK_BITAND;
-        else if (*operation == "in")
-            pnk = PNK_IN;
-        else if (*operation == "instanceof")
-            pnk = PNK_INSTANCEOF;
-        else if (*operation == "||")
-            pnk = PNK_OR;
-        else if (*operation == "&&")
-            pnk = PNK_AND;
-        else if (*operation == "**")
-            pnk = PNK_POW;
-        else
-            return raiseInvalidEnum("BinaryOperator | LogicalOperator", *operation);
-
-        if (left->isKind(pnk) && pnk != PNK_POW /* PNK_POW is not left-associative */) {
-            // Regroup left-associative operations into lists.
-            left->appendWithoutOrderAssumption(right);
-            result = left;
-        } else {
-            TRY_DECL(list, factory_.newList(pnk, tokenizer_->pos(start)));
-
-            list->appendWithoutOrderAssumption(left);
-            list->appendWithoutOrderAssumption(right);
-            result = list;
-        }
-
-         break;
-      }
-      case BinKind::AssignmentExpression: {
-        ParseNode* left(nullptr);
-        ParseNode* right(nullptr);
-        Maybe<Chars> operation;
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Left:
-                MOZ_TRY_VAR(left, parseExpression());
-                break;
-              case BinField::Right:
-                MOZ_TRY_VAR(right, parseExpression());
-                break;
-              case BinField::Operator:
-                MOZ_TRY(readString(operation));
-                break;
-              default:
-                return raiseInvalidField("AssignmentExpression", field);
-            }
-        }
-
-        if (!left)
-            return raiseMissingField("AssignmentExpression", BinField::Left);
-        if (!right)
-            return raiseMissingField("AssignmentExpression", BinField::Right);
-        if (operation.isNothing())
-            return raiseMissingField("AssignmentExpression", BinField::Operator);
-
-        // FIXME: Instead of Chars, we should use atoms and comparison
-        // between atom ptr.
-        // FIXME: We should probably turn associative operations into lists.
-        ParseNodeKind pnk = PNK_LIMIT;
-        if (*operation == "=")
-            pnk = PNK_ASSIGN;
-        else if (*operation == "+=")
-            pnk = PNK_ADDASSIGN;
-        else if (*operation == "-=")
-            pnk = PNK_SUBASSIGN;
-        else if (*operation == "*=")
-            pnk = PNK_MULASSIGN;
-        else if (*operation == "/=")
-            pnk = PNK_DIVASSIGN;
-        else if (*operation == "%=")
-            pnk = PNK_MODASSIGN;
-        else if (*operation == "<<=")
-            pnk = PNK_LSHASSIGN;
-        else if (*operation == ">>=")
-            pnk = PNK_RSHASSIGN;
-        else if (*operation == ">>>=")
-            pnk = PNK_URSHASSIGN;
-        else if (*operation == "|=")
-            pnk = PNK_BITORASSIGN;
-        else if (*operation == "^=")
-            pnk = PNK_BITXORASSIGN;
-        else if (*operation == "&=")
-            pnk = PNK_BITANDASSIGN;
-        else
-            return raiseInvalidEnum("AssignmentOperator", *operation);
-
-        TRY_VAR(result, factory_.newAssignment(pnk, left, right));
-
-        break;
-      }
-      case BinKind::BracketExpression:
-      case BinKind::DotExpression:
-        MOZ_TRY_VAR(result, parseMemberExpressionAux(kind, fields));
-
-        break;
-      case BinKind::ConditionalExpression: {
-        ParseNode* test(nullptr);
-        ParseNode* alternate(nullptr);
-        ParseNode* consequent(nullptr);
-
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Test:
-                MOZ_TRY_VAR(test, parseExpression());
-                break;
-              case BinField::Consequent:
-                MOZ_TRY_VAR(consequent, parseExpression());
-                break;
-              case BinField::Alternate:
-                MOZ_TRY_VAR(alternate, parseExpression());
-                break;
-              default:
-                return raiseInvalidField("ConditionalExpression", field);
-            }
-        }
-
-        if (!test)
-            return raiseMissingField("ConditionalExpression", BinField::Test);
-        if (!consequent)
-            return raiseMissingField("ConditionalExpression", BinField::Consequent);
-        if (!alternate)
-            return raiseMissingField("ConditionalExpression", BinField::Alternate);
-
-        TRY_VAR(result, factory_.newConditional(test, consequent, alternate));
-
-        break;
-      }
-      case BinKind::CallExpression:
-      case BinKind::NewExpression: {
-        ParseNode* callee(nullptr);
-
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Callee:
-                MOZ_TRY_VAR(callee, parseExpression());
-                break;
-              case BinField::Arguments:
-                MOZ_TRY_VAR(result, parseExpressionList(/* acceptElisions = */ false));
-                break;
-              default:
-                return raiseInvalidField("NewExpression", field);
-            }
-        }
-
-        // In case of absent required fields, fail.
-        if (!callee)
-            return raiseMissingField("NewExpression", BinField::Callee);
-
-        // In case of absent optional fields, inject default values.
-        if (!result)
-            TRY_VAR(result, factory_.newArrayLiteral(start));
-
-        ParseNodeKind pnk =
-            kind == BinKind::CallExpression
-            ? PNK_CALL
-            : PNK_NEW;
-        result->setKind(pnk);
-        result->prepend(callee);
-
-        break;
-      }
-      case BinKind::SequenceExpression: {
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Expressions:
-                MOZ_TRY_VAR(result, parseExpressionList(/* acceptElisions = */ false));
-                break;
-              default:
-                return raiseInvalidField("SequenceExpression", field);
-            }
-        }
-
-        if (!result)
-            return raiseMissingField("SequenceExpression", BinField::Expression);
-
-        result->setKind(PNK_COMMA);
-        break;
-      }
-      default:
-        return raiseInvalidKind("Expression", kind);
-    }
-
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseNumericLiteralAux(const BinKind kind, const BinFields& fields)
-{
-    auto start = tokenizer_->offset();
-
-    Maybe<double> value;
-    for (auto field : fields) {
-        switch (field) {
-          case BinField::Value:
-            MOZ_TRY_EMPLACE(value, readNumber());
-            break;
-          default:
-            return raiseInvalidField("NumericLiteral", field);
-        }
-    }
-
-    // In case of absent optional fields, inject default values.
-    if (!value)
-        value.emplace(0);
-
-    TRY_DECL(result, factory_.newNumber(*value, DecimalPoint::HasDecimal, tokenizer_->pos(start)));
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseStringLiteralAux(const BinKind kind, const BinFields& fields)
-{
-    auto start = tokenizer_->offset();
-
-    RootedAtom value(cx_);
-    for (auto field : fields) {
-        switch (field) {
-          case BinField::Value:
-            MOZ_TRY(readString(&value));
-            break;
-          default:
-            return raiseInvalidField("StringLiteral", field);
-        }
-    }
-
-    if (!value)
-        return raiseMissingField("StringLiteral", BinField::Value);
-
-    TRY_DECL(result, factory_.newStringLiteral(value, tokenizer_->pos(start)));
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseArrayExpressionAux(const BinKind kind, const BinFields& fields)
-{
-    MOZ_ASSERT(kind == BinKind::ArrayExpression);
-
-    ParseNode* result(nullptr);
-    for (auto field : fields) {
-        switch (field) {
-          case BinField::Elements: {
-            MOZ_TRY_VAR(result, parseExpressionList(/* acceptElisions = */ true));
-            break;
-          }
-          default:
-            return raiseInvalidField("ArrayExpression", field);
-        }
-    }
-
-    // Inject default values for absent fields.
-    if (!result)
-        TRY_VAR(result, factory_.newArrayLiteral(tokenizer_->offset()));
-
-    MOZ_ASSERT(result->isKind(PNK_ARRAY));
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseObjectExpressionAux(const BinKind kind, const BinFields& fields)
-{
-    MOZ_ASSERT(kind == BinKind::ObjectExpression);
-
-    ParseNode* result(nullptr);
-    for (auto field : fields) {
-        switch (field) {
-          case BinField::Properties: {
-            MOZ_TRY_VAR(result, parseObjectMemberList());
-            break;
-          }
-          default:
-            return raiseInvalidField("Property | Method", field);
-        }
-    }
-
-    if (!result)
-        TRY_VAR(result, factory_.newObjectLiteral(tokenizer_->offset()));
-
-    MOZ_ASSERT(result->isArity(PN_LIST));
-    MOZ_ASSERT(result->isKind(PNK_OBJECT));
-
-#if defined(DEBUG)
-    // Sanity check.
-    for (ParseNode* iter = result->pn_head; iter != nullptr; iter = iter->pn_next) {
-        MOZ_ASSERT(iter->isKind(PNK_COLON));
-        MOZ_ASSERT(iter->pn_left != nullptr);
-        MOZ_ASSERT(iter->pn_right != nullptr);
-    }
-#endif // defined(DEBUG)
-
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseMemberExpressionAux(const BinKind kind, const BinFields& fields)
-{
-    MOZ_ASSERT(kind == BinKind::DotExpression || kind == BinKind::BracketExpression);
-
-    ParseNode* object(nullptr);
-    ParseNode* property(nullptr);
-
-    for (auto field : fields) {
-        switch (field) {
-          case BinField::Object:
-            MOZ_TRY_VAR(object, parseExpression());
-            break;
-          case BinField::Property:
-            if (kind == BinKind::BracketExpression)
-                MOZ_TRY_VAR(property, parseExpression());
-            else
-                MOZ_TRY_VAR(property, parseIdentifier());
-            break;
-          default:
-            return raiseInvalidField("MemberExpression", field);
-        }
-    }
-
-    // In case of absent required fields, fail.
-    if (!object)
-        return raiseMissingField("MemberExpression", BinField::Object);
-    if (!property)
-        return raiseMissingField("MemberExpression", BinField::Property);
-
-    ParseNode* result(nullptr);
-    if (kind == BinKind::DotExpression) {
-        MOZ_ASSERT(property->isKind(PNK_NAME));
-        PropertyName* name = property->pn_atom->asPropertyName();
-        TRY_VAR(result, factory_.newPropertyAccess(object, name, tokenizer_->offset()));
-    } else {
-        TRY_VAR(result, factory_.newPropertyByValue(object, property, tokenizer_->offset()));
-    }
-
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseDirectiveList()
-{
-    uint32_t length;
-    AutoList guard(*tokenizer_);
-    TRY(tokenizer_->enterList(length, guard));
-
-    TokenPos pos = tokenizer_->pos();
-    TRY_DECL(result, factory_.newStatementList(pos));
-
-    RootedAtom value(cx_);
-    for (uint32_t i = 0; i < length; ++i) {
-        value = nullptr;
-        MOZ_TRY(readString(&value));
-
-        TRY_DECL(directive, factory_.newStringLiteral(value, pos));
-        factory_.addStatementToList(result, directive);
-    }
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseSwitchCase()
-{
-    const size_t start = tokenizer_->offset();
-
-    BinKind kind;
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    if (kind != BinKind::SwitchCase)
-        return raiseInvalidKind("SwitchCase", kind);
-
-    ParseNode* test(nullptr); // Optional.
-    ParseNode* statements(nullptr); // Required.
-
-    for (auto field : fields) {
-        switch (field) {
-          case BinField::Test:
-            MOZ_TRY_VAR(test, parseExpression());
-            break;
-          case BinField::Consequent:
-            MOZ_TRY_VAR(statements, parseStatementList());
-            break;
-          default:
-            return raiseInvalidField("SwitchCase", field);
-        }
-    }
-
-    TRY(guard.done());
-    if (!statements)
-        return raiseMissingField("SwitchCase", BinField::Consequent);
-
-    MOZ_ASSERT(statements->isKind(PNK_STATEMENTLIST));
-
-    TRY_DECL(result, factory_.newCaseOrDefault(start, test, statements));
-
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseCatchClause()
-{
-    ParseContext::Statement stmt(parseContext_, StatementKind::Catch);
-    ParseContext::Scope scope(cx_, parseContext_, usedNames_);
-    TRY(scope.init(parseContext_));
-    const size_t start = tokenizer_->offset();
-
-    BinKind kind;
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    ParseNode* result(nullptr);
-
-    switch (kind) {
-      default:
-        return raiseInvalidKind("CatchClause", kind);
-      case BinKind::CatchClause: {
-        ParseNode* param(nullptr);
-        ParseNode* body(nullptr);
-
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Param:
-                MOZ_TRY_VAR(param, parsePattern());
-                break;
-              case BinField::Body:
-                MOZ_TRY_VAR(body, parseBlockStatement());
-                break;
-              case BinField::BINJS_Scope:
-                MOZ_TRY(parseAndUpdateCurrentScope());
-                break;
-              default:
-                return raiseInvalidField("CatchClause", field);
-            }
-        }
-
-        if (!param)
-            return raiseMissingField("CatchClause", BinField::Param);
-        if (!body)
-            return raiseMissingField("CatchClause", BinField::Body);
-
-        TRY_DECL(catchClause, factory_.newCatchBlock(param, /* catchGuard = */ nullptr, body));
-        TRY_DECL(bindings, NewLexicalScopeData(cx_, scope, alloc_, parseContext_));
-
-        TRY_DECL(catchClauseScope, factory_.newLexicalScope(*bindings, catchClause));
-
-        TRY_VAR(result, factory_.newCatchList(tokenizer_->pos(start)));
-
-        result->appendWithoutOrderAssumption(catchClauseScope);
-      }
-    }
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseArgumentList()
-{
-    uint32_t length;
-    AutoList guard(*tokenizer_);
-
-    TRY(tokenizer_->enterList(length, guard));
-    ParseNode* result = new_<ListNode>(PNK_PARAMSBODY, tokenizer_->pos());
-
-    for (uint32_t i = 0; i < length; ++i) {
-        ParseNode* pattern;
-        MOZ_TRY_VAR(pattern, parsePattern());
-
-        result->appendWithoutOrderAssumption(pattern);
-    }
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseIdentifier()
-{
-    BinKind kind;
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    ParseNode* result;
-    MOZ_TRY_VAR(result, parseIdentifierAux(kind, fields));
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseIdentifierAux(const BinKind, const BinFields& fields, const bool expectObjectPropertyName /* = false */)
-{
-    const size_t start = tokenizer_->offset();
-
-    RootedAtom id(cx_);
-    for (auto field : fields) {
-        switch (field) {
-          case BinField::Name:
-            MOZ_TRY(readString(&id));
-            break;
-          default:
-            return raiseInvalidField("Identifier", field);
-        }
-    }
-
-    if (!id)
-        return raiseMissingField("Identifier", BinField::Name);
-
-    if (!IsIdentifier(id))
-        return raiseError("Invalid identifier");
-    if (!expectObjectPropertyName && IsKeyword(id))
-        return raiseError("Invalid identifier (keyword)");
-
-    // Once `IsIdentifier` has returned true, we may call `asPropertyName()` without fear.
-    TokenPos pos = tokenizer_->pos(start);
-
-    ParseNode* result;
-    if (expectObjectPropertyName)
-        TRY_VAR(result, factory_.newObjectLiteralPropertyName(id->asPropertyName(), pos));
-    else
-        TRY_VAR(result, factory_.newName(id->asPropertyName(), pos, cx_));
-
-    return result;
-}
-
-
-JS::Result<ParseNode*>
-BinASTParser::parsePattern()
-{
-    BinKind kind;
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    ParseNode* result;
-    MOZ_TRY_VAR(result, parsePatternAux(kind, fields));
-
-    TRY(guard.done());
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parsePatternAux(const BinKind kind, const BinFields& fields)
-{
-    ParseNode* result;
-    switch (kind) {
-      case BinKind::Identifier:
-        MOZ_TRY_VAR(result, parseIdentifierAux(kind ,fields));
-        break;
-      default:
-        return raiseInvalidKind("Pattern", kind);
-    }
-
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseObjectMember()
-{
-    BinKind kind;
-    BinFields fields(cx_);
-    AutoTaggedTuple guard(*tokenizer_);
-
-    TRY(tokenizer_->enterTaggedTuple(kind, fields, guard));
-    ParseNode* result(nullptr);
-
-    switch (kind) {
-      case BinKind::ObjectProperty: {
-        ParseNode* key(nullptr);
-        ParseNode* value(nullptr);
-        for (auto field : fields) {
-            switch (field) {
-              case BinField::Key:
-                MOZ_TRY_VAR(key, parseObjectPropertyName());
-                break;
-              case BinField::Value:
-                MOZ_TRY_VAR(value, parseExpression());
-                break;
-              default:
-                return raiseInvalidField("ObjectMember", field);
-            }
-        }
-
-        if (!key)
-            return raiseMissingField("ObjectMember", BinField::Key);
-        if (!value)
-            return raiseMissingField("ObjectMember", BinField::Value);
-
-        if (!factory_.isUsableAsObjectPropertyName(key))
-            return raiseError("ObjectMember key kind");
-
-        TRY_VAR(result, factory_.newObjectMethodOrPropertyDefinition(key, value, AccessorType::None));
-
-        break;
-      }
-      case BinKind::ObjectMethod:
-      case BinKind::ObjectGetter:
-      case BinKind::ObjectSetter:
-        MOZ_TRY_VAR(result, parseFunctionAux(kind, fields));
-
-        if (!result)
-            return raiseEmpty("ObjectMethod");
-
-        MOZ_ASSERT(result->isKind(PNK_COLON));
-        break;
-      default:
-        return raiseInvalidKind("ObjectMember", kind);
-    }
-
-    TRY(guard.done());
-    MOZ_ASSERT(result);
-    return result;
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parseObjectMemberList()
-{
-    uint32_t length;
-    AutoList guard(*tokenizer_);
-
-    auto start = tokenizer_->offset();
-    TRY(tokenizer_->enterList(length, guard));
-
-    TRY_DECL(result, factory_.newObjectLiteral(start));
-
-    for (uint32_t i = 0; i < length; ++i) {
-        ParseNode* keyValue;
-        MOZ_TRY_VAR(keyValue, parseObjectMember());
-        MOZ_ASSERT(keyValue);
-
-        result->appendWithoutOrderAssumption(keyValue);
-    }
-
-    TRY(guard.done());
-    return result;
-}
-
-
-JS::Result<Ok>
-BinASTParser::checkEmptyTuple(const BinKind kind, const BinFields& fields)
-{
-    if (fields.length() != 0)
-        return raiseInvalidField(describeBinKind(kind), fields[0]);
-
-    return Ok();
-}
-
-
-JS::Result<Ok>
-BinASTParser::readString(MutableHandleAtom out)
-{
-    MOZ_ASSERT(!out);
-
-    Maybe<Chars> string;
-    MOZ_TRY(readString(string));
-    MOZ_ASSERT(string);
-
-    RootedAtom atom(cx_);
-    TRY_VAR(atom, Atomize(cx_, (const char*)string->begin(), string->length()));
-
-    out.set(Move(atom));
-    return Ok();
-}
-
-JS::Result<ParseNode*>
-BinASTParser::parsePropertyName()
-{
-    RootedAtom atom(cx_);
-    MOZ_TRY(readString(&atom));
-
-    TokenPos pos = tokenizer_->pos();
-
-    ParseNode* result;
-
-    // If the atom matches an index (e.g. "3"), we need to normalize the
-    // propertyName to ensure that it has the same representation as
-    // the numeric index (e.g. 3).
-    uint32_t index;
-    if (atom->isIndex(&index))
-        TRY_VAR(result, factory_.newNumber(index, NoDecimal, pos));
-    else
-        TRY_VAR(result, factory_.newStringLiteral(atom, pos));
-
-    return result;
-}
-
-JS::Result<Ok>
-BinASTParser::readString(Maybe<Chars>& out)
-{
-    MOZ_ASSERT(out.isNothing());
-    Chars result(cx_);
-    TRY(tokenizer_->readChars(result));
-
-    out.emplace(Move(result));
-    return Ok();
-}
-
-JS::Result<double>
-BinASTParser::readNumber()
-{
-    double result;
-    TRY(tokenizer_->readDouble(result));
-
-    return result;
-}
-
-JS::Result<bool>
-BinASTParser::readBool()
-{
-    bool result;
-    TRY(tokenizer_->readBool(result));
-
-    return result;
-}
-
-mozilla::GenericErrorResult<JS::Error&>
-BinASTParser::raiseInvalidKind(const char* superKind, const BinKind kind)
-{
-    Sprinter out(cx_);
-    TRY(out.init());
-    TRY(out.printf("In %s, invalid kind %s", superKind, describeBinKind(kind)));
-    return raiseError(out.string());
-}
-
-mozilla::GenericErrorResult<JS::Error&>
-BinASTParser::raiseInvalidField(const char* kind, const BinField field)
-{
-    Sprinter out(cx_);
-    TRY(out.init());
-    TRY(out.printf("In %s, invalid field '%s'", kind, describeBinField(field)));
-    return raiseError(out.string());
-}
-
-mozilla::GenericErrorResult<JS::Error&>
-BinASTParser::raiseInvalidEnum(const char* kind, const Chars& value)
-{
-    // We don't trust the actual chars of `value` to be properly formatted anything, so let's not use
-    // them anywhere.
-    return raiseError("Invalid enum");
-}
-
-mozilla::GenericErrorResult<JS::Error&>
-BinASTParser::raiseMissingField(const char* kind, const BinField field)
-{
-    Sprinter out(cx_);
-    TRY(out.init());
-    TRY(out.printf("In %s, missing field '%s'", kind, describeBinField(field)));
-
-    return raiseError(out.string());
-}
-
-mozilla::GenericErrorResult<JS::Error&>
-BinASTParser::raiseEmpty(const char* description)
-{
-    Sprinter out(cx_);
-    TRY(out.init());
-    TRY(out.printf("Empty %s", description));
-
-    return raiseError(out.string());
-}
-
-mozilla::GenericErrorResult<JS::Error&>
-BinASTParser::raiseOOM()
-{
-    ReportOutOfMemory(cx_);
-    return cx_->alreadyReportedError();
-}
-
-mozilla::GenericErrorResult<JS::Error&>
-BinASTParser::raiseError(BinKind kind, const char* description)
-{
-    Sprinter out(cx_);
-    TRY(out.init());
-    TRY(out.printf("In %s, ", description));
-    MOZ_ALWAYS_FALSE(tokenizer_->raiseError(out.string()));
-
-    return cx_->alreadyReportedError();
-}
-
-mozilla::GenericErrorResult<JS::Error&>
-BinASTParser::raiseError(const char* description)
-{
-    MOZ_ALWAYS_FALSE(tokenizer_->raiseError(description));
-    return cx_->alreadyReportedError();
-}
-
-void
-BinASTParser::poison()
-{
-    tokenizer_.reset();
-}
-
-void
-BinASTParser::reportErrorNoOffset(unsigned errorNumber, ...)
-{
-    va_list args;
-    va_start(args, errorNumber);
-
-    ErrorMetadata metadata;
-    metadata.filename = getFilename();
-    metadata.lineNumber = 0;
-    metadata.columnNumber = offset();
-    ReportCompileError(cx_, Move(metadata), nullptr, JSREPORT_ERROR, errorNumber, args);
-
-    va_end(args);
-}
-
-bool
-BinASTParser::hasUsedName(HandlePropertyName name)
-{
-    if (UsedNamePtr p = usedNames_.lookup(name))
-        return p->value().isUsedInScript(parseContext_->scriptId());
-
-    return false;
-}
-
-void
-TraceBinParser(JSTracer* trc, AutoGCRooter* parser)
-{
-    static_cast<BinASTParser*>(parser)->trace(trc);
-}
-
-} // namespace frontend
-} // namespace js
-
-
-// #undef everything, to avoid collisions with unified builds.
-
-#undef TRY
-#undef TRY_VAR
-#undef TRY_DECL
-#undef TRY_EMPL
-#undef MOZ_TRY_EMPLACE
diff --git a/js/src/frontend/BinSource.h b/js/src/frontend/BinSource.h
deleted file mode 100644
index e362bdc90ee2..000000000000
--- a/js/src/frontend/BinSource.h
+++ /dev/null
@@ -1,274 +0,0 @@
-#ifndef frontend_BinSource_h
-#define frontend_BinSource_h
-
-/**
- * A Binary AST parser.
- *
- * At the time of this writing, this parser implements the grammar of ES5
- * and trusts its input (in particular, variable declarations).
- */
-
-#include "mozilla/Maybe.h"
-
-#include "frontend/BinTokenReaderTester.h"
-#include "frontend/FullParseHandler.h"
-#include "frontend/ParseContext.h"
-#include "frontend/ParseNode.h"
-#include "frontend/SharedContext.h"
-
-#include "js/GCHashTable.h"
-#include "js/GCVector.h"
-#include "js/Result.h"
-
-namespace js {
-namespace frontend {
-
-class BinASTParser;
-
-/**
- * The parser for a Binary AST.
- *
- * By design, this parser never needs to backtrack or look ahead. Errors are not
- * recoverable.
- */
-class BinASTParser : private JS::AutoGCRooter, public ErrorReporter
-{
-    using Names = JS::GCVector<JSString*, 8>;
-    using Tokenizer = BinTokenReaderTester;
-    using Chars = Tokenizer::Chars;
-
-  public:
-    BinASTParser(JSContext* cx, LifoAlloc& alloc, UsedNameTracker& usedNames, const JS::ReadOnlyCompileOptions& options)
-        : AutoGCRooter(cx, BINPARSER)
-        , traceListHead_(nullptr)
-        , options_(options)
-        , cx_(cx)
-        , alloc_(alloc)
-        , nodeAlloc_(cx, alloc)
-        , keepAtoms_(cx)
-        , parseContext_(nullptr)
-        , usedNames_(usedNames)
-        , factory_(cx, alloc, nullptr, SourceKind::Binary)
-    {
-         cx_->frontendCollectionPool().addActiveCompilation();
-         tempPoolMark_ = alloc.mark();
-    }
-    ~BinASTParser()
-    {
-        alloc_.release(tempPoolMark_);
-
-        /*
-         * The parser can allocate enormous amounts of memory for large functions.
-         * Eagerly free the memory now (which otherwise won't be freed until the
-         * next GC) to avoid unnecessary OOMs.
-         */
-        alloc_.freeAllIfHugeAndUnused();
-
-        cx_->frontendCollectionPool().removeActiveCompilation();
-    }
-
-    /**
-     * Parse a buffer, returning a node (which may be nullptr) in case of success
-     * or Nothing() in case of error.
-     *
-     * The instance of `ParseNode` MAY NOT survive the `BinASTParser`. Indeed,
-     * destruction of the `BinASTParser` will also destroy the `ParseNode`.
-     *
-     * In case of error, the parser reports the JS error.
-     */
-    JS::Result<ParseNode*> parse(const uint8_t* start, const size_t length);
-    JS::Result<ParseNode*> parse(const Vector<uint8_t>& data);
-
-  private:
-    MOZ_MUST_USE JS::Result<ParseNode*> parseAux(const uint8_t* start, const size_t length);
-
-    // --- Raise errors.
-    //
-    // These methods return a (failed) JS::Result for convenience.
-
-    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseInvalidKind(const char* superKind, const BinKind kind);
-    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseInvalidField(const char* kind, const BinField field);
-    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseInvalidEnum(const char* kind, const Chars& value);
-    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseMissingField(const char* kind, const BinField field);
-    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseEmpty(const char* description);
-    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseOOM();
-    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseError(const char* description);
-    MOZ_MUST_USE mozilla::GenericErrorResult<JS::Error&> raiseError(BinKind kind, const char* description);
-
-    // Ensure that this parser will never be used again.
-    void poison();
-
-    // --- Parse full nodes (methods are sorted by alphabetical order)
-    //
-    // These method may NEVER return `nullptr`. // FIXME: We can probably optimize Result<> based on this.
-
-    MOZ_MUST_USE JS::Result<ParseNode*> parseBlockStatement();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseCatchClause();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseExpression();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseForInit();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseForInInit();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseIdentifier();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseObjectPropertyName();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseObjectMember();
-    MOZ_MUST_USE JS::Result<ParseNode*> parsePattern(); // Parse a *binding* pattern.
-    MOZ_MUST_USE JS::Result<ParseNode*> parsePropertyName();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseProgram();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseStatement();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseSwitchCase();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseVariableDeclarator();
-
-
-    // --- Parse lists of nodes (methods are sorted by alphabetical order)
-
-    MOZ_MUST_USE JS::Result<ParseNode*> parseArgumentList();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseDirectiveList();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseExpressionList(bool acceptElisions);
-
-    // Returns a list of PNK_COLON.
-    MOZ_MUST_USE JS::Result<ParseNode*> parseObjectMemberList();
-
-    MOZ_MUST_USE JS::Result<ParseNode*> parseStatementList();
-    MOZ_MUST_USE JS::Result<ParseNode*> parseSwitchCaseList();
-
-    // --- Parse the contents of a node whose kind has already been determined.
-
-    MOZ_MUST_USE JS::Result<ParseNode*> parseArrayExpressionAux(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<ParseNode*> parseBreakOrContinueStatementAux(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<ParseNode*> parseBlockStatementAux(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<ParseNode*> parseExpressionStatementAux(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<ParseNode*> parseExpressionAux(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<ParseNode*> parseFunctionAux(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<ParseNode*> parseIdentifierAux(const BinKind, const Tokenizer::BinFields& fields, const bool expectObjectPropertyName = false);
-    MOZ_MUST_USE JS::Result<ParseNode*> parseMemberExpressionAux(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<ParseNode*> parseNumericLiteralAux(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<ParseNode*> parseObjectExpressionAux(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<ParseNode*> parsePatternAux(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<ParseNode*> parseStringLiteralAux(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<ParseNode*> parseStatementAux(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<ParseNode*> parseVariableDeclarationAux(const BinKind kind, const Tokenizer::BinFields& fields);
-
-    // --- Auxiliary parsing functions that may have a side-effect on the parser but do not return a node.
-
-    MOZ_MUST_USE JS::Result<Ok> checkEmptyTuple(const BinKind kind, const Tokenizer::BinFields& fields);
-    MOZ_MUST_USE JS::Result<Ok> parseElisionAux(const BinKind kind, const Tokenizer::BinFields& fields);
-
-    // Parse full scope information to the current innermost scope.
-    MOZ_MUST_USE JS::Result<Ok> parseAndUpdateCurrentScope();
-    // Parse full scope information to a specific var scope / let scope combination.
-    MOZ_MUST_USE JS::Result<Ok> parseAndUpdateScope(ParseContext::Scope& varScope, ParseContext::Scope& letScope);
-    // Parse a list of names and add it to a given scope.
-    MOZ_MUST_USE JS::Result<Ok> parseAndUpdateScopeNames(ParseContext::Scope& scope, DeclarationKind kind);
-    MOZ_MUST_USE JS::Result<Ok> parseStringList(MutableHandle<Maybe<Names>> out);
-
-    // --- Utilities.
-
-    MOZ_MUST_USE JS::Result<ParseNode*> appendDirectivesToBody(ParseNode* body, ParseNode* directives);
-
-    // Read a string as a `Chars`.
-    MOZ_MUST_USE JS::Result<Ok> readString(Maybe<Chars>& out);
-    MOZ_MUST_USE JS::Result<Ok> readString(MutableHandleAtom out);
-    MOZ_MUST_USE JS::Result<bool> readBool();
-    MOZ_MUST_USE JS::Result<double> readNumber();
-
-    const ReadOnlyCompileOptions& options() const override {
-        return this->options_;
-    }
-
-    // Names
-
-
-    bool hasUsedName(HandlePropertyName name);
-
-    // --- GC.
-
-    void trace(JSTracer* trc) {
-        ObjectBox::TraceList(trc, traceListHead_);
-    }
-
-
-  public:
-    ObjectBox* newObjectBox(JSObject* obj) {
-        MOZ_ASSERT(obj);
-
-        /*
-         * We use JSContext.tempLifoAlloc to allocate parsed objects and place them
-         * on a list in this Parser to ensure GC safety. Thus the tempLifoAlloc
-         * arenas containing the entries must be alive until we are done with
-         * scanning, parsing and code generation for the whole script or top-level
-         * function.
-         */
-
-         ObjectBox* objbox = alloc_.new_<ObjectBox>(obj, traceListHead_);
-         if (!objbox) {
-             ReportOutOfMemory(cx_);
-             return nullptr;
-        }
-
-        traceListHead_ = objbox;
-
-        return objbox;
-    }
-
-    ParseNode* allocParseNode(size_t size) {
-        MOZ_ASSERT(size == sizeof(ParseNode));
-        return static_cast<ParseNode*>(nodeAlloc_.allocNode());
-    }
-
-    JS_DECLARE_NEW_METHODS(new_, allocParseNode, inline)
-
-  private: // Implement ErrorReporter
-
-    virtual void lineNumAndColumnIndex(size_t offset, uint32_t* line, uint32_t* column) const override {
-        *line = 0;
-        *column = offset;
-    }
-    virtual size_t offset() const override {
-        if (tokenizer_.isSome())
-            return tokenizer_->offset();
-
-        return 0;
-    }
-    virtual bool hasTokenizationStarted() const override {
-        return tokenizer_.isSome();
-    }
-    virtual void reportErrorNoOffset(unsigned errorNumber, ...) override;
-    virtual const char* getFilename() const override {
-        return this->options_.filename();
-    }
-
-    ObjectBox* traceListHead_;
-    const ReadOnlyCompileOptions& options_;
-    JSContext* cx_;
-    LifoAlloc& alloc_;
-    LifoAlloc::Mark tempPoolMark_;
-    ParseNodeAllocator nodeAlloc_;
-
-    // Root atoms and objects allocated for the parse tree.
-    AutoKeepAtoms keepAtoms_;
-
-    // The current ParseContext, holding directives, etc.
-    ParseContext* parseContext_;
-    UsedNameTracker& usedNames_;
-    Maybe<Tokenizer> tokenizer_;
-    FullParseHandler factory_;
-
-    friend class BinParseContext;
-
-    // Needs access to AutoGCRooter.
-    friend void TraceBinParser(JSTracer* trc, AutoGCRooter* parser);
-};
-
-class BinParseContext : public ParseContext
-{
-  public:
-    BinParseContext(JSContext* cx, BinASTParser* parser, SharedContext* sc, Directives* newDirectives)
-        : ParseContext(cx, parser->parseContext_, sc, *parser,
-                       parser->usedNames_, newDirectives, /* isFull = */ true)
-    { }
-};
-
-
-} // namespace frontend
-} // namespace js
-
-#endif // frontend_BinSource_h
\ No newline at end of file
diff --git a/js/src/frontend/BinToken.cpp b/js/src/frontend/BinToken.cpp
deleted file mode 100644
index 75b0754b3fae..000000000000
--- a/js/src/frontend/BinToken.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "frontend/BinToken.h"
-
-#include <sys/types.h>
-
-namespace js {
-namespace frontend {
-
-const char* BINKIND_DESCRIPTIONS[] = {
-#define WITH_KIND(_, SPEC_NAME) #SPEC_NAME,
-    FOR_EACH_BIN_KIND(WITH_KIND)
-#undef WITH_KIND
-};
-
-const char* BINFIELD_DESCRIPTIONS[] = {
-    #define WITH_FIELD(_, SPEC_NAME) #SPEC_NAME,
-        FOR_EACH_BIN_FIELD(WITH_FIELD)
-    #undef WITH_FIELD
-};
-
-const char* describeBinKind(const BinKind& kind) {
-    return BINKIND_DESCRIPTIONS[static_cast<size_t>(kind)];
-}
-
-const char* describeBinField(const BinField& field) {
-    return BINFIELD_DESCRIPTIONS[static_cast<size_t>(field)];
-}
-
-} // namespace frontend
-} // namespace js
\ No newline at end of file
diff --git a/js/src/frontend/BinToken.h b/js/src/frontend/BinToken.h
deleted file mode 100644
index 3f2cff616c72..000000000000
--- a/js/src/frontend/BinToken.h
+++ /dev/null
@@ -1,201 +0,0 @@
-#ifndef frontend_BinToken_h
-#define frontend_BinToken_h
-
-/**
- * Definition of Binary AST tokens.
- *
- * In the Binary AST world, an AST is composed of nodes, where a node is
- * defined by:
- * - a Kind (see `BinKind`);
- * - a list of fields, where each field is:
- *    - a Name (see `BinField`);
- *    - a Value, which may be either a node or a primitive value.
- *
- * The mapping between Kind and list of fields is determined entirely by
- * the grammar of Binary AST. The mapping between (Kind, Name) and the structure
- * of Value is also determined entirely by the grammar of Binary AST.
- *
- * As per the specifications of Binary AST, kinds may be added as the language
- * grows, but never removed. The mapping between Kind and list of fields may
- * also change to add new fields or make some fields optional, but may never
- * remove a field. Finally, the mapping between (Kind, Name) and the structure
- * of Value may be modified to add new possible values, but never to remove a
- * value.
- *
- * A Binary AST parser must be able to fail gracefully when confronted with
- * unknown Kinds or Names.
- *
- * At the time of this writing, the Binary AST defined from the Babylon AST
- * (see https://github.com/babel/babylon/blob/master/ast/spec.md) restricted
- * to ES5, with a few amendments to store additional scoping data and to
- * represent the empty AST.
- *
- * Future versions of the Binary AST will progressively grow to encompass ES6
- * and beyond.
- */
-
-namespace js {
-namespace frontend {
-
- /**
- * The different kinds of Binary AST nodes, as per the specifications of
- * Binary AST.
- *
- * These kinds match roughly with the `ParseNodeKind` used internally.
- *
- * Usage:
- *
- * ```c++
- * #define WITH_KIND(CPP_NAME, SPEC_NAME) ...
- * FOR_EACH_BIN_KIND(WITH_KIND)
- * ```
- *
- *
- * (sorted by alphabetical order)
- */
-#define FOR_EACH_BIN_KIND(F) \
-    F(ArrayExpression, ArrayExpression) \
-    F(AssignmentExpression, AssignmentExpression) \
-    F(AssignmentOperator, AssignmentOperator) \
-    F(BinaryExpression, BinaryExpression) \
-    F(BinaryOperator, BinaryOperator) \
-    F(BINJS_Scope, BINJS:Scope) \
-    F(BlockStatement, BlockStatement) \
-    F(BooleanLiteral, BooleanLiteral) \
-    F(BracketExpression, BracketExpression) \
-    F(BreakStatement, BreakStatement) \
-    F(CallExpression, CallExpression) \
-    F(CatchClause, CatchClause) \
-    F(ComputedPropertyName, ComputedPropertyName) \
-    F(ConditionalExpression, ConditionalExpression) \
-    F(ContinueStatement, ContinueStatement) \
-    F(DebuggerStatement, DebuggerStatement) \
-    F(Declaration, Declaration) \
-    F(Directive, Directive) \
-    F(DirectiveLiteral, DirectiveLiteral) \
-    F(DotExpression, DotExpression) \
-    F(DoWhileStatement, DoWhileStatement) \
-    F(Elision, Elision) \
-    F(EmptyStatement, EmptyStatement) \
-    F(Expression, Expression) \
-    F(ExpressionStatement, ExpressionStatement) \
-    F(ForStatement, ForStatement) \
-    F(ForInStatement, ForInStatement) \
-    F(FunctionExpression, FunctionExpression) \
-    F(FunctionDeclaration, FunctionDeclaration) \
-    F(Identifier, Identifier) \
-    F(IfStatement, IfStatement) \
-    F(LabeledStatement, LabeledStatement) \
-    F(Literal, Literal) \
-    F(LogicalExpression, LogicalExpression) \
-    F(LogicalOperator, LogicalOperator) \
-    F(NewExpression, NewExpression) \
-    F(NullLiteral, NullLiteral) \
-    F(NumericLiteral, NumericLiteral) \
-    F(ObjectExpression, ObjectExpression) \
-    F(ObjectGetter, ObjectGetter) \
-    F(ObjectMethod, ObjectMethod) \
-    F(ObjectSetter, ObjectSetter) \
-    F(ObjectProperty, ObjectProperty) \
-    F(Pattern, Pattern) \
-    F(Program, Program) \
-    F(PropertyKind, PropertyKind) \
-    F(RegExpLiteral, RegExpLiteral) \
-    F(ReturnStatement, ReturnStatement) \
-    F(SequenceExpression, SequenceExpression) \
-    F(StringLiteral, StringLiteral) \
-    F(Statement, Statement) \
-    F(SwitchCase, SwitchCase) \
-    F(SwitchStatement, SwitchStatement) \
-    F(ThisExpression, ThisExpression) \
-    F(ThrowStatement, ThrowStatement) \
-    F(TryStatement, TryStatement) \
-    F(UnaryExpression, UnaryExpression) \
-    F(UnaryOperator, UnaryOperator) \
-    F(UpdateExpression, UpdateExpression) \
-    F(UpdateOperator, UpdateOperator) \
-    F(VariableDeclaration, VariableDeclaration) \
-    F(VariableDeclarator, VariableDeclarator) \
-    F(VariableKind, VariableKind) \
-    F(WhileStatement, WhileStatement) \
-    F(WithStatement, WithStatement)
-
-enum class BinKind {
-#define EMIT_ENUM(name, _) name,
-    FOR_EACH_BIN_KIND(EMIT_ENUM)
-#undef EMIT_ENUM
-    BINKIND_LIMIT /* domain size */
-};
-
-const char* describeBinKind(const BinKind& kind);
-
-/**
- * The different fields of Binary AST nodes, as per the specifications of
- * Binary AST.
- *
- * Usage:
- *
- * ```c++
- * #define WITH_FIELD(CPP_NAME, SPEC_NAME) ...
- * FOR_EACH_BIN_FIELD(WITH_FIELD)
- * ```
- *
- * (sorted by alphabetical order)
- */
- #define FOR_EACH_BIN_FIELD(F) \
-    F(Alternate, alternate) \
-    F(Argument, argument) \
-    F(Arguments, arguments) \
-    F(BINJS_CapturedNames, BINJS:CapturedNames) \
-    F(BINJS_ConstDeclaredNames, BINJS:ConstDeclaredNames) \
-    F(BINJS_HasDirectEval, BINJS:HasDirectEval) \
-    F(BINJS_LetDeclaredNames, BINJS:LetDeclaredNames) \
-    F(BINJS_VarDeclaredNames, BINJS:VarDeclaredNames) \
-    F(BINJS_Scope, BINJS:Scope) \
-    F(Block, block) \
-    F(Callee, callee) \
-    F(Cases, cases) \
-    F(Consequent, consequent) \
-    F(Body, body) \
-    F(Declarations, declarations) \
-    F(Directives, directives) \
-    F(Discriminant, discriminant) \
-    F(Elements, elements) \
-    F(Expression, expression) \
-    F(Expressions, expressions) \
-    F(Finalizer, finalizer) \
-    F(Flags, flags) \
-    F(Handler, handler) \
-    F(Id, id) \
-    F(Init, init) \
-    F(Key, key) \
-    F(Kind, kind) \
-    F(Label, label) \
-    F(Left, left) \
-    F(Name, name) \
-    F(Object, object) \
-    F(Operator, operator) \
-    F(Param, param) \
-    F(Params, params) \
-    F(Pattern, pattern) \
-    F(Prefix, prefix) \
-    F(Properties, properties) \
-    F(Property, property) \
-    F(Right, right) \
-    F(Test, test) \
-    F(Update, update) \
-    F(Value, value)
-
-enum class BinField {
-#define EMIT_ENUM(name, _) name,
-    FOR_EACH_BIN_FIELD(EMIT_ENUM)
-#undef EMIT_ENUM
-    BINFIELD_LIMIT /* domain size */
-};
-
-const char* describeBinField(const BinField& kind);
-
-} // namespace frontend
-} // namespace js
-
-#endif // frontend_BinToken_h
diff --git a/js/src/frontend/BinTokenReaderTester.cpp b/js/src/frontend/BinTokenReaderTester.cpp
deleted file mode 100644
index 177909efbcbd..000000000000
--- a/js/src/frontend/BinTokenReaderTester.cpp
+++ /dev/null
@@ -1,536 +0,0 @@
-#include "frontend/BinTokenReaderTester.h"
-
-#include "mozilla/EndianUtils.h"
-#include "gc/Zone.h"
-
-namespace js {
-namespace frontend {
-
-using BinFields = BinTokenReaderTester::BinFields;
-using AutoList = BinTokenReaderTester::AutoList;
-using AutoTaggedTuple = BinTokenReaderTester::AutoTaggedTuple;
-using AutoTuple = BinTokenReaderTester::AutoTuple;
-
-BinTokenReaderTester::BinTokenReaderTester(JSContext* cx, const uint8_t* start, const size_t length)
-    : cx_(cx)
-    , start_(start)
-    , current_(start)
-    , stop_(start + length)
-    , latestKnownGoodPos_(0)
-{ }
-
-BinTokenReaderTester::BinTokenReaderTester(JSContext* cx, const Vector<uint8_t>& chars)
-    : cx_(cx)
-    , start_(chars.begin())
-    , current_(chars.begin())
-    , stop_(chars.end())
-    , latestKnownGoodPos_(0)
-{ }
-
-bool
-BinTokenReaderTester::raiseError(const char* description)
-{
-    MOZ_ASSERT(!cx_->isExceptionPending());
-    TokenPos pos = this->pos();
-    JS_ReportErrorASCII(cx_, "BinAST parsing error: %s at offsets %u => %u",
-                        description, pos.begin, pos.end);
-    return false;
-}
-
-bool
-BinTokenReaderTester::readBuf(uint8_t* bytes, uint32_t len)
-{
-    MOZ_ASSERT(!cx_->isExceptionPending());
-    MOZ_ASSERT(len > 0);
-
-    if (stop_ < current_ + len)
-        return raiseError("Buffer exceeds length");
-
-    for (uint32_t i = 0; i < len; ++i)
-        *bytes++ = *current_++;
-
-    return true;
-}
-
-bool
-BinTokenReaderTester::readByte(uint8_t* byte)
-{
-    return readBuf(byte, 1);
-}
-
-
-// Nullable booleans:
-//
-// 0 => false
-// 1 => true
-// 2 => null
-bool
-BinTokenReaderTester::readMaybeBool(Maybe<bool>& result)
-{
-    updateLatestKnownGood();
-    uint8_t byte;
-    if (!readByte(&byte))
-        return false;
-
-    switch (byte) {
-      case 0:
-        result = Some(false);
-        break;
-      case 1:
-        result = Some(true);
-        break;
-      case 2:
-        result = Nothing();
-        break;
-      default:
-        return raiseError("Invalid boolean value");
-    }
-    return true;
-}
-
-bool
-BinTokenReaderTester::readBool(bool& out)
-{
-    Maybe<bool> result;
-
-    if (!readMaybeBool(result))
-        return false;
-
-    if (result.isNothing())
-        return raiseError("Empty boolean value");
-
-    out = *result;
-    return true;
-}
-
-// Nullable doubles (little-endian)
-//
-// 0x7FF0000000000001 (signaling NaN) => null
-// anything other 64 bit sequence => IEEE-764 64-bit floating point number
-bool
-BinTokenReaderTester::readMaybeDouble(Maybe<double>& result)
-{
-    updateLatestKnownGood();
-
-    uint8_t bytes[8];
-    MOZ_ASSERT(sizeof(bytes) == sizeof(double));
-    if (!readBuf(reinterpret_cast<uint8_t*>(bytes), ArrayLength(bytes)))
-        return false;
-
-    // Decode little-endian.
-    const uint64_t asInt = LittleEndian::readUint64(bytes);
-
-    if (asInt == 0x7FF0000000000001) {
-        result = Nothing();
-    } else {
-        // Canonicalize NaN, just to make sure another form of signalling NaN
-        // doesn't slip past us.
-        const double asDouble = CanonicalizeNaN(BitwiseCast<double>(asInt));
-        result = Some(asDouble);
-    }
-
-    return true;
-}
-
-bool
-BinTokenReaderTester::readDouble(double& out)
-{
-    Maybe<double> result;
-
-    if (!readMaybeDouble(result))
-        return false;
-
-    if (result.isNothing())
-        return raiseError("Empty double value");
-
-    out = *result;
-    return true;
-}
-
-// Internal uint32_t
-//
-// Encoded as 4 bytes, little-endian.
-bool
-BinTokenReaderTester::readInternalUint32(uint32_t* result)
-{
-    uint8_t bytes[4];
-    MOZ_ASSERT(sizeof(bytes) == sizeof(uint32_t));
-    if (!readBuf(bytes, 4))
-        return false;
-
-    // Decode little-endian.
-    *result = LittleEndian::readUint32(bytes);
-
-    return true;
-}
-
-
-
-// Nullable strings:
-// - "<string>" (not counted in byte length)
-// - byte length (not counted in byte length)
-// - bytes (UTF-8)
-// - "</string>" (not counted in byte length)
-//
-// The special sequence of bytes `[255, 0]` (which is an invalid UTF-8 sequence)
-// is reserved to `null`.
-bool
-BinTokenReaderTester::readMaybeChars(Maybe<Chars>& out)
-{
-    updateLatestKnownGood();
-
-    if (!readConst("<string>"))
-        return false;
-
-    // 1. Read byteLength
-    uint32_t byteLen;
-    if (!readInternalUint32(&byteLen))
-        return false;
-
-    // 2. Reject if we can't read
-    if (current_ + byteLen < current_) // Check for overflows
-        return raiseError("Arithmetics overflow: string is too long");
-
-    if (current_ + byteLen > stop_)
-        return raiseError("Not enough bytes to read chars");
-
-    // 3. Check null string (no allocation)
-    if (byteLen == 2 && *current_ == 255 && *(current_ + 1) == 0) {
-        // Special case: null string.
-        out = Nothing();
-        current_ += byteLen;
-        return true;
-    }
-
-    // 4. Other strings (bytes are copied)
-    out.emplace(cx_);
-    if (!out->resize(byteLen)) {
-        ReportOutOfMemory(cx_);
-        return false;
-    }
-    PodCopy(out->begin(), current_, byteLen);
-    current_ += byteLen;
-
-    if (!readConst("</string>"))
-        return false;
-
-    return true;
-}
-
-bool
-BinTokenReaderTester::readChars(Chars& out)
-{
-    Maybe<Chars> result;
-
-    if (!readMaybeChars(result))
-        return false;
-
-    if (result.isNothing())
-        return raiseError("Empty string");
-
-    out = Move(*result);
-    return true;
-}
-
-template <size_t N>
-bool
-BinTokenReaderTester::matchConst(const char (&value)[N])
-{
-    MOZ_ASSERT(N > 0);
-    MOZ_ASSERT(value[N - 1] == 0);
-    MOZ_ASSERT(!cx_->isExceptionPending());
-
-    if (current_ + N - 1 > stop_)
-        return false;
-
-    // Perform lookup, without side-effects.
-    if (!std::equal(current_, current_ + N - 1 /*implicit NUL*/, value))
-        return false;
-
-    // Looks like we have a match. Now perform side-effects
-    current_ += N - 1;
-    updateLatestKnownGood();
-    return true;
-}
-
-
-// Untagged tuple:
-// - "<tuple>";
-// - contents (specified by the higher-level grammar);
-// - "</tuple>"
-bool
-BinTokenReaderTester::enterUntaggedTuple(AutoTuple& guard)
-{
-    if (!readConst("<tuple>"))
-        return false;
-
-    guard.init();
-    return true;
-}
-
-template <size_t N>
-bool
-BinTokenReaderTester::readConst(const char (&value)[N])
-{
-    updateLatestKnownGood();
-    if (!matchConst(value))
-        return raiseError("Could not find expected literal");
-
-    return true;
-}
-
-// Tagged tuples:
-// - "<tuple>"
-// - "<head>"
-// - non-null string `name`, followed by \0 (see `readString()`);
-// - uint32_t number of fields;
-// - array of `number of fields` non-null strings followed each by \0 (see `readString()`);
-// - "</head>"
-// - content (specified by the higher-level grammar);
-// - "</tuple>"
-bool
-BinTokenReaderTester::enterTaggedTuple(BinKind& tag, BinFields& fields, AutoTaggedTuple& guard)
-{
-    // Header
-    if (!readConst("<tuple>"))
-        return false;
-
-    if (!readConst("<head>"))
-        return false;
-
-    // This would probably be much faster with a HashTable, but we don't
-    // really care about the speed of BinTokenReaderTester.
-    do {
-
-#define FIND_MATCH(CONSTRUCTOR, NAME) \
-        if (matchConst(#NAME "\0")) { \
-            tag = BinKind::CONSTRUCTOR; \
-            break; \
-        } // else
-
-        FOR_EACH_BIN_KIND(FIND_MATCH)
-#undef FIND_MATCH
-
-        // else
-        return raiseError("Invalid tag");
-    } while(false);
-
-    // Now fields.
-    uint32_t fieldNum;
-    if (!readInternalUint32(&fieldNum))
-        return false;
-
-    fields.clear();
-    if (!fields.reserve(fieldNum))
-        return raiseError("Out of memory");
-
-    for (uint32_t i = 0; i < fieldNum; ++i) {
-        // This would probably be much faster with a HashTable, but we don't
-        // really care about the speed of BinTokenReaderTester.
-        BinField field;
-        do {
-
-#define FIND_MATCH(CONSTRUCTOR, NAME) \
-            if (matchConst(#NAME "\0")) { \
-                field = BinField::CONSTRUCTOR; \
-                break; \
-            } // else
-
-            FOR_EACH_BIN_FIELD(FIND_MATCH)
-#undef FIND_MATCH
-
-            // else
-            return raiseError("Invalid field");
-        } while (false);
-
-        // Make sure that we do not have duplicate fields.
-        // Search is linear, but again, we don't really care
-        // in this implementation.
-        for (uint32_t j = 0; j < i; ++j) {
-            if (fields[j] == field) {
-                return raiseError("Duplicate field");
-            }
-        }
-
-        fields.infallibleAppend(field); // Already checked.
-    }
-
-    // End of header
-
-    if (!readConst("</head>"))
-        return false;
-
-    // Enter the body.
-    guard.init();
-    return true;
-}
-
-// List:
-//
-// - "<list>" (not counted in byte length);
-// - uint32_t byte length (not counted in byte length);
-// - uint32_t number of items;
-// - contents (specified by higher-level grammar);
-// - "</list>" (not counted in byte length)
-//
-// The total byte length of `number of items` + `contents` must be `byte length`.
-bool
-BinTokenReaderTester::enterList(uint32_t& items, AutoList& guard)
-{
-    if (!readConst("<list>"))
-        return false;
-
-    uint32_t byteLen;
-    if (!readInternalUint32(&byteLen))
-        return false;
-
-    const uint8_t* stop = current_ + byteLen;
-
-    if (stop < current_) // Check for overflows
-        return raiseError("Arithmetics overflow: list is too long");
-
-    if (stop > this->stop_)
-        return raiseError("Incorrect list length");
-
-    guard.init(stop);
-
-    if (!readInternalUint32(&items))
-        return false;
-
-    return true;
-}
-
-void
-BinTokenReaderTester::updateLatestKnownGood()
-{
-    MOZ_ASSERT(current_ >= start_);
-    const size_t update = current_ - start_;
-    MOZ_ASSERT(update >= latestKnownGoodPos_);
-    latestKnownGoodPos_ = update;
-}
-
-size_t
-BinTokenReaderTester::offset() const
-{
-    return latestKnownGoodPos_;
-}
-
-TokenPos
-BinTokenReaderTester::pos()
-{
-    return pos(latestKnownGoodPos_);
-}
-
-TokenPos
-BinTokenReaderTester::pos(size_t start)
-{
-    TokenPos pos;
-    pos.begin = start;
-    pos.end = current_ - start_;
-    MOZ_ASSERT(pos.end >= pos.begin);
-    return pos;
-}
-
-void
-BinTokenReaderTester::AutoBase::init()
-{
-    initialized_ = true;
-}
-
-BinTokenReaderTester::AutoBase::AutoBase(BinTokenReaderTester& reader)
-    : reader_(reader)
-{ }
-
-BinTokenReaderTester::AutoBase::~AutoBase()
-{
-    // By now, the `AutoBase` must have been deinitialized by calling `done()`.
-    // The only case in which we can accept not calling `done()` is if we have
-    // bailed out because of an error.
-    MOZ_ASSERT_IF(initialized_, reader_.cx_->isExceptionPending());
-}
-
-bool
-BinTokenReaderTester::AutoBase::checkPosition(const uint8_t* expectedEnd)
-{
-    if (reader_.current_ != expectedEnd)
-        return reader_.raiseError("Caller did not consume the expected set of bytes");
-
-    return true;
-}
-
-BinTokenReaderTester::AutoList::AutoList(BinTokenReaderTester& reader)
-    : AutoBase(reader)
-{ }
-
-void
-BinTokenReaderTester::AutoList::init(const uint8_t* expectedEnd)
-{
-    AutoBase::init();
-    this->expectedEnd_ = expectedEnd;
-}
-
-bool
-BinTokenReaderTester::AutoList::done()
-{
-    MOZ_ASSERT(initialized_);
-    initialized_ = false;
-    if (reader_.cx_->isExceptionPending()) {
-        // Already errored, no need to check further.
-        return false;
-    }
-
-    // Check that we have consumed the exact number of bytes.
-    if (!checkPosition(expectedEnd_))
-        return false;
-
-    // Check suffix.
-    if (!reader_.readConst("</list>"))
-        return false;
-
-    return true;
-}
-
-BinTokenReaderTester::AutoTaggedTuple::AutoTaggedTuple(BinTokenReaderTester& reader)
-    : AutoBase(reader)
-{ }
-
-bool
-BinTokenReaderTester::AutoTaggedTuple::done()
-{
-    MOZ_ASSERT(initialized_);
-    initialized_ = false;
-    if (reader_.cx_->isExceptionPending()) {
-        // Already errored, no need to check further.
-        return false;
-    }
-
-    // Check suffix.
-    if (!reader_.readConst("</tuple>"))
-        return false;
-
-    return true;
-}
-
-BinTokenReaderTester::AutoTuple::AutoTuple(BinTokenReaderTester& reader)
-    : AutoBase(reader)
-{ }
-
-bool
-BinTokenReaderTester::AutoTuple::done()
-{
-    MOZ_ASSERT(initialized_);
-    initialized_ = false;
-    if (reader_.cx_->isExceptionPending()) {
-        // Already errored, no need to check further.
-        return false;
-    }
-
-    // Check suffix.
-    if (!reader_.readConst("</tuple>"))
-        return false;
-
-    return true;
-}
-
-} // namespace frontend
-} // namespace js
diff --git a/js/src/frontend/BinTokenReaderTester.h b/js/src/frontend/BinTokenReaderTester.h
deleted file mode 100644
index 7fa8ffe03b3b..000000000000
--- a/js/src/frontend/BinTokenReaderTester.h
+++ /dev/null
@@ -1,357 +0,0 @@
-#ifndef frontend_BinTokenReaderTester_h
-#define frontend_BinTokenReaderTester_h
-
-#include "mozilla/Maybe.h"
-
-#include "frontend/BinToken.h"
-#include "frontend/TokenStream.h"
-
-#include "js/TypeDecls.h"
-
-#if !defined(NIGHTLY_BUILD)
-#error "BinTokenReaderTester.* is designed to help test implementations of successive versions of JS BinaryAST. It is available only on Nightly."
-#endif // !defined(NIGHTLY_BUILD)
-
-namespace js {
-namespace frontend {
-
-using namespace mozilla;
-using namespace JS;
-
-/**
- * A token reader for a simple, alternative serialization format for BinAST.
- *
- * This serialization format, which is also supported by the reference
- * implementation of the BinAST compression suite, is designed to be
- * mostly human-readable and easy to check for all sorts of deserialization
- * errors. While this format is NOT designed to be shipped to end-users, it
- * is nevertheless a very useful tool for implementing and testing parsers.
- *
- * Both the format and the implementation are ridiculously inefficient:
- *
- * - the underlying format tags almost all its data with e.g. `<tuple>`, `</tuple>`
- *   to aid with detecting offset errors or format error;
- * - the underlying format copies list of fields into every single node, instead
- *   of keeping them once in the header;
- * - every kind/field extraction requires memory allocation and plenty of string
- *   comparisons;
- * - ...
- *
- * This token reader is designed to be API-compatible with the standard, shipped,
- * token reader. For these reasons:
- *
- * - it does not support any form of look ahead, push back;
- * - it does not support any form of error recovery.
- */
-class MOZ_STACK_CLASS BinTokenReaderTester
-{
-  public:
-    // A list of fields, in the order in which they appear in the stream.
-    using BinFields = Vector<BinField, 8>;
-
-    // A bunch of characters. At this stage, there is no guarantee on whether
-    // they are valid UTF-8. Future versions may replace this by slice into
-    // the buffer.
-    using Chars     = Vector<uint8_t, 32>;
-
-    class AutoList;
-    class AutoTuple;
-    class AutoTaggedTuple;
-
-  public:
-    /**
-     * Construct a token reader.
-     *
-     * Does NOT copy the buffer.
-     */
-    BinTokenReaderTester(JSContext* cx, const uint8_t* start, const size_t length);
-
-    /**
-     * Construct a token reader.
-     *
-     * Does NOT copy the buffer.
-     */
-    BinTokenReaderTester(JSContext* cx, const Vector<uint8_t>& chars);
-
-    // --- Primitive values.
-    //
-    // Note that the underlying format allows for a `null` value for primitive
-    // values.
-    //
-    // Reading will return an error either in case of I/O error or in case of
-    // a format problem. Reading if an exception in pending is an error and
-    // will cause assertion failures. Do NOT attempt to read once an exception
-    // has been cleared: the token reader does NOT support recovery, by design.
-
-    /**
-     * Read a single `true | false | null` value.
-     *
-     * @param out Set to `Nothing` if the data specifies that the value is `null`.
-     * Otherwise, `Some(true)` or `Some(false)`.
-     *
-     * @return false If a boolean could not be read. In this case, an error
-     * has been raised.
-     */
-    MOZ_MUST_USE bool readMaybeBool(Maybe<bool>& out);
-    MOZ_MUST_USE bool readBool(bool& out);
-
-    /**
-     * Read a single `number | null` value.
-     *
-     * @param out Set to `Nothing` if the data specifies that the value is `null`.
-     * Otherwise, `Some(x)`, where `x` is a valid `double` (i.e. either a non-NaN
-     * or a canonical NaN).
-     *
-     * @return false If a double could not be read. In this case, an error
-     * has been raised.
-     */
-    MOZ_MUST_USE bool readMaybeDouble(Maybe<double>& out);
-    MOZ_MUST_USE bool readDouble(double& out);
-
-    /**
-     * Read a single `string | null` value.
-     *
-     * @param out Set to `Nothing` if the data specifies that the value is `null`.
-     * Otherwise, `Some(x)`, where `x` is a `string`.
-     *
-     * WARNING: At this stage, the `string` encoding has NOT been validated.
-     *
-     * @return false If a string could not be read. In this case, an error
-     * has been raised.
-     */
-    MOZ_MUST_USE bool readMaybeChars(Maybe<Chars>& out);
-    MOZ_MUST_USE bool readChars(Chars& out);
-
-    // --- Composite values.
-    //
-    // The underlying format does NOT allows for a `null` composite value.
-    //
-    // Reading will return an error either in case of I/O error or in case of
-    // a format problem. Reading from a poisoned tokenizer is an error and
-    // will cause assertion failures.
-
-    /**
-     * Start reading a list.
-     *
-     * @param length (OUT) The number of elements in the list.
-     * @param guard (OUT) A guard, ensuring that we read the list correctly.
-     *
-     * The `guard` is dedicated to ensuring that reading the list has consumed
-     * exactly all the bytes from that list. The `guard` MUST therefore be
-     * destroyed at the point where the caller has reached the end of the list.
-     * If the caller has consumed too few/too many bytes, this will be reported
-     * in the call go `guard.done()`.
-     *
-     * @return out If the header of the list is invalid.
-     */
-    MOZ_MUST_USE bool enterList(uint32_t& length, AutoList& guard);
-
-    /**
-     * Start reading a tagged tuple.
-     *
-     * @param tag (OUT) The tag of the tuple.
-     * @param fields (OUT) The ORDERED list of fields encoded in this tuple.
-     * @param guard (OUT) A guard, ensuring that we read the tagged tuple correctly.
-     *
-     * The `guard` is dedicated to ensuring that reading the list has consumed
-     * exactly all the bytes from that tuple. The `guard` MUST therefore be
-     * destroyed at the point where the caller has reached the end of the tuple.
-     * If the caller has consumed too few/too many bytes, this will be reported
-     * in the call go `guard.done()`.
-     *
-     * @return out If the header of the tuple is invalid.
-     */
-    MOZ_MUST_USE bool enterTaggedTuple(BinKind& tag, BinTokenReaderTester::BinFields& fields, AutoTaggedTuple& guard);
-
-    /**
-     * Start reading an untagged tuple.
-     *
-     * @param guard (OUT) A guard, ensuring that we read the tuple correctly.
-     *
-     * The `guard` is dedicated to ensuring that reading the list has consumed
-     * exactly all the bytes from that tuple. The `guard` MUST therefore be
-     * destroyed at the point where the caller has reached the end of the tuple.
-     * If the caller has consumed too few/too many bytes, this will be reported
-     * in the call go `guard.done()`.
-     *
-     * @return out If the header of the tuple is invalid.
-     */
-    MOZ_MUST_USE bool enterUntaggedTuple(AutoTuple& guard);
-
-    /**
-     * Return the position of the latest token.
-     */
-    TokenPos pos();
-    TokenPos pos(size_t startOffset);
-    size_t offset() const;
-
-    /**
-     * Raise an error.
-     *
-     * Once `raiseError` has been called, the tokenizer is poisoned.
-     */
-    MOZ_MUST_USE bool raiseError(const char* description);
-
-     /**
-      * Poison this tokenizer.
-      */
-    void poison();
-
-  private:
-    /**
-     * Read a single byte.
-     */
-    MOZ_MUST_USE bool readByte(uint8_t* byte);
-
-    /**
-     * Read several bytes.
-     *
-     * If there is not enough data, or if the tokenizer has previously been
-     * poisoned, return `false` and report an exception.
-     */
-    MOZ_MUST_USE bool readBuf(uint8_t* bytes, uint32_t len);
-
-    /**
-     * Read a single uint32_t.
-     */
-    MOZ_MUST_USE bool readInternalUint32(uint32_t*);
-
-    /**
-     * Read a sequence of chars, ensuring that they match an expected
-     * sequence of chars.
-     *
-     * @param value The sequence of chars to expect, NUL-terminated. The NUL
-     * is not expected in the stream.
-     */
-     template <size_t N>
-     MOZ_MUST_USE bool readConst(const char (&value)[N]);
-
-     /**
-     * Read a sequence of chars, consuming the bytes only if they match an expected
-     * sequence of chars.
-     *
-     * @param value The sequence of chars to expect, NUL-terminated. The NUL
-     * is not expected in the stream.
-     * @return true if `value` (minus NUL) represents the next few chars in the
-     * internal buffer, false otherwise. If `true`, the chars are consumed,
-     * otherwise there is no side-effect.
-     */
-    template <size_t N>
-    MOZ_MUST_USE bool matchConst(const char (&value)[N]);
-
-    /**
-     * Update the "latest known good" position, which is used during error
-     * reporting.
-     */
-    void updateLatestKnownGood();
-
-  private:
-    JSContext* cx_;
-
-    // `true` if we have encountered an error. Errors are non recoverable.
-    // Attempting to read from a poisoned tokenizer will cause assertion errors.
-    bool poisoned_;
-
-    // The first byte of the buffer. Not owned.
-    const uint8_t* start_;
-
-    // The current position.
-    const uint8_t* current_;
-
-    // The last+1 byte of the buffer.
-    const uint8_t* stop_;
-
-
-    // Latest known good position. Used for error reporting.
-    size_t latestKnownGoodPos_;
-
-    BinTokenReaderTester(const BinTokenReaderTester&) = delete;
-    BinTokenReaderTester(BinTokenReaderTester&&) = delete;
-    BinTokenReaderTester& operator=(BinTokenReaderTester&) = delete;
-
-  public:
-    // The following classes are used whenever we encounter a tuple/tagged tuple/list
-    // to make sure that:
-    //
-    // - if the construct "knows" its byte length, we have exactly consumed all
-    //   the bytes (otherwise, this means that the file is corrupted, perhaps on
-    //   purpose, so we need to reject the stream);
-    // - if the construct has a footer, once we are done reading it, we have
-    //   reached the footer (this is to aid with debugging).
-    //
-    // In either case, the caller MUST call method `done()` of the guard once
-    // it is done reading the tuple/tagged tuple/list, to report any pending error.
-
-    // Base class used by other Auto* classes.
-    class MOZ_STACK_CLASS AutoBase
-    {
-      protected:
-        explicit AutoBase(BinTokenReaderTester& reader);
-        ~AutoBase();
-
-        // Raise an error if we are not in the expected position.
-        MOZ_MUST_USE bool checkPosition(const uint8_t* expectedPosition);
-
-        friend BinTokenReaderTester;
-        void init();
-
-        // Set to `true` if `init()` has been called. Reset to `false` once
-        // all conditions have been checked.
-        bool initialized_;
-        BinTokenReaderTester& reader_;
-    };
-
-    // Guard class used to ensure that `enterList` is used properly.
-    class MOZ_STACK_CLASS AutoList : public AutoBase
-    {
-      public:
-        explicit AutoList(BinTokenReaderTester& reader);
-
-        // Check that we have properly read to the end of the list.
-        MOZ_MUST_USE bool done();
-      protected:
-        friend BinTokenReaderTester;
-        void init(const uint8_t* expectedEnd);
-      private:
-        const uint8_t* expectedEnd_;
-    };
-
-    // Guard class used to ensure that `enterTaggedTuple` is used properly.
-    class MOZ_STACK_CLASS AutoTaggedTuple : public AutoBase
-    {
-      public:
-        explicit AutoTaggedTuple(BinTokenReaderTester& reader);
-
-        // Check that we have properly read to the end of the tuple.
-        MOZ_MUST_USE bool done();
-    };
-
-    // Guard class used to ensure that `readTuple` is used properly.
-    class MOZ_STACK_CLASS AutoTuple : public AutoBase
-    {
-      public:
-        explicit AutoTuple(BinTokenReaderTester& reader);
-
-        // Check that we have properly read to the end of the tuple.
-        MOZ_MUST_USE bool done();
-    };
-
-    // Compare a `Chars` and a string literal (ONLY a string literal).
-    template <size_t N>
-    static bool equals(const Chars& left, const char (&right)[N]) {
-        MOZ_ASSERT(N > 0);
-        MOZ_ASSERT(right[N - 1] == 0);
-        if (left.length() + 1 /* implicit NUL */ != N)
-            return false;
-
-        if (!std::equal(left.begin(), left.end(), right))
-          return false;
-
-        return true;
-    }
-};
-
-} // namespace frontend
-} // namespace js
-
-#endif // frontend_BinTokenReaderTester_h
diff --git a/js/src/frontend/BytecodeCompiler.h b/js/src/frontend/BytecodeCompiler.h
index 44142cb2c0df..82ea548279cc 100644
--- a/js/src/frontend/BytecodeCompiler.h
+++ b/js/src/frontend/BytecodeCompiler.h
@@ -124,14 +124,6 @@ IsKeyword(JSLinearString* str);
 void
 TraceParser(JSTracer* trc, JS::AutoGCRooter* parser);
 
-#if defined(JS_BUILD_BINAST)
-
-/* Trace all GC things reachable from binjs parser. Defined in BinSource.cpp. */
-void
-TraceBinParser(JSTracer* trc, JS::AutoGCRooter* parser);
-
-#endif // defined(JS_BUILD_BINAST)
-
 class MOZ_STACK_CLASS AutoFrontendTraceLog
 {
 #ifdef JS_TRACE_LOGGING
diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h
index fecfaf9cffde..fb50650e0462 100644
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.h
@@ -18,13 +18,6 @@
 namespace js {
 namespace frontend {
 
-enum class SourceKind {
-    // We are parsing from a text source (Parser.h)
-    Text,
-    // We are parsing from a binary source (BinSource.h)
-    Binary,
-};
-
 // Parse handler used when generating a full parse tree for all code which the
 // parser encounters.
 class FullParseHandler
@@ -45,8 +38,6 @@ class FullParseHandler
     size_t lazyInnerFunctionIndex;
     size_t lazyClosedOverBindingIndex;
 
-    const SourceKind sourceKind_;
-
   public:
     /* new_ methods for creating parse nodes. These report OOM on context. */
     JS_DECLARE_NEW_METHODS(new_, allocParseNode, inline)
@@ -74,24 +65,15 @@ class FullParseHandler
         return node->isInParens() && (node->isKind(PNK_OBJECT) || node->isKind(PNK_ARRAY));
     }
 
-    FullParseHandler(JSContext* cx, LifoAlloc& alloc, LazyScript* lazyOuterFunction,
-                     SourceKind kind = SourceKind::Text)
+    FullParseHandler(JSContext* cx, LifoAlloc& alloc, LazyScript* lazyOuterFunction)
       : allocator(cx, alloc),
         lazyOuterFunction_(cx, lazyOuterFunction),
         lazyInnerFunctionIndex(0),
-        lazyClosedOverBindingIndex(0),
-        sourceKind_(SourceKind::Text)
+        lazyClosedOverBindingIndex(0)
     {}
 
     static ParseNode* null() { return nullptr; }
 
-    // The FullParseHandler may be used to create nodes for text sources
-    // (from Parser.h) or for binary sources (from BinSource.h). In the latter
-    // case, some common assumptions on offsets are incorrect, e.g. in `a + b`,
-    // `a`, `b` and `+` may be stored in any order. We use `sourceKind()`
-    // to determine whether we need to check these assumptions.
-    SourceKind sourceKind() const { return sourceKind_; }
-
     ParseNode* freeTree(ParseNode* pn) { return allocator.freeTree(pn); }
     void prepareNodeForMutation(ParseNode* pn) { return allocator.prepareNodeForMutation(pn); }
 
@@ -242,7 +224,7 @@ class FullParseHandler
         ParseNode* elision = new_<NullaryNode>(PNK_ELISION, pos);
         if (!elision)
             return false;
-        addList(/* list = */ literal, /* child = */ elision);
+        literal->append(elision);
         literal->pn_xflags |= PNX_ARRAYHOLESPREAD | PNX_NONCONST;
         return true;
     }
@@ -251,7 +233,7 @@ class FullParseHandler
         ParseNode* spread = newSpread(begin, inner);
         if (!spread)
             return false;
-        addList(/* list = */ literal, /* child = */ spread);
+        literal->append(spread);
         literal->pn_xflags |= PNX_ARRAYHOLESPREAD | PNX_NONCONST;
         return true;
     }
@@ -259,7 +241,7 @@ class FullParseHandler
     void addArrayElement(ParseNode* literal, ParseNode* element) {
         if (!element->isConstant())
             literal->pn_xflags |= PNX_NONCONST;
-        addList(/* list = */ literal, /* child = */ element);
+        literal->append(element);
     }
 
     ParseNode* newCall(const TokenPos& pos) {
@@ -298,9 +280,7 @@ class FullParseHandler
     ParseNode* newSuperBase(ParseNode* thisName, const TokenPos& pos) {
         return new_<UnaryNode>(PNK_SUPERBASE, pos, thisName);
     }
-    ParseNode* newCatchBlock(ParseNode* catchName, ParseNode* catchGuard, ParseNode* catchBody) {
-        return new_<TernaryNode>(PNK_CATCH, catchName, catchGuard, catchBody);
-    }
+
     MOZ_MUST_USE bool addPrototypeMutation(ParseNode* literal, uint32_t begin, ParseNode* expr) {
         // Object literals with mutated [[Prototype]] are non-constant so that
         // singleton objects will have Object.prototype as their [[Prototype]].
@@ -309,19 +289,22 @@ class FullParseHandler
         ParseNode* mutation = newUnary(PNK_MUTATEPROTO, begin, expr);
         if (!mutation)
             return false;
-        addList(/* list = */ literal, /* child = */ mutation);
+        literal->append(mutation);
         return true;
     }
 
     MOZ_MUST_USE bool addPropertyDefinition(ParseNode* literal, ParseNode* key, ParseNode* val) {
         MOZ_ASSERT(literal->isKind(PNK_OBJECT));
         MOZ_ASSERT(literal->isArity(PN_LIST));
-        MOZ_ASSERT(isUsableAsObjectPropertyName(key));
+        MOZ_ASSERT(key->isKind(PNK_NUMBER) ||
+                   key->isKind(PNK_OBJECT_PROPERTY_NAME) ||
+                   key->isKind(PNK_STRING) ||
+                   key->isKind(PNK_COMPUTED_NAME));
 
         ParseNode* propdef = newBinary(PNK_COLON, key, val, JSOP_INITPROP);
         if (!propdef)
             return false;
-        addList(/* list = */ literal, /* child = */ propdef);
+        literal->append(propdef);
         return true;
     }
 
@@ -336,7 +319,7 @@ class FullParseHandler
         ParseNode* propdef = newBinary(PNK_SHORTHAND, name, expr, JSOP_INITPROP);
         if (!propdef)
             return false;
-        addList(/* list = */ literal, /* child = */ propdef);
+        literal->append(propdef);
         return true;
     }
 
@@ -348,7 +331,7 @@ class FullParseHandler
         ParseNode* spread = newSpread(begin, inner);
         if (!spread)
             return false;
-        addList(/* list = */ literal, /* child = */ spread);
+        literal->append(spread);
         return true;
     }
 
@@ -356,13 +339,16 @@ class FullParseHandler
                                                 AccessorType atype)
     {
         MOZ_ASSERT(literal->isArity(PN_LIST));
+        MOZ_ASSERT(key->isKind(PNK_NUMBER) ||
+                   key->isKind(PNK_OBJECT_PROPERTY_NAME) ||
+                   key->isKind(PNK_STRING) ||
+                   key->isKind(PNK_COMPUTED_NAME));
         literal->pn_xflags |= PNX_NONCONST;
 
-        ParseNode* propdef = newObjectMethodOrPropertyDefinition(key, fn, atype);
+        ParseNode* propdef = newBinary(PNK_COLON, key, fn, AccessorTypeToJSOp(atype));
         if (!propdef)
             return false;
-
-        addList(/* list = */ literal, /* child = */ propdef);
+        literal->append(propdef);
         return true;
     }
 
@@ -370,12 +356,15 @@ class FullParseHandler
                                                AccessorType atype, bool isStatic)
     {
         MOZ_ASSERT(methodList->isKind(PNK_CLASSMETHODLIST));
-        MOZ_ASSERT(isUsableAsObjectPropertyName(key));
+        MOZ_ASSERT(key->isKind(PNK_NUMBER) ||
+                   key->isKind(PNK_OBJECT_PROPERTY_NAME) ||
+                   key->isKind(PNK_STRING) ||
+                   key->isKind(PNK_COMPUTED_NAME));
 
         ParseNode* classMethod = new_<ClassMethod>(key, fn, AccessorTypeToJSOp(atype), isStatic);
         if (!classMethod)
             return false;
-        addList(/* list = */ methodList, /* child = */ classMethod);
+        methodList->append(classMethod);
         return true;
     }
 
@@ -414,7 +403,7 @@ class FullParseHandler
     void addStatementToList(ParseNode* list, ParseNode* stmt) {
         MOZ_ASSERT(list->isKind(PNK_STATEMENTLIST));
 
-        addList(/* list = */ list, /* child = */ stmt);
+        list->append(stmt);
 
         if (isFunctionStmt(stmt)) {
             // PNX_FUNCDEFS notifies the emitter that the block contains
@@ -434,7 +423,7 @@ class FullParseHandler
         MOZ_ASSERT(casepn->isKind(PNK_CASE));
         MOZ_ASSERT(casepn->pn_right->isKind(PNK_STATEMENTLIST));
 
-        addList(/* list = */ list, /* child = */ casepn);
+        list->append(casepn);
 
         if (casepn->pn_right->pn_xflags & PNX_FUNCDEFS)
             list->pn_xflags |= PNX_FUNCDEFS;
@@ -450,7 +439,7 @@ class FullParseHandler
 
         MOZ_ASSERT(genName->getOp() == JSOP_GETNAME);
         genName->setOp(JSOP_SETNAME);
-        ParseNode* genInit = newAssignment(PNK_ASSIGN, /* lhs = */ genName, /* rhs = */ makeGen);
+        ParseNode* genInit = newBinary(PNK_ASSIGN, genName, makeGen);
         if (!genInit)
             return false;
 
@@ -651,20 +640,6 @@ class FullParseHandler
                !node->pn_funbox->isArrow();
     }
 
-    ParseNode* newObjectMethodOrPropertyDefinition(ParseNode* key, ParseNode* fn, AccessorType atype) {
-        MOZ_ASSERT(isUsableAsObjectPropertyName(key));
-
-        return newBinary(PNK_COLON, key, fn, AccessorTypeToJSOp(atype));
-    }
-
-    bool setComprehensionLambdaBody(ParseNode* pn, ParseNode* body) {
-        MOZ_ASSERT(body->isKind(PNK_STATEMENTLIST));
-        ParseNode* paramsBody = newList(PNK_PARAMSBODY, body);
-        if (!paramsBody)
-            return false;
-        setFunctionFormalParametersAndBody(pn, paramsBody);
-        return true;
-    }
     void setFunctionFormalParametersAndBody(ParseNode* pn, ParseNode* kid) {
         MOZ_ASSERT_IF(kid, kid->isKind(PNK_PARAMSBODY));
         pn->pn_body = kid;
@@ -675,11 +650,11 @@ class FullParseHandler
         funbox->functionNode = pn;
     }
     void addFunctionFormalParameter(ParseNode* pn, ParseNode* argpn) {
-        addList(/* list = */ pn->pn_body, /* child = */ argpn);
+        pn->pn_body->append(argpn);
     }
     void setFunctionBody(ParseNode* fn, ParseNode* body) {
         MOZ_ASSERT(fn->pn_body->isKind(PNK_PARAMSBODY));
-        addList(/* list = */ fn->pn_body, /* child = */ body);
+        fn->pn_body->append(body);
     }
 
     ParseNode* newModule(const TokenPos& pos) {
@@ -695,7 +670,7 @@ class FullParseHandler
         if (!newExpr)
             return nullptr;
 
-        addList(/* list = */ newExpr, /* child = */ ctor);
+        addList(newExpr, ctor);
         return newExpr;
     }
 
@@ -738,13 +713,6 @@ class FullParseHandler
         return node->isKind(PNK_SUPERBASE);
     }
 
-    bool isUsableAsObjectPropertyName(ParseNode* node) {
-        return node->isKind(PNK_NUMBER)
-            || node->isKind(PNK_OBJECT_PROPERTY_NAME)
-            || node->isKind(PNK_STRING)
-            || node->isKind(PNK_COMPUTED_NAME);
-    }
-
     inline MOZ_MUST_USE bool finishInitializerAssignment(ParseNode* pn, ParseNode* init);
 
     void setBeginPosition(ParseNode* pn, ParseNode* oth) {
@@ -810,10 +778,7 @@ class FullParseHandler
     }
 
     void addList(ParseNode* list, ParseNode* kid) {
-        if (sourceKind_ == SourceKind::Text)
-            list->append(kid);
-        else
-            list->appendWithoutOrderAssumption(kid);
+        list->append(kid);
     }
 
     void setOp(ParseNode* pn, JSOp op) {
@@ -892,11 +857,10 @@ FullParseHandler::addCatchBlock(ParseNode* catchList, ParseNode* lexicalScope,
                                 ParseNode* catchName, ParseNode* catchGuard,
                                 ParseNode* catchBody)
 {
-    MOZ_ASSERT(catchList->isKind(PNK_CATCHLIST));
-    ParseNode* catchpn = newCatchBlock(catchName, catchGuard, catchBody);
+    ParseNode* catchpn = new_<TernaryNode>(PNK_CATCH, catchName, catchGuard, catchBody);
     if (!catchpn)
         return false;
-    addList(/* list = */ catchList, /* child = */ lexicalScope);
+    catchList->append(lexicalScope);
     lexicalScope->setScopeBody(catchpn);
     return true;
 }
diff --git a/js/src/frontend/ParseContext-inl.h b/js/src/frontend/ParseContext-inl.h
deleted file mode 100644
index be2d22b53b47..000000000000
--- a/js/src/frontend/ParseContext-inl.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#ifndef frontend_ParseContext_inl_h
-#define frontend_ParseContext_inl_h
-
-#include "frontend/ParseContext.h"
-
-namespace js {
-namespace frontend {
-
-template <>
-inline bool
-ParseContext::Statement::is<ParseContext::LabelStatement>() const
-{
-    return kind_ == StatementKind::Label;
-}
-
-template <>
-inline bool
-ParseContext::Statement::is<ParseContext::ClassStatement>() const
-{
-    return kind_ == StatementKind::Class;
-}
-
-
-inline JS::Result<Ok, ParseContext::BreakStatementError>
-ParseContext::checkBreakStatement(PropertyName* label)
-{
-    // Labeled 'break' statements target the nearest labeled statements (could
-    // be any kind) with the same label. Unlabeled 'break' statements target
-    // the innermost loop or switch statement.
-    if (label) {
-        auto hasSameLabel = [&label](ParseContext::LabelStatement* stmt) {
-            MOZ_ASSERT(stmt);
-            return stmt->label() == label;
-        };
-
-        if (!findInnermostStatement<ParseContext::LabelStatement>(hasSameLabel))
-            return mozilla::Err(ParseContext::BreakStatementError::LabelNotFound);
-
-    } else {
-        auto isBreakTarget = [](ParseContext::Statement* stmt) {
-            return StatementKindIsUnlabeledBreakTarget(stmt->kind());
-        };
-
-        if (!findInnermostStatement(isBreakTarget))
-            return mozilla::Err(ParseContext::BreakStatementError::ToughBreak);
-    }
-
-    return Ok();
-}
-
-inline JS::Result<Ok, ParseContext::ContinueStatementError>
-ParseContext::checkContinueStatement(PropertyName* label)
-{
-    // Labeled 'continue' statements target the nearest labeled loop
-    // statements with the same label. Unlabeled 'continue' statements target
-    // the innermost loop statement.
-    auto isLoop = [](ParseContext::Statement* stmt) {
-        MOZ_ASSERT(stmt);
-        return StatementKindIsLoop(stmt->kind());
-    };
-
-    if (!label) {
-        // Unlabeled statement: we target the innermost loop, so make sure that
-        // there is an innermost loop.
-        if (!findInnermostStatement(isLoop))
-            return mozilla::Err(ParseContext::ContinueStatementError::NotInALoop);
-        return Ok();
-    }
-
-    // Labeled statement: targest the nearest labeled loop with the same label.
-    ParseContext::Statement* stmt = innermostStatement();
-    bool foundLoop = false; // True if we have encountered at least one loop.
-
-    for (;;) {
-        stmt = ParseContext::Statement::findNearest(stmt, isLoop);
-        if (!stmt)
-            return foundLoop ? mozilla::Err(ParseContext::ContinueStatementError::LabelNotFound)
-                             : mozilla::Err(ParseContext::ContinueStatementError::NotInALoop);
-
-        foundLoop = true;
-
-        // Is it labeled by our label?
-        stmt = stmt->enclosing();
-        while (stmt && stmt->is<ParseContext::LabelStatement>()) {
-            if (stmt->as<ParseContext::LabelStatement>().label() == label)
-                return Ok();
-
-            stmt = stmt->enclosing();
-        }
-    }
-}
-
-}
-}
-
-#endif // frontend_ParseContext_inl_h
diff --git a/js/src/frontend/ParseContext.h b/js/src/frontend/ParseContext.h
index 04e457f0f8fa..53dee523b115 100644
--- a/js/src/frontend/ParseContext.h
+++ b/js/src/frontend/ParseContext.h
@@ -7,11 +7,7 @@
 #ifndef frontend_ParseContext_h
 #define frontend_ParseContext_h
 
-#include "ds/Nestable.h"
-
-#include "frontend/BytecodeCompiler.h"
 #include "frontend/ErrorReporter.h"
-#include "frontend/SharedContext.h"
 
 namespace js {
 
@@ -293,10 +289,6 @@ class ParseContext : public Nestable<ParseContext>
             return declared_.acquire(pc->sc()->context);
         }
 
-        bool isEmpty() const {
-            return declared_->all().empty();
-        }
-
         DeclaredNamePtr lookupDeclaredName(JSAtom* name) {
             return declared_->lookup(name);
         }
@@ -410,7 +402,6 @@ class ParseContext : public Nestable<ParseContext>
     {
       public:
         explicit inline VarScope(ParserBase* parser);
-        explicit inline VarScope(JSContext* cx, ParseContext* pc, UsedNameTracker& usedNames);
     };
 
   private:
@@ -526,7 +517,6 @@ class ParseContext : public Nestable<ParseContext>
         return sc_;
     }
 
-    // `true` if we are in the body of a function definition.
     bool isFunctionBox() const {
         return sc_->isFunctionBox();
     }
@@ -588,22 +578,6 @@ class ParseContext : public Nestable<ParseContext>
         return *closedOverBindingsForLazy_;
     }
 
-    enum class BreakStatementError {
-        // Unlabeled break must be inside loop or switch.
-        ToughBreak,
-        LabelNotFound,
-    };
-
-    // Return Err(true) if we have encountered at least one loop,
-    // Err(false) otherwise.
-    MOZ_MUST_USE inline JS::Result<Ok, BreakStatementError> checkBreakStatement(PropertyName* label);
-
-    enum class ContinueStatementError {
-        NotInALoop,
-        LabelNotFound,
-    };
-    MOZ_MUST_USE inline JS::Result<Ok, ContinueStatementError> checkContinueStatement(PropertyName* label);
-
     // True if we are at the topmost level of a entire script or function body.
     // For example, while parsing this code we would encounter f1 and f2 at
     // body level, but we would not encounter f3 or f4 at body level:
diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h
index 675da8c2e87b..92bf5620691e 100644
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.h
@@ -13,27 +13,6 @@
 #include "frontend/TokenStream.h"
 #include "vm/Printer.h"
 
-// A few notes on lifetime of ParseNode trees:
-//
-// - All the `ParseNode` instances MUST BE explicitly allocated in the context's `LifoAlloc`.
-//   This is typically implemented by the `FullParseHandler` or it can be reimplemented with
-//   a custom `new_`.
-//
-// - The tree is bulk-deallocated when the parser is deallocated. Consequently, references
-//   to a subtree MUST NOT exist once the parser has been deallocated.
-//
-// - This bulk-deallocation DOES NOT run destructors.
-//
-// - Instances of `LexicalScope::Data` MUST BE allocated as instances of `ParseNode`, in the same
-//   `LifoAlloc`. They are bulk-deallocated alongside the rest of the tree.
-//
-// - Instances of `JSAtom` used throughout the tree (including instances of `PropertyName`) MUST
-//   be kept alive by the parser. This is done through an instance of `AutoKeepAtoms` held by
-//   the parser.
-//
-// - Once the parser is deallocated, the `JSAtom` instances MAY be garbage-collected.
-
-
 namespace js {
 namespace frontend {
 
@@ -621,7 +600,6 @@ class ParseNode
     appendOrCreateList(ParseNodeKind kind, ParseNode* left, ParseNode* right,
                        FullParseHandler* handler, ParseContext* pc);
 
-    // include "ParseNode-inl.h" for these methods.
     inline PropertyName* name() const;
     inline JSAtom* atom() const;
 
@@ -755,12 +733,8 @@ class ParseNode
     }
 
     void append(ParseNode* pn) {
-        MOZ_ASSERT(pn->pn_pos.begin >= pn_pos.begin);
-        appendWithoutOrderAssumption(pn);
-    }
-
-    void appendWithoutOrderAssumption(ParseNode* pn) {
         MOZ_ASSERT(pn_arity == PN_LIST);
+        MOZ_ASSERT(pn->pn_pos.begin >= pn_pos.begin);
         pn_pos.end = pn->pn_pos.end;
         *pn_tail = pn;
         pn_tail = &pn->pn_next;
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index de78778c6d91..ac5997f3f187 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -42,7 +42,6 @@
 #include "jsatominlines.h"
 #include "jsscriptinlines.h"
 
-#include "frontend/ParseContext-inl.h"
 #include "frontend/ParseNode-inl.h"
 #include "vm/EnvironmentObject-inl.h"
 
@@ -1747,7 +1746,7 @@ Parser<FullParseHandler, char16_t>::checkStatementsEOF()
 }
 
 template <typename Scope>
-typename Scope::Data*
+static typename Scope::Data*
 NewEmptyBindingData(JSContext* cx, LifoAlloc& alloc, uint32_t numBindings)
 {
     size_t allocSize = Scope::sizeOfData(numBindings);
@@ -1761,9 +1760,8 @@ NewEmptyBindingData(JSContext* cx, LifoAlloc& alloc, uint32_t numBindings)
 }
 
 Maybe<GlobalScope::Data*>
-NewGlobalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc)
+ParserBase::newGlobalScopeData(ParseContext::Scope& scope)
 {
-
     Vector<BindingName> funs(context);
     Vector<BindingName> vars(context);
     Vector<BindingName> lets(context);
@@ -1826,14 +1824,8 @@ NewGlobalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& al
     return Some(bindings);
 }
 
-Maybe<GlobalScope::Data*>
-ParserBase::newGlobalScopeData(ParseContext::Scope& scope)
-{
-    return NewGlobalScopeData(context, scope, alloc, pc);
-}
-
 Maybe<ModuleScope::Data*>
-NewModuleScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc)
+ParserBase::newModuleScopeData(ParseContext::Scope& scope)
 {
     Vector<BindingName> imports(context);
     Vector<BindingName> vars(context);
@@ -1898,14 +1890,8 @@ NewModuleScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& al
     return Some(bindings);
 }
 
-Maybe<ModuleScope::Data*>
-ParserBase::newModuleScopeData(ParseContext::Scope& scope)
-{
-    return NewModuleScopeData(context, scope, alloc, pc);
-}
-
 Maybe<EvalScope::Data*>
-NewEvalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc)
+ParserBase::newEvalScopeData(ParseContext::Scope& scope)
 {
     Vector<BindingName> funs(context);
     Vector<BindingName> vars(context);
@@ -1948,14 +1934,8 @@ NewEvalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& allo
     return Some(bindings);
 }
 
-Maybe<EvalScope::Data*>
-ParserBase::newEvalScopeData(ParseContext::Scope& scope)
-{
-    return NewEvalScopeData(context, scope, alloc, pc);
-}
-
 Maybe<FunctionScope::Data*>
-NewFunctionScopeData(JSContext* context, ParseContext::Scope& scope, bool hasParameterExprs, LifoAlloc& alloc, ParseContext* pc)
+ParserBase::newFunctionScopeData(ParseContext::Scope& scope, bool hasParameterExprs)
 {
     Vector<BindingName> positionalFormals(context);
     Vector<BindingName> formals(context);
@@ -2048,14 +2028,8 @@ NewFunctionScopeData(JSContext* context, ParseContext::Scope& scope, bool hasPar
     return Some(bindings);
 }
 
-Maybe<FunctionScope::Data*>
-ParserBase::newFunctionScopeData(ParseContext::Scope& scope, bool hasParameterExprs)
-{
-    return NewFunctionScopeData(context, scope, hasParameterExprs, alloc, pc);
-}
-
 Maybe<VarScope::Data*>
-NewVarScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc)
+ParserBase::newVarScopeData(ParseContext::Scope& scope)
 {
     Vector<BindingName> vars(context);
 
@@ -2086,14 +2060,8 @@ NewVarScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc
     return Some(bindings);
 }
 
-Maybe<VarScope::Data*>
-ParserBase::newVarScopeData(ParseContext::Scope& scope)
-{
-    return NewVarScopeData(context, scope, alloc, pc);
-}
-
 Maybe<LexicalScope::Data*>
-NewLexicalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc)
+ParserBase::newLexicalScopeData(ParseContext::Scope& scope)
 {
     Vector<BindingName> lets(context);
     Vector<BindingName> consts(context);
@@ -2143,12 +2111,6 @@ NewLexicalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& a
     return Some(bindings);
 }
 
-Maybe<LexicalScope::Data*>
-ParserBase::newLexicalScopeData(ParseContext::Scope& scope)
-{
-    return NewLexicalScopeData(context, scope, alloc, pc);
-}
-
 template <>
 SyntaxParseHandler::Node
 Parser<SyntaxParseHandler, char16_t>::finishLexicalScope(ParseContext::Scope& scope, Node body)
@@ -6492,16 +6454,44 @@ Parser<ParseHandler, CharT>::continueStatement(YieldHandling yieldHandling)
     if (!matchLabel(yieldHandling, &label))
         return null();
 
-    auto validity = pc->checkContinueStatement(label);
-    if (validity.isErr()) {
-        switch (validity.unwrapErr()) {
-          case ParseContext::ContinueStatementError::NotInALoop:
-            errorAt(begin, JSMSG_BAD_CONTINUE);
-            break;
-          case ParseContext::ContinueStatementError::LabelNotFound:
-            error(JSMSG_LABEL_NOT_FOUND);
-            break;
+    // Labeled 'continue' statements target the nearest labeled loop
+    // statements with the same label. Unlabeled 'continue' statements target
+    // the innermost loop statement.
+    auto isLoop = [](ParseContext::Statement* stmt) {
+        return StatementKindIsLoop(stmt->kind());
+    };
+
+    if (label) {
+        ParseContext::Statement* stmt = pc->innermostStatement();
+        bool foundLoop = false;
+
+        for (;;) {
+            stmt = ParseContext::Statement::findNearest(stmt, isLoop);
+            if (!stmt) {
+                if (foundLoop)
+                    error(JSMSG_LABEL_NOT_FOUND);
+                else
+                    errorAt(begin, JSMSG_BAD_CONTINUE);
+                return null();
+            }
+
+            foundLoop = true;
+
+            // Is it labeled by our label?
+            bool foundTarget = false;
+            stmt = stmt->enclosing();
+            while (stmt && stmt->is<ParseContext::LabelStatement>()) {
+                if (stmt->as<ParseContext::LabelStatement>().label() == label) {
+                    foundTarget = true;
+                    break;
+                }
+                stmt = stmt->enclosing();
+            }
+            if (foundTarget)
+                break;
         }
+    } else if (!pc->findInnermostStatement(isLoop)) {
+        error(JSMSG_BAD_CONTINUE);
         return null();
     }
 
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index 0b050fa95e30..507d2940a74f 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -47,6 +47,20 @@ public:
     { }
 };
 
+template <>
+inline bool
+ParseContext::Statement::is<ParseContext::LabelStatement>() const
+{
+    return kind_ == StatementKind::Label;
+}
+
+template <>
+inline bool
+ParseContext::Statement::is<ParseContext::ClassStatement>() const
+{
+    return kind_ == StatementKind::Class;
+}
+
 template <typename T>
 inline T&
 ParseContext::Statement::as()
@@ -291,13 +305,6 @@ ParseContext::VarScope::VarScope(ParserBase* parser)
     useAsVarScope(parser->pc);
 }
 
-inline
-ParseContext::VarScope::VarScope(JSContext* cx, ParseContext* pc, UsedNameTracker& usedNames)
-  : Scope(cx, pc, usedNames)
-{
-    useAsVarScope(pc);
-}
-
 enum class ExpressionClosure { Allowed, Forbidden };
 
 template <class ParseHandler, typename CharT>
@@ -941,21 +948,6 @@ class MOZ_STACK_CLASS AutoAwaitIsKeyword
     }
 };
 
-template <typename Scope>
-extern typename Scope::Data*
-NewEmptyBindingData(JSContext* cx, LifoAlloc& alloc, uint32_t numBindings);
-
-Maybe<GlobalScope::Data*>
-NewGlobalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc);
-Maybe<EvalScope::Data*>
-NewEvalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc);
-Maybe<FunctionScope::Data*>
-NewFunctionScopeData(JSContext* context, ParseContext::Scope& scope, bool hasParameterExprs, LifoAlloc& alloc, ParseContext* pc);
-Maybe<VarScope::Data*>
-NewVarScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc);
-Maybe<LexicalScope::Data*>
-NewLexicalScopeData(JSContext* context, ParseContext::Scope& scope, LifoAlloc& alloc, ParseContext* pc);
-
 } /* namespace frontend */
 } /* namespace js */
 
diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h
index 741eae2f9fa3..ba2a5623758b 100644
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -15,14 +15,12 @@
 
 #include "builtin/ModuleObject.h"
 #include "ds/InlineTable.h"
-#include "frontend/ParseNode.h"
 #include "frontend/TokenStream.h"
 #include "vm/EnvironmentObject.h"
 
 namespace js {
 namespace frontend {
 
-class ParseContext;
 class ParseNode;
 
 enum class StatementKind : uint8_t
diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index ac9e2a2f0a58..c0ee94921941 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -153,12 +153,6 @@ AutoGCRooter::trace(JSTracer* trc)
         frontend::TraceParser(trc, this);
         return;
 
-#if defined(JS_BUILD_BINAST)
-      case BINPARSER:
-        frontend::TraceBinParser(trc, this);
-        return;
-#endif // defined(JS_BUILD_BINAST)
-
       case VALARRAY: {
         /*
          * We don't know the template size parameter, but we can safely treat it
diff --git a/js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.binjs b/js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.binjs
deleted file mode 100644
index 925b6d52d433c088dc5154744a079d04e936aeef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7935
zcmeHM%We}f6rJ*B1MFcj3l>GFFBV8tX;B-32r4NeQN<3qiJOd=&IFIs$FHzu$8Yc#
zu;c^Sv0}l!9#8Cvoryb1tJ1P*RF8e1=RSO0;e&oi*DF0rI_qy)++}3nyW)A?ZrnNc
zHtUVo&DCZ*?o+R_B=%IoAmQs94?OP<?5gO;cL)o}Zb)Cyc1RfEK^zHE9rb_WeGH;b
zp4Km*GdGD=%mk^R;{{Q`hXi!?^$v}AuoqA!$VFsd37v2jMBVk9z@}NNw(8rB%932G
zEJ-3dt)|$&6>!Q(D99a<aA458kMv+`o7X-KNEq<rh2`ZHf5Bf_S$wwm)Z~%zS`t>Q
zND;0AnFGSi?Yc-Mt@|BlpP_YkYVVq}vhEEKy;gm*@!^SSnX@<K@3S-Hbzs%1x3+4g
z-Z~;2LHZD>^{9_vYjdAUr1}ul5Tr5l=l!*{HUE*xYziaSj{1xy38a7~C!Fp>XbKq8
z;kq@3t0WB7QE{RTOH@UkZUBdfzYWSKoG{*^2`|u4lGUjzIi^tobE#B;u<ig2kyurC
zQ05-cI%JTPUO~2|tQBv?T~jBKT0TR}8)3g0M1&nHy*x}j84SFT?s1O=-JVLXGCv`q
z$BL0|q*Ea2V2D}gaa7P(3J!5^L4|{K1>rlSoaX=GzZOQyP3HxESnx6DsA^}LOz8C-
z?1|9IbqAYq98waEt*LX?LfoK-$`GOjm{l+#hNMhm)L4ZbW(+y2A!~f*<6P9_i2$Er
zO31d4oX(bYD#|eb972AA#s)(2zDCPWm-`DnY%}NxL~U--?eDPtVtetA&5Mp*NorhK
zU>rh!dN^P^nF?pddr350Z1?tTX*?gKv+Qn){3FWBHaO78$BuAAL3@G4@%cimhxe3}
zbyAl;Q+xyS8~NU$mBKR(GU2j5D>|3nOJ7gZOAWaDK<}9Kf56J<dH#n?I*b!J$?A*~
z8u21V#`KNAHGm#J@i^e+AZp`CQ=e`kB^XKeVcNN$j31fmxOQ-f^F8YaurHHU(S%24
zEj*!^Nac8HDp>XDQJ=PL)0wn5>vC;|ar>jX?o6Ik&%<pTcjfM)C2vj}Fwp8oIKoi`
zgaaIBC~L}Ex=s#|Kr6vKZ4g?lq?0N;jzJW`5U{j-r;4boIUoJi6;}>X;6R}OT5=9K
ztTy_w)9Yq$0dt%=R!KsYSu+&`unz#2m_c&TbO3|%^s6iy&~WE!-sb=>$8H^Gb7I_W
z`Xuv>jt>WKplp^jSdv;%Iy|9ZMLA>4#Z@lrjPxf!&~z9@nSR-CnKKjEVcJgF!`oL{
zc4?;p&w7bmu97|<uxu^&K=}pSau>x-#7mxd`IG&<^1S?JTr#vX#%rPcR#c<q7PNm;
za5p$wCdBfPJ#EO382H8mo5l^2U9OI5pGJ#^{50lyM1D0JCHbNFAwq5%30iGc50|vW
ci@)zdJ<-m{t=2pzzZKfaiu{yO23Ps}7ZJ$`^Z)<=

diff --git a/js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.js b/js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.js
deleted file mode 100644
index c96d1be3ef1d..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/StrictEquality-001.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          StrictEquality-001.js
- *  ECMA Section:       11.9.6.js
- *  Description:
- *
- *  Author:             christine@netscape.com
- *  Date:               4 september 1998
- */
-var SECTION = "StrictEquality-001 - 11.9.6";
-var VERSION = "ECMA_2";
-var TITLE   =  "The strict equality operator ( === )";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-
-// 1. If Type(x) is different from Type(y) return false
-
-StrictEquality( true, new Boolean(true), false );
-StrictEquality( new Boolean(), false, false );
-StrictEquality( "", new String(),    false );
-StrictEquality( new String("hi"), "hi", false );
-
-// 2. If Type(x) is not Number go to step 9.
-
-// 3. If x is NaN, return false
-StrictEquality( NaN, NaN,   false );
-StrictEquality( NaN, 0,     false );
-
-// 4. If y is NaN, return false.
-StrictEquality( 0,  NaN,    false );
-
-// 5. if x is the same number value as y, return true
-
-// 6. If x is +0 and y is -0, return true
-
-// 7. If x is -0 and y is +0, return true
-
-// 8. Return false.
-
-
-// 9.  If Type(x) is String, then return true if x and y are exactly
-//  the same sequence of characters ( same length and same characters
-//  in corresponding positions.) Otherwise return false.
-
-//  10. If Type(x) is Boolean, return true if x and y are both true or
-//  both false. otherwise return false.
-
-
-//  Return true if x and y refer to the same object.  Otherwise return
-//  false.
-
-// Return false.
-
-
-test();
-
-function StrictEquality( x, y, expect ) {
-  result = ( x === y );
-
-  new TestCase(
-    SECTION,
-    x +" === " + y,
-    expect,
-    result );
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/apply-001-n.binjs b/js/src/jsapi-tests/binast/parser/tester/apply-001-n.binjs
deleted file mode 100644
index f94932cbb4a44f278460e80be0fb269addbe2dff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4825
zcmdT|PjAyO6!-X#;J_I!y#a!)+mH~NvPx?kSW#D|C7a-Yke9fvwJfO|ccWj0kH&>N
z;>ZW!*>w`PPD^OhO`Mv>_IrN6_j~_h@!=pKHLFjsUpr(`kKuE410i%8`6E<sb>2HW
zju#CGvZ`{A70{U1em+9zA?&jB<M!79BXLZl(BYVqa}sj22AfFwJ{6)LYv3Trj!NYo
zydnf))*A{baqhX64@<O536okve4br0=8T5D+HKH2fG2KM)f=m-R7*4Zur6*mVTL2m
zwkanJ2XgrW2SY>l6FBF%d+xEbQ|WHt!5|n_Jci?bg_D?Xm>R26WqN_+B03Zq4F3y)
zpO-)oIE3oQ?>ff^b^B<ivc2`@)$4^|dpit04zz0$FTf0oM|2Z}Q-3y%b=V6qNwB1A
zUQU-%4<heu(r<b3GjT+VFHn%uJmE(2yX=`0%qTt$hz^hlaz6tsMrSni(;G;x{(vn;
zcudQRm<(CKnue680`w~v!1pewa_olN`p}t=a>3|)0P<u^u5WH`t%s(}1X>l9Dm@6+
zTwrEy*UgzmK+vrKn%}P$%@g~`DGSXzaCN(Ju=i!lL}m#f%Sm^Fp{igcHA?qZ0rK4k
z2{FfvyO6o(Sg6G6(ih~yudCyNsDW<FZQG_{x*-MQ>M=-D)$ZB$%kAeCKO%AXl#ffF
zsp8t%Ap*0kc0v@aO9qX>K6FcjxludnnI_BB`3+cUq|Q1GF&ky9mqiMCD=1lzMFZ01
zh|yj@OQI?(2|+J1MY`KoAhJNfl%1`GftAd_lr%X3SKxMY7@taBSueH+4R9|MUF%|g
z-pydp{anCoQSzF$(>Q7!mR3d=4)+|-Wq3?BNo4+baD9N@13>MMhtQSS&CDwag>>%}
zOrC<6gs~{6zeuDezq<4Vf$NaV>}089l>kPR$_9>!35*P_-w@KbVB5rGRe;20XO@2@
zu#WrkUe%?oaLg4z6Btrw_~H{R8?~sQabn2V>%FOBdaPYpW}O01ShQT*Ctwq^dX7!X
zaY-~P8+CW;qn+q6#{Z!m9M4$9@4)wnSiRoIag#FQaT~mpj!0vqzz&hQEmiAhW^uKi
zpOn;MZuF?NoT{jaG{adFX^awTO}IcCiZw-3A6?YSj6Pefn(j~we`&iUjBC^1RsH}2
C(igV?

diff --git a/js/src/jsapi-tests/binast/parser/tester/apply-001-n.js b/js/src/jsapi-tests/binast/parser/tester/apply-001-n.js
deleted file mode 100644
index eac0584461e3..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/apply-001-n.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-print("STATUS: f.apply crash test.");
-
-print("BUGNUMBER: 21836");
-
-function f ()
-{
-}
-
-var SECTION = "apply-001-n";
-var VERSION = "ECMA_1";
-startTest();
-var TITLE   = "f.apply(2,2) doesn't crash";
-
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-DESCRIPTION = "f.apply(2,2) doesn't crash";
-EXPECTED = "error";
-
-new TestCase( SECTION,  "f.apply(2,2) doesn't crash",     "error",    eval("f.apply(2,2)") );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/boolean-001.binjs b/js/src/jsapi-tests/binast/parser/tester/boolean-001.binjs
deleted file mode 100644
index a724010a7b3799aefaa8ad782dab6ceca9bd139e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7700
zcmds6&2AGh5MKU4h#!d?a0oXLqAd~!ghC~n76_^WA`u5Jm76umw%c{&b=rnU;URbq
zUV$q&E{I29?Dejvv9ocOB!Zr*)b?l3=b3NDvvn~X#B{yhrzBi|$61e)gWzls1iLI8
z1sl!QoA$GImknr8UsZGJag>VnZ+C*=D$J_m<sS%-$ZkwGX*VXEh=?T$Dm1^-U_VO2
zlUP3h=gc%L#uZc)22m1;0swE{3~3^wPZ8w`E+Gfz(5c{2(p$d-+qAbDo#xwCeO3Rj
zzN$emR$I;Ajs)c-R&a+T9$I+U0dJSFn3Ckt+S=olz0`)y;a3%Lb-n93Sb0deJsqE-
zBB9>_dx?a8*m~cd7oiv6=x^GOcb?e9ET6|;%i~en-D!5Vw`{wyLwLI7T|nE&+;U~W
znP6fxpeur9%kMw1H~9;4w~hy#rYQt_TM$7HAPANB(c=HkXl;-<HcQotF8qs{7{i8p
z#P$_1Iu(SA4oyXgg&G#4n{)h)2~st+3555Cl8Dr4x`#100qcl^{JaKTro6+pS<kjf
zDascJbt~F8qJ;2~u`7^z11b)x3`!c)Pa@z^uWy7@%aR0oXg0zmEdbJkh<PivG_Yn2
zEd1W#6&|N63EKiWll|hSW21^P{}W8HE`A(qK6z8d7Cr9Lfz0VPd)Q4pCF&L+wpgtI
zt%*KoM-J?QxYL+EF9Hi7p2OH7SQSW>a4$&|)6l-7<@5L(oO6l(*?GIu?!0fdUfH%|
zDmR%xvM4p1?e5X82p~~{K8lf3va7A~P!OqaI#rjS+XG8RX_4-2wA=$Q8y={a0W~ij
zCWGeS6{_40ADOhPo*psl?gxF6gfZ0e`MU!jdqd6`TU7d9`F%c6DR3U|mCwubYZ*R{
zCk3XWMUTe(d0sV$RFh22?Q2(J{1GNt0q&{)*I;dni5jU*^nUG1g=cB2D|nb8$oPyr
zI4v(xUqDscOJp5q0A?wqo*UlqjV(+|JiKLY@s17h0F}~IBGBV^jL{AEGhN<n?~7A$
zC*v&YNWo;{hK_WX>^BsRS<i-sE$Et<SBnbs+b~asIeH^tQJP-hHi+o<8!;KCRK?E#
zx<dz(J52b%9=@d_*@Rlo0!EoRU#!7<Nv5I``J$pHE=Wc^n3;2VDQlH?Bu!~}&!#)4
zJ^zd8|L=&K;l1+@=?t}R1>b^)!^~LgY4rTcr|1oMPf^SjOEd&Nr(2`8shCltFdc4<
z%1?oJujs3bE5qcS$d*=vq}U>TW@Q)!wSofoq*{4gw|8@80llC91JbjaeG24fG7n!F
z@`~2cdaVft6>kPw%if)iW)yZu&jZMtybmoDdgQ=!xw(gTOc6mBs^@8C#x7|>SG0d(
zYQlIPc9&(%32zd-Lq!3ZEsuDZAq7ErwZf<9wr`#I6(-(*P4iD&&eld+@*z%-x!#?6
z$kA`rBNHANdep6<dQhIz`i6yIiyoy(uV~cKaM7bKKhi^zQdB}CxYYiFp-1ie)C2CM
Mtp}%kNO0!GKaCy6O8@`>

diff --git a/js/src/jsapi-tests/binast/parser/tester/boolean-001.js b/js/src/jsapi-tests/binast/parser/tester/boolean-001.js
deleted file mode 100644
index d2cea72b2913..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/boolean-001.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          boolean-001.js
-   Description:        Corresponds to ecma/Boolean/15.6.4.2-4-n.js
-
-   The toString function is not generic; it generates
-   a runtime error if its this value is not a Boolean
-   object.  Therefore it cannot be transferred to other
-   kinds of objects for use as a method.
-
-   Author:             christine@netscape.com
-   Date:               june 27, 1997
-*/
-var SECTION = "boolean-001.js";
-var VERSION = "JS1_4";
-var TITLE   = "Boolean.prototype.toString()";
-startTest();
-writeHeaderToLog( SECTION +" "+ TITLE );
-
-var exception = "No exception thrown";
-var result = "Failed";
-
-var TO_STRING = Boolean.prototype.toString;
-
-try {
-  var s = new String("Not a Boolean");
-  s.toString = TO_STRING;
-  s.toString();
-} catch ( e ) {
-  result = "Passed!";
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "Assigning Boolean.prototype.toString to a String object "+
-  "(threw " +exception +")",
-  "Passed!",
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/boolean-002.binjs b/js/src/jsapi-tests/binast/parser/tester/boolean-002.binjs
deleted file mode 100644
index a52b8a39dfdd3439994c3e4fee0861d161194ac1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7749
zcmds6&2AGh5MKU42n6B=mvAdWv;`p{p-_p2AX-H!BB2K^m78^wh3z`>I+XAzybX`R
zl>-t7cm~E^?|K@0Q)fvc=qcKG{n_(*=9}?sU5th?-KY;J2{&GI*5~9fI2#1PJ`2ae
z=2m;V^R&}rLmJfA)I0S!O2x+4J3(+2-m2s2yM#w%Kc+8eFD9Ibh$RXtG|y@9AxgsI
zSl<EX%t=^`E2t<8q9hUp0A7A8q=|?QBFYt9LJrNQQ^BL8zi|nc=`<VNt(|s#P5)P4
z(;yhDquy^tf^rfoxQ`?rS$Nk0Z=bQ4lH|eq`lHqNsSTUMuPNf{dew6<^CRK*>v$Ix
z3H=7xOC)r+`KB{3LNCD9w>uB_9^1q$pT}Rz<5Ak(-RicQw%ynvJlzt4GuX`Ba&^d=
zU}8L^tIC6S4p#2jYy1Vb%}+y4(-dO8BZ#1f5QED3Xz{-@SQ{jc%~Um`2Y*o$V%Tnv
z(7pmTr-E?NrKy-=p@zliW*>iJf)q_{0^$9UBqDX1?qSRgz&hffKCeKQDetlt>)SRd
zLHPoaZUy^hln_2Pb_G&yK*T|mK}chIAOars2S!J=DoLRGW+6<{0w6tzn73d{18c^>
z!tWhk;jz0ZQClEqs$V=h7OJT7Kfx61;3u)>lQv~+(N8@(lqub254(w{LfrzyHmen&
zH8J4q$bnrDcN(+jMPLEMa}+xSs{*MK?j?z08ro;Hd>(&;b1un0FN5K`&s%Ssdpj>}
z(=n4Tm_Vv1C7bQPr#%rsngn?iW2a(Qo8=)OQr>i;p1yAnEE%LlvbWK42f%E2pvoQU
z!l4{9$F5M~cKO&OU3Kq>S?@zIAW0ZQA)jA5@UA!I8xxbJURHjc4^#r2$7SX7^1NCG
zkK;apsc6%q33r}X1tPU1({lURl@z~&7p(C1RR3!*x6MS2)JmOSyHep<+Ug1(W(YDq
zBR5W`7pTvnrtK%PiZcMSlu^$NZ}`L(CM6!;GOuvQ_IO|#bzXO<^W+I*aKrpeM>pHu
z;xwGdB#AmqFqgQMBYh=%hI%pU*3hsG{StFwQ89iyk8yN8z>0KoZQCHCH)zCUlu{Ku
zL+A?~miLzMhCMt>g|UgVoCS<BbFx^6tCGw^$C5=wM_iDGcrY{P%2HMVuSuHH@UBgF
zPJ8}~>HqJDo8hYS56KL*PX(WXhr>vb7OX7e=SN%mn<)Wa6YC9N7nR&3MA;mpQ7tNF
z)F@1cTch$_;MFVo>f&lJc_y-()gURhNbgx07J^zqb$eW`JdWGDud;x)&;J4GS;{^E
z@-vx-?+bZ3Yd2kMf<d*LVb-!Mr=typz0q@hd5|m6JfTMpJeQYyIL8SZ=tA|}tqkfZ
z?dOX2mu4o6=VAA>q*-zw!7EhMkJ-|QhZ#~2gjW-MPG#Z`IM$o6X#Q<W`lNNSOQ(E+
z(_^kXryg>2TJ?xqB++2j7{XT%YY=yh^q{oC`mm+PO5y{JI{Gkr)a7G(NCpS0t`S^n
df7j5X_F3xzcRtsH(m1QBqsLD8^x#aVe*kq6)J6aR

diff --git a/js/src/jsapi-tests/binast/parser/tester/boolean-002.js b/js/src/jsapi-tests/binast/parser/tester/boolean-002.js
deleted file mode 100644
index 8dd55ed6b432..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/boolean-002.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          boolean-001.js
-   Description:        Corresponds to ecma/Boolean/15.6.4.3-4-n.js
-
-   15.6.4.3 Boolean.prototype.valueOf()
-   Returns this boolean value.
-
-   The valueOf function is not generic; it generates
-   a runtime error if its this value is not a Boolean
-   object.  Therefore it cannot be transferred to other
-   kinds of objects for use as a method.
-
-   Author:             christine@netscape.com
-   Date:               09 september 1998
-*/
-var SECTION = "boolean-002.js";
-var VERSION = "JS1_4";
-var TITLE   = "Boolean.prototype.valueOf()";
-startTest();
-writeHeaderToLog( SECTION +" "+ TITLE );
-
-
-var exception = "No exception thrown";
-var result = "Failed";
-
-var VALUE_OF = Boolean.prototype.valueOf;
-
-try {
-  var s = new String("Not a Boolean");
-  s.valueOf = VALUE_0F;
-  s.valueOf();
-} catch ( e ) {
-  result = "Passed!";
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "Assigning Boolean.prototype.valueOf to a String object "+
-  "(threw " +exception +")",
-  "Passed!",
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/call-1.binjs b/js/src/jsapi-tests/binast/parser/tester/call-1.binjs
deleted file mode 100644
index c695c8be4ef547bd7005592da25172bb4ad5f837..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6585
zcmeHL%We}f6gBV10@$(5vK6HPBsSG3Qj-P<3Mp!$ZjqBXsoTjo@;EK|0X_hU4WGsr
zz+Z6famLPgk~(QpO4Uu(jO}CJ$2q>fffx-#QVNa;?v_4t*5`PDZX<-+tUE^KTH|AL
zr`cgcf`X!&6NEGtrEkv>dJMAyd-);e6t_dNM>-+qSWp%zsIK`PqZ1l+r?Gwk&aLyX
z7*|lVi)che3Se(v>yk*&9wl7CMR;Hi9ScsQe(3>h)2vonwf#m=)Zc=l2C=c4YJQyx
z!f~kJPH{ML@a_X%2Z!Oy*Dl-ywx}Ey=-uwXic`$p>Gtmbha(TG2hCMFvRe7H`{j-6
znag+N9|+PVW#m2Bs#R;%tFGO4MtJ5UuoAr+MIA}K?ICA^iSdwZ%M^9-FW}ee*C8iy
z47)T17Gwa#Qw}5P_gscn;2dVDS|N`{46kgPJ^1_x?2QHHqD5jc$3hKjqnmSF#0067
z+62t|Bk71Z*K`kKo&nYw2g&&WT1<G0)mh)QNvX+C$WA9g%QV7#Z0tf(Ye2a{i9tO>
z(i4c&{*e(+ElCpSh1tk<(i$K=9I<MZmIfA#fob07WQE7+<}fxzP9#75nX{1z(?aRj
zAZKQ!x)E2EeGkD&l0_996W3SDpzo0FcVXJprSIXfRmZacXQ;5~lmPEpqKr!7HpCH)
zw+iy_rfY(o*B*zKSNr?=etEY(A1b41-h!~lL?)7~eM~w6foub3#duj6dFpy+z6Bo6
zkWrV3<^oM}TqQ^wrb!1(B}faxVOa{psb!PJc4$1N>xyc!I{WjQu<Zoo`zo;Q6$C7o
zZDqznf}^d1{>Ky?=djPSn2|!;!(pBr*$Hz)K=puA1l)kD&LN-&zokO!D7qB4oxL{I
z@;-rwHL@y9i(l8CS-NpOFYULWAy+|0b{3bBZT05f?`>?}2uenQ-K@4*>cJ7u8~yjX
z1tp{2vQ(Fa#*8Q7a`Lm>Di0_A1JPPA%<_bqMQ+NZLa0Hrh1A*vaj~F#1VU!BShxi+
z>6F<0N{Iwb#v$}C2l4DC=z?MJs>zkR>#)Bh!Bh$D;Q{s5Zy)CbIf<fu;Bv@1C+68H
z3x@gK-c2}>bEpF%Mm*F1ne;%?3V&+b)%PbZ;u!mAo)sxL3M|uYleBL<gGM&K-A7MA
zl3sdt=`w3HYiBK$aZ9#`u5yy;q}zbrxam`=4EX^QpGf<(dAZuA$L6N9o|E@}wxFFZ
zydKNxuIQ2c289Lb^rQ8dd)4Uyhco*7jQY_U&FMK>n@uZ`9>`T<J$6p#FIR{E0&9L;
AM*si-

diff --git a/js/src/jsapi-tests/binast/parser/tester/call-1.js b/js/src/jsapi-tests/binast/parser/tester/call-1.js
deleted file mode 100644
index 9ff19555e8a6..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/call-1.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          call-1.js
-   Section:            Function.prototype.call
-   Description:
-
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "call-1";
-var VERSION = "ECMA_2";
-var TITLE   = "Function.prototype.call";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-new TestCase( SECTION,
-	      "ConvertToString.call(this, this)",
-	      GLOBAL,
-	      ConvertToString.call(this, this));
-
-new TestCase( SECTION,
-	      "ConvertToString.call(Boolean, Boolean.prototype)",
-	      "false",
-	      ConvertToString.call(Boolean, Boolean.prototype));
-
-new TestCase( SECTION,
-	      "ConvertToString.call(Boolean, Boolean.prototype.valueOf())",
-	      "false",
-	      ConvertToString.call(Boolean, Boolean.prototype.valueOf()));
-
-test();
-
-function ConvertToString(obj) {
-  return obj +"";
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/constructor-001.binjs b/js/src/jsapi-tests/binast/parser/tester/constructor-001.binjs
deleted file mode 100644
index 0fb83e3759f878f95966ec2a96c440197bd6bf63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7148
zcmeHM%W~5&6gBVn01Ft{g<U%gO<`HwblNnFFePQ0Og9X}D7NYf94jL$ZL{LL_!Sm>
z0Q>}3wrr`k;yO;rw1HK|k#uzL(Yg2PVe`?@#|`@sBe(H^QIDa4b=9)0K6S^|R=e}A
zyViB+5L<RV>SOyP<PGP!Wj%miwmy6xF@pL&-o}oP7~+Hm5tOUGL+dLE+|yXU0O!hC
zSd>Lj#I;C3cnY9T-*$1p$pOJEf(y_<869#)0<Uokrs=ktz4mU$uFL=Ix&+a&x>5ff
z!ZAaB1b2k|Q4a4Z;O$|rbuz3wGyuSn!zp{Uy81c~pG;Ga2(;zw*8t%Nv3z&knu^5!
z0PHyuyWiUDo)@t<!Sq)1{pRO4d1mHM<j?sLc>|{EwR=0Qyx+PaO6v1IpauB27Hf2A
zIS)DmnV@=x!w{mp%Mr%|h`vZ}IQ`!krcLDgYG^dVfxoZ{F5S@*L460D3^`)FheKZA
zp@h}Zl^s*LunAs!fpAy>SR#@kPeR^<T;<~fZZYB=s#GNdUIgU2vQoEZo9cKX3Df=;
z>~L$y1TY^P`K&go1g|0nW8o-s6S?SSmw*yW1Ws_u$3vV)tBCptP(93>J_<u9T@gj)
zz^idqZBz+*1k=0GQs>RT5KP|&138V8PTs_1`Le&d=@m=ZO$e7cl`s)+%pgwPiw-{4
zB3>9aTk0wbu`HVv_6^F`snS~}LknW0n}~TMk@iAkCMu!ydw{j+x*}6IQD|U0+8lj{
zDMdOxwY%IR0b*n2(liP8r4p^aoF%L12AC2j!j&|Mtz;8VZM_zUu+}FDnYT4Hf3mC<
z?05loEa~NZIcG&tiLWr@LzwYnT!iEv;#09F8R?u6A%88QmWkyOYMrjYBr7WeHT{&l
z>+~xXU#`IX1`C=C%#u;`B(L6(j+kRe0y<SC(XR{ijWxp#R|mW3f)n*%5-F*k;`3wr
zxj^zl=PNJIr+wrXC#)?>eT;(Sq!0Y3r7dCjvI%IC+lfC5oS(=H0)iW@Y;}c09%b0P
zQPEYgU?RE;Occ5P4+zPdK}gT?LK=*GPJ9xaQR@~=N8;39;Q4<U72YiyWCRx-ydAjs
zq`0Pa;EcwIvnVx9$f&^cxyuMrLvkKY-bD0bP~u!6HmkhUWu>guI==oUBTR|E;eI84
zcEN539zN6oJ=!h)hK`S+Z}RFe@faS)?<A%RDXl4cD=3?cuPd_6aIdY6$~_&(w&DYr
z>?DlM?s;U>q)H~6Cn!s6HKZ@CHN6c`@hDrf2T=L9X@9Tb8E&y<YhE$3VZzOv@r>{X
DZqXtR

diff --git a/js/src/jsapi-tests/binast/parser/tester/constructor-001.js b/js/src/jsapi-tests/binast/parser/tester/constructor-001.js
deleted file mode 100644
index b268ae5ed099..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/constructor-001.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          RegExp/constructor-001.js
- *  ECMA Section:       15.7.3.3
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-var SECTION = "RegExp/constructor-001";
-var VERSION = "ECMA_2";
-var TITLE   = "new RegExp()";
-
-startTest();
-
-/*
- * for each test case, verify:
- * - verify that [[Class]] property is RegExp
- * - prototype property should be set to RegExp.prototype
- * - source is set to the empty string
- * - global property is set to false
- * - ignoreCase property is set to false
- * - multiline property is set to false
- * - lastIndex property is set to 0
- */
-
-RegExp.prototype.getClassProperty = Object.prototype.toString;
-var re = new RegExp();
-
-AddTestCase(
-  "RegExp.prototype.getClassProperty = Object.prototype.toString; " +
-  "(new RegExp()).getClassProperty()",
-  "[object RegExp]",
-  re.getClassProperty() );
-
-AddTestCase(
-  "(new RegExp()).source",
-  "(?:)",
-  re.source );
-
-AddTestCase(
-  "(new RegExp()).global",
-  false,
-  re.global );
-
-AddTestCase(
-  "(new RegExp()).ignoreCase",
-  false,
-  re.ignoreCase );
-
-AddTestCase(
-  "(new RegExp()).multiline",
-  false,
-  re.multiline );
-
-AddTestCase(
-  "(new RegExp()).lastIndex",
-  0,
-  re.lastIndex );
-
-test()
diff --git a/js/src/jsapi-tests/binast/parser/tester/date-002.binjs b/js/src/jsapi-tests/binast/parser/tester/date-002.binjs
deleted file mode 100644
index f79e4756def10a0baceafd9b732d10b198773592..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8840
zcmds6&2Aev5Z?ZzZHgXR^imWEqN9VLvHNps6$7#CAPyWgjTQlND(GEC+Ge#YaH%+Y
zmA*`oLmr|)Z#^|nkr^&`IbKo{wO$L2FE+F!KXQgM-+Uzdaz0D>et*JQy#H9_W5K4u
zhd~gW=J6spI37M6{XB~D84voqs!u;n3c3I0W)OS<z4~<cQzjC2n({*)rA#oH<e7qs
z&F><3k!10CtbYLKgLPQBP*6!6Bv~SB06P6~%rluhPq<KU8Jn6#7g8kIc>hzFW^^<N
zkAEHZclEdat_Go4Bh~*TkzBA;!M$YZ+`{_|@M0$UcYAw3*nk!Au5wvl&-W3GdC7#`
zozCCVm45^F7G3%D=*g%nS6+jqKOBAk`%kuGw(rNc+w&vZ9Ug}#N4DKGAUp%|8$dgR
zfV?vkxy<Ea#_tqdhRKxg+_ERQfMbtd%>*wBNb!+``KFM1D)M;!-I=2UmZoN?8WF)K
zZZeA+?UB*f!QetNAwyos6&7k(if-0%5fhLrwFyj&=je#SX}X6oUjo*d0MdB?Y|KTN
zpX6iPCdDRyLYiBdevo8LER0<Nat&}da53;_%Ad<XB;$#pPfbY(blXfsopcG19**dm
zr_sQkF|dw%M^t#MZbi!0$R*|1KOGbO|0(_x@ERofJar@%jS)|7Lb&@ZNqM|{C$?8A
z|AW<73Dn$^Zd3<y6n_=*87d;%_7<-E8W4whuLkYOiOA0!*mVG2MG1ld1@(qU-Nol)
zRumn_XDAk?z9?m#=Fy8_!m>C8sanZu8U+W~qcLcu9RCZ59-+IC<DWxTY$-8t10Ov*
zycez!KSO>-iW)BNVxmFKyFi^}XJef)dP7<;l3A<SLtHe(s@6=-UB3r%YMh~fFaVoW
z@Vmws8cZGq4gKLm^bPgqEqxAiY7!31Pyc|l4M3%WI*|*fKRg%i6F?qNC^@uLHhydd
zgJRJip{JD~Lr{JqiK-JLbg6BsLEM_4(M-3F9=~zM@;4Nz@`TOfA)IlI+En;(FfUi9
zwVgA^+$*6|515Q5gOtq+u3~To2m0yqO9496!`UhuY&TPsjXChPivvw2U9nX3a5C;Z
zP>!=a)<LITPCftL`D_Dy)nG7;!xg3E(s;`w{yjDrZ=Ymds&6})np<rBE=hpyJmnj}
zwi(P3Ep&|Gs1q(%aMZVejeV;tv8FrR^i&x@SKKmI&kG9gI_9}2coi{Vg+p8@!+ryz
z`WUUJhIl}GABr#G%>I5rdLBe~!1<+W=-usQ{H*s#X~CUazx2w_^_|(C<I;@on&*U=
zsJ$IHqrqIu6O{scgu@!vb7hO?axonphPx0w*14(-ZD{f;ovL+uwaDr}ouMUJY*sTo
zJc7wDH@>dCKhGk(K%lQHhy+g}N}Ls)sWT-RmmH52gAHL?#oyGs9){z^nR-WYB!QzE
zZF&lR4er1j&vV4ua?>yAFxE~{gp;H&c7TO;Y3^_*G*tJ99p>Z}-yW~SDBYlTan){=
zN1`Jyxvy8~qCJ4H$kk6-4%TQFt6uJ{qP6-@SN?>{xoEt6Rj)s_YNi7`GPs&Y7cx4U
zYHU~XS3}#3Su-7K<0aP)<>vvLfiIj_5&uGs_zK2XGT)AhqI{ND1*dTjNShk9NH;n4
zux@ia(dZV`Vzxjhkk+HNZd;<abgN6{kb#aECIg#yZ@S4DrUbOG-#v9JdiuP=&<*Y*
iqi%GRXWg>qVX~~<>hBGhSxE!3k_Ho$y{nkj|K9=H12G{0

diff --git a/js/src/jsapi-tests/binast/parser/tester/date-002.js b/js/src/jsapi-tests/binast/parser/tester/date-002.js
deleted file mode 100644
index 0f379b541276..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/date-002.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          date-002.js
-   Corresponds To:     15.9.5.23-3-n.js
-   ECMA Section:       15.9.5.23
-   Description:        Date.prototype.setTime
-
-   1.  If the this value is not a Date object, generate a runtime error.
-   2.  Call ToNumber(time).
-   3.  Call TimeClip(Result(1)).
-   4.  Set the [[Value]] property of the this value to Result(2).
-   5.  Return the value of the [[Value]] property of the this value.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "date-002";
-var VERSION = "JS1_4";
-var TITLE   = "Date.prototype.setTime()";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var MYDATE = new MyDate();
-  result = MYDATE.setTime(0);
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "MYDATE = new MyDate(); MYDATE.setTime(0)" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-function MyDate(value) {
-  this.value = value;
-  this.setTime = Date.prototype.setTime;
-  return this;
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/date-003.binjs b/js/src/jsapi-tests/binast/parser/tester/date-003.binjs
deleted file mode 100644
index 206cfa318f41de9cc31b42acb195b2a1bb5ff0f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8996
zcmds7PjA~c6xaT5zz!P*>@aMAjtPp@8M@Qv23VXFO^`W7Z4|u?jKtV#70ICJrv57X
zHv0y<4%n%u_P!6W_b5_&HfftyWuwg{f<^I1zQ^Bt??*CSIh~~Zush}~K71tdkzm)s
zhd~fr=J6~zI_;kgei=mhga_S@`lg#Eg*?0rgWyZ}s!O{+VIpCdDL>{>$^?^1o++rf
z{#^vmlPsRc`WJ9MScjDh1(n1>k|nYNpu?ZWJd?>)!i9p%*mXVWLW(3C9exJG3{HB(
z(~Ew$qu+Hq8iZmE)c5C!<btIN?gdMy7T)K87c<F!JUF;#0~+9ta#>f8_Yw4Y!G!%e
z9lxO~{{ieBy7I}%<3U@l`~;?cHu&j}pKZtN-jA<$=SQ@Acse{kvF)aW@Fe87fOZUo
zygL!O%;jvt?<(S6T-oq%;ntIv6TyoD0(>B0v}*`F#XDZTcSdNBrD@$&^@!jVuj7iE
z>=DmjfVqWaLJoN$S6HZFDSADRw=n@Tr8a?y(G(p~I8FC3<}1Lu5s-2oLN4ZFn4jk(
z+a{Gu{)8a6;`}Jdn3&ae1(<0db3-PE?3wZ_8Hi*wu9K%uNC<SN9*8<=3y>a;Xgf=z
zfnjZ6#d`-UJZ85dU@PP@;a5K$1HJnR{!{Q81o<>|1Qz9pXJ$gU2P{c>ynH2gS18}W
zY^(rUT$6S*2j(dLGU5}|L$>V=T=@+k_Vcg;4dqzmHxBHIfVWYAAfce%@Tfh0K4L}D
zGCzl6R@WD$tJ6Gs9*kKQryx{~sHQA9!Y>v&trX)=KMs^QZbOX!2T`%3z`*i!adfsi
zB>Mb@RJ1nBEo%4QXBU^xoD5PC^EZ5AIb(Y>f@M_V&Gv|z%{}LAKy!#BGCLLcq~g><
z^e_9Vsn;O))(ca!72O3<snuaM7s~J7Ksb&vlu9+gCR*iw?H>y3QM!Fg+GaZSIH!gn
zMRP@}05mwLFFA91!DG5!0pfv!dTRYH!0=%4S=J8fX?iMv>s|ha>RE35dEAGscP)bz
z!1wT-3MH}&o)7+VoQkD-Kss)Z$!Oe5*|gw_FB3RqxL$rxLA!c*NinykmYE1e**G)b
zfh9yj%w^`9^|vf+Je<6$Xd924C-wY$=d%q|-#e0RJoxXiz*tpfUhWC(U@}X)^tn3O
z0Cts27a=HH+zINO%M}UgJHVz1YSA6;^kim1M{mg0?db|!6Fea4v4Y!cq6~Wqi3;V%
zT%z(=Ztt!77ETi04@l4LaR;0a^)S32X8a~Jx^z$d!UMg%gZ=$qL-@j+=k4v=OG#Pi
zIWBS|+=C4yjA{eA=<UIZHObF~>N#DEN{8VtM2~r{sz%h8o>0q9OSH5$lQd5{Lc^S~
zS?TaF19O1f_$>9oG>h<bgI@d~65Q4(jaIZK(mXb8eHd6Ja_V0X)A3wSsbohOILgwd
zoAkfHAt>nQGHk<T-_j1M*+ynKPKw$Nu+Xm2Ev|%yY9F!1sJ!LN<F%cn3)GBP&3btR
zI%Xy;sdk*xNqYccnXB&EY%~|6JW##dYp~6e&ipZ#Q?YO{XD+8I`Aj=_M6el0monO$
zifvc$o32gztQiis)=Lf_%GW(M0be)|Bwj&{_!|0~Yk8X$MfpDi?vkS$ts@%!-l>aq
zo8tnB3}p*-0%={i>$W9=OSigY4(aHiFzL7`YDmYzzIoNH=*)Q;p&QVd_V!RWIx4Vk
camIvhTXSt%mTvX;2N+x_1KrbJa<@|ZA1|O|`~Uy|

diff --git a/js/src/jsapi-tests/binast/parser/tester/date-003.js b/js/src/jsapi-tests/binast/parser/tester/date-003.js
deleted file mode 100644
index f8f48c6992f2..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/date-003.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          date-003.js
-   Corresponds To      15.9.5.3-1.js
-   ECMA Section:       15.9.5.3-1 Date.prototype.valueOf
-   Description:
-
-   The valueOf function returns a number, which is this time value.
-
-   The valueOf function is not generic; it generates a runtime error if
-   its this value is not a Date object.  Therefore it cannot be transferred
-   to other kinds of objects for use as a method.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "date-003";
-var VERSION = "JS1_4";
-var TITLE   = "Date.prototype.valueOf";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var OBJ = new MyObject( new Date(0) );
-  result = OBJ.valueOf();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "OBJ = new MyObject( new Date(0)); OBJ.valueOf()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-function MyObject( value ) {
-  this.value = value;
-  this.valueOf = Date.prototype.valueOf;
-//  The following line causes an infinte loop
-//    this.toString = new Function( "return this+\"\";");
-  return this;
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/date-004.binjs b/js/src/jsapi-tests/binast/parser/tester/date-004.binjs
deleted file mode 100644
index 75e32116f50ba886aaca695cd325485fd07f71c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8655
zcmds6PjA~c6xY`M>4qLQ4CtXiQQwxLSknPJZEk?ZNwE~E7tBV1o(9HZZLPB8QFK#(
zm3^}TyX~@li@irt;*0rg(~1(Lxmd6${>b<L_sFiE&r-S9ok$Vyov3`Q#5DRiilWmz
zUPSvx{TG8D2cvu@qwcQxrkf^(-n;W4itfNyT{``hP>DEA<$)ZfLJ6JZnSqMk{~~&u
zWbt{dzX9i?O<1`yP)QsmS)ywIy8KZrGo8Fiq%v@sn7U0DS|!<d?{ipYaM&9j{nGF5
z+IQVu3qr95=KJGBOC?eR_fDj95AQbM#X`&Po;>-%2dsd1jmo-qy<0HnolySgbp3{^
z{0p$JP?fI^e;u@?%1>eIF9zTLb}jVy@73uM<sKdlj}O;7M4&_71+)Wj$j394>s&8p
z^6^;eVKS9I`~}?e@cm55qJRJ&Xjp9ufoJ?q*6-N}?TIvXQ_YMKypk@iXbc3z^A{j)
zp@q^zS?DzqG7;|faS;(PQ(6&(8qZM?1uJ@hFkb=InSzw_Gvs2ahWT+m_GL1;<WC54
zFV6RqOsIvEE5b|znHw@OWY1K-(UD5V6PG+~LPDTNZXs%dOMnbeMB7;!1?)HhYrki_
zB4BrG0=7mj6Mp@dS?KyF_|HIV5ajce2`uU(ftd;6o{J=v@oGz4U7`FBcH;%mvQ66I
z9GIiz`;nX>AM#~ypvrFmv7dKp(2ky{{EWe_9q=X+5OgT0H*(aTf1Ze<XxTr9YT@dO
z;nitAdK*nd7N<Z|D^g9pU?0C&nzWXT{{e{}q1zziUqVz|QDC3}U%ozgHrzmc`tpnv
zHQe0ANP}5-fh@_7#yVoGK^kNvw^wIF+%)*A<xH&Ap8=g3XGkC%z%~{9sS}1eQ$RsO
zeS{?X?bzEvP6a{t%uj!ZV2yy80w>W6RttgK4RM<QC?p!2>2c)>%g-{YQf1S28BJdP
zhq6+3#4_$fPwM!g0f0uj3^>ci*r?ddCwfAUCcRY53u(M&1`YUhbrVl_9iS-Vzs|v`
zD4{4@XRSwE)^fgo!-6M3$!K{<5^O=MG+sTa=07-{ZNZ4HNzMuI{{REyX_3xLzU&86
zW!ja`_4x*{>x{Y#LA`~~QO8oR$x-(J8&yypVJ)kJPfyh@=;{r9^*jY=v*|{g;Nd|}
z6bv0Of}KF3`UIt?f&`d5xQ)GpF8jlP3~U|01?86&zw@+{$+ON&!`^lt{?sX7S7%&1
z5B;#BMhjdIeWJ4iO%*KV19EO1;0+s+9)}vZU5rLXa1JqGpX;g+)ny>mDq?Agb+yUr
zNmpo?E4C{c0b*e6>#ffhpU<-qcKq}*1d-qd!*H{rHF9Pc<BER9B(Od#YtlE>Zh+u;
z(q*nam>^(^(Y9^tYfy*Rwl*~SC3R2Dnwa4vDV!XjM87h(XbB6|K4Ob8dBe>U)JIYS
zHS?=xvjPGg^Adj^LN^@%ghj5td1A6gGhYo-Z{@A^lgUuzHk%8|YAO|)(&cq?Y&}~w
z74zJR(}41IPt5dOu_pxoK<@q;=2z_7w^mW!ZgWQmbZDtY*ddmt+A-#?!;bL0nLv7X
z!**;153-{i`yim+VGRLg{EmPw^AIwz@GlVUC~EqA<+lTTCuawlvS~*)-0+niYku#;
S%BEzKoh(IY`E}*9_W3^r`1AAt

diff --git a/js/src/jsapi-tests/binast/parser/tester/date-004.js b/js/src/jsapi-tests/binast/parser/tester/date-004.js
deleted file mode 100644
index fd8733cbddcc..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/date-004.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          date-004.js
-   Corresponds To:     15.9.5.4-2-n.js
-   ECMA Section:       15.9.5.4-1 Date.prototype.getTime
-   Description:
-
-   1.  If the this value is not an object whose [[Class]] property is "Date",
-   generate a runtime error.
-   2.  Return this time value.
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "date-004";
-var VERSION = "JS1_4";
-var TITLE   = "Date.prototype.getTime";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var MYDATE = new MyDate();
-  result = MYDATE.getTime();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "MYDATE = new MyDate(); MYDATE.getTime()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-function MyDate( value ) {
-  this.value = value;
-  this.getTime = Date.prototype.getTime;
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-001.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-001.binjs
deleted file mode 100644
index c606d8345fbfeb7256a42cccf4d6285fda744ecb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7058
zcmeHM-EPw`6wdfZAi)JU+(qIBG`3D$qEOhnA_k)%+6{4qyvA*<rAg(a>vqF?z!UKd
zT)->v1c+nDv7N?E-JeZE?50)Y`13j6`FFi!I0$gn>tW<q-_xi|QQx`bIL<-jpEz4P
zjn~bm&2}`vj#uIDcmau%>Vx}^a|_<`^zHkI5_AyYZQKqJMG1*Q4&|%gv2#d5Kaceb
za8{;aMU+Dk-ytDMB!GVWj*r8HbO@##E<}ALbevEUcB|Lnm}b4!+IiRTD&m<}5g<BN
zlfS=95=>FR;f_!+EZ{K;{Ako80bbkKcv8g7uq&K3PaJs}wjCi_d|ek|PBwo4_8GFd
zU;oft7Ms^V^m^^>=I3)k<e#%6@+utF+G*|9%RR!<DIWuxAFZ#ibH8*)B<Z=x4bTA&
zu<y1b2$FD!-8exB?nB5F4_&}(>&F9%;}}A}nc;JH#PYc@c55gI)K<Qu4Ue#jI6X8h
zBK;<i02<Pyh2t^}4Y9A}SVRSuLxl>6c884U*r>XNGIs%ML?Icyf-H?`E82~^MXT`?
z^9^FZ5dK>vMD#@I<*)<<IURB|<kbLo5{Hs*Po-6nrx?(xI!HIcDL`5fvF!ZK6m*q>
z((eskVIf^f7)#`|4#=N|gOr)hi~HRHmUh$hQ4`st$Qf5`0B<tK&$R^&aDGbKSuurW
z83!2;x@V2O&P<f6y==eZ{C+O$wy3QcR`#u9{>z+x0d1#oI-Mk)jSGgQ?{KgEX<~S<
zEM-EC>yTq7OYG90wY<3|Lu92a8m3#$<j)rt%v*4Q7`gXCLd_l{+U7IMLd;_p>y54e
zLNaq(^l})s*+{2PcMJ(evH?tc{dn@os1s{ZNA2s)S5xF#oWLq|K>Ebc8O|sxn_2Mj
z0JjZL!X<RXtsrV2s=7XX(0&7rEbG>CIb_aqwh4WCH)Nft0+^*0d?r&`P8tiona>in
z+ajgG2ANf}*T=tgVnu(Fr<Tt=sas~Z7y2Fx!I^nSQPhi~a_P6DkL(g4e>}fJVSy$!
z(NCY*6*|CTp%GA)RA)1`!6(HWW;}dv;KTH%HgjM(5lpIU?DW+M1AzsZ6TG0ztXaRA
zS1z^dDVS7>lD6qNb7@y$K!apeZV@l%_AD@WdCK8*$oXlW5v3$Wj;oyg)=yBbl{eiK
zzii-<+R2@ASu^wvuo=4xsG%4uYBSNfy}v`EWfg7K>}EZcp2E=l-$GhmhNU;OZh95=
z&@EbCciQ=bEAt~A%~C>E-CfThnF-TELW{tiLrRwV-A6_G<`lB5ZPKN)(05W*NmF<x
zpZs1@X1A;crWR1!%2-YRV}aZLw6Vs11OB*(#p4<pBtx1#%PJn%;S(r+n`J98be49_
z;vHkA5^ILrE3sluof>4}PXMuIva(njvzmBn@LjPo;XYTa7AG39VCvt*(v(Zp)KB<l
U6IkXwxY$|7VkuW+N}ET<zs-u~I{*Lx

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-001.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-001.js
deleted file mode 100644
index d9a7a033df04..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/dowhile-001.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          dowhile-001
- *  ECMA Section:
- *  Description:        do...while statements
- *
- *
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "dowhile-002";
-var VERSION = "ECMA_2";
-var TITLE   = "do...while with a labeled continue statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-LabeledContinue( 0, 1 );
-LabeledContinue( 1, 1 );
-LabeledContinue( -1, 1 );
-LabeledContinue( 5, 5 );
-
-test();
-
-function LabeledContinue( limit, expect ) {
-  i = 0;
-woohoo:
-  do {
-    i++;
-    continue woohoo;
-  } while ( i < limit );
-
-  new TestCase(
-    SECTION,
-    "do while ( " + i +" < " + limit +" )",
-    expect,
-    i );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-002.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-002.binjs
deleted file mode 100644
index 9b80e1fcd76b00b0e9aae05ef5531336982e6ed0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10101
zcmeHNO_SR+820kbFasR=0}R7~(solgF+1*-ZW@L#OJGP^4jdRIRuauRmMc5W_QD_F
z#Dy97F`T*Z2ROiuGrxf0l`L8EN^z7;vb&|dY-TO%k@V<!KlI8`G0zfw7)>#X55Hn`
z!q6;uAqavYjh_TZ-QMT@gZ_wSIEY%}ohTuBaro1FLGT8=6`9>1B1X_K!T0efK@1gy
zrUEL~|L4I8N#i=!Ux2f>3X3uUMdE;@q^JPQ;kz+T3o<5{3Ahx^^rZ8Gk#utSDh$)_
zv<KZUdr?b1i&_%I#OjOpk4b?UN(9_vl*}zWPC-l;Q<C6Yw{L%BV=C;HU@ekEz6jkO
zBWAyDPT`zv{sGt*$mYY&*Zpm=`3g+E)BfV#cUOYQe=m;6mtm+ucW~TkR)nW0Zvt9O
z_xJaOF2e;WrXdOwG{gyx!x04|N#{7s3sm44n2bH>2CD6xW(?;!n0{a33pwKIxzl#r
zC`oiz(PIRUu(mkUG(0T*bszy&$ch2Zn^x$seLas&mcV_eTmoW~IVU=IF5P1>Zv)nX
zfiwCHyfkJ5dQ2zwt_c_O3)sG8{zoK5?1^4iz#S0ybnwyOR}(xg0!AiN?N+6q;y^d_
zK;{<g0MdhqZToM&z)&x+(!E0!9<ysO;|jTq1J%Edf%G<A75TjdEFG8bqb<FM&6!wO
z25)lV*V2L>h@X*>3Z~Fp*@5E0RMwf-`4-h;FYg}&|J<$Owv4R`OZ}RdPcx_A!)jM?
zx|$@Djpqzk+7YV#)5Y+ECYK2@ZcI)C<=87d8-DXvWg>e`*06f#TzY=KgY_NUz(%fp
zQbDb6BSz;7^FmxPo8?9?0Yb5MTJ-5W9q}WbdAj3Ba3ss%v^UF_9~n(zJ>sZ;y!qK>
zxgI0%NS%-wab$*T&Xu28@M(re4k#%J6Y(gaqZ1w1S0A*0y%q#K>#6yWbB42fke5$V
zo{4IJbyC4Ql}oG5#)EIJS)zM;xHRZcc~$lL*<X`by&}yn9~JgSo<}M;v)koS!Z#IW
zHcyHVn~Cu}^>I_oP@dah|5Mr=MFMkYcS@VghPBkVA&V1s=>%1+%$$&inQ&*apma*9
zy^AK)+Fs-XP@9!Q-lyO2!c~0{qU^_mgVS8r9{6{Vr8V$5ZS_GGL&ZXO7Qodhc3CdQ
zN58S;5bLoeOFUPTO?Ah0N(GxxcFFOhIrv^Dv72U_?^J@RXPcWG)1wM=2kzd3`i3Cg
zME}|v{Tue!(&!Px$OzP22Bm%Pz_itBOcU2K*J666;#mtAA0v_+gqR=y!SZ8WvJBA}
zD)UBFbI7+#>s2vo{g&kylW6mb1BR@u)9NZaxsp2LmZS-yHY}wHMyV=_@U5*?Irgek
ziJFMn`zcn(cEa|@z!z5sjt|0c$mj_U>AVQ(I7}$bZiYknC#CQ}K9t4pAy2<AL?&C<
ztsY+JeHI>STlM7EfIVIpZ=)RBYzQ0q4NAm3rCitbdsk>TiA+nv`7;aYnd_Ffm0@`;
z^nPgXyeV3b0L`72<5cHzSe`TF_Yz^`n3)UHV}>3ngt=zVS@L8dyl&HX&Pg_v5X{+m
ztasUtlwnWJPyL$U+S9C+Z(OR68o+XQ>Z3gM@Gj^<Bp~pKfr>aN6j!j)*mzK~^<whx
zIn?q~z6s``l*aPI?rNErs+VuCh+eKc^&*ZJkmMRy_g7gqjy!IOY_^p#duG`yhU3n=
z%=zI1o3fUT;~sn~l*`9$lofNPo~h%W@Ss0}fZl}u>N}psLUrEo$&qYxTo}t1cZOy_
zTHoEsHdio_O=p6GeCi01#xPce(rPnwAlsIFdLdi62diH`$Oc#OOE#_e{-KO+;_nZD
c&R3*%$eE5x)JBfoWI4U2gwt&XC2o`W4}KfYM*si-

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-002.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-002.js
deleted file mode 100644
index e25557e70bcc..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/dowhile-002.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          dowhile-002
- *  ECMA Section:
- *  Description:        do...while statements
- *
- *  Verify that code after a labeled break is not executed.  Verify that
- *  a labeled break breaks you out of the whole labeled block, and not
- *  just the current iteration statement.
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "dowhile-002";
-var VERSION = "ECMA_2";
-var TITLE   = "do...while with a labeled continue statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-LabeledContinue( 0, 1 );
-LabeledContinue( 1, 1 );
-LabeledContinue( -1, 1 );
-LabeledContinue( 5, 5 );
-
-test();
-
-// The labeled statement contains statements after the labeled break.
-// Verify that the statements after the break are not executed.
-
-function LabeledContinue( limit, expect ) {
-  i = 0;
-  result1 = "pass";
-  result2 = "pass";
-
-woohoo: {
-    do {
-      i++;
-      if ( ! (i < limit) ) {
-	break woohoo;
-	result1 = "fail: evaluated statement after a labeled break";
-      }
-    } while ( true );
-
-    result2 = "failed:  broke out of loop, but not out of labeled block";
-  }
-
-  new TestCase(
-    SECTION,
-    "do while ( " + i +" < " + limit +" )",
-    expect,
-    i );
-
-  new TestCase(
-    SECTION,
-    "breaking out of a do... while loop",
-    "pass",
-    result1 );
-
-
-  new TestCase(
-    SECTION,
-    "breaking out of a labeled do...while loop",
-    "pass",
-    result2 );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-003.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-003.binjs
deleted file mode 100644
index 57436770bd007f90b3e4420eb03ed8e7257e2be7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11729
zcmeHNOLHSN5T5W_-t3tws?0eg*@7Eo!fqT>YbqpL*t>9}WRKzuJDD+>@n%!}2+r^y
zxN+mo58y%-7w#OW<quGF%NnW2(%AAdj}3>V;u(EXfBL%B-I{tn9K?LLe!^L}`#_|9
z!A^r0f*|Oo;d!vvI{du-al4lecu?Pw@6_Wc%Xi<~41%}dtvVh4h>3`GW4_OOF%vA0
z(nLaq=I<<c93^2H>o36Bn1+=K2^EDwltj4(pwqWPp5)PS#D#=Q*r{1`mWwFq@7{uG
z+Ra9%b#z$YQNPu96bQv?%l8kWoC_99xF;+gT6k{&UYMSpL^0pGbLS%)v%ubwtku<&
zFT$`VOxUl}CCtg@pMbqaHXk*=Y%hz=S77PQ#uxX#`Os!&{Y3t^J|bU+sXDFBLDROI
zD#BBg9{^gIZf|c(UDnQ`{G`TeG3)Y}hqYb`PLd3HEz4QXPr+sENf#iy`E($7mVxWH
z3w$X@u77v>ZiB_K87fEg;3sZ8juPSF>8}9^V4=u6Jey>pf~DwY9gCQNF;tnrM1P1x
zXHL^SjJXY1X99xJeTdRrbkc*gZ||B6F+YLtTkgLXB}|+fy8;YA5Yr(>LtKsdaUO`M
ze`3O_ic<)*X(pm1tpL)4h-JrbG_Yn2)Vg=5!eez4+*l)z&H??WV<NLnmqmWa`hNNq
zo^m!<(xA3Wb%*@S*dkBwW%&bU9%?~H-EVo%;ox#vKf`+{^-`8{2)-zyUgg;i@56u3
zK6T~=%N&f;6iJm9#F#$D{=AV3rm3av^zh5o%jND5cjuRj=inQ;l=l59N0<AH$i;K;
z^D7s2IS->>VMpdWj2^5(E|>|GN?g=W=@?WcY}HA1O^&AbA#X=6E?KPk9@b=u=i#KR
z9?G!e=xI>Y9y-$?sr{DD<~GXa&YB?=not^$eIl<+sVbITsAbgM3d=4^{3yl63gMRk
zA)mPh{%n}^uzyEed58r4w*j>FPP6L%AQiz9le52JcFO}i@UbY9flZ6unW=doy^i){
zLlB9{7KVEj;CK>NtW61ylDQYBy~m~|oZh7U7k12|%#>sX3RT7@H)!rbPp6+?7sCKZ
zaL+cvCx$O-(|$_v(4<rrbiqI%aDJ}i79G_&i88Vb7^Pn;9G1TBv9}XcvN}W;vN7vs
zd!W)&r`0sqb1~_$>%Ooq_?wM#U9e0EYRW5TbWT6eVv}5vlU!rDf<-Zuu8UrM`HorN
zsX4tRcLa;J5?K$Qz)P4>3^ozF;KxPntcTJw=*D0sQOY>yyzBbKW#c&3a&8Wh%E)Gf
zDrPL>g#p&7G)AO~Zg@sdy$)3UPID^g^B=Q2JriBf%n8Hq*EL~SQ1_Hn52zWFiHCy_
zZsN>&QckOM0jCPOqGPPIgDTiEg<Q$2=1Z<T44f1rmd@3N&eyf~s5$6VhCbsV9%-$`
zy-Y!in=#G3gY?aci!l%SDq_hb^IFHoEL@`WdAQ2W_;*9d$=&Y1z^&h|33Zg^`HiC}
zV}TOsuv<^GD_$@|LG}b^q#6PYO+xXy{{QF}r8IhujNp2>llCS`$DH1?x*j~He0X!;
zU|H3j<8PoFE0ORJ=(6vS-+`sZX*#I+_6Dwkj(jU4Dk2Z=t0LdZt~oDMq5nXnz6=U|
z6BIg1>9;GoO>`Ttf;{~yLTXi`{DBdkq09Oj0ka`E(z@L7L7x=%AMgSy{~9J|b-%{A
zt8gSIFp@K>x1o3&wVZi)2;Xm-FQz1s?-oRoOAK0+O%Efqs$cD_Q%ptyR+v2cxxohc
zP&jG$5mx>->PgYyYzC-j6TW>=Z@A=3fUVDE)icM(PU?yK>?V-bH=|^r-4Rz0t4<{K
y*j19KM-`s}s;3yB%l9Mdfuo93Po{j1H&UVe_iF%`9e6czPOjaIj=SC{-2D$jFVlYj

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-003.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-003.js
deleted file mode 100644
index b482823e12f9..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/dowhile-003.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          dowhile-003
- *  ECMA Section:
- *  Description:        do...while statements
- *
- *  Test do while, when the while expression is a JavaScript Number object.
- *
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "dowhile-003";
-var VERSION = "ECMA_2";
-var TITLE   = "do...while with a labeled continue statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-DoWhile( new DoWhileObject( 1, 1, 0 ));
-DoWhile( new DoWhileObject( 1000, 1000, 0 ));
-DoWhile( new DoWhileObject( 1001, 1001, 0 ));
-DoWhile( new DoWhileObject( 1002, 1001, 1 ));
-DoWhile( new DoWhileObject( -1, 1001, -1002 ));
-
-test();
-
-function DoWhileObject( value, iterations, endvalue ) {
-  this.value = value;
-  this.iterations = iterations;
-  this.endvalue = endvalue;
-}
-
-function DoWhile( object ) {
-  var i = 0;
-
-  do {
-    object.value =  --object.value;
-    i++;
-    if ( i > 1000 )
-      break;
-  } while( object.value );
-
-  new TestCase(
-    SECTION,
-    "loop iterations",
-    object.iterations,
-    i
-    );
-
-  new TestCase(
-    SECTION,
-    "object.value",
-    object.endvalue,
-    Number( object.value )
-    );
-
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-004.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-004.binjs
deleted file mode 100644
index e2b7f4de99b53c54df059a4e92ca524cd9878d59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9961
zcmeHNO>g8h7*6>{NQlF74=WC=mhCJbrz%@^J3EL$WkAgAa^Qg6iDzmx69*^Rwi4pV
zg);}Z^I!N49N;hT3lOgzCw6Kl<IG3fW%tri<M^@P=l!-5WO)+d{ooj*aQ`bt=L{{p
z7d+29qT#uBFdTh8-WyM8g1w+8-U%X-X8Uiy>v?a$TY*0PF=7NAMff3}Mu?$|&{#l)
z>i^U`A#qs8`WtX|mSIsQph)PEm}C`zzWgx6aYkkYGXWQ)h1ztQF%r-BUxj7HgZ^ar
z<tXUMXF*Sb=vZU%{vpXQLy>@cf}-5O;}nGS^q55W&fU8oo0uhbPp}rqC0~STPY^R-
z*SD}Dn|}iKC9?T=@b!38Y`y|pAN0R?@ZE<dGnY@~zn4ek%dpgBI5`}ca_bi1Xq4{*
zT1a<ycZFU0rzAV}ksqNW9O2NPQgD(u$9|fj3@^ZC%thBAdvKO8oTlLV;}Tz(Bd(rX
zeYcOINKF+prtk<WkJE{8@buS#1dxzr6P&h5C}DMUwU2c~;4xH+fY?0eM5k8K9fWxc
zuud5Sqt75pV>Y3ObZ%-*gqYvJ_YL<yATeU+N-mEFAc*M@qam(Fc$RsL%#T%Am2rv#
z-Bt_fBy9oGfrw4VZ!Vy(1gz}dVigX%YjNWWxyS?6zm|oRny!oaan>KwZ+Mn7xe@{;
z@CG;dS~)NRqi1AVCQ%r!?7x&>x2OxRbJf&xE}!pt|9n#AYnf9^tnydKd>Xm@5u{wk
z<#KX#7M?R(6s>>Rn0?e18X=d>$eC9L@XCI*_;{ysiJdm<U#>Bm{XW-Rp}94D;>P_d
zV08BhZSti>8*VA<)jlr)Le{zL`81EGyk*n7H;x1?R|4JKB5iI7bz&Xz<nny-tIbm#
zka-4<$bwiZzK(n3y$C)_@YDh&O+iOIi0Jf0<?H1QG``_^oQGP>STS8afO>l#^9oY|
zbSd%fRUxdl8wb9*tr9icA%ww%DvFk`U;NdHRT3$7`Kq8B*=JO6`n0Q~gew(xmPgqK
z?Zh~CbKC_Jl%^)w|CBaM^RH{xk+zS3wi$woHQe)$7(Ky0%`>0Qsy;X^+fzS}!I;3&
zaTuL<WBIV?sg-4NzZZ>m5i83hGkyOKUd6k!8Kvf4bezr+=XVHcMqMe(`nm+-=#M85
zt7~;$_y;gyW8oG3`cV?XsfC&>fU8cnsZQgo-)?AR9rV!<<=XsjIIB}C*o32(6n~#X
zoVF6XZYBCoWia(hbe&c`s4%yX8XTx^N$73#cec@AK*xrS9x#lwqz*<@>8)H`_ef=x
zO83uHs_OB$1u=Ke$Gmd~M-9~}qmO2An64c}9&vV+d6kSBzr~4(PPBe2VN=QmA!^G~
z8etTd=NVkJwF8Qss?jJnpwE7atz$D8*}agl)z{iZl#9wY!2AfGDxHbou&LwR*FXY(
zEZs+G(}CI_Py=wnx<*}IeL7umt&<cQGU+o5=~$8$mxX?DEAyUjhCbbB9dhH6vP4I7
z+#xSK{lKy_TR?Nzp+ojwVV68l`?pN`R@`J;r?2nMLEa{fZ0*qhN@LUn#NBF)a<tl;
zU=O00fE)g@%R|1n0hP`cQJR?cqAS;NspcG}gE?4A>nXwZjvBAjUcS91_HxT=FXjEX
zc5{B6&BjubHJHsB)s$}3&P8{7z0QMo0R`W;6i3ZC9KokLseIf=NtUznS$TpYKz{-Q
zdK2cCpV4q9GVUeQmM?wenB|^Uj@T<R4bu4BMUL5$h#WFbbL8_2$wEH0q)a(t4H?Fm
vW*2g-;Y$cP$|G9+u0Ref`R1U|viSQmK=5trYB6e1iP}oAosrIR+x_4_KPa3A

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-004.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-004.js
deleted file mode 100644
index 90e376fdee86..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/dowhile-004.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          dowhile-004
- *  ECMA Section:
- *  Description:        do...while statements
- *
- *  Test a labeled do...while.  Break out of the loop with no label
- *  should break out of the loop, but not out of the label.
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "dowhile-004";
-var VERSION = "ECMA_2";
-var TITLE   = "do...while with a labeled continue statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-DoWhile( 0, 1 );
-DoWhile( 1, 1 );
-DoWhile( -1, 1 );
-DoWhile( 5, 5 );
-
-test();
-
-function DoWhile( limit, expect ) {
-  i = 0;
-  result1 = "pass";
-  result2 = "failed: broke out of labeled statement unexpectedly";
-
-foo: {
-    do {
-      i++;
-      if ( ! (i < limit) ) {
-	break;
-	result1 = "fail: evaluated statement after a labeled break";
-      }
-    } while ( true );
-
-    result2 = "pass";
-  }
-
-  new TestCase(
-    SECTION,
-    "do while ( " + i +" < " + limit +" )",
-    expect,
-    i );
-
-  new TestCase(
-    SECTION,
-    "breaking out of a do... while loop",
-    "pass",
-    result1 );
-
-
-  new TestCase(
-    SECTION,
-    "breaking out of a labeled do...while loop",
-    "pass",
-    result2 );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-005.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-005.binjs
deleted file mode 100644
index 3e1e3c360f294c87ce6f2ddd74357e174153ce5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9175
zcmeHN&5j#I5FY-CxNt#;+lT`>B<$u#K_YTi#Et`wHU`DsAWo?5Y1^&L&R9L;EO`kY
zfOp^la^%1}AcVx5AgbCu(>3m%aj)$)3CSL8d3w6K>#M4-s;jq^FXk~nYRx!{j=q!W
zRI=0H%^(OyY4j{;_xcY8w+G{N&V$yWdZ!hOEI;}=41!DWR*O!5%%otWnBU{$m`Rq4
zG*O}=^E(Tkh$O1Y`WxiDu})Shl_(JfA`y8hfG*#Qc#?~W;8KZ8*s0lcmP?ULkKTi2
z2HnoE_iev*sGqeCwGb+6px!?gIhQO};-0d2VafXd<VES(OvL>2Yu9esG7H&<3bmGA
z@-3M5lu7$_x`hqV{1asF5zWWlM}u9V`7Ug|+j)5R#~U^>`v>x${Q>z7EH&&6kGr<s
z)FV8d@+wG+(u0Eo<(J`^$Y&u7V>aS3kHT>ZL6R(ZnB^?zrw}ssqWcH?ul<3IwADWO
zx_|Pp-F;;1z5(Fqw>PhUapTLIwzw^z?EW;DJj;MZ2ZgCrWb^X5lLk91j?GjxV+@bD
zAup<;2WcW;;4Cs9@~p{Ov{)+L>|+}hFdb<Xn4B)qXEUej9?E<Ovd$#%`Ztj9xE!X(
z>D0EGV(VXkMlB|7i-gH%My~+59MU7CJ4jJ6pX7lQ)0xRon(|T56|)cp=>kN00I};-
zhzf>A!P4&?Ug5F321YC;FH>sy)3J~-(>Cshnr#<BSSIu#czAS-EL@LLp$v787e$G;
zL5cj_3~+yujIj`;H6ex!6mqo{Ce_}<SJt9S<+bB<{KR;}`bziKM~+H&Lz~<MHlHTQ
zUq--r2;`3O9IBHCM(D%B%y#)%ABa_oaZ&Tagpy;6*H^#kCX7Y~U0jtnXRH4X5+p##
zuZuXp-VBUq*@f{jXIW+o`=7$*sM4uJc*1rWV4E-z-wq=Yg-M!+Gm%4;8u5@#;P@4a
zB!SO3P3Nx+vW_}(17tUINR^>@WP%teQXL+agk7`&=!QH92orj`0DIa-q>|1}&%Z(#
zBh6GA5%<#X@kn0PL8Ti^U?r_>weWM$2obI<e1YJpFxWA8e*ki5-ii)w$r;Iz2=3DS
zTUfqk^93<dL%i~N<Wm6L5aI}}5klmI>7<}SzZz1voG7-mod>Iwfl%0C^_$LpiS4qR
zM70^6UPLt2@MvMZ9awFphkzWhs{=SDf;lu}9i0SqpnCx07NL727@Xs%aCH<E*p%PP
z!y|>tH#jPDw&(`544G4rC-VsUawggoL6;4NqW@8bu5K@&g|5`}7q$RTZ;bA5<(Po5
zS6bun8~%Rys%)#5kZUQgd8s&e?55274B$5T0t@I$&QN5r?EV^uvuxrpv~fXGN1?TO
z^MS6<&&*8ayt`tK_hE5tL3UWiZB<l2Uxp1@MVW{H@46ZG32Zf4oQ~k&0%;r1E}^<g
z!cK_efY=aUAgGM>!fNz&59Q9sj8wQW<jdm%y%)p<J_f^80<q~FOF{QMH`kXVRG5c*
zH1<Ji(kETwwUcNxC@7vrw46k<wX@l=f&2?_5=Svz<0M-oda9~#UAAU9tdN$X;9`B*
zjpk7w{zo9wk2`FhFJ$qoIP9vl@;h(}UK|zo_cd3Dx)!VLN9%ECve9FXdk;P0&VEFs
zbrY}0R_LEBv~nsZBP%BiGO|*->k%i1SYyO>tT9px>9Lw?M?H$3UA>La18Xk$mUX}S
Y{0&6l#tW-9*`*QvdW83YmOJ?V1!Ux?9{>OV

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-005.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-005.js
deleted file mode 100644
index 3c339f493a0b..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/dowhile-005.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          dowhile-005
- *  ECMA Section:
- *  Description:        do...while statements
- *
- *  Test a labeled do...while.  Break out of the loop with no label
- *  should break out of the loop, but not out of the label.
- *
- *  Currently causes an infinite loop in the monkey.  Uncomment the
- *  print statement below and it works OK.
- *
- *  Author:             christine@netscape.com
- *  Date:               26 August 1998
- */
-var SECTION = "dowhile-005";
-var VERSION = "ECMA_2";
-var TITLE   = "do...while with a labeled continue statement";
-var BUGNUMBER = "316293";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-NestedLabel();
-
-
-test();
-
-function NestedLabel() {
-  i = 0;
-  result1 = "pass";
-  result2 = "fail: did not hit code after inner loop";
-  result3 = "pass";
-
-outer: {
-    do {
-    inner: {
-//                    print( i );
-	break inner;
-	result1 = "fail: did break out of inner label";
-      }
-      result2 = "pass";
-      break outer;
-      print(i);
-    } while ( i++ < 100 );
-
-  }
-
-  result3 = "fail: did not break out of outer label";
-
-  new TestCase(
-    SECTION,
-    "number of loop iterations",
-    0,
-    i );
-
-  new TestCase(
-    SECTION,
-    "break out of inner loop",
-    "pass",
-    result1 );
-
-  new TestCase(
-    SECTION,
-    "break out of outer loop",
-    "pass",
-    result2 );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-006.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-006.binjs
deleted file mode 100644
index 7ab5fde070571e7caa03a24269f94f48da7076e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15060
zcmeHOPjBNy6!-FX0U<4d4^SjHp|%T$T?vJXZ5l*SY0)Mu;)L9InwYwFu$?WH_DgW(
z!i^hWfGc-C07Bx9#F;DaO=djLp0PbnoHQ+!sz%9pelzd){>+;<<4!u825hf0VXn9L
zMI4P|_uP5Tah#LLyL9&ZN1qKo9E_qVb2_{HnNHv*>E7=T9p`m;szbX!abw>-3D^M}
z1#ax7eiU*jPkm3EGe7k5SbqV|ojR;2=1{)p_@SR>0Cf1i$HLS<^;yi}Lib!vI!R+c
z9Phmh!wh=eVgLB3vnzh<><SQyHQ>)5`YDUufWtj?gPDf+8sK@+#l#QT_Wk=0bWDl8
z%USD)A)kkCPu*C5oK9guHva(ZHM04n_ju42n=irCd)?0;ee;3N%=(G^bA3d<2ty6~
z!^55~H?;^$qkI+6yl7`<huftNxdfHH@24?K5^(H6>Za@*9F7|s%YHX{X4ee@)s^=c
z!B0&26BX0Kk6!^1lhlpVAxqK<2?Z=gSMyj#1dNbE1UDYfkch-6x`i<J0P7-#Q1dCo
zU=|Of!)UC_!~@8W;MtmU@B5(}Un;pA3@;F|Ap%3x4A^Pv#Qu1qf~JT<2=tyBh?2Ad
zNDCs`j?O6HmJ%?tdxKS2%&x*oGvs-c&%PQ4Qfk^1^F!7TqOWib)4AdT^-NZG#4eO9
zd~I&aA26>F6FNTmmW>P!&ZqSgJcp*9%R%;|C}3_VS8iy|+)}C~XXwoyKLSsW{gFgR
z1Iy(FIGp3W^Kq6_h;?5MUHp1O4CHV#4diFgMV*0YD!h~FZsm63+}a6jI<7vD*w_jB
zwcG(oZ>}&9OS7_zCwKpEb~4z^c=F52;z_IKa_{QR1?5>T!+!w~(#FaCC$n&bWd~Y;
zKqM#|Orauio|Kn0s54t+gP1i1Q8b0BLP^$i3{M~rx%9*W8F#@^N!}y!2RhgNAR3*i
zT(Z7&^DhvBPvz#NQaJ^MlV{Z%yDz66Yy(wi4xDX0<jyDyoMPjFqi=63+Nd}OQCfuK
zTsYGhans8TjP_cR)`n2H!RD1AG_^#@A=ibn&)hJlifGJH(AJ$1z_IUUxT|&pC_RNh
zu2J4a_h(%1AE_DB8Qmo2sa%CM7P!tREh>t3YwTA60BipKn5DD0P%P2hA~$UPh9sNy
ze7BkFP3pBP6Es<cpvYWqE2Z-A7UXRKVp*Ekw=~)ApC16{xH#q(0*gp`7y6vU%so4v
z8Mfw>CkrrKM>$wORAEV~t07ihTy6-51s`1EO%dMUdQI2ihrlBak)vO&eQJ5ISce}$
zO?Dh&6;c5-DFe2;Bn&5hLZ$&CY5}*QCh8QsB72dr@{`V533#h0Z%-a<Rk@5{kCJE+
zA1n}W)x!^FEy%2n+$J7d12uu)`cT;!b?J&|qR~P}m8-18l%Lc?Z&g&LqSDR3iAGBm
z)nZC)QypND)PI3K>&s*752iM?#B%wjA+=lZKF6<+K55&^B3661W8ipy7NqZ2=i(NJ
zYz0eQ!^M{?A<A%5g@(`75_RaFuz-0g0mbr8fIrU5obtSa&d4GXVagTFQr~bKOpzKF
zNZx|<Ln}P4PzFB?TbJP<AV-ry99HM`!0*rTs-8&=jmdi#iiFz0eNsfk#$plCH1c&Q
z^EJ;?_pu(K6o3J9?g%Cdmh*uuvI%FPK5<hOVwFEqB37Y~5`Ql0qov%ao4>P$?$y=>
z7i6<E)#H_=6(%-Cx~SGRE8DklQ)F_Hj0NLEUA0*dvxGTGs&5Fz&2pV<NAc?Jq2O{h
zg!8?wn;3E`?(o0C^1etd9vz^~3+-<M-o#J0Mv=$1+*3G%+`>q;<%jSWif`4MgKiXh
zKAw!a^v-W~#;FcA$!Vu)m4;ieK15s<lWYsx7^<H=Q<J3bcO9~y#*6KB5Xvs4Geyk8
z9;za)P(>Gdfk|kG5T?PFU30{0A))0botZM|e7?%6uUcGbc=`c+YQw`5>{!<to^FoQ
zQR6JQ%?3G}A^RwCwwjC$WtzX&2355AMKR_b!OLRm1&;aYE<A@zi9Fjf=9;3erP}B;
z=P)t`$j=<zqyT%>^Qxf@sVJds{&Uxz!d(|5m4Ab5ZxpE1UO5m{R@`17WNSH(Xv5l7
z;Y}*hVot&cr1mBoY17VQ2q<sMU4;;hIG4hnRkW0yXOj`N{UHIxHgYLJw3zM<l1_z+
so@gm~kxH~;$j6$J%B4g@%_~cD!{`6M1_;dks27zfuU17GDdq_9AJ$VADgXcg

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-006.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-006.js
deleted file mode 100644
index 0a1aa701a68c..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/dowhile-006.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          dowhile-006
- *  ECMA Section:
- *  Description:        do...while statements
- *
- *  A general do...while test.
- *
- *  Author:             christine@netscape.com
- *  Date:               26 August 1998
- */
-var SECTION = "dowhile-006";
-var VERSION = "ECMA_2";
-var TITLE   = "do...while";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-DoWhile( new DoWhileObject( false, false, 10 ) );
-DoWhile( new DoWhileObject( true, false, 2 ) );
-DoWhile( new DoWhileObject( false, true, 3 ) );
-DoWhile( new DoWhileObject( true, true, 4 ) );
-
-test();
-
-function looping( object ) {
-  object.iterations--;
-
-  if ( object.iterations <= 0 ) {
-    return false;
-  } else {
-    return true;
-  }
-}
-function DoWhileObject( breakOut, breakIn, iterations, loops ) {
-  this.iterations = iterations;
-  this.loops = loops;
-  this.breakOut = breakOut;
-  this.breakIn  = breakIn;
-  this.looping  = looping;
-}
-function DoWhile( object ) {
-  var result1 = false;
-  var result2 = false;
-
-outie: {
-  innie: {
-      do {
-	if ( object.breakOut )
-	  break outie;
-
-	if ( object.breakIn )
-	  break innie;
-
-      } while ( looping(object) );
-
-      //  statements should be executed if:
-      //  do...while exits normally
-      //  do...while exits abruptly with no label
-
-      result1 = true;
-
-    }
-
-//  statements should be executed if:
-//  do...while breaks out with label "innie"
-//  do...while exits normally
-//  do...while does not break out with "outie"
-
-    result2 = true;
-  }
-
-  new TestCase(
-    SECTION,
-    "hit code after loop in inner loop",
-    ( object.breakIn || object.breakOut ) ? false : true ,
-    result1 );
-
-  new TestCase(
-    SECTION,
-    "hit code after loop in outer loop",
-    ( object.breakOut ) ? false : true,
-    result2 );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-007.binjs b/js/src/jsapi-tests/binast/parser/tester/dowhile-007.binjs
deleted file mode 100644
index 6e4eae5cd16fa481ce41886a094ae1193b2930f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21270
zcmeHP&5q+l5ccx_FSzY-ZhJt?EI$&`Dm&6nW`Lk!29anvB2V0t@s7t1wzIP%Rvh37
z5I5d|8xO#Z8#gWpi7OW#fE!hIx4WEfJ8dVEv6CDkD{gmnSM^ub)m3G8;>p-!yPY#;
zJG-BU!6>vZtY<9CItiRBYp-|oY5!h-7>t?K*-4)1cy1K${&!?qZ^2U?+Wny&y7r03
z_Sw+0Lpyc@KOyDF|B-d>`c9tK-$3WqELuUBka8W%_1!olK!@)+%#YnumxT#A-@cHO
zj^fbuN4qb=F#Ut>pm%)K+2Qv(JDdom)lZ&3bYm9UUPA7%?M)PVuL3<MxIA+`_RihA
zAF4D3?VUtw9X{l<(Cx7us*lqt)Rg9*KzoVOe0cChe^JtW0j7S?{p`V4@2Qemz99cv
zo*<uxp$5Id;epCGMT8+JUjb@Pu)V#V;8G<yhbRx8j6)VhpxFJ`j@bn$Tmm+h-PdYn
z*Y-TwHR&;gTTJQ`Wz#^9Uj`PV*bd_Xi{cUvIax|w&SM@H&_Z$+>~J(eK}1^C4VZZo
zXkCV2YCZuQ%)&u%7>rb&5(DxRXttu<d#-PXSCTIa%?ns;u)tt7J$4#fp*uR0Mw441
zB=oi%hzjW%NE!%Y(bgFm+>#7txYwY<V0I-+no&-zeD+r}kX)vwzz?OqAAE^>m@2D;
zp;H~|j@YH-CE1%7r4O&m2_2t2VndCBC)4^Bo_h{{IUi&%2s~!{V&{hDOfAK-<bZzD
zk8{UB%x(JbiXiBsnF#vL06}O(a=za!t;2ZZxSK}KYMP?BnLzse+JJOp@LLZ&ebY=l
z{n0QyEe?h20juwt2`fC(&hnV*Ep<bBtp~bV>`egxo8ym{fOb8A)M9VydVy4ejFQu1
zNw4+5Q;WT+ig+qn>UsdF*K0jswb}1Pf^I6xP!EMVsNWQjkc0VB0qD=hm9qdJP5dF|
zCuyn@DM5a545`bDs5t*gHPs+&Y#PnH1ENrTa|8O=Cz!<Vs<GRO6Xk?7xwm?R-k*C$
zn8$E^4QCv!bY6R2Fg%wb_1PKhA0XSP$XiCVB`Jg`E6;B|fRxzC$0U#>P$dg<Uy6$I
zv>#A<$WoBR!>w_M>7Dp0bERpo!I>M8X+W>+F%e~^j~hS?v)m^kv(Jww@v*PT64azy
z3|&D`T<L@*Z<{r8c11}6U8BKeAOR&rD6UkL25Vnz6$C+XrGz(Yq^mx`tw89};4EYd
z*CdU}6{{nzn^iKY5lU96=Pyi)igz-;9%6ZPI~%FN(iwBnm98wU+cNF5JeO#8#`zc~
zjr(pcwQFFlu!1PvBQ;BxX2f!0s_HcSc*nA^_9Qp2W*IvJDWUwKjA!D_@*1a(8_-R0
zB?S7!m5R5;f|=n3udiS<TMS+D^%cwqs>NBLU=HmQ<}pWlym%V$@Md~Y6~(!9NCQiN
zHBE4MbTys`rNqmF@}nmO!g%t|Yy$04`8@XV8<vIB$(h#PX@1OPxMAQ&?CS~E9_rYx
zcWN>aR@vr4SvMd>y>;UgRb`QW58_mI(LFrKNvUFciX)vY4Ol6Gkk}LEaB2hzD&H1w
zE1Fma<!s7&;@T9H9tpXKE2VOcw!-!OCfJHcy4cM+*b3v5{l-?LZ?v@7R#bCAYubuc
zRT@0vR64{rS78cluCV-@%~c#`s~t@$D9jupru*{L?hXje{MT$T`SapG?Y^q2S~Duz
zT!k$-P>D6215JVig++^ZxN1k{)+ubwmASqbYhD72gD=c=?MQRrPr{?$LR>+~iW-~(
zalc*ki?zxAy%qTE-d1^Rr5pH;i`jgezGa9p_at6md+-*o53eg)Ya2PpzvWb-Nz}4b
z*so|eL$nkIpt*e%woY8>5N*_~UjUEI(yaJ0Se9nN8?7#s`N(xMt&YGj=hLTB{V57o
zHqh5L#!90SI{lrpEDf?pnnU-B+M|EK7&XBjW$yo0j3p7Rwn!T@SEWL1<;`3h7&Ho$
zwabQU;y^2E!~boF4Sx;1wDh!g8cf2C35PFD<<i(~Fa)(y(rsg`vZvYx1~U%|Hs2X#
zrR_50n)qOWA?LU0>99@-q-mcS!{MPdB?aGbOW!bI&Jlc$F5<Vl_Bft|;+`nHNCI#_
zL+9JjU(|Ku{;YhRhkw8c7oN9Ge<+7Pp$*INHqG~pc#A$xNJuIleIsp3){VCn+85ql
zf?^GYoFemfrO1}wM@FZTXuL&N(ZieYXas?LQm~P4AP2>K1Mxn1gQh};x8U+9aWJJ#
z9ZL37N0V(teK^g6&!+KKWElgdGTOo$W_+M5t*cGZ3nWme6unAVm{XmJvZY8yZ&3aR
DTALMt

diff --git a/js/src/jsapi-tests/binast/parser/tester/dowhile-007.js b/js/src/jsapi-tests/binast/parser/tester/dowhile-007.js
deleted file mode 100644
index 44adbcafd988..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/dowhile-007.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          dowhile-007
- *  ECMA Section:
- *  Description:        do...while statements
- *
- *  A general do...while test.
- *
- *  Author:             christine@netscape.com
- *  Date:               26 August 1998
- */
-var SECTION = "dowhile-007";
-var VERSION = "ECMA_2";
-var TITLE   = "do...while";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-DoWhile( new DoWhileObject( false, false, false, false ));
-DoWhile( new DoWhileObject( true, false, false, false ));
-DoWhile( new DoWhileObject( true, true, false, false ));
-DoWhile( new DoWhileObject( true, true, true, false ));
-DoWhile( new DoWhileObject( true, true, true, true ));
-DoWhile( new DoWhileObject( false, false, false, true ));
-DoWhile( new DoWhileObject( false, false, true, true ));
-DoWhile( new DoWhileObject( false, true, true, true ));
-DoWhile( new DoWhileObject( false, false, true, false ));
-
-test();
-
-function DoWhileObject( out1, out2, out3, in1 ) {
-  this.breakOutOne = out1;
-  this.breakOutTwo = out2;
-  this.breakOutThree = out3;
-  this.breakIn = in1;
-}
-function DoWhile( object ) {
-  result1 = false;
-  result2 = false;
-  result3 = false;
-  result4 = false;
-
-outie:
-  do {
-    if ( object.breakOutOne ) {
-      break outie;
-    }
-    result1 = true;
-
-  innie:
-    do {
-      if ( object.breakOutTwo ) {
-	break outie;
-      }
-      result2 = true;
-
-      if ( object.breakIn ) {
-	break innie;
-      }
-      result3 = true;
-
-    } while ( false );
-    if ( object.breakOutThree ) {
-      break outie;
-    }
-    result4 = true;
-  } while ( false );
-
-  new TestCase(
-    SECTION,
-    "break one: ",
-    (object.breakOutOne) ? false : true,
-    result1 );
-
-  new TestCase(
-    SECTION,
-    "break two: ",
-    (object.breakOutOne||object.breakOutTwo) ? false : true,
-    result2 );
-
-  new TestCase(
-    SECTION,
-    "break three: ",
-    (object.breakOutOne||object.breakOutTwo||object.breakIn) ? false : true,
-    result3 );
-
-  new TestCase(
-    SECTION,
-    "break four: ",
-    (object.breakOutOne||object.breakOutTwo||object.breakOutThree) ? false: true,
-    result4 );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-001.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-001.binjs
deleted file mode 100644
index 8ab757348fe2a72cf382c4fdf4aaffb7d1fbe7af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6518
zcmds5&2Ah;5FQAGAc4dQp>UaFP=uUFIa!M(yjg@Jvx(T1C4^Aap6T7~q&+iq_t-Iy
zkPCMnfrsD#N1lKqZ<4Csp6S}1@otYjHa{1yXL|bUs;{fQs_ua)3(5Be3(nHLXDXj7
zb`rfEMbUAdo=5u!<0q5dNs<>l8tm9_22yCV_vgn^bO*i~(CJ4^33e>`W1dK+m=Sqq
zp;G^>qn9E}SF!#EoVT`N<;p^dG!mIGH2_`yAmy16Gr^UG%h-uGS{o&@`QCf5%w#m2
z9y}cncHFzcjsu}s6Z`$4FkCTd;ZB(>8+acA9)Fea0)74b!GniQ)Czsa@-}db-hzpz
zOf^5JMqHB5zX1CN`8*nZJL!whcfs@*`r-3OO=51I$J;>S4e^M6PY<Stqo&_9AOfTE
z5u$NzbUe#d{DhsdNuoqy;)!8d%2XPUs+iTgaXe&Fj+Dw<qVWo(k6smuYYlk;s~Ua+
zxoO$t_50Q&w#N8RkpBei<39B$Apt4>J|JkrltD(C^wu6aSc=|{3n-?}1*YaD5}{jN
z4{+uqz&cZ)N?(Iqb2ZHm^Lf)Jt2Do~Men}Im^$}<MW{m{?jY76u#(SAq{MvT_0`E0
zZo_@Q5GCmvAOnc#TgcJD*gLo>DgvzAkj^#ovK-Wp*A{+P&!F4D4W{MuP1WsRZ2vo8
zzv-O(UzJ&cRh>37m@UwOT-X}Xya))BO~g{DeVHdOy^3z{&VKtKvYEZoo%yWyP#7Fr
z1o=zQ@Og%+<pH|L#uq-Ts850PKnW>ji)>S<z^eEu_&Q@k@^m-O^0;o>VzW^BS?0}L
z&&leUuIah>kC2IFuy(oWEA?$$N?CQjFsrUr6%XsbbnaB0dqOZ>jxlzl1@s*f`tljn
zA1Qu<|Ekjjo!mLje}@Gyg!_o|-Wv~;oo|>~G|65k&>am{s2~R~z^Un4pGxNpnMoEy
z$x6*_f);QFJLyfVtW-38p$2r`zaxl{zV>gze=K>HaG#lL?WS+KZ0Y?2WE7QjC3gNd
zV)qGnRxqtm>`>tNnHRj~CRR~JH}jvPqJva*OWMadtzo$N`SA;$n5a<L1Do?Y%_tE8
zl`0@N0#NWi#pKIscJUrndsY9oH<CSR3cUbAFPG1U+$`H7o{r&`Wi7Mr!gn^S$>D($
zhuRIMly?@A*F6f!n4b|1!6@nL^oARZr_dqOln>{*rR7&x4-3bNDh0$&@OkJOj%(Kd
z8Q9XnC8RB}_dbii_xctK9g}c#^wRhWAasieRoO>T1C7RrihpPtcm>FAYENwrU;<Am
z7q#I|Wh&F_-(`x^g{Y7KV6C+E6!&rce0hjVExUO++_R+za3{MeeaqKFR+v(?%HemQ
zg>W8=s;l3&Q=e1HX3OXXTGQK&wOls1k#@Zykd3QbH+DhryV16QAQN@-vdxV)58`g1
gz4E!iEq7kajkAA$29}YHis?(yxskN)#I$F~8xpiaoB#j-

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-001.js b/js/src/jsapi-tests/binast/parser/tester/exception-001.js
deleted file mode 100644
index 987ba0af888b..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/exception-001.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          exception-001
- *  ECMA Section:
- *  Description:        Tests for JavaScript Standard Exceptions
- *
- *  Call error.
- *
- *  Author:             christine@netscape.com
- *  Date:               31 August 1998
- */
-var SECTION = "exception-001";
-var VERSION = "js1_4";
-var TITLE   = "Tests for JavaScript Standard Exceptions:  CallError";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-Call_1();
-
-test();
-
-function Call_1() {
-  result = "failed: no exception thrown";
-  exception = null;
-
-  try {
-    Math();
-  } catch ( e ) {
-    result = "passed:  threw exception",
-      exception = e.toString();
-  } finally {
-    new TestCase(
-      SECTION,
-      "Math() [ exception is " + exception +" ]",
-      "passed:  threw exception",
-      result );
-  }
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-002.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-002.binjs
deleted file mode 100644
index 2a03114aa34971b4bab34be4985c222a69e171fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6710
zcmd^D-EQPG6b>w~%b&y@E4axe2%+vGE>Ja8+RhH5t1=*F)EfjVH}TAPn<iP?X}3H8
zmvGNR@De-)m%It*Bu;#0oSAVtX?wv<(~0BHKA*qy`Pc(p<Ox3*EI5k~evsK*vh(2e
zAP7#g_$oL&8b6!tPoga6!C<faW{?P_4}SYF2p+&!1KRzBNx@DN{**@vlT3>&Eumuj
zTLot#jhC_h1)SHmVP&#}5^*3>p&I}?{87wPEoOqt5-w%ucG5~qk<Jh9!!VQ4aC-Fp
zc(7;Q4fYHO#hR4g9}CSTOG>y4mJ|-&`+&z^MLfq?KY#S-3m3IU-z#|=m_hGB#|tLi
z&*>zt$>%?SeT#gajDDQ-#pjza^%v^#^DkXuZlA|@fW%wk5#yd7O^-)z+*A;rs{9Jk
zxY8<|WioumF4!cJBG=(WvovNh4o9_S)qXh4QV?Yk>5-IKiz0U*e)KArTq(#67+Ldk
z$j_2d-n?&3<RMEE+qLWw!7FalkCNh%_HP3rN;9dE6_?^BLIX?D?L2k~0S(oJz~sC@
zB2;VW9>IJ7SeFu<>07XDE~nXXHg{tx-R93W1s{r($txRIfL;U!4~7jUoA8+qq?j+P
z#~RDRRQSveL`k{<NDm_VHggOxv;l5Xg~#kRq;!K^Z3)fK8<QVKwp#|h3kZ!-Jb%2N
zr8*cY5399Za%lG;-hd!<X9xJENF&_dX;p(M1Et8?8i_{lp_Q%dQoO??i_R>O+iSHm
zs8VpkOSRfH*W?Mf`8-AcvH)ES<ZG)O8j}Y{Z$SjGnG{Kjfm0~YJ@R9Kn=z5_ct1?D
zuqom~y^z^uYNuHXdi6=iv|QMALAmnH``q1;i5p@QvKuRnZCoTtT?a$2X4hKfqyA0%
zPUV#)1SNQi+6@*^g(Og=&tNA?#INvQeYT*TyXzb%N7nxzIv?{(E4v<QBs9nGm|nPQ
zs8`l`R@>LonvwG&;5F;I+LiVhG94|32`dyYog{~&<9Tn^TBe~J6P-Y3p`Cz~`x4rO
zzbtqf@s+i-&SC4slJ393@6qy?M1FTh(z7c+gvfHH6uL4xF~79V>@H%hD!Q0=M@0uu
z?RLO<n$gV`7e70F!6O~y63cdd)ub6E!edMI$PEt^yav))we7B7qk65HXM62yZb@h$
z^bQJ!YJzQ$%*X5cV3ZZcG1pZQ$Kx?v4y|O?NAO*l)#SXxNkHurUK+J)W%hfIMzXvg
zpi25WaN+{v!Fk9O<-<f?(()IKha1R}D|u+g`v`XfC(Ijw^sGHmX(?D6ZnvL&8vbNG
zE)*&xl50`62dP_(sLmUzT+fN4s=}Y$3GM*d&GG4+J($?EI~k{`r`|lPG^Ydk8c+`q
z*BW;7jB(AX2;e$-+5W26Lze48wp!vZ;D_&FS{qATdrmd&ZVhP~TJzkrwOo{#mUiPI
zkj~Y!X<L&4rnOBKq@!{#3Qenfe_$Hgw?Nal<-V?3z4GrLKsB;a(|s*EH<H$!nD#XJ
E4=f~v8~^|S

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-002.js b/js/src/jsapi-tests/binast/parser/tester/exception-002.js
deleted file mode 100644
index 74ce79a96b2d..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/exception-002.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          exception-002
- *  ECMA Section:
- *  Description:        Tests for JavaScript Standard Exceptions
- *
- *  Construct error.
- *
- *  Author:             christine@netscape.com
- *  Date:               31 August 1998
- */
-var SECTION = "exception-002";
-var VERSION = "js1_4";
-var TITLE   = "Tests for JavaScript Standard Exceptions: ConstructError";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-Construct_1();
-
-test();
-
-function Construct_1() {
-  result = "failed: no exception thrown";
-  exception = null;
-
-  try {
-    result = new Math();
-  } catch ( e ) {
-    result = "passed:  threw exception",
-      exception = e.toString();
-  } finally {
-    new TestCase(
-      SECTION,
-      "new Math() [ exception is " + exception +" ]",
-      "passed:  threw exception",
-      result );
-  }
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-003.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-003.binjs
deleted file mode 100644
index f7fe5ad49b047e9d21df6a68485602b5fa80e5fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8413
zcmd^E&5qne5H`Po0|JQ)0!1?6k_gBq3S2gmk=V%~Hd;*(GujJ6QLo)I<HT#5c6&F&
zL+}8ccm`g93$MVD$KXa)yX~%-_RO^BXBWg}y`FYgcYXcUSJmAeS!6NqcBY(#-ET!Y
z5$xQ1)$_cwG@N-y$Ac%s!(otS-0K{uZ#r?5%kHl?J?|~}szbY<G7+(}m_O!0%mkBB
znkZADdC$EUQ4-GE`U~v5vd&g2l&L86q9l^F0XqC~$P*cjBQBJ=gq@p7=Tbz;q<aH~
z8TNal<EMkpf&Q&?pp8&lL-qYhB)MR*GIzn^!m{@c*yAq)o}sUw-@Es~wpv*~P`GvU
zpszv43nuK(=_EG9^G~pSg?OI!zZ>of&o^M|&-44wzOaG0dK_;6h*yLo`aL=xo%C(L
zDIpwL`6XK8xy=1>D*Pwxf(-)^Wzru?mV``%e!t>ue&~;wm~hz_B5k1K7O3}MW`gHA
z1O^N%`8foqf|J+3H%4)f#j)wCdIazjH?c<%aftc10gYTTArTTA-`YcMmRdLS*v17^
zQ|$skT_6y7qw5aNya%=}1<2Ajpx0cC(vx&z`=q4imnQliMF|r#<Clj*1nLfI4GJ6c
zvGhbVnHquBdWCWDsTqiZv<H(8K<rw{(LvuhxQZ1Hvs)3*wdFD&)USJ^A9}W31Yx2t
zRpQzG<q%b#P;MBaZ4*G-d+<7VAX|t3*F_RwVyE>C#tRf7ORFR5y#rBJLraYv#cA-u
zpt!z7`}uuOMfY5Zw&8+&1v)-SP`QkOHq!CP(1!Zt0MMI&H>8mwZjf$j$}u&51m?yp
zig|eGC#hf8ZoZs~^fEEitk}Hxq+=Q^%(@^~`RWXJePCiLtX;N!rM?Y{IIhZH=vC*d
zMLeo^+IJ*o1`rIGGvux}h2kTI;(QD_D2{%D|Eeto?cAE@e}mZKApd=ym$`P$y6{Uw
zJGCX+RcV2dRz{IM1C^_u!Ust2IiMZm4&`bZ*@pG5sAAFLlM=(YZOC<f(e^l{Qi$%Q
zXU};cy-Z*^C1;J~b`(4pA~=}B<Ra5$Yg%DVG2YCp&3ZXFfJNR>n#P<pC^Mb6gDuoP
zSR0wjS;iZPsLi#s>IQKIb@il!Y)I=~t8LQWRtQDoO4(XLSU<}$nj%UMtzdd}Al6+P
zmb%AeFzv;x$hk@;8Ju68@2tvGGG%jaZqjYbyHm({mKtwJrXl~a;7PzucV(K_b&T1s
zD!6|Ky+g^H%LLa~*6g@O`~W=5Se|2zh;<>qG<BlAh!v~oVqPB<Eh@Z!iGn!9hJ(6q
zro+pskKJer)gkn<d_Uo`+)wgw04LN7k@X>br=q$P)$SrX<;*J1RZq&j*7frzP(Q07
zsTHFHt%|L|-l|izQHC9SkL3;7Tfx$UT|RE~=TymoJI+T*dpPO(-<m9|(rSl^{A;{m
z!FVV`!GGi@pu}ar+qb6Ctve5GHKrVP9OAQjh`Uv>3}flC^KM--){XX{O=0Lb_{a9(
zx9|Ahn}p*>x$icj1Jl=Jhb{cTYQX=&ZK96Qv`fQu;T@1zRWj^8D^$R0%XF?ZNdSgU
z#j0zcHN)YWm8RgLaXu%NKlfNB3(=UTeuId87pI$>i&bl<M%t`PSKZch=%AY#&d_y>
z$_47yik?T)Mk`V1MwEK%zEZa>2@cX)Yk}dpZf&9y>6qKsPo!h{uVvFdv(|l@YaQLV
j=7OlKAJpGJ01L!pk4xB`wDn9^<Glh=Y+A&uIcEO><rBGO

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-003.js b/js/src/jsapi-tests/binast/parser/tester/exception-003.js
deleted file mode 100644
index 7bc02a627920..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/exception-003.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          exception-003
- *  ECMA Section:
- *  Description:        Tests for JavaScript Standard Exceptions
- *
- *  Target error.
- *
- *  Author:             christine@netscape.com
- *  Date:               31 August 1998
- */
-var SECTION = "exception-003";
-var VERSION = "js1_4";
-var TITLE   = "Tests for JavaScript Standard Exceptions: TargetError";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-Target_1();
-
-test();
-
-function Target_1() {
-  result = "failed: no exception thrown";
-  exception = null;
-
-  try {
-    string = new String("hi");
-    string.toString = Boolean.prototype.toString;
-    string.toString();
-  } catch ( e ) {
-    result = "passed:  threw exception",
-      exception = e.toString();
-  } finally {
-    new TestCase(
-      SECTION,
-      "string = new String(\"hi\");"+
-      "string.toString = Boolean.prototype.toString" +
-      "string.toString() [ exception is " + exception +" ]",
-      "passed:  threw exception",
-      result );
-  }
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-004.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-004.binjs
deleted file mode 100644
index c8b2db4aad276c6a2ce96e58306b214ca8c2a35a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6792
zcmd^D-EP}96xRONVFPxzVY?A}I}B-o0RsXrK;wE?iohLaBR5@9&=PH{QACZTl4cLl
z2iQaGCHfS@uJ$H7hoZ#eNS5hXZU*cojzsYz&&Th4Jmf$ZdCHFlOU~k>pQTtxb`iWA
z1i?(i*TM10_{rpO5{aA#g9G!;AWf7$`umF@_!zz#(C%kUCTy1S$2>}zWI7R<fr{O;
z3eJ-(Ud8$caNgO3C8U8$;vmTqT?5eJPhy_wWS($o;4*gMCattgvc=IyFwA5$oSr-#
z4-V|R!GQ&#SQGR8X`;Dgse!v>Y0<#@4Dk4?i02sVw+|kC*F>$*4-9VuJLr4R@si2r
z=X4Uc<nu4Uev5pbjeeQ*#peew^_S}5i~j_V_khH=#3RN%J(-@4x&`5>%I^`4E3Lx0
zkl_<{$tICZave@I%VH+ua8zkl9fni!boP=*dL*T25#$c~9lgpWR|--C2G;xn($f&i
z>-VjBJY;F=x|$vlyy7nVXp(qj{XO7AX(lz2(qy=fu*C=5Ja!2I{nUoQ<f1?#RBPxS
z!F&!_R}zfrCva>or{YvBnlTx(`J+w1$4SQIwTml2D*}H9zXp#@`CJDwSuCB!TF1gn
z_{I%HmtYT&9z^u*<rrY-0_;+S$Lu;Xx<)Q{g!*xB^25k>%b-sHq4J3r57(1a#X{BL
zq_#^6?H<GX5QE;@0Ddg82sd|H(_qFxA+okYqS1RuWfQp+?l=|Ex#Mwjq4ow!6rAr$
zp?1q9c?4d*$k4qUz&7^rgA)#o$%CQ~Ap+P+inPVPDU|01`8B}JS(5VjFw8_)S8$<T
zN^zCBX;yl^`Af%iT)1^Xwes#=?(WFM?XV8H87qx#T%>7L1VgWS&$`J+^-TLt<+URO
zB{)Ov21_VGQYg{qun(ol@9<xBu%Ml{*Evv*tp7iBek@sZ&S@H=69`ks1-ZoSTwk{m
z>yd1@R&yb`mEoCbX5HJ)IhA4>zvZU5q6KmYg{jqH-Rw&H44ICW!;}?@8;8o_JbKZa
zW1IBu=4WdGp8-{U33$SPD|i-hXH5p$Ig+bB4c%`*Jt&}+<heV8>e=nTgvfHH6uLb+
zJil^|-(18>Ra8xPN5vLiz1^|tvDlM)c;tqM2jSh47NyCoU!!WR>fiQ?+FrfT6{Qzj
zFqD_4&^{Pt`FzTCSsU_r3^z_UGV3e&&SW(?MR5{P`-E3!x^2bxx<?}!^DE*ZXc2uK
zV{w7;I6h>G@?j%4wEPL<VbQ+gN*>zrJ{a!d+`0!y&z%;P2D|pN`!go*KM$Wdj|&qO
z63JPLsm44=-C#sj22xbdiKD8*=gkT30J)vx(>Z%E(X~5Sr>Ul1|CVV^2cl*I1gtfn
z9w2TtZ1;?D&B_Sij(XMp%GX1d>q53#;;-O`pJK$;5?j;Nwzb@%*p_zxu#M|Z)MUiQ
zt+j1iqjTHZD2?s=Hcb#f)x3PPt<6gb+t9uN+QtocfaThmzpsI4B+-ZLPD=aZr9DUf
E1-=}goB#j-

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-004.js b/js/src/jsapi-tests/binast/parser/tester/exception-004.js
deleted file mode 100644
index 41b7ac3aa4ec..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/exception-004.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          exception-004
- *  ECMA Section:
- *  Description:        Tests for JavaScript Standard Exceptions
- *
- *  ToObject error.
- *
- *  Author:             christine@netscape.com
- *  Date:               31 August 1998
- */
-var SECTION = "exception-004";
-var VERSION = "js1_4";
-var TITLE   = "Tests for JavaScript Standard Exceptions: ToObjectError";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-ToObject_1();
-
-test();
-
-function ToObject_1() {
-  result = "failed: no exception thrown";
-  exception = null;
-
-  try {
-    result = foo["bar"];
-  } catch ( e ) {
-    result = "passed:  threw exception",
-      exception = e.toString();
-  } finally {
-    new TestCase(
-      SECTION,
-      "foo[\"bar\"] [ exception is " + exception +" ]",
-      "passed:  threw exception",
-      result );
-  }
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-005.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-005.binjs
deleted file mode 100644
index 7bb22fc467a9c75fc8dcdcef3e7ce6f17305f212..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6792
zcmd^D-EP}96xP=Lw8IAMZo_&b^mZ810viSdUVz4Ru@r$j%tmgyqM#+(R-=d-NhQr5
zq7TrA=u7k|hF$GVb`C{}$B}H)v7B7&CXPh$BhSb0d^}`N7kSDLdUMX=gWsf>Np==|
z90b8c#FxS0(eT-5e-w$F2faP>O)pK9KKSRGAh-)(^=S7KCKEPE`4b+cOfsE_%s|EN
zSp}y_7B6D`3pgLG!xGX!C2^2siLL?Y@JBJvbTUo2G;kR^bCXtDCfV%Za~Nhc=#P({
z4|{v|U2o5VP^^*p{y5QGvedwxv$Sa7eFb>@O~iAI^@oQKe`=yu=zE5@o*ncKbUbIW
z`8l1$HTnD-uy2shlfmz!uK4^Erv6$zdi7(In49PE9*}rLJYwAAqw(>e88;P#rz(F&
zG_JG?r$UC$*f|?TGRbu~(kzRajKe{tS+yUI#q-H)9_fLUqD7Ef@IH8xORf~81`MqE
z8KkEnl-KWD^SIB_)O9sIB6!7J_EAnevi=_Mp)`{kNog`%M`&Rwx|_!~A)uey5SW}5
zNQ7z)-6NQ<0qa77G5rdT&E;4ei&--!V>a*F1bmoeOkTRU0<<FVckpZQ*pyFoAd}hL
zS*&#|%!KdVK$N5%Kzb0-wU=Xnp$l-8Dm-SlBBN{Ma!05icP2lKY`YBl0uU;nc=c#G
zNmVRV9ZqW7q|o*;d;&4(jSb*wkwv(<)0ze|1`3g-6%vi!Ln`aYrErI-h)x}k>kG9H
zP@>>`7Yem&F3Dr?@>z!N<p4IZk6)Z{XiOdyeFhQ0R#K!b_D!KYH^}<{H)To6<NYub
zVO_z6dM?F9=B8Qc`RXqn({bU}1=Y$|?{c?CCT@py$jw-3Y{Mc=t0EYB)qB=eKB{Nh
zcPuX*At=EKYB!ie36esIK81ZKP5y%as)GgXyt&SSa%BDgq4Pt@qEk-O5S>7nIxfg1
zZs+>4l~|8t!?l_Uv053PnP%3#?VM97rtw>DiVIpGhftVW9oE&Zv`?SuXx>j*p}29V
z9L}R>ojJBi@74TlEZ`HMsw)AH_@4#OBJQloKs!fr)u*BR1E>cDw2(ZvXHXrx{kITV
z&Xhv8M~CMZ&heXzSgDGt>Gr7Dz^gYqHa!tLau1K(@bDnKThgL5ndNI#tyTToUQyet
z7rLVKVhe`y@)X(!qb#3~xh`u%9uMKh=}KmO2j7{jCZ{M)0&1V|!b~@<_}+GCBtw2d
zJOnMGt79xKFdoPIOi?~;<c5~_Fdi1|3$Em$9q)tT4$iGRfb`sHQE9Mizj!cV^1;jS
zh4Z*DQ6Z6>rI>2WgVZ%fRAnGV^_)1WDty_T;1-aZIX<1U2NSDyC+jrT)a&0e&FMhY
zOn`u;2Gjw>wT4|iV_dT`0=T1Iw7>FopXIuct(N!)_~Dlrv9-k3bhT|Qw<xxy-9K#O
zvJ*8Kv2kl{+m`6uwl+#*`@T&R1W+|EA8l*%Qo=U0Z-BOO%^hI5cINL}AR0;ZA$ujI
K-SN_%BmV){R-c^!

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-005.js b/js/src/jsapi-tests/binast/parser/tester/exception-005.js
deleted file mode 100644
index 152aebe4be38..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/exception-005.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          exception-005
- *  ECMA Section:
- *  Description:        Tests for JavaScript Standard Exceptions
- *
- *  ToObject error.
- *
- *  Author:             christine@netscape.com
- *  Date:               31 August 1998
- */
-var SECTION = "exception-005";
-var VERSION = "js1_4";
-var TITLE   = "Tests for JavaScript Standard Exceptions: ToObjectError";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-ToObject_1();
-
-test();
-
-function ToObject_1() {
-  result = "failed: no exception thrown";
-  exception = null;
-
-  try {
-    result = foo["bar"];
-  } catch ( e ) {
-    result = "passed:  threw exception",
-      exception = e.toString();
-  } finally {
-    new TestCase(
-      SECTION,
-      "foo[\"bar\"] [ exception is " + exception +" ]",
-      "passed:  threw exception",
-      result );
-  }
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-006.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-006.binjs
deleted file mode 100644
index 6413d212c5b6e39c3a490590cb5c06cfdad69b46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8294
zcmd^EUys{F5O;x6cmVN;K$ZLms!&>icsPZVxHJ`4g<M6#y&zQW*_&ir$9C77+@(+b
z2uQr~%17ZtARhT9%s6ZBB;Iq@mp?7=a=v(XXJ>vp^P8D<Tg}plAGar*g~v~1GL~%W
zz2$k{MG`K&lhgj=!O<W{Qtq`|`J8qnGIjjRUC(<TX0_?^b0!75i1<SuL`*Uzk~kL?
zn%|lCT*Tq3tiM6dtxd8LnTrykCt{&W0d)J*kjF}l1edwEm`#n+nUW$NAK!s(2Hno^
z^sL`*>38jx7D8nW^7%cXxMWc-ZqA}vMcxM>k6#5mMO(kPfB);M)IxeI$E~e5eH#|e
znXFEyO5707zd-f@@jUPTFxVBIw?Xx1*@LHFRe?D?j<*5C1L25v4^M}^Zq;t;5RP8?
zB}(I&%KT9x{l{$127wf*@&}5=A(NrsEqpdR@`sC*ccn}$&bS5U-K$jcEQ7FsO%<O)
zXy#z@^1U^NJ1mOK(tJe#uegakiibnQBS~e7Nriw^(Jd|1VySea$2KM)mueH39M2Gl
z%xb!WF&}}fO9`a(9k4Z*!=#stt2X6C^PA0iPejb*!r0{@4FR_UR|CIBe55=n#uG!Y
znyoMj?wO4!NP7_J0K~3&91Zl1fpuQtpj}Ngmy(y+p!~Tv_e0CJiy+K#!{mt+Q=!D1
zKYegLPK7ztL5#O;6Ghvb@eY`w8gsy-SsY+)rzH&r4b&mm7D&{32XA=~#C^XwyLiR}
z3qes~Cs7hSHz;nd(*6Whan?$ecEbbt7RY=YBYhbGP59#*<2KZ$hY6L3$|gAyUMi88
z)WXV@!->d<8nCLIX7fSEQ&7n=!5U2qVa1bb{$m}NLh>7lE3aVuQaeqk=#2A3gyl}R
zR*t9-X+nyiC_ioH6&kHSsfGq2<1`pZygmp2$4?q_M_$aIjY{~-9-x4e!uVz$wC*RU
zqO@D9^O<ee9Do!ZlFo`1O_`B>=;h?K5_WG^yf~27yKu@-WzV7wiNmpP_!PvAn230I
z<j09$HnzT+$mBA<K3Z&1^RELFJB8BZs;$)B`m-o%Le6yUP%aD`V<~ZgzUxh(GmGHn
zVgx06BwoUQ#eEB1+_(bhK}JQ&|9|-T9-5Ipzcik_gMPHW+Oq}H>(QXlr1D%gE-Ow+
zE(yWaO2=JaO4oFl3MQS1%`%?za0>T@)18&nd682e!i^*89Ab4>ku=~hW;_n~nrHE{
zE;Ba-Ioy9h6j$o_J(X#PPdguj&!jBNFzsNf;g=@$R1dN6D(X$I4~hm!quJHg&H5sT
z!*hrY2PsHno7<)0tjeeT)?*K)ELyoNhkINtn|B`e;fugpWPJkj@~9>^U7R?bU192b
zjfv#<9TLfEZa|9I)m0-NFkYE<SVr;CmY1xAjqFNo;ov*Ymv?(e=X((8SX{RNsTioO
zxa#@rbN`;d_Tnc)e7?wh;)fb{>Ua)FZ(ye)EU8pSYtYsFpQ{RPA+lK-pgKDsQP(MH
z`YBW|pUc>%8@V>vI}mZBZR<70Gh12!9~M_RarwH#QZ<uSo_qx)i9LDo{nB2>Y7(^u
zxE{0Ijq4FR<LJSf`v9_O<x`{{yCx3wsLeOX!mRrBNRL*pl=Xl;JL*B}{gWQs@PTJ}
WzWLu@;V=-(tq-IY_U6FZgXtgI*pB)D

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-006.js b/js/src/jsapi-tests/binast/parser/tester/exception-006.js
deleted file mode 100644
index cf9df729c827..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/exception-006.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          exception-006
- *  ECMA Section:
- *  Description:        Tests for JavaScript Standard Exceptions
- *
- *  ToPrimitive error.
- *
- *  Author:             christine@netscape.com
- *  Date:               31 August 1998
- */
-var SECTION = "exception-006";
-var VERSION = "js1_4";
-var TITLE   = "Tests for JavaScript Standard Exceptions: TypeError";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-ToPrimitive_1();
-
-test();
-
-
-/**
- * Getting the [[DefaultValue]] of any instances of MyObject
- * should result in a runtime error in ToPrimitive.
- */
-
-function MyObject() {
-  this.toString = void 0;
-  this.valueOf = void 0;
-}
-
-function ToPrimitive_1() {
-  result = "failed: no exception thrown";
-  exception = null;
-
-  try {
-    result = new MyObject() + new MyObject();
-  } catch ( e ) {
-    result = "passed:  threw exception",
-      exception = e.toString();
-  } finally {
-    new TestCase(
-      SECTION,
-      "new MyObject() + new MyObject() [ exception is " + exception +" ]",
-      "passed:  threw exception",
-      result );
-  }
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-007.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-007.binjs
deleted file mode 100644
index 163354107106e1edded8bcad68be50472d9f090d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8695
zcmd^E-EQMV6!!A7{7C#<B9M?TK`Yc27J;fziKGF#%BE<O_6DKV)Se`>>)K{KX&WAe
zTkd%PZV`9901`L63FkOt&q+N^#*LF*;HGXo_BZF8`ObIFj9Y4&M*N^P;VeA(RwiS~
z&b=2r&pS)Pnb$t*KN#!}f+Xc$YbSrE6^Tq8{PDi$y$(;c=<BCU3U(IpLmos-G9{8Y
zhYHQ_%zG;0a1rZoz`3&uE0H;r2t5%CRRYlIk3t?RF%n$na4|bKMrTTjczo~*Of%?q
zhDXQ!){ef{+R-2sYmh(R6N*a~<!~1)npW`M06cyb@DzRhXm|IsDr$kglgF*4Cw&oK
zykN5WI5pyy@%$68w;0dU?xR6d@q8Iff0FGzzF!T@_TzXLg1DtPqTj=#VXs^Dn-ap2
zmG=>iXDahYiS!?^3pNO(NR>ZOEDo6r{cge8Y~S~Xvy^wGOe}2Ne$fBg9(iAbsoE!B
z_fH<SyN?<P{9Qo&WbgBjKi#dutr5!ZRVsOwfyBT9Dt-<!mlKnh_pN%^VNqmW&EE*%
z7B?zJx#ggq7_dw+sgPVtJk+oh-Po~?3s{%53rvou7>La3x`Q)s1J<Pkf&T_7AD6?V
zmyD}E<)ZzQO$gc|W^!iy@=(&DPD0&-S{3n;@}w9~OsUe!kBV~7OhkjU0Z4~HG+h(X
zLEku7^4`J<2kVw7V~ISktmRM3L}r=Rp&xp-UIx7h2#0*crja_ue&X@o&4DWXp$vIm
z{CElcP_;$it7#lyqeS~d%o=FwZtOOx_YQP<72qDuj?bR(z@ktTtQ{r6Q^SVUE${DO
zDn7N)^4@Ymz63QN$EaThppJliVQ52rI!q`Y8k^*i@KTA&q-IvJ98N?=%z(Gb$7~#Q
zTm_ZPyA@+;0aje8<tNL;6sq4yTzQ4$m)2=TMKWF_A}nXRv#>;cs1s5IMK5o2udwL)
zm0D;bWJrU8z?T={|M*H{@yK^Z$D=a*<%X&VCk<ntUz$iZ(34=xbyK<*^H;9(f<euq
z8{K6LS@)eSNT5rNS#YDS5HgqnWqTpZ%%VOI>EWPJNF3;@p%Pb#OT**1=Xwv|ModIJ
z-1p<eFAoKLHId0>T%F@ODe0X5x?tkYpme$FEA_2EjiNeQOy3>KnPC@F@C>=@O<-3W
z!Ku#(TJlKz2>%slRrKZB1-}Oc6czse!SfAlKAP70<;`7@P;||ojRl1zm1{F~r^8e*
z=|pUr@mz;fIBPv`tb@*bn&l~6JCjZ!SDVVD0smpj<A58D%%OSNhM5zAJlwxQ7FXK#
z4RvMPFFWsmKBX+nu<T%|;g_cLR2Q)zBu$ZL7m6B1qux>0?Y2P<i|3FV4k##Nt9M7m
zT9sG(DTn^7Kv#6#UKYKaWAwP1@6~zOhp#EuGV5J<F3)Omvc(DM>;^AbTDSH5xj`XW
ztPLm;O&u-b0^<>Bhh;P#+VfJCaNoMnTR3pX`LJ#S<$ME>j?MKBL@EYpD^7Mk_|U)S
zU%T<05k6mJKH;H`J0+e&q*tg@k(LzI(Ho?i|9#cKH6ZJi0cx{DB$n-zwEPsNm)Cjj
z(}`SFsR4*vO}pG;T(h|c@KJVA6X&-(ELBr!)yZE$B;UeZ*E)&JvV3>aqszAM`Vo5{
ztOsoeB6`Rw9(v4j&Q4~lsu_W-d;r#CH)N0=wXur4m{q?s>Cx)hvmUV5RXu1usM2FA
eJ_XI0k^lV#mJSUsmU0s-VXq$A)cP^CXXrn%cnu{0

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-007.js b/js/src/jsapi-tests/binast/parser/tester/exception-007.js
deleted file mode 100644
index bae0027b5ce7..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/exception-007.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          exception-007
- *  ECMA Section:
- *  Description:        Tests for JavaScript Standard Exceptions
- *
- *  DefaultValue error.
- *
- *  Author:             christine@netscape.com
- *  Date:               31 August 1998
- */
-var SECTION = "exception-007";
-var VERSION = "js1_4";
-var TITLE   = "Tests for JavaScript Standard Exceptions:  TypeError";
-var BUGNUMBER="318250";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-DefaultValue_1();
-
-test();
-
-
-/**
- * Getting the [[DefaultValue]] of any instances of MyObject
- * should result in a runtime error in ToPrimitive.
- */
-
-function MyObject() {
-  this.toString = void 0;
-  this.valueOf = new Object();
-}
-
-function DefaultValue_1() {
-  result = "failed: no exception thrown";
-  exception = null;
-
-  try {
-    result = new MyObject() + new MyObject();
-  } catch ( e ) {
-    result = "passed:  threw exception",
-      exception = e.toString();
-  } finally {
-    new TestCase(
-      SECTION,
-      "new MyObject() + new MyObject() [ exception is " + exception +" ]",
-      "passed:  threw exception",
-      result );
-  }
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-008.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-008.binjs
deleted file mode 100644
index 9e6209ca559176801ced6461aa9b9f0e425e4bce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6852
zcmd^EL2nyH6y8#xAcVvb!DZDG2%)r6kx(#^8pl;rMFwFj7lf+G?%1Aov%8&{P2&EJ
zp7<U71AYYu4*Uy_yf-_$^XysMyRnlTxYV_G=bL%oeD8a2COuu`2|wt~IExQ{mf2LY
z^WeQ82+p#29vmJIUySxgQI_+dw`bnzB|_<gC!YtwNAOmU4nJj5u(O08@hD-EX_2J{
zDt6yh@LHttBGx~Eb8iz?CJmH`1Ca_{1JLP@W1ea;5nLL$l%2apD=kGjJ$L}qj0XMj
z@lV6vp8c)2XF({|$h?0dG?y$fa2G5oJiJc<k6%SR$5_98^yqsZwL;%By!Gs)_hH}#
zlm6>;5!dANFTlP<K2Ha~jCRH62e9;4>ha4bJ~6k?;{zb^mUzUt$H(K7fgd*&L`zkE
zhiF`B6;3i4zF-$@6iJcmaHLrpGZ}}2O0#M|9L-bBt_D(O4RYLq^}$sxxl)iAFs<h2
zker52UjN>h#eJ3}Zm1a%!B5=f9%ZCO&VLMSD9xlsN_>9n2rVo{ck9?D1awmy0+Z7M
ziBOH9w+QAlz`B%ROV7ctxg2LF+0>88Sk3QE@;wwOlXDkWfJOxF4sHz&oA8Maq?pc}
z!CJq<Jov^<L`k{<$QDHG+Q~7%&;__o6)je`CZB8MvL4i5Z%lp|*>)L(g}!u&mycId
zR7FCy;e@tL0&O3``w)Tdoc_;>G{VA8`x(p^XhK$YM>P5tLRn8O1v^Z#=(S^UbBp#b
zG$**)g%<6a8}bx<e43(jIe;$K@uQOsjj07eA3_9BMvA1tx+zr4()cC7O_)e{ydS1n
zSodzBp2_Sob<3>Oy!=V$bX>T7L9O!j74GiH#8Oy??8i!D8x~1YwZAZ`u2;)^RNv{?
zv79?XP=aTu-CzdIM*_|H1Zq$s-opQ?BLyAYS?7NP<;eQ~L+4BF(Jp%nG)WG}9A6lw
zRGq?OkLQ+Yhr)|8IGv>h|G~$%XQN6>-e*}V7gRzHrnso`p!%GtBO!UD2M|W3u6y+X
zufnB3eWs&XKVgO9#?W#&xSsFK-f?N%kC!f>v))f3qr82%rWK9&n}Vkicf$>|Gcebv
znmzav^oEjK$hEukvmF-)xYG!7rW6(jEC~G46$pP5o78l7RCKWRB@00<t?3VsGFtO-
z^Ru&8kYYhD@!X*2Rh}(qqD5tIksB>guz}K9X+x{`sM@Rgv$^@UKD3aY#AsluI@lV?
zzPxG-Mp>HE3D;#K$>SkhO)X{C7x13RYI5MB&e6Q!g;~2ci0^i2Btw2lJY<(u2{#x|
z?tP{xA2xDB%O5Zw7O$=fY<-5jfg|n>K(?&KAuxqy{;P*oMSl2o_^WfeP^i$)B&xI)
zX}Q6Us_dbtEtikl3V-t#xCLZ4-=}MC!Nj^6wW{walbudPFXDlKl{Qqdu))ckD_x^y
zqHF04v|(X*S}5`1@_W%P%b)u!*M+PswEV3xhVt(ehp@m;kS}YijVW)RHJ`=p!-g9j
zGR!w9GM{%rZlA5l5&N`BH)NplZ#3;w|E|M6XfBoZ;f9OFQjzB03!u}utsS|E(v{qF
LkG~X;*U<k5DeAFW

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-008.js b/js/src/jsapi-tests/binast/parser/tester/exception-008.js
deleted file mode 100644
index f7efa9fb495d..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/exception-008.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          exception-008
- *  ECMA Section:
- *  Description:        Tests for JavaScript Standard Exceptions
- *
- *  SyntaxError.
- *
- *  Author:             christine@netscape.com
- *  Date:               31 August 1998
- */
-var SECTION = "exception-008";
-var VERSION = "js1_4";
-var TITLE   = "Tests for JavaScript Standard Exceptions: SyntaxError";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-Syntax_1();
-
-test();
-
-function Syntax_1() {
-  result = "failed: no exception thrown";
-  exception = null;
-
-  try {
-    result = eval("continue;");
-  } catch ( e ) {
-    result = "passed:  threw exception",
-      exception = e.toString();
-  } finally {
-    new TestCase(
-      SECTION,
-      "eval(\"continue\") [ exception is " + exception +" ]",
-      "passed:  threw exception",
-      result );
-  }
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-009.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-009.binjs
deleted file mode 100644
index d53a931f8fb59f88eca6725b946088ccb6b25fbd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7026
zcmds6TW`}a6b{#M5s23z9`cS*H*V6VP(e#!ok~GVx7W!_+%{U8RF1o@{0^S@XGpy8
z!2jUbb?Vb4ZQU)a*q*Y~_UCi?{GAie;e&oi%TAXPzx<8G9Y%WAP0O;5Vt-^+>djqu
z+x6l;wVaZi<Ag!N%RkmF>pskK@bUw~0&*16kJJkZBRq&B3FYhe#5xWle;Vr#;M`b*
z6*CDH_*M`Fd;);CulqFOK|7#K!bPN~jZQcVqE2}YwsC9KR{d+!DXHI_k^;e4uAJWp
zIAtW1a3>@jWbhsV9zFGFU-<fBV`D3enxdCv+#I#(Em(L$Sav!#;+*mP1=uT$=Rs}H
zEh?UO!1P^r^YC>xFsqN_8U%4gaTI>H>a9jC>o+EZAuHbqG@9_lZpX~tB`3u7SkULT
z%Sq%D=G(QDv&pvYjv`J@YmCJ?bX<MZf3J?cLcl8fpPTz%Dz&{rB7YYUUv0kJdRr`k
zYo~oilLRydGRSEUbWSppPJYi7#3~6xy;QF7;3ukO43o=1K1IM1P8b*L$_8vg76psZ
zwH+66K@=wC0%4tj2t<<Wx`8uK0BguV;dh|)QPzqZaVP7ORPCR6N>B+R!baLJOK3V2
zN+^6#tU}u677IFEU8|Jz3rTsdH^M=>1W1EG6kQaBgSK{X9xDv2n<I@A<Z)@8yynoa
z#YUQUB2h<S>>XQO(8Cb=g*N0e48Fr(X_qsV7BN>ZU)&w-zz$-QsqRQKMMH^D(fNn?
z1DyL#B$%!NmZ91^oeAudLF9#)fpOH!IqDe7uqr(RxIRe|>Tlb26x)-&$>v=a4<l{o
z*+i!AcvBsWD-=x-@j<vCniot=8mshKK+Fm+Blmy_O{gH$KipiLb=5dyNAPC}U`-Bf
z>U8?VYpR5M-D*e%36;mE4__#~*<U$$sX<EQLC*SuQ7X%-$X@^zxL03AOn83@wa-wP
z9z%@VBnX8tffUhUPVvHtJU<;$US^)-0){s^55@5sL7ee>gYxkQIrW?HNv!)Nx#?4w
zCrO676N-quxU??K>vbrgMe({xhq@BT8-k+RLm^V4&8?CI$3x{vhGh%9xDC^$4yXY;
zif*_bfDMt<Q=799N}e(n^UA<H)4Fd6HS6#zT`%w~q)^yj&5ot|gu-i{;0cEuWwVo7
zoj$Skp9Ya9u9onPnrJNH8f@nM9A0mbqWQ%bgDri~E$H1d2Yt1j_#jVfiZns^hjlmi
z`vKje!u0>7T_IU2&dK&=`H5qv_gKDWVQ-eMS$gB?tL~|I7$z}2##g3oJ-Svrz}{RZ
z9^i8_PeT^aPBR_;xiF_Kd=C>J3aL_U;f$+NHJV>T)L?G6qsDSBcMxQ@{X&qLe><qL
cyzT`Jo$W@{(2Sc+HJUBnYGA<~VlDyy0SMmFdH?_b

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-009.js b/js/src/jsapi-tests/binast/parser/tester/exception-009.js
deleted file mode 100644
index 1229bf561444..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/exception-009.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          exception-009
- *  ECMA Section:
- *  Description:        Tests for JavaScript Standard Exceptions
- *
- *  Regression test for nested try blocks.
- *
- *  http://scopus.mcom.com/bugsplat/show_bug.cgi?id=312964
- *
- *  Author:             christine@netscape.com
- *  Date:               31 August 1998
- */
-var SECTION = "exception-009";
-var VERSION = "JS1_4";
-var TITLE   = "Tests for JavaScript Standard Exceptions: SyntaxError";
-var BUGNUMBER= "312964";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-try {
-  expect = "passed:  no exception thrown";
-  result = expect;
-  Nested_1();
-} catch ( e ) {
-  result = "failed: threw " + e;
-} finally {
-  new TestCase(
-    SECTION,
-    "nested try",
-    expect,
-    result );
-}
-
-
-test();
-
-function Nested_1() {
-  try {
-    try {
-    } catch (a) {
-    } finally {
-    }
-  } catch (b) {
-  } finally {
-  }
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-010-n.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-010-n.binjs
deleted file mode 100644
index d6bb139bdc18614dd026a7afe89baec814b4d603..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4817
zcmeHLO>fgM7|!_ql(=#W7dRm3HX)%+S*5iNtf(th(+w^Nd5zatWJ%>X>vrUC@YA@#
zl|R6d*RB(Lb+%?}wp}<?jpN6DA3yKo_l?8Safs_qfRSJC(Rf7Bfpx>Oti9Mjwi@m3
z2XEaQ#$#+bHSvxUl7!X&KC!Gv@Rp-b-$j(5y%4wXFhmqF5=R2cSN{|18;SgrSib;g
zX&zQg1r+fu5)qaI=*zc#95J#_FcokSI#8QV7$woDeixSU+~%PDvFp_2Gp8m&bSzK2
z-ysZB6biUQ6s88=W5B~lLp<iOzFJ;cHc>P5n&8cmi{6BZhlrZ5>zlYBpFaWn3i;f1
z`(9Oi-hr*V&F#&vt0prG5a}L`DNYhNBab154?rh^A)G%i6jT$1p_(dY4B-)0GSE+}
zg#7M9cnL$44RFHFh_FDA7u3R^tJA`5SZdH7bX+qqou-nR^%T%rarA=OO^TAhW&w>S
zkivG9hM~E_wTpvWrW6OFqm)Z5DHK%+nSi%i6AIq51*VMYAnwE?Gi2c>KOoVKTyKyF
z(PK@y+-<<Z!IHs7L%h!{N=AWlQE5sX=%rdnKebDMEI~xocFhB{Re-r@3i7SQ?#>W=
zjyyH}{BOZR>X;VsrYhyf;~K+tS>RA2oG&nLXs%>hb7^-WgQxjyGw{LJ1qbq<Hd$=R
z%;dB+cHVb)wi|AL-CkXJyS8?fv~9xWIf}TcDY;tbaFq?US>07iB-ulVyybe$e!Ev$
z)%E}|#eFjGGN~?IuaCfc5Ul&T2Su;jQm2qPl71Q`Q<&QWrZg@nUNh9}S4UUEIhW6M
z@kGrOEkISbEGLH7VNH}^lNjMZzrp5i!D}bFoD!m~`reu+Se@s^Pf<skDS@lJW;n4J
zx~fyS{{+Jqy=CU{C3~?<rn7$~0Xh##gXdE341GKvDc`J{))y(EEKVA~G)>a-U@mR<
zRUZDl8sqx{r~d}#zT0ef+}5*o+Y90}^z8s0VjCYpP3_wg!U8*uhA4#^7#_;@y?h-a
z^`al0{-K2PH2n`v+w@xq_Pg*kB9V``P|_k4519+{&zl6{IL|>MT)o+Mf>W<QSr`<%
vyBsXEAvso1ylRl9FKUoR!>>Wk)QxiFl)hJvnwpjabNV1b*i!!aMkc^N)3qI;

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-010-n.js b/js/src/jsapi-tests/binast/parser/tester/exception-010-n.js
deleted file mode 100644
index 46fe72fddb23..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/exception-010-n.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-var SECTION = "exception-010";
-var VERSION = "ECMA_2";
-startTest();
-var TITLE   = "Don't Crash throwing null";
-
-writeHeaderToLog( SECTION + " "+ TITLE);
-print("Null throw test.");
-print("BUGNUMBER: 21799");
-
-DESCRIPTION = "throw null";
-EXPECTED = "error";
-
-new TestCase( SECTION,  "throw null",     "error",    eval("throw null" ));
-
-test();
-
-print("FAILED!: Should have exited with uncaught exception.");
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-011-n.binjs b/js/src/jsapi-tests/binast/parser/tester/exception-011-n.binjs
deleted file mode 100644
index 8397356dc8f41ffc250635ba4bddcfc1ea417b31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4530
zcmc&&%Wl&^6m@w&#ACx2nGFviNQ+oiCQ_RiH7JCt4iyp$G>vcL5w0DLCrP{HH~2Hy
zv1Y?3aAz|1OfzolHg3C$JdZPT&zyVaPCPyy#nAL3AYpTpr9(#coGXsw?4;p=v)<`_
z2v&nZIs(UQ$T40_Gv565z;W*4D9@a}O&BFRF|=V26Gk{q6A2aS@67p5lkhOsAH-QY
z2`gn1iiQqNC@%oa<vSrHobFO!5-uTodea$aG#NH;;xd8X>UTc%yoPG?8Vbb33gq}M
z<-kZR;U**=TX^>n5B3Kz60yEoURkkGbM%Jf%~OkB#fcNb?BV7n&dBF)#J)g2xBac4
zE<SJI*8SGUwQp~1W)>jQ-ybo^GCZSz6ApW*6Uh)1?WKZhkvP^<<%|I~ftG=JS{3AX
z8^g;uVZ09+KPJKwL7q_y|1M4o*Kw(Sr{DGMz)YGdX4YdwYp2OG?zR}oB9})joni{R
z<0OP#nm}kTbLk2ZzNr*K*l;X#mX#{2f>s_P)|8<EZJ;v)>!;mxXooCK<tJvlmGJ8{
zA?(1Audp2Sar9;M(inER!{{*5R;rvy0KL=;nMZdHkQIoi+p|T0t`4veO-a&K*xfOz
zFOX->UwoD<q>pJ4gQ`=0BCZkMnI$$Q!`Z=pOLG--`w`CloTu?Dvt5pk_`2j&&W*b@
zybp$nNKs9`bBY{!r#EZnNCnA=x~c64t*y>xZG{MyV~(`QO8!`%0xyrnTNttbWfO}z
zzpalVPcrjJDymW_9vDkYin1Iv|25IIdQO$PJ(%j5vb3%1;t<4$`l3ZLu!)iR^cOSt
z8V);Dy;o3f-Bw&lwI<n%AEk*lSKrlXpMqV$C&Lj3@D;ny>Yn#;?kv@xPf{AX%P;Ij
z)MF#p>-?u8!Q?`V@l-ONqfo@8beumI%|$9mOb{pTf|8gNQXZ5ET+i<76u?RM=Z^&x
z@D}I3U+Z-J_LEgNh|+N!x)GUx3;S3vhVGQ|2=9Rb8Do8ijp}_`{d!e;F&Q@h2@pKZ
zzVTHud+bBl!{>IUnm0(+rVIw$#}p_EU}-&1Q6hJ6e*O?X@-kHAXt~X+&Qd>8eI<pN
m0cjhg0cpKx4am8gNc9}?uv5LZrd7uYHNGTlsrY|F3I9Jyhr$d1

diff --git a/js/src/jsapi-tests/binast/parser/tester/exception-011-n.js b/js/src/jsapi-tests/binast/parser/tester/exception-011-n.js
deleted file mode 100644
index 17f19723db73..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/exception-011-n.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-var SECTION = "exception-011";
-var VERSION = "ECMA_2";
-startTest();
-var TITLE   = "Don't Crash throwing undefined";
-
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-print("Undefined throw test.");
-
-DESCRIPTION = "throw undefined";
-EXPECTED = "error";
-
-new TestCase( SECTION,  "throw undefined",  "error", eval("throw (void 0)") );
-
-test();
-
-print("FAILED!: Should have exited with uncaught exception.");
-
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/exec-002.binjs b/js/src/jsapi-tests/binast/parser/tester/exec-002.binjs
deleted file mode 100644
index bb8d1ab9678f78bbefa6ea0bc9ce0e749117b10a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23367
zcmeHP&5zqe6gS_cd?OA$K!p|#$yVJhg$fC!5$*0GEh<ZCRuxjWt;Y6j*3=s(wo^G$
z_!~f6DnM|8D+m4;F1^B~5)%Ic@7d#cY)`!7k3^fqd)O$k{buI9-}}8c&ok3<hkcW_
zTSt`W?VGmMwaKyaw4x}grH_>ByL+E^KIv#ypDL|Q|DKj<IBxsTuNCDS+|}YAzfEj|
zs3zT}nn`Tp8dlF2rAOZ#<$=-D<Fft+IZvG=%d&k@hOQVr!<`7=o8Q%G&ovGWYWw1P
z<T&cI<Jv~A+kOF>>FjLn?|!-0+GM}AHklA!R>!~phT&41n7+7&#2lvNy$14b(e94d
z-=rSZE?&BHIW0Gozv*kP#hQHv9(_pc^zD2%3TpH*$eyD{Z|~gdRHf19q3b(aUtGI?
zDirzO{1o{dG_}9Ge`6;b5t6`s2c!kS-00huYq_I7-9U&o0{Au4t(1T%;NPZ>1ODD|
ziA#^c4}JX6$?rmk-6EzLJ?cN9!A~@DGu{^@-1|iswc`@o-KUP5F+zdENBt->1SC#2
z1Y&oGs0c?mbcw;d3bL;0dSJyZ;!r0&BA-$I0at$(ZjNzr@K{J-*snfufz5i#p-H+?
zrx+Wd<{D(Ij|bzX7q!E#B9|D^uOU)+>qz1f30T$0wl^4M%i9Cx*@hMl0DBN)VE7Jy
zXFe6O_chxlqsXEG7EK?Q(a3$>{Rl!(IWgTyjs>6F=9E=JEjYaGv_e?K2n8p<E*Ffy
z1$~x<G5QR^xIxE*X0zdqM;y;FEW;h(k?e~QJ(A`>1A+j`x?T~M&y~gUMG+534hFG&
zl1oa8LM#s|(Qvhr1cZ}xs31X`xZ861*Le{<a)t>^Qpg4Mf*#qIc@kWx#;sn$CWxw1
zivI;MkB>TuC=qlbn5KkQjNfjWVMGz#o5aI%0pL*u0Ki!bSyyLg{<FUMi4MjmghcI#
z%_);3yk3@9Z$g)lii+e2zP<>juW%ems4X@1e76Y5!`wsHb%Cwo6e5GU(s}7#3Ctl@
z1*2Fg#J#l$h(mJlyc1>+b%^V>rKiHbR$z9lKzRrHfzBn2RVO*GKpRBWypOJo9LKr*
z;gu=^U1`$!3VMa)Q6$hId*X1?16e8F`K<x~Vo~|dJ%GnuogUu7&kK=Ot41QuVu|WO
zOR6Ad<d1wx*=(x=9V!Y!-*u-9Wu;*FZv`;KQeA_rHz5z79sH2lH4U<TNcTNI=a1S7
zQ|0_1Tq_I0U!Yq>%YyzK8D}rqBay78U@t_XRtnC4Eef0^ZJ#rzlP_o2xShPqPP|+~
zKbrfSnI{$C76bGEYT9aZovW%=od#gp#q$P0Tk2pWNaFHyaOp&#43;qw2nJIL31dDY
z$c|QugB##MWna(Ww5LHD8{<3o^t(;1xgJ@kYCt0bh^`S&i`tM#DBvk5V^6Oj%Tw_a
zkc1QbB9kfE&P(PHei8B{MM%m*R}fSzR>~C~S3v8N?E2t?2%uFvK~QFZ<T^;La}qmP
zx*}ir2_zLwr+x6M)g;phUV)?<yg6S3*5H+7%No3TyUL|bmDV+8$-Hj>(`fO+Mo#uc
zt`e+xD!odi=Hg(j^Rmnj=fcH2oCk%Hi79Y?yKJTIQHj(7`y`mw@pD~Co(DmYDzWr!
zvZ!pO@(N7w%FYk*&BvNQJzP70zq`%#wMeT~C&zC>W1hEmOdbq%t4D13zg7)Lmo9z$
z4qYpnFJnbLKB!2Aq6x4h!qHc(w4{}Scoo^lTp^CNLm%R&1=v5A05*~f0Gnfkl5jpn
zGePt&R-F#3Pka=TNTE?XZth(VpACB&Zqwp-Y@sCBX4QusT*uDzZD2Y3C%uH@W6(t^
zjz}l~Yi2g>!j_XXOXch<rc`XVL}^+0MhJGiQ9;ctXRolBb4*<Ah&uNPZg5EVjj=H=
z__}Fn527tC7*(=&_8IRg3U)eHx7<C9i$J6)n$>gYV2GQ2M4-K4bq&BYw+#bl!?2SO
zb_T+3K9e50ifwd{qNiDe$3Bk7(dc5sF(6X&TRU>dyn0nEv*=7<+j6<VVXrOq8>+bq
z?6`tax+9@l<_l%?B;58DjXWgH@Y7#-DqP|!(bG&%N#q8+8TW=KEW~Cv^UqwLf$1fN
zDB*T|FJ(s-s-J&0x38WDM@{945hf#_#rOiu$TsN-aaq(0Bvgn?`e7#<Zpy=bY-ud|
z7(5GDMQ@G~Pf?@efVovuF)bIw(R@Wps8u%NNoM#cF4!WPHjoId5<SeO2WAxBHj-UM
zQ*b-G!rq0SyhMp!=JfEQj#7sUfBXH^#3~Ukl3xXAxkcTf&22dbR7|KX#DXX#;tn+s
zKEj#`MeuN1RC0X}B1KKE;W-x)q_Dc=ibaFwhDm!}_ed@h%#7J`GP9&vXFs$$M6~BU
zqo~OC5>aPSL%{cSe$5?qB#9T9ijri~x<L6g=IzamDP=2BS|p)O$wFAMSW*-2X(ZeX
zlZPN$V!r*M=G&TY<&KdH`L;jIIJJtOhDz{lX6=QSRWt6SXuw`ToYJDXgwX@W&4kes
zGw!3h$Wb${9OJ(1XSl8v<n9g0VsawQ#4@xt{lLOv#46$C)t5!E<`XJodd(+H+W6=(
z50xa^z&Bn@?b(Mc&ddO^#X$*ME^e&JhnXp1hyBbWia&E0EIkR%A^O74BF~)A93m@d
z9uD3O*2GYK56%&G*w0&}53d};-@;W7{_D#>fDLeQS9rc})`Az7XH0!B%C2JympZMO
zUBgJ9I4+iZDs>_+yOu^9CoVDHk6nqS6zmFmL9&+0E@dzjyF-|sa)OhE7j|jN39sxb
e4llk4id~q3)!@)A|Nr~&DDrt|zNxkm1Nnbm8;j=v

diff --git a/js/src/jsapi-tests/binast/parser/tester/exec-002.js b/js/src/jsapi-tests/binast/parser/tester/exec-002.js
deleted file mode 100644
index 86d8ccb9a59b..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/exec-002.js
+++ /dev/null
@@ -1,188 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          RegExp/exec-002.js
- *  ECMA Section:       15.7.5.3
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Test cases provided by rogerl@netscape.com
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-var SECTION = "RegExp/exec-002";
-var VERSION = "ECMA_2";
-var TITLE   = "RegExp.prototype.exec(string)";
-
-startTest();
-
-/*
- * for each test case, verify:
- * - type of object returned
- * - length of the returned array
- * - value of lastIndex
- * - value of index
- * - value of input
- * - value of the array indices
- */
-
-AddRegExpCases(
-  /(a|d|q|)x/i,
-  "bcaDxqy",
-  3,
-  ["Dx", "D"] );
-
-AddRegExpCases(
-  /(a|(e|q))(x|y)/,
-  "bcaddxqy",
-  6,
-  ["qy","q","q","y"] );
-
-
-AddRegExpCases(
-  /a+b+d/,
-  "aabbeeaabbs",
-  0,
-  null );
-
-AddRegExpCases(
-  /a*b/,
-  "aaadaabaaa",
-  4,
-  ["aab"] );
-
-AddRegExpCases(
-  /a*b/,
-  "dddb",
-  3,
-  ["b"] );
-
-AddRegExpCases(
-  /a*b/,
-  "xxx",
-  0,
-  null );
-
-AddRegExpCases(
-  /x\d\dy/,
-  "abcx45ysss235",
-  3,
-  ["x45y"] );
-
-AddRegExpCases(
-  /[^abc]def[abc]+/,
-  "abxdefbb",
-  2,
-  ["xdefbb"] );
-
-AddRegExpCases(
-  /(a*)baa/,
-  "ccdaaabaxaabaa",
-  9,
-  ["aabaa", "aa"] );
-
-AddRegExpCases(
-  /(a*)baa/,
-  "aabaa",
-  0,
-  ["aabaa", "aa"] );
-
-AddRegExpCases(
-  /q(a|b)*q/,
-  "xxqababqyy",
-  2,
-  ["qababq", "b"] );
-
-AddRegExpCases(
-  /(a(.|[^d])c)*/,
-  "adcaxc",
-  0,
-  ["adcaxc", "axc", "x"] );
-
-AddRegExpCases(
-  /(a*)b\1/,
-  "abaaaxaabaayy",
-  0,
-  ["aba", "a"] );
-
-AddRegExpCases(
-  /(a*)b\1/,
-  "abaaaxaabaayy",
-  0,
-  ["aba", "a"] );
-
-AddRegExpCases(
-  /(a*)b\1/,
-  "cccdaaabaxaabaayy",
-  6,
-  ["aba", "a"] );
-
-AddRegExpCases(
-  /(a*)b\1/,
-  "cccdaaabqxaabaayy",
-  7,
-  ["b", ""] );
-
-AddRegExpCases(
-  /"(.|[^"\\\\])*"/,
-        'xx\"makudonarudo\"yy',
-        2,
-        ["\"makudonarudo\"", "o"] );
-
-    AddRegExpCases(
-        /"(.|[^"\\\\])*"/,
-	      "xx\"ma\"yy",
-	      2,
-	      ["\"ma\"", "a"] );
-
-	   test();
-
-	   function AddRegExpCases(
-	     regexp, pattern, index, matches_array ) {
-
-// prevent a runtime error
-
-	     if ( regexp.exec(pattern) == null || matches_array == null ) {
-	       AddTestCase(
-		 regexp + ".exec(" + pattern +")",
-		 matches_array,
-		 regexp.exec(pattern) );
-
-	       return;
-	     }
-	     AddTestCase(
-	       regexp + ".exec(" + pattern +").length",
-	       matches_array.length,
-	       regexp.exec(pattern).length );
-
-	     AddTestCase(
-	       regexp + ".exec(" + pattern +").index",
-	       index,
-	       regexp.exec(pattern).index );
-
-	     AddTestCase(
-	       regexp + ".exec(" + pattern +").input",
-	       pattern,
-	       regexp.exec(pattern).input );
-
-	     AddTestCase(
-	       regexp + ".exec(" + pattern +").toString()",
-	       matches_array.toString(),
-	       regexp.exec(pattern).toString() );
-/*
-  var limit = matches_array.length > regexp.exec(pattern).length
-  ? matches_array.length
-  : regexp.exec(pattern).length;
-
-  for ( var matches = 0; matches < limit; matches++ ) {
-  AddTestCase(
-  regexp + ".exec(" + pattern +")[" + matches +"]",
-  matches_array[matches],
-  regexp.exec(pattern)[matches] );
-  }
-*/
-	   }
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-001.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-001.binjs
deleted file mode 100644
index bbc38b49e83cc5ec1f2c0641e99f6be1bf4db9a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6002
zcmdT|O>fgM7|!^H1LA^^5Qk_I(h!3(;52nbTUWGBrA%uzjnm{MUTc;nmE*3P_$T}`
zuH4}_@Y-==w@y>H>js>*#`a@B@5l4Lc9{+O0j`w082Obw8g(e@IX4`~Igb1bXRF@a
zZLPPwsE?g;Nz5q+BxaTGj~(X$%qr{44-h5jIKbQ33lK$&M4^E4)$iCjC80lx^%HQG
zreQ@?KoQ>|Az>MSzJ1-tAtNUQQvnyEo;q~QC<!~2yRc2GR&CcmH_IjYtz42II#x@}
zZxDtl3IyC43I+z=L%_r5eTw54$i8~>X3d06;Y-4BWx4B3Sb2u1IbA=+oCf^?*w<*#
zgW7&;Q3kyYN8fF&9lbXVbNzPweSLQ1yxaA5qh|8f1Hv*ap8;Am3Vp&;5CtxzFQj8c
z-4*wPyY9X)H@SpyYgzoa7-F~wNhqRE<wb6`R#6bBrDBB#pRmd?ow!AA-v`n$LzJ~~
z%nBGvSRGxR<1!SuYDx--b_U!KaV~WWGLHajNI`yfK$kIXM~$dsa!RBaQr*b*EfOMn
zp?Eo5Z_+Su0(`<8N;+L7q*9hR&`Y(EZlo)Kv@pb?6`K=u6~Qd-bE3lHbOmXfAt$n*
z{mj|u-<SD2U^OUmgCHld^cb<!Cl2=!kpTOXJ#l^I@)w-ONT6|_ET;e98imh2+~>k<
za-YMLPXMtQxf!TCM6t`dG#cjMXF)i7E7GPHN*hIg7)0Kw(?y{lK*N<bhdP5TK4WZA
zVN-bsUN9V?G)zJ9NjNJzxtoubmqlvxExtRngQow4S--)s!NM{zUc*}G3f)g%jt(~W
z-3^z~0fw5rTsz#`Ut3;H{&~9$MO=J(w`?9lCQjyS=@R*Q#6enj&rh6m`#UJ!CKP+D
z1{_n{E@fSEimL-v5%ap$01aX+3QZrn|K8*qguc{5WQDg)o;u3Rp;m%=$YWyU{xWB%
zZ9?<k33<6!0JGHF4aH68WMP>rkmWrT$Az*ikEowi(Vi(q|DN4ukl`^M;jviIrfx@i
z4DbMpj=w@GIep5TFLsgU(@5M|c-kTdEKu&jfmoDikqWvrqo@8&s)p`){e1wiGj`)p
zlh!EJX<(K-8(_Z)7kAY-i%p*bHlLf`p2y9RoNRp8^tZnIoUz)(L$y*U$D%rY?h}4v
zsiGL0J`uzYL9BSunKfvvd*>@??f(x*%d)%*#`mIL4?&-mKK8gIbdl?6x9m8*{<@|g
z^$@h&lzVRlIypSd!OIJ63jvrSe0ivrr{x)0@UAcie_q@sRU;kFf_71zoX{@mJE+W`
zslLrtIxJ{#4PaJ}8&jG+UYHW;hHK8K>=yKZ$;<C^@U(dOjSHSs<yg-3SdQeYo(5?=
mD$2155iCdZ9IY*c3>|+SlB1?+<v@PPl!H@VX@qzio%0{16_^?T

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-001.js b/js/src/jsapi-tests/binast/parser/tester/expression-001.js
deleted file mode 100644
index 90b44839ffc6..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-001.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-001.js
-   Corresponds to:     ecma/Expressions/11.12-2-n.js
-   ECMA Section:       11.12
-   Description:
-
-   The grammar for a ConditionalExpression in ECMAScript is a little bit
-   different from that in C and Java, which each allow the second
-   subexpression to be an Expression but restrict the third expression to
-   be a ConditionalExpression.  The motivation for this difference in
-   ECMAScript is to allow an assignment expression to be governed by either
-   arm of a conditional and to eliminate the confusing and fairly useless
-   case of a comma expression as the center expression.
-
-   Author:             christine@netscape.com
-   Date:               09 september 1998
-*/
-var SECTION = "expression-001";
-var VERSION = "JS1_4";
-var TITLE   = "Conditional operator ( ? : )"
-  startTest();
-writeHeaderToLog( SECTION + " " + TITLE );
-
-// the following expression should be an error in JS.
-
-var result = "Failed"
-  var exception = "No exception was thrown";
-
-try {
-  eval("var MY_VAR = true ? \"EXPR1\", \"EXPR2\" : \"EXPR3\"");
-} catch ( e ) {
-  result = "Passed";
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "comma expression in a conditional statement "+
-  "(threw "+ exception +")",
-  "Passed",
-  result );
-
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-002.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-002.binjs
deleted file mode 100644
index a4cf82517a8870c0e15aefd19ea5d46a4e8b34bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11122
zcmeHN-EQMV6!!9uxB$To;>ve`R?r3Q)hZjQ&32(xl~zqy2?+^Jok`+d$BxF6roBTv
z#y$tnz&jvr5fX2~IpeW?;+eSPBsE>MH%*iAd~?p3@BGXecjRIo@os0z*{FLal8In5
z?+wrME|Sr;cW~4{9y}TZ$((zgJ@rf{3RBtr^K;Mp5T5GL>Cc!5*+s;k@E~G>$uNl(
z)TsQPdN0Cww2JjN;M}_jD-jAR9C=|J$^w8ce>CE;496iC3NB`|Qs`8QFrIYZg=GeZ
zz2VVmzq6-*>+ER|iZxKrpM;VN7Ad$(7A*|Cj{%Qg%>_?WP&WPQ!GmwVex91p`4W4|
zcpbg+n=t#53G;C($%aP#1F%~(>a)Z1!LE$@Hi&*a_~z$_reWH*<6rIB5%nG(4NneD
zy(u9YP!s%l&V{`8_k#c^nuy&}^RQt4Kr+c^;C_m8rAJu(w8x^ToT}V9fS)+`n3yaO
zCAH3T@b8bngi8Tl`#pp+E{4fTGBK^GobV-hhv6UxVa&ue5e{7xZO9}9poov9C&J0J
zj6d3w5$Jxo5Z$g@fOIg#t^*w^=$8r>eyBC23Oh(w!}J0<i<HGz%R=QgZ9_lQOw%vV
za1FJ29}rT>gdFlzuD4OH3Ps;AxPJgbqujOGcQ+aHJy_=K{PgVbeE6fO8`Y)Hm*tKq
z@wPK7l4M^9c5N=3o3i+9Ev^0rLbYUhTxM?SzG8BSmLd%DG6g0SfwM4;etv_>quk9#
z{<ROa&?Lq%UIKUx;^^a2XR511Sa}EZKRq~x`mTh??LeVcnTo~kuJVua7M*lW85B!@
zg?)VsH;PK+nA0)REaDL#hcO?S_!RMnx<m#A>o~kB(rrN+oy}0Z%OosUxVIu~-<@?-
zqTTE0KndhspIM51?GHIUs-INw4TE%x6*v+f&LE4(l76Trj$43mPgxk*I93>{wUGM{
zNYhftMgQVg0iWa1wcfuRP5B8R_7lGV_2pC~OAB`Uc5RuT{A$jF-SP8`rRk3OITY7r
zqEju9C<$J8Qx=aR=qcE$!vlPxGO4z2@(bV^WG?e$355@V$#iGIy7+&aXkFq>Z}p^y
zI@Q#KPZC-&;07cY&w(@ETxV3P6*imYkUCte2?r=FWmW&kj48R_(=hFTi03<ncsgE>
znPVHDS?s1u(ncRZ7nZJ0rE_{r2Gd@|7AaTt-5h#;v-N#LI@Li#<p8E`6s58E-G_1j
zd9_l`{BOO_!N|z*b%D8V>t8vWHOTC31TBZHap1oL3LZ#gk`*haGgY_P_`aJ!L4ymb
zm3=?qGP@|?qdv6i%buTF^fP!4pUr#aRdZyL83OC@K%>NlT)o{xBDRWpEam2&D8+t)
zKxG^f9k$!K?RN`Z$yWo?v2K3|)ccN0DA&2K@~oeXeHQy!MdB}~NtzFYsb8GQeRDr4
z6&)AHUHk$L3Vdn7%PCKB9hh-L0JNbxN{gQPrKz_K(Lv6-jMPwNgj!dnt~vhG6*i0;
z&C-X1MKBJ?#+~J-i#WhjEWL|GB)C9Tby~W!Ld~J)wFey8B%I+6W*%qqi*A*J6>CcH
zhDaz>s;-B(77C%_#q5Gx?tnEzsc?<!-QOXS7<S)~*SB=q-0b)^oQ7$s2UyWOu~5S~
z@S~1uTZFQ8?9CzbPbzJx*j;D`+@%d#=XN$LR^l)o`*iPN>sw~zN|qeW2%yThK0Kg`
zSGuhZB&-QiYZ8`C^Vj^bz4}udYxO?S?Yd?Dz$J<`?7!yEq`T6dxhwI<spCcow57jm
zsNBJA<p6m(4+4%;&yF6&>*n0B97fX&3NFW1Px0B$JvNsMVLjQugvp<xxLGvsTJHJv
zh;ezRe@9oY`VSeZUIFVN`<o1O(73qOgVs|uS#VIP2K5jsR(YRGkDw@K2S5+vYR2ny
zdTh-pPLHBpc;%Xf3{@*lGE^;7^bqDS@(Kc(P(4@aA(SsQUxgtPvwzFHsfWx%jvlZ#
nu=JoMU+NL7x9YJQUJ}bXOX}|<P)GHP^~@WHH>mKyp0oc2;s+si

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-002.js b/js/src/jsapi-tests/binast/parser/tester/expression-002.js
deleted file mode 100644
index 0110f23b774d..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-002.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expressions-002.js
-   Corresponds to:     ecma/Expressions/11.2.1-3-n.js
-   ECMA Section:       11.2.1 Property Accessors
-   Description:
-
-   Try to access properties of an object whose value is undefined.
-
-   Author:             christine@netscape.com
-   Date:               09 september 1998
-*/
-var SECTION = "expressions-002.js";
-var VERSION = "JS1_4";
-var TITLE   = "Property Accessors";
-writeHeaderToLog( SECTION + " "+TITLE );
-
-startTest();
-
-// go through all Native Function objects, methods, and properties and get their typeof.
-
-var PROPERTY = new Array();
-var p = 0;
-
-// try to access properties of primitive types
-
-OBJECT = new Property(  "undefined",    void 0,   "undefined",   NaN );
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = OBJECT.value.valueOf();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-
-new TestCase(
-  SECTION,
-  "Get the value of an object whose value is undefined "+
-  "(threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-function Property( object, value, string, number ) {
-  this.object = object;
-  this.string = String(value);
-  this.number = Number(value);
-  this.valueOf = value;
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-003.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-003.binjs
deleted file mode 100644
index dc2656b14bf3bc14b01d1945d35c943063c2e4d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10356
zcmeHN&5qkP5LWu%LxH00DJNYDv<O-!XitG-AnWY5yI43u?dDo=Wv;D6mJE_!?;hL7
z==1a?dM^s}EjmL{(paQr`nOJz%X)2+ALr+r;S8m=noSelX^%M@c3y~VB-kW)CkTS8
zY<L%(ocAvJkNZ(J<w3ip=d_bps?OP$LGTI8YSZN}nTXj{!k_UdVS=eROEuK6`Ywal
zaXMVY`WtZWt-{KLhKh$loW`mIpxd7hd8*>;m<tV;vPmVhR3c7CoeyD~{%Ln`{=C<2
zncvzi146O-dj4gsxL}EfyJ5-9!ut&H`0Z41DM4BJ&BKS^efvt<(8U%lZM?SG`CV9j
z!-PGZO0uC*{{-v<8ujJrPyJmP^?eZiqW|cZ?`^{z-j07A&W@<};Cyg-YU@o2u?96E
zo~K->yYOig0Yx*hTWX$`%<n6v_yodFbFPXAXPkCfl2l7|SV!;^=K&L=8KOw%I*<7N
z6ihf55Vb!-I^$xHU1lTOnmP!7hv={Z<Rng+xFf=0h@uUdf&`TCYZZuiG_LZGiDU$N
zP;ErrwFgKKL+m=yp@LzhU>S!-Q>w6sbPY@|k@HMhesyeAxoI2vp=O4D#R<2jHXj3m
zR7|J=muk6<3RNijhAKRT<7Sj%q*MUG8dQB!NlB&g@Z1NW>+_QfI6^B3mts9WC!%3J
zv8xdO2(XI0X3L;i^Bef|J(#vooOq^9bmlA_^6NO|LmQu(>*uCi0X4yOd|PI;GNGA-
zf#Tg{akay}1z~%T21Ohd^#@EY0SapupH!mV>*zrV<Xw+B>M2v~6oS@2so=+7<RI~(
z%$p^S2&bBOx&YzMSe&>xRvPMH#o|984d%fG4%U6Ln+hD`i{D0kirqnTe0iGkb3p86
zVF?<lvB>5Q?8DpjfJHbGir-Fov^##jU{dawp967Moz=R_OtR>8FlOm6fws+c0H5HD
z+M>qR^jE;O$Xp#p6%<YalbPntx%q#4(E8+?S}~0}HB>XtGFma91G1}Ez?oobIt8Z{
zHe2O!bof>i9#B|P>K5J3DMj4VH0^<ig@(%VB(xl~0JlE#<W2Xamnnc<n!3J}uIVxr
zjk^h(Nv;dLDcq|}mfy|Lr5-Bk2(WddC~Jq`1E>d(SPN&#|2F(QjNFu&n_U0K*=&uY
z{SaBp!!;iK_dq#{L_w1as+E7g<SM_6<-;CahgSD0Iy>Emc{sPYkF1*`PhoYA7T;->
z*pRFH?Gmva?=s2l1g90_kf^LK(Zk)|S1WtC`FS%SJq!0IK)oNhf_j~Y#X%eDGd#?$
zLzaelZ4%DMndD|5mSNeQhqhxWCq1P=cYXye1D`waTwM2{$cjwpLiLmuL-cD~Zx^D6
zoJ~g)HKixivU+vNMF8Dl!vwP4IpU!PCIq$iHQw1Qjj*4k555oyo>u9CP428>^SJ$L
z0Y^5;Ye<GX;%t6VS9w^mp%`Bi35AmSS=`n_Ayhh>Tye((H^WdW+}efjACO5byKl(r
zJ@uWNHFAS-EGs?0igxQl4d=m+CaP_b%9gRWfGj?#w3TAVa4~R94q6s=E-TjZF!q1u
z7Gmp1ddQXhaI`akuH$+zL07TVtsW$7NK#7<ESKhQ`Qv)eqA}MRKT&t>nLqG2#hLcs
z@@LdpxTiUm{L>Vh4*F~v?FO+3Z&xuu-h+a4<8^gMJMyMAE4IU2nnS?@nZ;&4|GCSi
zY9^cw{v%lY1&W*J@{aYW&iszyT8|MjRDa-WhTOHN8FY5Z1hZc&>dX*2zV;4`8NuD`
zj@}I7Zq_SEW^73_W=2tUUVCmrhUx_)8LC$sWT@T<nIV)!+Aj)_h55hLL1%{SuEY$u
kub#}HBZ$n%iq~ZFdmsJxF^H^hbIr;XOzGFW>OM&S1yF)3%>V!Z

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-003.js b/js/src/jsapi-tests/binast/parser/tester/expression-003.js
deleted file mode 100644
index ba5f9c076970..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-003.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expressions-003.js
-   Corresponds to:     ecma/Expressions/11.2.1-3-n.js
-   ECMA Section:       11.2.1 Property Accessors
-   Description:
-
-   Try to access properties of an object whose value is undefined.
-
-   Author:             christine@netscape.com
-   Date:               09 september 1998
-*/
-var SECTION = "expressions-003.js";
-var VERSION = "JS1_4";
-var TITLE   = "Property Accessors";
-writeHeaderToLog( SECTION + " "+TITLE );
-
-startTest();
-
-// try to access properties of primitive types
-
-OBJECT = new Property(  "undefined",    void 0,   "undefined",   NaN );
-
-var result    = "Failed";
-var exception = "No exception thrown";
-var expect    = "Passed";
-
-try {
-  result = OBJECT.value.toString();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-
-new TestCase(
-  SECTION,
-  "Get the toString value of an object whose value is undefined "+
-  "(threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-function Property( object, value, string, number ) {
-  this.object = object;
-  this.string = String(value);
-  this.number = Number(value);
-  this.value = value;
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-004.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-004.binjs
deleted file mode 100644
index 2a5ba62ca9bb7bbb0d238ede3f9f18bfde38c89b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10202
zcmeHNORwWJ6b^4#fDo);l?4mX2z8KHpi!wbw{r*X)m3Lis@Z~X;@gHvlgf6d_b&Mx
z{GRy}Y!MrN0z1xeoY;+>)P1Tmn#Fyjwm<uv^PQK|zF5pNI_OU+Nd`|@F=1pDyd4C=
zb&=c!XBVT(=s^@0a~kw}a!x->xfs0sDhNJ?S$%W)Gs04GozX`$&IltSEpiE!=w}{0
zPxE9I>u<n$YaLd>BvhINX`YH2z})^Kp}9zJQpzM;PG<VhT(C5s3_gHuqVwVS;>oDr
zQ=j#F3dF>U<ov5tP)0Hd_kv^#3-1%aqqlQLIR|0Cy?_6E8@7V)NyYWmuJ6Fg7lhf<
z%~Nct(7yothzfmn{!6qkg}w(zzl^^7^(6H8&++t#a*r>@SLfY?@TBEufCj!ir%c?1
z591i<Suk!x??BD-n)Q(&g3iG8B<Hj@IDK?TvP>_PE*-;1lm>)N7Kp-~>pXn>QxJN|
zz+-=gP)6CfxGE;L$kGY_1n;mM<SfkzyE6`lE{ZxN0)kIQZ$!Y-$yCQ4<;e(iPj6)U
z?*Sk^6tV9hhXRILz?w9Uu<3ES4yM=0Wu&Yh9UEyg?Lt44Owq5(Zl?J>r1=OCxFAf7
zDHrWJszfo-w+!wfBxj4eO|1Q7%lARJCuf(CFKx+8Nk(+3?Xg#%{t!-31v2{#k|zJb
zly~80r4sRslejKlWSI@UA|A}BDgjtf$0wIj_q_3pvNZ16TNM@6QR=_1W37R7gi33X
zIULQjm!}O7?lDO-n%L$)z8?RD(;UgIF=o-*n9i|4w`Jc#m7fFRs0eG&P)u2|bYLG}
zuScwfkx=w@PUHRY^C{tc&-@&-JDoCRqn8!&^I%HyB!kY$l?TsoMq^QDcld`ZN9h!y
zp^)*QGSxphH-8AN)g;HtPy+-Tlx9C_hMUax$nC!Ircu+bDJmWnrXXm5;`(>sOfXjk
zyHg9>t@0GoC&zn0VPz+~WUcYq-<9e&v;d}mQIzq#9kjVg{ahwNb5HX=1F&mV*GnAd
z91;;vhZ$LLDtR}DtBqOv^@zEhhti}6*s_@@8@t~<a1SKbN=c->=QVRb4<&a+<}TB}
zayr`}wI3sDd6>q7{~jnO5h%>yf?}1=S5%bup)?u6jikQbkkRQ&n1^$#Yr&>E$`ID%
zX!UGHi7mN$*xn7h;vwPG4scSi-yl#~y_<)*y>B=UZ~^mbKzjB-KLGW9q5|r58dixm
zlsP;sZbFiWWo;5Jrv;~KAmt(U%%N>lla8JTKudlN-2z=Y@LV+aV8@yu=tA{8EqdoS
zw%jg6k8^fqB~z82P;ISo%N2pS!<MmQvlQYX2F3!h@kQF>MIK`-Yrb|uBzRXOYc;;N
zV$I_^ss|j|CZr)5N@uhAWtz%Eiyd|NhDdlQF5iUhd?<v<7qe^Xc;%%SY94Omn)f9{
z5=-w}^7=q6=XO2Zc$#u82WZjmT1>@x@S}@rJA|?}_EwP9U-PtDuv2JCPRT%RZs*cs
zBMxKh7w_q%8givfj&=l)CEN%m$O6_hs|N`?f>cYwa!LM%Kdx^%bjDg`C(~R9=Fg}l
z?7!j9WUz8Yb1Lzt%QqeL+0ok-V&&ehV!-$o5`-JCTRXEE?^?5FJB+0z6ue?x?c>Xj
zhh#1m%-P$20gLg?NY&e;TQ+^64D$mVYTm-CA$QHG2Az$tff+T5H#LL?ZhYHBjo@x}
z)2;?_H|xtjYOJN{QllszZM+&WhMI+;G1ROojG<=3qlWM#+<ql*EG+-k2~7>z-G>@*
k-!7>^hqI`WHD5?6uXg0`2XJJ0VXIcIVM^4nsyku+56!Xl!T<mO

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-004.js b/js/src/jsapi-tests/binast/parser/tester/expression-004.js
deleted file mode 100644
index 5bf19d9e5f21..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-004.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-004.js
-   Corresponds To:     11.2.1-4-n.js
-   ECMA Section:       11.2.1 Property Accessors
-   Description:
-
-   Author:             christine@netscape.com
-   Date:               09 september 1998
-*/
-var SECTION = "expression-004";
-var VERSION = "JS1_4";
-var TITLE   = "Property Accessors";
-writeHeaderToLog( SECTION + " "+TITLE );
-startTest();
-
-var OBJECT = new Property( "null", null, "null", 0 );
-
-var result    = "Failed";
-var exception = "No exception thrown";
-var expect    = "Passed";
-
-try {
-  result = OBJECT.value.toString();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "Get the toString value of an object whose value is null "+
-  "(threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-function Property( object, value, string, number ) {
-  this.object = object;
-  this.string = String(value);
-  this.number = Number(value);
-  this.value = value;
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-005.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-005.binjs
deleted file mode 100644
index 16c76c4bf70218318d8e3d56d62a1f949fb366c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6146
zcmds5%We}f6g6*95kf*@!79sE6-tp{gQk&a8bqoPDiT#<h1`sr44uqG9;a!(1c^Um
z%Z|U`+T)CGVkdRdv?^Ui6Who4aqjW812G)LtP=DX4J(H{?Q+^DcL^cKX*ec(_2xnA
zeXElW7zxU1P7p_#sBF9>WCLaec=-|K5j~FCKI_DkQxT<!f(p%dMoyz7oW}YCICn0>
zO1XlHLJ}pBC;;&G^^heZI*Axpa0%@jqcg#yq+59e+q7!ccKu5;DC_@%vIfCeEj7Op
z3C3xx;Ld0~wD6t*9y=d!mSy1V>z$o<HtYnxtO6J4UGKrlGs^Ah*oqYc`WvvXF`!4a
zudQ_j^Z}TD(0cRztsR)_kK;8GQ~KSmw;MIvZ%hbJT0WO(JyuHCs05`8rI<RHc8P%2
z3eL9#6|4`1rx<5y!C9eI8pmd-TG4^On5ir5tVcaR0Y@`IxoERY*r6*t)UX)c*l`&b
zq*7`ZDDMtsATp=x9?r<DjW|foC(vTX+i4^1+CC{2`32=|Rrp?%P(C((5vehg^plvK
z2*RUo&xog%A_=r@Ho`%=0!WWQtXrj}gC*nOB35`<x1dxD<Xq~DPY3;OzO+AtsKLQD
zj2(rAIpV2F67D07ViwNN#H~CcrQ@KBth2s29?~qk8FBmz&RIe<%kA~_Zc^*nd4~;T
zUukn_1xmgE#AaG5Kue;>(~$$aDCFf^xHcb~^F{U5aoRa0J(`3uG^&%P8e6|7XUr^G
z*o>b-2CO8QbHG5!NkB#2t~xjW0G(_%k>{8JSmq$vHJQOadFZOI-Za?=nI>JjTn}*{
z5I$4UGlm!G)*e{jISsIX_@V@OMQCT2;x$z&I=yO4hZ$259>ATcKmXo^mwJR#<=XZM
zqbyCdZRjW@ho^3RCK<PkXdXdcr0t7R|KG)I3GrR7$=^@0&`5Hn$3Nh#Bm*v6S1~S1
z2{YFtH6Hx;KzR%Xi8OC<>|&ZtvGu(kp}^uI-O9fkOymzOENsG4hq-pBO<%!0Id}5j
zFdL5CGRt5cWE|@ixjHS=>%1q)oXGoLm1fM&iE`{G>?d`7N~k>2?S1pOf{W1=Kzg?3
zk}G+qzpI`M<Y~CMRoaAh2p$mZ5My?D1oZ;#m~arIdKxZCy=B|yLiDh6k(guSJfY^@
zo%AJVV&vo(@33OYEvLL5Zpac6UN0-!DeQz>wcu{BK()R>MxV;M&GPqJyEoGV&O+5=
wjtjaTaVrOcw4O5c*c=M$Q5SL0&@2%UW@f)#=}|lMdcb`m>A?%0kes6b54IY~O#lD@

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-005.js b/js/src/jsapi-tests/binast/parser/tester/expression-005.js
deleted file mode 100644
index c1e76b7c63fa..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-005.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-005.js
-   Corresponds To:     11.2.2-10-n.js
-   ECMA Section:       11.2.2. The new operator
-   Description:
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-
-var SECTION = "expression-005";
-var VERSION = "JS1_4";
-var TITLE   = "The new operator";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var expect = "Passed";
-var exception = "No exception thrown";
-
-try {
-  result = new Math();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "result= new Math() (threw " + exception + ")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-006.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-006.binjs
deleted file mode 100644
index d19dd551a8d26becf3efb5d3867e9dc4cc9e56c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7177
zcmds6OK%e~5MJI7Aq3(C7ji6A(DG^}NGp*vK&p^dP1-ARvu?8Ob~o}mef$qj{4s>Y
z2?-?r1v8F!?Z!^xq-jKZiW2XB_RM_q&5V=hopwl<^DRpJ<#iS}8QJ$Pd!Dx)`^R3P
zTwSfbtu^8{_40G#nS2-|eEIuB&$|Op<@MLM2n)z|NLOehB#iJNjs%piz9-&Z5cwyu
zegn>>VOTK}P=W6SQNS|*efzRcBOdGolnJ<q?5jg3oCQ&H`37uLD;4YIwQ7D&{+6GU
zAUak}JYNYoWh4}E2PEtmc=rL19<>=w5-|4J{QSc6-NZyrcbF5t%gc?gz{>}OnUCuS
z8Plgf0DFo)-70O=Cgsy>aP-yMi!ZND$4uXkzozF$w7XueS4yVcIw2gHc@NQAG#Ams
z9AqzKV{BpC^d0(hdJeq>TNO4xRyRKvN*fb#>UBVT^>T4>;f)D*3Rjjg1*vhu=|0Gq
zNM5BZR=q2dFjTLKHyZF0RVt<P#z7s?VF@RU*J;8BSSVq2bajr?n1FRhnm|~ygN{h7
zraKse32?|jz&}A{qpTiR;-+bn5ae&5l!jOqf{3tVWtWF?oo133(jD%xpxIKTNUAyl
z&8m%bC!GPLgCizg^U%PYGBD%4g%u8`8=!g_a<^(`Uo9K`|5XyD1KNa6Xh|%cBaZTp
za34qzQonyBrq^x!h0_=b)Ekq@ba1Fq^r%7G*j<{okKxJ(fLM)l8EB5TSbS)~&IouB
zyEr5i)EnBE96#4dl1!MNb#|=ki<nZvxUuK8NaTmm_NOC?&Vm9y(eu*4(dG}}BJ?Ci
zo7<2TQ%VdB;96l7hMU1zQKg4kQNzQXu4xeaZtq%&lVywy$QX*G&Z=UFhX$_7smmJm
z_b`w(BWxfPz$g`bNjXs`lS4s6f4B(!nZ%(_{EaxAjE8QaKJlZUyWc^}yF)$ot1wop
zrc6lTV|Y%mT(&?~Dh@B=MZz1cVn{j(6`^Xw9m0P9dkFp14sj8rQBh4@qN9u~6|>M2
z8d9MMcflCz;AD(EWTulC=$=1!J{zG88Es5kiFL(7a>YViy*9()gCASv&LK1o{C7aP
z2?yeFw@EdVDNU-rpIs5qBd_ZXU}x6#LiBq_X;g*s0UGrPuyu{<b%$M^(o^WWkIB`O
zdXIsf)TE0s!HK;{5^Bao7*+$Jx{BV_4RHv!^XzyAqwV>Cbez|og7drGS#C+($*qa3
zewXXE3h9rce$PBHqo~KtaZ98{ZU%-KxB)Z)ZOnEc#1P%Hp*kKH6VhV14bkD8g9?%E
zOGl`F4V`Rg(?h18`VM2t#b{N-!3<1)?sTswjna+KRaz<T;I8m1Ja`v2P5<sd>R7I0
zlkPt=ww_U6>X|U)l2xDNn&oCmuGj@rgEaomkZXO|FIR1x)0TQUq+urJrK?;uqb3*Z
Ng;*{Qx%;%%x_?Y`5W@ff

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-006.js b/js/src/jsapi-tests/binast/parser/tester/expression-006.js
deleted file mode 100644
index 2ab13479a1f0..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-006.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-006.js
-   Corresponds to:     11.2.2-1-n.js
-   ECMA Section:       11.2.2. The new operator
-   Description:
-
-   http://scopus/bugsplat/show_bug.cgi?id=327765
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-006.js";
-var VERSION = "JS1_4";
-var TITLE   = "The new operator";
-var BUGNUMBER="327765";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var OBJECT = new Object();
-  result = new OBJECT();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "OBJECT = new Object; result = new OBJECT()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-007.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-007.binjs
deleted file mode 100644
index 39c1bbdedc646eceaf3a19d9e7b7ec56770932c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6728
zcmds6O>fgM7|!@cAcVvPamsOMpbiNM39?G8?L?<4Otjk(<RxBfmL`?suIpdnpK;~J
zh2OyI)QR2NP2H}WD5oj4{rLTO-Y?H%!$E|rUJs+NdPI{hMSbU%<2a{DICl1%{$cxl
zJ4goD@haIKFCr<cww^oABiQAs$4?L?=rqE097KpBMv^##3gvg|oRc`5#`*;~TZ^y~
znn97!Au(YEfO>s1#4#gh1k(&IMtv!C$|#Au)%$QwyHV>jKl@%q{N_~zh>F$D_O}Sb
z6h#@_1&W3m-V?yXmjjB^6qJ3vyZcUu&EYGV;XHBcZ8&*>sJ>m5Vnu`g1ne6$=t<*C
zdtC;-3!)#k-+X(k8|LQic!R{`dUu+gRzufYC4?m{pK`Pwc4ItpA#@=W69dz(V9-Xv
z`8Gog_aX2y#>rSPMraL1kvy862;e6y<4RT5BAy?DqA5d^b#Tgb(-j&DSQTB$aTOJK
zrW7h5+8uI3q(;>(l;K_*QAjzTAQxlWNm@x)*D1>)KOnrd2;V0$qGPF-!*fjTeka0b
z%%P;)lgU%0A`Y}8FH((k4UiUwSa+7@3c6CkGFDhfR}!iP@+8$4p9cE<`>FjNSPcr>
zFfs&|$`Q+)#NiGQiEudI6E{~Pe}gny0L}VjJv|4{QTQ^z1Ktnmy02i$XMpG@ZUO4D
z9!*9D?1F&*W9z{Q1@#68>*MDUO4Bv-vqQ(SzGQuMlmzEa55-{wjcVRht1Q^(J7x}*
zHsgN)mqSlA<FXD&D9(5=nP^vymw$v#wj1+0CIOZyBzuzKs!kSpmB-1kUvC^V{YG7)
z<Q!Jfj>`%isCPy#oxB_uT8e6S2d=qDh|EG;Q)cs_hEo#coj+_Y0CGv@{Z%ED#@i6<
z+h%(okECvE>flPeKF`*oQm7_ZXVo&dsb^}41-)8?hAGZSK7g^cKY#R9k6JJ~3%7D6
zFCFVU(9~^ytlP59!pLQ1V3s|q|0IhyBtn<yBbJ-9>WP}`Ik}S4?@(5q0p-&J8y6W+
zwV#D+EckDM@&E*4$)wBFgK5^q+V`aOQ6*m`QK)CQT9fY<W|Oxr9QyFuBqzV@(igCg
z@6DflX3b$95^@DpiC5(6bgt%(UDv3}eZoiX8cMP5lT5K=NL0MmPE}V6cUupC*D#xI
z2BhV{^$Lt%R91J-<xP*f`@x;ebnpXz9V#|#ztsJxQqb~JP7HS&<`KZw0ZrVtpu~dA
zXF|0UmxrW5aTB72oMoj*wWTH0yy08)KDm(jU-gC+6UK6N!$J+70GQR&+=7Nq=3E%k
zOLFd4*!UPO&2z3Xo1~L}1{fZ4#ELn+iN!f{idf|rY7gSd$zo`i(IHk%>`|6x*`Q#i
W`U|L7)$K19%tci!E_jGE)~&ze)rS87

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-007.js b/js/src/jsapi-tests/binast/parser/tester/expression-007.js
deleted file mode 100644
index 3e01e0d8c90a..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-007.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-007.js
-   Corresponds To:     11.2.2-2-n.js
-   ECMA Section:       11.2.2. The new operator
-   Description:
-
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-007";
-var VERSION = "JS1_4";
-var TITLE   = "The new operator";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  UNDEFINED = void 0;
-  result = new UNDEFINED();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "UNDEFINED = void 0; result = new UNDEFINED()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-008.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-008.binjs
deleted file mode 100644
index f09c68a792ac9181f4be0977fd7a753f1c417fe0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6615
zcmds6&2AGh5H|lHA%w&MiPIj7DwHB|K(LKO(;!ksp(3FYC*)?`WT~?od7Y+t6`q5a
z;fA>J7L2{#wG%t3lctf{Q?#}HdFJ!XHy$_Sqah{LuupJQJ!EN*;Q_jh5IRny3EFG4
z4%+Y9-E>G$Sdnu=8fU!v=Q%=;VOD4^Kf)}=$CT`oF2xM<I87u}q`xzC8Yj^-)?dK6
zbrDv|Bvc%sIEi@)U~b=tNW$Zjm@o;K;DI(e<19{k)d#RmyI$)wKDWY(`de60ASPB@
z&Tqz?Fia)f8Kxr(?+M_M^C2Ty2F||P*?DWj7Vs5GT&Q-v11rxkv!|O@tVrl@z}_IC
zNA)l5brE_GOh0J9{{F@$X7fC5FffJRokpiwxBWH)!ZR$N3bZ~65;6`Tbs-f~N2FbX
z(0Up3ZH_q^K;p@W)4AZx&>E&xFO@60@F$}4%5>HvpC5sv8OMxwNXBjIN)HvRiLULq
zj0-|3l?#~lMuLdU>AHtA;?%|rB<B-oF=3swnf7d-q>B86^tLj5FHSI<XupuqnBw>m
zB_|xQxYyU>sia5%ZR?FplCA*KgNSvjv~V!c4larc59=1BYKfdnefjAKzZIqZ7r0^_
z{4CabYUN$ns`a(mw23n#q&1?nD3h?DjQv^PZ)Ekm4-P}^A5n+)m?U}1wt)MHV@e{M
z^ODbv-6H;hH5&>wA>-t{ONQdgX#2hbmCpdNl?Ekf!22v6JFqv;>jrOUBA}oolkWQB
z^AKm*n&Y#>Cb|U6)`O<qQ`E;vMBy%9^c`jt?1>pOix&1Prx3|jFzZsOp~NJhOx@_6
zn}2}IelHQFUIQ#sYj<^on?8Az9$&p_k+ET#aOrZ_tofy&OdsV*`JKy@>7Ut4f<+~@
z<q|d7TvNlm+pkeP%7|om2yNwHerswj^`KLpwLXl(5EEtTK--2(mx$r1##kT54GT06
zk{4-E!Fcg&GJowjTcU_9*9YyVrqGDsN{@elrlTPfw|hP*Q_1Ad<7hnM-vi|#7{t^3
zieo2JakO)P*CQ0BxCpoM?<V2-TNH^}@EW8$Gr8#tm?!2IPcpM~<d)4d+~j)2Se=&X
zb+(e?Ohiju!x^#9L^{?0p%S`2B~%{A?cJPRLGO4yAU$vU0gx~Ht6(=spow}P<eh~0
zgl8Kuvh~tFJ2UJ&Hxj`RY{3N>U~Rx6zD;0{Ft|YNT&SMriZpaM?n3mib5Z$O(&a_B
zFV)@_Mi#&34l9bpa<#&P5s~!V>$yxhWjf*3S$Ke0ptIlLMCJbqviuR=zD=qDr?jXs
x$E%APaci9cX}wRYu{j~EMqPnp49&Lv24-eINUBkrdNts#p=$7gcR^>F`VYHpU&;Ug

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-008.js b/js/src/jsapi-tests/binast/parser/tester/expression-008.js
deleted file mode 100644
index caf310195bc1..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-008.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-008
-   Corresponds To:     11.2.2-3-n.js
-   ECMA Section:       11.2.2. The new operator
-   Description:
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-008";
-var VERSION = "JS1_4";
-var TITLE   = "The new operator";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var NULL = null;
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = new NULL();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "NULL = null; result = new NULL()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-009.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-009.binjs
deleted file mode 100644
index 392209cb016b9160ae3878ab88d350a07f9f1307..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6652
zcmds6&u`N(6b_7^5<*B^5T}UCh9=Y@aRIVQtSit_m1&7~;efoxYs1o{a@=+OSNOL$
zaplH;!L#GUUhQUX*Hvt%Dzp9hz0co!&(HJdXc*(V*T*QV?~}Ag(7?IvIL=WTPMn=q
zXU~7<chezuyc(b5#ZgA<YtJ0#5zO+`<%ftw=qSd!xEmvaXp|-#DwN-ua}p)td8|Kx
zbL%3klyImhbfP4pC4jnpE5r$njw4JsT!IGD=!}vm>DBMUHh!}aw7zz{n)sVn6Cf&<
z&*!%ziV2E2+$oAj8s1~T!)HT+vkaVlwYBwDhb`c1oH$SHx&|vx5z(isRxC*9Z@^w5
zp@+=_e_4dy1=IKZ*Wcgh#H^mj6$+F29khaWQ}<gHgrzK>Ftk2)6FhbybRiT|gVHWR
zXtUJ3PZ7lf2t2Mh84Jb;ZJ;=oOZkc}{0YmrQk}Jk=ZD~EMiHR_&ZtgZ>7jsC(WM=i
zae-w@;Q}JP5hEfqx^CeNJGC)^l=B&KF(yIUPJ6mfJd6B<@YW)HCrS{RNWUDGV~XQ<
zVth;;67~8rd5ToTfHvhuDoIxWX+gxYvov$il@3;^!os?WP%V-3R9}7?<hNjI{{^mS
z2S1IqoLYGgw(^66R_BvWovIPboCIhP7(#Mo%`GXqiN%pI2v>tqY)DNDFv#FOqA14U
z|G?v4ux3R{WLX}cb@7nhD0SZ#pz<joc2c(lb!nfZV*~b$*C$kL++ChN_feKDS)T!!
z$O_FnlQ`|3IDM3aF<kYFwnSCI4x2HxsIr|IfRZ&a%StMt*d(A#T=<Qfe}G<~m#~|F
z1em83Z%c)%K3P;I+kDf(W5qP)(&cVpRh6O)AmK~-ohN+NL$%oin@V!aC1SF=rh#a;
z--yvD!<^$G^qqs*y{o#^f>3_i@;C}ZRFt`;wh6Z~rs8v*vpkL)CN&F^nR+0kj9I8)
zy!cg_zjmC>QO4$Lly*}!)i80TM?Zj1XGqxfpH9k9Qu(tu8VmhfpgaJBXqsOW^<XNF
zcINML5`~&vm|OXG8`J!;3WptdE|RSq-}E`mV{?l)n`t_7%Vrs_a=oBd&nN0-_L}TW
zSkK%*8P?B)JN5+<)g9)&>WIa0TX%0)&|F>*NXw4t1(2UNVD7fNzW(0LdkOep?>hO&
z#!LP5)bq03ipjy<fJ-m{>wtyARbUGtT#)ZfsFvokKr}dRLbR~6ssPRDa@7q?y#E$P
z7QgBa3#N(rs)Yq3EbOV(i<)psb;6u!;f<mq(|&^!<^N8|D&FbEnCZ4Dh73<LV#J*9
ql-;yPY%w-N#A4JW9c5^``ByMA{nb*8>g0<7a~&0f7d##sOVvLZV`>Hf

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-009.js b/js/src/jsapi-tests/binast/parser/tester/expression-009.js
deleted file mode 100644
index 9a997d7fbb25..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-009.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-009
-   Corresponds to:     ecma/Expressions/11.2.2-4-n.js
-   ECMA Section:       11.2.2. The new operator
-   Description:
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-009";
-var VERSION = "JS1_4";
-var TITLE   = "The new operator";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var STRING = "";
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = new STRING();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "STRING = ''; result = new STRING()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-010.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-010.binjs
deleted file mode 100644
index 988918403d223d43870d24304b8f5479ef43e1c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6623
zcmds6%We}f6g6*<5JF;s#D-ZG6_i$Dg{F~68q`!FR88oH1#)NHWawlj@;FWNEBpzc
z!j=URf5ElKGj?Mqb<#9ayNVLq$G*qsz8s&8hB2x7eS*X40Zn@p571qN&~X}0P_5bC
z?|kS4>5w45BIfvUl(FjHmk2$DS-!sf2-653$7GiTF{YSBX(FIP^*uwUQ4(In`U5z3
zF2hQxfQmvCB@rtD^zEA=Nmz6e5h~ykJWz+u7>$x%^$~2-Y1F&TFKxdffAcF6M91og
z`K^c%iemwHhU1Ze_YCmJ`H+$<17qK9ZEu;d1$;#i=gVF1!OAmC&FT6nmL&8yV6TzT
zqsC!pRfIl(qwjaNzrQz$SwD|!6ehR3+w8U)rro+A9A){OqxFfGkg*4@3$B=2ly(I|
z8>Qwu3^OtS#}kTEzF_sxI*wztRICW#C!+jHH`c+QpMaqm!<2PN#!Tu;3ni?MuFi24
z6L_SQCSckdaUwFS=?=#5TN_gdIeQR`3GJq>v}f8RqR3BhZ^OfDQG)42*@bwFDXt&I
z<b)v__4+D!%233CHq}NtN!I}BK*Xw}G&j&w2F_E3!|CR@YKfeO`tqwqeoKb-Uto%H
z@zYqV$(0XbtM=E=wZ@@Iovx8KsGdeakt<<U=>XFN+{zTld4d996k7t2&XZ&8=5U{I
z6qC@Tz2tLkrNlot&6@PaV>vkw$dK2KrtM2m`2rBzsaJw}tWVRi1$+IxuCYYpf`YtE
zg4OBs0B6~X_1UEpm4`+D5vRc^>f<Dgp`b6C4_yT{K4WUp+@@s!N;br-@}+{}lYlZ=
z)>}9K2o--X;rU(xERt|{l)`nJ9P*EAylIoMb~J9%)oLxi@2q@KI*_!b{GJCY-9o*k
z1jLfua*3R*uc>1e^y@JmWkhg1gzj=MyF=BNIuI&uTU|$S5FKS<sck~-#Z`QvKUUXq
z%cSN&^1LWiFkXD>%-=Z97D!`@wL`n99%{I_(&HZx)zOghBA-o4SJL@&xEcrjJD@y<
z1F<wOa!h9`u6E|<Y668GT)0{J_ZDIKlN1Tt@F=7jG_mO`n8)W9FEi70<R_bTaGmQV
zwR$m7ud<`$cfvd4I?jlBC&I8j2vqmE^|~Pr*X`V+T|*0bGaw!7{ntQ#o>q6Z-g<c>
z;q8d0oBZdEH|Evpm*uz**MheJ6)?OBnSh17bzlb-ToUYTsE)_wUT87ghUjq4dD&+{
zljoIRvcD}3S$yg{EEyvfOBD``aGz&Rk7m*+-3WV_g=dI4VfGu`sQAYq%b((H<)j?4
z#uhndd3}*1_F$($8t>F{Y=(&Cs7*TB&~)doVP@vTq#QNLmjm`BDhDrlAGGGF|NZb`
A`Tzg`

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-010.js b/js/src/jsapi-tests/binast/parser/tester/expression-010.js
deleted file mode 100644
index f8ad983cc480..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-010.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-010.js
-   Corresponds To:     11.2.2-5-n.js
-   ECMA Section:       11.2.2. The new operator
-   Description:
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-010";
-var VERSION = "JS1_4";
-var TITLE   = "The new operator";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var NUMBER = 0;
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = new NUMBER();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "NUMBER=0, result = new NUMBER()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-011.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-011.binjs
deleted file mode 100644
index b61edd52d2096810afab769b198edb0674802dc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6754
zcmds6-EPw`6wdfZ{0NB~#0|MZLlYX4xPq+G+7;2Mv=gm%i@e5b!_v5N+;zR-L3kS;
zgIn%+3yxhUb`z&{yQ~tsno`@J&+m86@jNyjg}CAkF!C$Ml=LYYI=39hIVJwosWw_i
zoe!NJ8DYoU6??oeh*{;!3&(j3yFC5)38Dcy4e=rFg@_^+kVruJ>N|GMgUFx9`U5yy
z%diL)P=W6RQNU6F{rZNFBNm(mm<qTE4VBO_qe0ZK+=pvA^;);lZh5=%H*Z&h=vW=G
zzZo!0Q7GUpP&m%vJq0{`Iifg@LD{$O_V)6y3H+`woF{L+4JR)U&2QJGSks`t0egc6
zJ*j`~lx5JnAo@{f@7w#lVK#5a4F)FHyW8kC>v_HPfUpe9XB=&S-3U)yNL@%pVu-XW
z7_^?oe1{>1hmd$8;#4jeGqi@nP#qN~dhiogd8I3Bk<Sl7(U>91x;SQe)1?|pSRGx-
zaTOIfQ%V&O?T@)3Vx#I7%5bkuC{WI4;9^X>q)GaDodk>gg!Im3cr}O+ohrQ?&M}Gm
zoe-ZfhX(zDB2P(09B4;fq#NlPAT110HcN8_U8UfnsIZW3L8_+6GpbKN4dJ&Ywf_QD
za*oepl~*gP?RK+%u%uR22?;TZ3XA1dT47Uz+{99N4_pI{z&JDzk)BhQ9M0iBp&-P5
zapZ2UrTDwKxZ|9TFMD{z`^UWQYnbvmAhw8`g1T%#$;5zt<Kq+RGwziapT{VUOODSj
zovL~)=8%x|&Yb~@{16)ZWC+otpvre-4lNvBegK0mB~i=a<&h0mIfTp^p<O+K@nvyV
zwD3f00=S}AYqEGbE-VCT%1Dn`Qj**@=SFST<U-G8PpECPaT5D280b`UB}&LE*e5(G
zTN$H?mKWn1V!c5vMB^BXrfCGz>#%qN)}^*+7`T9VvCCEt;T`Dhcy`Rq-^%MM8^q;l
zw{Faz0~lWW5pP`;z$(4tzS3<)%h;Ao3nO!=B6iEhs4k^a`9HDQ3gvONaqE!i{^!9(
zPQOF7a7L655o~G<9t+o4#J>f~0}zOjS@Wa<F6-LD?->c`p4Z>D06Wz#3sH22t2M)D
zVzz*zUcx@UH+lKVn!`*_i4^+nYsTt)Jt%Wx<v!t)cMZh`f)k3hfvE0q?R7;g+-*Gr
zUc-p`e?VH!5wF4cvU<DwE~8`o(VdMc@W~&D<l^?5d{*f`v%HRngu4w5HX!E#O;K$T
z3`;oAglZ`+Pey~{CPWK47ZoAhmX=UO)1+*k5+Ren`VDJR#cCD9LJgk!%<65fq>gX`
z9(@9rCTweLUgOz+1Gu}g4Ygb{(vMs-JOIfRGaqV@xu<fuRuJHF)f86RQZ`I9%sBrx
UDp&K4kqhQJD;JkMQ5s9xKc!uSPXGV_

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-011.js b/js/src/jsapi-tests/binast/parser/tester/expression-011.js
deleted file mode 100644
index 8337b9b76b95..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-011.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-011.js
-   Corresponds To:     ecma/Expressions/11.2.2-6-n.js
-   ECMA Section:       11.2.2. The new operator
-   Description:
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-011";
-var VERSION = "JS1_4";
-var TITLE   = "The new operator";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var BOOLEAN  = true;
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var OBJECT = new BOOLEAN();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "BOOLEAN = true; result = new BOOLEAN()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-012.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-012.binjs
deleted file mode 100644
index b2a72d1f0a67f74ca7dc745720b85d5d532efbd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7215
zcmds6%We}f6dm5M03or0Rn%1xLMi1XK^lpK06`^1O<IW+ax*3wn9M{Thcy4eia$eQ
z#g30a;$Dwu?8Z*&q|-?4DoSi0`yOAP`$&b4h9Rw1`jq(9k1XynGVm^Xo_7%Y6R*~6
zy>Gv0cjF=TDrGUJ5(Wvc{=4gWH(^#qU%pRRKn_Csns!6N2oK^&K>6x>;(ZGu|0vcU
zz`1Z7R?Gxc;Cn$7@EkzjzUkA52VVlp1YAT0>d*;iLDZ{WgKgT4dZ)S5s+8q#m9hlU
zvD#w(cEBkkp@92N!jXY@3-IXSkkKRoV;^oj+B9J^__83bB6qz6E58$FPS;PdB%!|m
zdxeDVH+I`a5qbrV{=WU_^AnSp)$_PQ$3(k3&CYhiv|D!wN4LC<Xnk6W=(q$=7oK8l
z@wC+w`g?Vbc>}hp?Y(X7eW*2d3nBF?AU@uF{`}cf6Yd05HgfrBbHeEWG)z2RB`a33
ztCKKPOT~&V{6v*R>3-uNjYwF+3F94_@HrMrSRGxR<0K|v(2*t()*B%aiPdxmWAFit
z8L0O=2y2ve;_bL++9U+|Cn%*MmbD-vY@+P)P_DC=<c0JL_gK*Dt2iW89f2OGjdYSu
z0n&kpq5~cpSW*V&esA##htthby&O4>n)z4DMoUIXZoBwttYXp*l#X_1x7m7YQm6Y!
zi;gv)EAl~z6NsF~Jb_?%2aaew1IKWK2ki$Yu*`U-@9tbCLP#*Afuqo(o%$6!Qi^bI
zNDxxrLaW4E9glx)&T%?V1;Y?M?9w4t52o!)P<aOsTX87|E%82!#}@3|PtRkbjt)f+
zhqPOqe|{uMQm}t^*hHleC@TkH-2LYDN#uu6)@3EA?gcfRF|}xJ={m6KzLH%9g>nd#
z$>Pqs`75aVdJ(273Sg03VM}?qZj(dkbk&=qAq7o3S(=FZ&I)Du1Ih#{`%E8{ZlT^-
z0K}Z!X$XByo$zkI9+FW)1;<0^F$`w+DfFcdgo@i%*O47WM_Jg_9zfcNUVNlWqCDlC
zxtasX^HeBfJp0s{KXaTd5XKg(<X*?R)Sz?42VX(ey&=Q;girFPr1R%+H4gsofN~uU
z#N#x{F&|TQwKG495ei*g(5&?PHsxt!lKL%Z4XWBwY<dso;oPi0H%&)+vRMb$xn9y&
zj|w$jY*EE9-U$}<b&^o?PK05fK&URG^|~Pr*X>+ho<j9|HXt4I{S6>L4XdRs(Y8z1
zt*`ZiwfiqiX=RZOiAr+)zIm7W?Ky6Y&QV&2lo(otCSd08I<SLV9HV|VRLA4uv$Pm)
zLv%Rjyl}Lj$@B8D8FjF}!;+%0SnP0M1Vw;5H2|eix)FBWg*tJL?*4!q#eY#U-9^{2
z^lg(l|KG?lTV|>cO?5xykfjABN9?jG2T}Np|2^c`4DXktHlNdmrh5n)W@2_{<*0dU
Qa=;#r<=`<*QftKf4>7DBk^lez

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-012.js b/js/src/jsapi-tests/binast/parser/tester/expression-012.js
deleted file mode 100644
index 69e39ba47c53..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-012.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-012.js
-   Corresponds To:     ecma/Expressions/11.2.2-6-n.js
-   ECMA Section:       11.2.2. The new operator
-   Description:
-   http://scopus/bugsplat/show_bug.cgi?id=327765
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-012";
-var VERSION = "JS1_4";
-var TITLE   = "The new operator";
-var BUGNUMBER= "327765";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var STRING = new String("hi");
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = new STRING();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "STRING = new String(\"hi\"); result = new STRING()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-013.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-013.binjs
deleted file mode 100644
index 2c33b5a9c52282454cac85de0787e40eaa58d4d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7198
zcmds6%We}f6dm5M03or0RhC5vl~NuOq(Myx(5i&0NxMZ(#!ZG!W+IQ%$A7Tm&yZNL
zLt?=vaIeQRc48-W(rKi&n<}w=?0bBD?jvPB9E7w|?or}bwprX|r0-qzJg*)5Cth`<
zvDtjn?8F1=m6yewau_7M^7o<V-Gy0Yefb_?0cnTyJ?(^q5gx>mfb!Mn#5)Kge-!IC
z;9NNkD`o;J@Vy`kcn+X%zv0t}2m1kK0xlwbb?Ah%AnI0b!8Xl$t+nx`QC^ncm6s)m
zj@1<Nw*pQX2?g9C35N#WJ;0;K14fesjD7lSWz~eu;Fkq)Wx4A$Sb0d8IbA=+oP_=a
z>;)3KSKnzCMd%GU`et+G>kE^Z#q+p8$3(kZ8?CLnX}9hWj&6A$(R#EL(W4SPU3iMI
z#nTo~=&!{&<{j9oy8E%Q`?*@*DTLIUfVlen_3KwJO}H~qS<mI8$qA=@&@l0Mm8@9B
zu13O8Efp&|@D)`OrTdM8G$LUMCycjf!lzg$VRdwMj<cA6K}VWESa*m-Bv#WMjKK$R
z#6Z12L0F@#6>r5|(<ULvKR_uBv8)CWVJFHi59K<0NnS|zxyOQTPsJgr>In2iZKRWQ
z4v-E+6dmx;z>+dB_j`+1IGk>Z>gC93)XYCxHkva^?%OVY9IKeL1Es@7i5m1s^SL4)
zggC*l-=>y0AQ)bUBjV+bBy<gUg)HbyOoL!P{QY~Er%*D-8NaPdnff55koXNli(2Xr
z-!Wz*+y@eb)Svvk7RTcsIE~>B=kqu)@X+H99bmm++CB%B4*;<dmvYb&@3HvEf}Q*6
zWlYV{q3H2|c8c@QZIUDf`)7-tsH6cEuN}sn1FuISKZHUqD>`*AsN#&VMN^B_zD?<s
z&?+eOc%V#{bJoq*q0;L{n4BnpS+avQ<>9(b4#Cn@Z$^U%nsm0r5ci!Fyz&PmZOK2U
z4@$RCZzTX?PHw(LPS)4d2=DZ2AsHrAa6EvnLVt2+LSO1YsJLx)9oa#2l$l-a2_%Z>
z#Uo)<dCDboH3yQXsZhpv_FrfI!f`f37@MtjdmrmkgU%JVzk#ZI1BMj|Kgpkx&Y#28
zIQYK<%569hkJBW_d`#KZPW)etQ0U@<W~HCEC{J6F)NepDP*sy+(?>85=Vl$baXQkI
zO***F^_;#sD%3@0`*<f<#@9$f%{vi>?SW8TN9%P%9Io5Bpgf0q_hLXg=KD{9{4}hV
z)<mNYiY+M5mR26WEv02e_PuCfEj>0bQolOKUC}d2OOOvkXV3)9oLvWY@QG8T&xY!F
zTzr!j!)=HT=bRRcW;A(PGB%+I)_0gwF=h)K4ve4zaHoEsG)gzZF1k=8P7&SjaHII6
zNhZ4JI+iwVlKxy{OFi|Wv4(~mvPzU3vvi!~h+Q)^NaJS?IX1!j<*3c)w4w0^f`*xx
W%~&~V-kKb+$6`5nN>9`p?*0RB1s8Jw

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-013.js b/js/src/jsapi-tests/binast/parser/tester/expression-013.js
deleted file mode 100644
index f4986a5c02b5..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-013.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-013.js
-   Corresponds To:     ecma/Expressions/11.2.2-8-n.js
-   ECMA Section:       11.2.2. The new operator
-   Description:
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-013";
-var VERSION = "JS1_4";
-var TITLE   = "The new operator";
-var BUGNUMBER= "327765";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var NUMBER = new Number(1);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = new NUMBER();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "NUMBER = new Number(1); result = new NUMBER()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-014.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-014.binjs
deleted file mode 100644
index 80dbbd50cb112fdf4c2be739841958a57df43fc4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7117
zcmds6O>Yx15M91O0tDg&ryN^V5Xx62NFz0AfS@$3nzZ7E+^m~yyV;GrPSgAmB=~0_
zPDmX17mU5$wHrH$lWrr?Q<T_#_PiOt@k|P|-}7;?(80(p?vSueP}jNYIL<-n4xLi9
z{;Bb{(F%LmDdhQ_g6~DN`0cUd+=E#Kb@@Ib9y;*xCT{tNAnJtyhjQij$T{``_bk>Q
zz_~IFD<mAsa~&`6XbPZiUv+Uny+aQZ4i})VJaj~f7qpAFV4Fsz+^lZb3wiNdAum8w
ztOlQ7^C%|B=Wr*;?`wDu0S}+{2#z8!_UZH0SI>?j9XZ({&$%mzjjzGt6GZgs>Otn@
z^e131kkkFjZX+vBZ^F?l<*kh`t2#4_C-V2=h`a$?HLJ~9MYmgx2+PoXz|cB47vMn-
zt}k52&=6{iC-m3i2)zSamG(Z=_qIxv-AqVjvH9}F+S;4fI@~#^tfUgsporow=or7f
zQd*3HS4O@sm+}=Y_z6pyQsc%#9vNW~MT9nSL?>7%U{!Q^j`Ntn5|1zek#?UE5gARl
zFos=#0RaX72&oN|W>^c`x=mb>zk^h2YFY9EM26BXhv{{4lN=u(Qipi$j?6_u))~->
z+(;$q0w67j$U5mU19Q^AH0}*iVR5<%s+S_iX*2z5*l5l)dDrClQLOBq9;NN=T4iI(
z)1!_DO3*Q~&v&Vr`%7WyV-$>cTFULhUMN4{Sj@PIFUV}DXQ~ZPw7zf9H1&E~W>yCG
z9(g`?C-Av29{(<mN0uJ&X$$w*%U-vA4k{l3Vm-{IpgGzh;lO}>>Ejch_HZk^_}oEJ
zlyQ7E$xx<tULpEn>)7d_!1bZzO3Fhu3QBCo$fAj5Wnj`{sfH4YDF;v{3NPd48&H$A
z1NMZF0JG%qbs6ERO%^H5R&Opu>Bps*^acrI((kcSsV1sbKk%Hgn=TQP)iq^ATb;6x
z`Vr<N_n-mL9p6Myms&8&-7Wo*97IK#Io4L-J;%cMOahXja>-)Nf@Bu9aHotilrWxr
zs?7g)oXwEOW-GBaLse^7aD@j)z^BtAtZ<;i^eU<RS-8d`{w+{$!+~fRzjE};l(=^6
zXEs8iiVHI<{$9g0?iymZ4t+aW^zlufz&tiL>70$y5ua?_!Bwv3jMcMBon@8Ee8Q^j
zGK#S76K>dN5UT6UdesmMcU#we7f_b|ACQ(0{ydN`O1IoPZ>WiSYH9ghE-oyR-{b7N
zw5+>Qb)MzEEH-jW@Fa#7o(`CVy9#U(6;s5|glc(Qb}J2rn-DF|IVl^>X!4}@m}to-
zhfF@z9p==G*;0oEBTNIRRbx&Vr5a(DU1)VoklnA~(fhDzBD=hkF#5iX;(u0HSQ&b)
zV$|4!P{y?XWW<=EIV48Rx~V{Fe@Te3G4U@(O;M)|jdl?f%t-H>ic#HfV!)h_#o(0o
Ir7`9G0~Z4RqyPW_

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-014.js b/js/src/jsapi-tests/binast/parser/tester/expression-014.js
deleted file mode 100644
index ac2dadaec5cf..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-014.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-014.js
-   Corresponds To:     ecma/Expressions/11.2.2-9-n.js
-   ECMA Section:       11.2.2. The new operator
-   Description:
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-014.js";
-var VERSION = "ECMA_1";
-var TITLE   = "The new operator";
-var BUGNUMBER= "327765";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var BOOLEAN = new Boolean();
-
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = new BOOLEAN();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "BOOLEAN = new Boolean(); result = new BOOLEAN()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-015.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-015.binjs
deleted file mode 100644
index 87a6c892fbb55b76dcf2f4d93e8f614801940a1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6274
zcmds5&u`N(6wdgKkPs4r1E(A}O;9G_0$G7|oz|)9CR*)^+{SCe(xh_Sb^R;2^Ph1;
z-1skecAVIa)7I&-^5aycwm<v5_r32u+o9u;kE_lABe!}&!ahMm>xN}n-O!y{dyUpn
z`)#`yj<Dra_#DUgB3k|W)UqDHEJs~_iin50KHkSY9}z^oFyK(G{En=1FK}nEege+M
zGOUnrD9^RLz@sUEx_!gN0rk#2OgLPChVsx6C0@|4-i2-2^;)NK+;S@7Kc^x<RIE0i
z-}ERZ$mehu$RBHX4*?HfjtGt-F!uS&oi{pc0$<^dbHuJUVdVuP`gHXaD?0Q$V6V}k
zr}a<mvK)FFj(*hM`TSaU%=-QKV|{*Pc6S<`W?i>iB}4&Q9*lz?%Rsw^d_U4*ui(yl
z%J?=#6b~WoINxL@<mM+kh+N87^x!Wnvr0A9Ae--l(;|up?cj(muu#CN=<*y_F@fo%
zFaeSNm^mWKHQm6NM}RdUAUKDh#F%u#X4uzl;u`V|l3UB~Jug6HD($kE!hmjr4uf|3
z_>5Y_>kp)K3L#=Z+j1k-N!I{r;E1v{ni*(I15@7Tu)^SU3lcR&j)gw`%-QJg7xp{g
zH7ILiKPRzNju<KugF8T;kKOr^SYLts1*g#xC>xV<Iu52$__BvbOpA5fS8(NHKx~C}
z3To2<2`4$&DFOe-#)A<G>J9Fd$IlZKMJ4mIL#DF6@UGeqd*{{w1+EWmYSL1xEZAc+
zGK&_r;_rdU8kuDskWg$AxJ)#wxtnK7beZ+-7TX<~XgvowJ-aZhSz#zHPhf4VRrap^
z>ILuAkIy!@-syV@jY(5OcwYQH69?t$!wwc-g$_})?-5{K9d=1vxRG8V5?mFihG=h4
z^U*lMye5y}YBZdGy;7GN)FU2L-A)yyFr&7ibzq^Nx!kSDsE=?n>IbYdk^n_olU-?>
zYLkIyOe>fn6l6}W*d!rOe$`V-lM7|xpYvIPYL$@+#=`~O{C=p$pOGu<egS`4Bf@%A
zI!$tEhI0m?G2p)e$~`y`4P&{HgiAuY^fxZBYUI_26TnWb%R<dtBNeBKY5bmo-4?uP
z$omD~^ci5YxyiFa)*bQ5vb!eV>h3FYwS^~gC0C8IE<`LQ>|$3#5!PeE4SNkj#p+5?
z(imScuHgpsZ$KJWUiJj26kI(_D#HvhS={YSXln7q)&cXVYmneege?!%@VG4Fwn{sv
zX<KVx@}l}Trwvl0C9}Fv?J8Cl49sBpO^x1nmNap!=)|%NH@#U&UC`Ub&)pv&%KW)I
zTJVl6#&TW=#7MrPDUjMrsu-KYUNM@-8D%JYi&ros{qanU>RuNE`IS-(E_uV^nyod<
FzX4OU@EZUC

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-015.js b/js/src/jsapi-tests/binast/parser/tester/expression-015.js
deleted file mode 100644
index 4febd4c3c935..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-015.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-015.js
-   Corresponds To:     ecma/Expressions/11.2.3-2-n.js
-   ECMA Section:       11.2.3. Function Calls
-   Description:
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-015";
-var VERSION = "JS1_4";
-var TITLE   = "Function Calls";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("result = 3.valueOf();");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "3.valueOf()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-016.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-016.binjs
deleted file mode 100644
index 0632656da96188c756632a945ea6330a1f3d6f31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6523
zcmds5O>Yx15Z&^PKnTGBiBpcPDoBwK2Uvn=nu=6WT9MEb5^{H)#B{S8d7Y*?@;CTr
z+z>bZ1!Kp%c48;>wrNCrs<w8XJu`3K%-CncL4+%Q52LVhK$9*-eeZ_nc}Gb&_O|QI
zz1G`SkPNWrm&G1GA}Oo<c;<NzV3)7|{18!sjv~B+g9uT?ND>REP<^M~F^R)ztUrLW
zb{1Ab1r!NA5)+mK=*QPX95d1(m<qTU_0^?QMoHYQ+=XLWwQ9S*-}KA!e|}kl=vXbW
zzd;zLC=zfdC>k1gj{py!4k%7jF!sgPt2ZWW245DA^W~{G;g=_fn%nhToYSGd0DFZF
zJ*<6hEz6;|;p%&>SKnTnj#<4Qf3MDu-0pV0-Kd#%>x3vk%iUod@C+<fQ52;n>;>Fe
z%NgHdh~Yk@o#30w1Z#fsi>RN9Uj*<ktg=cs)ghbjgVR!mC~M=CEwE6+>geho7cqhB
zq%;B1?vOhowVLi=%wxbBQ4pL@pv0KAlSa}tZ4w&t6O!A=?`;wzI#zahTwy@BL5D#*
zBivygCEcEqPANnjXj2`eJLwW29UQT2jphcHlz}<#Ev#_3-GW5Tktaf*e_9Uu|AqYy
zcn!+hFtQ|;&JjmN;&8i&L^zxuiPaUzzi=BPfo5Z}oQ{KQ6g~~`fNQa7`#D_s6cC$9
zDF-dF9!*9T?3{qtvGL%9f_j64<?-_XrRkFS*`{MvUqn|OCBd=RLva{Eo0_%MIt#Y>
zj+q}VY{fqSu0dv12NV?F1TK@!s`c=X(8qRTUdI$bkwWrbF<iIFL04V%rdSiPljw%<
z03=7>fivEK^3ur0Rxf;6R7t^q9dhbr^*#rX<@6Suagq=vb8Ay0QWKg4N`h>#fXz8T
zp03h!1s%xCrkGLoJ1PjXm~+1;5}_ZdkAAM#tRfclsu3EdSg>XQQ(%AoB&i?gKoP-T
z(>5KYaPn+Im&9o?6(q&|YnD6?PF|#|v+U75f8~5upfImOa~wkBz<&pnd%$*<OxiXx
znPx+5d@n~RbaCNkO}-nLO`eW$*o4O$HA;y?pTj=BH+w;ub;smp#)TzGm%!B~9x0X!
z)mYZ-$78~0*eXh~853dHI}j>fTc(7{A>7W>)FljiR|C><f_VbYU+0y*w6*b47TWa<
zGg>;)9HDvmOY6|a<59^3%owc$I|Tj=eY2rDUY94H#c&&<!#x)joPs7V>LKNDnO!pb
ztDm5fyHMFLRvjEX!qc2Ny=Y0JbR+D_3bXA3W&H{feF%qU%4*e&bn=33dH;|rb`g_{
u9MX6vmTPmEDpzg%(3WQ3C^XE}d>WLiribN%y*SE6Ylkh@&Un4E)~0{K{zfJM

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-016.js b/js/src/jsapi-tests/binast/parser/tester/expression-016.js
deleted file mode 100644
index 9d0bfcef4e3b..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-016.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-016.js
-   Corresponds To:     ecma/Expressions/11.2.3-3-n.js
-   ECMA Section:       11.2.3. Function Calls
-   Description:
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-016";
-var VERSION = "JS1_4";
-var TITLE   = "Function Calls";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = (void 0).valueOf();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "(void 0).valueOf()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-017.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-017.binjs
deleted file mode 100644
index afd2dc722533a71d2c89709da600c796a7ff2e15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6319
zcmds5%We}f6dm3m5JEy?!79t53Q8rUN@$2g(^RC2(uzdgf;;0T1I|ojJ5BQ|`~{!G
z4zc4exOSYe8#_}^JB?^p(Zu$#&wZSG?U0X01lPj>MsfXsW_^l=!R;Ujj<R?fY_~dl
z-S^!n8{r__kaI$kFkb)pA_yMCtk7J3h-iY22;RXFK@{;MOC?mSzgh4-N#nCve*ov!
zc~}{hP)QslX~J^=bNg0|Q=S|rm`b=54fUZJr%BqcKY(qz%|@@a-w8L=f8mA#F|oRG
zemmiqA|l~V5E)x|PXP~~jwogf$i9BNxn;x7;Wwn=LbdB1Sb2h|J>5LT1r7QOuvci%
z!{+C1RR+BWN8jsietBmbX7zUby*fJz-n~|@-L!d|0Z}3>cgJZYGO*S_gfJWS66S2?
z5#QyA;~}J-j5nPL&ioVy(M#ou2>!x4t4yjM+58BM#yFz9hZ!$ms9;TWeU8ge5IU(S
zAle@bLog?G4>HdHYeGSAK7kTr+RNHm-{vGW<Od|TmEYS*is)4H3WUOdZi5bkb`pHd
z1Df;)S~`^w37~bok!hqWfb=j#)fz1b)-=I9?j2F#ak_#;&5>t9pMN?w`u~OfK3EOP
z+L$;J%Zw3EMG|nkC?Pmr?upeE$iHwJD}fe$QccGpGzy<acqFvg=6(TFJ_p23R?9(a
zd_c2_13M4Eo7i}WfP#91qw3=G05Mi^eD>&6*B9AUlPvlk3{V;qXjA7cwHXE5V#dOv
z!d9F?BwN9(>wtz5lfY!ES#@sy5&GDED(aX9C{sv2=m<ACdFZOI-c;U1h+9lLCPeo4
z`^TC<o<53+^*u`~lc#xI0@&Qdi%ZQl4aB2CgP<|P($XWiISrTJzRaZ_W|cm-IhiP>
z18yBU3lYm_?tVI6Zdky17`aG`id=u~Y*wO}mCMte%oH3ET-nh#(Dq<NMGMQPc`BKa
z>){%Y`1e402nXWXtktoTY0<^jcQry`ii@B%`)*@Cdv3vT2Od21^+Rs@66T4y^H+yO
zbIeX=9atIJwDkpJwSy;mrBsco?n}Za;@;Ol4BI}D#I``F?h5uM5f68J-$1V5f^<C~
zJ-dGKJSJ-E8&zD_UfG^9ed7r$Twhy*wii!oHsCy(O<)hFpQCLqRL|pzq;n8=A$pv%
zsMwUGT-0-^%h>#o^IvlZo!F&He!0rvVG)ty-0KBMkupiRRTb`n1*-ZLJo*GSovW%-
zFWBtG+3{YWM%)6X1_h+`uByhCM5-Ef#fKVN+Ugoh7w`PWp3Ht~Q=_&A)PTEis=;$!
IyqvY^9~dtKl>h($

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-017.js b/js/src/jsapi-tests/binast/parser/tester/expression-017.js
deleted file mode 100644
index 1e357ead7670..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-017.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-07.js
-   Corresponds To:     ecma/Expressions/11.2.3-4-n.js
-   ECMA Section:       11.2.3. Function Calls
-   Description:
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-017";
-var VERSION = "JS1_4";
-var TITLE   = "Function Calls";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = nullvalueOf();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "null.valueOf()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-019.binjs b/js/src/jsapi-tests/binast/parser/tester/expression-019.binjs
deleted file mode 100644
index ffa699e488bb803d2ad72111d117148a4f1de846..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7291
zcmds6%We}f6dm3mA%w(^4Wq7FRj9lxAgx5wP*Rn&Y644;n{ktY=}hEt`uGo4{23A}
zcKikRI-ao;J5wheBIqhgJac>>=bn4*RQRAD(e+A?l3;z8C0#}iz002G?I*#hS8X)6
zTCZB2q))xdig>0Hg(+We-1ofO@Ki;A{Uc!^*^lT3?L>qT9wxDX3e@-1`x?f<DAq5)
zxpWp*!UR+pcwrp!96;Z`5zv^22O(twE+&V{=#;ZC?ylc}ZCdqOyRp-(tjOOgD-uM<
zYKiB!Lrxiq1l$pc1_s_8z@sO9M$;6Wefa3{OA|JOUlD<;$X&0%n@5D1kLy;<7|<Vp
zJ;#84tnanT3g|U3eXI5O^D{Fr^N-^kiHUx<8}047>9<Y@M_S%Rv>x?idhA2#LMbK|
zrp-T~Kj%lxTd-C2!)Eit`)Yl!l%QS*#HUYIS6@6g;m#4tdM+O=PB=XT4HLzyWW_3W
zH4;VYRq;j#exgdEblx~fBL*zxgz+{_d4Y!#R!3KMoW})hI?@Hgx&sVEYIWVg87zQf
z2I~C|+8Sl;WIO4aJ_$ko4oYc=Wi^ZmJ5_#pDA!pfc@aI}9t*oY)rX|2Bha$iNDtCq
zfOH5%*$odJ^p%4-?=7rwu&zM$a^zvx%)eST`uDpeN(amcgUC`?I!7Gk9pT=RFrvZa
zOw4cE_zl(=1vH+Ma>h5*D0<SNeH<-K-)9KrJwR+Geh%vM9!rib*f{|&;uMF3f__6g
z<?(Zuq-n|gY_n6<U&Ik5N;+S?9*KhpX8!DaqO+iiPmH}(c&^z6p-1R4&NUpWVorsD
z32e3Z8qLk(s%X+<t*MpSafJoq&}3R5N@fR4G@{`scxY%ZG=Zha<+UkOKZEwEs3^9e
zwNMrEaA)P$8#woMV;of!z%;YMn(|4ftwZa?c)PTe(Tt-@=Nl7?m}cZ*G#|Q$`o#ho
zHT(`;V|aH!gC?Bb)%YhE^Z=d{43fi^)s(Zxg&N_VUM(Vnl!{dK;i}?r@^y!9wL@M6
zX;fCTkmx8=i_)@9loa7E7-JoRjG2eZwDzkk;@PJj`Ts6vQw%)Q9SAoPU9nJKll?Cc
zPp{ALn8Q!4a_5j52mU*t+ysMoGVBg!F=eTp_&F2-J@dNW0Cw)(IK-rPltyh+UZ7EM
zEjpr6<KeK&Q)Y#}`;1&2)%!9#Jmv)N25KawW=@1-pFpUtVsv#!9MbK4O8pCm=>G%K
zaZq{=!9OC*AI^gQnz#WRzPq^43m2AN`@^9jTM{$l;?ip~p?V4(cSnZ!i*SO1Yey5%
zMsf#koFRcWR7Z2MHkV4Xv#2NOv2<`5p(f3C6GmQrhZ&V)x(4Fl1}Xt}x=fT#=}zc^
zt;Dx@K>P*|;y*Ike=JBH%N=l9@L!NzvyGPe(%3;qE?KU#<ceK8<szz|@gIs@o4|g#
gYU7-?G|nLnGc|8|<*J!AxnS?fa`B7{S8Ln*17^)ML;wH)

diff --git a/js/src/jsapi-tests/binast/parser/tester/expression-019.js b/js/src/jsapi-tests/binast/parser/tester/expression-019.js
deleted file mode 100644
index 76c26bcaea73..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/expression-019.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          expression-019.js
-   Corresponds To:     11.2.2-7-n.js
-   ECMA Section:       11.2.2. The new operator
-   Description:
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "expression-019";
-var VERSION = "JS1_4";
-var TITLE   = "The new operator";
-var BUGNUMBER= "327765";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var STRING = new String("hi");
-  result = new STRING();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var STRING = new String(\"hi\"); result = new STRING();" +
-  " (threw " + exception + ")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/forin-001.binjs b/js/src/jsapi-tests/binast/parser/tester/forin-001.binjs
deleted file mode 100644
index b7b533165315ef7ab7dde0445a9d1f5f0d98cf16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 55280
zcmeHQ&5z_p6?gbv!iq&8J};dkT4iQocVQFFPO>wZB!gyWqn(dS6fN%VnjSMAyJfp~
zGyD;pBQ7~|;0Q>F3n#>p1LDGmggC)1XCx%vv#adqcDY^tY<Ewslvq8spQ~QIdhb{7
zS07u!Y-+RZt#f9Mx8L*JiDzCKpE3+%=#H<9o&Ccf9ld@ua;MDL+6<rBvMoQ@{^y?!
z<E!x07JdEH^el5|v$xpDHa#=2TqhJYPJa8wh2@OXvi<>bUMiC1dZ8$5Y*>yJ!~*E&
z_s7f$tTT&wp*Y99ObYD>p5;uoKM$Wd+S@(ee{#6B$^W*s$%Rl^N8$4aR=_;d4#hn;
z?O8_N4Ul){g6LQ8-1%NsqL929>THXD@YC?pbJNQ{P76>`mwyG>9qRIQ@99xfy8Ijz
zeQ)>iqi5gGYNmTd{---deilA;ynlSKm#sIo2t||p21+|;12D^tjSb5g4E(?h*d_Fh
zto-iv`uFbiik)-k<ekHl$2)sZvvseaTQt$TckeuS?M_x)_p1C7bo7q;dh@FM0jTmk
z2&S)ZZu$^jX8y+I$i3Wv|2BuSi9fZ?VADT$Up#|f8>5N!hBbb8_ujn+_wP5V`n?aQ
z9`k*OR7awhggRyM-=(2u*R<{A)$olG{D~z2f?AhCU_u2$KlOrR<}d1}Tr8EIl%q}+
zFy!+pnBHWD?!uQ=U7<3!K-LQnV&}U6Dwucd9=MZitA#P~=Q11Ku^iL8O6p}`!~_Te
zkOE+U&CUYDvnJ;W3gCeiJHzedLsUsEh*VHS({KYTI7liOyBvvCD3oqN+=(Sez$N}E
z`B2hKeK9}O`rEFz?>v)0vamuw27}6Y&L_j4uu+gyCwyY+q1^=*OFBa+;maW5Gw_`h
z{*5F6h{jj0LcDsxt^n&%<VdYjp^-4;*vy#(=h=3rq7I?Ude$fxv4R-*ck9g<?TR*~
zLfWVRwg!0hsp(uTu7M)H`2xsuSm2M$Da#7%s#e(cSF8xcD>cfSA2-}6b6<s$#*SR3
z9!0%ljep8KH(%#`lq0?||8vEBhh!9@eFtwt(Zt$!VAdoR0~B1k_8r@qC^YXZRvUNR
z%{oc#JGAdGjM{Ke`;K+@9S^kc5O5Wds~)p7Hk8!9qd&d_vk&z$hS-`x>15&CGiQXn
z9Hr<`67XtMpzJRFeBO_OeFc<ToP~J;-_2xU6eMFx#0`@*Sy#z%BrWTX?T#*z+*C2Q
z=>Ua-xv><kPx3;EC@ef%oG5+-x#fw2+0;ZpnRMpEq>8jo3R=1eg%hc$N1kUEWM2;1
z3sS=R=7|c-`K%Z{&R=N-ld`Ocy1xkZJ;g*{PNiw(dZz0zSDL69-2ut5=gtG5HQMpa
z(FLP6j@>Nkqz2ESUWu@t>Q~KM@>^~{%AruRMakVoy+cuSo|8<qTv_k<G1y1OYxk?W
zwrY)KI(loSSf&t)#*#-eEV9E^6}>3Tr!2TfzNZe&_^LeAw`M~n0YXD&L|bl-s6elh
z;>zGR{QKmMY_^a~nYYdOca%P)-=Z_wP^y^C7QezDuKNxI(<GE42nwgGAy7AF(=klM
zQ3Kc&r+@t#KA3UN^Rk+mN{64Z5|b5rr23m{Uw9!`?HsprB425ST%EqQl@y#7Si!~>
zs=a1CR@Sm7p(!U(KjgaO85&{&N!;4JSrHT7&Y7T5UG=i^l^*kb1YI@LagzEaT^b)^
zi^qIvc;Dp28sxrlg3zw%OStdQ>HQYq86x<yAX|B=N}X<()AlWhR3x>r))7j6Kk*1s
zgX$5;sNYp&HB{6X+W!YxUCAVBbO`h6n+Y#Mz2ZuxwyNfa2O2riQ&el71?JV1CH2U{
z1hB|B(!`SZt0_g1cd#H4Bm{I6B}3Wx5LOJ#&GY&;JcrMUx%=}KXpN^{Y7jYrpw(&+
zQFJyqM2Xz<M&9t0Ht?DOuTH9_I?7fEI!f6rd50<J;obFCI!x^DtIJ?z^5(bom6iDe
zurg?2sfbz;p=(wqAHgk(pev{DGVmoGak2B)BWP<fVDniU#l@7@DFd`-#8n@YD#9C3
zETRYnH2cI?mPN_2aKb`uF0_n8YYh&UDTJc2<iUGkf8t8*u+@RDDlTrd5G5&^I(anB
zK0(0O>{GN4#Paa*e13)ZciQbsuuAl`I-Nt)MbY*dN+Wzpll2kVq->+?Bp6K>fwxrJ
zNTp7<({zy`+r*|MDo{XRIbK(QE^(z@Mlpknk~LlANA9y14c97QZFpo*WS5na$zYMC
z=_1v4DkjL%si%%-3}~{4Z*10DFI9m})VH=aa917FDufJ`I#r`{vD0@$&0Zg}CvQP=
zU&)?NzHS&eHz!5*RLqF~4dkFrEtJ*FoJb6RqjNU8*zuTok>yxuCszbeNW)J}-_HsY
zsEqeA?!A<zPFB?9O;BTpnoRcI$yT0fG95j!fZY){5d!Hz_cyxJJ-YTV6DBdb)zy37
z$s+U}sutfGKqym)ra%HWDQa1YqFZ5@{tLV<I?+_PsEF%Z%A>YAgj4PPt=XVz0Thiy
zGfT1@QkjlkCxzEFtyHF74H*!1Tyxw6Vv%MzCHj#NTqY|L;2W8I27SC=zDq&r*oG~j
z=rhx@vp_ON(OhK(GZAIV79yz9>CjU3or(>WhQA#rkKO|l@54;t?+BY23~}f+aA(25
zJ&QNN&bB*ktlC2{Dy#tm&&iw6udJf2{Jtl)@)fX^1ZgYHEHCZXX<N01l$H?e*3>jD
z@L{dGu{sz^)1Xosw2bx7_1{GiSr*L|0|dgozL1?t37qtv(TlV~{aNe7Po;5vn+q~q
zHmw{dS^z!Kx>R_P58$~lfx)wqd2pKCPNHD~l=yAwXk5;_rfj6bTDx8pd>Kn|?j>3m
z-Y3*>U)h<{ZyCnRU}dQkSw&9acOVBXd!ejm*cl|0U`qDP4kYISP~$BVEjl9rmZB)h
zA~CHf*zub?$Hbx}1gln*Oi>bF*Ly`>r!`d--T2Gk!#i^0xCsgeEIr=SvV2@PFo(=$
z<0P?*sXQD17;PCPcC4b^MKReloCR=@;gFe57HLp%rMJy_4d7u@WZ6<Ci6<Uhf(Zl|
z6IZILzSGI-y<{nRM_(b?Jxpj?T&cztY#j$HN`uF;^Zow^<y{jymq0q9ZE>Yq?}ltz
ziVY@xUjj;mF5+wC&{L`*V_Y!23<)P*t@}>JT>p}FDnZ0TA@Q}kPK5}n+lqQxDu4Db
za4fARo{!WHGTs3DeGUi6om~w=$ic?Rv9SZoAGnTvHDDjI(JX*lt}~MCKS$eQ$8~Lh
z8@b2Py%g{1nR=_@!H<ZP9#-EfJ#hpQ5J1Z}ml(hxrbzEcmM*MTT&e6;wBCRB#CmTh
z*6WL7T>Sx@eSGG61KV|{1Jh#zhHV8qu#O8r@M@Z_B(78QQb12=&WkYFdfM=xdSb)h
zO>8(dg+aJuFy-hxZ?xyNv|tGeqZT~pd_i5gh%1L+q0&~--TtvBrus^OsSa^?wU#C-
z0kzbq>YHdo9N;gYg>Wz|64i6Aou{wmIf6`Xn}DLsJrZ>?_lUAG_h?@)jw^IF9acq!
z23<21EQ6Q4pY6k8TlJNf{H5k4#mIvD5#H}Gb@jaHu<DALf6YrO?##CoMG+q?Oru`F
zT33sr0f}p<_lnZIq+yKN$cBRp@k~SCxUigYJSYf5mF6X9QyaFS7oERCTxgS*v?d-K
z4=t}KB~zBK`I+V=86G+r=9YVPn4f&iA<UDy+@<gra|0z&uK6o1r$T0}HD2;5WWF^o
z33iU{7R{BYGfiTFI}#Q^TfSlrX(@)Ca2yh(BPthPqaiu1D;<J^uHz^hzrr7``_5|W
zR06Z-6;qJeS)@}Tit4tao;2C%Otv-ISz#75dRR?%qUWRCP$BrE=T+J&^GJ=V*JP(1
zkhHVRIV!YD5zs46O0S{^)@0{)w8M4P^_Y##G?Ab%>R0MBNmSY@nyMx{mpvIu0&1yI
z)i==sNQ^G}8Zv!!q;*YIune;Ehbu;Q{_1OnflGT+aCDV8JTk37hT+P)mvyD43c#*b
zlvvi=c)(g$i)tKvcAzLtc51TIg5+J9V-=%8d>P~H0okcn78=IwoIQ^kNbK+-3?0cR
zNNtV5!_yb8Cxf@^I)UZPShC<5M?0FtV_wK+%64t-Gl?g|@T-`2(rcP<zR)={$J<L!
zk`|176#TYM^T(~Jpsl8<D!rzu@sXBrv*Jo|%qqIuzd#S|!vg460DJHS(9-31dQB7T
zAY<AgG^sTWKqviWT~{alx0jLhf3RXne|;{NSkZ_vL!XPa$#Yxr{C)}t(sTU~3F~vQ
zEXNAsxvNxJ3g{SfKw;?fvtEOWS}nczJ>6JlFXpw{X`h=EwJb#=ZDk8IeJ++-?{Ccp
zRo#!Gk?3==WEs{n-ll4L3?s2V7fW#v$=#nAGtFPAckE`X!j{hTQ|PsM8~F>JP+c6U
z%_T<^t<S|uO`%d~2wcN>%=}>2^d;Nig`~4S7Yp;w)FKu1T4dlnbtLRvT<KR<F$Jp6
z#S%McM8GxP-Mi{QtxOPCFiQkpg=lF#*Nf<Lu|gtLF`6QM7Mbw-i!%hRo}g65`pe86
z<!+XGTSdJf;MM11xl`r^S5<wQ@&qJ(E*9+dIzBWnnIG#qbk4mvUaAVuv$TR2P<6N#
zE@ypC^ygi38qDO4@f&#goAAC!=SyaF^3?VX{L0BYhbNDB_MRqgmET2|8)h({k>v!L
zdt@F-<{p_ep1DWZ`^-JEIbP--Sxb_+M<^$L?<UmYJuh+(k37#Lr<#zrGfRm1J=EOs
z{_(+HMmO?d3K4m__w;E0$zkS2j3B45S2B~A25%1~TV-&`;cdx*Bjm#)_i}1F*?P*5
z7Jp6V|M)Gm5ZLzF3vf)9sSFNr1KEvRaN~t%1?*jz>%_cc_rRS<-@an0t@9$J7ykbv
V5P|wHw&Hqiys#znT1!4!`aceRGC2SM

diff --git a/js/src/jsapi-tests/binast/parser/tester/forin-001.js b/js/src/jsapi-tests/binast/parser/tester/forin-001.js
deleted file mode 100644
index 215de6c4c8e6..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/forin-001.js
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          forin-001.js
- *  ECMA Section:
- *  Description:        The forin-001 statement
- *
- *  Verify that the property name is assigned to the property on the left
- *  hand side of the for...in expression.
- *
- *  Author:             christine@netscape.com
- *  Date:               28 August 1998
- */
-var SECTION = "forin-001";
-var VERSION = "ECMA_2";
-var TITLE   = "The for...in  statement";
-var BUGNUMBER="330890";
-var BUGNUMBER="http://scopus.mcom.com/bugsplat/show_bug.cgi?id=344855";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-ForIn_1( { length:4, company:"netscape", year:2000, 0:"zero" } );
-ForIn_2( { length:4, company:"netscape", year:2000, 0:"zero" } );
-ForIn_3( { length:4, company:"netscape", year:2000, 0:"zero" } );
-
-//    ForIn_6({ length:4, company:"netscape", year:2000, 0:"zero" });
-//    ForIn_7({ length:4, company:"netscape", year:2000, 0:"zero" });
-ForIn_8({ length:4, company:"netscape", year:2000, 0:"zero" });
-
-test();
-
-/**
- *  Verify that the left side argument is evaluated with every iteration.
- *  Verify that the name of each property of the object is assigned to a
- *  a property.
- *
- */
-function ForIn_1( object ) {
-  PropertyArray = new Array();
-  ValueArray = new Array();
-
-  for ( PropertyArray[PropertyArray.length] in object ) {
-    ValueArray[ValueArray.length] =
-      object[PropertyArray[PropertyArray.length-1]];
-  }
-
-  for ( var i = 0; i < PropertyArray.length; i++ ) {
-    new TestCase(
-      SECTION,
-      "object[" + PropertyArray[i] +"]",
-      object[PropertyArray[i]],
-      ValueArray[i]
-      );
-  }
-
-  new TestCase(
-    SECTION,
-    "object.length",
-    PropertyArray.length,
-    object.length );
-}
-
-/**
- *  Similar to ForIn_1, except it should increment the counter variable
- *  every time the left hand expression is evaluated.
- */
-function ForIn_2( object ) {
-  PropertyArray = new Array();
-  ValueArray = new Array();
-  var i = 0;
-
-  for ( PropertyArray[i++] in object ) {
-    ValueArray[ValueArray.length] =
-      object[PropertyArray[PropertyArray.length-1]];
-  }
-
-  for ( i = 0; i < PropertyArray.length; i++ ) {
-    new TestCase(
-      SECTION,
-      "object[" + PropertyArray[i] +"]",
-      object[PropertyArray[i]],
-      ValueArray[i]
-      );
-  }
-
-  new TestCase(
-    SECTION,
-    "object.length",
-    PropertyArray.length,
-    object.length );
-}
-
-/**
- *  Break out of a for...in loop
- *
- *
- */
-function ForIn_3( object ) {
-  var checkBreak = "pass";
-  var properties = new Array();
-  var values = new Array();
-
-  for ( properties[properties.length] in object ) {
-    values[values.length] = object[properties[properties.length-1]];
-    break;
-    checkBreak = "fail";
-  }
-
-  new TestCase(
-    SECTION,
-    "check break out of for...in",
-    "pass",
-    checkBreak );
-
-  new TestCase(
-    SECTION,
-    "properties.length",
-    1,
-    properties.length );
-
-  new TestCase(
-    SECTION,
-    "object["+properties[0]+"]",
-    values[0],
-    object[properties[0]] );
-}
-
-/**
- *  Break out of a labeled for...in loop.
- */
-function ForIn_4( object ) {
-  var result1 = 0;
-  var result2 = 0;
-  var result3 = 0;
-  var result4 = 0;
-  var i = 0;
-  var property = new Array();
-
-butterbean: {
-    result1++;
-
-    for ( property[i++] in object ) {
-      result2++;
-      break;
-      result4++;
-    }
-    result3++;
-  }
-
-  new TestCase(
-    SECTION,
-    "verify labeled statement is only executed once",
-    true,
-    result1 == 1 );
-
-  new TestCase(
-    SECTION,
-    "verify statements in for loop are evaluated",
-    true,
-    result2 == i );
-
-  new TestCase(
-    SECTION,
-    "verify break out of labeled for...in loop",
-    true,
-    result4 == 0 );
-
-  new TestCase(
-    SECTION,
-    "verify break out of labeled block",
-    true,
-    result3 == 0 );
-}
-
-/**
- *  Labeled break out of a labeled for...in loop.
- */
-function ForIn_5 (object) {
-  var result1 = 0;
-  var result2 = 0;
-  var result3 = 0;
-  var result4 = 0;
-  var i = 0;
-  var property = new Array();
-
-bigredbird: {
-    result1++;
-    for ( property[i++] in object ) {
-      result2++;
-      break bigredbird;
-      result4++;
-    }
-    result3++;
-  }
-
-  new TestCase(
-    SECTION,
-    "verify labeled statement is only executed once",
-    true,
-    result1 == 1 );
-
-  new TestCase(
-    SECTION,
-    "verify statements in for loop are evaluated",
-    true,
-    result2 == i );
-
-  new TestCase(
-    SECTION,
-    "verify break out of labeled for...in loop",
-    true,
-    result4 == 0 );
-
-  new TestCase(
-    SECTION,
-    "verify break out of labeled block",
-    true,
-    result3 == 0 );
-}
-
-/**
- *  Labeled continue from a labeled for...in loop
- */
-function ForIn_7( object ) {
-  var result1 = 0;
-  var result2 = 0;
-  var result3 = 0;
-  var result4 = 0;
-  var i = 0;
-  var property = new Array();
-
-bigredbird:
-  for ( property[i++] in object ) {
-    result2++;
-    continue bigredbird;
-    result4++;
-  }
-
-  new TestCase(
-    SECTION,
-    "verify statements in for loop are evaluated",
-    true,
-    result2 == i );
-
-  new TestCase(
-    SECTION,
-    "verify break out of labeled for...in loop",
-    true,
-    result4 == 0 );
-
-  new TestCase(
-    SECTION,
-    "verify break out of labeled block",
-    true,
-    result3 == 1 );
-}
-
-
-/**
- *  continue in a for...in loop
- *
- */
-function ForIn_8( object ) {
-  var checkBreak = "pass";
-  var properties = new Array();
-  var values = new Array();
-
-  for ( properties[properties.length] in object ) {
-    values[values.length] = object[properties[properties.length-1]];
-    break;
-    checkBreak = "fail";
-  }
-
-  new TestCase(
-    SECTION,
-    "check break out of for...in",
-    "pass",
-    checkBreak );
-
-  new TestCase(
-    SECTION,
-    "properties.length",
-    1,
-    properties.length );
-
-  new TestCase(
-    SECTION,
-    "object["+properties[0]+"]",
-    values[0],
-    object[properties[0]] );
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/forin-002.binjs b/js/src/jsapi-tests/binast/parser/tester/forin-002.binjs
deleted file mode 100644
index 3c83f781854050e9d1bac3b4068ee9f62065e5de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15210
zcmeHO-EQMV6!x;PEFd930&ci4d)3v7wk$WON+X&yt1arLK%zwg!OBUdsi|v6V`odn
zJrb|L9TMW9Ks*2!yaVTq$C=a2*qQveX&3jRQ8M=D^FQZjTua8IfYoa!%p26d;L(tK
zXU<EG<Mg7zh0{1_f8N>Y^rI1TYFpx(THwb?{o$vM^CnzXqqjfxxbO7>w$J*3$Gyal
zLIE{U-(%<04+odA{sx>|v#=sAp!|X3hkh~vppQQourTqDeZ~b`=$$E|<AnR+u>LAM
zrqgP6502WkE%{q*OM+0Wj=28NPZ;+C0r%Vs#v0yhfOi}L^hev<4|T*0c}vKwCLeek
zZhG!<{c=jcg0lP*u&+>-Pg`GgRwc_jKzghBWbfIv5ad5sC&*XeQQd>?VXN38EKTx#
zL_1+FnC0f?rXRX)oOlU41K-f`moU)Qk0Z|F7<{~w;S0-Sli!U_+Vp}z-74<r!%s}P
z7WD!Pmqr%^4tdgLaS?|GCs%YV!vY3N$%4m+V-$33WZi<9w*c#$L)3W;;h6DmbQleF
zt%+#zE4aDl=?y>h_=V!j!B_*q8-g(e(10B$4)=#ADt^k4gg_6}gQyBhfV2?AsslAL
z=qd&$c5ko>3+f6yc7mLS{K;3tgC32;KJJlpyL=hwggtHq+vi!FzXwwVS<rhIP@h~J
z^?qP|gNq1C+i;0yP8QH83b8dBgqw<h(%J~3{;6`d*?Gq8Hyj5aaVgJG_N}0hc2*pE
z_8?jfL-bDtFpq=mDi$eE`w_)MmLef&XT;I-k_%%n=$`m7Ap`E3T$b4keaMoUkWi~f
zG|{Tqs?;;6XIURcG~p;m$I6Z}@nxS>L2Y)fBq@^LRqZku4zl2*(;~d~d$>dk2bLMg
z+i)*u$(V<30#?3R93C>(r$4DElpHFHQWk}3OrlgNx*9WiQaP^Gr20#k)O#kAav!+&
z?im<2@4O~?RCZ-5l2f~CkI#C{P^6mVxK_LBEn!#h=GfJCWmYTCPq0u+qDB-2%nJ?j
zm4WKo#4CRZyZS)cm1KB>?1k=q1N+5MOLmZ`aA<E19;c;`CP!W5o&|&CRH47hDj8F$
zM-e{=pM9(gQpoWWxI#-`EK+VM=1g?iCl&j37Kfp8_J0;fo^||XvW{~1uo>0&j)@`}
zIdYrOw<ewIX|pxQlACVDKY>SUPQ6yO8N2P}QG{_XcmEVRFV~J<OtacE`5t7yjQjmu
z--CPL@9t;0E-0OC^*)Cluw2I+dyL84&GM{aP=2>^_V#`R9B7fiqD6)yrnEVy=MAO|
zYu;|<ztFAJ==$1EPE^~1^asU+HJhqZLs^m&3N?4b^_SNTEQn-F@qh+IW(m2IVoHbw
zPgr+mJyTsjbAlDAnnKMjpr3(EO~(r+h2?D(C`%lOHNBYWvJ`>*5AZY8<fYcSg__Vk
zt!C&YOpYo@Idh$7ZgF*ky%N-8*>iTmD9<6#x<M3;T$p-$Y5<NuZMyD;?gumwSXh2h
zOfi*;mbBxRaQ|DKIuoP?mBnGy1Zqhq&f&gucXwSoQY}$2oG=&>xEq$Z>l6X1%GkY;
zmP8H8zI?lM*Mbv#q--~5LfPP6|CB8<rL>TBkyB8{ETHDM+!C8ixHY0(>c%d1&o5zF
zO9PhY(OhCp*Y{Gcrj(T&*hBKthTmf^-uF2S|69ON)+i+H1Bpk~MLUIPTj_T=m6qoJ
zY|w_|b#W1XdQkAgOipon0xw6$f^VIo862*WFgq2jkHG7vOG?o?ipjj@=yfe7e>WAA
zRV9Y!l+)1i8%&h65PY+$?W&lB?V&0r>uAO|x=bsf@+$$-vLtaq8&xqWUYN*9*Rt$K
ze$uVoQpQy=S;yqCDkjsHiez<A6_e^^tQ%fTW{sv9C0tdc?ij1{RaDP3EZ>NF9^Y0e
zY&0~z5u7WwZa&<B5c>{b(lglF09}S2<J3`GBSoZK!yPg!XH~C=Eb2!;2&$I*$~D{`
zr``!8koshYKx*&g$u(1Kl}kDAP{~z&UQBK?oamFQD3~OgK1O<Ju_Jmyn$(c_sYB!P
qHdK;Wp@-<@+KhLn($1Rr{|%s^sbywSs6ykoi*TXqB8_-jGwVM>b}s7x

diff --git a/js/src/jsapi-tests/binast/parser/tester/forin-002.js b/js/src/jsapi-tests/binast/parser/tester/forin-002.js
deleted file mode 100644
index 7d898d6bcf40..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/forin-002.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// |reftest| skip-if(Android) -- bug - nsIDOMWindow.crypto throws NS_ERROR_NOT_IMPLEMENTED on Android
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          forin-002.js
- *  ECMA Section:
- *  Description:        The forin-001 statement
- *
- *  Verify that the property name is assigned to the property on the left
- *  hand side of the for...in expression.
- *
- *  Author:             christine@netscape.com
- *  Date:               28 August 1998
- */
-var SECTION = "forin-002";
-var VERSION = "ECMA_2";
-var TITLE   = "The for...in  statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-function MyObject( value ) {
-  this.value = value;
-  this.valueOf = new Function ( "return this.value" );
-  this.toString = new Function ( "return this.value + \"\"" );
-  this.toNumber = new Function ( "return this.value + 0" );
-  this.toBoolean = new Function ( "return Boolean( this.value )" );
-}
-
-ForIn_1(this);
-ForIn_2(this);
-
-ForIn_1(new MyObject(true));
-ForIn_2(new MyObject(new Boolean(true)));
-
-ForIn_2(3);
-
-test();
-
-/**
- *  For ... In in a With Block
- *
- */
-function ForIn_1( object) {
-  with ( object ) {
-    for ( property in object ) {
-      new TestCase(
-	SECTION,
-	"with loop in a for...in loop.  ("+object+")["+property +"] == "+
-	"eval ( " + property +" )",
-	true,
-	object[property] == eval(property) );
-    }
-  }
-}
-
-/**
- *  With block in a For...In loop
- *
- */
-function ForIn_2(object) {
-  for ( property in object ) {
-    with ( object ) {
-      new TestCase(
-	SECTION,
-	"with loop in a for...in loop.  ("+object+")["+property +"] == "+
-	"eval ( " + property +" )",
-	true,
-	object[property] == eval(property) );
-    }
-  }
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/function-001.binjs b/js/src/jsapi-tests/binast/parser/tester/function-001.binjs
deleted file mode 100644
index 775b94c1a520c4b87f50ea78f0428594596bf7e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3935
zcmd5<O>Yx15H()~geoB+A&xmx2}t3HmPjGZA*iIN8}%AFS!Zi-c2~C3Hh+~rfW)t0
z>~&%{-UN5k22Rn&_Vdh}c{Afk&I(3a(K*3M>l@Egj;H88LTHpHbM(2_{}O+U$9X|e
z)YN+-Mulwk_7QplyCV1a8Ris^7&#(ihB=lr&ooqGzXke1v*bF~FTlC?H>{j%D4HOe
zQMm+gukR%!lXOA}*Kir0TBC*JG)r5L;hMPH8T3y2QPcbvH4TW173=-SR1%JvhP%LQ
z=Ha~nyi<~PuZremmW`FiZx0XO``C*+nwq`HT>Su!UtsQUcTK6u>QBJlA**NI)A+Vn
z-2>CRov-cT2cMbU6Zw00L_UJ62ED;?*Z14ah`{801!!e*zHSs)LMmr(8WV<7(Kzrg
z*n(I{e@=ve<c}qmWC}9WsYjOoSL(Hc8M8<Ai81^|tjb)c1JwN#92OFDIUquA@X)}z
z=+=%KxzGl$(@Z&R0gzHP6ig_9P_!7CNW^J+ZflkizY^ysYo%+=QSRcYYMhV0ld(hv
zSHN;!$!EP&0lX?bmWgD|U8IX^b^w$L5jY`pIWLHhRulC(pr%B27#0G0n5HNUydG!u
zP6g1Tm_E^=_Raq<m{vVs=4Ao$O<aU;_187MW;@#hx$LN&DZTNE<aE90lS@bO%CPN9
z*CvUrvRPw>u(sZ)yscDdMT~J1^K_=lo~W!u0h#^`u-ZwYDs=~o3bys2v=3LRa(Zpd
z3~YZd;ao;88>R&wyc-U6<rxnB#C1b^r{ey1W%SP63Xw}dLa5HLAwo+Llmqng(?re<
z;O!*)_L_bO9?76d#3<Tz!hLxuQ_62Bp5^0;Bz<_^SoLXEu3#g)%h2L^u~uVd0;%dY
z&eCeGnx)D&lv%47V4YLm8^Nrt3B6g}+}s_Ain+q9uBNDSsA66;tA6;*!kQjfnV5e7
DGAIIj

diff --git a/js/src/jsapi-tests/binast/parser/tester/function-001.js b/js/src/jsapi-tests/binast/parser/tester/function-001.js
deleted file mode 100644
index df45e048d784..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/function-001.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          RegExp/function-001.js
- *  ECMA Section:       15.7.2.1
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-var SECTION = "RegExp/function-001";
-var VERSION = "ECMA_2";
-var TITLE   = "RegExp( pattern, flags )";
-
-startTest();
-
-/*
- * for each test case, verify:
- * - verify that [[Class]] property is RegExp
- * - prototype property should be set to RegExp.prototype
- * - source is set to the empty string
- * - global property is set to false
- * - ignoreCase property is set to false
- * - multiline property is set to false
- * - lastIndex property is set to 0
- */
-
-RegExp.prototype.getClassProperty = Object.prototype.toString;
-var re = new RegExp();
-
-AddTestCase(
-  "new RegExp().__proto__",
-  RegExp.prototype,
-  re.__proto__
-  );
-
-test()
diff --git a/js/src/jsapi-tests/binast/parser/tester/global-001.binjs b/js/src/jsapi-tests/binast/parser/tester/global-001.binjs
deleted file mode 100644
index 543e407d825bd0774882d7a098b583224079987e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6258
zcmds5%We}f6dm5L4G4(^t63IRC}oS%iZ%@p6w*SXZjqC56Vu5|WIIjsAFTK@Sg>Km
zUvTa5jNRCoI%yhFR?)=v@qM0qud94Kit$c$fKjw_NYg$=!{BBR1l=^6278UxhxY4s
zFCF2aT9JFIF=2e?+p{2e1iPx{@gqbD>c)5<_hLj5Cut&~BK^&R6Ou&dv3>#0jf=2S
zDxpXekc998z`VW@;e?Z8f~kZ{&`=A_I3-Dc=N??suGcz^gI2Yo{;O6Lh>6vf`<sMg
zied?OisG?__Ym;<aoR=k%dM?fHe?Q6kw&Yk8*jm>Q$+3UrUXkG^Cw`h(U?c|&+Szi
z^Dc;9uYKJ8@=qA@_xcQZ2d?TgI?Z}{M0m#J6M;6s;X4_Z;X(H+?r|IW5}{c?8&S*{
zq<5Pmj)#zTGUjmczcW8;D30|}d7=k@VVzZG{Ci~c1JIOlM0p3ZG7TO1t>w6k3W6t<
z3W)Z{!Vt`<x`#540c%2maNYwGW7<iZY2Wsm<dN@?;8u?Bkp$7H)+-P!1H2794BQ#x
zV;)e_A86`SWF&w#^+l!&t^m@*5Ub{Bp<t*LEaKh~6&})+<Z6MOk$v&$xM)do{{gC4
zj-SO^O{ElM3`stY9f@Veh$krtxVMPJIGXQ?^%coK>$9WaD16q#Bhd}nx-VhMr-0Z>
z!vZwq1DZ}8*hK)Yt@&7Ud_ui(mbN8~D&q4HF}C9P?9i#MFS4tS)80uiKuHuso0_-O
zroek*$IPM9R{Rq%f<+3t4rnN`2~4I+xAXE{sOtSh)G-aPNFmwQ5pL?_!K=P})4~%&
zG@(*S578MAX6%N|h1NxKC^@a~ENM(F%webu$~;p;yf>)DXw0y*;|S)W;r!XkJnCUI
z=}~R+Tn7_n;c(i7zClFlxyeo&@jnYE4<n1n#B-P?w|M?*TK?MEY=Kg>SS!Dunsg$9
zE0se@FruPC<<lZ7P5XJc#v}ecQ0{|3Jk1&zJDGCV&i!2tQJCZ+)XKh_m}ieEIBLOj
zh8`~DrO#oX*qgsA%$g&UY@Xnzt(T0|^JKirX-N1)Om#KHu<esfF(9hjLVHsY4|jXd
z7gsR;Tn|Xko?bMf*@zHshY6lQBTCrD3)@|$gFLZ?|HBRFYys8=%tP7)_VD}#1m{Ba
z6jx-PLva_Phn!^<XF-+A+A1|~<wEAa<_$~o!eZsY!y+Qjxz{6)Qp!}qO|39Cmr&~)
z@Th#>W+e~DYR&N^pjO;0W<Xlcr)q6Zq^ea{d>Bi!W4nRL?AJ22YFk(>xT~XDyx`Hw
HS%CfmU>fbk

diff --git a/js/src/jsapi-tests/binast/parser/tester/global-001.js b/js/src/jsapi-tests/binast/parser/tester/global-001.js
deleted file mode 100644
index 228b110c8954..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/global-001.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          global-001
-   Corresponds To:     ecma/GlobalObject/15.1-1-n.js
-   ECMA Section:       The global object
-   Description:
-
-   The global object does not have a [[Construct]] property; it is not
-   possible to use the global object as a constructor with the new operator.
-
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "global-001";
-var VERSION = "ECMA_1";
-var TITLE   = "The Global Object";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = new this();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "result = new this()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/global-002.binjs b/js/src/jsapi-tests/binast/parser/tester/global-002.binjs
deleted file mode 100644
index 6e10384cbdb2a51a1f96e60c2a50f32c191c152d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6254
zcmds5O>fgM7!KcG2S7+1IORArp$^0Wp{#;+1v*vTv{t(!xA9uDG^reSUH=7V{uvi8
zocI^KcAeO(-OTB_3U;be+mGM(dA}X7@hHO8V1Q9rJ)lXSqM>)w^So{nPQ9H*Yp?yj
z-AhK;3o2qy5RsHszd!f9N3bi<j~^jQP&dN6xECRc7)fFQ6{_#lJ0Wp+9_tt2+_(rU
zp#qA89*GId0rcw|A&wb2CYTDi7!8%sDWfFrSMR|!?Ru@#*lz_D`Cm|xAUalC>~9i=
zDT)N#DT>Ah-b29aM@bh&ueP?{n2;HCMUWQA8*jm>Q$)?}x&%v-`4h0$Naj)fu)QiW
z?||rg?bl!5n#8Q1$KUJYk?Y-QbeeTjZ`~mrUGgbM8({yla7%x``wjP)iF^r0>t`d1
z(-fk+%@D&wh&thNIRD=oo;4Ij>Zmx;gTJr}DqUNLV159arVLTm!D*3(5>`i7a$H6Q
zo+hOVi1x>vh}5dOgECJ5YeFI4e1SxaX(wqWebZ_pjr@T4HbQ)d#E4FnULH>}khUQW
zL+Xt1G4m+t4^-xqxrhU8s*7}zt^m@3h*hU(uAr|J%>CZt6%NuB#A=Q_%k}xE<)VK-
zx8DWUAjrp&C9rfKaZE}a?h_&r4i{TueKqnANMi)hyiHcqaPS<3&w6;on;}#8C8&G`
zh^@rWL47u$$;5)4JK%NfJ-9<by|I?IB}nCP2PjQf?4KPvRrN(Q)lt$r@dhXkBj{4I
zj#?LZhwqp>RM?3hf+ri!tm=S*;+udnS-P#4e}t;uk9i$a0A&ivw(@XYCx^W1ns3TA
z5uE`^HBEqkT<ttMq@c$4ENXN$^kJw7N<ULWtT(7dXq;j}<Ot@X;o{j!KkC4mFsb4^
z(?Lfm?N6J~IB-`zH`yr?ubDqNkX)2%GRCuCo%#Qcvl6wcTo~>qdOqRKm58at8&Te&
zvS}WbI)4tPaqxc!l=~nMOJ<#n8BCdJ7yhm$QRvBqt2O&>Vm5nB!C?!YGt_h;E`0&}
z_}=VYVV;heWQzpXxn9y&TX>>Qimb7!afsW5k99SaV$&u<v3HQDZgcH*MI6lSJYZbG
z{PTZ6IyUu>f&AHw;BP}0O45y&rm1w}IO1~K`y0^K;)!npX6~#5J6QdK<Yq&46qiSx
zMR6OVgPcXxrliV6J(V1`G9j~H{RS1;rD}e;(%`@dk8$So!XuT^m9VE(nDq+M>Ibl>
zc-u}39*yOi<vl>I*fW?0X*`|EwFRCkS8e{GEzQsD8fI!fmC03;VYy(hjB@dU7b|P=
F`3uh!>|6i<

diff --git a/js/src/jsapi-tests/binast/parser/tester/global-002.js b/js/src/jsapi-tests/binast/parser/tester/global-002.js
deleted file mode 100644
index 1639a34bb783..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/global-002.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          global-002
-   Corresponds To:     ecma/GlobalObject/15.1-2-n.js
-   ECMA Section:       The global object
-   Description:
-
-   The global object does not have a [[Construct]] property; it is not
-   possible to use the global object as a constructor with the new operator.
-
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "global-002";
-var VERSION = "JS1_4";
-var TITLE   = "The Global Object";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = this();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "result = this()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/hex-001.binjs b/js/src/jsapi-tests/binast/parser/tester/hex-001.binjs
deleted file mode 100644
index f210c40d6b2cccf3877e488290f3b2568060c45a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18562
zcmeHPUys{F5I6s!K>7Ct0s^(Cio3Sr0ipCzE=|RuBdsn+U!XnhIeR&CjuY%nn-l#Y
z2)+c*d=y?lm3ZQXkHE}&H(uLoXYDv47x^A8N^Fm3X6N^t@r>;zn~Yt$+dQMBzx%)+
z4SX`RUbHOhWYoW~_V&A9_rB=aqcOFbJA9v}>jZ4~w~l4K1$#Bs!ygjgAtx@qOKq3<
zggGORi|R+;1MA%J`f*v$LCy>FWQ}|-%IRB<=dhUo_4NCF>M`fkp*|Pqkzu5Cz<kFW
z?7jx4>2=yi`}e!e9r0UpM+i}6_4xh=4x>JCxwt39ouuSl1$l>b(3y_GInz&X-n^9-
zE5+|{$2G-SUxFi_5I?=UszphM{sFRA=+K9q!(LSmeHB#iw7+Q`-%fjG^^Uv(UR;qQ
zUjf69_KyxaX}i^kFpSI3L0TA>jWJ;m#9q)~XM{EEk;jPRHNK)##|B(FL*jM<n~Z6X
z{y3qYO@p)o3pgH-;nN@hCg?H3=nxRfJxXW4YoXjGt{WZ7kFen<8UavsiUIK70EYyO
z`0R)VEXP72R+S#<v4{ysslo)}4<_h{Kx?{zF~~Ztem`8`HVJfV#>wU{I4e?KjHSEu
zX=D;7)vEMD@P<mIJ<Rp#!VW1s8HO|-*GkJ3tSUoPT{uI*?}K2EK5c}WU%&SK^s`&n
zw$f)RAv#0n<w)v6Q2CCXnX|x5`1|)uZN5t!jC;y_uXAn7_sNA4MQA8>IlQB&UeS^#
zB0#5Zr0J!D@ZW0&;rp=CWg(0l*wQ8TurkuEoFRrk0Le)V->wM6Sz4Dsv5BYz64BSO
z(i6VJ->PA}f@R-q9M`GX8)T*?c~SHZM79d!Rz(o5E)Ty98e)NvUmmO{hL>M`Z8n6T
zuURTy{(6>3am#|RN$NB#7VuIVF|4UXRD){}^TwdADy!>h-U>CiRG)iEyl7$dc$!W{
z2^v;|+7Ke|CKB=EX+@bB^XGi%8ER=JY%_5@f7ugJuwgj<vrfkUUp-x6GBy#lnFyZW
z%v>3Q@%m`7{yI`IE8JSYH}Pzo5~>43lmt`0F$@rgLG~0<O=<>t*tli>p^jG!PJoHt
zrvo}2r}J?^U9W(sfceK2iNgVa7y>P<+M7bPs^p>9T<Q(j*}|$}RS%<Os!5Cm{r@&d
z8WLuo(cqY1qdTpeK&C2q&mGz4QF|GAEq{dWePUUtbZj`Ye;OBon6hAK7x3wve(rrR
z8aRO7s3^B^xC|qE7{SBX+@+_?@}0q1bTmX4PQy{hXU`(*V&*s=@zoZ80hxF1=w-I!
zQ$0Mr(dg;!h$+V5VWX2DsLiagk5;ma*{njfV6~t{+M-ixN0!TiOMdbu_XF51)jl`S
zG#A8)JfS+FJ8@mvc7s#T93_>KpXxDtOIUgX6AfUeYH4bj*21D#{Rn`HaTmjC6q6BV
zacv<7h?)1y-KyecQDERgq-Pim<BS`}!s%G#F?bbX7110srtG4l!8f84sfJz-kp^xp
zl8_BAT`}=(BVSyPd?zDSeyYAS&@!JQgfLa6p{lsTnsInZEeoQ&ELiH4!S8j;tkV)H
zBl%SmEr*m%eB~}4h>97#$ym^pMamt7+C#*tqzE-YFDt?RS`(~tQ>g)UT@Hesd-0=-
zVMCIA9Z7aO>rzN3*ubr(S6Ai8vZm(URaf&1uDJ{&1Gc}c)cbQyy*2fUrx^^X7whJ&
z?Tprugp6927@*Lw8C4VStb`20meiWIQ5IWr8AKb*yT8=DTk~!?-W^YJ9>^%jySY6O
zRaVWso5sAkVPwF(_eOry#tri~JZH$~FOzW}o?Xfw=cs{I@{zsYp$JLM1(LF=dj?XB
zx6-{w)s)28J-2%k-oY=DxY4tXi*$#Zk>aYt23Z;j!pQh?1Yw{-!3L;-#JtP=S?MAC
zq`K={9@f#79-nZ`#)k4KwIomA801Dq$KOEN+y#)@s#+GFs~*ECQc#Mlj6jY%(KVmd
z`~-_z&uZlJ>5FhiM#wHfqyY-*h9}a<)^`z)OX$l_l>!VLT9{T0n*+!ZkIb~(^ND><
zmvpB>^;x5^$I9DRcZ%1sQ*0Cf8HKa>Sp}*3st^FptZa~gmY-S2Aksn^Q1*s51k!#N
z-r<pWptu41@$@c=O}!cMCrahH=cv6371r2%q~weh2!C#qG0cFqtMU){?makOKFODN
zzol5X%$rrjb}Va?Zxc|~JoOqEu?;WX5--wFj!M0&L~Kj<9Tjnj-f(P7?6OmA(G}!k
zQx1=dJuseAV|zt#@~%*^DdPnfVr%B;Qf$wvN5p3IPU7y~5MccO$FNmJWah%^$>cwv
C5O*;E

diff --git a/js/src/jsapi-tests/binast/parser/tester/hex-001.js b/js/src/jsapi-tests/binast/parser/tester/hex-001.js
deleted file mode 100644
index 04c3a97b9450..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/hex-001.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          RegExp/hex-001.js
- *  ECMA Section:       15.7.3.1
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *  Positive test cases for constructing a RegExp object
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-var SECTION = "RegExp/hex-001";
-var VERSION = "ECMA_2";
-var TITLE   = "RegExp patterns that contain HexicdecimalEscapeSequences";
-
-startTest();
-
-// These examples come from 15.7.1, HexidecimalEscapeSequence
-
-AddRegExpCases( new RegExp("\x41"),  "new RegExp('\\x41')",  "A",  "A", 1, 0, ["A"] );
-AddRegExpCases( new RegExp("\x412"),"new RegExp('\\x412')", "A2", "A2", 1, 0, ["A2"] );
-
-AddRegExpCases( new RegExp("A"),  "new RegExp('A')",  "\x41",  "\\x41",  1, 0, ["A"] );
-AddRegExpCases( new RegExp("A"),  "new RegExp('A')",  "\x412", "\\x412", 1, 0, ["A"] );
-AddRegExpCases( new RegExp("^x"), "new RegExp('^x')", "x412",  "x412",   1, 0, ["x"]);
-AddRegExpCases( new RegExp("A"),  "new RegExp('A')",  "A2",    "A2",     1, 0, ["A"] );
-
-test();
-
-function AddRegExpCases(
-  regexp, str_regexp, pattern, str_pattern, length, index, matches_array ) {
-
-  // prevent a runtime error
-
-  if ( regexp.exec(pattern) == null || matches_array == null ) {
-    AddTestCase(
-      str_regexp + ".exec(" + pattern +")",
-      matches_array,
-      regexp.exec(pattern) );
-
-    return;
-  }
-
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").length",
-    length,
-    regexp.exec(pattern).length );
-
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").index",
-    index,
-    regexp.exec(pattern).index );
-
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").input",
-    pattern,
-    regexp.exec(pattern).input );
-
-  for ( var matches = 0; matches < matches_array.length; matches++ ) {
-    AddTestCase(
-      str_regexp + ".exec(" + str_pattern +")[" + matches +"]",
-      matches_array[matches],
-      regexp.exec(pattern)[matches] );
-  }
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/if-001.binjs b/js/src/jsapi-tests/binast/parser/tester/if-001.binjs
deleted file mode 100644
index da9cb6cb563fde67bd6e9a6a0d84b8e797b46de4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5066
zcmdT|-EPw`7&ZSOxPTWxz61g4Htk}XLZ!7-P_z}aX1hgh<F?kkq}a~JUWMo2W%#+{
zCAj2s>c(E3by*2PT($AfvA^S!^L<XB(kZ9SU_wdMd@qu*AjjxBLTHdgXQ<Wfz3p%J
zhsl(ppplIUIFqXR>k&c^U{v5vKO};Y0jIC%kP|@^OX3VFvd<D7u{b)9^&N1oU51s2
z42ngF#Z2V@?(*G;#)^#?6&YMij_szU5-c7!@4zzsPCM+r>je$d7Bmcqi`CD@?=nRN
z;ThZs;b|e>C=oB#*4BNzIc_6kEHKO6fGwO5;SYD0Uy;dg^)h+b+3#1y<Zak`r@goH
zVZ&#pej<O?N8~M7D(r^49Y1bY5hVo)uO$j66tfY=QV~Uu;hpf2>u2;weT?3NrCJBC
zdk1^1&b}Y}3an~zu5WH_ZB#4H&ZnuMQi4tP=SP)U4b9sNeXdP7w^OqjLujJbo!k&h
zxS}Qu#3EEk<ub7tSQp*y<4;1+`No7m#5mQOm4%^~2<9PRoeD7SH;~b&2$S7p?290?
z<j;_Gyu{ODF%f4rE~E_`@*m_g$U&Tr6cTJau_?&-x(0e?7jjAZ3y>v<s5;l_0I>})
zw~zu=l-S)8+slz>c{6`3SZKvO`2|Ap4t^1<nu<d&Lwwd;dGtW=f(_@z229AczZiRc
zr9{mX4gN!lzSgHAoq!-!q`bhMT`85U5;WYDNJ%4~_FQsTuUfk!n*_9_D@Z43n8cEP
zOu^D~Rl7Uhf&4d)wd1d5xi4)5E^G-0D)DBPL@5yOoJDs}EuIXI&NH<9k`=-hJ)5#L
zStvb-E-xDX9nTeO_c6peB8<~$8)JfB;sKVEB;^qnRHY)uYgQ5SQ}BLg+CFzU&P^9q
z$hGQCHIv-AD;`OYp4yq&?Y62K=q?1HYq>U&)Mq0LegK-espE75DWUhOtBMBf0WK>~
z%uzmlj!!34P<SM91ZPX&{~%El3?4!_R!PzMx-nE>fi7GLN|p)SB<w{Mxhq%=T<L|b
z{1%|qpdH&6%;N4%P;L<Jha&Apvu7x&X5WHn)Pt`vwx-V{xCsOAYYCbP`ht6#=`9qV
y=_@EEO;7Qg;6QrcFif8g!l~PwR>$p4Ymop<*9BKA)9X`iIxe}y%<OC7SbhV<pJJ&1

diff --git a/js/src/jsapi-tests/binast/parser/tester/if-001.js b/js/src/jsapi-tests/binast/parser/tester/if-001.js
deleted file mode 100644
index ffc621a32c5d..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/if-001.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          if-001.js
- *  ECMA Section:
- *  Description:        The if statement
- *
- *  Verify that assignment in the if expression is evaluated correctly.
- *  Verifies the fix for bug http://scopus/bugsplat/show_bug.cgi?id=148822.
- *
- *  Author:             christine@netscape.com
- *  Date:               28 August 1998
- */
-var SECTION = "for-001";
-var VERSION = "ECMA_2";
-var TITLE   = "The if  statement";
-var BUGNUMBER="148822";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var a = 0;
-var b = 0;
-var result = "passed";
-
-if ( a = b ) {
-  result = "failed:  a = b should return 0";
-}
-
-new TestCase(
-  SECTION,
-  "if ( a = b ), where a and b are both equal to 0",
-  "passed",
-  result );
-
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-001.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-001.binjs
deleted file mode 100644
index 1f10b0947393b9930cfc8473d22aac10e1c81373..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4242
zcmd^C%We}f6m@x&#{wa-WiiX5E+VmnArc9Z8Wd8*MBO4M<D`a(C-OKA{T03osfay$
zK7nh;89TAlm}DA(SdQ&EzW4at<Lg*VCmE^7=LDzq_dFkQJVv(=Lj63wM2&X$ZSo=+
z<P(D8npzWQv=H_0j}UqQt77~2Gt4ROXXFhTWSC<?bEcqD^If3Nl%>m9-vH-e6IRX@
z6ipFjRFnYr_U)7~L5GxZ1;_B%1YHPD*{FUGwn<veUi-8g*YsFi(;zlhqSkk)ARK23
z?gD312M^#NlvSVwU`<gK>*?FD_5yQvxxMd}6#fA0JyLkq`jAvb;UR?HYQB5@@wv;)
z{)zm#KO*nKR=sww({l5+6%nY!CxAv-Aut<|d>BE&LILI;we7%Z>&t|bqJXka1Quir
z<)&0e%5iU9HgT4jU)3K27$T;c?0f^NSQ-yx%0-V9!ey__P{Z2jCXQWFkp8Gsz<e~7
zL=@iC1Cn_RSThbra{>-bcrWkdBR41IBwwM#oholohWVw*3rU|@96!p)P#{i6=f*O%
z9Z8^Lvyn~G4L}AEQMEVA1S6B+b*c!6?wV>Xk>_?_etP7$rM(~e4t^D@nj2EG)^}O6
z<<TWGOK$Rq-O5=Wd?U{@f|<MVDw|u}sV3Mzs`=$Kt1S8Zkg&9_CN7AZu~N}5p!E(c
zTk5X@WLk9*9YYMzv_$>rRm8|F(&u#a>?I6Y_s!b#vxTD<t?jA~ysg-_ZuAgBHxU}1
z?T7*x4Je2JlrW8NHjsZ&%U6GimSu~yB-+#dCo=Ff5Vk`8W6jFWd>uulE#H`AEAJYm
zor<7_QQt93GO!-P(h=qlW4MCnZ(Wjh;k9XcK*h>aSSU?s@c{ICfbPb8T<a;XrRzCQ
iSE6V9cZ>z;yy5iRir?wcH7&QEb*a@88=70Mczy%!u3ozU

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-001.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-001.js
deleted file mode 100644
index 9bdc7bfe3f8b..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/instanceof-001.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          instanceof-1.js
-   ECMA Section:
-   Description:        instanceof operator
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "";
-var VERSION = "ECMA_2";
-var TITLE   = "instanceof operator";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var b = new Boolean();
-
-new TestCase( SECTION,
-              "var b = new Boolean(); b instanceof Boolean",
-              true,
-              b instanceof Boolean );
-
-new TestCase( SECTION,
-              "b instanceof Object",
-              true,
-              b instanceof Object );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-002.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-002.binjs
deleted file mode 100644
index 293e9645539ddb3fdb5b4264e834523ea11d3b48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6327
zcmeHLOOMkq5YF;go(BX7#4ShA9x8F*0HM;hRHCSK5vlfy+{SGUX<Rw(mi`s~4_8h|
zNL*Lq%uisPbz`@7+mME~3moIe=b6vnj3?vq(J;hiua8kse#2;wp@DP3ahx^{CQhZ^
zeC0p&J9LO0uavCuLK5@x={?7}39CGP`!Qk!wL|;@cS6JvCp1c+0`(m`A4n9;Vtoai
zy;WG0B~T=ANJMxFpdVikaKuTMV3xo|XrPRaIU`Z8d<Bm2Yt>f$sOgpDm{*b@I+mZT
zZxD_d3KO^!6pjo$fCE$Jfu?|^gep%?Uxc+Mh?&dvb8}Mo9k4e@;c@M)UlfJ=V0x|k
z`taRjlbOvE`D1fLUWTJu^;V;1`mHM>qZ025v_5vLC=A^yjX-px4yP8mtwCz-<B;Jv
zhPd`Q;&=e@mdFmL<JQ0wHmR-2jt&fA6;8Ut8N&D)I2&`scnineq%ZYQ!s_VCj&)oR
z2~xU%SZ^eVh^?+?aOM_ZjTvN`mym)nYtaVnnLZ_{<P*fW5#|*VAvRHdIU><O!iEG4
zNi)P<?l98ptDGtGkpMbS2k9jJ0muwQ6rG%fgRXLLnJO|^w<KIs<g<LAep=+0Gr#ZK
zE`A=Xm?u)O);3ww<<Z1rO>Sbtdf_ZCzCvk;QDh!G&t{HCRT=wRF+b~Oks*H-92Tjo
ziehYfoT%t0(0U1$%@kM}WLk6(9e@o`wYY8fxf|iJEAQ#yqh~Ng;F&>D2h;9!-1J5l
zj@-PktlG2IVtKRCbue97s4UYh%D`xbfXIN7P2;N*$a&QAw;j>)9T3EfXph?OamP|X
z=nDCVH7iQ<MHHoJ`R|nMmmQJp?Rm)_GKMB9mrbu>iDCgEElsV<bJmYLm0m@4wt$+c
z&$4hxKP6>4bLTO+e%=wK-iI52e@?t^QLs(9=F9c}U;m|*?CFjO^Z_VKUa+pwMGu^w
z7xL+1%XRD0ic|M4gMPPL2^8Kx5<gZvQ|m}R8aiEiPaLEzd*tvle%AKJK@%F!svDHl
zM^9kk4Olzv1zVmg*_E;0nw+!Ug0{_QY|A-I=R(fd|3fuMqtPqpgx^||K#neG%gI@j
NbUCr20cI^Qe*t;C38Vl3

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-002.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-002.js
deleted file mode 100644
index 6b2bb7f4f690..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/instanceof-002.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:
-   ECMA Section:
-   Description:        Call Objects
-
-
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "";
-var VERSION = "ECMA_2";
-var TITLE   = "The Call Constructor";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var b = new Boolean();
-
-new TestCase( SECTION,
-	      "var b = new Boolean(); b instanceof Boolean",
-	      true,
-	      b instanceof Boolean );
-
-new TestCase( SECTION,
-	      "b instanceof Object",
-	      true,
-	      b instanceof Object );
-
-new TestCase( SECTION,
-	      "b instanceof Array",
-	      false,
-	      b instanceof Array );
-
-new TestCase( SECTION,
-	      "true instanceof Boolean",
-	      false,
-	      true instanceof Boolean );
-
-new TestCase( SECTION,
-	      "Boolean instanceof Object",
-	      true,
-	      Boolean instanceof Object );
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.binjs
deleted file mode 100644
index 8a2e95ec8461fe1a9af1a92673cd006449f09121..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21454
zcmeHPPjBNy6nFW%fRMPe5>ZdPl+rGHTZKTI1_&x?wFxV3k(*3Xv#uT4PP^r!AaUg*
zaO8s^j$F8Lgd6WUGoI(nIGH$3l%~EUO2+g2X5M?h_nYVORHO08Wwq)hv-`F4z#j(o
zmGzosSr>l));eyszHL8i_xusFst55kRo4ll+An98^$@PA((W(pz_Bk}cEWnD9oUiM
zd$Fj#{2f{^9j~93^%uz5nJ3E+Vo^@tay%zW1kl?z`^<}+fy07WoM&H2rNbz2ykYHa
zxJ|oJ?=;U^)dT)t^?(bZvfA<Wr%uEI+l|Ft+wNGA_W{UryfCu89`gtLhlfx1Jyo!{
z!9hHARes;sq3^XFsFzbca!%<VAbX8d`l9i?UDTAm1*$jd-yL;7Q)g!V6Zz-*Ch|?V
zRj1iGZK&g>9%1O2?}9YxnX1Sorn2#B6tFOa=x#@L#I7LfVrOH?|Jv}Z+pa6S#yxuQ
z7n4CnhiMSZ@4yft^n$3v!f3__xmYS)>aola5GMH$>|i*?i3qhrHy8{e$xQ%w^9=wo
z3p)O(KUBvQ1IW)1*-CI9JDwff%5hl;F96#B!vLKw8$?#%3@;^eauh;Ad-6tfl2#zn
zU?Pf!XdGZg4lwb1jaL|GHzP<B$rF@Merj&?)!6G{cBF~&4bT&^+XxcpRhXT9seugi
zMHp!E1a&r0ry<t$Z@38EC6&w#gg<~j{>6{17j>Vgq8HSZ2-6_{g2FI~033m4s$M(`
zQ;El}-+L*MU_Sl%7yJOPO3j!IJ}C;l4;0~esRf54fYPCd;2{Mp61|_xA<{7!*biq3
zG#k5`S)!uy0zp;|qOuLtB%ZNqH=7Px@tbNat+bGtTkJ;mjGd>b)PeJZDX?ybO!|UQ
zJ&y1v5Z(wdDStJXdSfuo>mut-KP%AEkdEOvAF0Nneq~^e*^wYDPK6q(_dclixFY#t
zaS4;Ctbui%$_Dc=3*PDI4Mk;PAkP#+$>e*I;OUL%IvJ)i!TF>Mzj)a`>mv?`7GE>(
zsp_-w=v&Z?KD{WQAb*Ni(yH7d^75}BUtuy5b{7Kd73Jj<pXPZa5fch!jRK_W(QV>9
z)LA;0PAJC#om3yAmm4_#EK6v-wHS#a9;mKzSfzRTHBlWx?lfc`uHRsxpotcZjask-
z4V+$P)hc!y>%o^v#Y>n&e3xdKS3tyc7WtE`YG{;|@;;FeR9#}2z5#U=m^S1DA4A`O
zMdQG$>^_22u)7xl2z@G@a&I?b43BqJ1+uaycQPH^lWH^is;D>%_Y~jMP4i^lZ9p6Y
zJkCzxbOH?pVKrT2V=jpbEKvwhoK8r-jBjWcJx8OrHxPuC)NU6DNaT0BW>z+kddINR
zg-OVZl^;Rh1S>gEV#EMMPS{-zfTT7QFu(eOAqNf3T5Xeg|1%){8(xpghXN(<hsV+>
zG~M!L+3I+|mCgH0F2*-N<O@=RT$l~36y^;D70tzFcm~z(e$i%42Bec=U@Bx)F{g@d
zN2c64wOB+pvfLx`>?MF$OHF^%F|M6;XddsBti$XXe#TS4e1KN6j*@lYb~&X`NYTM;
zo&V1lijV|y;@D1+yFAsLJbmt0D$~F!HKai*!#q+n>zLsgRJ+ntWP`4OsWyjoXc$xy
z`rN|eH#PX$S;wJT@!Dk8@kv?hh&Q4e#6tOuGuh-$BWzPhVF9%c$V-`zi3GTm)r~b(
zH#9&>-OeCjm*N>FzCiW4U(8~8<7^JI&=A@r*tvzpZ))(hGmE3U#Vmd+cTbhfVk^o`
zd6<RawiqnRYT{bpjrgXxvki%+_>$lq+aB-}*gfy|fPLtjY!48-tSkPYqTg1PW3xcX
zao5CgHK9*K-GJk64vo@KLIGdX-*k-I0A~hv;?K^OH~3<Un$@MDwbS3@lKvL_Qs1Uj
zZpy;i))m$kz#UCoZ+pHd>2FDY<>T=C%Z4<ePbb5WR+&FaE>UULTY-kt4Xe!M?UrNN
z^8KtMN#IO`f%D1|2d5-Yal*+-O-P!reW#yL$eq+ik*UomaB(7FIu%X-rvAEFOBn-m
zz6S$6X|(Ilo9BfcVuj~;$y-;Pu;Teq#jXtaDJ6*sGI#Ra=_$oJRO5$pI2EjMq7Ib~
z%@B-`9J3(s16A4ze6gNBRtevNDC%GdtfJ06Jmz<}NO|S@*!Nv#dzo*d?j){6=Qm%k
z0<1FGh_-s;6tkf>GCJ;RPDK#?WU_M(j+mRgR>b-(cx5T%f7k61y!$Es6R%>%GxZ;I
z{t)_$ca<|iiDS7w!bqd2Ovr%Yjl2d!3RUR_@*ptXK=vM`8_0nM=>}5gNjH$x$s4lb
zf;VdqP2p{b4O54_@fMsU^%NH(QaNOgw_#$|yu8O-bw_3JrmTk~yjd+<@dngXJ@!d$
zRBe#KA$V8aaYVccJBI2}Z@d*XO$P;0MtxhGH)?7ayk*W=Y!kGIKgV!qyt{}5oSIB$
Rp5+%at*@IH9^O-!^*>m|T~Yu5

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.js
deleted file mode 100644
index 1b3937ac8ab2..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/instanceof-003-n.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          instanceof-001.js
- *  ECMA Section:       11.8.6
- *  Description:
- *
- *  RelationalExpression instanceof Identifier
- *
- *  Author:             christine@netscape.com
- *  Date:               2 September 1998
- */
-var SECTION = "instanceof-003-n";
-var VERSION = "ECMA_2";
-var TITLE   = "instanceof"
-
-  startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-function InstanceOf( object_1, object_2, expect ) {
-
-  result = object_1 instanceof object_2;
-
-  new TestCase(
-    SECTION,
-    "(" + object_1 + ") instanceof " + object_2,
-    expect,
-    result );
-}
-
-function Gen3(value) {
-  this.value = value;
-  this.generation = 3;
-  this.toString = new Function ( "return \"(Gen\"+this.generation+\" instance)\"" );
-}
-Gen3.name = 3;
-Gen3.__proto__.toString = new Function( "return \"(\"+this.name+\" object)\"");
-
-function Gen2(value) {
-  this.value = value;
-  this.generation = 2;
-}
-Gen2.name = 2;
-Gen2.prototype = new Gen3();
-
-function Gen1(value) {
-  this.value = value;
-  this.generation = 1;
-}
-Gen1.name = 1;
-Gen1.prototype = new Gen2();
-
-function Gen0(value) {
-  this.value = value;
-  this.generation = 0;
-}
-Gen0.name = 0;
-Gen0.prototype = new Gen1();
-
-
-function GenA(value) {
-  this.value = value;
-  this.generation = "A";
-  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
-
-}
-GenA.prototype = new Gen0();
-GenA.name = "A";
-
-function GenB(value) {
-  this.value = value;
-  this.generation = "B";
-  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
-}
-GenB.name = "B"
-  GenB.prototype = void 0;
-
-// Identifier is not a function
-DESCRIPTION = "Identifier is not a function";
-EXPECTED = "error";
-
-InstanceOf( true, true, "error" );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-003.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-003.binjs
deleted file mode 100644
index 7c92d661ec149be7ee8db05d540e1534c00b3580..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6082
zcmdT|OK;Oa5H|0Z;DP{&Q;r}6sVEPLx{;bRML}(fnzUE6i8qO<<BisviU@J!hwvx(
zF&shM`3Eq&S$oH|oj4Dr^px1%{dVS?nQv#;7Q=x@OLmVEr}Un)E+>8KqGeev=8UXz
zt^Tg@rqN~tYS~3K#`fGml>XeatlKck#?y}ocS*~m+qCTwPK3*R1?8CMz&dt)Cyw<K
za4t;4Vq8JFj^+BUhyd{NHHZ4b?YNXHIG^;5(ShKu-z{B(Wg68=v$kKii~5~i)F2qE
zp~mmJf^y<1xD(<H6L@z3&-DXA{5EBsr)z8LN!Sp+sED)ms+VBq3E|1%*orv`{Q=l3
zB=o3y&{!6sSHbjZWpC@l^CUB?C-V2|h`a(zHEYe?YSM3<5jpenE})sbEI|1}IkJ>&
zTRo>MOwJp?LizA*{cx{bJy;5_mjUthtM!*jumy;$ej0EZ1fZ4;K?LoCimCFY(fd@n
zs}RpKQ`L+%yrM>=aN^_;M@bh*85d0&hzTBQSd6|i^xIPIvGPlW1G&!JNAUa{)=9V>
z#*%hnoU+H-$8i?Zwy@X~w8g;^5!F#Z_25P4RQm%lGNz?1g_kgqHFKn<Pf3a`$fK?=
zQ^){VlDbd=ERS}C#ocbtY@&KglJJ{`Uu;c|_*{qCqDKdui77$aZ+)a~Y#+?bq&*A+
zw#K;jKX9|nurIQ8V#+}ar~us+qsTYxLk>oBWqb}CS=TBoVl<#8z9F;W?~K+>j&}$e
z{$lVs!*@#WB+**$2=5MM$_Mi@eG9O*97pP2g#;-asn*ShC1p%vJ#X3d2_G4kW+}EO
zCK#BXoO^r;OzCLdEr2pUdR*8neEzag2&+&(!l!3Z_~Bjnd81&KPYY8{Gai5$A!Gsd
z9I0BJwoaKbj}kxZwE->)W9slZ3BL)r#ysOXW<EzTO-}n6!7?j6bX=bqqDPI7mznd7
z@Ezz_(HTK5v(znN_JdTDqpepeM@u#eR*(3O2gk+mXp4D0)k>&I6OY7SVMu~eBMdWb
zRcEes-@ucE*5y=$`!e2Id>EF5DM^qMUY?XF=V_;zSp3dbCvqfx4z<ZZiS%Gx3DKkW
zU#mupjXAp93K8vI#UsOjs$3Yrolbvg{k(K7Wv7i99q;C+m*6h|mAJ7T`n;ClUvT7n
zm*C<Bow5HdDZ%m4P^QiJd6$auF_t=YxI#2dr7E_EFixddFuqZg|8W{;RHRO8oZZXG
zOS%4H$9{RIA#$Dgr_gRFgq~yqg)d;B?6||L(9G^zQ=D;)qrWD4DE&V5s#kwYxoktT
i68D+<oAeKDVft;x=?Z-fl6NZlYm$2XA*0JoO|E}BW3`(A

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-003.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-003.js
deleted file mode 100644
index 1021914e9577..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/instanceof-003.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          instanceof-003.js
-   ECMA Section:
-   Description:        http://bugzilla.mozilla.org/show_bug.cgi?id=7635
-
-   js> function Foo() {}
-   js> theproto = {};
-   [object Object]
-   js> Foo.prototype = theproto
-   [object Object]
-   js> theproto instanceof Foo
-   true
-
-   I think this should be 'false'
-
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-   Modified to conform to ECMA3
-   https://bugzilla.mozilla.org/show_bug.cgi?id=281606
-*/
-var SECTION = "instanceof-003";
-var VERSION = "ECMA_2";
-var TITLE   = "instanceof operator";
-var BUGNUMBER ="7635";
-
-startTest();
-
-function Foo() {};
-theproto = {};
-Foo.prototype = theproto;
-
-AddTestCase(
-  "function Foo() = {}; theproto = {}; Foo.prototype = theproto; " +
-  "theproto instanceof Foo",
-  false,
-  theproto instanceof Foo );
-
-
-var o = {};
-
-// https://bugzilla.mozilla.org/show_bug.cgi?id=281606
-try
-{
-  AddTestCase(
-    "o = {}; o instanceof o",
-    "error",
-    o instanceof o );
-}
-catch(e)
-{
-  AddTestCase(
-    "o = {}; o instanceof o",
-    "error",
-    "error" );
-}
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.binjs
deleted file mode 100644
index 1d16ce0406f3c64d759a004b04af2cb0b8bdde05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21635
zcmeHP&2r;J5LWnIps3=)jVfF@?Gi$Ef#Q%dfy6OjDtJ@tuy9K$_Sg}tNG?fEHarRs
zz$5T56h|)HIC7+WJfmrOM)p{iU5=wmRL*ExJ=5J^f72RGJsAysc2K`$ZtvhU3I~yU
z<-FoJ&PCX}b&gu??>qaQZa8F4eUIN$_q{kd_~O)YK7hOGwEJ^6^4trb9kZ_QMsDJT
z0T<O%zhmcx7xc2S{suW)vt)%47v=RFFYuC70DXL`$AZM`do1GO0{2QO9Vd|&3=ZCe
z$8?&Fv)0pgeNX(az9)oGSsi}=iI=d*^|`of*B@!}-UE4F5GQWXWnq8!@#D{T16{Cu
zz#gBvx_IuZ(D&Mn^xLT(1*h~+kiEhwecpW5DQimK0M(m~9}dqy)n{h)6ZzNbCh~Q7
z)LHB7q^XaadW5BCz75ipXX+vsn9AnMVZ`DXqPvs03A=)*<Icv?{~N=z;rhPn%6oL-
zUrYrR9i~MvzXd~t(2J5Y7AI3iD8y3fN{>Z`fG{bB;6{THPDE@Ry2W4+Np2#*o9_UK
zS#%bjgads{96)}9$ku}U$P3))R*lO+cmdc37zXI{SwC?iZ*ZxQQ=kwE+EEXple7ep
z786l6MB@N!YJjQV8@$3oyD34MN*<$p`qS{BZ$?2Evm;HEuYsPB-G-1juj2gdOATb9
zFTy}eB&er-eHyr~|G-V?E}3L*A^ZXK2`_$O-Q@g<E_zN)i7*55&nXO(2*43&rt2lL
zFqL@Zhus$n31-uu|G*FMuFQ<7;8UW|`#=$amqu_n1SlN@2p&qnJkk558X_H&h5c}r
zK(mo=m?bKzC=lf3AS&BJP2w5LcC*Q#mA|RR%1U#Yxy^1=PwqTrr4F1QOo0tIX37_&
z>O8`qKzJj-Wc<})>aD@JsEe#N{VYLCOFD+*e5f0T`jv$_rbmLbI2CHC-n*dQqnhH2
z<t0p_vH{jjDqGCMG<c_@w-l9!fg)2#CDZFT!P5uPbuvt4it}j~ar2^mR!1BVExu*J
zXS&bw(YK))eR^I%LH@*7(z@I-^78K>Ut=-~cIN`@CFSMgkmh+L5n~GF3?roL$!+R9
z)LG6hy;zL{I_W+}Z?|y#X_hc}YdI2SJWyTLuqyNP4rFx*xzm6JxPF6$f+1QAHfqBX
zH1fK+RV(f`&V#ShikCEpyjEtJRY1gamW1Q1YH5_E@;;dmbX_=1-+;OrOj~k-kDzbF
zl2H`YwjV+&*xpG1gg#MDxwD-zhDY1F0(sd}IGG9VNwpb$RaTs(d&(<y(;}I76A;G&
zkMmPFoj^-LSWP$BSV*D*D-;40rxQ{v<6GLr%+cuMEd*gD_52(NND`i(+gaH{>K(&M
zA10wFR(=S5Q>+v~i4g-3Ic9eS0Fv5J!u;|Jh5|GUYqfRe{rf=r*SsEA3<WCQ53i*&
zXu9FcvgPr9C!hCMTuf|$C>Ep^xiBAADa>06Dw~T<@eHcn{i4l=3`i%#!c@qrIHyW(
zhql}~vsgqnve+x~{3U=~OHE$s7+20Z46k=8)?xP!Kj$rAF+i(WN5wjDyPQ@ir08I`
z&j0r-O-KqkJhn6Bu1GbfNT2(a$_%hd4QY|eFpreYI;MCA)vhuX*`RA-s`X(V1_qUe
zzOb<TO%1+s*6~=cc&#(*__(Td@Qvseu~5C^OgFjH2wN9YSVFA>@>1?=A_*>4bz?=<
z4Fix;x3dV?g?NUIFHn8%7qeL0IP1eK41_ifc41-pn;LxO%;NBFF^fN{-BT5_*obmd
z5oTezEe4CShPak^Bd-*9HX+fJUlP1y+XH?DyBFOaunT?D?E!L^buH}I%-gC8Y!;|E
z?ut0BA@pgeTX5X<p-~1(DB)}JO2@bfaAsjA@$PJKgU`39Sza1iIsHAV=x@m%^{q?g
zrYfv$Tw!ev+%d%Urss=_{#Nu?y$-*>Y{(G$bTTYymHn&a3YDgP6=*r#u*zKAZUvSt
zKTbQ61kOb0doLY%a7y|XCmx^Fgrxa8^m-|U+{$benb>>+H>Uz7Q_<va>aXjyl(8`9
zJ224WW~cG2bz0gXR(Ot=dUVZ;YeAUQ+*)6pQj(e=cPG!Co>HtsHGe*ZQ^A_Y`cUc6
zEWrrLF^i%w(xolI7aQ4QmGCQwvJRHOD(cL`V}637nD)u_@(#Pe6Df|u&}XjUqgcLe
zV;}C&3U#7O?x(R^%D2b6(xj!R{U?OLb2QMQx0m29SzSyz6-2NJufh3Re5Y|@bq?2z
zQYAX@cuOCgeK-EziS^p>EmbW3-EfESQL6l({6>_|)cfFw{8U1bM2yZN+H#Rpw3}gp
zG|F;{igM8?3P+^6mTe$!FS89~!&J6`oWhW8AjPR{1IhQIAupIkv+<-C(T0FFaWb7~
z!Aa7Oo*^Q&lL18=vI)Z%hoaSVzK3Yad$S{&^;(-~Kuz_ts`N(P206q>bTyr!B$}{e
zte;OOT2a$%zz}8hPs~N5q3|MFW*i_lMiTya1W(4N%cBNxYI2=<nqN${zG-4a=t~?E
G*Z%=>K$S%R

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.js
deleted file mode 100644
index 18de1c8da079..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/instanceof-004-n.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          instanceof-001.js
- *  ECMA Section:       11.8.6
- *  Description:
- *
- *  RelationalExpression instanceof Identifier
- *
- *  Author:             christine@netscape.com
- *  Date:               2 September 1998
- */
-var SECTION = "instanceof-004-n";
-var VERSION = "ECMA_2";
-var TITLE   = "instanceof"
-
-  startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-function InstanceOf( object_1, object_2, expect ) {
-  result = object_1 instanceof object_2;
-
-  new TestCase(
-    SECTION,
-    "(" + object_1 + ") instanceof " + object_2,
-    expect,
-    result );
-}
-
-function Gen3(value) {
-  this.value = value;
-  this.generation = 3;
-  this.toString = new Function ( "return \"(Gen\"+this.generation+\" instance)\"" );
-}
-Gen3.name = 3;
-Gen3.__proto__.toString = new Function( "return \"(\"+this.name+\" object)\"");
-
-function Gen2(value) {
-  this.value = value;
-  this.generation = 2;
-}
-Gen2.name = 2;
-Gen2.prototype = new Gen3();
-
-function Gen1(value) {
-  this.value = value;
-  this.generation = 1;
-}
-Gen1.name = 1;
-Gen1.prototype = new Gen2();
-
-function Gen0(value) {
-  this.value = value;
-  this.generation = 0;
-}
-Gen0.name = 0;
-Gen0.prototype = new Gen1();
-
-
-function GenA(value) {
-  this.value = value;
-  this.generation = "A";
-  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
-
-}
-GenA.prototype = new Gen0();
-GenA.name = "A";
-
-function GenB(value) {
-  this.value = value;
-  this.generation = "B";
-  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
-}
-GenB.name = "B"
-  GenB.prototype = void 0;
-
-// Identifier is not a function
-
-DESCRIPTION = "Identifier is not a function";
-EXPECTED = "error";
-
-InstanceOf( new Boolean(true), false, "error" );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.binjs
deleted file mode 100644
index 170b78ef4b53fa652b295173d353fe2dc986b9cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21583
zcmeHP&2r;J5Z3a$KvBh&f&y1gyJSPMP+Yc5AaM+s3f|P(Y;kib_Sg}tNG?fEHarRs
zz$5T56h|)HIKqu?c}COnjO4K_yBtTCsGQNXdZxR-{-!mWdNdik?67{p?7`t#;Ew|P
z(t5?RtaE>GV;#5J-*=vL`u><%_5Jvsy6c3|;YVkd^&#9<r`@01fn%S$?1c4QJFp|i
z_hL~4`8%{;INl&F>o1UVZ=Nhah($RA%ki8j5kMc`8Za+%h7Jp2ah`oCl@6o8@kWPl
z!ectkMz{5}UEk;btM79mR8}Xx|I~?CV7sxnE8CqY^4<e^ju%F@*Ju84@8IBzJx>)Z
z9<U!zU7bJoRp@(V2kPxqkAhSB2gqLIls<1h>y$O6Z-DB}#t%om&(xV&|3v<|zKMJt
z9@TAiPn+tvsYe)k=G!1mdZsFJiK%S990x26A-X$}9kEM@y4cxR@_%i3Hf-0GUE>~o
z_!pBwMTcn+%x}REA@qW%%fcvUgj_6@F7;Su2ndsW2zD@<;6#Mlp&JYak>ol6y!j4*
zm<3(`)E}v1iUH(Th-@Xej~&krZsfQugcpEqfMI}6mklE;a7GsrIXMcUpk4VOI!P-K
zX)qCGLo^PsCI^`Ky~ZmHw95(7MDi5nlb@OgeKYa;m>p@Nd=2!3>^6qPc^PJBUuqx&
zeGvv)JV8Ajs?!kb`ZwH!?vhI82Ey+{AOHMk){lCRRnZG-N`z^Ue?eiGL;#LJGgU91
zg{j12*YCfONHCxN{0n}7cco@b2A>p#-Uo_sywrlj5kTq4L-3FS7Kz?3<q+wZ4D5%q
z1e#4;%`8z-MS&nI2T|DuY7);_wVTZbt@uqfmR4HG%x!ipd&bUFR_eg{!4%lALneJe
zs2)f7V+d~qn3TU7OuaD}7j=>Krk@pPX-LO#oDWpvP`@%TM}8y-i&LS7>b(o<J*-K-
zSYE;;Dr;a}r?SC3<iR@~y`iWq4CI+YD4ATR37$TPu9IOZ6P!=F@SB(Ivp(X0Xz?xc
zK39D<9(@~{(We&$6y#6wN?Mg$Mqd66<SR@@!tO$Vy`sE);?q2jBw|XTtZ{&JJ-SJp
zhdN95!U^R#pp)uj^mYTs&$EQaTg#Cs;(_WahgF$pa44!n$el*a!}S|16g1JIu~8eA
zpn=oRtXjoxW8MEcsdx!<h-+n*c?CpFXOTb6s)j~cDen^rLDeOO>1$9|foVfd@Coz{
zSTqT|+Rg(=1v|SDfY7JXDR*}g#_(`QRUj*SawpTlJ*hUMuZoJZa8GfiZdxSsZUf>N
z;Bj^erxR!>2&?HD8*@oiV1+_};&eiaWqd=s=s6mFyn!IBr1pA1Kq9}_GqbXR)LVv?
zE=)pEto#`ICRoXV5+ep6a?0)s03@}cfce!I3^{0M)@qx~`=0>m-|%`|F%+nHKfIPs
zq3M<{%T~wxt!&<3aWTFDqF9g`<ic!Nr7&+OsBA8l;~7-DyG5Hd8IVqffvJ#H#hfa-
z8JlwF)M63Y$a1g9vzGv3Ej4?kV_ZAy(7fKMSclm={EWAN#Q?2h9Tn@q?Q%+?kfMXx
zI{%-q6d?)Z#Ic<scSWi>Mf%*WRHlJdYDj}rhIyoH){)~GRJ+PlWP`4OsWyjoXc$xy
z`rN|eH#PX$S;v7|@!Dk8@u;eG#2e8KVxfA+nQU^W5w<C$u!LF%<fY8lL;_r@>c*O?
z8yX;`Zf6j%OYsa7U!eNjEoQO2aW;opXb5c*?A*fQH#PX$nZ?oVVivzwyQeB<u@&W}
zBFw^YTMQOuHE}KQMqDZGY(t_cza)6ewg>zIb}za;U=R8x+XKWd>zY5T>9<uC*ep<S
z+%<7rP3Y55H{iINL!&g5P{7yhm5y;6;LN~I{N35|248GZv${02cKUl<(ch9k>f4mc
zO;uRiy29E5xTA^dZO<1K{jKP)d>wvw*^nmm>0}tvD)U##6)NR@6=*o!u*zKCZUvSt
zKjs}t0%sx&otKt4I3;<D6HZTRLehNYJA;Hm-b-y1nb~{-HzxvSQ_<{i>aUx%lrb>p
zJ223bW~cG2bynITR>vSyKDy?FHM=(CCzL#@B|8|gUXi}d^P`&W@h=<_LuKywxz!Vo
z)vD%CXK;2{^F$pg9hxCzA%$i^;0LO-6?kkTefSc7D^b?*6Ig4Vd&JE9P&!jS%uXMP
zQQB@-4c3VnrFN3O9M|<QCnXp{KxjUAmSFJdPB@{ZxKeEkBGruD%bDZI=)A2tB}sI_
z>DE0s<8Jz06C1R_2qFJ>!yd!Or{aI&ThMr>{)5gRK!5SEbS5ftJL-d%G>X!QjK#DE
zkV;v)fxL-KH;~Ow=>~G5Lb`zzn$iu#pLs)8$nj?FsV%$>VQ1!)Io^Vkq#h$fL@KBJ
z@it@zny&|WtM050-jwy0hBvEqGv0ujs^?Crjj9bYNDS|)I}eFBVaHHCYmT>~rs<#{
v%BY`<^F~b(g}2N(3~q`R@!ttN8J{j90jDO@ne+T2*ZR7N;o&W?ieLW+b`ysO

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.js
deleted file mode 100644
index 8f02162cabd9..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/instanceof-005-n.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          instanceof-001.js
- *  ECMA Section:       11.8.6
- *  Description:
- *
- *  RelationalExpression instanceof Identifier
- *
- *  Author:             christine@netscape.com
- *  Date:               2 September 1998
- */
-var SECTION = "instanceof-005-n";
-var VERSION = "ECMA_2";
-var TITLE   = "instanceof"
-
-  startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-function InstanceOf( object_1, object_2, expect ) {
-  result = object_1 instanceof object_2;
-
-  new TestCase(
-    SECTION,
-    "(" + object_1 + ") instanceof " + object_2,
-    expect,
-    result );
-}
-
-function Gen3(value) {
-  this.value = value;
-  this.generation = 3;
-  this.toString = new Function ( "return \"(Gen\"+this.generation+\" instance)\"" );
-}
-Gen3.name = 3;
-Gen3.__proto__.toString = new Function( "return \"(\"+this.name+\" object)\"");
-
-function Gen2(value) {
-  this.value = value;
-  this.generation = 2;
-}
-Gen2.name = 2;
-Gen2.prototype = new Gen3();
-
-function Gen1(value) {
-  this.value = value;
-  this.generation = 1;
-}
-Gen1.name = 1;
-Gen1.prototype = new Gen2();
-
-function Gen0(value) {
-  this.value = value;
-  this.generation = 0;
-}
-Gen0.name = 0;
-Gen0.prototype = new Gen1();
-
-
-function GenA(value) {
-  this.value = value;
-  this.generation = "A";
-  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
-
-}
-GenA.prototype = new Gen0();
-GenA.name = "A";
-
-function GenB(value) {
-  this.value = value;
-  this.generation = "B";
-  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
-}
-GenB.name = "B"
-  GenB.prototype = void 0;
-
-
-// Identifier is a function, prototype of Identifier is not an object
-
-DESCRIPTION = "Identifier is a function, prototype of Identifier is not an object";
-EXPECTED = "error";
-
-InstanceOf( new GenB(), GenB, "error" );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-006.binjs b/js/src/jsapi-tests/binast/parser/tester/instanceof-006.binjs
deleted file mode 100644
index 36ed72efb86a8407430d1f7ad53bb86ad9e5f2db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20918
zcmeHP&2r;J5LWnIsDk3mg;Y+vge6(_wq*>7H$bSYm%`q?x)gith*cz)Bqtjlg$LM2
z;8`e&6E|)gInq6z(X>1xc`VB=$I&G!XEd#z>F%$;X^p0lOvXNIHZGVuX#Nz1qsYB<
z-f|r0JRICO$EWQdJ5M_OaLk;>0l%l=dvVfy^UQHRg}WNG`%5?S+;g8jWqsd`+{6n5
zE^45D$IdG+7-VJr4RUto$qFMb${RRd;3cU5`uNiU3leYWv51Qc+)Jf&oJ3wQYQ7JT
z>72B>r_bAs1M$Dcfe=Dvb@=^fUcw^R=i;thf1=6z802|DoVY=sg~Nx3hmUlzQv3m*
zxQ2M@+tBmMjr7~879}V2PmsOF34M9;bEm2aeGgPWX+1mYeWlOL`X}<Q^-biv@Tl%-
z_v}O;H}wchzx)uSDZkW3E-{rSug4LKV~Fie;wJ18Vvai-OaE^S&X()@sw?l&hkr2@
zQgoOWq5J_15dtqtx-3o#MkvHm=}M1fhJYX`hTuk{2~I?89J<9|J^@+R5unWv0K+Wm
zhG*eO9}@?V-ypKJ;6C;OH@Z>dau8ksv;l+xIDIxuoX8tpDBKh%go5_fgXko!K%~V)
zR1MHLz+E-K)b9;mVWC|?kfxHSD4+f`Jm|Yg(8t_J)8sp#C*-y<q|M7XKlf4tS?G%}
za4OQ%^PxTsT-Sf#CUlofDz^}R5Bh}Xzp#GNGi1F5H6_9f$iJX4Od<eBpqV~ok%g(m
zV?XS_Qb;hL{QL)gfOlnPOa-43h295>2)s0c!x2E~C_wN~0v3thuhkIgm@Mpvvjmz=
ze8VhJQDuQ3F9%WC7HSgDShbtY2Ce)}HC9$y$johat$K3jsVa5g{9p=fxiM3|AXVoP
z{s_Vw0Vd<G7E^Bx#${b(z3FEKT3XUE9Or%AIMlB!%uyT((&AL8rFtKMdJlFLU#u=+
z5|s_GZc^D|9*W?dj^0vK9tMg`A(c$8(*#c+L|4f$l_}1rUBu1H_E{fsK(zRt1&?)~
z<)d#yGy3$RfP(yqucLLjRpjM2AYWrL3U(I)>=otZry<SrNFt^b${9yU*OQynd8o5=
zFT7Zd13KwGMsK%p{31&jytNvMG9IX|YFM>-22EKVLhdwT0j}R*p<sv>gN@p-1dY6Y
zZq16jjdSnYwB9AnA+NPr=9LdIoh9Kkt6CamrMyoj1YH*n)7PM`2Gf?D;B)93v1Aej
zyL<N`73}RN0773Xr`+F58N-7;U4gvpDV)p%_oUX0zAEd@(mmysx@noryA6nAfyenN
zoKB#nAgrYuY%C;Efi(&Niqi=xm+>v_V&-V{@fL!xlG^J50ZGDM&(6vgQg0bn`Y;J)
zvGOzMn_{H^N{kqQ$SJ!k0g%*&66RN5FchF+SgUO^?|%ZMf5Yo><xrsJ{qRycgQi=)
zEL$D#ck+3E&Bes_hjKw`kqh%-mBPHGpsKl8foD+d?iOt}WI#F@7N$a0#W_`SGq&Z<
znZ+Wqk>y^I=Pv=|T59%6$GCRZVR*e$vktp=_&IL@%K=)=I%?K|o8`1ZAw>tfb^gEK
zXhKrR;jx_|cV((MW%}H$RAzuxYDkMzhIyoF)=}UYRJ+<#WP7fKsWyjo7#LI<`ohBU
zH#PX$S;wJX@!Dk8@kL$h;M>qGVxfM=nQn2X5w<C$u!33#<fYu#L=s%;>c*O?8wMby
zZf6m&OYsaFU!eNjEoQO2aW;op7zk||?83tGH#PX$nZ?oVViv#GyQgYqu@&W}GR(qq
zTMQOu4RI~;MqVlIY(t`{z9e|dwg>zQb}zd<;34!)w+F~w*1O?w*SxK&#Abn-<F1M0
z8bY6jx&_DG92#Yygc81HuXK#t0B06<67SBIH~3<Un$@MDwbS3@n*LV&QQxLiZtB9?
z))m$kz#T(eZ+pI|>2FPc)$8!P%Z3c0Pbb5YR@uKwu2HGzt3b=?hE?YBb}O-Lc~NvE
z37m;A^j<si;FR<&PCPxQ2}$!+=nYZ|xs%x_GPC&vZcYWvrlQ&3)L%<3Wm?&zY;fm!
zRUh+X<!bJM9WS5|p?&7Mx&sFA6oBI}^qFh;5Rtzse++kM#Szg(evSyY=r)>e0g@)7
zrm^ttLcOT08BI{r%wb+TYL8M@A(LX&_zdc>{NB#Q>g1z2#UXUx=_V>TZEX652^+NG
z>y=piyXB7IGeG%2`BfgDsXw4IKLt*Nt<fZ+4GVs94Vs3v{N7cpwn<5X0096PdF7LB
zAiGSm4dm1HYy(-*XB!AeiiW&s6wSutF+>|Kk!Ftb5-m6n`gt8hq;{N|XhR4#e5NH@
zO@|_gro3{vXx0l9q5(D45BSj=bsOYl3(?hd@Qi4}j<J5ImuN*zvp!Fh(Z9<TjfT~#
kXqj{B))Wl*-w8Y!pDz8i(3y+;qR{%Li4oB&p-5c+2cFTY4FCWD

diff --git a/js/src/jsapi-tests/binast/parser/tester/instanceof-006.js b/js/src/jsapi-tests/binast/parser/tester/instanceof-006.js
deleted file mode 100644
index 9f18c4e103f9..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/instanceof-006.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          instanceof-001.js
- *  ECMA Section:       11.8.6
- *  Description:
- *
- *  RelationalExpression instanceof Identifier
- *
- *  Author:             christine@netscape.com
- *  Date:               2 September 1998
- */
-var SECTION = "instanceof-001";
-var VERSION = "ECMA_2";
-var TITLE   = "instanceof"
-
-  startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-function InstanceOf( object_1, object_2, expect ) {
-  result = object_1 instanceof object_2;
-
-  new TestCase(
-    SECTION,
-    "(" + object_1 + ") instanceof " + object_2,
-    expect,
-    result );
-}
-
-function Gen3(value) {
-  this.value = value;
-  this.generation = 3;
-  this.toString = new Function ( "return \"(Gen\"+this.generation+\" instance)\"" );
-}
-Gen3.name = 3;
-Gen3.__proto__.toString = new Function( "return \"(\"+this.name+\" object)\"");
-
-function Gen2(value) {
-  this.value = value;
-  this.generation = 2;
-}
-Gen2.name = 2;
-Gen2.prototype = new Gen3();
-
-function Gen1(value) {
-  this.value = value;
-  this.generation = 1;
-}
-Gen1.name = 1;
-Gen1.prototype = new Gen2();
-
-function Gen0(value) {
-  this.value = value;
-  this.generation = 0;
-}
-Gen0.name = 0;
-Gen0.prototype = new Gen1();
-
-
-function GenA(value) {
-  this.value = value;
-  this.generation = "A";
-  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
-
-}
-GenA.prototype = new Gen0();
-GenA.name = "A";
-
-function GenB(value) {
-  this.value = value;
-  this.generation = "B";
-  this.toString = new Function ( "return \"(instance of Gen\"+this.generation+\")\"" );
-}
-GenB.name = "B"
-  GenB.prototype = void 0;
-
-// RelationalExpression is not an object.
-
-//    InstanceOf( true, Boolean, false );
-InstanceOf( new Boolean(false), Boolean, true );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/keywords-001.binjs b/js/src/jsapi-tests/binast/parser/tester/keywords-001.binjs
deleted file mode 100644
index 60ae7a7dba8cabdcb3c7d264b512c4a101056d94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6811
zcmeHM+ioK@7<M_I9sqGQtdO|dBDg_psMMyB2$TXlVQ-N;<0S4*W(M2oHgCWi@M7G+
zQ}77<zsECn#-7woBP38SGqykfhwnc*Bekvzb~0KrnxFhAs)e8{@){xJs>(OyY<l@^
z`c;}$H6x>Ay=PQ#sZM_XkdXIb*T_Bof(lNr3U<!2f(oj5Rcff*{+8q=FY|4zKLF?G
zF04vuD4r8ua@7I2*H3d+Dn92-Xt<KDtk6;kUM^1FhHKKvcsBjva&&CIjgAe7i<RpA
z7hEwx3k`Qei?xRba3D$_s0BRMrW%>$*J1As75;Yj-aSqD7hwO3CVVk@o*v4CZ-MBO
z@%N{{eC}K3e{IM&LGjsib}{kwb{P@L#CHJgJGOaMiCp@C4>089wiZlEh~-pK#a0kw
znrf{39t_4YEed;7pUB`7vmxXv84<egf`U>}p=L~~9U2-~7v0M75EU>f8WpHmtkDoM
zsCtAl==&NnQa}-%Gk$}0FP<Zr@C?q*mRu$Z43!A>>zacDld8sioLtizDl@@r^|bjS
zpJIN>RKiNk-Fd*YO&aSs6tM7gZY_&;!mCMEl@e}8!nC!+^~%pB6&vdsg832Z4Ac$C
z^}x9~za_1qI{=eQ(Ka7<k{)eUp&s+1-F99nM;bg<U0t(Gfh;JN+H^v=TJ&y1!5+qQ
zEK$ZYoq}D7YJK2J5J|TcRoQYFQTw=tyFJ=HXA7`PTME%GHC0d-OENF$!iIox4d(NP
zQT8&k1S?=e^TX<NH@(h^Dto!ju-)y+7odfwi1n_8!cFX6nJk)55q{a}Yi*Vk<nt6s
z<C>F@Ct3oT)};Gs2xUII^m1Fk#(_;6=p8kO+_R5qp{bnOg^y|B6%(Rz8sNvYK*-RP
zGFSo*k{0@&=z=+%iw~R@_8fBl4CTT;)?wyEOr6j)t&2c|<|ep%Wa2sH;qJ=d?J+FQ
z#Ku-KtV>r|C&`kQc>zOksOh?QCH?HbQAytb?HP>detU6{c#&)90H68b`;}2F=uKJu
zhRSp3&NDRu*;|Jl+14mfQ^(lHjSIS#Ot;K6ytJ%_Uu#^pMsy@7+O4mri*j!Y{SDOg
zdYFA$gEPKsWGL8N5y2NrJ8qZ)^ByS0OQ~p?v1)F$bG15*Z6Z+c)hykVir!APt6`Ue
z15V$wbv=c-eNp11Y5}(AtYM>}$G+a%R<Q|mzo9F_%n?M6K*6+v724XN@1?=tO(k_H
z7TZY=ok5ivj0>ikH&&Kkf^>EU)0ch(`*ge+`u9ySP~#6ryWUKE$cYJ~=QPjp4QNbd
zz%N?4Pe5gSPS|=Eh^*CL!nw7C$KpgSSz>3y<cTf<PZGJT)<s@^s*((oaB>YVEme{U
zDg)!S>&r+1?o1FaW(0?Kh2lW{a&NGi!}c1;C~KLvZf#k+#{oR?umK1|5ucSJLUDKK
zAsw4Ag5GgEjCK^|=5LRmK#vdLeEX(9NJkTT!T%e~+Mu7!df<K7LG_;Com0K19<$=-
fG6&8ZHypU$L#0^>(aJ0hJk^@jfFrfTytd~bpkJc*

diff --git a/js/src/jsapi-tests/binast/parser/tester/keywords-001.js b/js/src/jsapi-tests/binast/parser/tester/keywords-001.js
deleted file mode 100644
index 411386100bfe..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/keywords-001.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:
- *  ECMA Section:
- *  Description:
- *
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "";
-var VERSION = "ECMA_2";
-var TITLE   = "Keywords";
-
-startTest();
-
-print("This test requires option javascript.options.strict enabled");
-
-if (!options().match(/strict/))
-{
-  options('strict');
-}
-if (!options().match(/werror/))
-{
-  options('werror');
-}
-
-var result = "failed";
-
-try {
-  eval("super;");
-}
-catch (x) {
-  if (x instanceof SyntaxError)
-    result = x.name;
-}
-
-AddTestCase(
-  "using the expression \"super\" shouldn't cause js to crash",
-  "SyntaxError",
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/label-001.binjs b/js/src/jsapi-tests/binast/parser/tester/label-001.binjs
deleted file mode 100644
index 92fc9e5e0842af0be46299acc7457e01809cb8e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7746
zcmeHMO^@3)5asqWX?rMoE>QOz1RJ!sg?5|Rbx;ReC#aoV3)-R`A+o4aQg-)Jpg`|E
zxBnu?{*?mlsXri>+%rQ_BxO-H{jo+G^s)<!;^WNY%p+$M<V6~@v*0PC;n^d>=YlTC
zJA{x453fjfFnlmN8BKZ0NN_CQ3F0Wr&u)B9$S3etU{8NSMMNht`<6{(Drg?@L_&q;
zcSfE?Nm$4F8*q-+VR0d$qL4&MlxqNc`9a8%JeoyJNVtS9jL}&xqGW#dAuKcM_r`;V
z!{Asw3yu|tjWv?*pGP?pG?sABX<Rh$ZUSCRCoH~w=g!wn#0vRXau%os--Sufsc61#
z8?Yspe*yLZxqQ<9VYDwUKLFGFz3=b+_*Ijc!xQ=M;fQ=6mKqPn=l!PNc0_oF<Y$0(
zjv>jyPL|W0Eg&nhCiD)J_AgVxvJBFDR4pKbj_K#l{Or*<HdEz{DLi5(t88~YvKg}v
zTon13W%&vZ6|9YJ?AXNx)Jf$674t$e?R4G4nNI=hLV)0W2TIJun4j}`(<dn;e?W#e
zlDr!wR9qRq2+9oTHs~;DXUt|f5z+jqkxr#X2z1LVWRr9akRC+rTcgpzj&V@Oy(20-
ztXq++8o5+^{nN3K*`_xo{4kfKY`Aktx-@}zFyw28{t&`mMAPc1gkhZl6$5rmdAzPp
z%W8J@-$waw^7pd`e;BQ`s|FHE$jfh>*OVnT*H3<Hx%~%7YQ*N_Rgws2*etpvm2m5*
zwRG{emW`uTG4DaULj%0_?(T1Q^~S%od*{@ZF6S|$$^W{tUY9RivA@J$BSw#OT-n0v
z6_mCb9V{r(f!(f)?*T%-@lEl5kxa3YwToIrf=V=nB6pFsSIRcA9#;#WBlvgMR(oLM
zwIz-gk>i@Yp_N#svCEWA9Z)J5Y{YKNr_anK2PJxSXW_+1L|$EMf~yLeI*u&7OSGyt
zVXy4L3SN;fIM*ugOo{tkn01jy*?_=6B1IZPfz|GiZO)bj{hzQPhJKBXWvu-)M{sAM
zt}9~4&f1<VX#~vDXJ>U+)BiVbeC$$m1ZF2~gFPZ)OWzx+ie!-5p{)$D?RhN2#@u1$
z#YLBDZ5I+uom(xH+KwJp+hrTMapImpHZ>x3Ff+M>*(TFw%9D)!R6t*X&=@*w2_}&%
zg}03br0Vqa+JnJ^^%c6i7t((LPaC9n1*4Yc;&`c*E{;8%XqCyz1()tyonu&EZ?B%>
z$cv3b?pK%hJq}&qq+llS-e>|eA*EE-Qg9m%tvTp-*};bcqrAVca0qSjOmBx=^oxo{
zRr)x^uryCwtL&_P+h+F{X?|tc2XMWd^L5=dG;`2$xMZj<qn>WBGGrG^3c9aO+znV9
zyC6N9F{2@s>5_+6U?5%sYp1eDCVBU^wpBhPuH}sI>>qy#2on^L4lnW!pLJ+QiU+il
zXIyk*&eM}llNNhxJc!s(7d;SH-Agw#&Kds-qov+iqky<A*PMyAkM?J~11!D9c|46<
zoG%~uXqp$oDNQF}{>L!C`gYb*BPro>rk5JSh+F!~qDI{LZb3G_a;Y&_$XTl`)mv($
m<)eifZPuu2pm7GP=W9M2l&UTNo&o{56&01M$Z}KSj{VnJ*1JLg

diff --git a/js/src/jsapi-tests/binast/parser/tester/label-001.js b/js/src/jsapi-tests/binast/parser/tester/label-001.js
deleted file mode 100644
index 391732a2d3dd..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/label-001.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          label-001.js
- *  ECMA Section:
- *  Description:        Labeled statements
- *
- *  Labeled break and continue within a for loop.
- *
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "label-003";
-var VERSION = "ECMA_2";
-var TITLE   = "Labeled statements";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-LabelTest(0, 0);
-LabelTest(1, 1)
-  LabelTest(-1, 1000);
-LabelTest(false,  0);
-LabelTest(true, 1);
-
-test();
-
-function LabelTest( limit, expect) {
-woo: for ( var result = 0; result < 1000; result++ ) { if (result == limit) { break woo; } else { continue woo; } };
-
-  new TestCase(
-    SECTION,
-    "break out of a labeled for loop: "+ limit,
-    expect,
-    result );
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/label-002.binjs b/js/src/jsapi-tests/binast/parser/tester/label-002.binjs
deleted file mode 100644
index be279c14ee9375841b79828fffde80c8524098d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13403
zcmeHO+m72r7<M_IE)Y-P-hmdhEte%5*et2KXh|0mRY(Y-Niv%?>)6rQX&c&o1g?>|
z;$67m8IZU`;+99?|Hos`?|7Vy<0MU2xmhV5`<wrKn%PD?o%p=jxa4fuJQv|eu(9)s
z<2e0rICEO3ov*t0x`S}SoyMVjr{Q~1+`PW)IPbw*4f^>bCOp>n`Img)Gr?jn3?$T0
z|Bjq1FBs;r{sx>|%dkQrp}e8v1zwy1(Ctr$Jczvuj|&MGu(2jOiiH=9ns353-S$cE
z^kJuQsGc<r6$r)Z%J<K_m<#4hxW~+&7VzE%JfHQs|H+*@pB52Q<U=X5hT8B|_~<bc
z#n&kTE6VaOz}})PAGN>ju1l700O{?MuaAG+2|@m|Jwd(>TlG$RXYIunVQG>d0NNRv
zBp<p_%wj$UuZW7!HEgr}bRu{ZfqQq;4W!ZW?77iDPnhrPPvsW_c*M0=Q3tT_X7oN_
zQN%qS#S1tz__wB`4htA36$?y^rc%;I)-9NMAF!SX2sjTQ5_8cD&%#lWCmBe70}n4a
zdCLo!m}$No3^Ne7Ar3?A^!Y{X2yb+$L#K*H2y~z~qAJ(`q=g{X9ix#!S2LK|y}>Fh
zs9WHy8FCWsv!8~Iw3>Fs{Lq(V*f9H&Wa(G1ceJWp(tp_hi4S7UkhIK+K+B6g9%b$z
z5q<|{pwk!-p!UE|W^(<C&mcw8giGzxLQS~I<Ze;x6vi^3BFC5B$3?7E!4xx*#s+vX
zBt^QfB`@e(ZV(FLEzbxh_AIw~ClOicPAgE3kP6SNjGO9oer>0Fwic)BKzbA2AT5bO
z9hqy_u$0#T=4UR#4SClb(U=NyVFkHxoc}(r(*wvn8}M=tRP|p&O6ayIrO>p^3eJRh
zfK?*+m(i0jJY?z15Gy55ztnc6eg1+eK`wdQ=3;|RRy5qwtdcrdeSa%W`D-Wn#`+qs
z?Q8qAmFC))HEoqA_Z9r8Jk4&)hfodm1{Nrgxbm#x{xlfiER~K`5ea6Y6Bx6Oqw-lT
zm9s^pwrK+Yg`H6sRkHw&_d?k#7AvKSWMcWkpH86dT+-oLu&l8R8A@dmN?ywk2Uogj
z$3AoMr2P0@$3bo7<fYqX4Ta_fT&c-gR$SA~k74LG3UJJ%0jkV-j<o10tc93RdqCOL
zH_X{6lx2emXux2U4CS-pJ4@gSkpiocrWO}U-p4s-BLDPsf_`Jk*DMS#Lqi8bp(?BW
z9CTiAll!4KB{Ner3o@81wIfQ11y64QtQx?~ibAdkX6v?<1@tG_JDU89_6xM5gUvfe
zOR&Ker+$kYCjl|jmeJ`gG;XUT3#i4$Gw-3<?<5CP+oDH@z-h)>_KAAA>>IR=1Otx3
zlGMkC9XQjQ8!6s~_oN-EXi~y}MUgO`#4{aVOf=_c6`YYofFva0XakWbli6Z1Z$)G&
zEmRimYNFH0ON$$6Uy}Vg{E7Zjj)~WG_JTHpbMF%t8Rj@r=mQAmg*0yAPgq~9^ThcZ
zz)KR=J@+CM?uTv~>Rm5zlX&8O<UVtgZ0#N#sfXXE@BQ$Zd+qkodff!by<VIpT4CsO
z7L;})x3UCIZ32$3JkSr(n5^KJA4p+beEwXML_t?QkwVO)%?Ei)djLB(*RCetx=AdX
zN^GUxl=Zpc&D`UhEs(n@TZw!-v-$QKLaVXrz9X#G5q<$3As!>Y=*kzJX7e#|-w`&G
zD|5G@d_a-s)V}Ws@!nw~pa+npF;V9Pr0a)DwPKw~3DU6d2%G73#gc|<K5x(c&Lzv;
zYn4F7yV;SNMvmJqbkd@W>ac2yck?^K{*H8n=U~dUJHmWFxNiuT+#|OghwmH0vRn8`
z54>*(WktBk=yFM-z#^t(e40EyVUu_&j3d=QfGE6<oK^rO$AXILvK~<_8wX%&&2X8P
zh@v==BansvJRoa@`AT7p*qvH4jnLH+ijv+XrH{=(^CxBMi<0~5Y89u8`NLtgu=r-U
jdI{+-9AqWqV)^$wSeNHf>itD(F^@yZM)Ulchc^EM9UAXO

diff --git a/js/src/jsapi-tests/binast/parser/tester/label-002.js b/js/src/jsapi-tests/binast/parser/tester/label-002.js
deleted file mode 100644
index 1e2b63adca7f..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/label-002.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          label-002.js
- *  ECMA Section:
- *  Description:        Labeled statements
- *
- *  Labeled break and continue within a for-in loop.
- *
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "label-002";
-var VERSION = "ECMA_2";
-var TITLE   = "Labeled statements";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-LabelTest( { p1:"hi,", p2:" norris" }, "hi, norris", " norrishi," );
-LabelTest( { 0:"zero", 1:"one" }, "zeroone", "onezero" );
-
-LabelTest2( { p1:"hi,", p2:" norris" }, "hi,", " norris" );
-LabelTest2( { 0:"zero", 1:"one" }, "zero", "one" );
-
-test();
-
-function LabelTest( object, expect1, expect2 ) {
-  result = "";
-
-yoohoo:  { for ( property in object ) { result += object[property]; }; break yoohoo };
-
-  new TestCase(
-    SECTION,
-    "yoohoo: for ( property in object ) { result += object[property]; } break yoohoo }",
-    true,
-    result == expect1 || result == expect2 );
-}
-
-function LabelTest2( object, expect1, expect2 ) {
-  result = "";
-
-yoohoo:  { for ( property in object ) { result += object[property]; break yoohoo } }; ;
-
-  new TestCase(
-    SECTION,
-    "yoohoo: for ( property in object ) { result += object[property]; break yoohoo }}",
-    true,
-    result == expect1 || result == expect2 );
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/label-003.binjs b/js/src/jsapi-tests/binast/parser/tester/label-003.binjs
deleted file mode 100644
index e0250521e717805f8eea014beb05fdead098fddb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2239
zcmd^AOHRWu5H&x+hO=~!LV=bpKvjiQiM^XlQ>#uKY!{UsJ5B?);65CIv17;Xmx5qL
zHdd0EH#6_ecoIFUIJA=q(5!tYMJ{PU_6Z>)kv);l&ER%;HcUkYBxzZjgfpevZ^wij
zqE!;R-&4uxh{H9coJy*hC@oYL-W8d$GF!xYMx4E`u!OWWEcnKeZ!#z~8#Ab_N?L?`
zm6oi`+a|(1X}Pzg<=mUomX)~Q2Wb3A<*Iocv`<ICAscF{p}_dIR&GAl<axqkpB)lC
z!q^sNd-M($>2xvncFEpRRa4i3WW9MMK`B%!KpCc>`QB(1mvMzId1;Cc02Uk@1%*ek
zIE*!sET8BGAQIv{)E2|;z|IC4W0b+H0Ljum)0hjlZSzR^tmz0W51)^V)gEvtF<3_e
zjc7LEYl(kfUEhjv_(1P}(}!Gc)TdR?YRpr7Q5ki;I-b+zGxq%<$6d;KaJ9pq;wJz?
zWsWUaYSp9>hufjaPp|^26iD5B2$SM#u+_hyiMgg1rg;bGKbfCe51*eu<Dvsm-|FK(
z<oFcHlTZn%yP~M5gbhT$qTR~1xpc*#Nh9^T>c43|v>R*V{pFXGkzY(#({|(G6KT%v
wQ)3#Vo+4c1^#+G*fQvMAu?0|QXE(pQ&e!*<`?+S9xj$RzcNWW?y0*za0juoL)&Kwi

diff --git a/js/src/jsapi-tests/binast/parser/tester/label-003.js b/js/src/jsapi-tests/binast/parser/tester/label-003.js
deleted file mode 100644
index 934732949857..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/label-003.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// The colon for a labeled statement may be on a separate line.
-var x;
-label
-: {
-    x = 1;
-    break label;
-    x = 2;
-}
-assertEq(x, 1);
-reportCompare(0, 0, 'ok');
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-001.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-001.binjs
deleted file mode 100644
index 3b0f7fec00d51c7baadcbf3f817400234fbfa6ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6153
zcmds5O>Yx15Z&_qAtWTE9ysl>fKXbA6QmI&4Qi_>t=P~ja<gt?>g+~dr)mBQ{|pHU
zi5tIwD`T&B?ZlhZX}1yO6m4ujduHC78N13yLyBwFK1N~fki|WQ2Hq{t^N!<i;??)s
z`@!3w8xOHpt;ji5N)ldMU-!JnFso`VKSGS4V~Tfhmm-EZi6aRW>hHumB~dty^%HQ`
zF2ahLgd(9wBEoY3bNjszN1U7x%p_cd2KvwmXC&&??!z`gv(ec*Xjd!hziLH+m{@_F
z-y$3{L?zrAq9Y4WxPanw(na+3=H`}-nPFF?*Q#pE+pz2mF?+gsgiCt!J7BNSn@7!0
zL0R6s3rF7%w!XZv9kY5r{#u<Mh25RKPOE9#Z4$zflTQJyMI!8XFdL8v@t7qx@D&`|
zJRdTgB%tnqBaR24I>|Vk|6eH22BK6il`B9t6l+nL#yW`kAsCu)#CQiMe1U}u)<oCm
zxQYoPO)3)*>y3mXl0wrRj1f^AGsri)kccts#I3kz+a$BdH;}ib@H#}AO|)H}$T5(%
zAq_+7r1*q;jP&|CbE;G%fL`g1Oeb9fq=O^MPSL_ZUmKY7zJL`Dr&}P^963$(`DejK
z|9)z}2VMh_k7$9gOpZ9_Bmwsk5sJh4kyu@c{0*nE1T-6yavBbiqwskb4@EO%+kOdG
zJ_E#d?B}39@3VMZfSnWYe{4Mjp`hO2Zh8DXL`hOIKRaxq>x*ovY1}>a`X~x1bg5ZK
zZL**)X3Q*F*oprDCR=3IbwERjN#HV7x(he|09Cygi8`hMmMJ9Ln&GBR4tdoz-^?@-
zWme!j!avaEYa22JNdbL^Vav~s>F)uoee!4?UsdAEcC&s{{hAInuVvy)>Gv*5b_fGW
zG{K52zH9mQCc`y>8i;rM4T?qymT?}!wQVr}>Sr!>2&!b9?M@SAX}bRbP%8|Ytv7`3
zOO%Bf#tYjQw9PxQDP19t`1mVO!W%Nt4Dw0Fi>ZryIk9v=5klZ`sv4UZ8AIp(E>;3y
z=hn?aOmWV5)DZ4W)ziW}eYe128(t1{BQH074)Y}KjJ6pY7NjSe-8K6*cfTZ8+jy*3
z%BPUBZXO~g;s(_~iD{8KvotJ#%Y;ae%aX>qm%oOq#?63qEFdqz`3LoVc)9Yo{Rof!
z1F7nFe%hmFf65sfFAQF)D4GOx+)~iO-+<;4cC!JCnC+nd3-VqOs^f8mI13CfLUcH%
zYkTPkHSZ=hr}CT8(xP9gv@KUP9Lx~%=T7e|$|%zavtJQ4DgA~U*L22R(8i>%&hH`0
z^3_>o;lli)#tLrgYNR;f8IabSrW%{WUNu_88DnUc0|sVdKVqp-+v{qexR9#B3*M4s
IO1JvLzmr7AiU0rr

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-001.js b/js/src/jsapi-tests/binast/parser/tester/lexical-001.js
deleted file mode 100644
index 3dbd61d997c0..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-001.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-001.js
-   CorrespondsTo:      ecma/LexicalConventions/7.2.js
-   ECMA Section:       7.2 Line Terminators
-   Description:        - readability
-   - separate tokens
-   - may occur between any two tokens
-   - cannot occur within any token, not even a string
-   - affect the process of automatic semicolon insertion.
-
-   white space characters are:
-   unicode     name            formal name     string representation
-   \u000A      line feed       <LF>            \n
-   \u000D      carriage return <CR>            \r
-
-   this test uses onerror to capture line numbers.  because
-   we use on error, we can only have one test case per file.
-
-   Author:             christine@netscape.com
-   Date:               11 september 1997
-*/
-var SECTION = "lexical-001";
-var VERSION = "JS1_4";
-var TITLE   = "Line Terminators";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = eval("\r\n\expect");
-} catch ( e ) {
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "OBJECT = new Object; result = new OBJECT()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-002.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-002.binjs
deleted file mode 100644
index a35cb02ca93d0ee66155349dd2938b502f697d9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6134
zcmds5O>Yx15ZzL~5fTy-NSvaciV#XcoKPB-ra?^=g^Gk;k(+fBQ)f5wI!*Ie_-9B+
zNZj}ZTp4@4YbSP6r`<-tDcab6_RPFDGj@fKh7?yTeT>5DA&Ywq4T2j%5FE$hB-m}V
z4%%<q-FS$DN?FdSP?GTK`ja4d0JAFQ@*~6uI;MCJcPV0slQ@!4q5e*SQxb*KSU&(~
z?INt0NhlHqBqBTqFt=}nIO61lU?$-rG|-1mI3rQ7dIz>?*K3`|hgPMm{;QM~h>6vf
z^P7ZYhNy%)Lv&=}2^Ua&PP&M`+}e6=V`kW8>9va5avhePA!biEk8nwEego_kdh@9M
zv0aomZ^6+I+OIypu^qE|KmJ^uABEkWMyFY~?KTPF$;n56)+7-wbub%{2=SODHt-c3
zT0b8$oFt&`Hb)!}Ky{LFIRD=%&l;jsFO@4mHWX`7nZ|mE`5qXWaKv~ACwzg03f4r|
z=eUXqB26k25bKSEBNC_S9>$2MjTz*deMrQZb>e2+vu%=D<SWSAQur=JnoYD_fygnC
zwjm8e>ZJID2aNRkI&-R2B!FJ%jZ7z91Ehx|icZnOz>+pF=e>g!9;aI%)f_oZ_4%h`
zqrX43-v+ON$Vb#6ER!RiIZ431M}*>Vek4{`B7ebYECJ2Nq?m?7<S2aJ#Y52y*|uN8
zm5%|j6_;|*67REk?7+?m_&>HDf>2OzaJM*q9-<^En4cXs(e*_()imy&27MHT6uQ)`
zqc&NvD`w0rTG)wy2PRu&)^$KbiAmrxRl1#<zk{mYi$opM0Lv7TZOw4gCXc-8n{Q^C
zh$1WSP2nHt^0f__f~0^x!La3L&-8Z});_#HkFP56WxH9wseVm|n%6RMru2IsC3}Q{
zB<f&A7T>k}dXwRrKsCg>{TfB11j{%N;o3HsfAuq$dIVK6&UUAXvNYX)1E>`S&DMW}
z?n{(~8O96S7qrcLu_;|4kNEftP$C#I(G2oQ#*3+odoi)}KoLUVajF`d7#Tz7{w`Jm
zVCUA&LQHYac+?Q?Ox4rGJbkyoVGCXkbR#b}eFpO+?Toe=8y2J|o82}0Hg~@yS6g_j
zSIVc5qHZ1{CgKKFLy2jTI<quv2QCvLJuXWc?_T~It{VRaq-Ozn3eHd4@oiC}HaD_r
zvhmy?p$eJFHcx!Pfzl>)l6YLQ0bMlq5c>s5&V}lET%kmV;VwjvbNcp@o>23yO>@e;
z87-~wrRvynCBnlDp>^){sG^KAjWC-NQGn8KxL!@C*9ARG`oz2gQI=24D&;zpi5hcU
x%hiZGyBUzy1Ew0A!(KJ&;*2pg%K-y3v0tpzsO@z%;I5i#@PdaUnZK<j@DKPq!Yu#*

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-002.js b/js/src/jsapi-tests/binast/parser/tester/lexical-002.js
deleted file mode 100644
index 19eb30c0d53e..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-002.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-002.js
-   Corresponds To:     ecma/LexicalConventions/7.2-3-n.js
-   ECMA Section:       7.2 Line Terminators
-   Description:        - readability
-   - separate tokens
-   - may occur between any two tokens
-   - cannot occur within any token, not even a string
-   - affect the process of automatic semicolon insertion.
-
-   white space characters are:
-   unicode     name            formal name     string representation
-   \u000A      line feed       <LF>            \n
-   \u000D      carriage return <CR>            \r
-
-   this test uses onerror to capture line numbers.  because
-   we use on error, we can only have one test case per file.
-
-   Author:             christine@netscape.com
-   Date:               11 september 1997
-*/
-var SECTION = "lexical-002";
-var VERSION = "JS1_4";
-var TITLE   = "Line Terminators";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  result = eval("\r\n\expect");
-} catch ( e ) {
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "result=eval(\"\r\nexpect\")" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-003.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-003.binjs
deleted file mode 100644
index 40c4dc64d15d5fe3523b20ce88417e06beb98a31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6286
zcmds5U2oGc6wUZ%NC*iDBzWl~bb<`Q6AIN>SF}!5nP|0F<TYNK%}pxDUDv+?zYHFE
z<6m&?II$b2ty{A3Ayukc+sD55o_p@KJvJT@T=NDP`L#nD^(h)U*Br+=j{K>!+iV|n
z-gbJ?2s@rD=6EECS?%j1$GHcyJbn2Qq5(Q4cn|joqKE}iD4=}xJ9f^3(4WQn0XQ4W
zup%m;0^bS3fMo#s_Dvs$EI0`;6>uRMszb+&24TN;8@A~*>fPqYw&%+KJXeC~SRFCH
z6);Q@5pd^-j19c|fJg8}&_m?K_V(+Sr?Cl}!n?w8p4|01tUO25oUWf@O^1F1>??HW
zQR7pmEQj8NqaSo$eSTv)=IZ_U{p$S4?d~?at%hm0P6$g{-T}0FG#o-cluO9Q#faiK
zhQ#hL#4z7LFb!w_7iMN15u%og6_7Cmt9;Upw8-PTU|`G;WnCOI(`6Y|B&?3E&ha}Y
zaD|j6Ale@bPZyeQVax--noy9Meb8V`yHP9Zn>Gpc_yTEdWcF?lB05!eIb2&nu|a`B
zH3>dp4h{MPC7M!#IM9~bNO#gDKw3DWY<1=aR+NE@SYdIx1u2>#Cla6iETG@tFX^|y
zYmnq)Qjl0WM=Z67!+k&j!T$V6TwQ7W38yg<C?At@dJV2o_@akLybm&MU&ECT0kIub
zGSCVe&}dSCoe}VVY&kfgpx)qKdHg&?aa=M#yL77Ri|D6G)H`zqDD(+5sA)5;vtXCc
z$Sqpfgg1c62ANeIP*8jlxJ;Jr!p(Cfy3G1^gYORQvzY^eo&y**tgsZ9r?A$oZo1V<
z2#o;tE4`%asZ`xf_?SCNrO6UR`d|J%6AkU^!;hC-h4xXr7f|3{0}M(XxshEVQd}LV
zj#zI{CukgFQJF_@H5$&pUg=9Ms*(t;X{U~|GOxCvf#3v~x!kSEtM||?_CwwuDS%ZP
zly}ND-6jjq*w!&iD9E2e$w@<=e(R@HCa;u>f6iws)U2Ffa2_t`>GvW%{+wLV@hSMz
z8ByM;vT2%2Gn}&sjRpTLQ22$3MTzJr!lfZy`kj<nJ@Wd)31DZ|<)P-SQHs;TEO}4C
zej8pi;tWb``UJ4~-1J!??~deT`CZfB`tECTwT&lgrBIEsu0=d1{CZbMF*ai&4BG*r
z;?-qU(pX<KF5w>ZZ$Mhs-^bv5x9V1Bt8dkX`fG+vXPYHH=RoBdw7GavF#(HcY?16s
zM6L+c^0++vo|kq`+eX*I<VCe`PD`XmOJ(><b!@c~VPOW(b!PSAv!tQp1t^hdxckk@
z>w-QndHUXgD2u1>c)^>p94mM;kR!$Fra>C7s&Z@&d*x^mXSAXGy<WqN&F3^ZYI<D`
R6jx0-xa3t!=(o{0{{kI;@#6ph

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-003.js b/js/src/jsapi-tests/binast/parser/tester/lexical-003.js
deleted file mode 100644
index 46d60cb7fbc8..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-003.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-003.js
-   Corresponds To:     7.3-13-n.js
-   ECMA Section:       7.3 Comments
-   Description:
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-003.js";
-var VERSION = "JS1_4";
-var TITLE   = "Comments";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("/*\n/* nested comment */\n*/\n");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "/*/*nested comment*/ */" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-004.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-004.binjs
deleted file mode 100644
index 4bf2d6454c9b159c9a809470fc93c9edbe30134f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6264
zcmds5&2AGh5Z>~SIDmx2fzuvA6-tpfpt6miX;4$5P?4xNgxsu~m^!<W*J+vu;3ar7
zxNznz7<+&0tT!7c-Il^B+SvZ=nfd0Mu{}N+Q(X6k82R->77iF1IX4`~IS&1qv)k$%
zbho?xaEu+VCg*sRM7;j(iQ_zgS)RW92r+_=Dc-|<iWuS~3?!7Vz9Z+91pYkMFTmMY
zh7~diMSO<@gl7Qy_AMU=oSYEMBwT<->d+BqBpB51!ZzJzqu2V_@oLF`UM&I9vAS}8
zn{dn!m2hW>P7FNZ0*cQ`AJG?ETdz#a6uTz9<|SL+gk@)lnbY+ntm(}kfPIDDJZgUG
zR^`pxaP))j%P-f$k3X-@kHYR=tJiLp6T*^{_W<n!o=rpMM<(C}2-!RzGaN;b)m@G_
z9znKArs3@W!nAB4O4U-i0@8(Il}tM8Et2>?7#MNHcn?Rs#KMBKR_C~g2|^wd6A&9r
zgd?It(=Cj71XxoBI<pS~j9D*ihXd0lsUF`Ut&PmyB>`eHWtStg1>_p!7bKJ76YelF
z7%Ig~BuD^ls*UszTmqzpBdV5WVW6uF%y?hG3X9W~q-cg5OMLcOu+jCG^gG}+Nb(6S
zNGzQrmRcm>-XlV>zc><CR~moAX^aHQ$E2D@LueE}@8hv(f=t`jaOGn_?1XLx>hd8A
zrv=y<0sqIALl6q;4enRR&qEYN74x&lW~#o(W}1fmQ)h?*pF($<cG5ZvcEya`qS6k0
z8<=d6S=9jrB_@H(lG0tcd9FlPS>JAn-Jy3jb3oGbGYlJ6Sc;1%ozO+Q!GuzG$K`B-
z-<aDZ@{(mm;`HS2xe#cV9dV}k^0SYkJ;H!+O|T;M-bQw5NO5(b2IBo;gQ7`<WjP+h
zWoWecLZvUYC`B@!rky&<%4FJvu0ce7?mD+7nchK*I0!^jqySdwN_LcOx=j|Iu`OPf
zP>?i*I+KPx{nbyYOkODg|DMlQC{#I>5Iiht<o7~7{(@ZL@mKJtGiIVa<+C)G<~U~&
z8Vmkgpom)%4`ZcKgiAxZ^f#`pdgS$|62Q)^%R?<%qZFr&dHjNc{SLfgsH=tC^eJGA
zx#?R%-W~DD^1G(r`tECTwS%W>rBsco?m{9a;!f8<5jJBY4SNkjB}&Swq_MtTT*Bq&
z-+;6%x(~tmxuR=^N@tlRu86(+40>8Tbxpt``dTFU5^*a+wLGrKy62Uh)3&R%FuAM-
zE@*}HXsOIzseY|i8Z68ZInJ$~ca}7AqVUAh3>Uq5SuN@B;z#bc5M}wu9hJNuCu0Q<
y1j$ITs%enM6KXQHfW66R5offa{3Tw)jLf&QWYqL}GEiJClfflVSW>r*hWQU8EbS=(

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-004.js b/js/src/jsapi-tests/binast/parser/tester/lexical-004.js
deleted file mode 100644
index 853887db3ef5..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-004.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-004.js
-   Corresponds To:     ecma/LexicalExpressions/7.4.1-1-n.js
-   ECMA Section:       7.4.1
-
-   Description:
-
-   Reserved words cannot be used as identifiers.
-
-   ReservedWord ::
-   Keyword
-   FutureReservedWord
-   NullLiteral
-   BooleanLiteral
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-004";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var null = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var null = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-005.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-005.binjs
deleted file mode 100644
index 880e4d9736188b7a93f1ba122d14c82bf32ae595..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6258
zcmds5O>Yx15Z&^P00{|+1E(B86-tpnNU)8dX;4$5P?4wyF38Qg$x>%GvYn<m@jv)y
zaN*3qVC?m-o%JSh(rx)TMH}1Co|!jq#`gJmL~zX?U=-92Xxyi0=w0zV?<fwY-cGZ<
z-+9&P#Ut$bRXN8eA>*~L4?XV=%<|3Uhlqygh~Qn^BZwj%#*u^y^f&WP!YG)<`UyB2
z%dlc9p~AomqmX9+=Jw41M?5?ZF_mx;8tOwcPQ$2Qy9wKL8uf1TL))*a|NN=~F|j&w
zek<gdA|l~V5gA)}!UY7Mg*`-`Zf(7=F;ncS^qQ}>yb8-s5w)kAM_ALF-vRp)y?NO9
z*eT1K*Wu{<ooAn)+m5+>KmNEpKMK3M&2Fn<+ieoUk(0Lo?LD4OVj3_T@Ene8oQ)`E
z46?ez5ywNwHpw)c{a=`tbwr3>Dpx?d5Ui8QG}0l7Z-ar1Bg(s&@dXwtSQA~J<2)t^
zc~mAK+8+x?utL)vjJXe36AC)B2Lg;~H*Up!+a{?V-yp56%-#tjM5o#=PiPCsHOMbW
zCc($tqhWub6;nx&0NT_WnNGR@NC!uhEzQEfiZ(FgeE};RPPZUMGvq|#v(JK!{(ecn
z0bYY7ACrQ_GCAU?MFQ>}3JDJ8N8<8I<1aXkl|cEJl+$PkjlyR=JQ7WiZTlLod;o~;
zxRQZZ_<+Wf0_=={|6|J`2nF>9_sZkv0b;CVes<|p*B9ALlel-{4Nw#i=uXp4+GN3w
zn2}qwumgVyOt#3Z>wtz5lfY%FbQf-(E74`vw`*c|=$-8xko5cn!<H3};&KnxayrJ9
z?aDDC48OMbP}-8Egz~uhd&d99O-CFkx%uoNwi{AlTLVl;UAK|l7*bplsE&AVP$y{2
zu&l)+xCssC-=@r^4s}Qd)3(z@S(!<j&@zaS&)ntKWYSyc5Brhmh%~?|Ey=dF&9uqE
zGp?1(5ehP<P-N1Or@!VYwaF`G-=Fi@3RNm65rT&cy7=ALjK3gPeDnqU>5Zu9P5Cs<
zr5VmSgvNpY4k+S^#N$L}G~v>aF8xgks~LIoodmEm>+(?Z)@a3PVV*pn;Ghi;82Vlz
zH+=-yVs847katINviz>;x4HY8Ty5itUMW?htc#F{iMY_!5yN&&q+u^Ws6;(kl{C&*
ziwn5<{2P#t756SU->kTHoJ@*2f{MUb9z!>aClwp8h`SCMzC_uIP#upeQtnA<=XC97
z9ZX(S0O#~UX0&u#uT;ENs|yZhhy>?O4?9b`I8k*HU4|>(tfnq#?vm&2HxOm{yv-K8
z8>_K`rvWumENKR$^?0hr=CD_d7IDTH%3t3NOlH5DsZrbOYM{7Os=+0XS5maCZuvK!
CaO&d#

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-005.js b/js/src/jsapi-tests/binast/parser/tester/lexical-005.js
deleted file mode 100644
index 2f3d3bdd8226..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-005.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-005.js
-   Corresponds To:     7.4.1-2.js
-   ECMA Section:       7.4.1
-
-   Description:
-
-   Reserved words cannot be used as identifiers.
-
-   ReservedWord ::
-   Keyword
-   FutureReservedWord
-   NullLiteral
-   BooleanLiteral
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-005";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("true = false;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "true = false" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-006.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-006.binjs
deleted file mode 100644
index 2d07274734b8b6123e3a9f62d8973e7280ee23ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6274
zcmds5OK%e~5Z>}eT#$GiIOW)?LMamB0BL}xK~0I$ibTC4C+j9lo!!WGn&ww<=byoa
zGyj6I*SmJso5V@C<#CEOwm*AjzWHYC3LlRMu2u#Z`PE|@^(h*9H$2blM*h^>YqSpA
zuiL$7guO~x&Z&@q@#@#7p7#J|Rm|llhz6)j@ILMlL=g|7P(u0on|WtJ=+9#P1e}d!
zSP_*_f$s%jz*7Ko`-YE09-Ic4O1KaW^`RN3LD;X}g>BmPTBmW;s+84#m9hdcvD$Ke
zGvJsaBH_*v8C!V51q5FNJw%@G?7Xru6YR3|T19Pn6PBGLYEL(hu%<V^1NJp~^Q8W%
zU6eO(!_g1hFFwDt9drGD{BeDL6n1wSoo3y(+a!b|C+`8;M?9TG)Mqx}B^+757*Wg^
zWObV(j)#zKl4&^oKQ}FFh!DM0u7GqQSSOQdq(c(l2Ll;Lly@-W3oKNyCb~YyWlRwA
zs7ye#KNgN)xu!c9^ANBm6m;eQ1Q^p!)QtMJO;SC+L0Vgxy%&UtPPJX0&=!zukYA8Y
zf={_egZ@A(rjj55w5>NXopc3|4vr{VnuUQSZD7j#99B4-Zb6Es$g#wypE(=-{gQqM
zyaq`=COL^^a>P-K1l$J{5bV#7#PyZNUvL^LfwD0vrqK`@g)e$|B$^=G_BCAj2oPIQ
zDFrR@0gWa(*eL=3$Cg773hE8+701tG#8|=n?9i#MFS3~?QSZzfpwK7KohF^M$$~vG
zBeQ5>2mThAY>`>l0SzT4fy-3s&fPpyqKm9=x5VzyJKH%R>Dh&0%L+$vc>-&@6r;1!
zZYji*(oy#d@M3f8jlGxBm^3w%=hfdcaWHN?;$ZO&=m4?(fC73QOi5h0k=`5<Tob5<
zcyCZ6Xw0yz$s@QC4d>sg%%u+XNCwrm(?nUBQQOcuh|tg6>DFY_d*~DUq3Db>z$&fD
zuC~pz$-y(O70eL|GACDTl8`6A<|(zwD`nxI^Vtg3DkBwwhYPy-{m6{JAXg-l)EiOJ
zqw;BzOEa8v2#o{(9Z<woiAS;AXu>5SUHTgrSTpkGdkJ8t)@7mQt<j3p#5{gR!F~%K
zGW7jIZu$(c#oXjUA?uF#WZ7MlZ*%uGx!S@Ly;7=1Q5PZ+6LGPtA%^XkNW*qPs6<^^
zl{C&*j4QYS{Tq;umG?0?Kd<uI@iM9A2rdXv+Jx>FO1cf0$6<#|U!rh%sE)@Kskc?w
zIbHi(2a^{S!a4nr87-aOD;2TT>VtzBBGI|iL(h_KPE?;*pW(_ktE~%~y!g5M9Yk3^
zce4fW$Z9O-sX&e7OPc{{J*KL$IqX%Vd7LqZve$V7li9CmYSi|+8pto1YH-P8mK1NR
GYyJ(pr|+}?

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-006.js b/js/src/jsapi-tests/binast/parser/tester/lexical-006.js
deleted file mode 100644
index b37fe0d529a9..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-006.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-006.js
-   Corresponds To:     7.4.2-1.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-006";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("break = new Object();");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "break = new Object()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-007.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-007.binjs
deleted file mode 100644
index a4f7be41d0ad81167a683f7eb09ff0c1be45fce2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6258
zcmds5O>Yx15Z&^P00{|+1E(B86-tpnNU)8dX;4$5P?4wyF38Qg$x>%GvYn<m@jv)y
zaN*3qVC?m-o%JSh(rx)TMH}1Co|!jq#`gJmL~zX?U=-92Xxyi0=w0zV?<fwY-cGZ<
z-+9&P#Ut$bRXN8eA>*~L4?XV=%<|3Uhlqygh~Qn^BZwj%#*u^y^f&WP!YG)<`UyB2
z%dlc9p~AomqmX9+=Jw41M?5?ZF_mx;8tOwcPQ$2Qy9wKL8uf1TL))*a|NN=~F|j&w
zek<gdA|l~V5gA)}!UY7Mg*`-`Zf(7=F;ncS^qQ}>yb8-s5w)kAM_ALF-vRp)y?NO9
z*eT1K*Wu{<ooAn)+m5+>KmNEpKMK3M&2Fn<+ieoUk(0Lo?LD4OVj3_T@Ene8oQ)`E
z46?ez5ywNwHpw)c{a=`tbwr3>Dpx?d5Ui8QG}0l7Z-ar1Bg(s&@dXwtSQA~J<2)t^
zc~mAK+8+x?utL)vjJXe36AC)B2Lg;~H*Up!+a{?V-yp56%-#tjM5o#=PiPCsHOMbW
zCc($tqhWub6;nx&0NT_WnNGR@NC!uhEzQEfiZ(FgeE};RPPZUMGvq|#v(JK!{(ecn
z0bYY7ACrQ_GCAU?MFQ>}3JDJ8N8<8I<1aXkl|cEJl+$PkjlyR=JQ7WiZTlLod;o~;
zxRQZZ_<+Wf0_=={|6|J`2nF>9_sZkv0b;CVes<|p*B9ALlel-{4Nw#i=uXp4+GN3w
zn2}qwumgVyOt#3Z>wtz5lfY%FbQf-(E74`vw`*c|=$-8xko5cn!<H3};&Knx9wWkV
zWxK-Z7{9jnP}-8Egz~uhd&d99O-CFkx%uoNwi{AlTLVl;UAK|l7*bplsE&AVP$y{2
zu&l)+xCssC-=@r^4s}Qd)3(z@S(!<j&@zaS&)ntKWYSyc5Brhmh%~?|Ey=dF&9uqE
zGp?1(5ehP<P-N1Or@!VYwaF`G-=Fi@3RNm65rT&cy7=ALjK3gPeDnqU>5Zu9P5Cs<
zr5VmSgvNpY4k+S^#N$L}G~v>aF8xgks~LIoodmEm>+(?Z)@a3PVV*pn;Ghi;82Vlz
zH+=-yVs847katINviz>;x4HY8Ty5itUMW?htc#F{iMY_!5yN&&q+u^Ws6;(kl{C&*
ziwn5<{2P#t756SU->kTHoJ@*2f{MUb9z!>aClwp8h`SCMzC_uIP#upeQtnA<=XC97
z9ZX(S0O#~UX0&u#uT;ENs|yZhhy>?O4?9b`I8k*HU4|>(tfnq#?vm&2HxOm{yv-K8
z8>_K`rvWumENKR$^?0hr=CD_d7IDTH%3t3NOlH5DsZrbOYM{7Os=+0XS5maCZuvK!
C5bEOq

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-007.js b/js/src/jsapi-tests/binast/parser/tester/lexical-007.js
deleted file mode 100644
index 255a8b859fb1..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-007.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-005.js
-   Corresponds To:     7.4.1-3-n.js
-   ECMA Section:       7.4.1
-
-   Description:
-
-   Reserved words cannot be used as identifiers.
-
-   ReservedWord ::
-   Keyword
-   FutureReservedWord
-   NullLiteral
-   BooleanLiteral
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-005";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("false = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "false = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-008.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-008.binjs
deleted file mode 100644
index ac103a3ae5603a82d77f9e95301a3f3687c9ab72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6272
zcmds5&2AGh5Z>~SKnMxJfzuvA6{JWNLa>dXX{x4*Le)e?oRFI}$+pgJWIIjs5WE0y
z#+3`=Ef_oAwG(d=Cv3~lDcacn?3wxIo3R5v=o4HHx)_D!1DbRw>Umc@&pS@Sk+)rI
z>^EOG+esgLK}pUDNW^&g%OlUb1G55i`4OTKIwp7rw+W(%M@cN9LjBFW(<lxnvAzS&
z+9IrkN~kFGqB!CifVq7w#4(RPN0>^u81?j_8K+U)Dc^)`n$=3H_P!C6)PF%qftXlL
zIlmrpOc9ZAXNU|eynBF0@Ojim<k`l?tLG=ohE3s1(s6;>^(w49L)4ybo?=CZego`F
zbm&p_uvwHtufx&zn=d|X+K#z=KmNEpKMK2BwN|}q+ieoUk(LhuZFj&26#IvmVS0u`
z|3gB<V%b?e?^DbeWO<V#j(d=Ol6E-zKQ~P)h!DM0u7LC*SSOchu|rbd25T8dl(#VB
zw*NBTC|DC+pW}B-5OS$ZK(sRuj$pZ_I~a2xu!a<LXAcA!(^gVXI<`$xO1?slTWP)>
z#fXlyU7ipckZ+J<kWhj@bB{)yu2xW`M*?VFZ)7^@0w5h6QM6PG1AT4aJXScIZce^t
z$YZ_FK6B{z_v`x&@ERoffaD~W$q`3k5^%dHA~>8KiOZ{#KjAc10!_!Hn8rhB6h3d`
zzG#YU+gEVq13+vfeg^9EE=`6x*ck!;$NobQ3hE7R7st;7#8|=nY|)XfFS5BNN&D36
zqBtbbt)`u|$%1V$V`|adj{GGs*&?&90~$(90+*@MoxAx|i7v9fT@$-QFKy?5q~}K%
zwybazm%FgGjTrW~d`<`WjlG4EmMkNb!`0st?l&$z;ymMv&>mtt5e2eU!GhFtYuN=N
z#WjH{h_|~Hf(8uBQrw4&QE&F;%3SJDhGZ;lJ57|OiL?$KgNXRV)ow*1y@U3!6N`pO
z11!^#Y-!s}n;bmjTDTmcAYpPfCJlM|Yo1b@yj1f2IiD?2q^1-?@NiBOzmu5p7vxHg
zPr#pEpNiI$kJ4P4;G9Ef9Qf~matjW`ld;NZ!lfZy_&ctvX5`Ih6Tr@_n}(XTMk`Jo
z^YLp64jb^Ep|2Hk)5m}<=BAGd)9x6bY<k!9+uVIct~T&cuav4$)ICVVMBL{pAn0~X
zq+y#NRHB?LOB&~!#RXh^{tZaSf-4>Xje={3$z+%#rii=$1bSIK^liXA>N+I&0%6NT
zbv&-fxTl4k)3uv*FnM16o6!cD(b8GHRP9=>EI61U@|!z7>nv#EM9~?`GF<Q`C3Q}3
zH-7AX3sIJj-E7V)vKq^I7*Hemie^As@2F~Q27A?L9%qc9>C3x;$?P{XHEMfZ4dho!
OHMrpEN@}*%EdK&c74Pl<

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-008.js b/js/src/jsapi-tests/binast/parser/tester/lexical-008.js
deleted file mode 100644
index b24b85875856..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-008.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-008.js
-   Corresponds To:     7.4.3-1-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-008.js";
-var VERSION = "JS1_4";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("case = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "case = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-009.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-009.binjs
deleted file mode 100644
index 952fefbd972d4c9dadfe711f0ddb459b3cfc6646..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6278
zcmdT|OK%e~5MJIO4j>^oaM~jXp_UtuG=io<1eJiAsGJaTv(sd$yBpcww)q|0_-An8
zi1-(b9q-y%ZxSaBL7bwE?QcA<Z)RK**^olLHUJXUKd`jV$Z>En2!ew&8U@>}_S??$
zPA?roP}@*@YBc7e{`FoE+{9fq`}jU#F*%^H13gL@5pkL*sK|Wt;3!U_NvxlUb73A<
z$`n)_1#uFK0>BpEiXaj3VGK;cCFIy#nhO>u{rWW&(`h!kt@rKPhW@X%p+Rh{j@rK)
z3t)sQxD!G%2Tz)S!dcuS^zr8AGZ!<*-cVMnX_1%k*a>0ocKZrTTJr~DuhE+O&Ara5
zta%l$-fX;k_4$cwne`j;*ZK^31x0mR-QA|Ew;d6lL3tO^US}d>5bgm7b^=lOF=Y{V
z(a&Mk=Gl+|=a}OiK?EFQ?y0zg;{VDdZ4gS$QFQ{7hk{8hTVs!uzJc0uL73<Q7c(@}
zur|86$9YtcWT{mkte;6k@JiJ^l(~&qrwm!=4bm~NZn~THU7Zw{e8VJn@_ai^2pbu_
z0?9N;-bltspcD>8z~cVE@TVpu3G~PavW@f?AUzDRYND13hDO06?kl3g<90LhwLl&d
ze(_l$Xi0+qj;c70FJrByTuMU5B+qC?V%ag`NlX&%HHj%i(><}iLiu}rc9a|iXFV9o
zmdMq82~*xd#C94MprIJB^t1xI2*9;9AZw0KtT)hGU3`8ZoUb@OyKH3Yi)yWD+B*sc
zB#9{Ys(D{+N5Qt-Q93lUAAgRF;E;l;0|rWNLX+vzT`9a&qE}hpE=%dyNxM0q!t)a@
zJ6d>>i!7ZH9Ay1Iuy89BEQ1%W7)>ulR%oN^zb9N^jXv^D<5B1h;X5(IfNP=_x%Dm-
zBSemC12u@~4H}eW98@_T;%Ia{eY~=ddXysNPghSHW#M3Ygk6L5`owUzWH7zL7O|hm
zrpN#+(v@r(-E5saEaO|eJfSdYDtRV%dH!qP(x|*p0{%OjEl{XREFt4?MkBwI+Wwcp
zl^%RSdj>-$+fy;hb7>;xJY3@u{~jpU@j@aUGmQzj+@*7W$F<e=y!~*3*oAgwsA*>m
z<LrVMzo$Ud#up7US}39S5nJxfUlz*d7~iZcHUGAyFBz+CI5j5~YpiM(l0K0$U4w9N
zeWDb5ibN$#%A!HzJze~T;phK=^eno!(D<dI>$=L0GEZFT`|ttwv~U`_fK}n^k>qp8
ztqRrix-#n?uI!$&a80W=wk<tWo>c><v_iH7li3T^uf<A(hZ-`+h1c`WoJLL-o-sA!
zz&uH-Gy1#nllM#XvU>97Gv1Q*TEzo_Ua4j^3(|Q|)oW9tSFcvZjI~rA;w?<>zMbh+
U*Xnwqx?1YRIZs%Mx1EOh59WySkpKVy

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-009.js b/js/src/jsapi-tests/binast/parser/tester/lexical-009.js
deleted file mode 100644
index d5dc0ed44303..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-009.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-009
-   Corresponds To:     7.4.3-2-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-009";
-var VERSION = "ECMA_1";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("debugger = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "debugger = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-011.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-011.binjs
deleted file mode 100644
index 717f1822c139d32948285e3eb11cf43730c64219..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8799
zcmeHNO>f&a7*_T@>;nUeU4|XB+lFGzf^8Vkx&ao)MO_455qll5%fLvq%~qB?l8Tdm
z&|}a0XFKgU>|gACDN3Y8$)+7QYlj?ViVyjIJ$(4e9huJ)df1s#5+6S1*@Tl>@J0{>
zXIXq19Q6l}hIfZiHm5;nU%k^wn2?8`he7Z$yw$O%KOvlvvxFYgC?T9kmZb_RHqRn>
z#?p8h>o36BTZff#1;yfkrA$@;_VWFhrjm^r<q9q(GqY(SIZG#p@4_;}UU$_0Y0%l%
zzjgLCh>bN=@1HP9IY|`UIZ1K{?*qU~=mm>N^7S_d2QFrby|291(M!Gw)6NNZU$?ig
zr8oZs>}&MqliulYSKfRZw*F{%@Y{E;W3Jzie_x*;(e6=ybkcL}wiCiLCqD(W2f55S
z4Ns|{{G7(&FBy-8i+%;K_Acg}3IQcPltj`Ql%7gETK(Qwqg|3DW~!P2wUba&S+>O<
z75zR~D<t7^M1@>op@y~5%|5PT0&=A`f$&L=ju4Hedl>TxU@bV1&O=~h%17BrHgRoI
zRPqPZxKrjwEG7KX*cBkr0Cxiy1AiuTECbFaQ$wGcj}Yj#S;%(MOMvun#IAW74GfKe
zRo*vbg~#qz)N6%Y@O|~zu#gGUtCD_b*Bs8thB{K_Jcn^7=R8^I9?Tt0nFuA+X~^mC
zIRpL(vpK4S@F_VbBI0Z=?-aj?JD8f03~7prB5sJ?dJp%<#<N(axO5O@sesjyuS!K@
z=ljpADhMcV%r1hm&MN?`jJ~LLy0@f_YQ*Qw8poM5iJ~M>cJ`D;5(0&VEibE0*jCh5
z!=PP_X0af3WGVwI;Z$b1y#voOnh_aI+Ywca=diYucBga#eklbSx^qq>sI@d0CuCw6
zScm2vc%jHBvzQ)&5%8gYFgC4EucIW3o-JqCYSH{HSm79AqHCb=CA!f;>YYy>aakE_
z<(47r&oN}^Cz+cfQ6`X9$<?DyDE+gYUiQVL2w-tJai;1?_S_p<D1@5|;SDV;DCe1V
z7rUW_AZWWgw;lmIp@n)Rs$y>D;vLh%tAF1{>IBi0Ck+D4Cb$il_yJ+f>Pq8XU*F=N
zrZc4;lihTI@XkmtBC52fd-QMN%3FXq$ifOVlvAE9QWv|H(wb}jC;cGIPmnF3PF=&d
za4Nz*CPFl-|Lya0#4nA~Lfv$RIxd)!G)|y(*mNn_Sn2)ndMLfOFksNwbi<_>_g5I+
zR_1*Kb43m}l<<Bic~0-SYiy_Xa6^Uqdq~7FTp}ac0~5-)?HL8HQ^d}^E?zgf3CRUj
zy^%Szsb}r2ZhNYSaK^1s*G?N{<4n2@+<-~CbeY`p&hR7j>n167s0_d+Eu#CzHrpl-
z&-k8Po=|NhQ?aYwp1n(BvZ;O*u+{gh|ITL{oKl-z_qS^)c!b6y|2<INgKU>sp<ztI
z)kE9*Txdl*^1gS)wmF7zPN*!tZP9oDUzbdmK`r_jY#iS$zw*@G(V}8^m#YK1Fj=lx
zL*MSohLzc{ZL4QYu)*FXqJiL)Vc!E$;d!z|R36aYt=^Z=iGDpGJ>~p|;C%bUb!*2C
zx+f?WWB4VgS-J>az_JK!V2_ZmVYVhz&+TH#eYLZF`s!H^lUE&pEjq|{swwM@4zJD5
z1rIZ@z_E+o?&30dYcA&~X$oG3E8a4vt`K*{e-B<jl+}L^#EOsldaU77jUK_wb}7w*
zbiQosv6k%BqfI%Zhj1^oez&!p(^|1+)jrBtOV!%}dI<L@+^?c~)QzGZXg+%N;F^z<
J>JV_$_rG7QDF*-m

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-011.js b/js/src/jsapi-tests/binast/parser/tester/lexical-011.js
deleted file mode 100644
index b6703284269d..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-011.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-011.js
-   Corresponds To:     7.4.3-4-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-011";
-var VERSION = "JS1_4";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-print("This test requires option javascript.options.strict enabled");
-
-if (!options().match(/strict/))
-{
-  options('strict');
-}
-if (!options().match(/werror/))
-{
-  options('werror');
-}
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("super = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "super = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-012.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-012.binjs
deleted file mode 100644
index 7f55206ac98ead7d1b534cc3b8097ba0cc857150..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6271
zcmds5&2AGh5Z>~S00{}ffzuvA6$(WlBuFD@nyRUyP&HAJxF9#{CQF^&$ab3M9e4uX
zj1x!1TQK%|*G{}ioOD}$PSM8pXV1(x-;7=6!vVpSau1`RvQOhKMSbsz=XpnQF!r|U
z&Arx}Rwo`{uUwLI$|PjG^7WDD-GNzUbNL~nAvz*>8+Qnzh=*|`p#uHQypu2rCb511
z&e|fZm`bQH@WLqM8GyNcJ-`tUk3&o)T!i}i(2UbC>Q-*THmzE<UH{N5m(+jdk^(WY
zT5^6P<d`BN;Z6}5T6n?*1fPW+M4mn0cwu9v*d^(;vfA=0EIUQio^BptMQ?rw>`V0K
zVeOz*lsB)#(f3*#pI_RJxqLtVygWY&yW914qh{M}62g&_4*_jw$cGgB2bf`ciUa>+
zOao@4pTn!QvjN47L5jCH;<yi~CuxVX|8sM+iU`q5<qF6hf^}w@7CU70ZLpScM0p!C
zKF2}@YohCOoW}&AmC6J}yF=j!mTS6$G4}y$L_u_RL5(qO$Bnpa+a#sr8|1i^=38Ne
z=vdq3384Y)1}z5tB>0$nH0<`Yd@4N>K<j!V(@7Tq>EMW>by^tcYXdXh=di-zbaV1G
zLr(NQ`^?$s@7MPm;5A6{A<0QBlOvA8B;a;XNN_Ma5|>vef5B<21e%UXF<pnyD16qz
z1JM!Lwy)sI2Y}d&{S4ISJsOX4urmVwkNt-r6x18sDUP4}h_QnC*`{M%Uu0)Z;?9ZJ
zLs3AWRZZJ!lLcF1#?+#@?f7e8vPEWH2Q-wJ1TIshJ9qP`5?y3{yC!yrM%vB+NzYF(
zY+2zbF85$<2k}nN-}E^h;<xr5N?Wp&P##x*Px#-s_J{)|*Pva*wnGYRtAPor>(;XC
zLyBtxRmF*_1PvLMwRiy6qW<iwmATZR4#{BJcA6+lGie=K1`+a!i`|M$dJp|!HxeC@
z23V#g+0?d~HaU34wQ@N^LB`~YOd9g^*F2>*d8zFCb3R+5N=-?G;NhGuemgefFUS=i
zeF1-Z11fq`K2CFKf^!a`ap1oL$}Kn$j}w{EgiAxZ@HZ)}X5`IB6Tr@_n}(XTMk`JO
z^W-fB2Tgd*(Dw?t>0`habJJIaX?G+io8C43Hg{i<t4%!8E2U}_brBLV5f{2DV%Uy}
zH0%`!m8d7nlE(RJaRE1<e*@C7;@$=4n-$lNlSwg0P!V|l33Rh~<lBIG+;zzC1<IC(
z>Udm{a!(68r)xj!VDh{IIHM0Tqovb&sp7R<U2rf%Bsh0^*jdoUiK>(6GF<T{HFZvN
zm%MeqgDA_lZZ_u;S&ij94XBZPNi!g=msB-2gS~1rk2A*5^!44qWcI6>8nwNy2J%a#
O8eH&rB}LonmVW~iRPU+)

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-012.js b/js/src/jsapi-tests/binast/parser/tester/lexical-012.js
deleted file mode 100644
index bed3322dde22..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-012.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-012.js
-   Corresponds To:     7.4.3-5-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-012";
-var VERSION = "JS1_4";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("catch = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "catch = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-013.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-013.binjs
deleted file mode 100644
index ce63ba5c86efc04e7eecdf0b94e8ade1d1412285..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6275
zcmds5O>Yx15Z&^PkN^q6fzuvA6$%wd2uLGnnyRUyP&HAxAR#yFCQF^&$o4kPzu?S2
z<HQm1FBp5hYbV|$PMVgFQ?#-D?3sD<X6!Og1_W2iJ&c0NK8?E+^}Q>e=N-kt$lIzn
z_gZgSop^w~a!Jl9laTSs*GHar2WFMc<%fud=!oEL+#!e}9>$S`3iLPgPQoY{$NB*{
zYxA&TDxt!_3!{+d0Ot1f07pDL4l$K*5$fwhGfu;(Te%6_v})CM{X?@{Qva1p3dF=}
z$@z_tV~U7`J4Gb1@PrEpJ_|dDJbS+J!p6+7OVVp)wdGY<c8aJy-8{mQ-uw>Om*~yI
z+Cgho-n<S+-)n7rerY@A^8NVp^86_5Zr9t5nr*j92uDsn1hk!mClvb!m|=Q~1OH=8
z17@S2!>hHk0mY0#inlo8xDTl(X@~Rw3v;xJ2+>RB3dkLTb!M3sJ7n~2u$FN|c^fl6
z!$JjXqU&><#{{93$^=BaiEsofG~L0N`+zm1AUeCC#+bI_M%=Y+l2Y;wa@<PutuR7#
zr0w#A(13P>7K45ge9S!>c6(Yrl^zM8b-j`4qziy_aKx&0S{UeS19RRNu)^VVGx9Y@
zPW3+jEZFGp*Y_LXHAwP=6eO0(5l3MXa62d@IG7%Z%d3;W;51eOO~zz3U5C&peAdAO
z(Gl6UFX74ufY^-v9MtDM8V?Jwa{~U4{f8hF)EnGc9Y6OGV=Lxon~rpSk)1V(J11Tb
zMFD|UHEXL)7Ho+b6N_fH<FA3q7MXP&&`@F$xJ;Gq!p$d2^eXGyHL*K1(sm9=dVYdo
z%L+$vxd&?le2hS>{7s+J1i!U+QR<Q>h4Q)jdn^LR#YY?|y$J0hwjEO7TMdlJoVS)=
zATnGNsET-}S0yN6SXSc!T#WkDFIVPLhe{;FY1?U{EX<{KXc|P&$F6oua_K#Eh}}r^
zL>gd`resswX4>T78Q0q72n9J)C^K2evtRR++T?}u@6Y*cfjTuI5`u>_`uOeGjK3gP
zeDnqU=?$ppPWdRyr7_MqgvNpY4k)+aKs-)`MiVXz>D=G6w3?AOpG^Qew{8+@+8V7m
z4b0Qm6dW|+Jwx9t<fe}STg=Vg6(-%0o@{d0?AzRZNv<~WP_LA#v8t<(h>5t;RT0B>
zOr&A2K&V7TS(G%+mx~Ly`}`Y_jy3l#IDfq6+L1Cz<_If7?>~W#77u+Ju!y}5IX*|*
ziclSoE0XT%%FgN9(>j<us{~Hzgv@B^#9pX;Emj#E%n&KgogR1Q^l_r@q{<A}ym3{X
z(cY!+-R~gE^1YkQct}=b1<wO&q*&ApNb5CKjZI;%8ZF|CF*JFFH!zv~a;8RYud9LL
PVyOn_JYY%Lw)*AYVuSI0

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-013.js b/js/src/jsapi-tests/binast/parser/tester/lexical-013.js
deleted file mode 100644
index 1fc0bf38a5b1..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-013.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-013.js
-   Corresponds To:     7.4.3-6-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-013";
-var VERSION = "JS1_4";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("default = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "default = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-014.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-014.binjs
deleted file mode 100644
index eb56f5bb305454b7b6540363a66a23415a134977..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8806
zcmeHNO^@R=7|!s`1&|OIPC;BiD`r@+5`yiH#B{pau0~}wEz1Q7c@nqvY?>6?nRfmG
zN6!2+u3QlRg7<Zt*o~9c?REzS%`tWS*zecl$8Xw^`8=V=ohc>p@iU%HIGF{n1wn9;
z#n-_}fADnp?J&ybH0T_ucRC3Z^7zv*2;PIYI`;JEgfnuH&{G;EgcHfKR6)h&Sp+Xw
z8n0sg2{;FvurjWoSRAmF$qK+;z8}+6vN5Av!KGwoHZ3G)>E!rrSZ3Jkj{4sZI!F4q
z&XESOv4-mXGbSk~iGsT#N$%jG3lh3y5lO!I^8SOvOX0$n@JGsV9lh%7F!PFV_jP+0
zJ390az`j9;KJT3m_vO$xVe3za_kVuiI_Bp6_}9((5$zuJM`u0PZaX17)AA!gdz{Oh
z)9{=M%CBe~{+RK2zuDPa&N&qVs(dJkq%){Km3FlHy|GNYBuUIvH3P~gp{BTOi#>|^
zU9eV2!sUnx>H4qA8x3otn|-{D2}qaP1i~jdIzlv>?qSRafVJSjJ5PX+DIaBL*~GO;
zQOWO6<4&2Mu$1s?V^@Gg1N04a3>2Esu?#qyObvr-K0=^-W+B^2uK?1+5&NcUG%z#<
zuFDFK-L0wD3c29>>hV^jAKEpCqq3onlsUh`xRZ09tn?7(j;2h666!SM^p~6ge}vf_
zg+h2qu84>@o6E!E7jcNG8Oe~QC@SKH*lqT3e{2dH%M_OmqAV4#I`UO1YV3UfVO<3Q
z<&D`gDC@ieu*&F@YNrP)@~B39-mGz&Nvoc5T6S?sBME`R!j{+7CTuHet6|Vyj%KkS
zbz~|7EA3QfxxE9=GMW(?P1_MwjOVbnlXmBH0)8nq8v12UBnY-N7$;<67+8nqEqI~G
zD6^Ozf)VhcelRv|POp<Bi(af|*m~Xk6<FaIVxnuH@Flv{LF%1P9&uS4Yvq<9?9VY|
z=%<>SB2gxgR>{?)PAL7eonH3cqzGVfKXIn&N%q`3S}25@3gI0sEGXxhbr-v%g&=6V
zKDQnLd!dDTB&uR==Hflm!hiq1jnoOEDNh;%noV$9F!5u;n$?xYyScu_-%V#qJtq5U
z1mT^LE+eY6r+f78;K~mHagc=-Xeg&VTcj>_Eu}Tr{7?Epn4ch9K%KgV@8DE~dq#w4
zRR6o@=ZIe$rG>ib0(D$4C25>M_ps?wu(i_r=5{E(H!xt(+jPUF822X_-c{zkkI+j=
z(^!O$LdkRb&|PIWy@y*W^xqRAPT?9E$sQO{M()69c%3A6?sf6P(M?D$sOpZ)p;tX?
z?|0i%J)|>kjk<Q)C|l>!Jzxh+)0OMwj<<&Ipkp^lu}5V9wrLVQGPc<^d3eV6?DB+a
zqnV0d_4e#t8k0@^tAMS)Y5jXX+v1$s?!v!YQ^6xN9{KNq@(yIX%nB7_60RQF*5^Vk
z+L8CYEw;@ujB`e1@qvrR1Ng*b`V4B(k748ZZuy<3?v556yT4o=(1poz#Txp4SGKIo
zhHYCtV}dRAE)fj`rwscVhzd`X6{7Nh_HOpRf?o9Pfb<mf_(5{@%yp~B4!b8TmSgxC
zC|bG*UBI#oZD5a}Z{W5jRL|{V(S5$Refnxz50lp&fh|hNcB(1tt&XqlP6iJ%u*9*G
z-tOWucpEP0C~693hHKs`tFDoE#a|G9gD9)NAc!^J_Vrl9=NdhNneCFA1?ha<)?+Q%
zt4Eu1Mi1d$YCUgjIj6m1&8mHvv6ia01oRN@QMg}5^{5*~J<xpk>cI^kDAh6G=<k03
DtL`hr

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-014.js b/js/src/jsapi-tests/binast/parser/tester/lexical-014.js
deleted file mode 100644
index 05f0c3cf9107..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-014.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-014.js
-   Corresponds To:     7.4.3-7-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-014.js";
-var VERSION = "JS1_4";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-print("This test requires option javascript.options.strict enabled");
-
-if (!options().match(/strict/))
-{
-  options('strict');
-}
-if (!options().match(/werror/))
-{
-  options('werror');
-}
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("extends = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "extends = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-015.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-015.binjs
deleted file mode 100644
index c0d1fe40b62679d11a87731c0431a171da147b81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6273
zcmds5&2AGh5Z>~S5C{pufzuvA6$+IAAxI-=nyRUyP&H9Ga6oR>O-!BL$ab3MC3pbd
zj1x!1TQGLKYbV|$PMVgVQ?#-D*)#LaH)9t?zejPY*uf|&?X#rKP&c>|1i?`f4TG&}
zeXsGR(MozaC>GS5A|+guzCH?qJ20zgFF!<#pd*U6af>2`1W95A6`5}yoRByg$NB*{
zYxA%Yrl3d^keG-Jz}~(Z;aHGkf|-JgQP&)r3r6C0=_YK`sFa)45A|X}|5q$%5F4wZ
z=GTb83{eGlifG@#lP;k6jI<Da_I%@|i<x2<l-G)S%d4>L6ft+YeS{^w`5mw?(VK^r
zgT|`7c^!_v*Vy>{!gb8$`|;=H`BB>4tTt;E*KV5-o}7FLXght;XE;2-9J5m#g&z|Z
zaTom@Uag$<80H*OydjXlT}VAeJDmNWo1<k!sadL4K<-d%GRwBuBcpGFwOk-3nwX0j
z7HU`<-JIh*CP=N+CLq@COGofr(>;v24_E^RqO%KXj9D|OC2iLxB_-b=$DK6aA~9k^
zV^<)B2DBTr81$3kV-YaY?il&hdL)6?%|^D9E&$TQ5v$f|X<%p!%y^%}3Xjvx$kz;c
zr1#lp&PIQ~zTW_^L6Y}rPGZ>{@f0Qrw}S}9(ey}MUY+~}r*RT!GA66(I;2M7vli~j
zj>xrr30FP<#Cj5DprPonWRQcM5%7QPKO~``-r&~i__>cbUok(MY-s9>>a1zfIte-`
zjwrOMX<KcxU`x)JSTwU8e+^7_$ZYC>fs&KJWx90dZaz_>S6Sb#$=#umc5^_{^Aij^
zR(OibJy^>JM6^2LW++%6zjZg!;*#ZrcDeq0ECANMN1kYO586e1n=qhT1#C!tx0c->
zQd}FTjNn9NiuxR@V%&p!QFr>?%3kVGh*UIPJ8hJOsk9C~gN*su&2C95y@v*|9m|%;
z04&mzY#Q5an>;+@Te>`<AZ2n@CJlM|YoF4Xyiof6IiD?1rY1B(@^D5Qzn$3em*h&0
zzJNc29+S<f7^b;2#yOABc<|o?<rW-BBqN<MgiAv@_jgoT?a14&CV-t;HwiUujZvH$
z7Nf@$9M$1D!(1%XrjG$z&P|^cCfzYQ+2pS2x4rw4T&?4QS*cWGRW~6S6M3U6BaYpe
zD8pWXP|1R_C~3U!78h{!`8OavOYU88{#eO%17&l}6IDh&d;<L}9)vDn9(g@de2%o`
zp?V%y=G@bjozu6Y^)Pu>1)S0d+0in2y-@X9tT1?(Av0WfJ?+eC<7C+x2{T;s#zl2T
zcQ<<Neg{!juibpcGqN7bc^uFq`I=@yI&Z0ZYzlkzXdY**p~(xpg~{D_Gd=2hT@U2f
PN<BE|`AVs_(=Pu8Q#|m}

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-015.js b/js/src/jsapi-tests/binast/parser/tester/lexical-015.js
deleted file mode 100644
index 7d8c8e80bafc..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-015.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-015.js
-   Corresponds To:     7.4.3-8-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-015";
-var VERSION = "JS1_4";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("switch = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "switch = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-016.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-016.binjs
deleted file mode 100644
index 8c60e0ac54f0169e8a138683c23dd4c6fbe13aae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8799
zcmeHNO^+Kj7@nnkiVq<nE{MZ$166dXpdit7rEWG=Q>{X^2}R<9yfaSXb}}>A&Sv)?
z^w=~1j1x!1zu<j6p0P8YNt|rDv}lhLk01N}di?mEbmTlw=s{;nNqq2_XA@3l!5cvk
zoM!PwaM&L_8vZzpvYZB;ef3T!VL~2!9tOcj@K(p3{)BKwP7``Wql9oGS(YlO*gT8i
z8B613tiJ$fZyi>~6%>mDmNHoZ*vt20no2filq<ND%*>{R<Sd;WyaUS&d)-n0r$J|5
z|JK>pAU4)ey?@Lk<s?yXXC#?Bc<%#VLeE)5lCQtH{k@A>V(%-jb@Y-qVA>hs?(6mz
zw)EzofPIDDe9}7^?#i2Q!PXxQZ~yk4>zJ$e<KI{3N3?s?A078xyX}PV%*jsy?ZI5m
zISo&!p!|%+;V&7Fg^PX(ulCM!PKAIHA4($W3`$R>9j$(EtkEt>5;IlJfZ9o@sVv)K
zkBWW|tQC@QIif<Yuu#L==w=_6F#)+!n?U$vj*bwGrh6FkF<>n?kj_J3W6DR_aW-*n
zQdIH>)VNdThb$%h!q^oc(ExV?7XyDLbSwkTCR0P7nvW3Zrdh~#(o2B!aKx^88VwAM
zfmPl&WQE7>R@7^ST=0GM*szcZ)2otxXjcyBWJ4V(bDqPvlXIS|bQk81rc8tq>NMo^
z_c;Up2(uhjLim)N5fO2g%Ui`S;ufZ6Btx2_qKF$}x8B43vGFXHDJ~sESt?+4<f~HA
z*!lkRstN+i8?*DEtn&)MDx)u|o$f7ZqZ;vfv&K;-O`<3Xl$}1Mk%T~DVatnZ6Sft#
z)i7w6qggCS9hu6&N;s8SZtuXejAlee({@A^;~ds@((Z&#z%QjhLwDvxf?7+1aY81B
zfpuu!h8K#AGK=XU7y%#Z2V>Lv^g2wk=-G0HtrpGSf)$P-Cb|X+U!ofwq~7`D5to&*
zR&E)>{v1Pwev-K<5@iBum0UgQgwj9T>1AI`iU1au6KATPWY4{(g+jQg5MI;5f^wc&
zcd=_)2!gh|bL$bX6I!T8qAKQQF5WRMy!!WTq)re`^Q1wb*#x%%6F(rVSzT$otLt0*
z({!fPW3rnr5Z)Q-c|?`=bdUZmT=@wg4zjQU4ds+)i`2!grL^Xn|4Bax^AltXs8iSQ
zEu4yQkBJbC>VNzE9PtaIv`{ylqK*ruB#jej9X4GGHdcB+ydFyLO$-<`Hr;S3#{CtB
zx0QJx!d&PA3lZK6C7;u~?i$;vJ={>C{vHx>1eeH2_P~TPZhJ<->lCpwuZ!1>ZbIgQ
zs@_NrZR%NjtJ|LHA)Ik*)V0$_**KGK0ykiiE?p+KyffT~e%&O+4wV7eq(yYk*k;@0
z;ThkP%M+@NWGZ&m+p~9ROg7c80=D{|_22nygHvj=>;85v1&`2p<i7{XyO8ZND>RHr
zxO!+?p9`&MN8b0Y*fz&7&M}q6w=EhE;Omm<GN?sAgN@_6<yW4%J6cri?s9cN7beRU
zYv|iu*|0Jjwr%x{2{zcfL^KebGVBfz6`m(cMCAeP-RgY_o#@vC(o@cV0M55hT(@@Y
zpnHO1F@|4)nx%`-1uTou2KET~8fI%k_1rF&+*do>r>~y%FnQGh*rJ1Mr<$_f=<wR?
zT<|ah3mm)X?Jh2Zx8`z=lBVEgxZ*8y>I!jJ{P*AmL|Og!K&<$vug4lb)#wq-Y?sn3
zNaxG89&5>7J=&BrdI<MY>vvnrIjt3IR_&vVwN$+wpoege!u=|$N8Kpuf##!E53cz*
KsSW{0eg6w)dnnof

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-016.js b/js/src/jsapi-tests/binast/parser/tester/lexical-016.js
deleted file mode 100644
index 419af22c0e99..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-016.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-016
-   Corresponds To:     7.4.3-9-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-016";
-var VERSION = "JS1_4";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-print("This test requires option javascript.options.strict enabled");
-
-if (!options().match(/strict/))
-{
-  options('strict');
-}
-if (!options().match(/werror/))
-{
-  options('werror');
-}
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("class = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "class = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-017.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-017.binjs
deleted file mode 100644
index a1e0e6e591981f371c016327a719040ea662e56b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6265
zcmds5&2AGh5Z?0tb3sCI;Iv0jg+dV$5~L9{P1RIUsG6ufA~)+MOP$@wcADk|cnIE%
z6Gy~bF!p-aPP|E+bQ^w7(Z=>?&&)U9j9uo#0l}4W52K)RNaHR=eeZ_nd8ctO_IB#c
zgVwuNCmvw0T#|FjBxJnu^{MAQgjr>C`7xp)Iwg1)cL<`0hjApK0{zXr^Dqh~v3>x~
z#v-hkN~kdK!YJe!fVq7=z!4A6LQExGg!=l>jMFgcR_?+!ty;BR|I{p()PLoY0x_{#
za(*M^m?9$KE)W@7c)|q)Uxpn-UcTCTYh$L^CF!-Y+VUnWyFk>QZXRJpZ+-{tHG1>7
zcGN1$o44WU2d%BoZ*0e`-;Y1n=SN|8yWVcpY`aZDICAm{pzRI$kYfJ`GfXdV;Ge`a
zU^e;{yjr^)P|O&lc#9*B`;dB)b~yV#H%F_85WQ5cfZQQiXO?NPLq^{RYZ*tBw=v^$
zEL5;2x<1EMOb}YBOhB|d6pmoIraKt(2(U&JL}wq=7}Iv#h`Y8;QcAu-j$3KI6Gn)R
zwOyVN8qjXgV$e^5&$vg!Zcodn(jx)1sW&p6bPbRWjwo8Eg@L{{Fynm=D;!QYCtow<
zMDMfDoQ?i|eZK=<gCrl4oWwFY;wVf4ZV!b72eTuwzB>5}PGcp|bWDorI)p~y%MKoh
zj>xus1y?=>#AfVgpg!->c$9;k5%7QPKLnwm-r!Dg{5(XA70k~z9qalcJ8Kem&b=Or
z0s^gS+E$w^*by_P7R_zP-vE;>GV3~^p~NI`nJV46n@^SKBJ0~Nu{$)<b`D5-p1`nW
zg`>DUfVDyFZ~L4M@q2p%B`jG!D0i#BC!BBGdBkawJJ3F2yCDUt)!_W8-!`(lLyBtx
zRT1y>sss%gmW6l#ccT96dzHD=p$N%H+IE^KOVel*`UMg1iCf)@H2Mh5VK)-(kOo+$
zAKBKnnKn6i#<grYLP5IZDoh&k^w&J4HhHPk`*S{9qC`#UgW%zu7JfH2<1fe+pMC*<
zdIKsNQ$9{}X@YYOp>g291Ij%(5RVg$(S%Dwy6`uts%GTP7ZbqFteb|KwMHvW1M}n|
z1qV%d%Fvezx#=^&7IV`lg=u#rC!5|i{Wf=Bk*iHS(krEE6m<&{F%h@9Dq`4<i8Smr
z2$d)%%aX?VUU3cAo__<<vD^y1$jYr9B$Ho`h$8C#bLeC7$hQIWi0hEv3uG-1)$zC@
z-(D1UPS;M>!Q^?>Z$=YjMoZ`PQk84DqTpbL$ZqcRq_d!f6D21RWw_i;3hJEBE_vnt
z08y5&+-%PCu^P*H6i_4idS*acZ>VZ)27A?L9%qc9>5IF8$?W$sHEMfZ4dmBJHMro}
KN-DP1D*py;ne93N

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-017.js b/js/src/jsapi-tests/binast/parser/tester/lexical-017.js
deleted file mode 100644
index d7d33b4f0182..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-017.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-017.js
-   Corresponds To:     7.4.3-10-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-017";
-var VERSION = "JS1_4";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("do = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "do = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-018.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-018.binjs
deleted file mode 100644
index 8d7deb8b9cf35de802a770077a28cf6eb5c561f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6275
zcmds5OK%e~5Z>}eNPvXkz-f=53WZ8YywV7orfRAvR83SaNXX5)$x>%Gvb|07FF5nh
zIB`V$3&vjW+KD%blcwcyiZ-@CduG1*X6!Og1_W2iJ&c0NK8?E+^}Q>e=N-kt$lIzn
z_gZgSop^w~a!Jl9laTSs*GHar2WFMc<%fud=!oEL+#!e}9>$S`3iLPgPQoY{$NB*{
zYxA&TDxt!_3!{+d0Ot1f07pDL4l$K*5$fwhGfu;(Te%6_v})CM{X?@{Qva1p3dF=}
z$@z_tV~U7`J4Gb1@PrEpJ_|dDJbS+J%ErvFOVVp)wdGY<c8aJy-8{mQ-uw>Om*~yI
z+Cgho-n<S+-)n7reqlT2^8NVp^86_5Zr9t5nr*j92uDsn1hk!mClvb!m|=Q~1OH=8
z17@S2!>hHk0mY0#inlo8xDTl(X@~Rw3v;xJ2+>RB3dkLTb!M3sJ7n~2u$FN|c^fl6
z!$JjXqU&><#{{93$^=BaiEsofG~L0N`+zm1AUeCC#+bI_M%=Y+l2Y;wa@<PutuR7#
zr0w#A(13P>7K45ge9S!>c6(Yrl^zM8b-j`4qziy_aKx&0S{UeS19RRNu)^VVGx9Y@
zPW3+jEZFGp*Y_LXHAwP=6eO0(5l3MXa62d@IG7%Z%d3;W;51eOO~zz3U5C&peAdAO
z(Gl6UFX74ufY^-v9MtDM8V?Jwa{~U4{f8hF)EnGc9Y6OGV=Lxon~rpSk)1V(J11Tb
zMFD|UHEXL)7Ho+b6N_fH<FA3q7MXP&&`@F$xJ;Gq!p$d2^eXGyHL*K1(sm9=dVYdo
z%L+$vxd&^Hq5Kgt@;7}>6a3cRMX5`k6w2r7@39CN7awt?^dhv2*mg*PZ#6I?bKY8h
zfyi)8peo{>UX`GPVOfm_a53snzg(G19V(Fwr){T+vM`s{p=l67AG_Ku$))$uA$B9t
z6KQ}&nvzXzn`x7SXIyKSBNXIJq0D3<&wkBQYLgerzdz@*1?tp<NC+Oz=;OCzGyZ~H
z@zEFXr#GOYJLRJ+m&Q2f5E=*mJD}Wx1MxT&8cnz?q;r4M(rQNDd^Q2>+`37qX=}9N
zG%!zJQ*h9P_Y8frkefaRY%w=`SD181da}t~vu|_vCAr$fL%mX}#;UGDA|~QWS49ll
zF_DJ71fdcYWl_>NUoI}-?(=UzI@a8~;QaBLYe&i?nIo(Sz5fI{T0Hb^z#{fK<oFzI
zD?)WVu1LD4D?6uaPwQavtP(h-6EdTv6MLcZwOD0vFhis`cY55J)5nRrlPWV@^Tt(m
zMthgOcfW%u%lB?J;~`m%6+929kz!FZAg$L_H8zF4YP5(m#?a&y-oRw`%b6Ory{-m|
Qi=`Tz^MEB~+v=Bp19naEmH+?%

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-018.js b/js/src/jsapi-tests/binast/parser/tester/lexical-018.js
deleted file mode 100644
index 4d151e67bd14..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-018.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-018
-   Corresponds To:     7.4.3-11-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-018";
-var VERSION = "JS1_4";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("finally = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "finally = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-019.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-019.binjs
deleted file mode 100644
index ba6774fe3e5fc5665750170f4b008a5f4149a678..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6271
zcmds5&2AGh5Z>~S00{}ffzuvA6$+I=2uLGnnyRUyP&HAJxF9#{CQF^&$ab3M9e4uX
zj1x!1TQK%|*G{}ioOD}$PSM8pXV1(x-;7=6!vVpSau1`RvQOhKMSbsz=XpnQF!r|U
z&Arx}Rwo`{uUwLI$|PjG^7WDD-GNzUbNL~nAvz*>8+Qnzh=*|`p#uHQypu2rCb511
z&e|fZm`bQH@WLqM8GyNcJ-`tUk3&o)T!i}i(2UbC>Q-*THmzE<UH{N5m(+jdk^(WY
zT5^6P<d`BN;Z6}5T6n?*1fPW+M4mn0cx_{**d^(;vfA=0EIUQio^BptMQ?rw>`V0K
zVeOz*lsB)#(f3*#pI_LHxqLtVygWY&yW914qh{M}62g&_4*_jw$cGgB2bf`ciUa>+
zOao@4pTn!QvjN47L5jCH;<yi~CuxVX|8sM+iU`q5<qF6hf^}w@7CU70ZLpScM0p!C
zKF2}@YohCOoW}&AmC6J}yF=j!mTS6$G4}y$L_u_RL5(qO$Bnpa+a#sr8|1i^=38Ne
z=vdq3384Y)1}z5tB>0$nH0<`Yd@4N>K<j!V(@7Tq>EMW>by^tcYXdXh=di-zbaV1G
zLr(NQ`^?$s@7MPm;5A6{A<0QBlOvA8B;a;XNN_Ma5|>vef5B<21e%UXF<pnyD16qz
z1JM!Lwy)sI2Y}d&{S4ISJsOX4urmVwkNt-r6x18sDUP4}h_QnC*`{M%Uu0)Z;?9ZJ
zLs3AWRZZJ!lLcF1#?+#@?f5HTvPEWH2Q-wJ1TIshJ9qP`5?y3{yC!yrM%vB+NzYF(
zY+2zbF85%qOagz?=X8kQ+IuK%$x=djT>U-af8*LC4wPJjb`jeSDX^^uCZw)g%dQV8
zt_f5{ywj@^G-O!T;sIQX`m?WA=2C|`B!g+&X`(F6q;+T+M93#Db}KUJJ@kj&NOVLR
zV40R=Q`=_R<lq_C%H;?J8IvnAX~@%G^OV};rLynO`D}?QH6;;(hjY64?bwXJAXj|!
z1^np^sOU}kIL)OA&N+m}f&UIDx8OiLPGm+CE)D6z-=wgbkvAVr06Vj88fw-WtvC(L
zleZKcG~qQv-z(&%j{#fEO<xtJ-I1JZde`*Z+<ir^Ht|TWl&VqGMM%U%T<EHZVLK+$
zu$LfIqMj^E8t1FU1>Ai84M@j|dl#H<R$MzyCdC{<Md1A>0E<Vy4VcGWhYVk!Y<Z}T
z#}z5}w6Jr!_OlKq&ntj4`XDn}I<1!~Udz=52Qx&1bEk)$1znt|I*BgB6>m~g=QMZ8
zTlYJNvV7}ia~_e^SkBXc8p)S51JZg)Rbw;Qt48xUV+>7S-wjM=znZC0+v{o|zf`Kh
M1&>!!w5@LWH^S8L6951J

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-019.js b/js/src/jsapi-tests/binast/parser/tester/lexical-019.js
deleted file mode 100644
index 0280b77102cb..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-019.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-019.js
-   Corresponds To:     7.4.3-12-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-019";
-var VERSION = "JS1_4";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("throw = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "throw = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-020.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-020.binjs
deleted file mode 100644
index bd74082c9a61646f63217d75f6546cf7219be058..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6271
zcmds5&2AGh5Z>~S00{}ffzuvA6-q%MBuFD@nyRUyP&HAJxF9#{CQF^&$ab3M9e4uX
zj1x!1TQK%|*G{}ioOD}$PSM8pXV1(x-;7=6!vVpSau1`RvQOhKMSbsz=XpnQF!r|U
z&Arx}Rwo`{uUwLI$|PjG^7WDD-GNzUbNL~nAvz*>8+Qnzh=*|`p#uHQypu2rCb511
z&e|fZm`bQH@WLqM8GyNcJ-`tUk3&o)T!i}i(2UbC>Q-*THmzE<UH{N5m(+jdk^(WY
zT5^6P<d`BN;Z6}5T6n?*1fPW+M4oND*sw8E?2`0aS#5b0mYpJMPdAUSqBp+-_9c4r
zuy)WY%A42W=zFc_pI_RJxqLtVygWY&yW914qh{M}62g&_4*_jw$cGgB2bf`ciUa>+
zOao@4pTn!QvjN47L5jCH;<yi~CuxVX|8sM+iU`q5<qF6hf^}w@7CU70ZLpScM0p!C
zKF2}@YohCOoW}&AmC6J}yF=j!mTS6$G4}y$L_u_RL5(qO$Bnpa+a#sr8|1i^=38Ne
z=vdq3384Y)1}z5tB>0$nH0<`Yd@4N>K<j!V(@7Tq>EMW>by^tcYXdXh=di-zbaV1G
zLr(NQ`^?$s@7MPm;5A6{A<0QBlOvA8B;a;XNN_Ma5|>vef5B<21e%UXF<pnyD16qz
z1JM!Lwy)sI2Y}d&{S4ISJsOX4urmVwkNt-r6x18sDUP4}h_QnC*`{M%Uu0)Z;?9ZJ
zLs3AWRZZJ!lLcF1#?+#@?f7e8vPEWH2Q-wJ1TIshJ9qP`5?y3{yC!yrM%vB+NzYF(
zY+2zbF85$<Cyp5RH+@cr_^rK%(v~bGl*iTI6aF`@J>o#gHE0*H?T`Z7YG6X@y0z^3
zkm8y^Rm3~JDnUbrWi1}SwWvS)YGp2Us6#TCww)%*(o9;1mO+Gk;$pWVliovr*o{O-
zqyd&`Nj9}@rcDl>ajjgAP>?aXB9n$Z{WVXiO<pSd{+!R2s8UlBA$T~ai{FmT_zQBy
zM_<67-hhhUl#kO~n&6y6XdL+OfN~2C#N$L}G~v>aF8oajs~LIo(FCwF>!zV*t<j3p
zz&v?N!9f#VGxWVeZu%Io#oY8&VcH$Z$)<Nrzs=oO<Z2U-^h&83MO}nMOvHt*iWs(I
zA`N>5LM7_SvZQgoT3o=*=ih*Ithjf<`DVqn<786I5mW@;e*)bs9{Dz49(Nrwe1Wp%
zp*kK{q}<cO&gt6EI+#4K0M6)x%xLMfUaEL4R~H=25DCtm9(ERVaiZ!Zx(rvmNll&8
z+$C?_?;y(Zt((nxL{?)tPXlTsU(yUn>m^l<&0wz@&Et$QG<|(HFq!>orbcbAtAYGd
OsRkE3UP;lmy5-+F%<u64

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-020.js b/js/src/jsapi-tests/binast/parser/tester/lexical-020.js
deleted file mode 100644
index 7be919181b98..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-020.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-020.js
-   Corresponds To      7.4.3-13-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-020";
-var VERSION = "JS1_4";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("const = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "const = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-021.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-021.binjs
deleted file mode 100644
index dd38b63a2dd7367fbd80008b2ee8adf3d1780f4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8801
zcmeHNO^@3|81_;=ia-bnap8d68>nKJ0^&f^mActf4O&9A2}PXHtUXD*b?kIzyxIK+
zJ@(8$gCiHjzu<kxW6#86C*w35w9+1(@jNr{*E7$&PDf<(m>zbfl!S-RSUO>3=Dp>4
z-dP%6c}M-hkHa5^K{}^i=Rm&Gi6br!KleTFBY3N0PJd2VM9yM*OoNy(BBC^rP@#V2
z-is&+m$Ci^oV|5eDU(o9=tW5+N&s{Den=A$jU&n=Tta4g(_FA9nH;_c%M5$nQUB*b
z=Rp0|IZz-b)=<8G5(&ykEa5IloLPA2f|y=L0g1o*`kM#)=iG)Z;18tZI%?HBF!O>i
z`*m{{8#?qaz}}%lpZ89O+j8i;u=QT|r^mlPusySTNB*-rN4^6~jryaLo^7|85srEJ
zDWE;cM8>FpN;zd0H1vN>S-9Qw>|M?o<s8a<D2SjlC_kBZwEVrcPP-(I^;9_n>L;eU
zx=f25s``DfmJ7nfh;m{3ugn_-YohCYyom|Om&ydfCK)<{*P8BN%*TMWU_d-ifsrX2
zr6=jcwn=iyA5i30ogYOBVOQEN519t|8~7MFG^S(Wv1l^Y6siabf$r;tOeb9fq=O^2
z&DCh2uMJ$46%M;wQLiO(PWa{HjYvPVYYt~+O&v*dUctDPbB?U^5ay1i5%&eusn6)k
zECT-U(>W>y|D0S99<XRG_VZu(KBi_Me43!D2y0@u-oyQ|E^I7QT-poLgv08{SB0uE
z^Zl1q6$F$wjxN2T&PxEJjP8{?-CNQ}72<PdjpI}p^^DWfvvV2<2ox5!xGFbcT2WaI
zgZ5@Liv_77QyN%`ry|SE9XOWJjEG>`j3{F~hqbM=JEarwOCi$GFLNS5u_fL(CKJuT
zDm17q@{H1psUa8vAF2m!)B5x}iqqi5a)zxI&fkI+mLWR28VX;ctqxM>d~%4(%2-Rc
z3}JtkAwxIWTo;KVfs{-xA5}uBpUw0#FDH2b^9zbKRZTMI-qJ!Y+++xEX<<PbOO4Ce
zEiHIn)BU;e2-pfOR3lLqb3GStnHDy@aQ|7yg;lKWbTE)QK{RD?jX*OAt_2f6AyK`$
zQh2*-T>QH`KjNK{UItWZPy6WKz?Gi>;vn@)P+v@0x=3v7N=hrPxz2{rj`I^_3#e1u
z@C}@b>HdsxUaS5$&(9IN(n<?;(;4bGZ%UFdhW26IrJ%La`~GGqy|=Ltpt)&>OET_n
zFubYE`w*d%Z00}m1<U9|dx_1&9_}X>e@_WNhC5^+dSF2jwmmK2Rfd>}*TvgLHzpaU
zvNbY?PW7z0+igyD(9O6tYTId|v`(b^Kn<9qOLxf)uMCf&T{lUvL8SrObch~l+f17r
zJmY$BIYKpYOi8Y4d*&{+$-4Muz*b+g{y(3!IHcO$_BZP&IE2O_{~b{7Lbi)EmoPfv
zs-bOs&ZVLmdDp9A(;Uq>CsgF0w`e$k4@|nrAQ$}%HjeKWUwNwTXb`d6%hds0=q#74
zp)Pktze;b|wAC>t*kA7wUPExwu<wAV@Hkl_DhFuiPVY4|qHhMIqniH!oNpYscIlWg
zcf`b6^uGWtOBcQkSk#~i>=5xa#8!vuxLvHcFSoW&JhYllnwBQ7I{zAEkhy}c>Q-l0
zyJNv2a#-KkLvMC*5xg~5b5t}rEyG25nNnA1yZqk=uOZ6v-v@lfXMHtR^PxtKU}oEl
zW<XjWw$)fe_NvjkoKZu#mrA$WSk7v!7_%y$WQ?V%%>Xrod*t>vQ8j8uQ4Q3eylQaG
Lr%8DRSmOIX<7O#o

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-021.js b/js/src/jsapi-tests/binast/parser/tester/lexical-021.js
deleted file mode 100644
index a3b4422ccc75..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-021.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-021.js
-   Corresponds To:     7.4.3-14-n.js
-   ECMA Section:       7.4.3
-
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-021.js";
-var VERSION = "ECMA_1";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-print("This test requires option javascript.options.strict enabled");
-
-if (!options().match(/strict/))
-{
-  options('strict');
-}
-if (!options().match(/werror/))
-{
-  options('werror');
-}
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("enum = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "enum = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-023.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-023.binjs
deleted file mode 100644
index 39a9aca701bbc3d9a58b34e8d969317678588c8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6271
zcmdT|&2AGh5Z?0tBOxRN2TpqgRZyVf0^5i-P1T?fswOJjkehXrZJpi7cADlLcmm!G
zj$9CL!PxPxop_TtVH?CL+SvZ=8GrN5j04{95nKv77=@(+nzSkEdRIKpJ5Iu(w^OaZ
zZ@g)=k{<Sg4LK(u5#yz=k38=#%nHoqM~Ft~nBZO9B8Va$C9#AG^*8g*qBtDK`UyB|
z^RN;sp`y@>;)rJe=JwSP$2>ZTFqLpI>gq!?PNTS8x(VAfD&=PNV?EeV{{<Tg#KdaI
z`L&2+iim_eN2G7z-2*&=FQOJA&tAORe16Jo*c5(4IxbMVUWJwCh}zT5Q!MGwAAr3=
zhaOc98$~(v1{}Ro{;>V!rR|y3JM!1+9C;nKYF3-Iify;a2uEH%1hl<A?^Em_VutBC
z4*gFF4U45`<)TM1V-V&IjyUc@_(|U3?El<2Eh9qoQn>=+hhQCDro|3XeH*N098uoH
zjNAUpc%xuVbbXG$F+u31G6B(cUpRv0n(koCeZU$}5T1QdWK5e$Eos{}NiF#XL2kwQ
zP81_L)OLA7X+Xb0k3mBTKH(mX+8r&SN{|H5y57ii(j`DTIHG8+76$s-z*($tINgkR
z&5%cepMB=gZ%Kjw4yITaKZ#XL#uS1KLEa}hfn{>UQJ4hW9*PJKr{Bct66NpJ`B7*T
zzG&f|sETacmvH3+K&&Tz2I}(;O$IsG839*TfUKCGkZ*9SIDQ@=#tP<VlMZ!$k<~Rx
zT4!Dd#UX)mH7%`87VL-_6N_e+<gY;yEK$&TKtqX1;4+oEb2pzz(M9IBYhrgOrtKJz
z^!yCNmKBcTA{r7-hyIq&X&=9}cTmcb1%&dq`g_d#M&l!nGirqP5!;O@aIFFcq>fw5
z8i*9v1S%um>XZrUGb}T44;rKH^ybQ3>X3!xRoZr%C=2sw9SR0<;bX1cl04dm>aZP)
zdPoB-QjlzE+f17rJmZ?T9HAgyawR6c^7Pj{r8aq?*!y=rTOdbG2!!C_j2eD7G4EfH
zD>*&|e|kMCDpNj8V`+?Y4p-yAe+QIXa3G$HL`D-Xz0$eAqqJ(?y!mVb*qL>cP}A0E
z#i?OFdQHJ$9o{o^S0Oij4A^3B`lvAJj?u{`cTK;|-IwHQ9S`(MsTxJKLE=tCJ6A>w
z+jk-j+XSH!*<?}DI5!rT(D(cwkdFEG4me-uTl<zwf;mEpYxkc(C5s2X4VcGVhxneO
zYk8=S#}xthw6JrEoHZ@cn7(u{c~<(HQU#ei=%8LGbuE?^9Lx~m&7B@~=G1T^=ZsVt
z+T?LXol)A2-n!qxEz7rVHscXljpaNGsF8d@Ga#*JR5dn*y=pX%Gse(l>uz8&`^8L+
V+Fn-!`H4~u&Uv_!l5N$>e*h>D@3H^@

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-023.js b/js/src/jsapi-tests/binast/parser/tester/lexical-023.js
deleted file mode 100644
index d5df7ce7d8ad..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-023.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-023.js
-   Corresponds To:     7.4.3-16-n.js
-   ECMA Section:       7.4.3
-   Description:
-   The following words are used as keywords in proposed extensions and are
-   therefore reserved to allow for the possibility of future adoption of
-   those extensions.
-
-   FutureReservedWord :: one of
-   case    debugger    export      super
-   catch   default     extends     switch
-   class   do          finally     throw
-   const   enum        import      try
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "lexical-023.js";
-var VERSION = "ECMA_1";
-var TITLE   = "Future Reserved Words";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("try = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "try = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-024.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-024.binjs
deleted file mode 100644
index 8f4f5a90348a177c7c5cba6a82810807d58b4897..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6252
zcmds5O>Yx15Z&_qaX~`jz$r&ig#uMi5F%(A)RZVxBq~SbWZlHn*^RtT)BF|w8C*E?
zFBp5hYiGULIO(<&PSM8pvuEbbo3U$rI-$5;8)4+vk61WlXzbnaJg*=6b8oNJIqbgf
z4#ElcYE?O>MoGl$^CzD75N6fP<;RE-)TekK4=7@YlQ57_zW$E9Qxf=#Sib;gYZX?=
zBoy&I5)hsOnA^8}9B^_%Fq3cr8tX$xoRMHyzYE)Rn~h%UQ>Ru{|JAAr#Kh{#`E9~6
zLsY_@Av(42gbOG>Cj&%ZyxiHfF%#^n^jb}Ac@vhMA!biEkFcRPe*pFsdh@vXxm%Vu
zZ^O|KyRW`p3qSt6IzI}#d#zr(Sxg8=PTm8wk9a-{nIGAJ7a(Nwe8O-PK~{G;;&=?%
zCYgrQ|8vu_fhg5W<qAj_ighxXtanJ_`(R+i5#v1^@d68T(psP6A|?oVR3;!coC-%o
zxu!c9^9ZnJ40PrI1Q@ek*baxbO;SC+Lt0yzy+;DX=Grb#XbZ?S$S+7H#V6cjWH{1_
zsU%1MZR?H95L^PJgCok8W?^7O8<_GwhZPQ|D@f54IhOeJGiRggFX?x{Ymnqqnv+;2
zM;x_Cz<of3Vt;uguC6rxhSOLHl#NL_jfT)Dd_KSv(FEDHZ{W(ufY=EuDQJa{SUAhU
zP6_xwwj6>`P;c;{JboUbC@PtsJvP_%MK;qk9GrS16!;Xn)1;F&S+FN&WEK^6;Jd(N
zi_E$XXecoWT&7BQ?&g^iU1oi|C3c72+0Fq;&o3}+S>Y%y4`3~H(Um^K==6=fffAN9
zAC$Y*-wVz+t~uf~@wMjwMf-#S)tYer#BW>abs@nuff|SpMh%Ll5tfB`0@tAN@~f1&
z)S(E;NZNLqC~MPb8~Ozi?}dxphBSH)&EYT*?T`joryqH%Z8L3h@QiEOa)g3($yJyn
z<jJpjN^SC5srUDMwnmA{=!4*4K?}bhn(-Ip3j5!{pWcLt#+1*KTw36qLuefM?|>ri
zM?8!*MiVXx>B`@@s+y5EA4vc^wJr;_Y>if&Hs<l$3HCeidZ8~Ba?_`PE#@Y#2w8W;
zC(G`de4D#($kh&>>6KD7%DM%Kn26h414Y=5i8O2ngh~{XbxGrVuegM3&%XibSZ;-0
zq~+EQlF2VeL=pAMGw5UStYQP^5!WHTSIAl(s^f7*zCADPoUWa$gULnJZ%GqmMoZ`P
zT9s?PqTpbL$ZqcRq_d)h6D21WWw_ie3Ti=T7e8#jgDA^~?Wo|zSdHa83aF8MJu@J!
qXHzw{guQAsk2A(l_Tp|}M)rG|8nwNy2J-8q8eH*gB^BFhmHz+`^ywP_

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-024.js b/js/src/jsapi-tests/binast/parser/tester/lexical-024.js
deleted file mode 100644
index be1c3a7b9145..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-024.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-024
-   Corresponds To:     7.4.2-1-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-024";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var break;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var break" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-025.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-025.binjs
deleted file mode 100644
index aa3e59877d2d36190013e5c81bbe26e6788c4ccc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6248
zcmds5O>Yx15Z&^PxF8{M;FKe%LMatoV5y*KP*b8%k<cr0vu<K=b|c$qn!mz7g9~T=
z1!J#w?ZlhJNw?wS6m4ujduHCe89NlCA;o)PAERjRm?b@i2Enx;2u_n|66`lxN9~vG
zZZgC{SXFaEO1Rh?Jq&_-Fe|i|pCCriDa8l4OA$kYB(Z{u%r_6dk~o^i`UyB&%dirr
zphy&un1~#}-o6pxSdcS<nSzVaz#N(jM&jPyZP=z=uXP$9T47cH7gjZhjn!83n?zuS
zsDe93bmZVk7f^gbx`;mA*?r++X4qBbwNP()9hRLV=1#Ydu%<V^1NH{Jc~bw_F3X!Y
z;pj*0XP=+Dj@i5)e{9Z=((X>9)2zF8+l27s<Q+hJk0;}VMcf6vgd^)0LxwqrtZoY=
z@Bp$+F%9Sc7p7$mQEHZ|6_73zn`E+$^hn~nU?3NWi4NvsfrT2@MmOiUj0sX6wF!vz
zM$!?y&~y)D?gQ4CfzBL)0Atoknn};KNvX#-NNXpv_eqS{#Ml)`Z2`Fk`31?O_)G+h
z^!i3IwFF6^ZL^W>q$_~*a75YCEDfv}19RRNu)^bX3sN*kP9;A7EZFGpm-JiUHAwOi
zEl4bzBc56$;oc!aaWp>?n=6gK;51GG&BmmhMnh^8zUbniY=T_d*Kp+nKx`$I9JC_(
zEEyMI=LGy8TMkJms5iJ<9zTx}=Oy#A!zQM_sAifb-LF9(#Sw+>H0z{o7VOIzGm92>
z;Jd(Nhs>r97$`XjT&7ER;pQ_Xy3G1^L+%c}vzr5oo}XaYvBFbaWTOLJbmc5zuUvR7
zD|t3(XY0SGTyI@+<XO^7&mrOmgaOg&aQe(^Tlr-n!?l5GNOb!(ibfo(GCYJ!&|v;W
z%3kVGf>az`J8hJeNwf{!f{gamHEvB3y@l4W7t3bI0IbrDyf(JkHhFl)w`h4nL9!I;
zOBV9%*FL2&d8Nerb3R+4K+ULw<l%w_{vfgAFUgghegS_5Lnhl&G0AdiigO;J@!-D)
ziWCizqzYpQmxXlcZ(39B$lFgOfSp@63pH<zQJf|g>B|X@TJUyZt`ut1M}RHoW^V|y
z?nqBIyKDAs@4hBiTX<|%D%B|K4kTkD?{YQ7u^SU**bWGlEG4Uw#`{)r1(%+G1JbkD
zN=NEq>xRf?mnWW#dF3(muy|Z?0gGtsk=#o}tq9fgxH8+Gly*+vF4n{3MYV5E3uH&j
zWb{gPYqgT#VTR0Y;q{!eq=AzKCzWKl*iFmng1#<&)P4g|R*%|z!E3P|D|islBgJZF
sK{`*SdTb7R^=J`itfARUyM@W!w=zBIdR-3`S4lm%<jG3uwbLm722k|pk^lez

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-025.js b/js/src/jsapi-tests/binast/parser/tester/lexical-025.js
deleted file mode 100644
index 0dbb3ac63d5d..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-025.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-025.js
-   Corresponds To      7.4.2-2-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-025";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var for;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var for" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-026.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-026.binjs
deleted file mode 100644
index 3b5d230297eedf3465f14241743b49ac850a6f97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6248
zcmds5O>Yx15Z&^PxF8{M;FKe%LMavE0HK1WK~0H5MMAI0&AN%f*^O+cY5ofT3@)7c
z7mU5$wX@zNPPz>rr)XpQ*)#Lz&Db?D9#Onk8(<Xf9kaO4&@i|b1i@(>PJ{hs`>6A>
z(~Czqs8!XR8YNupjUNWVJ(yLqm!BX;&?&_SxJMB~g2a)63e7hUzLF@M#rg?2Tg$Lw
zrl3d|kcfy3z}~(Y;z*D)f|-Jg(9j&33r3>;-fh^X)2MfwAKJC5{;yWmAU0M<&2JHb
z8KMgA9MQ3ZCtX1C1?eIBbZ7U4i<x3qmDg%|%j>Z095HvgeS|f=`5mw~=*^SH$4*(^
zya`7?>OA}W+;z<6{rF>Zew221o84B!wc93yCnxU!+Iu{m#4O}4;3XW{xEL|aIb?N5
zAc2RFZHj3)`@b+P>xfdbRIPw?q1YsoZKOvM-vtA?KumNo7Yi)Zur|6m$7M{A@~BNf
ztUs2H;Dx4p7;_)6CJc1u5Cj;rZrqCdu1!ikzCl_$nY~XU#HPlsKxzxfHOMbWCdFqW
zV5C1Vim4??0&Sa(Y$sg-q=zHQmS$;S#Tc0JzJL`Tr(2Ms8FC`=*=NB<f4`*P0<S@m
zk7+?-*&OlIA_?~n5sJh4k=R^m`~|0R5-1;&avBY(QTU>VN3scWZC}Hc4*;<pS2ECw
z7_fL!fSnQWe{4A<p`hO2UU~dHMx2+-&n}yq`l6a?8uz{i0~Cc6y3@3iwpp+*XXF+w
z?7(+{$qt!K9WYRG61Ys4?!wJ;CA!S|c0=wCy|bGGik_cf*s;P>Tx6pIU34YFlUFXh
zmX$0Uw6pc!Gp@HTIr1#YrRNaw1Hyo44LE)3wXN*3kmA}vbtHO&Iz?lSRT&<^C1^PR
zB4sc2C_yTYuAMf@$|Tx`Zb3$S<{GyqiQYnM*pFm0WB^v_MqV4+Y@0kh<6E>mp&(fb
z^(75?`fH!kn7mTr{W+hlP@r<^AbGf;fj@}t_)Budr(eLI!HCJWR7}%cn&F&BXgv7u
zfg(ji#EHTf!lfZy`kT~LJM#7u31DZ|<)P-SF^bc|B6&H%VH@5q%#}iI`UtS)-1H40
z?~deT`CZd*d-pZD+Qt*JQmIB+cOV%Pd6%mrj@_6j!*)QZWGPvdG~Tz0E4cLh8<3vG
zRytA_TQ@{DyFBq^%qx$fhsBeM3s^*3kK|q=YDK7?$CcUkq_lJTcCj8NFRFcWS|B@G
zCZkuXTdS1>4>M$L3$N##B@LV`IEf^~#cozk7xZ<>qxKt!vU=3!3to%$SiysU9w}Bc
s3(|Qq)njwmt4E7CV-4jm?G`3?-^%o;>vcU)TqX73k|!&r*G{AS8<(f&nE(I)

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-026.js b/js/src/jsapi-tests/binast/parser/tester/lexical-026.js
deleted file mode 100644
index 2711de0892b9..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-026.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-026.js
-   Corresponds To:     7.4.2-3-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-026";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var new;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var new" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-027.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-027.binjs
deleted file mode 100644
index a29bed12aad5bc0fb704cec2979e99b70ceab20b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6248
zcmds5O>Yx15Z&^PxF8{M;FKe%LMasz5`+qx1~nxL6$!l}H|r(_XE(B)rui%UGq`Z(
zUoiH1*UoyAIO#Tg9HJ<({p^`}^JeUt7>_94s|_#;_l{ZIXJ{B)3xeP@4yVC>vwhTg
z+3Ce29Mr06PK^>S_Qnr`;2zAX*~?E5Bj}Xk1KgvCAwl9uL51cw55AHpoW=SHI9toG
zVy2)-7?6mF48Y#L8RAHgGlH3di_p*<nhQpv{@!iarqif*n;+V>s{XH5)gU%jN6l{$
zff=F-?i|svgC|`;@dfE2`gCXag^QVDSC!Xlddusu>>M$7x_yK-z4;xmH|Wii#>Y-s
z-n<D%Kk7XD{M>cS=Kc6%bAFU|cbnZ-!?oKcgeNEO0NQ&zoy08UF5o2`*|-=n%sFIr
zM<9WRkZp=-IQzdaE$fI<vsA5sbfMTJlWn9&65j;_xj;;GF&7Ig)UY<XImcy8kn*Ta
zK&(HOj^Kr+dl+*cuqF(2<`4uJvu@mq`>st&J-$I&JDI&tBE+V~u0U!F$Ti3>NG8Q+
zB4DIHFp8-qNCIt}jcg}f0i=f`%9dtnV8s}i@xFi+9;aK7q8V}`@!8LUjsAW~zXe`{
zBp=g)#IiZ!sYMd*9U>Hm^CPjj()bHb<0Mc%Cgn65Qls!i507LM<l4T5D<1%2JFaA)
z6)|A(qyRf3;Q!ciNJ2rq!M*bMd5kzOnV(%YHT6X`(=_gV4F)I*DRif4CvCG}U(U!a
zTG)Z_0+Sswn>t{i<RoyJF5QKj=Sp;$_3eh-9eQUs2NXR&!LVb6r?|*Q2fFAAd|tWm
zT2``b(9YI>&$!;Y<jAumm!3n!4+sOIHQ@BA*S50DLW*kx)sg58>J*JRR%Lhum!RSN
zi<G_8qXelqx^~(qE0bs&x&;~SnQPpdBzg<2VLy`1kO5ew8+mPPvu*P5jBnBMgo0!#
z)R#2m>9>7KWAaLg_vd`JLV?PugXH0Y2L2$n<1fh-pMC*<1|ufhQZY?)X@+wiq4D6q
z2Z|I85hn^`2$zO*>3337?a13tB!Hb+mxr3S#wbn;i{#}5hi!PfFjoq-=_A0FbJI73
zygQPU<#$bg+q<vH)i$1(l}a_rx&z6W$h%w}aqPxK8MXsLB}>Vwr18F0T*0O1-+=Ti
zw$hQh*t#LI+2x5RV_ta-JuIG7T)-mQdL;J}Q7c0AJg&^PC#9X!w~O^Kc~R|~(*oJi
zG8w&6-CC_Ac$gt`TX;R^ENS3m!AT?;E_SnWx}dL19<|><l+~j)U+`M2#|j<<^hmLq
sS&+_?sUDldUOigG8EYtiX}2)B`&On$U9anb;wq^JmpoZ1y>=Sq-=6~Km;e9(

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-027.js b/js/src/jsapi-tests/binast/parser/tester/lexical-027.js
deleted file mode 100644
index 0d8ddf079875..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-027.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-027.js
-   Corresponds To:     7.4.2-4-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   var
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-027";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var var;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var var" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-028.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-028.binjs
deleted file mode 100644
index c0ef34a00cd7dc9ef0be23f44e5881c58730a81c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6268
zcmds5&2AGh5Z>~SxbP!!;FKe%LIK19m2Ct~gPIbBibTCu?yj3Gb#^1$X_`mi6?ika
zaON!-d%bHX-Xu=CEkCDdWBapb=9_QE_W5W?aLw;y6xI%C(xYhLUGqHeI0+}-PP4t=
z+3Ezz5PN=A&hbgac<t+B&$|b+d~^9Bq7gbKcozo*QN*JpmQbPoX5MKOhtpU;0cT?w
zRzf9I6naq{@f^V1z8T_}M<)@c5-vsqeQ3sM6!&VkVVh2)-fezr`&IRyUsWI`R!7cn
zMI2K^B-|MyBMVQsfZ+2eK;-$0S8r_047)15=Bq8Q!?H6(?dj$b*7W9gz`jCn9yUIA
z%JSw-IQo9)<<V=~F<0-$A6Mr`VRyILZ8dDWO+q+w@(!SV#FKGCLuLbBz>$sfA;pYA
zR(Ck!cmUZZnTGTK3)8ZW2+>RB3P=}%buyVoIwbL3FpzOXc^5Ojz(NIUqU&>9!~`La
z$^=AvBjE^EXu5+j_W^56L1*?rfHCbRt)yq$B-P^^q_vgVJ5h}2MBC*FZ2`Fk`31=&
z_=I~j>h-l^DhU!mn|dSDNtXcW;E1xNSr}N+2IjmkV1>i!7Nls7oJxHDS+LRHFX^|y
zYmnq4Qjl0CM;x_Cz<odw!QuQ!TwQ7W1*fqRXf`J0G#Wyq@OglTq6xBXU&ED;0I{7^
za?lFz(_~zLofGhXY&is>px)r1JboS^#!BXAmritjk<Bzof>W=L;*dahnsw493wFee
znMDgba37d#ky+OP4J9Ul%T(zu+<c})ms#I#h~1%gwsSzz^9Y75D;&k;A*_Wix)LPN
z_QxZ<&FKigwKq}%ljntUyZU=72*!0soGQKk>>;)rQJ`D{?8yALkzX4!Tob5{c+jsC
zG-6m5<RM&#2J^2}=2C}ZBqM6uX`-x5r%mV^MBJw?bZgS-Jv52EShPhNV3odPTia&Z
z<lq_C^5qBxX;Y{)S;(_r^OV};l~VA}`D}$!HKP-PhYMQy-NcN)AXjqy1^np^sc2C7
zB+I2K&N+m}f&UID;-18lRBJThvXCzQO{=RJdGoOZuygBXq2{g8iqpb8eM7-v8(uN=
z<w9=y1hB>2>@{K59qGwtcg?=d-Ph!58;|u$sTyV7hD1!nt*(w3wqqg<+XA5yMP*ge
zINvWW;rjD$KsuJ)2jG0G?ApOHdFF^LqF;FmeJvhWY``J{JEZv%c`HJ7Jg&&QXQiFf
zwX=0Fc~KRd(+ru>(z(4-1zW8+IG7=_oI5@7ENSIL=}E;IE_>6$x}d{LAG+T`l;uM=
zTkwLc#tI$@)JU<e8Iaa9sv4WaUNu_88DnVnB5z<a`~6If+Fn-!#r0ARE_ue1%5AmG
FzX4L=@DTt2

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-028.js b/js/src/jsapi-tests/binast/parser/tester/lexical-028.js
deleted file mode 100644
index 2b75204c7fe6..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-028.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-028.js
-   Corresponds To:     7.4.2-5-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-028";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var continue=true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var continue=true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-029.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-029.binjs
deleted file mode 100644
index e79fe5f1e264706967fda0b39ca45ed95ed1a421..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6272
zcmds5&2AGh5Z>~SxFCTzaM~lNLIK1D*hbJas3}pXNYpEGvu<K=b|bITG!MZG@Mdt~
z%v&(_de_c+lQ`+N{G6hV?a!W>Z@w8j;FB@M^<aomSU+U(fT59h#q+%5IGlOAt<FLB
zRkt6Hu@}_joPd&q*S|jSygM)}Fqa=8M$j?Ed$>;#L!88sgbMX{;(Z}eIFI!caJE)q
z#Y{qx&?6DyIe@u+E5s2eCj>JI7om|pbix^l2KAe;O}E+TwLWx$n))xODG(E@E9bWf
z#|%*kcZ%r5!V@l__>A-see(4AOB*x8u1T*2YRjvz>=ZG3x_N{Rz4;xmFVUMv&5zxx
zym=jte$ajP>4oi>%lG4t%k!hKyVvTqo3`C1Asjh*3((%<*)(QhVgsJTk<GI)!$|^J
z-Q|em5oDWW8qWVOP0I$NR4<h)AYCZd$z&Soki@saz=R{ldpO}sEL5;2x<1EwOc3&@
zOh9Zf5spYoO?NQnE?`X==*&I{FlN2D9S>}qq<VaVw6-#Pmqduov|XOi7LaR@Uyw|S
zPq@d(V5k*SNss{A)*G2lx&TNAM^r7%!a!denDf4b6%MCclA<|sD)ISe$wq&_q~8Fq
zL6T2sNn)8CanvFK_YM(?!^M%fywdm!PGcodF(%bC8bYJ+Ss#x@6J*=Ifh+F;Vkh=<
zP@fN3JT1Y_3HU#@9D-0#Z*adlejcJEshFQVHq-S*Hq$ijfANMW3Mq7_Sto6>U{}m2
zELz%u*MZ3vnROk|P+}6eOqK4^%?l;E%KCOq><+!Nodc4d2!<^y9L426tc5PxKbb^*
zk!Jpm&)EdOwzpCelV^r<y!v}C490~=oGZNm?W1ImFd$tMEXh2$m0uh(Tob5)cz@WS
zXp&%AlE-i%8ZEw5nM)nYk&LNrr-`yQp|+uO5Rsp|(rrknx6mdIBGDLWfOR^P9c`Ow
zlY?hm3z#DmBu=T;WFgOf%~NWV*Gj@a=d(46RY55P50^Cad$AdRL9Y1tGx*aRGtr{*
zS(Zz4oO1|`1OFXR#7&9EsoH45Wg%Vpo7Pt|^5%01VCU8qp%$&tiqpnCeMP}x2i`IC
z^+Im?5U|DE>^-6Aj`U>3U9)d<_YJw)!Bf3bszz1!ArTXCuWO(L+c8NE1ECUSWnI!Z
z-!LxV0`zY{Iu>5hik1{!J6tBy9I-|G{YTK-;;C-~mQmOt(N_pu8LH!PMdm%O?3}LM
zt%J$S>fnNQ$c&cG?zL*zdgZ~v43X#D>6vFmGbf5qD$j7?o0rxlJzo0Q{RW~eAG?z!
zugGew<e@-~lq;J7X+5Q?u?6f^qh*{ihKiSY12eJT(A22ybv004G1cITr!1-6R@3|&
DnuhSA

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-029.js b/js/src/jsapi-tests/binast/parser/tester/lexical-029.js
deleted file mode 100644
index f559b5d050aa..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-029.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-029.js
-   Corresponds To:     7.4.2-6.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-029";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var function = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var function = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-030.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-030.binjs
deleted file mode 100644
index 5acef3d410c14f60d5cfee0f2fcd7cfb927a6454..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6268
zcmds5&2AGh5Z>~SxbP!!;Iv0jg;E5kvW=i=P*b8%k*L?o&AN%Hvm1Gxrg;Qjfj5H-
zXWoLb<6S%JP2!~6@^gwdwm*AjzWHYCfRBb0SA#xAVfB#3J%$F}4bSsV;&9^aHd+Vm
z?RGaFVlSx3IRPaJuYP^%c@JP#U@kvGjGz;W_i&dYhB%2M2^H$^#5*HVIE(cYa5k1<
z#Y{qx&?6Dy8GyNcBg7FWrvx(z7omYZbix^ldeytIO}k#}G(NS0iuy08C=e5?E$250
z#|%*kcaG@D!V@l__=0p1eYy2|%f?KxE7EI$+VUnWJ4ei(ZXRJxZ+-{tYxL$({d2o4
zZ{CKZAGBW`zp)*2{eJv$eSQ>ncN(2$-L~5#gd->K0oq4A8OJP4Y`{x6vVJjSI7uL@
z+Z=H`fNYaY!`c6ZX<0**>ZNi8qzlD5nM@-clK4Itm~g~+2Pb@ig$mY0*XOv52|^x~
z35fMZ!VyWK=?=y`1gtRwo!JKg#;g-J<DPAkRF7|v)>dZkk_fShw#yUR0&)%V3zA9k
zDfbxZ^|fLu2@*h?dLz?GR{-hYh_a<w80c#QGu{`l!r^oaQZz%JN__TNu+iTy>36_u
zkmMs;kXR;19JNTmeL#fbaDF7NuQdLG(^v_Vk4ZU=hR`T{(Zxg21lhK);mRj~*oyrO
z)aQK`j|;Ff0{)LJhaeQx8{93ApNA+(O6F&WO>}*c%`}a>XI>vgA%*TV?W9c>?1~w=
zMGHId0GMo%S=Rv#B_@H(ROv3<JXfO2tZ%o(?$A5iIUwnI48xWcj^gqd)<PHUGt5UU
z@^^gBM)<A0krJ3JFO=KW-!nllt~=sX)9cSZO7;i?%GJS+)PEb<wIRhdfoh0%`!$M2
z36=$U2-l&({415Y)S(#3h}w3VC@a%x6Z!@b_n8abnsj;(O=2$+ZIK38r7zjhwwX3L
zc*eDSIYL3&6e>*`^7Pj{r8aq`6#R2OTcK3tbVBfOK`Xx(oADRqich|PKfNIn4Jx0c
zxirH$htN3i-vLG3lXyJU8cnz~q)UIN)zyr=`B(zjnRR)nd26)dG%=sPq2RCuuNeAr
zAvb*n*kW$_nvi$L^kn&6({FS4HM!ctW4%(UMp?HZ5fgE%tDywjF_DICgHVa0vMOnu
z?-y5a{rNW_9n0<`aK2S`?O>Tab3_)=_n$*wi^skVSVUllG+!cbMW~L)6?ylfv~#+4
zwhksQs)BQxAv0P!w^yoQs}%<aGenkirzf5zt(+)5Q*nmN-mI`L=<ucw-R~gE@}WCf
z@Pe$y3LXj6NU^RNkk&J*8k@sjHCn_OV<>--H!u_X{Y;J8URMLf^->KkdB&2;ZMDq5
E0cuX~00000

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-030.js b/js/src/jsapi-tests/binast/parser/tester/lexical-030.js
deleted file mode 100644
index f5fc09620f44..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-030.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-030.js
-   Corresponds To:     7.4.2-7-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-030";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var return = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var return = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-031.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-031.binjs
deleted file mode 100644
index 7430834e08b2cc23a5dd02dcfb08977b35171ad8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6254
zcmds5OK%e~5Z>~BT#%4BaLN%>p->erutd-_s3}pXNK|n{Zq_7Ao!!WGnnwH+{ux|2
z^Dh{Cy=!N^Nt|>W9;awy`?F`}n{USU`FKQd%^zSC)Q)J}r)cP1@jUM&4yN8-vwhfk
z(doq_?D<tW$0s4<wXY96?=H;p&E?04hUkRgecU66A|A$(gbMUG^G?Gkn8o@DI9toG
zVk)7+zzd_0X8`8*%>YL{{2XE`;UYBDhi06HQNMN*w&^tL-RAqYUseD4RRv;Vb>#e3
z$T3Ak!kr;9w(x`t2tE&ch&*|^yJKUf*j4E@Uu}66mYpGLPdAUSrZ>L>_6EIq-1yKb
z%bVBX=!c!1PtR<}Y~GJQHs?oScemMXHEg?0LO62r7NEVu(@9JNW&>Wpk&W{a#f(8#
zcR1pB2-zl?hO_?*)3S~T(M#nDNEd>2GMPp?B=K!9ka0wL7c;)VLIrE0>vLSh1R;;g
z1VsB|;Rse}x`Q$I0Bb@)XAVGsG3~~!xNqAe)#DqawUya>VT9;Z+vN#u0l5bG1<54%
zGxuoNA85r?5+s1O^+u+XE&<ZP5oJrWFtDNx%y?hG3Ww7zNYM;Ak@)PhV57fZ(r<v*
zAj!w1AhAr2IBJoAdy7JXgZYuzTxt9Tr?C<!ACqz#4WUu^yoX1k39@Zp!<F{|u^m@3
z&<Y>Wcv66!5%7O(IRv4g-r!z&{5(R8mCVmBo$C4`n`sjFPQ3w&0s`G>+DV%%*b_5y
zixzg^&w<GnnROk|P+}6eOqK4!&2uHX%=&gs><+!Nodc4dA7R+C!ckmA^9@~eg<?LY
z(Mx*=r7T%OD1WQJXS{FRbHs6yd(Q!4`ymCcHNb$>aa-AaA;mR;>WKFSb%MqW%St?g
zd(d$HUCLbQP=#bDZ97erm3g!c4TA{y%uQ}h9=(C?upfzjNCT|Wki62inKn6i#<gxa
zLP5S1N=zE^^w&J4HhHDo`*S{9p+@BdLhx`w55FIq@fYNZPriUZy%80iDW9gfG{ZTE
z&^Ykl0YzMpc$|ogCR`fQrN2p8H6w4nk^pvQT^?%Q8m%}j%#+6x9JJy2Lf<OnrVjyI
z%uSyW^6p4Zmftn~Hg{i>t8F~dE2V0bbqx|R5!bmoV%Uy}G;9}yN>r0oN#lI6xP*Jp
zzX9o3Z|{Kfb-lHtWD?8~QiQ$o2s&9jsn~!;%yr1`CAwCG>Udm{aF0tnr)w|kVDh5!
zH>V3SqotF2rP8%pRd6svq&IhZ)LGKQiJFtBGF<Ow6?H*tmppC1hA7LYZMNXeSdA4t
y3#gG|K{Ft&hf_5+hrMdFh%?4e{_1XEGW*3$joMyU1I2|>4K8`Ol9Fxp%D(}LY3f!0

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-031.js b/js/src/jsapi-tests/binast/parser/tester/lexical-031.js
deleted file mode 100644
index 53f0c399c8b5..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-031.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-031.js
-   Corresponds To:     7.4.2-8-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-031";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var return;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var return" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-032.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-032.binjs
deleted file mode 100644
index daa962e4b9521b9b21242cef03fc1ccbd31478cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6260
zcmds5OK%e~5Z>}e2!w>hfm4p43Wb*tf^7s%gPIbBibTC|KyKDemO8tU?KI7izrjC)
z3upcXW3PAZtT&01F6D8GHnu-|X1@7mY@d%u1lRllMnP?##(j#0-UZL|4&z|zZ8zI{
zotK?nJi?w|m2-R&GG6;~*Yj?`EZ<yyfM|#g3Esgyf+*r)97(7^e>3kmjDlILAAqy5
z3@fG*Dh#|Z3V8-#Zr==W#KWTyQwbNLp*}R@G>rPStFTR{QSUb2xBaU6&#x*F6RRWV
zw?d97A`<Qdk+Fp*TtM(?*hA#uqo+@7%oMvSz2>VeFT%1DMD6M35!UqPH^4qeZyq#0
zbjtGPWjOj?=kcd!wqwrUkKfPFkHYS5v)gLecAJE7<m5F#dxxi!m<G%SJcA<}rz46P
zgRJgw#PJZaO)?E<{}-lZ9TB3J$`z0<1nXonjdV!j>tG<`i1IFGe1U}u)<oCmIEx8F
z9+e4*_Q%2ztk84^V{QZ1go4iOf&gRMjazZwwn?hTS4e9sv$w+t(W$n}6WRiD4e|?;
zN$?T(XxJZU#Z(d`fHw6;rjvdHq=O^MmS$mKMH`s$zJL`Dr(2Ms8FC`=*=NB<f4`((
z0k1)lk4ZsdnH+J{A_4ang#-ulBXNGE@h6<dN}zm9%4sx&M&Z*Q9*HK%wtWp(-T}mR
zT**Kyd_dz#0d_{f|FPu|go1j5d*$(SA2C)kKf83Q>x*orN!&a31}F*$bf;-2ZL(ln
z%*ZWT*nz(QCR=3IbwERjN#HV7x(heYmFP0-+a<9(^v-q;NP2#RVap0fak&L+157Z-
zm8}Y=WBkhAM2Sn56Uyc4@0kD?R~>Pp<m$7F*iJ}+ZVj*@_1#8xWk_*NpgQ8cL7kv6
z!?GBU;3_nnf1NUyIus%qP1{ZrWo0UDLeC&#K69B{lS*%(LF`AOCDH(^^dwu_Hq#~t
z&$yN@M<_^{LX}BFp8lGr)F!W#et*tqE0n36MhG4*XybQcGyZ~H@!@Cir#GUaIpxzd
zmu5KU5E=*mJD`X=5|0y|(S%Dwy7V`xtY+lRhZ4Zftjj~qTcZ`Hg?aLRf`c}^VCaj5
z-1Ht`i@E7bLf#$8$@06V-{$UXa<z>odZkp2vTi~mCgMg{M-1CBk%m17p%MjURnj=$
zEq=q*=ih*IEV(zq`7<Tg4wT6;M^q8{%6;f(@uXq{7LnH>#g|B15vt>HMb14a?VPS1
zt%J#nD&U+($c&cG>y@h4YK6hU43Xj7>1k(48z;(6BFu2fn-$ds-Cgp){TiYyAGq0q
zmt!?n@Hn7GiZ#uEw4P7Z*c|q%(IU<mL-`B5fywN5Gc{^^T@4i1N;SCT`AVv`)h_=6
DARX(v

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-032.js b/js/src/jsapi-tests/binast/parser/tester/lexical-032.js
deleted file mode 100644
index a4196950b8ba..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-032.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-032.js
-   Corresponds To:     7.4.2-9-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-032";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("delete = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "delete = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-033.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-033.binjs
deleted file mode 100644
index 079b441d7d92d9bda3abdc532708fa3a534cbf2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6252
zcmds5OK%e~5Z>~BT#%4BaLN%>p#bd(mI#^#H6;oaiOLbVSvN6tb|bITG=GJE1{co!
z3&vjW+F5TBC*6j}Dcacn?3wxIo3VX99#LHL2N(slBNp`;8hY0}&pU~Nskhf`A9h}K
zdeI1bepSx#DT#S)`pEO{!z|xievBAFClv4F9z_gs5`_{f(BH9lM#5kg>nGrBEyIeK
zgd%}QLc%iubNgn1LrzW!W)dz$Lw)F&GZOY|w_%%3quy<PZ2ML9pI=oVCRRtzZxN0e
zq7v>L(XoXmTtM*!=^^^;`Oc1wnPOL^*L=0*by#+em_6M*!kXUv4%i#?=5gawrz~&Y
zgrgsJUVPcL9kY2q{@9!!h27m|x7D!iHVNU#$vc4d0Z%6p3t}7a5{_(Kj2Mn%$m$M9
z91kJeB-3#Ae_>kI5v6*mTmk7qu}&t_NQWf83kJp<G2X>7UtpnvHPQ7sE@Og_M`Z$H
z{jqRFTxhz3F%JN1!a!#ZK!7ppMy;rC+a%TF8>F?B*?S~JY^v?@gtmZOgZzSIQhdri
zM*0J-m`Z{K(6-*lbkY?-Iyj<iX%+@nw1FA#3s~WBx&<kkAtw@_eHLu=_e=UM@ERof
zm=+|K$q`2_5^(Pkp*WZyiOrS9UvL^Lf$}jar_m4^g)e$|B$^=G_BCAj5D?o@B?GPS
z0gEOD*ck!;$Cg773hE8+mB-H`6vrj=v&*KszQ|^pM!hp{fWm-6cbaz6CJXk&jNGDy
z9r!LV*&?&90~$(90+*@MUATF!M3-6LZiwBXceZmt((^M6TUI!V%RN|2PAhLJoQ?5o
zdjlmbSw1LttG{QQZ(MW4X_9Nt0gCqt1FALP{Hfozvg<;MYXa2~?+xk{jbkhe@d&O#
z!}(V!bE!iSl99CSG*MQj(Khr8BHl9>xix9@4w}P$DB2+nuu4DjM%!lE<lq_CvgHT`
z=~AdLX~@%G^OV};l~V7|`D}#}mD2~o!v!t;eq_d9kSjX*3jXv)Of;r^n&#3B=Nv-g
zz<&o6aX;cwqA{9qX-Jp;CRNppy!l81*qL>CsCjF&;<PYN-cE4PhSv*ysgRpK25d1m
zeMQK-BRN@q*Yw-meNC>m@kFnbs!`T0NW?_k=ISWMc1)yUFF~k8F<F%~&i9Hdxc2-T
zkdEb6=tWj;?I4-_azqqSuRMW17EdZRU=eX0(tC-l6`?vFSLEB%($4AH$vT+4sQS%m
zg3M^?oL;GNtyUBq%n;elot|`-v~Z&2B%%zLyIDb9(Agyq+ixMt@?kq(@M5gS3LXX2
wNU@$7kk+%Q8k@sjHCn_OV<>-dH!x%Sy-bbTURMLfby5v3dA5>@ZMDk30r}48R{#J2

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-033.js b/js/src/jsapi-tests/binast/parser/tester/lexical-033.js
deleted file mode 100644
index f36daaff80d5..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-033.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-033.js
-   Corresponds To:     7.4.2-10.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-033";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("if = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "if = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-034.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-034.binjs
deleted file mode 100644
index b3278d53d2172070ca4eb24cb0e59065c638ef6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6255
zcmds5O>Yx15Z&^PxF8{M;FKe%LIF`OXj?(kpr%BjB2mQ+xmh<cb#^1$X&Q-N!asux
zXZ{6a?}wfBX5*yWQaD8$+s~fyn>RD|#biwJjz7dG*g0g;fT59h!}Gl3D42P>t<FLB
zO}8J7vFF#-9G?;{cD_CKyazDLH<uqFM$j?Ed$>;#LxM!1f(rCE_fAO|%wzomoQ-8z
z5mQhk@JL8R24HUA3UDaM3BgRkg=nM?%>^UjVCODu(``0-t&bhQp8V(66A%-ttLC?f
zzzk6ZcZTT1!jmqb_?+|+eg5LrmW`QW*Ok}&WXqed><lq`x_N{(z4-&Muh5%E%}?E`
zym=dre$ajS<y!dh=hgX9+TCmQ+Rbu8ICAnHpnbrzX~Y6<173iT&GRwCoI_N11rm4!
z(WaP&v;PajvVkboOVtVp7m9T-nXGpR;`?AA7l?@-=Ay*Hg0R--xQGc-9upG~8%(4l
zc%kVI#ykY9DFdC^2LZ;c7qz2-ZIe=u?-15jWbcv?v6;5ZliC7u4e|?;N%4vB7#R$;
zVkQzKfj0F<<`rB5q=O@>mS$;SO&gf;zJL`Drz;833^|tg?6Y8_>o4hdz-tiX6Iu{h
zCPy5#NW#5GgyLZFO<Y}S{0*nE0w{kc)f5_1qwskjk7W^L+rEY?9|2+~s%4-xF=WxS
z06Qb#|5$QJLP5U4{p$F6h&Zp9pFK9y`9&4eH0qyvLlg!Ss?)TRHd(MMXXF-@R^YFJ
z$rhP)9?(#761Xf$-G!UyQgoI1?UvjfYG*qJ6g@w~uw{j#xX9vL3<<Ao*94njdxu0>
zvVchZo%}uLeWTBj$BFx%eZ=<&1Fki}fYfmtS-+6tnm`RC`ojiA6OL6T9z!2ATHH&S
zOC7S1x=Pzl6J=!{Z9>5yFMO_(Ta!ocpgJ6cvL4a^s}v;L+BVZB2hX_XEk`JbmqLk2
zuRQ%VPpM5_Dfa%J&sNA$If0NoEUDr5BJ=(wxuWB*;7@PNWMwL5X)Mig&f#ht`0s!s
z8zd3MBBKeHUg^@`IIWsDZ@!WMc4l23YS9|4IBhKA#}gcM;Q2y#6>8HbfGy{y&j@*U
z#3#$|ntq$RugTR8p6ZoKHL7ZZ<ekWNu7P-gkSoKsK&WIkS(P--jm0JOJ^uz|Rr%Ir
zm?NgV_u5k^W%0DOI2KJ{hX7w9Y()X#cw8BA&ni2oYccC!a#{XcPzIS!)lt1t?piG^
zIG7>hTR6SyEGgn-(urjm`n!2aEvfC|x9zuZ%j#{LmpmFLV+HR5$w;xH8Iab?X)?Be
ly~$`1XN;kI?`~jn`^hXBwY{DU6lcn0aLLP+(rl|({sW9|>G=Qv

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-034.js b/js/src/jsapi-tests/binast/parser/tester/lexical-034.js
deleted file mode 100644
index b160e3d030a5..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-034.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          7.4.2-11-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-034";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("this = true");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "this = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-035.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-035.binjs
deleted file mode 100644
index b5015535d3c6013bfb084d5cf5c3d7d0f8af230b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6251
zcmds5O>Yx15Z&^PxF8{M;FKe%LIDaF6e?&M)RZVxB<dBpSvN5_yOHfQ$zS20!G$yb
zg0a`TcGjE3Nw?wS6m4ujd&Y0x%(y1TBZ~KH1B}A`6BhRw8V1*bAUKP|S#Z#7A9r4N
zdhrMcwW^v^qlAn7>BAtn2eWGS@>9eJI-~dy_b6gWkT_CMq50;)R}zKuSU&-0XBAe=
z6ch;q5)qLB*xNTl90_txFjH_58k$3M!AR8KzYW`T8uf1TW4l(>|JAA*#K!8V`7I(a
zLsY?CAUbyNqzfpXk{+T@pY6SJF;ncS@>)%Ac^#HrAm&cDkFcRPzXSFby?NUB)G5oG
zH{s~Vo#&rlx{letAAfAmkJ9dLv)gL8cH4yT<m4Sd`+#SYn1$R0yo4hg(-Fg*LsWMJ
z5_kyFrkIAa{|m#ijwm%t)d~m~icK)tMtTJCT`-Uf#6%Z!vBW|RYonWUT*d?`kJ<#p
z`eW$`UTC_9G4}y$!a!$^K!7pp#;v&T+N9Lu8-%qJ*#{&-Y-a2Vq_%)ugZzSIQhY7~
zM*0Jzm|B7)(5~6YcG49<dN`tNX_f|7jDZ>N3s~WCx+Ni+Atw@_eHLu=_e=UM@EQd9
zm=*+<%@I#6l5p=4p*UQ86WdFTzu+`Z0OjwboI*ot6rT3*NESh^?HjoA0U);HN(NdH
z0~SvTurmVwk0pmB6yzJ+E03Qii1U*9*<~}6UsN$o<KEX`fTEB>b(&VvHVY2qjNGE7
z75E-7*&(yZ0|rV?0+;F3UATEJMVFc1ZphuCc6MVx(eo6B9V<M=MaCFZ(Ur*n1jfbJ
zx{`&1_O||e&i7WABM*~wJx7Qi5(Z3b!0}VJ?PT3TifaSak?0NT6pcAnd3Xd}&~R}l
zWiR!}LFyu1J8hJ;S+on~g1qjzK5j!6y@T4YAIWOS0IXAvyfL=fHhFl)H*0x9L9`SK
zOnT+%uYF2m@>-Gi=X|zChRVr<<l&ME{xG)hUy>_6`vU$9MoiYFVwT3z9Opc)#)JPJ
zD6%~gaUwB>aOst<{7sUoee?Dk31DZ|<)Id>F^bc|B6&K&VH+MVOi!UUeFWHYZu*Fj
zcSmxv{I2P@z59k-ZR3eqsZ^t^CP?0iZ072S7YMmB>;(vw%q8oR#=EV!g0AP^fGj85
z+WhiFl($}a3}q~yR2D~~4eSx#D`c%G96XOJ<Lyal=kzUPJxpGf{T38Kwo^?^ua&vh
zO9~!l$mkYcFFGqqIGJ)1QHI`bUQm}*cFDW;TexNQuFaP`80)cuHvv6TtY;Ra^J=Qc
m7O+>37IDTJ%J=OSCU>99^r-7~Jy4t{_27zEE2Y>@sr(ynp6Lbv

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-035.js b/js/src/jsapi-tests/binast/parser/tester/lexical-035.js
deleted file mode 100644
index c061c60abad9..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-035.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-035.js
-   Correpsonds To:     7.4.2-12-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-035";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var while");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var while" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-036.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-036.binjs
deleted file mode 100644
index 5836694ee868559f4d00ebb8d6c62420f5e35786..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6256
zcmds5O>Yx15Z&^P;DCh0fm4p43I#;f18gH`8q}01R3xgz3AtG}S?cUYw$n5R{s{jJ
zE}Z!njJ@8qv)&|5x-B24Xk+`?GxO%n*ghYR2(I}9jDp%Bjr$Z0y=$K59mm1c+ikWF
zI<Gptc!WK_D(CnlWW4tEk>}lmS-!da2+<H76TF9e1X0ApIFe9-{$}237zMLfKLKZB
z8CFasR2X<+6!Hwf+`bv$h=(U3rV=hfLw#t*X&Ciuw_%%3quy<PX!}+5pI=oVCRRtz
zZ-pFFL?ql9B4Z0rxPajEu!qRA=P$Qy%oMvSz2>Veufwu4MD6M35!UqPcfh_vZyq&1
zcFOYRO*r~N=f&qO+c8(~#~)YcM`3rj*=;p!yG=qka`FzKy~oo@Oao>EUcix!^AW|2
zK~{G-;&=$zCYgq_{|nQyjtJ39<qAj_f^{;PMmi+%T`-VwM0po8zQ95SYohCOT*L$+
zkIDo@`(xn<R%p6|F%JN1LP2NtL4Yys#;v$-+a%TF8>F?B*}Gwc=v3R~32gzn2Kfca
zB>04TH0%$wVk!v|K%06a(@B>A>EMX6rCAtQ(FSI`FJOhk=@z7DhMY)z_F1se-!JL6
zz-y4?V^WY<CPy5#NWi^AA;H1?NL*cM`~|165-1;&avBYxQTV)vN1_R`ZC}Hc4*{_q
zS2EBFAJBMGfSnQWe{4Afp`hO2UU~dHM2wZp&n}(n`XZZY68BEM0g3_w-D%oMn=IHB
zGjfX-cHrB<WQ)wY4rnMb30$U1cj4x_5?y9}yCHUm-r3FpNzYF(Y+2zbF82jAVYsqW
z;dG2&+gm7U$udGYT>U-ce&eDe&XZhx_7U3)DUhuJ7Nnlr$Sw>it_f5}yf>&5G-g<q
z;t^bghVw5|=2C|;Bx7mYX`-x5q)q4;M8s#Va%&RlEwqRINHjzmV3m$!N84uF<lq_C
z!sQ4B2~(&sX~@%G^OV};m6Gqz`D}$El~V}8!v#(JUTnr+kSjj^0{-+yRJ5jin&#3B
z=Nv-gz<&o6aYN#9qB5FrX-Jp;CUw<}y!lK5*qL>CsCjF&;<PYNUQck)hW877t&p2O
z25d1meMiW<BRN@q*Yw-meNC>m@kFnbs!`TGNW?_k=jw=IJ0{YwEf6YEPF5w2^UdNC
zE<XPTq+`JquU$sLwZmjG%n?(>z48QlSv;xOfJM}GNbn`XR)p$!T#<24OFO4)H|t>X
zqWU+d4KkypvwEf4wOUzlFhk@wcY4-Y(!`0PlgKh$@Ma}-L2s8lZoh#j%g1fD;MG`-
z6+8^6kzz$NAg!lUH8zL6YP5(m#!&w9ZeTL|%}kBjURMLfl~N5ZdAgFCZ8gik0onrU
A8~^|S

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-036.js b/js/src/jsapi-tests/binast/parser/tester/lexical-036.js
deleted file mode 100644
index 6b0c3e9edc2a..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-036.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-036.js
-   Corresponds To:     7.4.2-13-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-036";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("else = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "else = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-037.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-037.binjs
deleted file mode 100644
index ff6c26bf64799bfc29ef046af0103552d987b619..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6246
zcmds5O>Yx15Z&^PxF8{M;FKe%LZOHQf)GK|pr%BjB2ll%&AN%f*^O+cY5ofT3@)7c
z7mU5$wX@zNPPz>rr)XpQ*)#Lz&Db?D8B<)Z4KWJq$1EN&GzzW-L2w#}vtYl~IqJUZ
z_Tw=QYE?C-MhO>n{xAsc!K|9S`~)$APANXXeTo<oB#snRXuf&yl|<n@)=$9MS%nod
z1x3PuL_}l&_V%q1M}nLY%oJRNM&{65FcJ;ww_%%Zv(amP?9{6Izgks;*jQaPzfA;Y
zh$^^qL?;fObOFT|q>t#+XU|`{m??Hud99|mybjCG5p$>8N7&Gt-vN7z-aKi3>Xzlr
zn{f1_?%wAYu4A_E#~<7CqqMu%>b0A$-8LaSIe7=rKH%9jW+8V0FX71M#h78vA*;Ir
z2|R*qQ%u9z|AlGUK$M!LY6YYV#U`0-BR!J%E*QuKVxot+SYn}uwb9KvE@Og}M{NRP
zgNbwmFEri5nEQY=WuP;MAi$XQ;&wc6ZBpv-4bs}l?0pg;HZyhwQd>Z-L4H9pDLxYc
zBZHw)Of5kYXxD6HJLw7_JseTCG)n_3#=wmC1+4Hm-I5f|kQ0f|J_|Pb`z8Grcny+#
zLJJbh=7^^jNx1ijP#i9f#P&+#FF1{pK>3)I(`ZPI!WVr!mQ9dr`v$Ij0EnHql7Uvl
zkj2vi?2Lf_W6L241@#8^%j4%U;=E*j_SnqS7u8JDxc@a6q9~-$ou-|%&4PV7Be!U2
z2fhbPcF1h%fPs>ez-7907jB*_(Ph@R8*+E(o!uNz^z6Z~V}+-<$ch17bcIB(U39G~
zSu$u}>%ZqbZ{2a^QIb2)A>s#w0neIn_|$1T*<B&UwSgK)^oI?KCLF6OJcc{aXz@MD
zUg}YSR2W@5ZIrb+v<uCG4EEeDZbJ^egU)ae$zI3+tkaCVF}B$@d3eURW_dzEt`y2k
z8uIklKBX~vt-SklK3k(c<-|eqa7q7u5Zm#W<cd$ffIovVlU=EprMWc6IgikI@ZSSP
zUXDbZ2#g_I8q$@&NlCRMZ@-WLc4l23YS9{_IBhJFhZ7uj;OWBLDAcBp09(#YpAhoy
zNKTgDHT|}C-;k>vJT)toYLs;ak};82xd!6cjfpa>3PL3-$-1QRzEoVno#)?x^sKc~
zW0P9zM#v_YC!7p<<uP=ycv^7*i&*QC+bcA!2-WkrGTEM#c23_O*2CmwrEft8WJk*+
z^jc+Wy^7#rhD>eY^_a7wf0OklQDnH*&8z8>wk~<nehX1nPuhIRTd^K1cn;7b#bRbb
rIuE9LYyo@qXc1?uq5PHI!sPBtnI3h$t_O;Xq#j)HV5Q{R>63p0pSI?%

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-037.js b/js/src/jsapi-tests/binast/parser/tester/lexical-037.js
deleted file mode 100644
index d42c13170aee..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-037.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-037.js
-   Corresponds To:     7.4.2-14-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-028";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var in;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var in" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-038.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-038.binjs
deleted file mode 100644
index a490d4fc7b2a0a911f741538856a303b4d7405fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6260
zcmds5O>Yx15Z&^P5C{p01E(B86$%K15Nso88q}01R3z$!19G!&V(RQhUZ-h}{0;sY
zTsZSD7<;{IXT3?BbXz`7(Z=?(XXeeDv3))sQC#x}7zMR`7WEk#dY3%UJB)&<x7}>-
zbzXIP(Fl8fRnGA#iFxhoeb2iEvwU;;0b&FlQoMtE6fwj}6iTQ-f5+Z234>XzpMbNm
z3@c(1iUb}B3C{q`?VAA(IXNPjNw^RV^`T?VNZ7Akhiy8IdbjzZ?N`-*epP{(SRFaP
zML1@NO1Kk5#}=M&0mY}Jhv?%c&tBS?DRxzQ%~xAqhGi#++0)G<tm)0~fPI19JZOCE
zl;zE<aP+;-)6dUs$6UN0e_Wg&h27m|x7D!iHVNU#$s2(79#1C`3t}7a432D^ju?((
z$m$M991kJeB-3#Ae_>kI5v6*mTmk7qu}&t_NQWf82?oX-G2X>7UtpnvHPQ7s&SHX)
zM`Z$H{jqRFTxhz3F?RuL!a!$sL4YyqMy;rC+a%TF8>F?B+1n&UY^v?@gtmZOgZzSI
zQhdZcM*0J-m`Z{K(5BwVbkaFMIyj<iX%+@nw1FA#3s~WBx&<kkAtw@_eHLu=_e=UU
z@ERofm=+|K$q`2_5^(Pjp*WZyiHj?Zzu+`h0_9^;PNN|-3ZM4yNHjsV?Q6L59w4@(
zN(Nft0~SpRurmVwk1dBF6x18sE03T1D2_|!XO~TNeUZ&Hje5u40EGdC?lkSBO%`m6
z8M#FZJMfplWQ)wY4rnMb30$U1cj4x_5?y9}yCQan-r3FpNzYF(Y+2zbE_YxppN?>J
zRN1O<HpZ{*O_aD~IiXyx{+<bdan%tgO0GV;DBd9q=+*!mQr~T4SB4bV1gaz68`LQp
z$5<BQ5nP3a^RH9pQinn$qiNe|qO44%P3Rd!%x5lhYf|YgG>H9Bv_u+Um7Ziv+h*G2
z;2GD_<p>2SQ>Zd&$kSi*l-lH#((ljtY=ttF(+I)C1#SFJWX4~RD?0oF{`5vnG^c!;
z=F$x3975y3e+LwCN8(YUGn#N|NSFR5mDP;A`A`DbnRR)nd26)dv@lQJPjJwN7Yu!|
zkefaLY%w=|Nyxh+Iaz+!^xNEhO|G`_M6Z;pQPxdJ#6;Za>L|u`Or&8iK&V7PS(P--
zcZ+kl`urP^jwSatIDe+(+JQ1T=7=gHUwH`qES^+sz#{TGr1%nPD?)WVuE@DZrJd8Y
zqjfNOQ3agS2$|8+dA(BgTCFfRm?1KpJ3Z|zY2!rMNrV|Ld9$Lrpu0;RxZgmO<pX!T
z;N@726+8~8kz!3VAg$+9H8zL6YP5(m#!&tOZ(zpuyO|oby{-m|Yo!`o@_Z##+iI78
E1L@7|2mk;8

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-038.js b/js/src/jsapi-tests/binast/parser/tester/lexical-038.js
deleted file mode 100644
index abcb85790bad..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-038.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-038.js
-   Corresponds To:     7.4.2-15-n.js
-   ECMA Section:       7.4.2
-
-   Description:
-   The following tokens are ECMAScript keywords and may not be used as
-   identifiers in ECMAScript programs.
-
-   Syntax
-
-   Keyword :: one of
-   break          for         new         var
-   continue       function    return      void
-   delete         if          this        while
-   else           in          typeof      with
-
-   This test verifies that the keyword cannot be used as an identifier.
-   Functioinal tests of the keyword may be found in the section corresponding
-   to the function of the keyword.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-
-*/
-var SECTION = "lexical-038";
-var VERSION = "JS1_4";
-var TITLE   = "Keywords";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("typeof = true;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "typeof = true" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-039.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-039.binjs
deleted file mode 100644
index dfc706264557637de7d73d1fc86684715e547538..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6253
zcmds5&u`N(6wdgKxF8{M;M5~%LftejK&W6{(K=OSqSda*O}sYXCY9r^D}M_A83)9f
z|AJ@7iQPDDoh~asPE~6Av)_B)``)u%Hk}aMa7P&VjZ+#8DH=OB9LE_%{@giicTak+
zdR{caj$0RVToS~r@%6FeJb+oQzWfZ)01XH}!X7~su^<Wsl&`*H=SvX!i&#GaXJ;K&
zL<LmfJ3$z*3_#z$?c<OI=K-byE<|H>=$O$U95(L4HoaD}-~P~b>+(OhE<tpxo|xYW
z7^a8_xC=z41|D|-!Iy!D$n(8}mnLS4T^C++<(4;L*#)BJbo~e$dh<JAZ_%4)t&hE`
zym=dre$w0j^ulz^_Wk%{dw%40_uKtW%d}f3L<vr+RESN?EBLZ?IiWa?A+dW5F+7HZ
z6J*2L|Am>^M1-iNVg+Oj!7870JJsRE%%VKL4<3sdqO6Z&w!%UQtD~!PT*U;gkkSN1
zhg0r|xX^S9V;%z5jDpl0g9c;Tk2=xNv`GlaH^^)wxetR7(YdnA;qn5C4GIjZN$@#y
zXfPZp(UdC0fp*nKx|6N}(!vo{t1~ySrVPw@U%(2B)2+zT3^`Hx?6Y8_zhBkwfY%_&
zr=%dUbdFfc5r=z^0)qYJk=R~!`~{~m5-1;&YI+T>QTWos6W#}zwr}9dM}XLkY8hya
zjc7D0z|IKxKXx6QP*88MR~<i3Q5;vy&pw^2`Xc&i5_w;o5ej_*4Qkp<>nu3rGjfYo
zHsJ@rWP{AA4k#!-30x*icj4x_5?y6|yTx~h_Swt<LC-T7HmtA|7oKC#NZ0nzz<X`t
zOI^v*L3&&Mz2JN8qQei9TzrmEd=yY%S__V!x@{-BFr>ITP!ln4)FfycV^N1Ea1k0W
zzf9>%EozVmq-m#)Qkq4(&@S+BFI?p|WYIh54TmA`h7>@VcI1t+O}ELyGqzRB5(=`V
zP+-!Kr@#6smC2<t@6Y+HM1{)91Lxt24*n?8<Il+z4L*ZEoeAZADVwLcw7@xw&{*)_
z0_7eYh((FSD8i*7UHh99RXy_hGYMd4*5#p=tx<~8!7O<_!G0IsFVvkvZ2APS`P}p!
zA@7dlWcgjwZ+-U-x!T1uwNj`?RhJ+h6MmU%q8OVo5r*x9Q1Mz)mNeGaifg#_{2P##
z)t1L7t+r;2bb6HltUZM;7SC!XU=eREvU`oH6`@)lm#5pa%Fb!q$6A=Ys`xGGf%Isp
zlrB}c%GCr5Gk9_{s|TGm9UQMXi6+C<Zc$HHG<M0$_FIUuc-f9uJQ>Tef+qnvQY>d0
rr15Sl$Cj{Hjuvr78_HkXHO$z2Et8|B*X2NQnUsTT9<7968=dlRD1+$Z

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-039.js b/js/src/jsapi-tests/binast/parser/tester/lexical-039.js
deleted file mode 100644
index 01e4407b32ab..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-039.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-039
-   Corresponds To:     7.5-2-n.js
-   ECMA Section:       7.5 Identifiers
-   Description:        Identifiers are of unlimited length
-   - can contain letters, a decimal digit, _, or $
-   - the first character cannot be a decimal digit
-   - identifiers are case sensitive
-
-   Author:             christine@netscape.com
-   Date:               11 september 1997
-*/
-var SECTION = "lexical-039";
-var VERSION = "JS1_4";
-var TITLE   = "Identifiers";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var 0abc;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var 0abc" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-040.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-040.binjs
deleted file mode 100644
index fd39cc1f252e5610d90e799b96fe785fa68aa89f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6253
zcmds5&u`N(6wdgKxF8{M;M5~%Lfynp5Gq(#v`$r-XtgVH6R!<(lge?|l|P05j057#
zf5Efk#BQ9nPM4J*rz*Am+3&sYeec;Wn@$LBxFd}G#wm@46pfu*j^hj>f9@Q%yC=QZ
zJujMI$E}MwE(v1R`1;gw9>FYEUw(#YfCdB~VUHk+SP+E*%2(g9a}k98BGym9*;$7b
zQ2`bBP7nqx1JJi``#5C5d4Q>a3(;5|I%YHohmHHNO|RALw?B5>y8O?rOAsBaC+2qo
zhAAQf?h=uyfyZ4y@KxX;@^bHB&%{iz>%wcU-10UoyF}ESt{-7TZ+-{tEqe2;^{H2t
zH}AsHPkQ^G4@}2w-;Y1G=SOaLzuoV&OuKbLl;EUFh1kTrhA&%J6N=*)61&F`!(&J|
zK{lNIUznLqM2K1{RzSuOtnx{>QypH+EXw1D;IWt?%KA8FD=d_-I=VW?bxhz2DNR6h
zIOUFr3r)8$<}qN+C`ipQXfUSzs1prMn}mRTgUmLP`!EO*oh!Q>E-#?ipunJ-1fMg9
z2E&mOO{qd0Xjg5dJLv`>EgVs`I&%YS%D{~G1+1_*-HI&DkQ0^9J_|Pb`&IoOcny+#
zN(vH7=ZK{oakvjCAlP3XiS1R#UvL^Df$}k_rq|#ag|9q3;eC*4`v$Ij0*KwHmVwsT
zh(@yl?2Lf_W7ok61@#7d)$#Kb#c{>_?9;ibFQT6&k$2&YQ0NnAP}62wXTc$#kz2H~
z34aAlHpr~%fP&(az-6*@7jB*_(N)&BJA8L&pUoT)^gM%M!wO4r;W-A4bZs9Eyf-Gk
z)Rin9q_^eY3%=JbI{Yxn#pf8sM*#(<wcz-v+jg=GLyD^dH4*bhO@gK|7Ik<67oqX;
z%ap#<q6UdTns(|arCGEK?E(+?!c}fV7QKhwa2WD#NCA{-N8T#ibek+ZV_UT>p&(ld
z1ttx7`m3K(nOrLK{+!QBRH&Rha2~Gc;Ey6b{+wLV;0yTEnNZ%BvU!?I3!JkEjRpTL
zP#(a6Sd>VNB3v5MwZBPG)g!MzlK^&RT^?%L8l^ZL%#zm=?04b)Lft9Erq2MI&rRPE
z^6p4Zmftn~)_32Kt6e-(D}`!QbqV4z;g`84im@3JVc0$h6|W^_Nn?GjxPe>GzX54k
zZF!8+YHP+wr&kHU+H>e)@vLS77V*|1yVs~%5vt{JdAhx*?3}iJtcA&|ir<nRNRO6E
z=~9KOTurbrgC{q$deB+Z!SRZdXfj;w7WH&RW0$;azk?`?m+g4Pld&8tcoL8!#d4-W
r8t<lZYzceiXc1?$q5QR7!;H<>GC68`T@DnNNjbRY(Mkxm(JB81e@*D!

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-040.js b/js/src/jsapi-tests/binast/parser/tester/lexical-040.js
deleted file mode 100644
index 346345579623..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-040.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-040.js
-   Corresponds To:     7.5-2.js
-   ECMA Section:       7.5 Identifiers
-   Description:        Identifiers are of unlimited length
-   - can contain letters, a decimal digit, _, or $
-   - the first character cannot be a decimal digit
-   - identifiers are case sensitive
-
-   Author:             christine@netscape.com
-   Date:               11 september 1997
-*/
-var SECTION = "lexical-040";
-var VERSION = "JS1_4";
-var TITLE   = "Identifiers";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var 1abc;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var 1abc" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-041.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-041.binjs
deleted file mode 100644
index 57264e20375fcc7abebb470b315ba9b4ea819bc2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7088
zcmeHM&2AGh5Z>~S5E2q6IOPbcP^jPpOVl<EYETFjiF!ruuA3}%b|bITB(K7|@E{-|
z&b$R<?~k3>NxbPcfaodOc>UQkp6?satjk72f@^LcBfoY;qaH;A=bGa<Cy_sO_M7c@
zomU+%8e+$-ig#QR#H{x9k>lKlw_J7lF`@xFA@~4$1X09-C=^h>e2$&7AoORkege+c
zDy)bKsK9rEFkm@=x_r~eAq!3eOa)ws26EFeqe0lK-G*g4je58Fq3u@F|J-T{qGEN#
z`>lXsiim(aM`Wbo-2*&=CxM5^v*#~&bj%F9D!k^VOJ0X*=ZNaBt6Nypo8JL@gWf!D
zeC(9v&0DbbM*aQXr@z9HKQ`yco3K>3*=;qJM?`_3lw62)%nJl%V=|;Tj)B=7h8P|I
z<3zOK{C^`g>xd9JRm=d&5G)C$M!wv<c+*7WyWp{yA<DWqW=kwIP+RWfA|`N&Oie(v
zH{y<njiy@|^8m2M6tw0LL>SX<)QWn#O+rDw0JSxC?*}2GQ)!pO^#vpwBp76q;8W(%
zpx2kGnaU6c+LjBcM{o&{7LF)ep1FY)X<#1rhN!UE-4d4O$cfD7kA{WhF<m75xMf!i
zs$~iFia{x*{|5%Gc`^D1l+mPf9;=*dCcnr)nj8^BYEo6!GNE(0w<sXkU#w-DyI}s>
zoF93X#}f|^c`2dWzJ@Cw0%AL=<e(MSr_tDeolE$}F76wSPdpi7ue|s?LUCMje0J$n
zrbtnelE^!A`Y7}X)OcAvsz$*+e`9Xa(mM79D1s&m<)r8`Z-_TI5ugIqIUvIG*hEQ7
zap4?;TC}o@PQ2GTeyS@u9a3+nf6w?{=@oF7CcT406dwc>BCP@2&(3Tsuemc^6{wDw
z*RK;aim|xK4xyJYSlo|Lr&`?N_|~v)r;1WIinigx&5wJg8?t5;?Ll?b3wb>u0g7Dc
z-$>h3n=CwIo3$*V770vt<k_#fOKGwsu{f~h<>jCAS%C~ytOh=a)br=T6`gzr8aYGC
zD?2vLxHJ=U7Dr<d{}w2BU_&fQBt`~YcBCtRlccJiyxM65?A*F}s6}(6;<PYJ8j#p;
zLkmz=<zmstfX&~{Du;P@Bs-g5HG5W9Uo%$Qcr0fM)hMftz|VxYL+U6t2%Io%2ZV~}
zlA=LlT~=H|-{9YXw9K~rjIwO2^F|G?0)Uk#aEry`iVkRsTMKrtP&E^(<#svUo|d*x
zp0O6C8P%5-CNE2V3+_Pb3X;-=5?8UDU||L)H?wMquDHSRjFV_Gl*qGsy5wS)d>q<^
zQ|4brGL1E=N1S|-F*McE5wo17gB()(^pK7%h~9M66f?@ueA%vG#(KXw9o4;_4w%zq
OI=G@~B?Mc$DgOqosrrWi

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-041.js b/js/src/jsapi-tests/binast/parser/tester/lexical-041.js
deleted file mode 100644
index 9687c7adc472..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-041.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-041.js
-   Corresponds To:     7.5-8-n.js
-   ECMA Section:       7.5 Identifiers
-   Description:        Identifiers are of unlimited length
-   - can contain letters, a decimal digit, _, or $
-   - the first character cannot be a decimal digit
-   - identifiers are case sensitive
-
-   Author:             christine@netscape.com
-   Date:               11 september 1997
-*/
-var SECTION = "lexical-041";
-var VERSION = "ECMA_1";
-var TITLE   = "Identifiers";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var @abc;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var @abc" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-042.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-042.binjs
deleted file mode 100644
index 47f879d5daebdd7c53c0be93ff95dd359160a195..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7085
zcmeHM+iue^7|u8&goMNuT=fz(p>AVWP%2ngv`$r-XxT0D8m~3DN#(d}`zkyNZ^8xQ
znz!J$<HT;AwoaFg)2^!2@n`?1??0r%M?;FMl|Dv(^@xQ%h6dg>&+|?~f9mZuT8Hfy
z?QS^4UZpJGsZbK}>eok}cOTxWnA?vLBj|+UecYvpAx^?TLizeR@;;NmpT+tCI2)_5
zLMEYz?~#D;6u>;b;p2dlQ-Ya<3(!DcI^v83z3Oc^rd_Xf8t+<_vih%5Rv;!;TfW~U
z95X~E+!>-H3-2D_Q9L1CM4xT#?%0?Kc3EnzqK>={+s+WPUpKF?rZ&F;_9bfbxc<If
zls0d|)eqa-A9roVT)rN^U!ER?+?__JS-0gj9U_NM>QIPm%ya0nJ{d9`MG)9+jyN7b
zz)5Gr>HnFLSwocSt#SuM48=O0OgZ)C<(pY?d>1qpam08BM|_Ed3f4r|_c)ITf+3X%
zi1kK75mBb-4#GSDtT6+sIRFmEtP?iFo-LCkkS`F~R&ei;0I{i-%M<hhj13G7tV!`H
z_ZaE*HEAjq5<r{!AX7;f0O_EJqS;vpSkeNfexKnL4!2tpr73dE^66v7LE22`aX%s1
zRRmR&e0mi@Dy0912>SEuqFWH1kS0eoBQ=>U>zL35+*?E__7`*6<<*xz;WkzZnzu<Y
z)w;;?c+$l~(Mi~{uc69^fY=I4DQJoJSvbzXPAU9ftlNb{;mHtpi}TMT6h#I5XNOI7
zij*BG4ZEMcJ_>vaEnd=&nqIIc-k968w2j>XPqv)7m=s-Pg?K|43>r{72Bdp_fMrVx
zM{>CXd!ZFAZSOpPX~Qd8Nuxn2Tm3zwdSg-`?h;Q94p6jD7&uxTZl9QJBki~oTob5<
zc(-4pXcS>t$PQtWFjzc|Ft<7sapG#&meWMZ?L?bUZwqVB%tF?5qBqc7^#ajOXn;KR
z{3|V+DU*X{T$7d~)FOUKOrHFjx6~r*7?uWG-d+Aao#jYS`C8!p(6qmBuJGg&gpoI7
zqOs%CB$j4;&cQSe{_lVyNP~wl!)S*~OuF(n&Z(y5%{e1rr_#+sE!v|Qr-^wye#CwY
z27tOLmxn$EZ1HZ=ILxafzS;b#$+LO-n!eh?W4%+dMp07)VG}V8si7!?;G|$%KvW`?
z<aHY7uHpj527d>nW3m;BRLRy38`HZS@r2DwPoRdy<B|=S<+cvNy@J%TP#v!;qU~v6
z_jIjd9YkK1`xcZyrnPiL=gM38Qi6jRBDT5HKy*a`ClXFf$<Wx%(&>`AF8(s~8mufn
zizF1ANgh%BIVNMIrdG1qOf3pX>$`(mTj0HFHOps=rTM1az>Mr^vs$&at`@Shq*`1t
LvXXpl70SN=&ae2H

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-042.js b/js/src/jsapi-tests/binast/parser/tester/lexical-042.js
deleted file mode 100644
index 0defe9708958..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-042.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-042.js
-   Corresponds To:     7.5-9-n.js
-   ECMA Section:       7.5 Identifiers
-   Description:        Identifiers are of unlimited length
-   - can contain letters, a decimal digit, _, or $
-   - the first character cannot be a decimal digit
-   - identifiers are case sensitive
-
-   Author:             christine@netscape.com
-   Date:               11 september 1997
-*/
-var SECTION = "lexical-042";
-var VERSION = "JS1_4";
-var TITLE   = "Identifiers";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("var 123;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "var 123" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-047.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-047.binjs
deleted file mode 100644
index 483ce6f420cb1da7077a22bf97bcdeab264f2ae7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7567
zcmeHM&2Aev5Z?6v7bx0Wdm-FQ0-<mM1SpWM4b-xNI1tpJ5^^d~&=M^%rk4Vjifj}C
z@*I7XK1NP0dg!@t(HSmxNsH?>C2!QC?P;+~@+0T(o8fG#7jwb((;1_a{U=IJ6+KJd
zNRs4OPA-yzqrv0hgW*`tS(5IWIjP{e-hcT;l6(lWQh)hVsyICs?2wHGRaA4C8K{YS
z&y!Q0O)g{o0XVm=!;;EC@kzont}6h4`=bfVG(X`?8Mus|xkKk#@oc*PE^IUGbw@|v
z4bolvE#0*sKGx98?{m!*6$b7(6^j55RUp_oA5-zw-TPmMm?ieE(OPP^d=r*Erz)K8
zA7Mjn{s!1v)aKLP_rtcd`8FK=@$lY{_d~^OUyr|UPmd_~=xEgMg>w525$Tif1KNpH
zL`XT$L&O_svUfgLEYBgVhni}32H|F0jaA=k<FZSIa7)b!h!??JH2G3SL@`R3YpV2!
z<+?#a3+to1bKFD(<VPz4RnrA3BCi!aLYPkgYpH-}9svV0HIjWf4P`R)@iWAA5ZVVk
zqw2!Rl_0qQUjzRFX9{+r6UC=9N12v`5UAre@|E-&AR`pfHaDYy#0gmWeT`Q{oUS28
zE98RXtJj*1{`s8#4rmR6d?9KA%lDB;GD5hAlnXYw+7jE#jeo*vf&f~zNjsGWauhos
zvpH5lq3j!|@-sjjNK%0kJyUX7gIzh`zp>^(hk|^=#_jp%6Po8O`{zhqxcp+OX(7j_
z$&6+b0p)2~O8Z`LfHPJWHJ0GN0wp1I8zuNJfU~8*K$;)RMFy31b65-@uPQz+Yj9Xr
z>8<i`tH2Ey#3f9pbJPI%maTEB-Fz#p)G}=r0&n5&aLWj_V&eD}<n_QruOU<a4_Vs(
z=7m&blKd1bj}`lEVgrNhk-Hy+e&9P|B=pAsU4o{2<X#PG8B80Xf8@|R9df5#aEz^=
z+J)Q!$fCF*ojtPifRL%wL`%Z6j1@Pgop0LR5~X<20BNbKG(z<(a<^|2zZZk3#XD3l
zMZ1Mf2GH=x?dL}{KjaFsWDgjnVlo3tV67n%dl9H7WHa?v)f*|#<sYa^^?245bdfW2
z>6k;$=j`gfk-s#e;5KC390O~o%npP!s_s(C+%OY-3m4&OhF3oau+H6U&&jr?W@1b9
z2qiaFQ>Dqvr+-Q(@><#R@6*{D<@id9M?Y+6R~$;;{^(rt_!-1qGFNyB*B4dr`TC16
zO@#kPpu7hM(y~Yv&f!XvUi)ljA;7MrTZQta^_dIBD&G4{UuLedDmI&b4)bts*)m;K
zM{%;%UCVcW_YHk@z?N>MVU4yrK4=r{Ty<&ALYo-D`ao1z4_+dw2y;jGQ2w)3US!?$
zB`9C;jFDr-=xI)tT+et$D8V|7Rd<BYe7@&J?uGt9Zo_S!ElCJi=h6|La1G(rp++7T
zBk@ja=WNPAzAhs~Zpw>Slv(}`F51`1Y3rqn2r)43byQ>93grvoQ|(QP#2>)QSlyTO
zTT3i?@l&m)HEKudna&O(WbpUM8w;8QcI*nzwxf0a<PEL1Ha*Nd{G(t;LyOpf`s`{4
NuW9TXo(~G_zW^MFl|cXi

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-047.js b/js/src/jsapi-tests/binast/parser/tester/lexical-047.js
deleted file mode 100644
index 7fa084bd3fc9..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-047.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-047.js
-   Corresponds To:     7.8.1-7-n.js
-   ECMA Section:       7.8.1
-   Description:
-   Author:             christine@netscape.com
-   Date:               15 september 1997
-*/
-
-var SECTION = "lexical-047";
-var VERSION = "JS1_4";
-var TITLE   = "for loops";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var counter = 0;
-  eval("for ( counter = 0\n"
-       + "counter <= 1\n"
-       + "counter++ )\n"
-       + "{\n"
-       + "result += \":  got to inner loop\";\n"
-       + "}\n");
-
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "line breaks within a for expression" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-048.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-048.binjs
deleted file mode 100644
index 5db347b431af79b0b2aba67c99009649ac9c0eb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6779
zcmdT}&2Aev5Z?4RO?xQNOVJaNT#^cf6Cj5oT^opH6;U9lMkM4^prChYi7~YlNGh_C
zHz|-)-lA`kQ_p>e9y+ABOM1DoDS4x|Cu7Cs$C-~a-^{F2wU{$<kWLBC4~_+&2s}$Z
zN|NM+=NHLgfB1a#WR&qaNzy&@PRgiM2khG<`4Zkr{p~NYp!kH5Ba$&Ju%f&$P`P`S
z$r&y3%UFK`&aLaPxG+#OPiR3^1>hgw&q<-^DJ8<d6?o>1mP*iKa_~7EGwOB6{a=RZ
zp8YM|vmid!$h<$GiU`aM+-uAh0iLFSk#m}1_QS)+KZckk_MTxawMTvo+g@W4zV4f_
zC7bU7dxvbk?7bMZ#pb7A`t#AF-yVm=?4HNJcgLgld)yxndZFKbKt#sm_Zn?V(2E5l
z67f^?bfNeRvN1y=GNT!1yg>az5}^|`Jn{xq_s-{nNC~hbg%z1WKAKo0)$fgo+r^Bz
zt!4)#6eBL(d>SIs{0pE!DlF8PNOgsW7S>01cHG1TEuhu~EG7$0glu#@!kMoDYbij9
zo`FOYG3En434Jp9@;fAcko$+Uz~aLBm1y+=K?i{bQDx**C4x?-PE)N&X`qff$S3Io
zKt>SJws>m?k#n$$`-Z59u<nW^u8>znpn7aL=)W)ep8;!-<O|l2SbmH|s+ETO8B<2`
z^*6D*;`tX?6C_amPTFZjv__HhjLe%=cnd1O0mLCk6(~|u!I$kSe4UHP7H@}5i4G{J
zHzaE>K98}KEyw3rT)6sT+HJ<Ovt){koI(Fu_S$|F9O^e}o38B9-vO?MZlg#418{bf
z7+U5tz9^ve4kf`SWC(Rt(5!6IVOzypU1GOT5LYlA=b8bCE!*Q%r};+JdYLvGflu`5
zFouMzn7Z;7mV+ybRN-UTd&&j6k1X?OA3gl(PWh1TqetaKr-L4#H+NPg0Co1!-6v?m
z6{3ZtIYAnQaX!EMAT-n7!kWwRS@h>lP2uVp#Ah{Hl6(lmowPqc!}5p<NcbL*Q(cPT
z1eKiFo~Ajr%&WJmIk2?PH>itMHtjOJki_&)bC_>u>t|$tYees0;wt3JN7*?0JJ99@
z*}r8_KZTxtQs^$$0c_Gn?mORnpCXuv?KUEzAbA@LLwV)pU*AgS@<u}N?{T(4XHiot
z9fwy;UPs)&e;r)><Q4Fl%!QsO)J2tiK7SEc6A}LrD7V2N#aD{w0<OH$YyYmAbKi1b
zg#f$qt`4<sk9KQ?F(B%)a+L+%9Qqx+r{66<57p^dSyn%_eD+V@GFFFV>2?~`Xlr=Y
zccO>zE|w&`6XVzbgi4pTOKnQTbw`hbA7EPje?UeS|9e0_qXj`Hg5WcWmQ+n?fv~CN
zpqRGZ39rwOyvVb3JfQn9n2;q30h>ZPA`-3<ye8C0b9E**H8R$7pMVHEV@H!nsC85L
znl{Tf)@A!fHEpwU5#ff;dlmJK&N}5g;mh+)n#5n>mcIf+O8IRR7P<NdLc>=cyV9(5
zc2PqHU&_6;VBWE7Ya-jOHpP>-RF4l2Q-&W$?P_=<cA>et+Qn<WQ5u~O8ti`nR8N)q

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-048.js b/js/src/jsapi-tests/binast/parser/tester/lexical-048.js
deleted file mode 100644
index 788c3240ec90..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-048.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-048.js
-   Corresponds To:     7.8.1-1.js
-   ECMA Section:       7.8.1 Rules of Automatic Semicolon Insertion
-   Description:
-   Author:             christine@netscape.com
-   Date:               15 september 1997
-*/
-
-var SECTION = "lexical-048";
-var VERSION = "JS1_4";
-var TITLE   = "The Rules of Automatic Semicolon Insertion";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var counter = 0;
-  eval( "for ( counter = 0;\ncounter <= 1\ncounter++ ) {\nresult += \": got inside for loop\")");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "line breaks within a for expression" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-049.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-049.binjs
deleted file mode 100644
index 53d2a5856246e0912b2898833835b739ee172a49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7602
zcmeHMPmdcl6rWQ5gAjrnT&!|wiO{xEFD==Xy4j$nibB;yJs~0Qj5jgsj3e7=c2)63
zxbiLd9KDnaXTAdmo*mEFJD#0&veSSBr_qe<pZ)&*-t(KTS}qtl=*|ev4xS1=6?mS!
zl_beA&(4#>!RX2O;W*_Bl63dXoGznM9sK%bl6(ZSy8iO#SWtY-$Pq~y7Fbc98>q~^
z%jA^i*+r~B0O!V4SX>w=nk6)+ss!-2A7ms~^n?;&;Bq{7hn7mve0uO6Y%}inCWG%s
z-97uQyJtastg)Ftq>2d44BQLMmI0nt0V8KL#q68A_aB6q1@@lNTGwuQ6PCTeBAo6Y
zVM}ek2J9Vb^LhW-xGinI14n-{zW3w(P%*pL<6pbeqn3Lzm<;=&+`dCZ`sCLdZAQ?u
zB_k5?6ZB}Q_#C1!MPo9jDQ7%KgIp4!12o+78mjJ}Ed-GgV8;q8GKY9HzDUaNwSn8i
zjJc&|1q2i$F5G-IM1=VVpaQ9|P!l3mgM=2=M|bDAjtH7Stq535ms%0BR`dvAJ_W3m
z049126ivj05BW5d$?(fB5comtAJQC)b0=4#*#`(62pUM0krR~&I-NOAwIrp1I&LFh
zNpAo$LJ@6~w-yjN0ZYHH@rsDkH3V^qyiNk;Yt2Uge$syzv<5-GWHo{1`$!~PX}Iq&
zWhA@Y61z*Df5K^k0IJ%gol-<|6gf-DqMn7fQ03=<IO3=TMQSGas$GV!>LRkl+hI|n
z9SZUdN!#<!r&!9C{c|GDU4Aj;Hsk4OGQ)YspnffCZQlzH^^D4*#v1*1pd=05MveX(
z;Or<cG|i`cnM3IvQi89L5#&`t)1pX+Wu@M#6uSk3xP<9+t~CI@Wow*rH~&zTTBglH
z;BCD-Tth;wn7r}|@_JyRH;}3Shb-)W{X!}-Nqz>FKj8x1Mm8|eKDzs1=m)+dMnZoA
z&;@9BAKm-52DXT%E#N<P@SP62(=NCUu9xjXeg%;0>IQZ8(XEGQ$`zuyq!~fl0*v#;
zt(JA9#rU~F3`<^x70Tzjn)Hq0w`(-&`W<rix+6of5%ff){rniqBPt+I_JLDME;FDA
z)*33YSAlv;HdAku?UUkM{(*W}rL!KxOG(VNV*zcU`Q@!8e`!R?ZRof;3N}uf9SCZz
zx(i8j%UtjXuENt?U;Z4xCbzGBC)<Xai7nD2l-yKL6(%p9{wbZv8|BY`PG=hw<dr0^
z{ji~7am0Q5Yv<y}KSA6j3!$&!>bwj-Uw;v%iSYjjl=tC4im%g!bGX8!S3a9r2(U}(
zs!+bPK67cY*6%~2E;3h97n@DLfO&du(N(RgV|}vfuEo2*`<A{sA}hDjutr-wA8ixe
zyXs*{LYo-DhCo!hBD_FU5$2BWqWov;yvWK)mkNyL1RV>4PbFGWHKRGgrcNN`Eg>|Y
z?|G4XX@5Ys;XY4RC<Lr?=?G7_g7E54Baf>i@lI>!Y|22sE+a&4%8QqjS^f?#+BeE+
zo282gF?8IksMfX>$``_?+UpdFKY*2Wd0)_PEwRY;f47?Es2!<iIy<N#gC9)ZSkNZ0
oW0!cg9j)^xZ>ZYb^e|=kPr;6c7O?~M+0_nS(b_jW9~9Vs1DDaFr2qf`

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-049.js b/js/src/jsapi-tests/binast/parser/tester/lexical-049.js
deleted file mode 100644
index ea2483fd8fb1..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-049.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-049
-   Corresponds To:     7.8.1-1.js
-   ECMA Section:       7.8.1 Rules of Automatic Semicolon Insertioin
-   Description:
-   Author:             christine@netscape.com
-   Date:               15 september 1997
-*/
-var SECTION = "lexical-049";
-var VERSION = "JS1_4";
-var TITLE   = "The Rules of Automatic Semicolon Insertion";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var counter = 0;
-  eval("for ( counter = 0\n"
-       + "counter <= 1;\n"
-       + "counter++ )\n"
-       + "{\n"
-       + "result += \": got inside for loop\";\n"
-       + "}\n");
-
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "line breaks within a for expression" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-050.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-050.binjs
deleted file mode 100644
index 38c0cbdcfdefdad1ccbf659d1cf6cfe938e78830..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6284
zcmdT|%We}f6rJ)$Y><#xu$m=Rh0+IXP^f6rpr(pKMWSwzJL4t>XB^p1(+cq+@Mo-8
z^9^jcc4lH{JV~5(8ekP=Y#-m}x%av%hXaatt38b3-DA$W9QA`+K@gm>_%hgUw2s=Z
z+YuY!pjy#;s+0)1`|W8EJc3<S`}hgs1f5cRfFp`Hl7uB1DmMQ`@R=m>G}ceRSzCm~
zxP~HeKoTM+0QU8b7$=gP5zIAQg8D{iAvsC9yZ7OmcD>eVyl+)2>9=Yn1+lT(dViBh
z%n{Xa=ZFp+JY@okFGz&wi_KS?E@p;Z(N?RbSKfwW=ZL%8Z4s_$%^!fhLTjGXKeWrT
z=3Nl|sJ->^rE8eg+wu46?5OnaG&;??tG68xo-w%&X!Q%!hqM+UI}7)QlJy}Oqp*$p
zBw~~$VIvWktNe6tyoROg7Xyxk0NA!f689k;btvM=_rkobAxh0reFE}{Vv}vQ6+E*1
zAy`02#AOEyIY+}3)<!pSTt@}PpQ#FncZbRlqEK}YWgY|8hyxKF0z+foVNKR`b<*_m
z9rE5u{e6-kerfay6!`$313v?&QhX)@PP#oqsVPS(pbc}8ZKNB3^e{x(+^rN0je?W7
zFNg{c>E`6{1bJKoCVvYq`u92i9#{>Md`Jrt%Z?FGvQlvG5TQ7p?TOXZ&R-ynlR$Z&
zl+%eQj=~oa9u%|i6-@aA5L+yqfQGWi*{EEG&)dSY!&_lbq5=x)4UWo-&toJ+$?@6Y
zm!`hxZkw{`bI?OcOrd?vT5UTD_SKHup}8&k4n(pO%%%<)D76VpmX_|q%X1~V%=&gm
z-44yQoBx_FPhi>6!joK7j(rKY!tL;DxZ~odypreR^z)SMtuaUmGaic$kvJe6BCQVM
zXJ%WQj1w8I4OBxi>eVP33asn!0LG;L>`}`;>QRHVBV9dhl%=C+1KI`U?x{iVicz!&
zy<s;|-H-uTrX6`>bhCBxu#9ij@`QqHDI}Q8<=L+-rBQjQ%=>#bTcSec=t0HdoDTkg
z+5T6-#ZEtgJ%a&PeW|?6a%n2&JY3@u{~jn0Kp@G+6k`G|bLqn0ag%3z-hM;@?1^@H
zs99$W<211xzpdc71+N=srqGu@18lW7du7O*qqzOdq_A(lVyw3C$eh%yQPvQoe4>WA
z8WPy`iB@bIh)UIxWrN0hthj-x=l_5#r`p=_<%y`g9zKUQ7LP*L>qUX<k=_evtq9dq
zT$OL@rOD~r$a<(eulmhsf^2V@oL;JOEmssg)KJ+iy<T({v~a5Aj7b^hnQ20u)7gz5
zzTbkE^~1NA^P-%t6}$<gE5&?fK|0T>>Dr9wO;?Lz##+kH?G~nRpUcu!*Xrp)ah*&T
M7ra_&#&%leKW%dI#Q*>R

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-050.js b/js/src/jsapi-tests/binast/parser/tester/lexical-050.js
deleted file mode 100644
index d0079468a916..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-050.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-050.js
-   Corresponds to:     7.8.2-1-n.js
-   ECMA Section:       7.8.2 Examples of Automatic Semicolon Insertion
-   Description:        compare some specific examples of the automatic
-   insertion rules in the EMCA specification.
-   Author:             christine@netscape.com
-   Date:               15 september 1997
-*/
-
-var SECTION = "lexical-050";
-var VERSION = "JS1_4";
-var TITLE   = "Examples of Automatic Semicolon Insertion";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("{ 1 2 } 3");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "{ 1 2 } 3" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-051.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-051.binjs
deleted file mode 100644
index fa840f33e0af9c2ca316c15c9a39b9a7cc395288..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6321
zcmdT|&2AGh5MKWOE=WimI9Z&i3M!S#rA;f^G>D)oAQJV8++8;@b=HyX(B@Tm7~X>u
zXP$uzV`n#Z)|<pB+W@C1Yx}cj=9_QEuBqXGk-b`v;AHQE;9Y_H(e)^bPIxkk4w|iZ
z?d^8V2PCR(m^n2@rP}-UIEo&?teU(07z>I|7&#;{!vZVHQv;RQ|1vtGX)=xV18}Y_
z!s5a}(IlcNRTBVr`({E?MNcUa1}?>YduXWyO}l${V4HTM-f6yX)i$zkwT%qK#cG@R
zM^q7knSuL)+0et&E@0$>#+bc$`D)Y0%&|9&*J|08H(=QpEd1&25iaS??|{8RZyq;3
zwyW~yEjaqS_U5N8-!ZHA<FD2EQQO^Vc8(gp-7X;lIk^UCjSJj|w3djUqWz)beMrU_
zwMn1GobePjQ%Qu*Pk+Zh@O0y1Ac&Lz+g4bSKBS|eBAI+I&D%O=%q}%6AfFhq+2(p7
zAj|K82c*J6b%<1REX-hCbbF3JF+uBRW&#%7p>~8UH9f$Xhk$i1K#1OgLKD&9N4)FX
zWaQ;5<h_^r2Q<ZEWbKNy_<){+K7*z*a;hRhyFDwZnMP@#b-R)4q$_|7a75MGtqnxh
zzzOe5SP^i#IXOH*9@l`$-;#~~ea*iOUV|hbvXaDdIT9#V8tx6Ij3l!ovAWv%6HenL
zP%$RebRt@#$VE&B<tls$S3Uy77Dp3Mq<Vs%SF7+vUj%k|E9^-$p`hN7xH^7*z*1Js
z&yE<``eM3m#^bZ7htq^X`<l1fE(;FyjKZS1E&4Gq*(0;90~Sh80+(f_yL9tHiLSD~
z-PF57bM5E9k;@SbdsYOB%X3(J$_09cchJfGH8j>Ow7!d;Zlf+&NO45dlnBH)A3WXh
zkB~`EQL?koQ{i!LO8UIxo6}n?52*k$Ho(H%v)3j!jvUtos$&)R>I@GhF{OF{H>v*Y
z+nBpFpiG%q`*yl0OA~D!IttB*sk`7MiM9{zV>i_elLc6&W7)N~xi$rOCbX~xLP0{6
zYET~X{MS9DHF>Gz{ChrIqKFj~MDuV?lYhwF_-k_Ulh5GKXdra!sz!M(O>r(DGy(h%
zK)DMCQhcmJmT-AU7ygd>KsWO4I}2b>tSdszT4NRGh^X=N3rSk=0AjBlX45Btt>@+s
z5k+^Dcc}R(+}$t9)fPFoD~)PYbx+bU(f7SNmc);VF>DKjN|&2uNfUhYxPpt({{b0T
zko9w!Q;_{IxeN=$)Nx18pw}hm$OkN=Za{)B5VkVZz~kzSTdVAxq1|qP$@A*pj5f%P
zmd)y=YS(gQA;1is-zw<YXF(IEi_Tb<;nFiLsdIX}@$2|&h_ZPdmvf$-v$2wggKVT+
u(Huzc?KK;l!QO1Nj5E$q@pA8AO8-qQ8}+@O4U|{PY;eKTmeFjlS^f<*g#Vua

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-051.js b/js/src/jsapi-tests/binast/parser/tester/lexical-051.js
deleted file mode 100644
index 1fec695d642f..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-051.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-051.js
-   Corresponds to:     7.8.2-3-n.js
-   ECMA Section:       7.8.2 Examples of Automatic Semicolon Insertion
-   Description:        compare some specific examples of the automatic
-   insertion rules in the EMCA specification.
-   Author:             christine@netscape.com
-   Date:               15 september 1997
-*/
-
-var SECTION = "lexical-051";
-var VERSION = "JS1_4";
-var TITLE   = "Examples of Automatic Semicolon Insertion";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("for (a; b\n) result += \": got to inner loop\";")
-    } catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "for (a; b\n)" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-052.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-052.binjs
deleted file mode 100644
index 02ce208c76af3d0eead046fe47aa23d7891667b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7315
zcmdT}&5qkP5LVjsFYTc~Pwh#^20^e%(OwF7fvnd-yx6)yY~&hnC9bW6mJE{4u8)0<
zJW(E?m!5jgGvv}CMT=vRvMERFv?oKR_>nX7&CExtCzlIGk9#vp(&MMRm~t|YK8d2}
zqDWWK$#8Tw{&k!b3mWx~^gBJ433>eI4^i|Dyw$_gpA(*u3r0_A!U!iaD{>8$+Gi2H
z%JOs*>mR_mwF|4@8Y)YpEYD;GfR`VpG?&?BM!AN|$=q&QNS@`><1b*D@t{8${xRwu
zng4o61_Wb`_50_Uq?|Af_nNS!gZDMyF?yXPgx!De%TF%m8v96lt!I|}6sEl<+<hHy
zVNY-V4cG_t=JUa`aaZ2_47PqYe)!^N*D;6p<NL$;QQ18iPR<9e-Ix%8oV*KYgKIK}
zv=(u389!ReVh+ie#A7<ol7ba^Jj?~<DnH#7Kfu$2>jkGm0PI*2N#~G`nu@gg-<!96
z!kC?^XFxtNYO@V{At1}Y0uKmDxSUWSw^(RkF}mHyhnS%1r!j%>=~6jDcufy5=3BtJ
z;!ud5K!v7!Qk)l4*Ct(F-ay_vseh8?gs-e!kt#k=&!Ij;O=a{_Mm(F&Y)LgWN&(%o
z3t=bS0Azq8x~|>Iz}OmC@!rFVfZc7$;R?Cz0o9{tq5po({~WvqNxo#B#KIg2ELIBc
zG07NBn<H_!-uVu8<0Mc$Cfz6zRio&2LKprjyoW2l1H@4gSD>++@#3o63Saj{pu#(#
zCQ*cfenXS)`1zCw(J?<Kd}aHKR@<ydUPUvKrwrulT54k!oTxWyleS9qw>~o4K475~
z<H2R7b$b`@yhY!EHGf|{Ugn9P|MeniYQTm=(Afmgs(sg|;yHaHlUbjUrJ%YGF5s9l
zZ$9easR2DeJJPLV7^QU-??Jm(1lc%f?HR>Kpv|VaQX>|ijU4#R+J<ck@Jwje2!sN*
zdJ}wG=&i}EnE&y7)}lkSOV85+$6t}FxOfTvj22w!Lb<9^sb!P{_#Y79FJVKnDD{IS
zTs^dn&!x!1JI9w8fL&QvhiICk%qlU?sVwg{XgY%11*_@xqHrZrst2T?DYC#X|JJ*}
ztMAFx5xufAb=BzV5TatD4pV(1utjFi+OQKSRJWCPu^|EB4wm&daO(JfKn6<b@4@*h
z-f+(qb1IiSkKw8<<B-{Gg=lEvgToZKf?`4ZBgjg66}x~wA_v5ON15}X25wj7?cL7y
z87eFTOy1TFjnG+}z5d0~vN_(WleKFS0cNOdm#uGD)|wAr600i-xY=#Ia>mvNY;2df
z#Bi+z*-L1cjv(9fT=W;%tysEIGwWF0oHx}n!c7M3iomog*{kY{3%9209!K_WSgj({
zRnt@arf}`=nyDM!84NqY3t(qMBpMQb$H7P0TWS-a&89Xf|9(QmsqO&-u%wbcjd}%B
zM89;a`aH6ZEv5{XRv%$2H|U%f5GMVBOO#)Znrey}_No{&=D8X)BYs(hAf2x(W~`xU
ino(b?LPPcIJA^6RTXQq&7JD<`m+NM5$K|!3VgCX=nLr8v

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-052.js b/js/src/jsapi-tests/binast/parser/tester/lexical-052.js
deleted file mode 100644
index b134b9743095..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-052.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-052.js
-   Corresponds to:     7.8.2-4-n.js
-   ECMA Section:       7.8.2 Examples of Automatic Semicolon Insertion
-   Description:        compare some specific examples of the automatic
-   insertion rules in the EMCA specification.
-   Author:             christine@netscape.com
-   Date:               15 september 1997
-*/
-
-var SECTION = "lexical-052";
-var VERSION = "JS1_4";
-var TITLE   = "Examples of Automatic Semicolon Insertion";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  MyFunction();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "calling return indirectly" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-function MyFunction() {
-  var s = "return";
-  eval(s);
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-053.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-053.binjs
deleted file mode 100644
index 10394859b5cf6c6e27b63f679536519ccf1d4d6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6943
zcmdT}O^@3)5LKFfq%8sj=&3ysIc2dZHbI(8;24O#F5+O}2DOoEKucVk4J{fZon7C0
z?oa4H>nZ2_hFmhFD3L45HoZ}d?#YlSK5`ys-ptS)wOTUL?aT?zx~~ME3A{+YN|I#C
zvvtxNj$V$Rj#IuQN$13T(_vJqZt`=I{0Lul{OPZ;pm@s2DM=X?SW%uEsLVaf<Sos!
zt61*==hiMPE({dS5}H$00r<-gGm<NMPKhvZIbOI;OC@MN>wX8zj0gS6@Q+dF#J=mC
zSP&m;Y`#CEiU`aM+&j!x0iLFSkxQCl_UpqZk3-B7`^2!;u}j{DY45NIKlitAO*a1n
z>;tm-dhqACEjGV_t-l;Udh=UI%;9<bcsL%l-IL+uY!KS*J4B>U9s%0m5-%XECF1Ak
z`AYEx1Y?TEWI<ETc#ej-Btpk$xZ-CpJ-A#7A|=3%6;@;c;b>fuRPP((wvQQeQ_T#B
zCq`Vf`7A_4`S-wpR9L79k!p*D7S>01`}iCaw0>F>u$Zkh5wg+r2xIO6)`b8edI1Ve
z#Dt&mS!k1ymwzGdgV68M9E-KHE79TudJg&wn##zzN(7zFoupcg(m=;<A)ll#02x6<
z+uE%SM9#p<?;E@#Vs~3&xI!*+K=s(L(EnfazXjGH$XBc(uzVkh6e|t)JEn|en@{3!
zx$^_;CJ3PVnY2@hXpJJ5DOonF@HMFX2@ppdRiH@C1;1!l;p<#PR(J=jNwh;jz9DIQ
z{`m?^*|L95#M<Q-Q*ASzzD?#h&lr@iWvT6ZK~H~Co3yn={|AI#YyFiH-Q@uXr9B=f
zv#Gmr@#m1$XSvQ}4q%@|^2|lIZ&QS>>dj#{yA)3!rN=oVINw;T->NG7a(4Oaqd3EE
z5Hr)gm;oxQ(=92e|F%F$t)6SM82VbfDs*C@*(SIC4a0$cM`ohOFqfXA2N-qH^ymk|
zBtb=@L&wk1{ikTg6;hzDdO()-?fq~kHeJ<;wXc1C{q9<CyLf(q<tY^)U;{9;Jg?A)
zeV{&8>AcVIN)i*5OX$8An>%=aYGeqK&`uv^Z*e*XWzvpuv&AX47>XcyTi&X>lF$5&
zldU}ppPG>95ZTfgo^n4qY3Jh8zaWf~rO@q;T9>hO#pfc9Mz6cW|07WD0E*&;7=^)9
zKjPrI=pFo%_tgWiE9>f0H_dU1b4FBgWk<3RT$;I7)hzl8VC!$o%d0va&0S5o3xD-%
z`s#>WxS2*Z+Ul+Kndm!$K9&s!Yz*sxQ0c6*uhT?#t6!j*z8R2_c^NL6P1M8nE#zah
z5;=k!WRoD-It(P=-y&DgUVt7zw?r;b2-xJv5#hc==9*9=x2xmtsI`4=%R4@o5hicT
zh8v0^e+3ugdllgOC5Z?#bhN9ei^ClyolZf8NJHCvRbaPNdd2@M3{Lqj%r8Z^QBGv>
zr$)oolO1W+H#?{ygWG#MrhUxoy1chu$6?=Y@N_%c<X_%U{VK`Bgc`ekgKI~_6S4!%
QIo1yDxJWf>AC%dj05u5DBme*a

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-053.js b/js/src/jsapi-tests/binast/parser/tester/lexical-053.js
deleted file mode 100644
index 8739afbadada..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-053.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-053.js
-   Corresponds to:     7.8.2-7-n.js
-   ECMA Section:       7.8.2 Examples of Automatic Semicolon Insertion
-   Description:        compare some specific examples of the automatic
-   insertion rules in the EMCA specification.
-   Author:             christine@netscape.com
-   Date:               15 september 1997
-*/
-
-var SECTION = "lexical-053";
-var VERSION = "JS1_4";
-var TITLE   = "Examples of Automatic Semicolon Insertion";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  a = true
-    b = false
-
-    eval('if (a > b)\nelse result += ": got to else statement"');
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "calling return indirectly" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-054.binjs b/js/src/jsapi-tests/binast/parser/tester/lexical-054.binjs
deleted file mode 100644
index 142d4f35c604634dec18f9fcb4536e533cf7b326..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7538
zcmds6O^+ir5cTr8zyT!01ulJKM=LZS!3AXlJDH%(Y7|x^+ADIpJ&9ST9of##%s)Z=
z4}J_M&fK_jp~~rQJKavlne7?v>?umS{p>2&dsVLPne|Gres95O)_<ntT+t<Yix4uC
z*%dh%jh{}wpQLidNblIb(-T~q{+C}6@)5k%^QS+jiqn~3rz{mzQNv|!p)&VhlNUVC
zwz2*OoO}DQq_R*vBRuD(0`Qj~Wh^)RoHJ$Na=LVz)<*Gs-hUsKnG6Th(a+=Faq+Bo
zT!8pk6Z`%dH%w7s;a*a)Zs4H{1iR!Z6<>Y*-M3B568qSCtye7hHcWd-Rr7U!3)l4K
zUx0m!-h4j%Wzv;5--WF|oqY4_YvITLZqJWs_jEKp8@2~TWK13b+VGMtfz~>a=gH%>
zkxL+BnoQV|r&7o~8ReQO<Y#lmSBTi*<w`NF0d``jVN0N+4MkQx5At?Eg>X~t4B(Ss
zj%_|IB3S+bct9Jf%#>-<Vqt*yZXd5=0_taB0#)-hIzk6ck1*yFz`9T%L{C7WnVQNo
zId9rz<>e3HeS`WZJg4f)*+o!%K+i#+K~n`gH$?II!bxhOQ3&+VE#x1;4M0XXqHFC&
z0~2Rp759Oth}c~Vhb!bw4ygVH7JB_P|2^;;kbEry#PVY#Qmhc}C&~rOcAv!U<<5U#
zHw^;S&!n451T~6Xrfd~f;cK|^Q$QTcqykOMLdlD66~69^$O`WkYZ447$TuwQE<T@8
ztvim-sk(Cc#a7!wrZ32X=9z%<wJf#$C^*44YLi+^^glt8P?feybe9Jl6h=I_tVrF#
z#UDdfpXZpz9Ka!o<dI{yZ&QS>;^wHEU5clVGKK`Jcv=?gFrl)ce7*kbPj?pGA(zY!
zatS(d>;8g1BIMs6s=Ln{=b*F;2azA&Tn7abuFr}Zsdhxr{Tp>q?PAbnRs9ZxKLbiM
zqr?_zGZ;pbx3n{|r1=cy@$=*XP5Q~~=tCwnOVZ>~5^#7?+0@BbJob;nZ^YonHvgYc
zeaaQ&x*?cSir&3O%=$nBYSP6((6we(z*o?yS?+H3_){a*nl*juqa2*a9>RqMkACYc
z?wn}H*3A)4ZYy!>q2zo1&iU+s8o4GFNRgHv!m0G@7z{2s`weJBRtj&%=Bnh<R?I~l
z4X(Q<{v%NC1B#IwxoMKAe#DLcn`@?j^1gZic4b|C>aICXan6|8baz=chW@JSYS=|T
z2W)(|>~q%L5xxMIyYN@PW~`3cg_~(rqpLOyo(Z;-22=+Q*c#Rcp~Ad!XwXDAHg2Hr
zayKBm&%A!DMWSN_BoE+H%`TGNtn`5+sJ=(yLez-dE^_avvwgPZoC8g6%Y-`$B7X(P
z?}M&uhb4%JlS8JPsQ&Vvat_naMxdd)vMsJHRo><^-0yJ8AH)1oaD!5!H{ZSj9m--P
ztZl_0LN-3~6k`};-sRkT>fKMhr{1N^d+HU&#nT<EC`LoE=nd7olOCpSeiSH1o2OX}
RgmZB*xTiO7vqGaB{~s;_ie&%*

diff --git a/js/src/jsapi-tests/binast/parser/tester/lexical-054.js b/js/src/jsapi-tests/binast/parser/tester/lexical-054.js
deleted file mode 100644
index 1b6e995c361d..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/lexical-054.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          lexical-054.js
-   Corresponds to:     7.8.2-7-n.js
-   ECMA Section:       7.8.2 Examples of Automatic Semicolon Insertion
-   Description:        compare some specific examples of the automatic
-   insertion rules in the EMCA specification.
-   Author:             christine@netscape.com
-   Date:               15 september 1997
-*/
-
-var SECTION = "lexical-054";
-var VERSION = "JS1_4";
-var TITLE   = "Examples of Automatic Semicolon Insertion";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  a=0;
-  b=1;
-  c=2;
-  d=3;
-  eval("if (a > b)\nelse c = d");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "if (a > b)\nelse c = d" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/match-001.binjs b/js/src/jsapi-tests/binast/parser/tester/match-001.binjs
deleted file mode 100644
index 075236aa2fd129bbe9720356786f53abaf21b32f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21482
zcmeHPOLN>r5Eg_-cvFxQ2k;?>m=xalkvO524YA`;rh)@mlM7I;@oKVGEbnef+EiRA
zuJ9lDBUJG#xWb)+V~Sru_h_^;yED?Z9^QDdQmHtWM&I=GbbsB`Gg31e4t(Bf9&qNi
zz7G1`fE_t6I*zm7caNQo?VT^%pSC;w0e6}W(WdEpVbuEg8^?JQS~c~@AF#k<`#!(T
zJ3b3o<n?<3%2mII&Y{<H$FcqfoEN5H^#cLrxsKQKq7i`J{kF?{k@wK!fq?6=BPDbg
z1zxY)dKJ29Z*A^w-`i<6<h5o)g6LRn(f+O%@qqaP?lJR+2HyLKCz>{nSkyWA<jR%h
zrAMKOo%GQV+H1<L&%xu5SztETMJcG&KLLA&T79r}zg?A9Ujfm#Hov;Hw_<8$_KN&>
zc8Yu%y4u~|y}M<OTek?JaV`K_+;nLW^rL=sJm5>hOfM}2yvv^q78cEpN+@{i$spii
z2yWkwSj3OO9fb)(Px89eZ#S9mt4GBX9k|4mx9Ni?c=>BE@GxRQw9CUNV}ue`M^|!`
z83OXB90CivLsUd)9Xeq!Zv)mX*S*iXAloJjxrJQ>sXPO3N6#6f<Q?cd@H(kP2JPX`
z`OnLcAhOJ=sb*cRM2meLkd{|g*REb$zkcINHY9Ci&u&^rMtj(?tL0V@uw!K?v5EV_
z+|?|LDcOPX7#vL0MT%Bs0GaU8(XVr1(icE2VA5as{e9+7H|%3@CuGJk!;T+I>>3?z
zz#@p&J?Ej%x@sQ6IPhbG)iq^N@-iy9tF9($EMU4QU}JTyQ4Jb0*y`Hq8vfO!w#i2`
z<rEL6oAO^E5vD6+lRz}(N#)yyaeAQ6pojhZQh5(U2l(E7y8NSZr^=lS)At7UQIVUy
z19)+~Vf!7IR~2+FmW><#fX84gEaGfPY0GL3O86QgSu*ef<d_o63L;G*L?V-*Ojj$@
z)3wTw)+<B0UK!Gj%8)Ec-5KQD4<M43&1fXwuFQaMS57(KUMS1APk{`K`5^KLCO6B~
z&}7AV($#8638h-EhD#92wyrya6mSD{VVGRbMU9|<+fQo>0JADf0lxqSnrD%e3!h{A
zmBdJd>bNG<^YRePlFAk1U}@n*x$AIuhP@8%ALv^Nhy?Zj0c<TCh3WefdRAFweeHM9
zg;8H4bb!wUqTFguYff2lO#q9ky^7#avUrVFS~7(4d9NECl!ii9gFPbtq%_i7fF$bO
zJltbgv@;Q<U+MF(;rBa-s``r_nY|bG>_f*v+Z>|~RUcGP=uA9UEnLt+TnjH<NPYu)
zhpHRa#IcNQ>Ozz(Z-V-bI?smJV}V}s#1^n82zz|6FX!`zkrQ~`1GOy|TU84Od|7og
zrscB=nIo;dw4iinTgMa0C(XrekVNUQKDn?cH<L^uZO8;+r_q}YmMHLf5O{GZjiGG7
z1bL~Xce@`cIuKb#fBzBhL=J4rffGf?PO`VId&tDL7?}!+^+p_Snl0&q6QGde1v97H
zj$osE&<;stj9Ll!SuuAamC7l3)|@A1G|@wHS?@{N!+eE@W*r{1^D-w87m0j^Y*2>>
zai(Xq!E5s~qB?P7VR0!X>$Kq#IEa|X7NhGrI7F?}7aTICJTapGacuakjtzBeNKRy6
z)@D62Id@BkBsL6&8E47#+>Q_%FpH$5(sghcEsbJzwUA=xbL9{RhfFIX1cy8QK&=>J
zNH`9S1y*M`aN*Qtda+8k(SnDHe*^6s>#<3!>W*s5;+?rj)Q2*0016}=*~}>D%Jx#f
z(v+}>HTCp$nH0aN1lI*7@B?xVY4F7ef*=8*cA9fcq?NP8)S<r>W~~;?aRDVMJ|<<+
z(VWZ4#Rbykl-eU<_?Z)sn3XPN?yB)QC`lQvq(-Tn92@adUN!y*^i@}llh<g<a7K#B
z&Ie?h_SQ^YyikE5;gaO1&M7(6x%eFo@+7E_C?@jQ4>Tz^0@gX?MT+Kx@l_w$@&}8;
z<E!gFr?KusGJuriUS8JyUVrNnoMx2TBpi|aOnU}BEyjS<JU&6e-5q!xQoR--c2^dl
zok&4s&SW2kXlfK$r-(fZ5uWGp^}c6!Rwd_)Ge5yB;1aRQ-7|gQ1hSpBrJECuS~np`
zmbDzoDHS22*xV)WIg?-Cvm8;I*A+v3&O|q|6G-ogSy`Qn(^68RI_q;LQ%<!InK{l#
z%&F0xh5$9c)#9x1l;nRY8KthHx?GGOH_<gxmy1UqV?gewoJ1oy8X*PJCxL)SasY{`
zL)Ycvx?Ftb3$Z7VPo4lIF{i3iR5K4sQUIO#a;UQ|7snqwBgCQVBb&X<CTG$%vBk^b
zb-B1M7mrG}I#=i==2_HgZS^nh+k&$Y;S>)aBV0<sKEAxk2GKCE7V-Z8-Mx!N-gwE}
znqDK84YNKhCYz+bGA8dMlNp~=l=pDyJ@G9&?J47Pf!b3O$FRrlj2)kncWf&K?V*X&
zV)9M~t!uE8FIvi5DIb`VchhR#8gBew71re~%e%7i?u+>MB4`vHC7J2e*|FCJ{sV#|
B9Mu2-

diff --git a/js/src/jsapi-tests/binast/parser/tester/match-001.js b/js/src/jsapi-tests/binast/parser/tester/match-001.js
deleted file mode 100644
index ab6082a1a7fd..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/match-001.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          String/match-001.js
- *  ECMA Section:       15.6.4.9
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-
-/*
- *  String.match( regexp )
- *
- *  If regexp is not an object of type RegExp, it is replaced with result
- *  of the expression new RegExp(regexp). Let string denote the result of
- *  converting the this value to a string.  If regexp.global is false,
- *  return the result obtained by invoking RegExp.prototype.exec (see
- *  section 15.7.5.3) on regexp with string as parameter.
- *
- *  Otherwise, set the regexp.lastIndex property to 0 and invoke
- *  RegExp.prototype.exec repeatedly until there is no match. If there is a
- *  match with an empty string (in other words, if the value of
- *  regexp.lastIndex is left unchanged) increment regexp.lastIndex by 1.
- *  The value returned is an array with the properties 0 through n-1
- *  corresponding to the first element of the result of each matching
- *  invocation of RegExp.prototype.exec.
- *
- *  Note that the match function is intentionally generic; it does not
- *  require that its this value be a string object.  Therefore, it can be
- *  transferred to other kinds of objects for use as a method.
- */
-
-var SECTION = "String/match-001.js";
-var VERSION = "ECMA_2";
-var TITLE   = "String.prototype.match( regexp )";
-
-startTest();
-
-// the regexp argument is not a RegExp object
-// this is not a string object
-
-// cases in which the regexp global property is false
-
-AddRegExpCases( 3, "3",   "1234567890", 1, 2, ["3"] );
-
-// cases in which the regexp object global property is true
-
-AddGlobalRegExpCases( /34/g, "/34/g", "343443444",  3, ["34", "34", "34"] );
-AddGlobalRegExpCases( /\d{1}/g,  "/d{1}/g",  "123456abcde7890", 10,
-		      ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] );
-
-AddGlobalRegExpCases( /\d{2}/g,  "/d{2}/g",  "123456abcde7890", 5,
-		      ["12", "34", "56", "78", "90"] );
-
-AddGlobalRegExpCases( /\D{2}/g,  "/d{2}/g",  "123456abcde7890", 2,
-		      ["ab", "cd"] );
-
-test();
-
-
-function AddRegExpCases(
-  regexp, str_regexp, string, length, index, matches_array ) {
-
-  AddTestCase(
-    "( " + string  + " ).match(" + str_regexp +").length",
-    length,
-    string.match(regexp).length );
-
-  AddTestCase(
-    "( " + string + " ).match(" + str_regexp +").index",
-    index,
-    string.match(regexp).index );
-
-  AddTestCase(
-    "( " + string + " ).match(" + str_regexp +").input",
-    string,
-    string.match(regexp).input );
-
-  for ( var matches = 0; matches < matches_array.length; matches++ ) {
-    AddTestCase(
-      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
-      matches_array[matches],
-      string.match(regexp)[matches] );
-  }
-}
-
-function AddGlobalRegExpCases(
-  regexp, str_regexp, string, length, matches_array ) {
-
-  AddTestCase(
-    "( " + string  + " ).match(" + str_regexp +").length",
-    length,
-    string.match(regexp).length );
-
-  for ( var matches = 0; matches < matches_array.length; matches++ ) {
-    AddTestCase(
-      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
-      matches_array[matches],
-      string.match(regexp)[matches] );
-  }
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/match-002.binjs b/js/src/jsapi-tests/binast/parser/tester/match-002.binjs
deleted file mode 100644
index 772363013e947c229d2d07748285db83a20ccd66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36161
zcmeGlO^@WnwFxAAL`0E-kU$7pg2Rk}nPq{?(lg7<FoZ_SY&1RD%d%Q|yK8#QdhEt_
zqgeqLq#W{pkdXKjx#y4|F5Du-FUWg#mHpZ-+s|&h>0W9t-kvVMdiB2R)qB;0a6WUy
z{@}i_Ci{Q$y{T_q^nTat_3n9-hrPq$$;YE>qp>#=y}@oYX5iRCxc}dO_IiJTQ3Lw=
zEz7s9dye=(j2+9jLfdmAP?Pj?(0gFJlSNoR0i4IGV0nH7%AWLW*A5c^bo${$xS@S+
z3qJzqS{EtOLFn7=bpJ`1W^{aXHoSQ<*p+`9>`EXM)+ic(!w!XSIT5%oEN7mBha`xH
z?p|2o`2L$$u3X*uEXc!FbL>Xc8_202hu6Qb{QPi=N<*st8(^=Hs<)0$M{QB{4}kjd
z(I*FYujVPUdP4rPIzs*)raBv*-8jy#n@R*zIQsxC9=bF0z0eCE&cse6rdxeqOvUA_
zzn!0G2?8Hq&U_IBp!TEC3dIGeV<dtwll;3@Z;vd;NnefL7{i}Ls%>=f3@v{e79NC_
zAD)RIELouhOQENDEVBf(pK=M7Kb<2X0`1Zni}@44I+#pO#T0NmvI3#8E|F3B4rWCG
zS}@7+Ys!uxUNb8MqvrO`9c!8*B@NPxFktKUr;|HhzWep|*6lYx?ccc`eSGKZ?dz|l
zq?E&9G%QPgSjLXN0DyM4ZYT5NwD2LCb+?rn&{7|ILFl<}^gpqJV5fiO>RWHWQx5wC
zSm)bgMLsmA3vK{D!@oD)*Dn3Q_pOJiJjI&eL|T#3J>uN|00_E*1<u8qTR63HA;@vY
zO4^0S5L?v2xjPZ(wksxiDoa0@F*eD^jnK^JV2Plae|5ZjmQ$^tKY;i=k>zr?`iTNN
z%@dy*Jf>ivVJKA4cBW{gp?oDfg%#xDA?E5!lx$^!d;pGh>Y^(lHU+H)#O4rdLwxLr
z^RVaJ)B9<79K>NSu6r+)1ImAfDx=r%Mf$qZQVOP9IR*qYen#P;o)n*yMz#ESM@0U>
zqfA43diOpP<FE&D8E`Lr*fcocu!g~5G}ew4ghMdcmw86(2%K?^F^A#}q8grkt}lNW
zBtjL^L|$}FOk?tAfRscc2Ss5>2gJ+7*(f_J4^qDci<Jvf8RX{(I+Ompux?-U_xgqY
z>^;~X?Iilp-@B4m3Cec{`V8r5%AL+^3j=4y%Kr$|PDpw4JWoj_=usqm0;6%>CXq0{
zr{Pq_K~u)@g9j6#XUM3yM#*V>Zjwl4C`JRHyXLBnX*)-_)9`+=mMghY&lcpTso`Ys
zh@E@+4{YqZa%+dSYxy*hP$TGnJ>>+YbZ4HjpU$V_@FOI^l$;DnVmQ;La=hk5H32|L
z_JB$eQz@Cy7&5soDLS+1=5D%;iGZW$?)M1Fb*U%S(uP59Q_eBem>r~i1E#|SDX{S`
z4^o=4%J|_R%{EtW#C6KWkaiPDMM+wdNr~!tv<I&ykfNszHFk>yM?{?&HcnEPVG<f-
zQaadE8@I8N*o?+vnKLMK4Vv<dpRXrYLiwERlLFn~0PjV}z->@~*MSl;O@I9(AQLlQ
zu0hD5^p@&tV<SL;FuaTjJWb$PQ7*`|K961oFBAKqs*IPa;Ke$*uy*n8hjVv~O$W69
z03kuszzq5kE`s8whMLBJopbpI(4vV;#<Mg(s?jb_Rxk|LGXM&9=672HhnN94=%!d2
zGb9XjgXprKHTm%@K#D5cMR3=`y4yT%@&KCxK6JeCgS0*jw<G0UFCRhRfa_l<PZ*vr
zf<U?LjXgIIpU<%ZUiHn;nQwSg8#E-1HKY1pMkOEO_|;eG>L}2r@f5<`E7<#GG#iIX
z%`Pu&?`+T5qGF(F5SL<{Qd7kj>KWCf+=O9h(H5Cr-D^~)D4A*s%Egnp<EW}{m^Bd}
zg_C;Hce>y_!?G~6j$+AOnRbPBRrO^sE-0-FTub#WRas=MsMVmtRsseI@pKew$gxoc
zdpq)?7>VFBAgY+hSy)U{rsIMO>H;<cB!jGFx<^Hl8L?s8pzNH=b4VwyOcaY;vJNB@
zRpf3-R~KD81Id~izLwsi#b6~0F^VN%X?Ia54-w=vjg|Q*nM!$kD#E!>+VDUs@}49H
zLtmr)zS>vhV4Z+&s&V}ncnV`&RSS3rE`Vvd(5-G&<k=V|tIYK4#FmL29y0W|+jas~
zd$T1FehLuY-l?j`q{`n}%wE%rFqz!_(u_L`_m|oIFx?rI!IpTR*<b0@Xj9$Qz_=@N
zV~KHBi$|WSEqvqL6>hP%cM7tBI{jr>3TA$>ncp+cVI7@A3CoobJ;J_W&-e!88&vWb
zGeHaGFdOe1X7iHUd>TZNoXn7M4oTi9Cf7ci*fmLn)#Q2X97?5#;T#&?$Mz#6CQv08
za`;(T?c8#Q>vZf3Tca(MVn?1kvGKe-cMusJVOkE}69xBpRUKw76NB%k*;I;JGp%EU
zgeDcy(#<1fX*SA922VEEpdb;d(oibwq(o^Z-e$+Kjyn#H3@p!kh8q1krcH@=@{A9a
zWUPSaDwP+Ue(3q>aeVBf;fB}92hC>_bU=kwIh3$jU&_3F_Ip5aMSdA`9I{F&b$g0%
zbSasdR(LH5!qo8OS)bm^`0GK6I7OHtp6talV3h<oiY^qpzeiG(CVZp9kfhj36*46x
zma>cIQLh&iN-%INU9S$y+SO=}!x2wTa?@3&I)#J8nwPk|0`xMcupOSlE~E7YTF?Q=
z5%1n@b5@+%VP#9ylUlwS<lMf^1KEY?W1@+6><$mhL*E)d5VQ{xMW&^_Py3NpeP_{l
zeP$Q2j=Kn!02Cyr<e#bDbL+T@-a$=^VL((Jw^NA83H+c!=H}`?jEh1L88hjZp)Xgf
zK%0xgH9!G%TV=O3v0($`mL*L0Sgo$vrRF`??*Zqqw0<Gc$?zJukuItjq3mFQsw%6h
z39iLl7sGYv^rCL{`?Ig=cwib;;tPr?`<tcW7&6$RIGaWlH1I_&N(^2ww2sQeN*h&P
z0*4j(FN(pY?&6;^jVh!7fgzb(E5Y0$A-EmvY1`s$lb9IB0Td4;6H^TDOrMGhTDfAt
z;Me*%i-PS6wR5IT1%8x{*8^zURH)#X)Z-&k+hy8RNWjo+Gh#A&>zL6)mtI*LqR)&`
zL)Y+B+f<unk8?5LG}UIjGZ14@HrAp@+d)l;@hVwcfM*1oS;EZmD$DbpvCXWRQe!~m
zEKQwpC(ruTPo~-of2D}Zh^aO!|Iv8OiDDvu8gpx^%}lk~Z@!MJgZxYfAep&pJf1N(
zlPq4iuPh*SBsIuss?7$`Su`UqYCqD_SLsMj>KNO+n$GMb*KsGw5`co^8(n$I@Z{ss
zwb2+#>cLVL_bO0ZK`Yd_rCxo2jbqiRnSL4ioLU9iTok&m>uN%nZm_B#8G6Nn8o~I_
zN7f83q0`n4ehDu>PdHg!Viq4k@0VS?EQb^xr^)Y8YDULLXTzH(>4~=d4nzI3;n|Jj
z+&B2vt>e>??ydZhD*>0e(q!SAg;r$wO~J33$ZrdOO;LWY+eDKoGf5BmO^Jt*BaqiV
zxt)~EmMz(nU!g*g-%FQ&#l;1o<%f9TX^zH4WqV|{_`kU~kptK;miq!HoWm8<=e8>*
Z>9<m}BUAAj453z~P=4e~%0bHK{{gmV*6{!U

diff --git a/js/src/jsapi-tests/binast/parser/tester/match-002.js b/js/src/jsapi-tests/binast/parser/tester/match-002.js
deleted file mode 100644
index 21b832501700..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/match-002.js
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          String/match-002.js
- *  ECMA Section:       15.6.4.9
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-
-/*
- *  String.match( regexp )
- *
- *  If regexp is not an object of type RegExp, it is replaced with result
- *  of the expression new RegExp(regexp). Let string denote the result of
- *  converting the this value to a string.  If regexp.global is false,
- *  return the result obtained by invoking RegExp.prototype.exec (see
- *  section 15.7.5.3) on regexp with string as parameter.
- *
- *  Otherwise, set the regexp.lastIndex property to 0 and invoke
- *  RegExp.prototype.exec repeatedly until there is no match. If there is a
- *  match with an empty string (in other words, if the value of
- *  regexp.lastIndex is left unchanged) increment regexp.lastIndex by 1.
- *  The value returned is an array with the properties 0 through n-1
- *  corresponding to the first element of the result of each matching
- *  invocation of RegExp.prototype.exec.
- *
- *  Note that the match function is intentionally generic; it does not
- *  require that its this value be a string object.  Therefore, it can be
- *  transferred to other kinds of objects for use as a method.
- *
- *  This file tests cases in which regexp.global is false.  Therefore,
- *  results should behave as regexp.exec with string passed as a parameter.
- *
- */
-
-var SECTION = "String/match-002.js";
-var VERSION = "ECMA_2";
-var TITLE   = "String.prototype.match( regexp )";
-
-startTest();
-
-// the regexp argument is not a RegExp object
-// this is not a string object
-
-AddRegExpCases( /([\d]{5})([-\ ]?[\d]{4})?$/,
-		"/([\d]{5})([-\ ]?[\d]{4})?$/",
-		"Boston, Mass. 02134",
-		14,
-		["02134", "02134", undefined]);
-
-AddGlobalRegExpCases( /([\d]{5})([-\ ]?[\d]{4})?$/g,
-		      "/([\d]{5})([-\ ]?[\d]{4})?$/g",
-		      "Boston, Mass. 02134",
-		      ["02134"]);
-
-// set the value of lastIndex
-re = /([\d]{5})([-\ ]?[\d]{4})?$/;
-re.lastIndex = 0;
-
-s = "Boston, MA 02134";
-
-AddRegExpCases( re,
-		"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex =0",
-		s,
-		s.lastIndexOf("0"),
-		["02134", "02134", undefined]);
-
-
-re.lastIndex = s.length;
-
-AddRegExpCases( re,
-		"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex = " +
-		s.length,
-		s,
-		s.lastIndexOf("0"),
-		["02134", "02134", undefined] );
-
-re.lastIndex = s.lastIndexOf("0");
-
-AddRegExpCases( re,
-		"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex = " +
-		s.lastIndexOf("0"),
-		s,
-		s.lastIndexOf("0"),
-		["02134", "02134", undefined]);
-
-re.lastIndex = s.lastIndexOf("0") + 1;
-
-AddRegExpCases( re,
-		"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex = " +
-		s.lastIndexOf("0") +1,
-		s,
-		s.lastIndexOf("0"),
-		["02134", "02134", undefined]);
-
-test();
-
-function AddRegExpCases(
-  regexp, str_regexp, string, index, matches_array ) {
-
-  // prevent a runtime error
-
-  if ( regexp.exec(string) == null || matches_array == null ) {
-    AddTestCase(
-      string + ".match(" + regexp +")",
-      matches_array,
-      string.match(regexp) );
-
-    return;
-  }
-
-  AddTestCase(
-    "( " + string  + " ).match(" + str_regexp +").length",
-    matches_array.length,
-    string.match(regexp).length );
-
-  AddTestCase(
-    "( " + string + " ).match(" + str_regexp +").index",
-    index,
-    string.match(regexp).index );
-
-  AddTestCase(
-    "( " + string + " ).match(" + str_regexp +").input",
-    string,
-    string.match(regexp).input );
-
-  var limit = matches_array.length > string.match(regexp).length ?
-    matches_array.length :
-    string.match(regexp).length;
-
-  for ( var matches = 0; matches < limit; matches++ ) {
-    AddTestCase(
-      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
-      matches_array[matches],
-      string.match(regexp)[matches] );
-  }
-}
-
-function AddGlobalRegExpCases(
-  regexp, str_regexp, string, matches_array ) {
-
-  // prevent a runtime error
-
-  if ( regexp.exec(string) == null || matches_array == null ) {
-    AddTestCase(
-      regexp + ".exec(" + string +")",
-      matches_array,
-      regexp.exec(string) );
-
-    return;
-  }
-
-  AddTestCase(
-    "( " + string  + " ).match(" + str_regexp +").length",
-    matches_array.length,
-    string.match(regexp).length );
-
-  var limit = matches_array.length > string.match(regexp).length ?
-    matches_array.length :
-    string.match(regexp).length;
-
-  for ( var matches = 0; matches < limit; matches++ ) {
-    AddTestCase(
-      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
-      matches_array[matches],
-      string.match(regexp)[matches] );
-  }
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/match-003.binjs b/js/src/jsapi-tests/binast/parser/tester/match-003.binjs
deleted file mode 100644
index 1422b2f79d54876b0c68d87ce4a3a885164ec239..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21251
zcmeHPUvJz*5I2<n2n3=}NQe{kAyFX-ZIMuWO_ii63To3T34Lj+YIELP+&cDQ`>IB?
z--XY?m*9mb9(myj3GvJWGwb#3od4X7?f9B&-G^T8ygNHHJM){}+3|Lx;lP!v-9stt
z)jNUT55$r6x@B4WzI|-1Z*BjudwI9#52V#yR&Bbj6Gp4ccP#5;Xw{|N?~1??`>wn$
zd#(sX<oKQ<Wt;Dz_1N+3aaw-?o!6$(@&iT6u`S1Qq7eZ){FW`f$T@IipvZaR$S@s7
zf#da8--cm!H#hdSZf|#&^>5u}O@z|gRqby&kqm^Z$UPD6FhlPXq^FuLABm`U`1Q)l
z#id7KmUc46veI5x4}Au@KM_H;Ic24yR{sFnGt}zc&7Iwo(&}5l`sT*1wTBn7nwh;K
z|DBy8--My|w)SprX62?9!8FbeP>Y)`4FW&%qvL^GQf9i)31nYB9ds761JzLQ=F>qS
z!w}qlHxiLN0(Vp<2qWp=bNzNhxUT7{di3BYX}paJ&+zhhLGUmVL9{2sXo7^AETwMv
zC?&!gNZt2PU_-z{?*`xmAO!Go<w0ZxPXEwgmj(fJ(yN9`$_+zSgz7+=?#c8~GCQ&l
zY$afZJq98IWb>>8SM<Ztq-cgdg$4`v?%NN3{`UFe!o9EWcOG0*UoSmhymrnEMfmTV
zUlRt>pOhh^q&d+t&QT7kQ<-8<OO%WqawEn^@L=5!Bj5X~b8D@$a^ahcmu8~8l$W6u
zXfG2%e~6}Q41vnUu)(uHYt6R5cl~|g#>TcGLYbp575zSgvEP6$V`~S-FdS1~cRUds
z8~ZBbgy+pXPz5k27O^{!ovR%~C2;{tt%jTx$uVqqEeHfv8g`Mc0&rs#YVLO62|gX0
zyAm2IviEpdlt`#oNu#e?fmDxXicbTCT=yyPqoMlyk7O^hAn-y2h>k}XOJ%5G3nj^5
zM07<MZF#nQnl;cw(Uj^oU_#*Z5<mk2BN>wB=}+3d;{2Q*l=^+XQ0i3!J|^bi2JH&0
zc9%xh4+y=IgVBjCQyXUZXA7<*ebCS<_$36_#zbP+Bg3k31MW(%9~~CQio{`(PwF^x
z5B~qb-ffPSs11OB10<P{{bCl<Oy)4>nTaRGPC}jHCGvSH76VQgpw#X_YNm=Bvo6lA
zn_&YLb|6*v0*$GHVaE(jypO>(*^AviC<YI;C*FqEIBt~<H}+e}p`Y4pYj1uj1Nkoy
z#oIvsDrLl)59BQ_!2$5>aH(Bvz{z~Y9aXy{=cYRw*zdGBF%z7i_>f9k;{s^x6b`<_
zzkjZcYCe)hPx_M*t>}AIr=PKeEP3Ge9c-!FMNqp4G6fZ3Tn<$uo6+K>s)l1Y>uKBX
zQE01;my{So7mOYBtCI;z1qjqluU6d?VtiD(<mtxH>tU%Tt=dFNP-;1VD$b*@xD>SH
z?3WB%S3o0G!WN!h#Px02+($`{-vd&Bl@Cvd9C8*zZ*9&#08*-!PlgW#mTzP!>M9B<
z^1AEy9-D#*%<WCC^F8}z-W(i^lR%rZdcGIRpN3fTmsASVk#G8a2dvwyrMQ(j$m6qT
zMmkEgY7j!2R|{(HQeKHowO3BAlWHvMc!EZQM=Q!`j5^Z`UzHoY4ebz)#*&T<c%S5X
zshS=-joU-l<<yzbK21zLLqdkzQ7*ZXC9^>LmiE;zV0zJ9$7anqobg$lT3M<lm+b`%
z72<jbss*t&7pnxbrl?HtLqL8kpdAyY>ZGH<1=W4?L6V_XE=(}<qxhzTE*8(uP@cIm
zSezD3^T;yU#TlMZ%ufA^!DvY@Z$n13I)jjriXeH`vLmBmK;Aw8s~D|DlJ<GaBJ!G3
zZWnDo2?=UW^9r!PL9}QAHhJ@{fiS>CE)1;;IR%N-#u$(_3I6lUmdPC++jkb{C=k2@
z3@<KCD_*0@ZEWFQGKw%Kxp~pra5j^0Ms4tf=AIEDE51$oC*VtFN0_E{GVkc(Ce?M0
zoSZlJsLD2c&vr0xl}Re7bcAs61vhvLaav-c4)U*>r7>l#MHG8=Y~R)*%G@G~w(I)l
z-P*vs+CcreXN0#Gvsg-2#-q=;G%}2jM{#>J^?HUIeqb_d7`xQ{6e<P{2Q~(v!VEiA
zY&w=Q@6PxY2Aok`#*C0YaWG*oQ5+Q|b*Kp4vU_mdUN2b6=(|q5?i$7^!wmCe3(uf6
zVS$sU&L5Q(nKXmS@s92lNDd`ND%QHhZRPoboF{|FiSp)gSvp&N26k#0%QaFOpTb6`
zJzM=b=&MbpG?+}O<Mjnz&;UthQl(A#7#vQpB>AMcTtc0T_jn|mfIcRhh+_|UT&@SA
z_gFS`rNGIrw8{sI%JQ|lh|{=>U>QI`a;nC048;n1QyqF*{2f-+aaohJx8XXt)MX|e
zXs4DSdd-wCM#0-s@y~TxxC|^{I7n`U%UK&%VD5BsHD#tz4F$6n|GXgvaJrW}lYhfB
zs_O`~vZhy>>4t^H2t@0d3j_5toU7DrZKPM`LOlJf;6+INw6IuIKgVO9^a+4|gzTh>
zd-RhDh_73q?&&RJWVCeYn|_3TLoRsIzoKwq_U1MHwCMbwj28cCqNIM5Q`s2%pZfnC
Nj7t5ua8mOj=zk4$_CEjs

diff --git a/js/src/jsapi-tests/binast/parser/tester/match-003.js b/js/src/jsapi-tests/binast/parser/tester/match-003.js
deleted file mode 100644
index 24453e621cc9..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/match-003.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          String/match-003.js
- *  ECMA Section:       15.6.4.9
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-
-/*
- *  String.match( regexp )
- *
- *  If regexp is not an object of type RegExp, it is replaced with result
- *  of the expression new RegExp(regexp). Let string denote the result of
- *  converting the this value to a string.  If regexp.global is false,
- *  return the result obtained by invoking RegExp.prototype.exec (see
- *  section 15.7.5.3) on regexp with string as parameter.
- *
- *  Otherwise, set the regexp.lastIndex property to 0 and invoke
- *  RegExp.prototype.exec repeatedly until there is no match. If there is a
- *  match with an empty string (in other words, if the value of
- *  regexp.lastIndex is left unchanged) increment regexp.lastIndex by 1.
- *  The value returned is an array with the properties 0 through n-1
- *  corresponding to the first element of the result of each matching
- *  invocation of RegExp.prototype.exec.
- *
- *  Note that the match function is intentionally generic; it does not
- *  require that its this value be a string object.  Therefore, it can be
- *  transferred to other kinds of objects for use as a method.
- */
-
-var SECTION = "String/match-003.js";
-var VERSION = "ECMA_2";
-var TITLE   = "String.prototype.match( regexp )";
-
-startTest();
-
-// the regexp argument is not a RegExp object
-// this is not a string object
-
-
-//  [if regexp.global is true] set the regexp.lastIndex property to 0 and
-//  invoke RegExp.prototype.exec repeatedly until there is no match. If
-//  there is a match with an empty string (in other words, if the value of
-//  regexp.lastIndex is left unchanged) increment regexp.lastIndex by 1.
-//  The value returned is an array with the properties 0 through n-1
-//  corresponding to the first element of the result of each matching invocation
-//  of RegExp.prototype.exec.
-
-
-// set the value of lastIndex
-re = /([\d]{5})([-\ ]?[\d]{4})?$/g;
-
-
-s = "Boston, MA 02134";
-
-AddGlobalRegExpCases( re,
-		      "re = " + re,
-		      s,
-		      ["02134" ]);
-
-re.lastIndex = 0;
-
-AddGlobalRegExpCases(
-  re,
-  "re = " + re + "; re.lastIndex = 0 ",
-  s,
-  ["02134"]);
-
-
-re.lastIndex = s.length;
-
-AddGlobalRegExpCases(
-  re,
-  "re = " + re + "; re.lastIndex = " + s.length,
-  s,
-  ["02134"] );
-
-re.lastIndex = s.lastIndexOf("0");
-
-AddGlobalRegExpCases(
-  re,
-  "re = "+ re +"; re.lastIndex = " + s.lastIndexOf("0"),
-  s,
-  ["02134"]);
-
-re.lastIndex = s.lastIndexOf("0") + 1;
-
-AddGlobalRegExpCases(
-  re,
-  "re = " +re+ "; re.lastIndex = " + (s.lastIndexOf("0") +1),
-  s,
-  ["02134"]);
-
-test();
-
-function AddGlobalRegExpCases(
-  regexp, str_regexp, string, matches_array ) {
-
-  // prevent a runtime error
-
-  if ( string.match(regexp) == null || matches_array == null ) {
-    AddTestCase(
-      string + ".match(" + str_regexp +")",
-      matches_array,
-      string.match(regexp) );
-
-    return;
-  }
-
-  AddTestCase(
-    "( " + string  + " ).match(" + str_regexp +").length",
-    matches_array.length,
-    string.match(regexp).length );
-
-  var limit = matches_array.length > string.match(regexp).length ?
-    matches_array.length :
-    string.match(regexp).length;
-
-  for ( var matches = 0; matches < limit; matches++ ) {
-    AddTestCase(
-      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
-      matches_array[matches],
-      string.match(regexp)[matches] );
-  }
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/match-004.binjs b/js/src/jsapi-tests/binast/parser/tester/match-004.binjs
deleted file mode 100644
index 7643a2be422b5fb00c3c86ab6126240c46eb3ec8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 30346
zcmeHQ&2Jl35I2;MQdD|?3laiLa7a|uE>NVZIH{5}tx}~airZc)6m9GmXWNZ!cGo45
z`d@KC;>sN^aN!0Qu86;Yne}^q<K4IG*|pcP%ge>ee$39yo0;ExGxK&E;h^t{^~SMq
z+Uwu=y^imkR9>%CDu=!HS!Hu)?|$=Ev(@X1N~0cK)9~CNT>ss#RNjND8ua!jj_*2$
zp131gp5r^A+v`T8+WP;X^4#sV$7%fybY7c8tLI0g+;+w7y5Wcbef&;abVK*Z6@Emn
z>zrt&gV1-oo%OfjG0p9*M>`Mq8g+TBQI|w0t!8xnt{V#9@gj0B9B+`I_de2#F0G$9
zVe9zX_3Jlk&w?av^^AI?y@q`B1-Si%<0mhttQ6GhA3%GKT79y;-<*|J-vZXRw;pU9
ze38`5{1y4{{1o{nJnGTTquuSK+|(kN##sew!%J&@zZdqxv%aWBX1Y@KMMs?WtE<Te
z&0oP6z)a_4sqcVFHXq;Hd;DN?dp{|A0VQ7pipOEtzg4dX5GDsf{cz9;`koWkgX7-!
z2k>95)p2jT?X@p&e0B5lo5`n6q4Dk0zAu6R0&O#NLU95CFj6Iqtvqgwlv|GH>06^a
zT5w3{_(nCsh^wgAAawljkqE*J2_;!dUGtGkgbk3o(?x+bfeOY`fGU6<fD2C?g%#iJ
z9BZ_YVHb^UO>;@PVaST$=nH+j8a_&9Uvz*i1s`}v-w6Rrx|Ji(=>(%ekqqGl*K3-j
zJPb$SO8L(SrquJ)FMY1o#gZr!hr$4tRHnVbiSXT)QYPLphQ&XwTy(Ge@aNVND(Fs+
zS}$5b@9>#ug%ya`V8-Fu$WW+4irvMqY{XsA_Mw<CBVmxjfG`4`bQ`8(F{mOwMgYd6
zSWHpH?qYC{>TO1o#U%SV6>)CrRY6DnQoaiYpBNaS7f3L2{0{hjH`MWxK8~SrT%l~V
z+rwzQ<pjbIYN84G8XyM_&)9N?@c?9Y5*BQ_UB^Gu%E^OLSGA>3(T7%)8WGj<0^P+I
z)wQaoVj8z8<Sa;z5%o*7iYz~jtl>WB4Oz@<4Jl&DHJ?dWlduh#fWLokkFbqe!G`ZU
z)UNRH!iy$>+G8St9>SS~KujZw<|d|v*l;DQq>2ft4pV-$3oOFqq_i;4i3tps!w~N|
zLAcXxi_@e7n-m<gCLl1HKd8&&zcU!05<Qh2zkh~Mw?y%~1V~s8lFXQMKETCf?h3e7
z_36kpt8QSxSLJ8azh04uV-k(2I>exFd9jQUAyeR%s=UP5WM>gkIe<Cx=RS*wSpwQl
zYpRsj8$cn<o$b0i=(eyfLQ5n_3F;bsD4CoD>2()s*9`AqW9M(6iz3*G_YBj>NsrFS
z>m?u+g#N*d$RTGy4hlXq<7`Ic5ZIvpWt!0CRM};q6s1B$aNyuVAStSxl2gK)Ua$3B
z&%V(sv+I1jb(3)%jgvq(sI+?BKzujA4792g(kJisIxaYzUITEK!N}vwms&bXwCJP<
zX|APYfMbCIFO`8JI~`FPy3f$hFw%%q(bC#fV6J}Cmy3*$ljV1@^&uU_y@BVcTm~>W
zG9Sg0`la`jG4c!v8D2-Z<Vt3gFt4kA48aAhbu4S4{Y|?pVxP!WAYwZKLxu0c(;+8^
zg(A$zB~39h!AoGOSj`y|rs$xfz$uxu<sivWYnJa(lVr}<uu($RijyN`GFK*xX$Ws3
z$z&BrH=~YCg=a9C)58}MEoL}bnNV$+8ZJ`pA$N9hUxWjnl)=F&l1MV7N=<@xI2mt|
z7n=-pS%d4ZfD|^ks;0LRAb=UU5LQ<V$s=l?jF6QT`b}ob<PH<i)zw*pz@(+#6bxSk
zhF5Ez=yt+m9%z*|XU~Zu%t0<+Gz(|py0KWs93dv06>#uLV;@^zncQeu;i_Tbiu7n(
zxEgQ&Qq2xa2UobnTCJsI15N(Rh(XN!Vlmva;IN3`kTK-Sh+biA*s$1Ou|Xw|F%vY_
z8ocz_&>v)U)90K;s+AWfJ7fW3lsg)#YaPSvf+WLoj{6WGGA)S#5CwOk{RPPhbjz_k
zew@~9_V%Hio_pdNJcep)tJiJ2Sb|R!Bcn2=<KZ?9*h@31pgGMvd|js}C~L*MjxjB?
z=?Kog3Wg%HQf+i38Kjmspr8^arX!>_s8WiVw_SBC;;MsV1JjQ^!;Q`-w2f9)Qbq}&
za;|{2m5JNB@AiCMk{@C;>}!uOXwYvX0Ht>3P{qcvl)2~rCtz_-xQuxY*{P&qPbrX!
zlBa!rSjfwx?`iP5p&6$PGt84MJcCxo1jnS#$B`B3q;J$5GTI%hnwjGBT&zi5O=*^3
z@R%vDiObv_X&0c(ldxPZrS>VjNGy1p%O{{OTZt{P5<898r+7gLB%8dqjo5mzj>9UJ
zs9zeFbEtFmDUW0sp^wQX#xdrmiA~>WJr_mxlr!X;{Y)!ASQM7et|At36~Quql;o5=
zO#PnQ%awKydfJc%%&LbwG(>w3ULzITPFscRqA7@+f11UJb+E~YPGFnM!YyC{;Xq}$
z4RgZ+%uTD9^0}Jd{+SOzyU?e6&+8pJ-hT8xm#jAkd<`Rq?e$}cPDWJ4g>+ii2ptXv
zDV5-#5xE)Wx){)5@{7D3@RvU|je*^)GJJ0zwWeaJIED?*(46gN6%6oc+msk%!SFh2
z6La0H@(}=5gkO|{WnINzw3}5(69U6Bxlw|-LPByi+}E};v&CE%_)W3o#Oa;gtD+{Y
zTr*%;)Z&0e%5sIqIlEN_Ud7AX2WYpdP{XmQ$5*7k%WhR66NX}o5u4Fl#Ec$7`o!K4
zb7qVNx`I`0+ieyv=i-FZcAN3ut7{|5(nb^+J7@^8s1lC_SR+`@7G@5rOh5LFWoFKl
z8iOK7G?j1|{pRm}vfXC*ksE3ww%aWGQ#po;;>i9C;nsGW*>1D{eIHi|`I!<(GPCNo
z+l*ID$e~W#Z8rSQ9AjQI`<a%xOGiSPf;KusDBewHSCWgkl4Kb`O8Lgro<hEj2rH}6
zYD<}t`W-VVau2uFs|vL7T2(bOi($^GO<<eLLiv4Nv~}-%xtgFdM8%XI!QtU8rw=cp
zGxiPs0ylq1MsjkCne5@qdY7}jB(<C-&*SS+3}3#JXK@t@3!<?vKgm;QZi!E3lG~cG
z7cI+ExO|9x%8(FDd@WL*OO|m7x!9{x#?FjwZ<c3LzMvt`nik%KWGqo4&t#wyd8pyT
zSMn@c5B*+{JdC`=yY}QMbO!R(BJz|V`Mo`PHmwmbc6#`)p5(~W$V|#993I@Ertgv7
V5=EcS;4BSPsU|6JQUOx_{s-VUi;4gM

diff --git a/js/src/jsapi-tests/binast/parser/tester/match-004.js b/js/src/jsapi-tests/binast/parser/tester/match-004.js
deleted file mode 100644
index 7c17396afa75..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/match-004.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          String/match-004.js
- *  ECMA Section:       15.6.4.9
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-
-/*
- *  String.match( regexp )
- *
- *  If regexp is not an object of type RegExp, it is replaced with result
- *  of the expression new RegExp(regexp). Let string denote the result of
- *  converting the this value to a string.  If regexp.global is false,
- *  return the result obtained by invoking RegExp.prototype.exec (see
- *  section 15.7.5.3) on regexp with string as parameter.
- *
- *  Otherwise, set the regexp.lastIndex property to 0 and invoke
- *  RegExp.prototype.exec repeatedly until there is no match. If there is a
- *  match with an empty string (in other words, if the value of
- *  regexp.lastIndex is left unchanged) increment regexp.lastIndex by 1.
- *  The value returned is an array with the properties 0 through n-1
- *  corresponding to the first element of the result of each matching
- *  invocation of RegExp.prototype.exec.
- *
- *  Note that the match function is intentionally generic; it does not
- *  require that its this value be a string object.  Therefore, it can be
- *  transferred to other kinds of objects for use as a method.
- *
- *
- *  The match function should be intentionally generic, and not require
- *  this to be a string.
- *
- */
-
-var SECTION = "String/match-004.js";
-var VERSION = "ECMA_2";
-var TITLE   = "String.prototype.match( regexp )";
-
-var BUGNUMBER="http://scopus/bugsplat/show_bug.cgi?id=345818";
-
-startTest();
-
-// set the value of lastIndex
-re = /0./;
-s = 10203040506070809000;
-
-Number.prototype.match = String.prototype.match;
-
-AddRegExpCases(  re,
-		 "re = " + re ,
-		 s,
-		 String(s),
-		 1,
-		 ["02"]);
-
-
-re.lastIndex = 0;
-AddRegExpCases(  re,
-		 "re = " + re +" [lastIndex is " + re.lastIndex+"]",
-		 s,
-		 String(s),
-		 1,
-		 ["02"]);
-/*
-
-re.lastIndex = s.length;
-
-AddRegExpCases( re,
-"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex = " +
-s.length,
-s,
-s.lastIndexOf("0"),
-null );
-
-re.lastIndex = s.lastIndexOf("0");
-
-AddRegExpCases( re,
-"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex = " +
-s.lastIndexOf("0"),
-s,
-s.lastIndexOf("0"),
-["02134"]);
-
-re.lastIndex = s.lastIndexOf("0") + 1;
-
-AddRegExpCases( re,
-"re = /([\d]{5})([-\ ]?[\d]{4})?$/; re.lastIndex = " +
-s.lastIndexOf("0") +1,
-s,
-0,
-null);
-*/
-test();
-
-function AddRegExpCases(
-  regexp, str_regexp, string, str_string, index, matches_array ) {
-
-  // prevent a runtime error
-
-  if ( regexp.exec(string) == null || matches_array == null ) {
-    AddTestCase(
-      string + ".match(" + regexp +")",
-      matches_array,
-      string.match(regexp) );
-
-    return;
-  }
-
-  AddTestCase(
-    "( " + string  + " ).match(" + str_regexp +").length",
-    matches_array.length,
-    string.match(regexp).length );
-
-  AddTestCase(
-    "( " + string + " ).match(" + str_regexp +").index",
-    index,
-    string.match(regexp).index );
-
-  AddTestCase(
-    "( " + string + " ).match(" + str_regexp +").input",
-    str_string,
-    string.match(regexp).input );
-
-  var limit = matches_array.length > string.match(regexp).length ?
-    matches_array.length :
-    string.match(regexp).length;
-
-  for ( var matches = 0; matches < limit; matches++ ) {
-    AddTestCase(
-      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
-      matches_array[matches],
-      string.match(regexp)[matches] );
-  }
-}
-
-function AddGlobalRegExpCases(
-  regexp, str_regexp, string, matches_array ) {
-
-  // prevent a runtime error
-
-  if ( regexp.exec(string) == null || matches_array == null ) {
-    AddTestCase(
-      regexp + ".exec(" + string +")",
-      matches_array,
-      regexp.exec(string) );
-
-    return;
-  }
-
-  AddTestCase(
-    "( " + string  + " ).match(" + str_regexp +").length",
-    matches_array.length,
-    string.match(regexp).length );
-
-  var limit = matches_array.length > string.match(regexp).length ?
-    matches_array.length :
-    string.match(regexp).length;
-
-  for ( var matches = 0; matches < limit; matches++ ) {
-    AddTestCase(
-      "( " + string + " ).match(" + str_regexp +")[" + matches +"]",
-      matches_array[matches],
-      string.match(regexp)[matches] );
-  }
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/multiline-001.binjs b/js/src/jsapi-tests/binast/parser/tester/multiline-001.binjs
deleted file mode 100644
index 7c56b53f6e51409086a4a9ce792fdc20db17512e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15866
zcmeHO-EP}96xRMbciY7<>|z%~E(&Z}k)&G(Z0p<raq12kQn!oK7DHDQjKtVlWJ#ms
zBnJ8vdz?MQ9-!FeF8UZdhayc{lpM-`jXU4Oh(sQq-|rkAQuVYS2XwpMrNrBQz@iQ#
zJ?BlwagHKy;57DHKeunS-6*C`eT$E&2Y!-nU;WW>YA~v<Pk%(1PmTh5hq?h_B=w_^
zlk(L6iF4wI-YBh?K<AB%Xhn>Z@;%27{d7n`Uw+S{Vd@|IlyPz)=_#g@l=)$2`#o5u
z-P}FgyWgsBiD&gKK}4t3=HvJMlrj=<a;GHd8}vQ_dIz-AJdd|}{UG%NKcpKsZhUPL
zmy2w1_0`4NZ^8Ui!pz}1FB7Wu1<+ogS|2qJ+OtyYyTE#L_ukI4Z%oZBUXcs*&v!uZ
z!@a}(rYX1X5tiQhDNxJ2^VZtXJ=cx{(lN;|UakKu&OhIWr5X=^YCXKyXdaldPoP@#
z(3{`h{9(qS4nV?ak^peFQ<Bmi02+^BI(%M;e7htF)Koshg-2B3l`f(MPNKq+l(6)W
zCaI~gp|c3GI`s+B>TiIm1)<ed5bi9ByqLNtlqIHkx;PC#By6B57a<$cA*44*NdY}h
z9p-nsDkBMGM_H~b(mF}Y==~lj_@@yYY#jMuORwfdXW^jMB|aO}h#Rr6HlRTeooyV!
zk59d|gv3c7WvZ!#rKu)h;4@$#j9A*GECkf>Ipx?7D0rq<u!LM{_**^IDLqf)|5&~V
z|0k@|$0$k)<HjNqJ_1@ho|nPsE=g#Czi>HUz^ZS<;E{?bn<mQ$<SQmA)D)qED6E(g
zPJ^hj`PGxb(`(9rnm_f_Q>kO!tQOK#a{U~tSZno8lqx&&sx3PDow}(LGYp(`FsUsn
zac`jwtOlVPrRVpLP0dOTbK@SsNCTZL;}~-~58Z+_vIvn&>Bih)jOeg~tJ8pI1m!jh
z<W1DAl2!Suv#gB1biw;_cERhdg4Ze9dcC^f{dJ1q{Q&0bNq9~%yigVw7RrcO)77Dv
zP}9mK=-qzkV)H@oLm(w+9>ma>=q2UN4IR%cGKh6`@Ez#Fs17U^z>0v;4n2=e&#TBQ
zW;;=ROic@O8qb_lQ~D4n^+@V=Y4VI<&NC?rf7Qip1d)59vJ93c<NH;=ec?FB^hkBK
zcRWf0J<V~WFrk0+apxsFUi!-WQO5_LR=Lix+z=p-&z~#lbfS}PGLYu&+r>05UG+9Y
zSH?)9=hRh_%X&oq^2+D|3^S@Wi=Z1DDLM4i&DiP(fvojm>7oBfrsS_aXC9`v5YZy+
zbS`ZrE0nNmtbPuGik>|Zt194B%<`JJQfCCoii|Y%&JYV4*coDn1owreFLEEOfv+M$
zj0iKS(NW-%rowWNwD3$@n6TV^@hvrC#h0dmioDf=!}0JS!bXoCOIFdk>oeoBVuY{K
z#r7i7MJ{_3dEfy}`%LTqf>)TCBx@Y#PNpB#6;2U@i<VqgaQzoD#R^>I>1{5A5l%#|
zD=K8?)}^xra0{fp0wSbQ2A}1?Sme=`kh?_L0d=vy8PKqkcFT34Bf{J)Trss+7#i&`
zf6;OQVqFZ*O_4JUl}oxMnvv}-(&n<}uwPa=OuK=U3(-{$>&S)zs-o}?(h}t`+&Qgp
zmNX8F(zpeDU{|k%;`GTd=Z>q4AubA9*k$}KIorR?-sF<vYn(9tTy>PRgkj-{wpG^a
zw`Y)e8~4Xt;?hylLYrgbTBkKx)x1L7h4i6xLs=L-OR{6#$O3WiMocyDGm>zXo1eP%
zV-IeXl^^2i{7!ho@GmG7u!tJz#OG<v?wYwc)HJv1x+pEUoW^`t)_B03+3FMHg?^Ll
zB0F}yPA|GRKFygxT`{gRY~d>i5LUuZ1`rk;yqf-mEIo8}J>+h!wx-!_IC*<i9zhLl
zE{uz1=Jk?u9t-iu8lZ^F%BSg%VF@FYl$0vSaS*-aCv*wa2dgHsY$8vC86_?|2a*<1
z@c*s)5I)wQDEyWoFMoA_vQT7YII*mw5gVS`aoJ!5E}zfoR`Kk!MP-dmF5jwLzKrFv
zl>?L%%;K>gq_#)9WpgmnG8$0sW|tzV*MiR@b2rJ?U>r~Dq7Eq*W3+W6LFEFr7s0|M
z79SzG!~)slT@u5of1y>bz~ql%zWio%+?`WlxYDah;(f{YaGKeTk7UI=+_mLCP}F7_
z-++pD=HZk^F4w%($niJ&w;3a|Ms}m(4JQ5kIih$q2IjRTjSI3G;ru;Z@v7uoIq?=n
gAHBgWUKF2gi<jk><+JGHf3E>)JzPtzUW_#V0rg5Hy#N3J

diff --git a/js/src/jsapi-tests/binast/parser/tester/multiline-001.js b/js/src/jsapi-tests/binast/parser/tester/multiline-001.js
deleted file mode 100644
index 9e69022d5d7b..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/multiline-001.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          RegExp/multiline-001.js
- *  ECMA Section:
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Date:               19 February 1999
- */
-
-var SECTION = "RegExp/multiline-001";
-var VERSION = "ECMA_2";
-var TITLE   = "RegExp: multiline flag";
-var BUGNUMBER="343901";
-
-startTest();
-
-var woodpeckers = "ivory-billed\ndowny\nhairy\nacorn\nyellow-bellied sapsucker\n" +
-  "northern flicker\npileated\n";
-
-AddRegExpCases( /.*[y]$/m, woodpeckers, woodpeckers.indexOf("downy"), ["downy"] );
-
-AddRegExpCases( /.*[d]$/m, woodpeckers, woodpeckers.indexOf("ivory-billed"), ["ivory-billed"] );
-
-test();
-
-
-function AddRegExpCases
-( regexp, pattern, index, matches_array ) {
-
-  // prevent a runtime error
-
-  if ( regexp.exec(pattern) == null || matches_array == null ) {
-    AddTestCase(
-      regexp + ".exec(" + pattern +")",
-      matches_array,
-      regexp.exec(pattern) );
-
-    return;
-  }
-
-  AddTestCase(
-    regexp.toString() + ".exec(" + pattern +").length",
-    matches_array.length,
-    regexp.exec(pattern).length );
-
-  AddTestCase(
-    regexp.toString() + ".exec(" + pattern +").index",
-    index,
-    regexp.exec(pattern).index );
-
-  AddTestCase(
-    regexp + ".exec(" + pattern +").input",
-    pattern,
-    regexp.exec(pattern).input );
-
-
-  for ( var matches = 0; matches < matches_array.length; matches++ ) {
-    AddTestCase(
-      regexp + ".exec(" + pattern +")[" + matches +"]",
-      matches_array[matches],
-      regexp.exec(pattern)[matches] );
-  }
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/number-001.binjs b/js/src/jsapi-tests/binast/parser/tester/number-001.binjs
deleted file mode 100644
index dea41480451cab95c845c9b34c4344105c50df6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7566
zcmds6O>f#T7|y=G4y&}=wnL7ss*P6KVcJrpmNJbB(Q2?>CqrDw8e-&_QZD;T`#rnt
zzUzL$UMEiMVgn|ni0*`f?Z@xu^S*iGvEd-ZWv_>kUp}FvOHtps>o`uE_+#gw);MZ@
zXm-c|J6<W-<Ap)Y%KNVz=Nats)Z?d!2B;n4L)-}wMJymu0_Dr+*f|d(|0>pRz_~LI
zi_ior@SPwESPr0GU-NOqg0leA1TI2-DRj(e5OvFs;F@N&(yARdyps6OD+v%4tC{St
z2MkjbCU6%h9BOz^0WTW%+nB!D+1b@0Gw4!cG*8@k4^CYms&7{%C}_-IfW1Ovo>sp!
zmu1WcAo@{r_uD(&FsrxY-__ZX>)oog>Q!BDH6ScQ(gn2YWd{#<`o-=Up>89I(6@}F
z5Sv^2Mb|KJ^>RRQ9K&r*h8XTc5+)Id^Z$+6T0vnbk0vKN@E4XjrYdid+fP98m?6qq
zIA$|66tF6~l;b)oaMlzmAle;rL&QeaEtJ^+tPutJ`3$^_X^YfJSJx?Fl?_ODE#nV@
z2+^_B%i){@EDo#;Od8@d=Fp(qlSC@0i34rRi&P_7NWE-&eGSrN(L11o5jGy+MdCOQ
zYlG9*pI{$?`jA?~&=Ah5XDpe4!+k<Qh<)kcNdv8}Q2haEw6LA@$#SYbX9k>6qON-Z
zQ@#Mi261yxm-Q$aMLKqF-~X`z-~k0Jk2}kY&l42KOODSL9ZObEI@^$R&Yd2L{195j
ztgTg};DGO#I5e{zeh;SL411*=mh3B`c*KLrM8Py(z7Msu8}aHP0T!X}JsE|nP8Rgd
z{Yl#2=lZjOM~Y}%rR!C0e(&*=d-DVmx@6C)YEqbWF!Ui&9mfMMwW$LY3<@wC8@;|n
z_gFwZ2C1@kP=-rp+w51haWSomow87XhfLbm>f)<nTR`#ZkT(}Pn#mXzsCE|4z_VXf
z^!18r3zfM~Y}%E@I{zCDAse={(7c$lGpCE5OZB}vcLA&BjFBG^o7FQF#5%o7h=wsv
z%EbUiF#YLc9QCM$ib>(pvqME$xN2@g$>jWa`>Uo+*jpHxXAqv!P|b4vt)q$sI`TDP
z3yb)-aPV3Xg-R}5t@OE$Svt4Hegh__a&nQpxx9pZd~Y_woHR%JdNUcL*|W+L1!MJU
z&$-M|3-<{h8C6h>b%IM2`vF9CpKGrwV&QJ<dB_cnYi<Xm<>=xo7(cDm?w%Xrk(<6Q
zY;JvY)4%hf5Uh)FXWrB0YuaYhBvf^=rF1-k+)Wq(fM9wAnUcUFcIHr|3Dr_up1U(f
zz^VZ(<eXKr3P4S(q@qd6)Xsj@8wxVZVg<&+BAh9h)eL%0=O@V-=3+C*`6q0A4wq)+
zY<fA0(+^;LDa{=jsA9=TR$|TYi9)QH*;9ekz7UDEDe)~<O;M#RrAe=;Fy&QFIXD?!
ZiZHSM?Le&R4iyXLaxNC<jPQ*W^B<MJrEmZM

diff --git a/js/src/jsapi-tests/binast/parser/tester/number-001.js b/js/src/jsapi-tests/binast/parser/tester/number-001.js
deleted file mode 100644
index 37ba1b798bc5..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/number-001.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          number-001
-   Corresponds To:     15.7.4.2-2-n.js
-   ECMA Section:       15.7.4.2.2 Number.prototype.toString()
-   Description:
-   If the radix is the number 10 or not supplied, then this number value is
-   given as an argument to the ToString operator; the resulting string value
-   is returned.
-
-   If the radix is supplied and is an integer from 2 to 36, but not 10, the
-   result is a string, the choice of which is implementation dependent.
-
-   The toString function is not generic; it generates a runtime error if its
-   this value is not a Number object. Therefore it cannot be transferred to
-   other kinds of objects for use as a method.
-
-   Author:             christine@netscape.com
-   Date:               16 september 1997
-*/
-var SECTION = "number-001";
-var VERSION = "JS1_4";
-var TITLE   = "Exceptions for Number.toString()";
-
-startTest();
-writeHeaderToLog( SECTION + " Number.prototype.toString()");
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  object= new Object();
-  object.toString = Number.prototype.toString;
-  result = object.toString();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "object = new Object(); object.toString = Number.prototype.toString; object.toString()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/number-002.binjs b/js/src/jsapi-tests/binast/parser/tester/number-002.binjs
deleted file mode 100644
index f8d2838668daf7c2e2ac2b28f07eb990cd1308b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7588
zcmds6&u`l{6xM#P-C+ZE>kiW~MbIT11`Jpn1B>gT2?8gGja&!DVr;FlWKeVxqkm%m
zf?j&xasNTzqe$_^q#fFE17{~eqWJOs`1n2QsUauhj5ixY&XVS-C<cO!qR*o!x+s!q
zba2=?>i*g77h@hZcGNqKEG=bo@24pG4&G|e>E}$O>>}eYc|T)<$+XB7RATST=uMg@
zx3N9|&S!UF6+%I!NtEWPtO4lqhY8PRdYN*e;Bq#yMwe2g`Jnj?EYoebdWR>S#*Tj0
z*wG*qtE=8WP9+yCQ*c)-n>ct+0WY77F1UEHyZf69X`pvh&>DKhFJRUc6YlHOf)#`L
z9<U!UnCI=Y?z)2c6_|e1{q^tP-M~D29RGW`IHKRZ!`^Y*^_vnRkdi+GTKlHY$GH8<
z__7djM=|sl#o&|6t>^AK_lR%%W-NGF!eU*?Bp<;ZR0QPpbMIztu`IJw)r>wo;&zKs
z-vhSx6Y#r~OvoND<pK{iEJe3=+{XnJP3-~`g9!$r^tvA4%nyKdEkJ!<gDi8=D~^kS
z>yr|d?_sw)8~z~8nV4F?B9t5uaS&w?(u`lqNTh?I)lscX2()b%qCpC<dfn;@H6}9T
z9g9L1aysTq(70x`C+C|luU~`ru(Kwahs`uGfx3WjuUMM##O8N4Ko3`@{sn6s*3RZ+
zJvASNfg3?|eP1DzKLTQ>h-=VT4n=XDyV!Mn|BvM#2?Zk0`|IQ9DJ#o0^Rp+WR@BwG
zHY@sXq9MzZ3=WFsP)k{GfN#u9T6h@#144lUd+RW4#n(b1;~`|aUV0b*3rguA$KqiD
zmQnA0%R=f?fO=y-i;I8m%x8yR6VuS8`xS0n_hinx^#;<un0xA)HD(h6{j#8mL&8-t
zji7)*{gqR1*4LPx0H|-lDp^!@!_vjX)?8_fSMzGMSpg0pWvWB1Yd$qQ01B%^eYSAX
ze8C7n#gmXeZqLUw*yc(t-z-uGc#J6tIjt;r?*F6=3K6>i&%<_;NwRaTjs`UMwCMs-
ztp#ItDxK3}vOjEPY*KPnEymD)8O`tE(5V3~s=DP8nW8LRG`FE*qC7tSq8UQ_fFR=z
z;&aYZi&FpSq+*E!`G%-P0RICLyb(e{#Rc7}?vJ^wnzlUYK-<*zEtEPvgZJ=V)4!Yz
zM<rpi95we;C069>?IY(p8!ea<Y#6mz$z6d{j=cq;`VzgTjs&DTxEt~bnl+CDGO%-T
z2Engtb-W+v{5r0_7Pg-6#nofe5`tmf>a0(6W@z?RUlWw(H_$YsPrL=6|6r9%AKwlL
zAkH27=tB)O7dP&L?k^2MfSrp9)(TMb%BXHi8Mn=quCSu4ELU9uB7!m@gWAv9De8n@
znV~1PK$+h`MzL3Hl-c)TR93&faH!fimZ*Bjt5kZ-^K(Lv_@$FTI{$|B*c^WAQ6H<w
qP_^S77v_A%k%_bPBF2>NZv#E*CR7jjYq=iue*NjOJ39N`Qu+}%%d2((

diff --git a/js/src/jsapi-tests/binast/parser/tester/number-002.js b/js/src/jsapi-tests/binast/parser/tester/number-002.js
deleted file mode 100644
index 5f4462e043f8..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/number-002.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          number-002.js
-   Corresponds To:     ecma/Number/15.7.4.3-2-n.js
-   ECMA Section:       15.7.4.3.1 Number.prototype.valueOf()
-   Description:
-   Returns this number value.
-
-   The valueOf function is not generic; it generates a runtime error if its
-   this value is not a Number object. Therefore it cannot be transferred to
-   other kinds of objects for use as a method.
-
-   Author:             christine@netscape.com
-   Date:               16 september 1997
-*/
-var SECTION = "number-002";
-var VERSION = "JS1_4";
-var TITLE   = "Exceptions for Number.valueOf()";
-
-startTest();
-writeHeaderToLog( SECTION + " Number.prototype.valueOf()");
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  object= new Object();
-  object.toString = Number.prototype.valueOf;
-  result = object.toString();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "object = new Object(); object.valueOf = Number.prototype.valueOf; object.valueOf()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/number-003.binjs b/js/src/jsapi-tests/binast/parser/tester/number-003.binjs
deleted file mode 100644
index 5ff1d672080e763d18823bad698a60f83ae84427..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8026
zcmds6&2JMq6dzc=IRM%lATdV}f`Z_LvXy8EB2|<k5_&~$#z}@w#*yt%@_%yK!|s_q
z?tj309?#f}ozw|w)pCj^9{>D4fA9HCL(Zld-ENF2Nw(i}HsWLwU5ujWfF<*2r`_G{
zz3L6vltzs$^-d#8h1~vjKZ<U`TMc{rKH(`j$mkn7$OtDgWx0Y%%(I9N(>(bZ>tDdR
za2yun3Mx&aG*4v(U?1O3XfD%XO1Xl|$;1dPBv13v_Ek8h*J}3Ld)>yC{;#p6L2Rs^
zdcTuO%1Nf+zL0F@;N1Ycd^S0t{K>OtFI>nHdP^Ctp-=n+c6}k-echH|O=JEI*r#aB
z{nm%xri^(RMBnW_|Mb!|%<0?l|I@Q0>fLYmJ1tjlJ0Jo>@&TZ=z7FUV(@(@h#^bJv
z(5EVb_l6H2x##?XeOq6roC*Pl^(2vW0y(GxkXHYDleI~*%xqOV2Jja(DQ4>)klNQl
zZy^bneJbP<4K=KdZshnC6_7Nw3WSelXb9m|JwTb;fOW)yeck~rQ{HDCHga`Rq;d<g
z-AVYJG$(v+^oo#jfW(26fk-ntlo3xyW5c7GnGoo)Imk9rfYh62*LxsM8N5@@B$M+g
zT_KFCsP_2$?9=NN&>k{tmU*Jtc1$2IAlzG$W;8MWtsCg{%G7@#jT5zXpKPY)BQemD
z5MABZFy)_s*ky4A8p|<fN4bk#+4pxW{}@m}@^rAd_<T=<*l>LI`P`7Y>T5GLIE=<5
zPcmo}%cj<jf*pLLwrOcI{0|V{C9uX%&9EU~1BDR}Ce!uOd-!W8rK22+hXGiHz5g;%
zXzLWf-q%35{nwq3txtPz4M-WnHrN|x3x`H!2cIDhA|Pp~F>>zJY`t9pf@2^SEzWYW
z1E7#As!HRc`HT^Oigi&pUyCtI?DE$(xCw=G5=-cky`5dSX}Jp9igoFc(M?_OHq}9)
z1Vv?ZB~Wbq5ngaAP+%>^RB7i!yot_TcwI$HN7jFB{f+Wx!LcWrp&{Y0sa&#69Duo;
z`Oc630#wDc2x%%;yPo|vfm8Q&^;|S?c3jz`F)(UX@~SQRWqVJP$icXok(r>XrcYr?
zHd#Drv$qELR&^IH9oZ-=w>FRA;)n(Qe782CQ6FGrgrW<&-es;oTTCCI=nB`SGeQ;t
z@gJZ!76Zu^wGMR`JI|XT3Y%O|t>U>uWieW(Nf(COX1b&fy$kQDhDH>#?z%Y&$sB<_
zG__`|o?J7BKEbhGlL+b(oKh?YqH^wF0qzc-S)IU0?R-E6_QWmlQE_>N4=oF)b}<n!
zEupc#4#jL3lejn`E-sO=>tMTr1xkYv6F-Ex3_bDymPud(2gJ%Tl;}eZ6c=-K$yk0x
zIhWO_HJ}#tiwo{K_6ch;$!Y~9z;nn9GU&U2R?1ewPsT8;Ttdd*!J~KJ(DIWXx}-j%
z5Cu=;QvGtIm%QX;Z7ZV7B#d72d{ELWej>FN-2sqZL{XfNeR^#{Ug%X{G+G-y;}&aU
gJ@%}P!u{BzS6y%G1%GYVi{2@XUOVP{jJLG@0KmLA!2kdN

diff --git a/js/src/jsapi-tests/binast/parser/tester/number-003.js b/js/src/jsapi-tests/binast/parser/tester/number-003.js
deleted file mode 100644
index 8d0ad83db006..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/number-003.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          number-003.js
-   Corresponds To:     15.7.4.3-3.js
-   ECMA Section:       15.7.4.3.1 Number.prototype.valueOf()
-   Description:
-   Returns this number value.
-
-   The valueOf function is not generic; it generates a runtime error if its
-   this value is not a Number object. Therefore it cannot be transferred to
-   other kinds of objects for use as a method.
-
-   Author:             christine@netscape.com
-   Date:               16 september 1997
-*/
-var SECTION = "number-003";
-var VERSION = "JS1_4";
-var TITLE   = "Exceptions for Number.valueOf()";
-
-startTest();
-writeHeaderToLog( SECTION + " Number.prototype.valueOf()");
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  VALUE_OF = Number.prototype.valueOf;
-  OBJECT = new String("Infinity");
-  OBJECT.valueOf = VALUE_OF;
-  result = OBJECT.valueOf();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "Assigning Number.prototype.valueOf as the valueOf of a String object " +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/octal-001.binjs b/js/src/jsapi-tests/binast/parser/tester/octal-001.binjs
deleted file mode 100644
index 5a3c602eecff39f4a9601c03641763c38a7e88cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12564
zcmeHO-E!MR6c!XHQ0N7`fZO3BnNF<+n9k5~42f&NOzL*xv{%ezHqu5`D@*F`sw6Xg
z1@3_x-iixefY;z0X=SbcoVBfZl8$=Qv3B>{J%8Uh`;(rCLXY-)Q%daqGZr|E%#8O9
z!#D}-b7Oxr{$=uLVg(^JdS=|G=eb<;?{*F2W9ZdWhrb}qB_|$zOf8QvBHX}_q3rB8
zH(t5EoyYnQaNfHJD_}8{Ya6cbiaCHf{m7=ia8F&zVmP17vPE;jT;J*6glQ(j!O`gH
zxM#|5JyU|HSd+N_fh#B@UJUn!cu@)OOTas%&hRWW14|I^{(}cQ-Iu(Koz7v#+Uv=w
zZ@}<3gq6FiOIcB?{{r>~wfbUsIB80&AHmXxgC~2(Uzatrc}3m;EpAAWAA;aVqoadi
zS#H%MG@Ww?&=TkDghYTR`@AEjM0Bjc7sT~DPtj$E+#(^J(AN?5EqWzfcY_-L1a!3j
z{HO8rC;P+0Mznq(5T`<fk4%#TZ${iai5wn!M3{UU{B{h#x|ZX9@7lZHeEV?cyNBgj
z*YI&*B1Sm}=A8&4=nNP!c3wLFUP+w;;(6K7c!UL?XhwLd|7j2{>Xi$^#1Z9UfrJuP
zMbFl;jtH2-qzHsL5h{XLimoBdZNS>I?Ie~4gjYpL%<E?`E0R|(D<;FzRD$c0(P*4{
z#K{&Va{_X}R(Jc?olI-81sXsC`D2}|g;~&y=P(<=`vCBM9^JXq2pHx>09%YT27@x!
zN|lQAoXgMf8~^=Ksii%}$a&^vNql&5tYp@R?fEBQpuuwX)MQ^A*N{q3yb6WLTB5)f
z^PiU%TDY9`*a00zEKLkQM!tnLrCMGh64Zntl$$eNU$d(G(qzE@1G*>$yv77LhEWGt
zd9j~sKz#~OzzN3<!67$Dep-8Jx8%~A!b56=-2**adu5*k(u@deO8GHCIw&K`=u$mr
z-wUi)SyI9XU%X5Dy<-@-=p28HPV*2L2nLj7JTAeiw>AfX<3h+Oq=hsIyE52i!OqB|
zr@~;aGtEZJG=Xb;`!<s<CywhArV`;2n7g~xn1g&FfzxYc;m3hcgu`LM$xCVpBV;J0
zIA1k)HyCNiHS~;HndC*Tjg!VR=!O)TH@e>5v^G)-T(6pO9C==v2w~c}qKb=C$LwE%
z={2}YBka^w>PnVMs*YVcR_{WfqTl7rmic5BvuIl&Zdqo})vZpxY7}Uw5IGfUQ7o&m
z5-s~;?1Q(#S23D%!mMg^6!=~?kt*o*fYeZ{E=_0_e+bt_uGq@-mU?OWzp6)#6<(N3
zt8g`!ix%E)Y^6&^`KrOvri}PFQ#WN4GDwxT98wW6<=_CkVoq;q|EjV`IV7$eB0W8Y
zP#yoe66`(57A?W1_XZmDwahj}leMlH$>Md%cGsi6Bc^&>dua@}BtvVM7j1F*qP3}_
zzv<mYL$=q*KG!uB{L$9h$`!JPzqF|U581Z6HAh)hWs-(gH4n#D%PB4KUPa<vVDi+7
z-eKPTtL5F6cjdz+%^gF^yJ588PFmfbYVfZ1g-Of2^TPz5yvDks2kII|PndV18@<EK
z`*(Zz(K7FH%==kf@rocJ>MhN~=0e$t$JAE+v!vAsRwLS*KQ6(upi~+4XF+KZr)H#0
zsH8AQdx<N3UBgutRs)5Upqf<!dO4pd%$2&5{H#u`zVQaPoG0n|5ZQT^F&9jSo|Q}w
zkDQZdJ=7k<yKOE%4@d}C66v?x3-nts_zPUFEG8B`(vw|k?@ncV&0|p6il!~S9hYrb
z4-_8mDx*qoqh(vU{!!oxrvtf`T;U;Gs!m{K(*pjIJu2N+0WLl+l1(+QJY{R`jiqd_
kI|q`@sGa;HG1*WP2=T>t^4AGp!B9*Vsc+O8zB)?&2kSKR1ONa4

diff --git a/js/src/jsapi-tests/binast/parser/tester/octal-001.js b/js/src/jsapi-tests/binast/parser/tester/octal-001.js
deleted file mode 100644
index 0aa1d040746e..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/octal-001.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          RegExp/octal-001.js
- *  ECMA Section:       15.7.1
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *  Simple test cases for matching OctalEscapeSequences.
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-var SECTION = "RegExp/octal-001.js";
-var VERSION = "ECMA_2";
-var TITLE   = "RegExp patterns that contain OctalEscapeSequences";
-var BUGNUMBER="http://scopus/bugsplat/show_bug.cgi?id=346196";
-
-startTest();
-
-
-// backreference
-AddRegExpCases(
-  /(.)\1/,
-  "/(.)\\1/",
-  "HI!!",
-  "HI!",
-  2,
-  ["!!", "!"] );
-
-test();
-
-function AddRegExpCases(
-  regexp, str_regexp, pattern, str_pattern, index, matches_array ) {
-
-  // prevent a runtime error
-
-  if ( regexp.exec(pattern) == null || matches_array == null ) {
-    AddTestCase(
-      regexp + ".exec(" + str_pattern +")",
-      matches_array,
-      regexp.exec(pattern) );
-
-    return;
-  }
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").length",
-    matches_array.length,
-    regexp.exec(pattern).length );
-
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").index",
-    index,
-    regexp.exec(pattern).index );
-
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").input",
-    pattern,
-    regexp.exec(pattern).input );
-
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").toString()",
-    matches_array.toString(),
-    regexp.exec(pattern).toString() );
-/*
-  var limit = matches_array.length > regexp.exec(pattern).length
-  ? matches_array.length
-  : regexp.exec(pattern).length;
-
-  for ( var matches = 0; matches < limit; matches++ ) {
-  AddTestCase(
-  str_regexp + ".exec(" + str_pattern +")[" + matches +"]",
-  matches_array[matches],
-  regexp.exec(pattern)[matches] );
-  }
-*/
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/octal-002.binjs b/js/src/jsapi-tests/binast/parser/tester/octal-002.binjs
deleted file mode 100644
index 3a42bcc33bef51ac10902d1b4981c354cb25073a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16156
zcmeHO-EJF26kcfgEffjvK%fY5kx<oc3qqxGf|Asrpw_M8v{y*ccs*HfyV+fK#wC&Z
z3fv=ZxZ@Rg6E1iGu6Y7DXLrUs`{&HsV`E1vMOk@g=FH6b`OevMW;%QvdUU5VqGY)9
zI0~GIoLaA1mNf{5=hogq@B99}z8!?r>a^oN9nWQa=ktzby$!uO>hPx|a>>A>_o?lX
zh;TRXV^YKPH?y9*{xD1HZ=mzaMYMt_Cglz-*LV4ZfI9ubkow#`acLBj^T}ztXvQPg
zcXr-@Y5Lv$qk~7iPFuX|v;`5BRzL3lz~wX|UQF%<@x}#u9{{~W>U7V-c3^Yj-Mn?{
zPU{&f(w1|yWA1gt)K_5m3lbH(t4o=YtA7FQC35v?_pon@tFOb-yZaA!kM9&YvwTKg
z0WL0yk*~qVj}DF=bc_2|H9}K4Zv(YNIX6PWL6d#9!AFE|*n!W9>u)?lmF+T{gtSk8
z98=$>E1|ke<oH{_qrE5J^`1Q3>mC~6`c0rX;yk?9ZZp8mF>4RT4hucP+iVp4bPT^*
zw&Q-|4!6Jf@~hi-zb?)?hmHdhMU*i>-aaRso&qAq%1bBjOQCb0cwRa*9$~{PngX7x
ze;PoGd}W+O{D?9>Wru>SN<Cf2JX=5)CbmE#XN-(srCZn7%ypo(I~*pqv`<)>mBhII
z$5qQh@XC0_WSDd%xGrIh)`>@)bWy@5d<Y#jTU(`nKio}ODY`>%*p~P)k1P8K2(?RR
zg_r8YQae?dX(G~lFb5%nfo&6fz|%Ie_S$rNpb(L3OQ9r8Ov0P8?d?VpIZyR6u_!OL
zu2g=p2K)~4McvP6fF^fv+=M$u_=0YWtRSU<u{D{aWJVK_<K`$WRCXd1mHM9ldAX4J
zUjxYeG03(GAQ2-KPrh7mRwkCxoB^EQQQ!xm*@%tSBf2nH{s&;W@VTl9%Q#NL^1vM4
zEY!AV5I-W9x!swgWJV9y2$#*tE)VHR?m<F?e5&)MG0xh>-dEw{dEVIjB7|RH`27i(
zUuF1hE&_j71v6p_<!e%1eVAWGa5lFlbKq=_QUmjj{2E1HRhn(CaMAx4%*Q@;t}GD*
z<rc4<Ao_Of+gMvr%M3^fY6BsZ9Zp$w?Lzf+CKEq@0xt^AM`HpU6H$krh0~*L4N@4U
z!e_^^A#zwL5qYY)mv&7o%@jRMlS37Wp3S{7bX=!|+at=32_|`p6oqxEnzQEx_VYAA
z!j#_hYT3^lmW7MXWQ7h+vLw(DEJ)3>I2B)B;(8D`E@U;+FwMde5>)4)+6EOekDhQV
za-C5+T6~G(8ehIlcbD0Y>yt=LZ`Gi=y<JW-mr%y(wX(7I1FmcihXsRY)aF(g;V$|4
ztT|kRmWEhE&uEFqk|A{*Xg`K-2$5N#>(wYLEhUHbsu+7?&yy|$rkyZKE=oStF?$OT
zy#`ikn4P*x-JO;0u&%9s3Wkb$ml0d4lc~+3Yyr4Mxn;s`b>XvGfd&f^Q=uk-<rS<*
zq*f@I5bNM|&{eeN%w}d4I&SzzI+423^&qLiR$Z9T%pD=Q7GlL_$~P$>`BeF+vBC?T
zX&GJ3<)VbQjIFe$mCtG{jmwCSwdlHxoChh>mP5+Nky1bgt(d@@>|YiZDTjqhhX_rV
zBvi#;SAe|%-l73md45a-zUq9YXrk7df$W<IvMrDL4j<`Z?ZObQCPHh77iF>dtu?M<
zXW3sDhGehdeb&_#{L;kQ%28qseQ8_)CfT-H6{)PUFiC@}n#r-*d`bhns|dVPL@t%+
z665Z#4emC$D=x5TelbYg4aZZ?Caa&P8n~-nFlmr?l1yO9t(+B2sA~v4LEfoqbcvDo
zw<h_~Aa6b7#q*$BEgmF5y{VaO&V`+rrnajO9?S-?8rE(;U4pqF$&Bh;kPPBfkF*Sy
z<mPCKxI))8RAp*3kaG#DST#u3)0x~{QkBGOb!zplFR10jNl%7|&a;fUU^>*SWO}&l
znjGt)!yeq<W#aWd385q*-(_whUxUH#<8nnXG3~OJ=u%lb73~$50!1r|ws417v|&7u
zyTGZ8D%_D3ZN>OUA(zVzWLh$ThiECwz>20R_$7Ljs;xpef4E3ARowOyt(6r^(O#7Y
g63xh+>>)AHP+<tkDd+hAXD}3<h188o!IxXfe|Ju8y#N3J

diff --git a/js/src/jsapi-tests/binast/parser/tester/octal-002.js b/js/src/jsapi-tests/binast/parser/tester/octal-002.js
deleted file mode 100644
index 309fff473e17..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/octal-002.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          RegExp/octal-002.js
- *  ECMA Section:       15.7.1
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *  Simple test cases for matching OctalEscapeSequences.
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-var SECTION = "RegExp/octal-002.js";
-var VERSION = "ECMA_2";
-var TITLE   = "RegExp patterns that contain OctalEscapeSequences";
-var BUGNUMBER="http://scopus/bugsplat/show_bug.cgi?id=346189";
-
-startTest();
-
-// backreference
-AddRegExpCases(
-  /(.)(.)(.)(.)(.)(.)(.)(.)\8/,
-  "/(.)(.)(.)(.)(.)(.)(.)(.)\\8",
-  "aabbccaaabbbccc",
-  "aabbccaaabbbccc",
-  0,
-  ["aabbccaaa", "a", "a", "b", "b", "c", "c", "a", "a"] );
-
-AddRegExpCases(
-  /(.)(.)(.)(.)(.)(.)(.)(.)(.)\9/,
-  "/(.)(.)(.)(.)(.)(.)(.)(.)\\9",
-  "aabbccaabbcc",
-  "aabbccaabbcc",
-  0,
-  ["aabbccaabb", "a", "a", "b", "b", "c", "c", "a", "a", "b"] );
-
-AddRegExpCases(
-  /(.)(.)(.)(.)(.)(.)(.)(.)(.)\8/,
-  "/(.)(.)(.)(.)(.)(.)(.)(.)(.)\\8",
-  "aabbccaababcc",
-  "aabbccaababcc",
-  0,
-  ["aabbccaaba", "a", "a", "b", "b", "c", "c", "a", "a", "b"] );
-
-test();
-
-function AddRegExpCases(
-  regexp, str_regexp, pattern, str_pattern, index, matches_array ) {
-
-  // prevent a runtime error
-
-  if ( regexp.exec(pattern) == null || matches_array == null ) {
-    AddTestCase(
-      regexp + ".exec(" + str_pattern +")",
-      matches_array,
-      regexp.exec(pattern) );
-
-    return;
-  }
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").length",
-    matches_array.length,
-    regexp.exec(pattern).length );
-
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").index",
-    index,
-    regexp.exec(pattern).index );
-
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").input",
-    pattern,
-    regexp.exec(pattern).input );
-
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").toString()",
-    matches_array.toString(),
-    regexp.exec(pattern).toString() );
-/*
-  var limit = matches_array.length > regexp.exec(pattern).length
-  ? matches_array.length
-  : regexp.exec(pattern).length;
-
-  for ( var matches = 0; matches < limit; matches++ ) {
-  AddTestCase(
-  str_regexp + ".exec(" + str_pattern +")[" + matches +"]",
-  matches_array[matches],
-  regexp.exec(pattern)[matches] );
-  }
-*/
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/octal-003.binjs b/js/src/jsapi-tests/binast/parser/tester/octal-003.binjs
deleted file mode 100644
index c1c1dd331e5158404cba2a717276213a6ac90add..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18706
zcmeHP&2HO95N4aE{|yQhJ@sPr6eEZf*J)7%ii22D3KxkJSWYf&VXVou#DpSQa+TUZ
z9;8pv2Pn|j=pn~m`WWd9xvO3AM;cM0VyC=Vuy%Jizu(LbchwQ&(BnIuA!p9c<0u$J
zY-GJ_S=MpjoLRej`#<(?_3a?!R;QiJ>3D7|cK+yD)`u{wV=jNnB9|R|{2sSG7BS%l
zenQI8|HsyI*LS9A{R?#7nMW&#5>l>XxxOnV1kA_pIoucSiOZveoX<v@=~zUrKiK&I
z9@Fo25BDDJciQs1PFoT&Y4wx&4_v_`<|X7_FmIfr_XW^9;Dg?2*bZ#Lyz4h^Y`31p
zdD`k3?L>PW`RGfq`~{2h(@j<?YV{S+UZYl@_73{1((3!bdawKN?$I}S&8%OMmq3ea
zQsiY2{BZB^K`$@2=@CTd+yZK;b8du8fG7L$h8QxjVF$iouD|gJUA7n7EaZLu>zMmC
zKNqgMMvZ?2I@*2m!~T<pyS;;zX#F}+910QMYPVy+&2ij59uMNsW1<}ogWrzezm`34
z@3_wG?VI0iZLikH0f{0W$AG+j!2}-xA|}quC*K!BXP0@NUYe}1;VZ5I&-6b6(4t;r
z!6I?UW0BYEB#I?jle*?(84)mrNfB5y7^5QMLeUArTmf2l9Vd;YE{ltzB*FF1-?J<P
zuc@q<E>o!l`I6CSop@}ZnUXmHF`)JHjjb)MH8}zUAc6d6nXH8@w($||+2nRzpG9Zd
z9v0>+C<P$3Lpt{OiLfGfFx1&t@`h-6O_Mf_TLZ~HEmb2^Of#iC&}1$X1!Nbx7YIX1
zxGXq+#%*DR5o$}ERdqZxR4U$V#tA<BDUdpef>C$KqHf^uJVB+A#FMvSdM@ehLl{M_
zty~$VOaxPlWqmXGw;;ZW_Cht9L9han7+P#Pv=mj-4G3aRPxrhfRieFT8OTF>Er;3w
zUzS)Hu<wt38*6>D>_<vatB0@+7{%p#2~&>*Cnf{&-=K>e5ECANYa%}2r(r%m7UcC~
zAO(1Mv?6l2bCG#tY1TfGtgVV3#ue=9`03J|eFl_9OxQynAF(K6XL*VeVN7f6dV&31
zM-C##?A_~M-&z(bbSh8polKL!K(L@xj+4?@Cpq)U4}yUUA*bV)nj(?MmoK$+Cef-n
z5^3JPT}<;_rnVJ@24W3A<+hewp}P7^QrcsfmP=^_OqdyYnS5uOaeq7~FUZN}nmSBR
z5RnjeCYMynl={uJ3&-l$fG+6SQ?aT8PRA_T7JyrBe<qcQ`S7YyKu{rKD(n$(yMsG~
zye}p`cm;eFi|8p~su~>yUSFAA1D6D~QWG+<s6=ut#EPqV0~L8Ify24Uw1_T|U9|A#
z$~avx%Bu!Tt-GPOFJ)vhNRhW3a50XIh7Nee1m4vAqO!<n-WM*B(5Oh5NO@5K_8Mf1
z24L0u90GhTvP~hP)&&Due2ul)^0+?`LmJlBhHwiaG{L-Ri~2=tQpL`?cNZ(NJt6yC
z)Ku_$Q)?Tq_6h#dqypUPZ?;NWSw&?ML94{(Shbwe0PlGO-WeuWPV^Sz?yIH*Z*W&0
zC?oC|6z+!O8D|B|?P*oqBj7bw%se?0liv)ykv{U9l=U@qps)!w)vs())uj6pr^gD<
z=^F@wx2LIUX53{{RT2b~<0mSinbCPscMNwR_M7HW(>%hX(8SDz$7(iPB1orSB{u6b
zkd6pzmmjyQhPQ;^Uwyj?dud7;`Shu<LVcQ;kx>c0@slc9`uN`5jQ%}5Etlmo4Ao+z
z%rnSB*X9wZs<-bIi|J>CuvpBA7f+8B5A^>7#>shUmey*nNnlmrxg)or8aH*>4SdJN
zlV7<LFv-~&=HZ!hIE6g#6wNZPmUlGFn5@+nA*;tsjJc*okGFFsMWty;Lcm_!@|$A&
zqHI~sy_<A%9=nAUA20)=n(YZ;^k$$<x%cEV-CxR`HEze|-jKT=MEV$5x}$|Ff=Lb<
zhYlv7(&M0}VzarFczy9tU~x@(8T(}Nc&tu)N^zzrgd^-~nXF$H(f2a>x}zC4878<V
zS$G1i83m5gi^<)S#EW!WBRP;bxd@{+DA}$Mmh;z24(JhhoGEV+mkS@Qd<~Dtd9IdH
z#}rQD=lp2pS0GH&yiv`YWkR&XWosZwh=S&&G{VT{PZ~B==&Mf?s0a#O7*>d#FvN&o
zXk6|_%zn;mx-+->DrRAgRjsoL*27|P=G&>uMZK)*3a=_kZAB_7;D6ttB6%dOF(qf2
zAY%UL2WWdz)+oSHpJi(h2~rwRQKy#zxw8+y#-Z;zCpG>C%uC7-S$h^sRs6bX4%<`~
zZUGC3uj&Um3hKfN%q^>!dbpaSGE_r})zYuKEQDj|g_b;q#a|j~oOMrA>a+B|j2tid
zVFtq*x!-Y-V~7y_<h`uUMsf(voB4eWgJA9_Obmiq%#}m=&XXJ{ziurjq}$Y~JCjo*
zQ?F#@NKvOi4$a7Vat20M?!u=*I18$BsN{zn<Y?*T7dc*5y~$xzA8ylghAL^nr&y5u
Sy#q_l$erg;g^9BeTmA$2hr}2F

diff --git a/js/src/jsapi-tests/binast/parser/tester/octal-003.js b/js/src/jsapi-tests/binast/parser/tester/octal-003.js
deleted file mode 100644
index a73d7d40e232..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/octal-003.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          RegExp/octal-003.js
- *  ECMA Section:       15.7.1
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *  Simple test cases for matching OctalEscapeSequences.
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- *
- *  Revised:            02 August 2002
- *  Author:             pschwartau@netscape.com
- *
- *  WHY:  the original test expected the regexp /.\011/
- *        to match 'a' + String.fromCharCode(0) + '11'
- *
- *  This is incorrect: the string is a 4-character string consisting of
- *  the characters <'a'>, <nul>, <'1'>, <'1'>. By contrast, the \011 in the
- *  regexp should be parsed as a single token: it is the octal escape sequence
- *  for the horizontal tab character '\t' === '\u0009' === '\x09' === '\011'.
- *
- *  So the regexp consists of 2 characters: <any-character>, <'\t'>.
- *  There is no match between the regexp and the string.
- *
- *  See the testcase ecma_3/RegExp/octal-002.js for an elaboration.
- *
- */
-var SECTION = "RegExp/octal-003.js";
-var VERSION = "ECMA_2";
-var TITLE   = "RegExp patterns that contain OctalEscapeSequences";
-var BUGNUMBER="http://scopus/bugsplat/show_bug.cgi?id=346132";
-
-startTest();
-
-AddRegExpCases( /.\011/, "/\\011/", "a" + String.fromCharCode(0) + "11", "a\\011", 0, null );
-
-test();
-
-function AddRegExpCases(
-  regexp, str_regexp, pattern, str_pattern, index, matches_array ) {
-
-  // prevent a runtime error
-
-  if ( regexp.exec(pattern) == null || matches_array == null ) {
-    AddTestCase(
-      regexp + ".exec(" + str_pattern +")",
-      matches_array,
-      regexp.exec(pattern) );
-
-    return;
-  }
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").length",
-    matches_array.length,
-    regexp.exec(pattern).length );
-
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").index",
-    index,
-    regexp.exec(pattern).index );
-
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").input",
-    escape(pattern),
-    escape(regexp.exec(pattern).input) );
-
-  AddTestCase(
-    str_regexp + ".exec(" + str_pattern +").toString()",
-    matches_array.toString(),
-    escape(regexp.exec(pattern).toString()) );
-
-  var limit = matches_array.length > regexp.exec(pattern).length
-    ? matches_array.length
-    : regexp.exec(pattern).length;
-
-  for ( var matches = 0; matches < limit; matches++ ) {
-    AddTestCase(
-      str_regexp + ".exec(" + str_pattern +")[" + matches +"]",
-      matches_array[matches],
-      escape(regexp.exec(pattern)[matches]) );
-  }
-
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/properties-001.binjs b/js/src/jsapi-tests/binast/parser/tester/properties-001.binjs
deleted file mode 100644
index f520e8914f2bbe7043267ff27b287004f5abc42f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23094
zcmeHPO>Y}T7~b;zQE@;>d>pDAD%20+B!~#La#A&EKtXLlb=m{5izfEO-FCfecGqpv
zj}xjmAP$`P0f++^_#xauf;%S;`~=>2cg8#Rj<c`VW5-{Yy4l%zXXcq_o|$>)oh^o~
zro-2ZcR8!Af8l#|pEa!KEX&&WYDd<__ReRe%cZK<<W_MhdZ*~vLAd_xwq?BuZxz+-
zx0!FVeTQG;RfqX3v^_U6RZIR3toycG>$LSR*g2JD%kv{scFnR~J8T<Ji{GwsH?$9I
z?nmZa)<`NHgud<8*I$NWN?V(|+n?_gm&CK;k}#s$Dn;*Kw?pnTCo=bdIjxkvcfj6F
zUf()wE;W4s$q#KFEG{pv6z&D-0%So;5rjoi{_|kt0rS(ZtM$nV?O$MfgwWpJx>+&>
z?MqPgt<4)(zxptZ%;<sqZ*)Mu2u1B~?_S?Zw_9Zdk)db68VqYe%?0mZA?EACwi|@Z
zt@5$p=^vwm_f;rr<JPA;w{C1~-82F*7z91)R+9lZ3UcD}AOQI+g)HO^khN$O^Y(MC
z{%tbHNwP*cs_=*>s-^OWpq2;~ki-vnc@Q4cLSa_5p44NICg40In!x;e3xNo<O(!(w
z4X|~!R*Tuc$pRhmBVGO;1QW%lV`|&s50fStfEEjgtI``+6;I-5e*w&%yK?z_+Nf%5
z!}A=@TsgZzo;IkGwWE7|2fEd_tH)JF%$Krm@>i{6(m4~yw?N0Ym>Uul90yGn!eYd=
z4jfib27yo=e4%h5>2>iq?%8f-QgI{ls@uM<3+Akn%jhm4J`ojrW`I?=THY(yDvwv6
zrl^Ih%6jrtM+hRfw590mbrB3}(6J~#rCrH)<%)+yyptgmlJ)w`tJgOMc!rbVUb$4c
zayB895H0LvJ9(<>F(S=$h3L!;#+Tuca^_j~vjLX94OF^wZjUWKs$4j~cc=WY9Fz~r
zZrQI~ObDjXu8};|@q|b_QmH!ogYhs+x4NtoX*=^g{K)_h(QUR@zE*j>^1<rUz4F3h
z1?Sj=Y=VNgYN(r$zN``n^dk}^AFaA_WpQ`rS@@#?7M?~Hf)-v~{Bn8mQYF22i1=ql
z1ACV>H0EV-sEcw$de1!belWm1^lu(MIePLaC3)xxuiIugrzvG<WFxX?&N)0|lE)ro
zf82KlIERb>a%*{cbtOeQ)Hy?()0ILX9aNwn|J$5x$RgE=WzzfmtpT>77q)!((W;hf
zbu;>wE`z|deAF2ZKWBa}HO92%OCRf*W@h&gF|DJFp)qYZ{2V8yVG9R4l*8@_`#z8R
zq~%sI9zzYyKuZu$(S%TqM$kLnV^~W2i%w|?QjQb0&lAS$*hnygJ)t@K?z6RMCBqF)
ztV_mVC0fatT!>bjG`ivpPK9T~@v8Te<2LM<<Aa7OE0%?O!H&s${7&v(hbqEJF&=v3
zIdK|`=$QC-*sb7(rK2$$w#)pZq)E{m7<|D(2w-yfL1_7Q{caM!r1%>ZFQkexq01;E
zg6OWqaFGJa%fi~4h!iP6WK-ycM@=3jq~XvFz<hh1yzn6aYimi(RQ#@aq0%4trni5O
zS3^q#Y#p`N-fAvGs1wX&>$zI5e67isi%@yo@$?E~P^(Qag~29mrX^h|$t8dLw3>~s
zG(3?(1~jSqdn%>seIQIB^kQMt%aur^v1u+@(Wy9LsJ;ToOW<kP<`bZNxd;syd)cBP
zJOk48&s0j+MU<|p=Z1c(3JXK6ctJ8O4x@D17@O-CRlji7>>J*EVw5k}G)Nd3<QY)0
zKc`Z~&c-U%Xxa|%Az@M4T)xCEpR!LU41Elkta^Pwn@@!D<s#I7>{nkTfM-Cqrr5>B
z4|!FqS(q>vEVF`zP8d3_`E(~=u4z!KY;<Qps!qe)I(^=FoQMj6*Yc~HQwZ6seR@O*
z=Uzh_ONJIexPZt)h2YN3d8hhUKoCLfIQZ$dW#+m%7E?;kMrx05dT!0elU=6X{luYw
zr#KdK@X{DuB8@h@{OcCpC6zb%RXYSFBrqp-#>#7Jn4#l_j*R_6$;!T_n7>MLXtaO(
zzi^+N86_v2*dE^39b6>5sSB($U;i0!9ZsJRV%yuk{&VNkLqhhnO6k0(iP+6O4rAvg
z#l>_32irugz}{F&cevWoM4`|qsg5>-)k|k_#2TFuk3wu8zz!2d5PvsCd$W>g2s=<y
zB?*-LRXcRVfMtZ<5Zh@KFin*tQ1bT#0n3OoItjouRgyr--wwd~`c}rcFNo*Ih3oNW
zsit@vSa-aArVGpyv{u<ooDemttXdg&*5fuX3l+jPa8g(LZ%w7kBU<U(b=UK`KKN3n
z=0v`0Ce=ye`)j~=3Nlm7`8TJM^VqS4M#~9p$9Bzn`ZUX;NuoRkg%W_7Gahi7q%iY{
z@eT{ZZMVh`)7#7eL|(H*nl#1}fa$?_@mOuJ`UzLuipPJ0zdF7O#A`e7oz&!mVv(ox
zJ$Mh_mHt}%zv?}S-KnyZ<nPIpn$cwR!1icz{CJZ!!<Mgw;Wx<qt^&hxSC)mNq^FZs
zr1$vxq)638Mu;Rl3QB#sR-|dZ7^>t-eUw#6ONEh$G;D@8LQbTo&m2WUm$OGa)veT(
z49dDpJngmAQ8FpxTs%c=HA6?qqs)d%9?b-!q-yRYh*YGOdJ#=2NV!-hp6br5lv0B9
kXEsGDLfv`aPbBo%^v7c}`u7TC#Y)OyoJCF@{q#cfKhR!VWdHyG

diff --git a/js/src/jsapi-tests/binast/parser/tester/properties-001.js b/js/src/jsapi-tests/binast/parser/tester/properties-001.js
deleted file mode 100644
index b0ee18e209ea..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/properties-001.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          RegExp/properties-001.js
- *  ECMA Section:       15.7.6.js
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-var SECTION = "RegExp/properties-001.js";
-var VERSION = "ECMA_2";
-var TITLE   = "Properties of RegExp Instances";
-var BUGNUMBER ="";
-
-startTest();
-
-AddRegExpCases( new RegExp, "(?:)",   false, false, false, 0 );
-AddRegExpCases( /.*/,       ".*", false, false, false, 0 );
-AddRegExpCases( /[\d]{5}/g, "[\\d]{5}", true, false, false, 0 );
-AddRegExpCases( /[\S]?$/i,  "[\\S]?$", false, true, false, 0 );
-AddRegExpCases( /^([a-z]*)[^\w\s\f\n\r]+/m,  "^([a-z]*)[^\\w\\s\\f\\n\\r]+", false, false, true, 0 );
-AddRegExpCases( /[\D]{1,5}[\ -][\d]/gi,      "[\\D]{1,5}[\\ -][\\d]", true, true, false, 0 );
-AddRegExpCases( /[a-zA-Z0-9]*/gm, "[a-zA-Z0-9]*", true, false, true, 0 );
-AddRegExpCases( /x|y|z/gim, "x|y|z", true, true, true, 0 );
-
-AddRegExpCases( /\u0051/im, "\\u0051", false, true, true, 0 );
-AddRegExpCases( /\x45/gm, "\\x45", true, false, true, 0 );
-AddRegExpCases( /\097/gi, "\\097", true, true, false, 0 );
-
-test();
-
-function AddRegExpCases( re, s, g, i, m, l ) {
-
-  AddTestCase( re + ".test == RegExp.prototype.test",
-	       true,
-	       re.test == RegExp.prototype.test );
-
-  AddTestCase( re + ".toString == RegExp.prototype.toString",
-	       true,
-	       re.toString == RegExp.prototype.toString );
-
-  AddTestCase( re + ".contructor == RegExp.prototype.constructor",
-	       true,
-	       re.constructor == RegExp.prototype.constructor );
-
-  AddTestCase( re + ".compile == RegExp.prototype.compile",
-	       true,
-	       re.compile == RegExp.prototype.compile );
-
-  AddTestCase( re + ".exec == RegExp.prototype.exec",
-	       true,
-	       re.exec == RegExp.prototype.exec );
-
-  // properties
-
-  AddTestCase( re + ".source",
-	       s,
-	       re.source );
-
-/*
- * http://bugzilla.mozilla.org/show_bug.cgi?id=225550 changed
- * the behavior of toString() and toSource() on empty regexps.
- * So branch if |s| is the empty string -
- */
-  var S = s? s : '(?:)';
-
-  AddTestCase( re + ".toString()",
-	       "/" + S +"/" + (g?"g":"") + (i?"i":"") +(m?"m":""),
-	       re.toString() );
-
-  AddTestCase( re + ".global",
-	       g,
-	       re.global );
-
-  AddTestCase( re + ".ignoreCase",
-	       i,
-	       re.ignoreCase );
-
-  AddTestCase( re + ".multiline",
-	       m,
-	       re.multiline);
-
-  AddTestCase( re + ".lastIndex",
-	       l,
-	       re.lastIndex  );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/properties-002.binjs b/js/src/jsapi-tests/binast/parser/tester/properties-002.binjs
deleted file mode 100644
index e657089d33e6b87ba8671797fa1ef9142248436d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 37649
zcmeHQOK;>v5ccwZi38%m3GIRB0!en4=V~^)ne2cDZ34<95fUp_j;Av*IQC$B_8|oS
zfFHu|;0Sjl;LM2wcZ5Wjr+Zws+i^|Lc#?Q}4{OCeUEN(>_4U`)54Ymc&|~YZBWCy4
zKM#XJXdhdTSeA7V^dDO7?)Im>Ydt3zGOM+k{HEo(QM~@|kCyc+|5XcT-?u~8KJeHr
z=6H5!$8O*!qWbCIk@b!1_p`G8=5j7n$qK?ml-svl-;E~%aPi$f^JDkWWnm)Dw~y0G
zM{(%-gY_qQF}=>_Zuhh8)~a~dS`|XDtX}f_+iuK4+e^gVv%OJ4-b-BG4jXhH3|EIC
zS5g?eEP7{c?aIp6QLzA7&}yQ>mMH&GF5{jZ7JrWGqp8~8x$Fh1cE7XJo0n>z;8pKz
zZf)GXQq;`i75UHN6!|zWYPY+4yHjj8wg{qyzRaa@w-%;(F*v+9w%3bYKZ<SNVQ0cl
z|6H7UpXNoi_deO)+iG`q=AvS-)XP`iy?XVdqPQ6>m4iyiqKJcNFScWL%)u@3Wj1-Q
zM8Qql^U|zI4u`*DDRyBiB48#cjGIar@3JU9p@l*$mY&vQswQmkRu6n=a4Nt8m;^Jn
zV?Gpk>@c=McW{)B1OiO~?XIV_#I+%`^)a41WOpy80%QkbL1Pb+g98kfLp$apg>M~t
z_8^*ci>ML^z2j`$NQI)h4$`->sQeQbohsxkX!KTqdk7Q}9DL23*b;-`!-*<z8|Kyz
z1VLcDo*l(qzt0|&s~T4?=RnXZ;Xrmc7=cx$J&g0!s*Ei=J}Oop7f(<IxX>`TUz8&)
zF5x9V@LxfrGt_RIH#~G5Y4hM^8A8PWhJQDeWQvygMw(d=Bw4Ne6E|DaA#^*LpylVe
z9ya>@F-UCMk!plZ6#XmLGK?J=MH333ffSJ+6v0Vq8*8~81Rk^f((b>Y?Dt$QFc3M3
zAQV#dbKNd9ep;KKj^{P9Z{-sklBT<!IwMd_LU6ODWCQ@jckW+Gffx}2H+?G=n1AAu
z&z3@K^({`!D!PFHo*IOp?fQ23Fje$4RP>#+H*v2S>^dEeakG?T;NGF}m47&)7rDxw
zSZHcLQ!#g4OCh)dnW#7%uVx@B6;4YeDh14xO2<l`jd2uM?R;pBfe#U0CfMZJo}$zZ
zAI;@YSJQD&<+oGvr>B5FUHWeA?GM+!PX!|qb)3GH#pRzEHZ-xhCRSQEiK^%ef|nW+
zWvNz|U@pDXfg0>nhD1&1VFK$%vyrF@rzMgoHE>F3#N9U=ld6i{<fK!Hmtj&(VN&J6
zUTlQ=7}8uO^=^^cV3keDq#)4$)k-Q-a44YR1J|&qvQeIgqAL2qu&7C_ADbsZEla|p
z)=em?zb^Mckwa0#*;rJC(-K)!9yAI3iOO*1vCc*<%dn}Yu&KJSq`7SBy_EW>yjX)x
z-D#&H1)CbrhQuF}S)nXXKJhTQTmh+yP9SgwjewNy!b+{txh04mm1C831o@nUL+Exg
z!Q{x4<>%S9`BXT^6qE%clS;?Apv;spoH_qox95y|&bGVf1ovz%3wS>rvQ>^@SO6Rj
zs@1c2K&7G+2#{=80PiL_r9Q7K>Cyq^)35+Ikx=0rh6Su=c2U=gRZBq9%Qw1|Y|Wp8
zm)5kKf-r7~4fP)w79e625J4<CL{+P2aiFW{1VV3Wuz*>1_`a1|4R!)Ee=$3JwGM2;
z;({|iuzB)%GlDCSV-#P`wyaX&v`u9v1~%ly5d>R2uk#TM>SjL*nqUgn^kF*wsitfu
zcCv`rNku0R+;hRK37vhz4rW->`Dab&5V!<{{1bP%=2EAwr4U?UQLL%LX$@-<7fzu`
zsez5WD<z9Er*&mRd6)=$IE^)_V57M!PKv97u*wW;S_EsV=mf%0p~0GT2d-KJZ%Yu;
zzE!&4HV>)T5zjF@nQ`Aqg>y8Oof!8#of*gp?%6;V0Czm{#g5BsCU}C_{i2tgh`mq`
z52$TChnqS$<vw8H$;L%&*4D-sclS4L?<uY$%@3UN?}iMZ|M6u|ooi2sX4TXYv`L0t
z+t8Dv8L;5)%ydgDMC0SBFKGRE<U4RpH@>kOB=Kvuhx`Wb<EZ=^aO~s+C?N;ce$w<h
zST_yX%#a5?p|}!x%GQDu#m%l7QWV$0X-H9=<kgVk6}2n217TrpFL1s|@3?|~Ir%R6
zo2!=fEdNzz2iMt~ctI8Uy`FFjGTiD})I|aozwmWVSnA9)riO)Lg3D1nf;b4lE#fNx
zFBh+07Z-@H@H>9vAbvPxNkUN_DmIWiVgPQExkk3+!Y$2{ilBh&izby6trI%08qcxM
z>5aL1xd@d9)-(=b7R>@zn;;4zY!gc>N>dpbL29*jrQrJZJLV_=*o~k7Gw=JMLDe6P
zgsRuL9#`UE3~Xw+5{WcxGLV&g_J!b7aJi6FJWaQH0Hl|T(10@!TQm(X0d)P<Na%VC
zpvwvTI2<|rD;G-e;>kQ>mZZ~s%-|OlzhKmyTD^K;q?fA+5Jpz=5}?>`jYP3m#wd0?
zbUjuAVM&^SFAn7JQMx(J7~$J?PB4XP^*~53R}-L%q~Ilhtp<m<*aPM$F$)q5V9gh>
zAP7U(s~+y?<!S<2Rcm(%pz1k3wl*&s4+GIk6pTVgu?iu3b;>v^Vcn}XUz!sEg78h1
zRvH}6eVIpxnrG`UUz~(<-*}Ta25T-DffJOR=dNK1Z)ru2WAmjS6O=dDKyR!TJA6LC
zrh>`Y>ZOvn8Tfq{HdxsBo4nwqu$XGu9(*;Hf7~~TJF#y^@Qq*jiA0TdR%|&SwvX42
zS3+>T$#s>uIz&Oxfr=_gMad_YykLb@?5-fTbFK<gR7omIK2K3$6&p!TLt%<4Nkz$L
zMqyKZAN#Cx9<w5}-b(h}G??iRyx_oA?Y$Cajjfw7b1gw-Eaj|QJuv+$tu&bFzu3rG
zZNl{3fgglSy}wR{=0tl}465hJ-k;(2PSH$*ZT^Ku+B|gZ%JImHUC;IB8_ZGAqVr_(
zu<wtc7-R8VPr;CdHs3H}dF(K@LU(YK&LYJ$?u5t&0YWJOIwJK?EZ(!Dxa;@XgW@!E
z29Q@!r1NI+1jUqCym*Zp-0p6F+Pl_sxOs3RfjND$6J|1_SE-tsr=mD8n6apRI~*S_
zVf}6Um__3Crag>Dp?oK6mN5Aj`O3xXP+eiVC!HJ-KLP5X+?p@a0ZiI^pKR}KwL3eh
z&7oAqDL0V{>nPdd@gf08X#SiXO3Lql7D*7h?{zkJyPs_rDgp<`cDuW`JB1X;wcpw4
zsd7PDVclPpR=V3pq!$;7L_%(oAl|BYH_CummUvr6Tu>(Dwc>5br3xqy8rx7F#c&}~
zA>cL)?ibWrvbkL3%A=lm4LXCfy9H^AbAQ<^=tJn)1oUywYy$dTRW<>A6(XB}E{e`3
zpgS6~3FsQ4Yy!FgKqP=wpu<t(t!mvxB!PmX*bZYjHB(R+XcFR}g@lr*#`rW|^8XE<
T75YblL=^%+9rGTkM$-QQ*;1fY

diff --git a/js/src/jsapi-tests/binast/parser/tester/properties-002.js b/js/src/jsapi-tests/binast/parser/tester/properties-002.js
deleted file mode 100644
index 330fe4bd54da..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/properties-002.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          RegExp/properties-002.js
- *  ECMA Section:       15.7.6.js
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-//-----------------------------------------------------------------------------
-var SECTION = "RegExp/properties-002.js";
-var VERSION = "ECMA_2";
-var TITLE   = "Properties of RegExp Instances";
-var BUGNUMBER ="124339";
-
-startTest();
-
-re_1 = /\cA?/g;
-re_1.lastIndex = Math.pow(2,31);
-AddRegExpCases( re_1, "\\cA?", true, false, false, Math.pow(2,31) );
-
-re_2 = /\w*/i;
-re_2.lastIndex = Math.pow(2,32) -1;
-AddRegExpCases( re_2, "\\w*", false, true, false, Math.pow(2,32)-1 );
-
-re_3 = /\*{0,80}/m;
-re_3.lastIndex = Math.pow(2,31) -1;
-AddRegExpCases( re_3, "\\*{0,80}", false, false, true, Math.pow(2,31) -1 );
-
-re_4 = /^./gim;
-re_4.lastIndex = Math.pow(2,30) -1;
-AddRegExpCases( re_4, "^.", true, true, true, Math.pow(2,30) -1 );
-
-re_5 = /\B/;
-re_5.lastIndex = Math.pow(2,30);
-AddRegExpCases( re_5, "\\B", false, false, false, Math.pow(2,30) );
-
-/*
- * Brendan: "need to test cases Math.pow(2,32) and greater to see
- * whether they round-trip." Reason: thanks to the work done in
- * http://bugzilla.mozilla.org/show_bug.cgi?id=124339, lastIndex
- * is now stored as a double instead of a uint32_t (unsigned integer).
- *
- * Note 2^32 -1 is the upper bound for uint32's, but doubles can go
- * all the way up to Number.MAX_VALUE. So that's why we need cases
- * between those two numbers.
- *
- */
-re_6 = /\B/;
-re_6.lastIndex = Math.pow(2,32);
-AddRegExpCases( re_6, "\\B", false, false, false, Math.pow(2,32) );
-
-re_7 = /\B/;
-re_7.lastIndex = Math.pow(2,32) + 1;
-AddRegExpCases( re_7, "\\B", false, false, false, Math.pow(2,32) + 1 );
-
-re_8 = /\B/;
-re_8.lastIndex = Math.pow(2,32) * 2;
-AddRegExpCases( re_8, "\\B", false, false, false, Math.pow(2,32) * 2 );
-
-re_9 = /\B/;
-re_9.lastIndex = Math.pow(2,40);
-AddRegExpCases( re_9, "\\B", false, false, false, Math.pow(2,40) );
-
-re_10 = /\B/;
-re_10.lastIndex = Number.MAX_VALUE;
-AddRegExpCases( re_10, "\\B", false, false, false, Number.MAX_VALUE );
-
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-
-
-function AddRegExpCases( re, s, g, i, m, l ){
-
-  AddTestCase( re + ".test == RegExp.prototype.test",
-	       true,
-	       re.test == RegExp.prototype.test );
-
-  AddTestCase( re + ".toString == RegExp.prototype.toString",
-	       true,
-	       re.toString == RegExp.prototype.toString );
-
-  AddTestCase( re + ".contructor == RegExp.prototype.constructor",
-	       true,
-	       re.constructor == RegExp.prototype.constructor );
-
-  AddTestCase( re + ".compile == RegExp.prototype.compile",
-	       true,
-	       re.compile == RegExp.prototype.compile );
-
-  AddTestCase( re + ".exec == RegExp.prototype.exec",
-	       true,
-	       re.exec == RegExp.prototype.exec );
-
-  // properties
-
-  AddTestCase( re + ".source",
-	       s,
-	       re.source );
-
-  AddTestCase( re + ".toString()",
-	       "/" + s +"/" + (g?"g":"") + (i?"i":"") +(m?"m":""),
-	       re.toString() );
-
-  AddTestCase( re + ".global",
-	       g,
-	       re.global );
-
-  AddTestCase( re + ".ignoreCase",
-	       i,
-	       re.ignoreCase );
-
-  AddTestCase( re + ".multiline",
-	       m,
-	       re.multiline);
-
-  AddTestCase( re + ".lastIndex",
-	       l,
-	       re.lastIndex  );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.binjs b/js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.binjs
deleted file mode 100644
index d598f086e8c883009bde180203ff4079b5dbd298..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14141
zcmeHO&2QX96nCHn3I~ut0)dcRai9g-6vBnD4eF*_8q}t!Nqea(<nB&3CXQ{!&c~|o
zKX60h#$UjZKZG0N#)Ts%P8@j8JL7rwjP0?ryD1+zWaS;td-HztzGt?V9>f7#>+Ldc
zwDviV#@yR?o^l-LQ8b!3{f*7fwpO=>QOum)a`sLy@RM{cUU8fk;jJE>e&6H1_b6c3
z*)Z_9m-<ndks7Jz#M$%1QIXc~Kxe6mR>U(>{>bq|Kg|hH_8TJ>rv8r4ct$St_SK@3
zl>6a$?O9;6HCW%?xU<<?7T@)j1rbVXD|`QzpEB+R8M#9*IMC?50`xc=v*Y*@3lH|;
z<&<5za^-!UxMZ@N!PgVKpN9E|9@k%|Yv~B<FF<>Nu-+fs-I^7w&%n|L>$k6c@qv!a
z;(`2YaX_90R@)ofw+6c0R3j|4^BtgemyJ0~5->$~n<c5c6LEJSR23}31(S~%Pkol?
zEEf;;uZx5F9I)!&`*ic(?f&4dE_(;KQEOLLKKk&=icanXP!5h`v4dMFxR-r!a+zI&
z(-Gerz2UkS1ZrwFV+da{<-@3m7QPb!OHz-gs7Eyt3bK^CTE|I5z^Eid@c0<KZI~uT
z(Jh2|31}U0aPK!E?lHa{-HOJ#Oqs9#9-OG=NBe&0@rjblK~IjB<fRa)0=APn+#m0%
zKqVYL5_(rLq9DzIqy-SOj)*9rs|3vT-k=p0tE=&cIpt|U%^wYnItI|Qrj0MtnoVAU
zs5N8(o9u|F8%{WxIit6N-~cqMcPj^VVM)uG#bVBM*{Mm+8go?VYn*!%oox=a;J>&$
z@!Vn|H-wIPLjF8Jjsa_qs(vHl8=(qpXMiIK0F`wVmD<7;qQx6bwF8v~N7E0Y;hqww
zxfc8lTnWBas0Ed;QlwA>R-d(8gH&}KVrW+c+QinY%CaajeeMnS7^R5|jvjr<hN%-z
zQ{YM0Tp|-o@s*ZL`CpGtkGF+xVJrw(I8JwUF{C*1lZtgG1CZ=grlfgAkpr5AkMjVz
zrY2Jgq6nE}<9loZH8Cx=DN74!o&#y*p6c?nBvxT|)o9FC7K|7f81;h8UB4TAhQ+Ql
z04V_#aW8)q+a;gr?kT-%<zh;O5vrtBRWVl^ZitE&_`U#gc%zY2KV4rWgqbnE2HT+-
zqXn0WU8LLcFVIDENg-6TAS>yQ0{*$flUU2osyPVfw8si{#k6h8Mw`&MRE2G}me=7u
zd{_1j%iCaHFy%VfkJE{=6QHFnw(xo$rqvu|+7P~r3A43nStuSlb<E?|y~L2TXY&65
z{4n_{<RKQMtxMoJROptSythCs?p}36cH~Yo*$WpxcA5AlD=F{`-RS9_TJl;4Uf3nP
z;Kr^Wy4=0!K6cpyc6pj1JOrkXT^V0j<M-SwKCSWx@k93;Sd@5AUyI2YHnC~$4`rhr
zSl6oMTz#-XuPA&Lnq-wnS=eef<0}O=G}n{02+)|)*3G^f2jLKpe&{I>cE{l8W>&RO
zQ&C5^t#vu`BLIik72HV2Tw_k<OgA&w-t`kD2S`|NYZm%$opaC)nI&E6QsxkvP4Gx|
zR2-AKqv3$M$8ZR`pUh0_8_~`@%Xh%LOJ;{_#v@bRZ&PV4Hm{~+F>O=ZZo|(n8=`!<
zD{Fc3{1eEmnR=PlY&yIMZ|o(8Q#J~3KZ*k8g>~Uj>Y%_<oGYM%J#0Ei-q=ye98N&r
z?hK<aVP75Ksgf7Kad!x3OnD40tgYjb2P)(FioQ%KWX&>RM8FxOCb~XnX7VQtYg>PM
z2_70v3jX=BzFfKo7UoxN$0f~?kCgtsx>GGUZrt&Y9eMVaD~V7+WPBL;qg;ZeLIkzQ
z^yG@<CtX?VFn<2Y595}*+1hQOUKcuOOZgoa32pv4%|;7Icd2RHdhs*he>C$`$%*n)
z_)<gBd3sLdZE#qc6mxJQ{|u6r_2nX69o1{g<zZli5;yl^n(0uQ?c;TBc!G>6B_alh
z+BIzu-Sm>{K8N#)0hqS*z14<ISJ~07PPLhH1g3=%r4U0b9Oh{@bLL>CmP(5SvF!Y=
z8g!Rxg9V7qIRqtWxkkJz>3RW&3pW!tzb!fXWM-B|*JLTAIkXC!ESqY9K1ro9Yb~eJ
z^0F+Q(^Wl?{?&>Ex?3k;t}S}h#WA*OhtR5Rs&_ip6zCQ&DaD~EcSFQNU)soJLC&UE
zNaZT!&xk-F$Af41`vc5L%qo9UVwUSe^I$5W*GN;6Eka>oTHDO=+Zkq#PgHyEf1`w7
zAhZql|3RaK0GdRha(;DoZW)^20M8*$bPOT7npe)ddl_j-0)t@1Noh@fJpHlCn=m&k
z(~{}0Krp>2MgDC4dNy6~R3t4woz*nd3Rt<+LbUG1=>eAq%#E;3K+0EvraW}U!mV_B
zQ2<(TmtKrwq$^*)6GO&qU5p{S(r+Qei1{p745CNC?4yRG_EQxxwX(r3#!-hzf1EHh
z<vU{76z9c|o@Nt9<gOo~RF24E$b99AP$Tzu2(_{+5knO>{Rug8T}6D0vS1Rde1#am
lZOjrCZKUB2{?w&p|Gx$r$Utgho!ZnYN7D{hh7+@Y_!|?M<SYOH

diff --git a/js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.js b/js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.js
deleted file mode 100644
index d1f3f213e59f..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/regexp-enumerate-001.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          regexp-enumerate-001.js
-   ECMA V2 Section:
-   Description:        Regression Test.
-
-   If instance Native Object have properties that are enumerable,
-   JavaScript enumerated through the properties twice. This only
-   happened if objects had been instantiated, but their properties
-   had not been enumerated.  ie, the object inherited properties
-   from its prototype that are enumerated.
-
-   In the core JavaScript, this is only a problem with RegExp
-   objects, since the inherited properties of most core JavaScript
-   objects are not enumerated.
-
-   Author:             christine@netscape.com, pschwartau@netscape.com
-   Date:               12 November 1997
-   Modified:           14 July 2002
-   Reason:             See http://bugzilla.mozilla.org/show_bug.cgi?id=155291
-   ECMA-262 Ed.3  Sections 15.10.7.1 through 15.10.7.5
-   RegExp properties should be DontEnum
-   *
-   */
-//    onerror = err;
-
-var SECTION = "regexp-enumerate-001";
-var VERSION = "ECMA_2";
-var TITLE   = "Regression Test for Enumerating Properties";
-
-var BUGNUMBER="339403";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-/*
- *  This test expects RegExp instances to have four enumerated properties:
- *  source, global, ignoreCase, and lastIndex
- *
- *  99.01.25:  now they also have a multiLine instance property.
- *
- */
-
-
-var r = new RegExp();
-
-var e = new Array();
-
-var t = new TestRegExp();
-
-for ( p in r ) { e[e.length] = { property:p, value:r[p] }; t.addProperty( p, r[p]) };
-
-new TestCase( SECTION,
-	      "r = new RegExp(); e = new Array(); "+
-	      "for ( p in r ) { e[e.length] = { property:p, value:r[p] }; e.length",
-	      0,
-	      e.length );
-
-test();
-
-function TestRegExp() {
-  this.addProperty = addProperty;
-}
-function addProperty(name, value) {
-  var pass = false;
-
-  if ( eval("this."+name) != void 0 ) {
-    pass = true;
-  } else {
-    eval( "this."+ name+" = "+ false );
-  }
-
-  new TestCase( SECTION,
-		"Property: " + name +" already enumerated?",
-		false,
-		pass );
-
-  if ( gTestcases[ gTestcases.length-1].passed == false ) {
-    gTestcases[gTestcases.length-1].reason = "property already enumerated";
-
-  }
-
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.binjs b/js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.binjs
deleted file mode 100644
index ed112879b60626265f2fca3a93b2151f56d07e00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4820
zcmeHLO>fgM820!^oOb4t0~aJlH%<s;mA0;jPGg|8Ox%#$xT%M07uzY_U*o56;2-c4
zka(RqvDc(qvW-fUI8;><`|<1Neclf{)X9vIb~qt8YJZd>mUxQpA%un^I!F7x<HP>D
z{z%LS3R~%zkWr=EpEnVD3Zp`Q`YDza4;eWiBZei`RPYoka?c8Vr98Tb^#^b^uEG*B
zg`yFnoazF=U%nR+uIZQ(nZj{Abw(>KDUaKaVVQonGw6Ld4qNtJ*s>r#RzDqoL^Y9^
zrEqi1k`mraz&j!fI>M|Y_}r{7xN1oflf`U{Wz*Hx_V&)}GgV$OU%8cX8d`(y1Lz#f
z@^Ih4YjXV)u-C}-Y4@amTU<W^)4QGbdtcs^nOQ%Pzt>0PLs)9i8yt1Z`}P%4Q?kzi
z?S#Y$L}<`m%p_3?G#gl{->yg<eqUovrVt;g`XD&$x|M<4!Hl`7=?n-kMqK#$`>ql8
zCQ~Vmr5+Ha%Pbb^v9Lb6v!l@#_JGxxn+-bvWC9y9DP%^-W{iwAk~E&UWM<>v#OJQF
z(zm9@Ud`+ZFZw7om0|*JhLs|bGiI5p{Mm<hJ8neTlGjZQvR=nBP7IZ*QY|$&c?MW}
zQDnT|!HSf(ljh$aK%H^Xg_>5AtG6(()e6)^BrFPsB*4K)OpVd60xmQ>LQP0xjuhGt
zY<(!3<Fi@QfXkfa!~H{+jR~2x<sGF2AHslA@u}gy6_U19Gne4<qusT?`Mavj7a+^)
zD)S&yraqq$F%HD=jEuCWQ}aG>AF@`BL;;k9v0zMmhqeiX$}57#XZE&LDtJUqFNOU=
zU?|WK!w56z%Q#dNG=g@Ed`nDW$@^2^tbNL{Ja=xdn}SX9*<F!?KV1e1b!|)+D9>1h
zQ7Y>{O^9TkC_-f8Lb|y@G*sxlfmbpE3#*EzIFBx$)dsL*Oj%X^xF+0{<tS^UbEETr
ze>EqDyH%YwZ;%6avK(Nmlc`6N=tS}W^E@L!3eXc0r0D?KLtv?_1)s(S8d&8t9}Z4W
z{{tSpRCQ=wRsJl0K8+2$l2wATldEE;0c;&-H-KA}KXNPAR`iV%ZgvQHU~+%0^M~D(
z?^ypL#+Z^l!zDm=*FvIWxb1NLahe8y!MG>z%kLFdcEReB%Mtsns<*SBDvqZfVCe?H
Uep?c?eY@hIX1`W2Seftt0uneaCjbBd

diff --git a/js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.js b/js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.js
deleted file mode 100644
index cb2448d1ec59..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/regexp-literals-001.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          LexicalConventions/regexp-literals-001.js
- *  ECMA Section:       7.8.5
- *  Description:
- *
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "LexicalConventions/regexp-literals-001.js";
-var VERSION = "ECMA_2";
-var TITLE   = "Regular Expression Literals";
-
-startTest();
-
-// Regular Expression Literals may not be empty; // should be regarded
-// as a comment, not a RegExp literal.
-
-s = //;
-
-  "passed";
-
-AddTestCase(
-  "// should be a comment, not a regular expression literal",
-  "passed",
-  String(s));
-
-AddTestCase(
-  "// typeof object should be type of object declared on following line",
-  "passed",
-  (typeof s) == "string" ? "passed" : "failed" );
-
-AddTestCase(
-  "// should not return an object of the type RegExp",
-  "passed",
-  (typeof s == "object") ? "failed" : "passed" );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.binjs b/js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.binjs
deleted file mode 100644
index a3ccf7cc93a6876e15a53bf9977b885a4db8373d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2735
zcmcgu&2AeZ5T^fskI>6rTQ%7z$7*HCv3+pmxK-B5wZdM!A;qu)Y}qf?hv~h?K0>4p
zEH<R9)omU52n^rMe0(!Qrk52Xo$Q9-qVq+HQsM=Aj1ZcNVuLP*<4^g=d?qS_veepS
zj4Ivv@Cu>lV3mc}ud$?f%1EEg7?xO5!7Wtb*9v{3ytt2b2RM)Zh9#thq6MOy>K#Dn
zepnE$>6{X2;W%FSpp}-Cmz@{jCLi=B!_VU^b$eOrKtinC+K;Fv5;F_8!fYAgy#u@v
zS<@M2J;7JTzu+pBq$KO=gw@y8$=TWY>8*-AZat@#)650*1VC3<#^zyw|H<_az&;|^
z*MqD4p}0138}u%_U(aJ^j!)#T;}Q7`Tup|P(ICz{R76Y3z6G=^QZAuFlfk-@L@Cg0
z;-vntBK7#W#+odkKCJqnIGo?cLhfP4{8f7c3XBn7eqr7%${v~(QW{G=Axg(A?$qO8
zLv$a<At{)K>Qcb6TpA)&W9luEc>`G8qA;oSup)6fwwZhfm!^^2YtStv(uaF#nsgKB
zV^$~ry%N{c;K)3o$s@r$5z|{T(}|cTdQ*`E^aZ?~#-WAGwhZPe1f%7$A<q!(-z3u)
z+P|xvD|G^>k}&C{-ZZ|=1?5<7f{TV<V~;gVCr0KPNm}0c;pF=HYcQi6^v7pJ%snY#
z{550Sd1K^KVGYBFqdCK+*NTHQ2J818%5B3gMD7-ibFGEGOrNd8iJ`WY5{BLa@+ClO
zk=vQNA9M@urr~bsoP|F9BOFqdW)L3MSgbf(^%R#>m_+!wGNIIK80_``i4<e_!T6`Q
zW&IQE44d1(!ro@!M9}n@?x^uE<jxvKPH-!l>h5e$n{}r#SMFesI_f{sA1e3_x(R$!

diff --git a/js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.js b/js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.js
deleted file mode 100644
index 5b256dd22d9f..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/regexp-literals-002.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          LexicalConventions/regexp-literals-002.js
- *  ECMA Section:       7.8.5
- *  Description:        Based on ECMA 2 Draft 8 October 1999
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-var SECTION = "LexicalConventions/regexp-literals-002.js";
-var VERSION = "ECMA_2";
-var TITLE   = "Regular Expression Literals";
-
-startTest();
-
-// A regular expression literal represents an object of type RegExp.
-
-AddTestCase(
-  "// A regular expression literal represents an object of type RegExp.",
-  "true",
-  (/x*/ instanceof RegExp).toString() );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/regress-001.binjs b/js/src/jsapi-tests/binast/parser/tester/regress-001.binjs
deleted file mode 100644
index c013b642ee7c044cfbd4fb47d044306be14c3461..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7756
zcmds6O^?$?7&e7|K-E?~bMc`9R;U|5s*sAc)g}bAXg8qEE|;oWP3&36tYcf_3EGtq
zcYX+ef(!qHd(|sPj=b-9oEgXC?BruZ+e@r?W}bQ9=lz_q$H!Srx4a=G!PYaDhK!7y
zuN=o2q`{ff-swH*|K9i0j5=OR%<<wV=Ue|=cbxBFmZvX&PFO?+F?~q=m@vYlG!amN
z`ky-|Q4&<K{sx>&=V7HxKt+KQB@v$h=-clEG~v;4M45m~$VdsDa~37x*0-=tzuP(3
zdD`<@@}1X`AUalG%-@YTWh54GFG)PE;r$GF`!wvHW<bvAuXpa;-F%VPk;@%gf;&%c
zd>IzMB&<GN7i2+BKLGX`Iep&U@2`r}Z$R{JXK(xHUY(is6ZvU<M1Boh9qb(JcI$fU
z9%1R4HvsKP-(@tUr<qF<f0$wjxM||jQO3{Q5#j#O9gM^JcI&5kjsAKSh-n`_?j7#6
zyZd$B7ohqIAl|$C+x<G&5=25yVKmPnhxR$)bOgCgL^N1azBeYp4vAy6RIKpf6;-KA
zSI{D5B3(Hrj33aP&(Ki9>gY<2WmLdoBvl|R93v6AQFRMtegv%TAShCHhvd|dtVND~
z54)mSEA?%PTWi4{rd&}W%2+yhL4EFI3<@jbXGV1jA<Ghkn`MMUJxZM8n1qS~Sxrz{
z^6J$<nMe-6d%%}}jK$7^I7FwX)UN}TE-q->gK4$0W0|nba>|lf?xMSwCGJlE+(Kqr
zo2bF9n>RP=TIjev@G%zoCG)6HrTC+uj`Q&kBbVEZku%NOxSGZye3i-8!_^dZCJL3H
z%S0&ZxLlG!_u_Nsmq+8o$0k$nHxUV%#0>h+QQq9d>h`v9f9t&Q0JuOADtW_V18jPV
zQa#%@EugLe6h!;cir`SPm?j|~E-l#)042H(njaC2lRBdGS=~JCIQ37IdtxG-eKy$z
zYvHVl4OZjn)+yh@PTzxwP>ZmvVkN3`A+kgdP6>EWs3_Bp62kN>gEO#{5Dw?0m>zS7
zMd45#lVtYCK)tOts<6CzNXz_;oZfPkRHi&-LFajHZ-TXy5L+O3W3wp=OvsCsd<!*K
zm?&mN_WxNYi@NwIWh&#~xlCL-V1;tVSpe;La|+UfYQe+%JJ=9IwG#8wSgX4bktun0
z1Wq+YAl;;CEq!J36p3rDTaINCnx_QUxwnWVybZEa{=%Z!q9V?zlTA>UhSH%Ag<GpC
zSsYW!l2RVLCN`G^1#|c9hKjPR0ZdZP-3z>d;H`y{(ozLEPNH)it=HcRyoJv4KiUf{
z6W|U0bpeo;{lLG!V?i%*H~v(au?(j2sfYeW1ga&I7<GTyN!ez^KcS0Uq*&;;`aC?d
zwwSDNq57?`YqV0Vp~W(t?zAsV;0%)jQ&Lnub%)izN}&f8|Di!DE&^!KgHJzGw=FKr
z6NNxlF0&d%=Th!Dc^0p~qzGSf?{ln%*|5O^#p@2q_?Q{3@)}Hnu~#;Wv+h}>;Tn(4
za=hVsUo(5{1E3r;e1Fka)jn~_F}&@m-i*otQzs^eW~3W!@$?0b9BR0bm!nO`U^$G^
VPF=JW&Mkg_fl)n38o4&d_h&BM%CG<c

diff --git a/js/src/jsapi-tests/binast/parser/tester/regress-001.js b/js/src/jsapi-tests/binast/parser/tester/regress-001.js
deleted file mode 100644
index 9282cd806175..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/regress-001.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          RegExp/regress-001.js
- *  ECMA Section:       N/A
- *  Description:        Regression test case:
- *  JS regexp anchoring on empty match bug
- *  http://bugzilla.mozilla.org/show_bug.cgi?id=2157
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-var SECTION = "RegExp/hex-001.js";
-var VERSION = "ECMA_2";
-var TITLE   = "JS regexp anchoring on empty match bug";
-var BUGNUMBER = "2157";
-
-startTest();
-
-AddRegExpCases( /a||b/.exec(''),
-		"/a||b/.exec('')",
-		1,
-		[''] );
-
-test();
-
-function AddRegExpCases( regexp, str_regexp, length, matches_array ) {
-
-  AddTestCase(
-    "( " + str_regexp + " ).length",
-    regexp.length,
-    regexp.length );
-
-
-  for ( var matches = 0; matches < matches_array.length; matches++ ) {
-    AddTestCase(
-      "( " + str_regexp + " )[" + matches +"]",
-      matches_array[matches],
-      regexp[matches] );
-  }
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/regress-7635.binjs b/js/src/jsapi-tests/binast/parser/tester/regress-7635.binjs
deleted file mode 100644
index 87be12f962e36b289af66c076bbeb7844789fb14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5244
zcmd^D-EPw`6b`@R_l75kKtkIMl|X>RvPx^$p`opVwc9Q78n-jc;>vM13gQvC;i-5A
zE_ezafaA=LPv@jfyQ*U1DvEzTpY!?rI*@~YM61COC1Lfw;5|W3yz8Fl9rAGK)wY`N
zT5nn%-ltwrN!J7sOJw!?BhPyXs{*|JfCxqoBf3F55fMZ(9;Z;D{ZG7O7Kfu)zX9jk
zBrGmcC>DAwW-<f7$8Uu+maNODNa12~VuenmU~#Xy1jn=*_4d|oGpOjXprS!ARx4e<
z%_J2hO5sjPG;r|l0UnDJN#YLWT^G_oS5ndfec}z+bxMT097`}GnZE#gfn**u_FD5I
z^EQaysPC+QeC{%{cq0ESj>ubZRC}wv-Ej5B7E#hB9|PJR?FpJB;DElQiS)Z%__aar
z3yUJ+KY9J?#Y^|7#Z$aMTfGaU)b`&t_jhWIJy-V`Xub)Eb0@O#xv%f7C5fab5YSR@
zrrCII<g1e?vRl&~9T=iEUSS1G#7RXLL^UDXU_CBfnW<=4jJ`RDJ1X+yB%lHwMDD_r
zg7=q@PQh(*?#hL6Y7y@okFuDT%|^DMYzIeVRF6{^W0u`xuWD4j3Aels4&95DO;`X=
zaRJ#GvMprDh<2qXSntRtNS$(2N?5amVXaFLeg}5TBia{SPGEia@DuG|`NnZ#c*W9K
z)&2!;HaONrl|?*N&;u%fbUDmy1nW?O(NZQ{0!KM&dM$F;r}lmgv*tUcbmQ;afSNA`
zpYi%?EGA-TH<vZ*qWTMqRD#9v`c4T}c(sNv^ToJU^{LGMLf}^hssld}y@3i9$*dN7
zAF$TLP$hsmNpfr}Eopy3U{MN>^Z_Lcl@{#l>TKadJYQb%zkXZwO`!4D(qEW(mRUHA
znQ64pR^ST8^#V+Ejq`|-*i`l)LPk*Dz5HK>dETWM9?TchH)B__1ZJ|Ju0$P^(}`gv
zn)J;2+Z?JT6+TSa<657gG5b#63tDNfR&@AriRkbYNQEZZ?}E?A^vpK|FR!e^7;^au
zmwmMyzJ&Fb$Y%v87c4OQ)xLpUWIh(B<hWcTqPi^A!IpL_tOTyjl_=-`5W>!T6B;(*
ziO43%)Gt54!UwR{ywwz@L0woEG?seSsRi_Se#Fp|xsOzOF6XHL?Q&jY^xOq|(4z&l
VBbrUz7EsT+_o62XN~zq;@)wAct+xOG

diff --git a/js/src/jsapi-tests/binast/parser/tester/regress-7635.js b/js/src/jsapi-tests/binast/parser/tester/regress-7635.js
deleted file mode 100644
index 7ea94e037ae9..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/regress-7635.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          regress-7635.js
- *  Reference:          http://bugzilla.mozilla.org/show_bug.cgi?id=7635
- *  Description:        instanceof tweaks
- *  Author:            
- */
-
-var SECTION = "instanceof";       // provide a document reference (ie, ECMA section)
-var VERSION = "ECMA_2"; // Version of JavaScript or ECMA
-var TITLE   = "Regression test for Bugzilla #7635";       // Provide ECMA section title or a description
-var BUGNUMBER = "7635";     // Provide URL to bugsplat or bugzilla report
-
-startTest();               // leave this alone
-
-/*
- * Calls to AddTestCase here. AddTestCase is a function that is defined
- * in shell.js and takes three arguments:
- * - a string representation of what is being tested
- * - the expected result
- * - the actual result
- *
- * For example, a test might look like this:
- *
- * var zip = /[\d]{5}$/;
- *
- * AddTestCase(
- * "zip = /[\d]{5}$/; \"PO Box 12345 Boston, MA 02134\".match(zip)",   // description of the test
- *  "02134",                                                           // expected result
- *  "PO Box 12345 Boston, MA 02134".match(zip) );                      // actual result
- *
- */
-
-function Foo() {}
-theproto = {};
-Foo.prototype = theproto
-  theproto instanceof Foo
-
-
-  AddTestCase( "function Foo() {}; theproto = {}; Foo.prototype = theproto; theproto instanceof Foo",
-	       false,
-	       theproto instanceof Foo );
-
-var f = new Function();
-
-AddTestCase( "var f = new Function(); f instanceof f", false, f instanceof f );
-
-
-test();       // leave this alone.  this executes the test cases and
-// displays results.
diff --git a/js/src/jsapi-tests/binast/parser/tester/split-001.binjs b/js/src/jsapi-tests/binast/parser/tester/split-001.binjs
deleted file mode 100644
index c9118cc73707008c915e4dfb7a429e9e9dae4cd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22400
zcmeHP&2HO95N7)Sduq`F1p=t2*iCAs0eWa48;BhTaFM!g<fbTsz+j|}%!DFUa+Sn~
zJVRfg57Beqp@&|3ZO?sz9y+t!6-VS!98$Dn#k^QBxtyJyo%!ZxhwRDe#1~t=BjFCW
zzKg<9<c^(J9LISO4v(Gfz5TEI*ZYHTBAi}Vjp_MbEVsTqaGbYcRF6J>*Nr^)fiG@~
zf$v7H^uj=q8m9lp&SNha&eQrA=v*kH6-J7bH*~zflQRNz`n{nDr1#Jhks=qk<CN)G
zMqV)5dK0GU@9rGzeY@Z5>TA8OCPHcT)%e?<6p`yIa!*`;nxpp#&=Z5Pdw8vzJkgCO
zz9&Dwdi9HqM{#}%GgVg!v8OqB6{tLMqx^8nQBC3g1+-65xOaE&^qUgy8^HSR&Nnv>
zujM6k`hxuL^aS}jOm(n#aC<kuZmJPX9sLZbB||qRQ7A)sJP{j8P1ib+7>Q?-E1i2+
zd~fW@`<?atluL+u_t_*8aSS-nm#!3Juur9oFsHt5HRK)F_tQt!69c#;QuCu?V3<83
zRV>{|9*9^jSfM6Msi%A_vjhZGy#zNJO;HfBb?J=7ybrW)42OLLnjJS57MMxU1z_bh
z7&`~iOr1fTR4OtSd2vzkFzEp~SZ<tv@G^jlg1mHTF{v9-<Q}K{mS~)>v@aF9645(A
z4wqU-L<p)D(bo_TQkpDY5>w1b$#0C3*BB*>&DE6CxG|nAimknJ2JmM8YL+SIsg|u8
zIy^rObl4Y9QwcSI;}{X#5hI|PR|B(6bbFX)^B#~5#M4efdd=bkDbW^QmWOc!suo@_
zk(xO}oBpQ8vkbhTu$POUFpQ9uL#JEQV1PLwO$U(@<Zu&6565wFj!EsU!I0=H5JfH|
zV$et2NrIO=?o?z|g`xu2FT;|IkHMIV(`0lQ3kxDv<m_EsBnFj-E(TEfm1_4$$!`1M
z;Bl&(<#mG}Keg;YGiu&sjE%B@7#q_C46*aFP~qd>kf>qqJ{LZ2dx0C#@DoQs{X}iJ
z<BNyViM-KKTEfs#F<R;6bfP&apI4Gh|BXAp)=6b&gHnbuEwXYONhWt_@tt*@ap#$|
zQD!i^(DH3GncRK^+^%m7!T{8AIslC7Y;JZ`$iriOI}Cl{28ETg3p0n;gofkJZ*HcX
zQJObHnF5O{9)=GdiGg&W3IgURkF5!KruM)Fm3p%=HhPg((&aKpVO>cfd@3-bDdtz<
z+8r2&a5RT&4EiO$Et6hVWF8@zsAcgID$+%vl<0ScaU&}_QL1UFH$)MNN|i3QwlOw?
z=feJIT^Kq4I04_ygx%JKWs*vpkuhcY7TDeThA)DVJmSH`iGg=%OieL_VbtghPJUsn
z50qPH(g$+3pW&=(9wq(*)91p1EUjkFY0)XG6REuYQj6IMgQ15d2A7@}VZw#g3di-~
z_%?upClxq|pQm{KWR9^Zon>$zDmV}-<KgmLxYR<*oH$xYS!GDkwn9y&o_@D#u)=Dv
z{Pr^<oEH%>nOJl7o1C9(SVwnK+MRPNjMBspy_f1zQeJ2}8KMg+?5Cn)&3aR22i5N|
z;VF4$tUHZeIXJTQ9nhuhLzhG34NM^j9-Fz|nVj`_9kNuB_c9*4XZP3)<zz3u9y&5O
zc#-BoclQUS)M?ctsjrzTx9M@2?YQ1r%yKUm6uB9TUnqW~RFuog#}gMIcgz`5y2{kV
zSE06Z5#-e#Pnh1;We}r4Wmkh_Uu7o-hf#5@t*mVYs<{dj%5wc)>Shc!nO}-gCxLs+
zEk|9r&*O4CatDt^odXrd`kHoX)%`^6)wK!D8BJ(dI#5t6)0e50(ib7XYG#3rv1s#K
z^bDF>LIXnlq#;HO_u&nNOh;-5#^G4=YJhziNq%DHoc$)3mu2BPOpgF&Sg_RMbU0Uq
zxwFsJ>9s3;2-1b_lH1sFFUlLa{{)4=%I{o3jRC9pOtMpXjHlbdAXRd*Tag;-4KUV7
z*OEm$jXhN4O05yNV$_`(5-as-Hjt^>P4(MFON76w>B@6Zi#A<p)0H+|!2qD>?Zrae
zw4q*~FUu>PypynzWI$gDklLs+8T}Xp1FdwV4XEu-8zgVWnUY%?Pg3`HV)e)dV+{1<
zobI$=VVsIj=>oZG*;wcGg194-Ra9gX0|%nujael!e17}fegQ>ogNrt};5)>&p&U9|
zjITDo6w8=C8=-n7f(r~=Ah@W~UdQk{=pc(oQfb!n&~5qgjFul4ZM!k1Oq^gYQ>|#*
z3h>)BR3dF#!R*r+h^(AfS{Nu*TCJj6z@W!ce@&B;eo5O3z6al;s`_-Tt6HZULytro
zN}u~sx@~^Qe_jk>4+?b949-j2nIW`}OjU7YjYpY*(F;#uY{3YV+m#9U5yU!en?~~K
zKZe3I9VFO~kF|@mDPa93lr~Q~qj?fb2MQ7;+X*W9UL{!f%iN~Xf#uch6ro`#?QB7M
zFSttuy+;8H$>kk)BBznHd8P{we*n*$&Xw{$i^N%PE%>CK9)Z|r{UC_GZ>g^9I~WsW
zzgeYkq4MXxMoI`~z5z*|%6(>2-zz*k(D!Y58JRHC`k?Qq^Su1Q33)DaY@_cK`U^@o
v|5e7hySa7@eb*Yi=zF#(Oy9D6$S7%=Qh$Gf{ZN^W9=+VA=c<0zuC4z8jP7zt

diff --git a/js/src/jsapi-tests/binast/parser/tester/split-001.js b/js/src/jsapi-tests/binast/parser/tester/split-001.js
deleted file mode 100644
index f8e2c762a20b..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/split-001.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          String/split-001.js
- *  ECMA Section:       15.6.4.9
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-
-/*
- * Since regular expressions have been part of JavaScript since 1.2, there
- * are already tests for regular expressions in the js1_2/regexp folder.
- *
- * These new tests try to supplement the existing tests, and verify that
- * our implementation of RegExp conforms to the ECMA specification, but
- * does not try to be as exhaustive as in previous tests.
- *
- * The [,limit] argument to String.split is new, and not covered in any
- * existing tests.
- *
- * String.split cases are covered in ecma/String/15.5.4.8-*.js.
- * String.split where separator is a RegExp are in
- * js1_2/regexp/string_split.js
- *
- */
-
-var SECTION = "ecma_2/String/split-001.js";
-var VERSION = "ECMA_2";
-var TITLE   = "String.prototype.split( regexp, [,limit] )";
-
-startTest();
-
-// the separator is not supplied
-// separator is undefined
-// separator is an empty string
-
-AddSplitCases( "splitme", "", "''", ["s", "p", "l", "i", "t", "m", "e"] );
-AddSplitCases( "splitme", new RegExp(), "new RegExp()", ["s", "p", "l", "i", "t", "m", "e"] );
-
-// separartor is a regexp
-// separator regexp value global setting is set
-// string is an empty string
-// if separator is an empty string, split each by character
-
-// this is not a String object
-
-// limit is not a number
-// limit is undefined
-// limit is larger than 2^32-1
-// limit is a negative number
-
-test();
-
-function AddSplitCases( string, separator, str_sep, split_array ) {
-
-  // verify that the result of split is an object of type Array
-  AddTestCase(
-    "( " + string  + " ).split(" + str_sep +").constructor == Array",
-    true,
-    string.split(separator).constructor == Array );
-
-  // check the number of items in the array
-  AddTestCase(
-    "( " + string  + " ).split(" + str_sep +").length",
-    split_array.length,
-    string.split(separator).length );
-
-  // check the value of each array item
-  var limit = (split_array.length > string.split(separator).length )
-    ? split_array.length : string.split(separator).length;
-
-  for ( var matches = 0; matches < split_array.length; matches++ ) {
-    AddTestCase(
-      "( " + string + " ).split(" + str_sep +")[" + matches +"]",
-      split_array[matches],
-      string.split( separator )[matches] );
-  }
-}
-
-function AddLimitedSplitCases(
-  string, separator, str_sep, limit, str_limit, split_array ) {
-
-  // verify that the result of split is an object of type Array
-
-  AddTestCase(
-    "( " + string  + " ).split(" + str_sep +", " + str_limit +
-    " ).constructor == Array",
-    true,
-    string.split(separator, limit).constructor == Array );
-
-  // check the length of the array
-
-  AddTestCase(
-    "( " + string + " ).split(" + str_sep  +", " + str_limit + " ).length",
-    length,
-    string.split(separator).length );
-
-  // check the value of each array item
-
-  for ( var matches = 0; matches < split_array.length; matches++ ) {
-    AddTestCase(
-      "( " + string + " ).split(" + str_sep +", " + str_limit + " )[" + matches +"]",
-      split_array[matches],
-      string.split( separator )[matches] );
-  }
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/split-002.binjs b/js/src/jsapi-tests/binast/parser/tester/split-002.binjs
deleted file mode 100644
index 918343cc2e0648f6ea57a586bd626b8ccc7b089f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 70881
zcmeHQTZklA8Sd3+qAuQp8jP%HB%5S+lNA->WU{-HiA<c#hUwW2F@&L}yJn`cJ>8w^
zn$3=cJP2MM^Wd8ij3D^tgFXpC@HMD!0euz(Z<u!l|NqoERe#kvRrS}kt9xo6wwdm#
z|D5w*zW;J=E8g*RWUsCq+SYLOId^j4T1UP2^?JR%$?&9iZDZ@1{^R|@WNP<TE{SJW
zM$XJzed+9(-k0I275e&3%XO^1k^PiC7+J36Ig_y<H4Oir^=>)iVU*UtfzFvMS`$~0
za)v!;?05kI+Wf}Q9(&HdW4nUf*g6V3J@Z^=e6V^qG}B*S+u69jwQ@;*w{l4mp|twq
z`Ax^OU27!B-L^)@8om2~o;^6Sb}wJ@-?%iJjvVj8qmN#``0`9|LN#?sFmXlp;Qc`5
zw&m)N(;gLM?q7g*gUr3TzTK~ixgUhCudh9Ob@#H)ndTY!-{u(k0cdJxV`p<+A2-zq
zrj9-Y)ci*;PTh$&@lK}pMWLn-o^$O3`_A-{b1yzJa*iDDrE}-?CQGn-{m#_2XEVTo
zzGr#%5!k0tMrc!hZ#3jJYcvX96>kjSD?2nl$_9qne+XDG^DNifv1eY&2qjrcJ?uxB
zAt0d2Az1FgF*0Ii96Dn#XMxt*<Y;QSb|1k;ACCZ+pTc9<Yy_d1DuW7mXpcq{oi^nS
zlN$D7G}1{)5DfHdnYjOEYq*c#-!Xr<%2d{BRUesur_=oTG5@e*{`{D4a39Nz`9Et7
z=BI#ICjdyb44GUC%V@~Mh|e(CJRT42eP?VBPZ#|Bq%{@*9fA0I=4bsuhQG|p|BKe}
z{=?7{kv({awrig*DZB?`*UBwh_N!qUDU!0PazQMS_<^m?W|0MMoBC5e6pkB`U(Tu_
zle-GlgM%^V%Y=hiFN2CCR2ZQuII{P>p6eVOhDAYX_9%xZLcUNKe`-SMVS+l@d)Xd%
zJ*bcXVeiD4oELkG;WAK+TgOLxc18`5K?=Q3Q055-pC%dxRrHRcWW=Lbj8VnjV)Q=E
zN~l&aNX?DCX#xyQW5H@v_k)RQHL7~iGRe#Yf?WkQ*U=lwb*?i=oD2BM|IWVg%g1l8
zB}Exj!=Uw4TF^fH`_Gd}w3HT5n(dSRy)Xt^p?u!)4mYvBtfPlu`*(oni0P41Wv2#2
z4XC_39g0Quoer6%C=o~^P?BGVdRI;t4sCWg6fKVA(II?REfG*|DxM}t6{MQjc`wQh
zMg*FcE3`C-p(EsZuNO`k^8Bhpo*c+?V{Ex6A#jM;F{lT?%7T68PESp<2bd&_0(SvS
z-JUpMVfIWk>Wl{HMo^RLd@8`L4{>=Hnv?kg)QH5e>Y9_Lndz0P3t@6Z@iMj+2D4>W
z@vydH3L4O}mS>n)rQK#YGE}SS<kfK4LDV1#32*i~Jf)WiqE?D2dt_1v{>Fcy6QNz>
zd7vxd%P~XGPm3gS!5GEh!th!WrL;qUYfDupZ(i?oUd^PJL>;KSnN@i-o4v`hOs(ft
zsb6>gD2Gaw36v02L!T6lk~%-9R?K&PPHYN5ZySk<0zW4aF6Kkk&lLX_-{1Wec%TK#
zOju{GKVecs<25Y$r0iyD?v`cPDRC;K`OYFqGZxfB*Mr1Y+1jZP+MgF#XbEWy2^TvN
zX6(mm97SVxmmortiFP7fOcCCbSPxM6N}cQC$1+O@q#vJy2oVruy-rPzQ9WS<VOVeT
za&KFE`glCR{kL>0E>eR1v#@c@I+`W#@6Fl2GTYG@!^i0^zjUt`3Ul^U>;klL_^@tJ
zrzVk^61_H>3~q(hH>^XZZ;Src=XyQ#L6JFyf?!b7(nki*ahJ4M?YH}w&L+yA))l8K
z)E35)M^VEyuCQe=nWv4)xx_!I6c$*&3_H8&$cpM0gZ&6wKCbL0ENm6hHSVHikgre?
z=dLI<O5r0Qg{#9MZp&V?W`?~2LI`hx=hEsbWonQQhp<M~?bMQFR+Z5IJ$NqUodPAw
z!;-dPBFXF>dM$abf!;+ET}D^4Y)_7yGJx4z+$3}U-1&<mdwgJ;Of_}5wmIF<;b#Cc
zgJp<(EgMuu6jRZl7@2*+GhBWI_=kx^B&v+ls^)+kjC#aTAi4=rC10D2hYsc!7Coo~
zF&a~qo;89be+(yn^ahjh%zot<5B@OaKV=YiHS8koS_4MXj6O9ysAep`gSFHhW(+6_
zvAP*GR1yn5{go?z?7WI5pLulE(-SvLq7h-l5nci*j;BL}iNvg$8bKWKn8%B~4GlJg
zp6Jy5#2F3_I|}hh@s5rrRyl?@1B6tM2cP*_UItiK!j97pGjuc0_!;C<oRMM;?cfce
zOJO!F){O=0LX#GRVo>{VLPEgkW7d#O9nD=<`Z@$vnhJ*l4UG#QvU44-g~OKxO2whV
zCsXmVxor?@m(8gKBxMXWL2GLu$uI<N#e<n2Emk&%R&@Tw5I2?8t4|733|<xi6((O1
zAztEj^qOl8ZrMdP$}@%-hB4&>&m!z<XmI6YH16OM(ofT@207Ffv>`F<ph`;*f<+bb
z|AvUnpJ1|wTX5QH=r}~c@+Ejqcr6(#CXU1pZ<MVBpZ?cnd+`MH0?kt$wrU6}iuG?H
zI@a7gVBVFy{{)$6VE_X-xPFE~Dx<nb1<arpsCPpB#AJzi=NG^K`EGtu90Z#ltJYQn
zs!;h5hZ1I<6aoqWd`sb1PIa7%a;u)lKWX0!<}GcQ4$lZxYMdxzPFJ2*P>t)G`nv+X
zt5K-DeEGdDUnW-+)R5dR21#aqhoNpaM|%L1L(=xuCxwC>ynMtk-)$mUMSv)~SfHmE
zdv>$QaDz#0kzZJ^D4)_}6qz+eo{-K{-6%L8(#<9Z6%U#CW09hpP0l*~l7Vockz_>5
z3|cHBF(76G2++*nsHrzFsD@xoj!L;u33JjAyV+#Cg-cZ`gM!j-H=CR_o6Z0fL*X~j
zLIaL0?`-l90H#G<o+3=as?6N8<DY|{(8|b*k<oR%RF{CE0E2}Z>Bl5>bKayF!a%)@
zGO$8G3I$7-9e1<yk(I*?t*J7Q&kAEqD%j1=iz`<F7K2<>u}OVWi|uCTQ_Fot*we_e
zf#zoCne#_~1BKI~DF$9(vc9|P9Xf_PZ>gd(NM$&zoYc~Se#82byz}wD{dTYSF*H)z
zt%7yADa7PjSRSWU%`OjYrmrsoql2h1ut#O_V+_3uLMGSY0gV$3)k)LBgnDX$`a@hK
z%w_0zH7nk$I&Z0Xqqi#{vj?Sa*hM?L>blm6-mG$1!KZI`c}hMT`{5F2geS3efNU)a
z_ZwBY$q2*7ClW3YVrXLu^iWAKC?O=K-6$u?QL4F@n4bf_YBpD}C@{aJ8mJtw{7P5C
z2yePmdRJG(v3(5PLyorhl-?(=gn^$AD+*<(z++o&P|Xd;1=Dl3<lBl^@M#DciY%th
z8)m#~@*T@*oHfQB_ki4YCO4e1_f^9Tju7n@Jffi>!%9-HJ}K}}Dpp*jlvYwzFBqKc
zm=r8dtGd`TBTJ}lwhKj@5%)5LjbUcy^nFykd4iod+nMp@Z%nEir&XN@r|CX62D#9;
z#6m`a5S+$?7^TJI!4^e<)uyveM1o%cjv`YdIc>X~O|9iY1c|KdDSH0^ypX8f6r35@
zl7LVO>eVNux@~*M?l?@4kc3(uA9Rbp!0d*B2da5#vXm&Tv8C}tk)ZEVb8bg^SDOc_
z77lO$F{Z(udpt0oX(!nn;r0+t<8byJ+ZCbC7&dMNY9jp<dbn--0E}Kod6NL!g$_*p
z-qy#KlT8`IRGd<ul=?DqEEc*W4y6>87R1CbY49d}apk10FiNyppH%b|?OGnZu*xYp
zLOsfcdAKdvKJCT=Nh1SpBBRR2_%4(bC9p1(B<o4$VUyL?KNiTG(LZJsLJC4_?&ANy
zpnip?L$^5PV+M8K)qOO@#aM`f?pKB=Dq{-IFre=-TE}HB{prZ@;Bvfy;dVTs=f8u8
z(5Xfk%^;4tQa)ZqDjDT3j>h>Gn-uay*hc2<nh15iSbVk)d6S_$*CvyZZH+f!HMR>k
zZsR{yXo@p~GGQK|D%+>sXjjJ3x!t95yYV_Rvu6Dcm=GFX1P<f0s;gPQlI|RsIGj=w
zDNxGZwD#<gJq*ith?67y(mxbYAq+KTMn}<`k0ujCUn!yI51o-6ZCaGl#c_<LmSYfz
zvWv{5o(ZO7X*0Rwk$27+;*kXl?W$2WLx8A!O@za)ZIO#AKrAfR)GnXEP-}*lo_C1%
zF7Uq9As&;>2K|-rrW7##NfokbV{K*RmmBx~2-nAGy0ef*YPiaQsz+_bUj{%h^dF19
z_IS849@=;Gm?5tB>Tf#0g%cX8-N4F-7ZyNlFb0?owNw125|{d<Vp}lS%CItqrlY+W
zgl^(ZZZv!Q)4d+fBu1k9g)<D~(2foQRBMWc9JQKLMxlqH8@Q-#HgX0AEmQg-N<nYH
zbC|V6<jkO-pnH_FOe*DKm3FD*yelKMDy3mfNltO+S$vn1bb_TTU00tGstp%7leQx)
zfzTps&7Qu*c*VHV-z2841S{4rtj-UiQ+$X?VC{lrrWbP3qXf>>iZlWfOWIni`!P&>
zX>*57$I(f+SdHXrLswSP#TY|Tr<gmW{}uR1E!0~`V>N_~IXzH9_^NDIeNw7$ZJOtd
zk4ecLiTKriQ@NcX`s6~t>OjSdbr(|F8PHtANjwbEq3km{7V{bSMr6JP{)T^yooiGJ
z+a<v+-^pBx&E0H7g<LCJtMXe377!qp9FY2(j;}2dMs2YH@}`+|Il|WE$-FA?d+i`W
z<<l<gW;(fySZjXXH=|>fdEYAZNNT~tD??XHm$ew>)zoKKOFx2*X(7OgnQ-Q*kO}KP
zYYl=J4tfcK1Erl5cbKqmuyjRDeNw9PDAM{%nQ1TRK30^l|2M2jOu6XJh39axOdZ@D
z(+s((62B#ra^zbw0ZYCm&WU_WC$`NCv6pu=%^jD=TFk%vE4?DBl=sk@KRjqy+)L9o
z%p&6_H#C2eSFIRbe$Pf*ws_|*6+iSTL#a5vwwt+5{F_j7M)-`(U&U!vvrZhBe!2Fx
zJv$zG>GL_QT=h|2;n0yCnYS=0uU$G)C2mmBq)@|*FNlLwRAizR{3)r*ucaGB+_`PJ
z>C$Z<P%*f|S6&9O0vm*Lhj6j|1RxmJy7k;(^x2Ot%febKU2UW1dg4@FRr?ze7ZOhR
z6nNkQKx-IXrnGY*94Q5d+Wd8;#>1JBrK2idYBDDQ3IS;wPfy%%uMdjT89SaIfgMkW
zmS_7rj%WsCnv{(DU8WEJJv6B4N1RqQJ{+5=ZDP&mcOF+##t2r-M!<k?1{0RYluYVA
zmkWFnxNhoSSm_F_5?{CPOx3+8CiAQ5aNXKVWf_jEHeE!PX0*+)CJvsPgj_3IEA?0z
znyUt<KB;4&9s|j6YG(JrbNDQ+nNiF(yEWQs?qKu!-plrY7MQX9sf#6M&#}XUA4JoC
zf-FH>>Eu&*&VS`Z{C>+mi7v^A<fshILLnyaHKGG9<3|#%O{&f6DpgHCR!QB9Mfp^0
zP%W|4SRe?>!ODmjik1h$Ojcf(@+a@uqC#a1FmY9i8clk2fVS2gqQ&}FwiDj~eG#xl
zrVI$I%5M{_GaGYrC*Bu6Y1ji6kNTMzM8k(vXB3Evp$tQf(JPfN<K?pU{5eg#f>$P2
z>D-w#G-_|PO0;~*GnYgS!=n{Vgoyamiz(SC6LKWns9lC+LKMRkzoA}C#m}T-fCYu&
z1*jQR(nKwHtec~-YHDx3rJ{z9vM2u0#ETpeS%G<mGUiZgaj05zXnQdxcVKe@8!tru
z8Zr8Yw}U2~deX|N$!a{{;Lvif8fIpd<%&?|AK>0J;gqqoHaH#wOsPS~5*w<LtyG0-
z!dsRqJY!M?CbpS4o}D8#;j5*<si0}f3S(wf4d^>)FU=J07A|*4EG$s|M`vD<n{wvW
z6jw78FlD|qFnig)`kQtqw-)BAjy?$q#PU~18B#(y*Pd6H<l9x_po)~TCihVgOm-m*
z#YYo5GrBAOXP_<@L7#<25mFMSK1k(`bggvdj@(n&>W((I$QP@i8TSE}i5|w`)P0%)
z<y}_$_s{ftccb=Dv|l)viYjPe5FJy|$d!TGSW1Jme$OTbreq`_pdPuaCgPuT)CFtf
z-vg{eo<_7HPOF;LHF)B{%sI%C-ef#<JgDqjqfj{o?1{Q#xXzng<7|qQ%4BWj>LVEg
z%uyDi@{PTQGE3jlPhY+<w%n5#JA)lkuxe!AxuakGM*K;*r0z^aQF3=GuED|Iz5|s_
zqLaIwXQ3@RY))Bvb8_H7be+VBk-hKrT<74>3$h^DBW&Qc*Fs>X%&moJQT4@+CLL;1
z6c}rp-#|owTQ3ZkUQqrra2XZG+Doa4HvrDG%Q3rv-USL3XuN!$zSaqSWaqnKyiG!{
z%}mmw4yry3L-_<~;&a#g8#@~}*LOFzp5EBn*m)s@wYYM||E8^#QP!mTGh+md0I)cf
z)bZvGxbdbJEwsvAUdaI^8EIx33aNop0f%0)4eLyc3zd$ksM4Yw9}4Y+l4Nv@8Tncx
z8kwLcmzBWuJEm&Goyy!ZmL&J#RuMziq!dp$=rOQavzRVwF))RpbjV0UDiWLWiT^1z
zTZu(|QibnuVYo_5a1Rv5g#-~%W-qt)PbaU2%u~9iJ_RJa4qA*zSRn1}T`^uN6mzI3
z14ANxC49Mni8Q@rs*MGU+$$q~2y)iYe-2=S>h^HL!7#;fw=?P~CU=Ws)S{me(4lkQ
zpdpC~y@D?)@Z3><aXnMbXCwn?Xq;L5`{6lZl(G<J2xWa%1?|dl)8SLr)!uN%z|p!B
z2JU~o=3fLe+_H}1dwbr5K=x}WddUntW8>;@xMR<}HETwWDwn?-rsCx<XW`AY$<fqu
zZE^Q&=mq5i_r@N0-ti7Mog;^=V3JSjQM&vAi(*^WmPXoCPLQu;ln3NfD8g+c*=_p(
z09*SBUm&ZvBpIBH>aVZuY+Tp-m~@Vgd=-b#7ssI)+ad=@$rn%(I~zNj>)P|?$vo1<
zo9o+sQx~xhySv_@L&}cwH5@P5Iw-%@ij?Gg*vn$<nZCzGzJ#sE*D=YT5>I}Szhm!o
zT}3|V+sWiBh6IifBg>u0^G@^<EcpxeJAN#!{0aFJxtW0wgYOemKYCduc_nrhiTniz
zPqHG?bR-s)-{Vmhu+h((cqdbxWk`#x;UF#ODuI+{HrTu6(KJ}TgZz!%m_vWT+o3h}
zK=Ya5FT0PW{B~LU4NXhDXXdHssAstzqMG(HiqG$v_7g&y|I@A@uRVZ3g_AVe52$+H
zq;Iz8gwsSMdr$=Q_GRA}iT@t}q(>Aj57vnYi`;;8A~GFJI+hC~t46$3Ttl{*0m=kK
c__SI3b<0mOVx*y4MNu8j)U_g76N_N}4-o&^Q2+n{

diff --git a/js/src/jsapi-tests/binast/parser/tester/split-002.js b/js/src/jsapi-tests/binast/parser/tester/split-002.js
deleted file mode 100644
index 8f14e4facbd5..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/split-002.js
+++ /dev/null
@@ -1,270 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          String/split-002.js
- *  ECMA Section:       15.6.4.9
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-
-/*
- * Since regular expressions have been part of JavaScript since 1.2, there
- * are already tests for regular expressions in the js1_2/regexp folder.
- *
- * These new tests try to supplement the existing tests, and verify that
- * our implementation of RegExp conforms to the ECMA specification, but
- * does not try to be as exhaustive as in previous tests.
- *
- * The [,limit] argument to String.split is new, and not covered in any
- * existing tests.
- *
- * String.split cases are covered in ecma/String/15.5.4.8-*.js.
- * String.split where separator is a RegExp are in
- * js1_2/regexp/string_split.js
- *
- */
-
-var SECTION = "ecma_2/String/split-002.js";
-var VERSION = "ECMA_2";
-var TITLE   = "String.prototype.split( regexp, [,limit] )";
-
-startTest();
-
-// the separator is not supplied
-// separator is undefined
-// separator is an empty string
-
-//    AddSplitCases( "splitme", "", "''", ["s", "p", "l", "i", "t", "m", "e"] );
-//    AddSplitCases( "splitme", new RegExp(), "new RegExp()", ["s", "p", "l", "i", "t", "m", "e"] );
-
-// separator is an empty regexp
-// separator is not supplied
-
-CompareSplit( "hello", "ll" );
-
-CompareSplit( "hello", "l" );
-CompareSplit( "hello", "x" );
-CompareSplit( "hello", "h" );
-CompareSplit( "hello", "o" );
-CompareSplit( "hello", "hello" );
-CompareSplit( "hello", undefined );
-
-CompareSplit( "hello", "");
-CompareSplit( "hello", "hellothere" );
-
-CompareSplit( new String("hello" ) );
-
-
-Number.prototype.split = String.prototype.split;
-
-CompareSplit( new Number(100111122133144155), 1 );
-CompareSplitWithLimit(new Number(100111122133144155), 1, 1 );
-
-CompareSplitWithLimit(new Number(100111122133144155), 1, 2 );
-CompareSplitWithLimit(new Number(100111122133144155), 1, 0 );
-CompareSplitWithLimit(new Number(100111122133144155), 1, 100 );
-CompareSplitWithLimit(new Number(100111122133144155), 1, void 0 );
-CompareSplitWithLimit(new Number(100111122133144155), 1, Math.pow(2,32)-1 );
-CompareSplitWithLimit(new Number(100111122133144155), 1, "boo" );
-CompareSplitWithLimit(new Number(100111122133144155), 1, -(Math.pow(2,32)-1) );
-CompareSplitWithLimit( "hello", "l", NaN );
-CompareSplitWithLimit( "hello", "l", 0 );
-CompareSplitWithLimit( "hello", "l", 1 );
-CompareSplitWithLimit( "hello", "l", 2 );
-CompareSplitWithLimit( "hello", "l", 3 );
-CompareSplitWithLimit( "hello", "l", 4 );
-
-
-/*
-  CompareSplitWithLimit( "hello", "ll", 0 );
-  CompareSplitWithLimit( "hello", "ll", 1 );
-  CompareSplitWithLimit( "hello", "ll", 2 );
-  CompareSplit( "", " " );
-  CompareSplit( "" );
-*/
-
-// separartor is a regexp
-// separator regexp value global setting is set
-// string is an empty string
-// if separator is an empty string, split each by character
-
-// this is not a String object
-
-// limit is not a number
-// limit is undefined
-// limit is larger than 2^32-1
-// limit is a negative number
-
-test();
-
-function CompareSplit( string, separator ) {
-  split_1 = string.split( separator );
-  split_2 = string_split( string, separator );
-
-  AddTestCase(
-    "( " + string +".split(" + separator + ") ).length" ,
-    split_2.length,
-    split_1.length );
-
-  var limit = split_1.length > split_2.length ?
-    split_1.length : split_2.length;
-
-  for ( var split_item = 0; split_item < limit; split_item++ ) {
-    AddTestCase(
-      string + ".split(" + separator + ")["+split_item+"]",
-      split_2[split_item],
-      split_1[split_item] );
-  }
-}
-
-function CompareSplitWithLimit( string, separator, splitlimit ) {
-  split_1 = string.split( separator, splitlimit );
-  split_2 = string_split( string, separator, splitlimit );
-
-  AddTestCase(
-    "( " + string +".split(" + separator + ", " + splitlimit+") ).length" ,
-    split_2.length,
-    split_1.length );
-
-  var limit = split_1.length > split_2.length ?
-    split_1.length : split_2.length;
-
-  for ( var split_item = 0; split_item < limit; split_item++ ) {
-    AddTestCase(
-      string + ".split(" + separator  + ", " + splitlimit+")["+split_item+"]",
-      split_2[split_item],
-      split_1[split_item] );
-  }
-}
-
-function string_split ( __this, separator, limit ) {
-  var S = String(__this );					  // 1
-
-  var A = new Array();                          // 2
-
-  if ( limit == undefined ) {                   // 3
-    lim = Math.pow(2, 31 ) -1;
-  } else {
-    lim = ToUint32( limit );
-  }
-
-  var s = S.length;                              // 4
-  var p = 0;                                     // 5
-
-  if  ( separator == undefined ) {              // 8
-    A[0] = S;
-    return A;
-  }
-
-  if ( separator.constructor == RegExp )         // 6
-    R = separator;
-  else
-    R = separator.toString();
-
-  if (lim == 0) return A;                       // 7
-
-  if  ( separator == undefined ) {              // 8
-    A[0] = S;
-    return A;
-  }
-
-  if (s == 0) {		                          // 9
-    z = SplitMatch(R, S, 0);
-    if (z != false) return A;
-    A[0] = S;
-    return A;
-  }
-
-  var q = p;									  // 10
-loop:
-  while (true ) {
-	
-    if ( q == s ) break;					  // 11
-
-    z = SplitMatch(R, S, q);                  // 12
-
-//print("Returned ", z);
-
-    if (z != false) {							// 13
-      e = z.endIndex;							// 14
-      cap = z.captures;						// 14
-      if (e != p) {							// 15
-//print("S = ", S, ", p = ", p, ", q = ", q);
-	T = S.slice(p, q);					// 16
-//print("T = ", T);
-	A[A.length] = T;					// 17
-	if (A.length == lim) return A;		// 18
-	p = e;								// 19
-	i = 0;								// 20
-	while (true) {						// 25
-	  if (i == cap.length) {              // 21
-	    q = p;                          // 10
-	    continue loop;
-	  }
-	  i = i + 1;							// 22
-	  A[A.length] = cap[i]				// 23
-	    if (A.length == lim) return A;		// 24
-	}
-      }
-    }
-
-    q = q + 1;                               // 26
-  }
-
-  T = S.slice(p, q);
-  A[A.length] = T;
-  return A;
-}
-
-function SplitMatch(R, S, q)
-{
-  if (R.constructor == RegExp) {			// 1
-    var reResult = R.match(S, q);		// 8
-    if (reResult == undefined)
-      return false;
-    else {
-      a = new Array(reResult.length - 1);
-      for (var i = 1; i < reResult.length; i++)
-	a[a.length] = reResult[i];
-      return { endIndex : reResult.index + reResult[0].length, captures : cap };
-    }
-  }
-  else {
-    var r = R.length;					// 2
-    s = S.length;						// 3
-    if ((q + r) > s) return false;		// 4
-    for (var i = 0; i < r; i++) {
-//print("S.charAt(", q + i, ") = ", S.charAt(q + i), ", R.charAt(", i, ") = ", R.charAt(i));
-      if (S.charAt(q + i) != R.charAt(i))			// 5
-	return false;
-    }
-    cap = new Array();								// 6
-    return { endIndex : q + r, captures : cap };	// 7
-  }
-}
-
-function ToUint32( n ) {
-  n = Number( n );
-  var sign = ( n < 0 ) ? -1 : 1;
-
-  if ( Math.abs( n ) == 0
-       || Math.abs( n ) == Number.POSITIVE_INFINITY
-       || n != n) {
-    return 0;
-  }
-  n = sign * Math.floor( Math.abs(n) )
-
-    n = n % Math.pow(2,32);
-
-  if ( n < 0 ){
-    n += Math.pow(2,32);
-  }
-
-  return ( n );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/split-003.binjs b/js/src/jsapi-tests/binast/parser/tester/split-003.binjs
deleted file mode 100644
index ce86209d718ad3b09a210323f8be3f32d97964c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38042
zcmeHQ&2QX96nFS6AS5IZNJvPF1X4powzMb8CeWl?DOK2_Y$%7Sirn4Fu3N`myxz1q
zfdpqHPH^DB|G<qaXRZjrt-uv=MjUw09<Rst*!%pk$$rcwtE}zknK$qK-p9Oo+i*t%
zlWjKoOz&=f<k&q&Khhr4H0`e4J<+yyS~uEP+8ukqv_{>#r(qgHck|xYn)WK()es-Q
zr8|ax*JRgN$J8C&HEhcx)eZk2YWEGR8>RI(&{>&8%XU0cMprW|!yOY4U%%63mTMdu
z%<;%s`cXLOq3ak{Z}Vw*O}n|hzjL$IsPpd{bxuU2)%Nb+HC*QCrbq5rH%AG2$O6_m
z(hn}x{U_?ffoZsJU%YsE{oXM7ir`gskBJRFg2#c%vF;>q7e`c(xxWGJQ)KR~=3cuh
z<~{{OZ*G5h_25#HGpEnU|4xsQPr|GAclLLi$$5(sL6p(AfSP~n`oOVW+dUbubx%ys
z*BsVk4+m?t+iRwAWVm-~tI1cEV0H81z+uB7;6U5eU3LWe=?NpelYcK&<ZazF!$-X*
zI`9<>)lXytLG7Ob77Sh8arfEK&6pu4D^d@~QDzDVsC){#(;FcphSI4MCi6Vdy4vlw
z5ooscA(Oz2hc17?OP_#yBM?oL8I-_2Gfg|mERi`a_8{a>1?z+wzsGt&Gx^>?48`{o
zXY(wOwb+AN8flT_Rmag!Vv}N~C%WN^dHg*FSVcY+;V&X`KRHKnAjG*LB~}?Fa|S6%
zWRRQBKqTV-ayE+G3|DmC)cBq0tFf;afwO~HHPBt~d@SwI)O(@W4}B*JMNSYD{w;h7
zh{pdZ<5QtGR5$C{wCHO32*@GHB5I1P=vSj%K&cw`AomwkC0>H5fo0o8SA<PAa9v<U
zQ2-_yxH;5}7I+tq(FwHKmpeal3-D3|#<(KM?w?D1%_&U3D`AqD&6qGD_C(@flon0<
z=Y1*O$3+XDmb+3n;R;@@5~Jfn>qp#y3Iv~`D$JgbkW+@=0DGkX5wlt1veIN&`=F!@
ze+%-9{zBy4L??dge#R0igQb+AFrc3+s|=4o5tP#{;s4y*7^PM+*MVkZUQlYq_mG54
zf{JBvKkX-Ftt4pqv86j=G8Rn=Y(>J>B5Vi37Q&(NPz&<ukX`YkTrOLf`aZUe?l_OM
z67kGp8Vfg%2?Pore2UH_J*H765d3f%3+LVhey&ml5?##`>KJ3CluAfk$)w7;1o8Z5
z$|y(#jj%<E`@JKp3--Zcp#dPtT6&U70s7nky4oTimvj+fS#6O+d04P#f*24<a|eZ5
zctP0tlzBHqepgFL#ZVYSeF;pRa{7A#3tk9;P*wo6tiIX5O4xXyoyT;<gbh(J0<<Vi
z73?RrfC$o#MEp6BSyGy{ggYqLrXPMRKAxtC_?d1u;+P~NF2Z~cWs%fJEupe}rIclA
z_TWsnBd4w`1=UUxhb*Dm{i@V%YHC+{yK)V5r|1cUIZ`{Nz<72r$dTl%S$hC`dMaqg
zvx#})sCnKPRp(~F{f<Pvf$AXUNz8gdd{Ie3ObUJvOjY=j7hj0sA2?rHUv1`+PODs2
zhOU68dRCjg%1AApkwWWR?wC2oI&SV0=GRA72U}%`T{Dmpw7M8T7mcG~dMggmGazUR
zbzA&hU_~NsBhbg=+rExx*Y^-ec_;Q6&L2wsN>jtOA26_kA(I>|&&kB+kQSc3KhW{0
zcyeq!3nP-<GVRX&@Zd3;&FuCnpS&(vf!QmZLtemvP3)?God}Y=@QSql0RJm-7+}lD
zs_it{p{qGYuOD`L;l=~C^g{Te2$z?YWSiEk2F31tE##f7e1V{vSz0b5NgN$&d~KCC
zCP@xbMwu|!OwE_kB#!oF813qM$F@K$M;*YZ+QvrBt6QWEeap5@rdz2MCo9rowW3Oc
zE5ET3j!e{=YqlE#i+6&}zI%^#T&S<cQfv2QTo)}q6>HIgFCg_dDfTwPLT5>(IB)_f
z3>Q6w4;dCnO7Q97+8*48a1_~PCeWW?+hSS#oP$S57Q`}r3OVT_QzpoFY~TT}#21B<
z7Ft7OA<NYeh%9Y{#h{t6pOpy{+Qb!wp$ywigk5FA{1z-@>mXAyA}`N@-mR{i%<8$4
zVgMQ8se$)IpIXEaf>NU~nEu3+4RkkW(gsqNpJ1#Cc3k`uUY~Fa;<T!1XNgAHYuuMK
z^P<LV+g8`W6oW3d)x(esvlW_dVy`FY&*wP~?9&mp=?hNNiFC@~KAZ&uR~hrr5qC*J
zN`xH>Qsx;_xUPsQQ%t^<7|gL4lwW>=hjSJlQ{WPgKm8+^9M;jCOl)F&-FCvj53QHi
z%-OR-qd^x<P-<ROWNX}-5*tnb2roP(%Zz!aBi-%vW$jtTsl+Pc;jyvl9rKyr&s~;0
z{4Qg$8*+<H5Ki*si=iW71ZSxp;_80v33ZtD@bhay2ZOZM1sLUCNJ(-NCZEavK&Zq~
z=H8xIf!HyjNZ~9)6~~)qJ-723@Jnq^1U~^#1~F1Zc0NcFvnDD7Rb2)OdAWK!G&2D<
z1)m~DO#}CcOO7CRhc?PBNAKKcMK)9j^Q+pZ<+l@sXQu+184YMiGLVuh<6nzfD*j#!
zXicgsoAwN<nok2<e7_)ubzAU5E@2aLFX*VjeVzltoniSj{P-k5lkunjb=e_YfgvD(
z1;x9PTwH;{&HkuPuUskTNrEpxAaD^P2{i(&R=9IKVP{udT*AOms6m7(saldqXP^%`
zM>Ww3$zUOG{nIaRE>Qi`2`r=vFjRn{s<hB#r~NEjD$>bts!iwRT8-wq6972_L`w|v
z6<`V!z6nJ;s+O$d|J+xQAPc=e(O69_dsv}IfFeVwCHoHU^SnuMf&`JQ*5k+$@TfDL
zbC~Ef2m)TIMlNqvT1Pn+)2&KVnaku)sAhp<2`e~X<=+U^Gw)b%mQKGAj$o%IMvXZQ
z3QFPhC#KSt?&gAfCKN$R$$yF>Td*Rb4i?<YV`kB+rdH6yZB;BNjXxDSO+N8M0QoG}
zKooESDQes_zxBtQAtGOj1+>aYDI*2R)$)QwP|LFb${?s1fBKmSzPYB#4#nnMxMifu
z4ky)I5(GWVTM7hG)VKvL^!o;4$b^47uZ4a;K-Hq!hg<r6IF-~>Nj+)%y}3y0A%N9X
z(PYE>tv`Yxui9hH^sr=}LGhAM71%9&U`LXsl=P#l&T6N1qkW~_fyONW6AN8_`5sJ9
zEWea;lE;WrXFj^0E!A9so9F~n3R9;vtO;w4j7S-s|Mj*$a7T``l(r5JzlgHJnKilU
zlHZuoO^)Az*eh)h#;;?NFSdKnui%R9u^vPkVW|MWgbUqnZtw5hY$dKC!Tp{6-Dctn
zK6R_P*Oonn!;}^$2!o05H3>6_<<$9=l)?<*xmZ~UzmjUNM7pl-xY%?}I!(ASS~AL?
glx1i6rDWqm;cc=XQuLL_`@0F;6BV(*qRRp9f3_h^D*ylh

diff --git a/js/src/jsapi-tests/binast/parser/tester/split-003.js b/js/src/jsapi-tests/binast/parser/tester/split-003.js
deleted file mode 100644
index e887dbe0e917..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/split-003.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          String/split-003.js
- *  ECMA Section:       15.6.4.9
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-
-/*
- * Since regular expressions have been part of JavaScript since 1.2, there
- * are already tests for regular expressions in the js1_2/regexp folder.
- *
- * These new tests try to supplement the existing tests, and verify that
- * our implementation of RegExp conforms to the ECMA specification, but
- * does not try to be as exhaustive as in previous tests.
- *
- * The [,limit] argument to String.split is new, and not covered in any
- * existing tests.
- *
- * String.split cases are covered in ecma/String/15.5.4.8-*.js.
- * String.split where separator is a RegExp are in
- * js1_2/regexp/string_split.js
- *
- */
-
-var SECTION = "ecma_2/String/split-003.js";
-var VERSION = "ECMA_2";
-var TITLE   = "String.prototype.split( regexp, [,limit] )";
-
-startTest();
-
-// separator is a regexp
-// separator regexp value global setting is set
-// string is an empty string
-// if separator is an empty string, split each by character
-
-
-AddSplitCases( "hello", new RegExp, "new RegExp", ["h","e","l","l","o"] );
-
-AddSplitCases( "hello", /l/, "/l/", ["he","","o"] );
-AddLimitedSplitCases( "hello", /l/, "/l/", 0, [] );
-AddLimitedSplitCases( "hello", /l/, "/l/", 1, ["he"] );
-AddLimitedSplitCases( "hello", /l/, "/l/", 2, ["he",""] );
-AddLimitedSplitCases( "hello", /l/, "/l/", 3, ["he","","o"] );
-AddLimitedSplitCases( "hello", /l/, "/l/", 4, ["he","","o"] );
-AddLimitedSplitCases( "hello", /l/, "/l/", void 0, ["he","","o"] );
-AddLimitedSplitCases( "hello", /l/, "/l/", "hi", [] );
-AddLimitedSplitCases( "hello", /l/, "/l/", undefined, ["he","","o"] );
-
-AddSplitCases( "hello", new RegExp, "new RegExp", ["h","e","l","l","o"] );
-AddLimitedSplitCases( "hello", new RegExp, "new RegExp", 0, [] );
-AddLimitedSplitCases( "hello", new RegExp, "new RegExp", 1, ["h"] );
-AddLimitedSplitCases( "hello", new RegExp, "new RegExp", 2, ["h","e"] );
-AddLimitedSplitCases( "hello", new RegExp, "new RegExp", 3, ["h","e","l"] );
-AddLimitedSplitCases( "hello", new RegExp, "new RegExp", 4, ["h","e","l","l"] );
-AddLimitedSplitCases( "hello", new RegExp, "new RegExp", void 0,  ["h","e","l","l","o"] );
-AddLimitedSplitCases( "hello", new RegExp, "new RegExp", "hi",  [] );
-AddLimitedSplitCases( "hello", new RegExp, "new RegExp", undefined,  ["h","e","l","l","o"] );
-
-test();
-
-function AddSplitCases( string, separator, str_sep, split_array ) {
-  // verify that the result of split is an object of type Array
-  AddTestCase(
-    "( " + string  + " ).split(" + str_sep +").constructor == Array",
-    true,
-    string.split(separator).constructor == Array );
-
-  // check the number of items in the array
-  AddTestCase(
-    "( " + string  + " ).split(" + str_sep +").length",
-    split_array.length,
-    string.split(separator).length );
-
-  // check the value of each array item
-  var limit = (split_array.length > string.split(separator).length )
-    ? split_array.length : string.split(separator).length;
-
-  for ( var matches = 0; matches < split_array.length; matches++ ) {
-    AddTestCase(
-      "( " + string + " ).split(" + str_sep +")[" + matches +"]",
-      split_array[matches],
-      string.split( separator )[matches] );
-  }
-}
-
-function AddLimitedSplitCases(
-  string, separator, str_sep, limit, split_array ) {
-
-  // verify that the result of split is an object of type Array
-
-  AddTestCase(
-    "( " + string  + " ).split(" + str_sep +", " + limit +
-    " ).constructor == Array",
-    true,
-    string.split(separator, limit).constructor == Array );
-
-  // check the length of the array
-
-  AddTestCase(
-    "( " + string + " ).split(" + str_sep  +", " + limit + " ).length",
-    split_array.length,
-    string.split(separator, limit).length );
-
-  // check the value of each array item
-
-  var slimit = (split_array.length > string.split(separator).length )
-    ? split_array.length : string.split(separator, limit).length;
-
-  for ( var matches = 0; matches < slimit; matches++ ) {
-    AddTestCase(
-      "( " + string + " ).split(" + str_sep +", " + limit + " )[" + matches +"]",
-      split_array[matches],
-      string.split( separator, limit )[matches] );
-  }
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-001.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-001.binjs
deleted file mode 100644
index 6b06c09c12642fe477212351360c1f68c963ce9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6268
zcmdT|&2AGh5Z?0ta{(c7;Izk96{JPtf|iIj4Qfyb6^SZt$j!RR(#>vUJ53|R1MmvG
z8C>DQTQK%|*UoyAIO#TsQ<Sy+jpy&18GCFr3~|-#W8_zlNZcc6;9PSY=Op$g&VHly
zw*9i*jfdFrDq@cp29#C5J$9V?u*=hrA0rZ=lMo-^ZionCK^zGvU;U@fSrGZtSib>h
zV-Z$N1XSQVK@_kIKo{Team0et022Whp@F(IWh97t)!QJZU9WW-?^|9)e)B34M8|52
z{mp=3f<ggzj>3_F_W<xHLktf<^wXW4-DjVv37iV32-A5|?sYhOj)=KkzsHIu{R!A>
zH0g2uL%S@K-h!*wYwz|x?V6TZzaf9E&yY7kRHxBt)=j<jh_H;zha9bs-P4%3S%jL%
zm#}F4Vn{HhkmT(&14PW>?0aFB)=(I#qvAvtK4Fzxy0#WMeHSzZ4GHUD%I0V&VRdwM
zkISgQ*;1;2NN>ccfEKE5p$sRKF#*~+1U|;36F1|YsgvN5?~vd|j_(H%A`_*T!&wH{
z8`u~aG{mROAwjRN2vm|02ijJGbR%5>q=g~MW@@gWs}#)Qz91?rZZ{`aGvtKqv%dv`
zRwVZypo-!6JXSgNl9Mqc`6w(%EImdnNr}U~K|zT9*`8Qmk^HkhJ93V~7hOE$J&~#V
z3Z{Gnh^^SoKwZ`+@wfmx3&6ECA8U?Js5iJ<UVI)QN=uH<4w<O>B6{mE?w&b)6!{@E
zt7&7cN5MYdkvlZEA%6jkV32~U0}6_70+Y$oT_`+PqRXsrH@I|YrOg}=;rS7k4J|Cm
zg^we=+u01Z+%NaOni3?lWC<bdEk93LUmJV)b&@gY5YdBxK&;h4fz)st+4zv+>OeKb
zy8T*+Mih%mJcO}mFnhGpk6KhA;Yw3a9cAe_+J=UKJA7)eTQQFIpgZhEydP2k%QPgf
zly16C7M8KCTb59eFNGA7x;*{WZ>dyXD);`K&6cQ9IfCGEIH!j{h;{$-;EGQ^gFT%g
z;hia)q`5Q|a~7_#h<^)|J8&TuCnTc+E_La`-=wVSp4T5u06Wtz4>jwIVw@&s$y*Bc
zTkx8prV1hS31IWR>4QSv9Lde{Qq%vs^c7>Zg~#foV2!fIAnp@B&eagbrcZ=o&w;3T
zHCZ-jtOtuLn0x*YNXvT5`2y;#D7OXGR*x@BMDBHW6B=1Oc1^Dr1+GPUFQBy|RLkq~
zeA_DRp1fqusx!JREmWRY{bn>lx&)QeOI5Drih_k2JiD3Io6dq3j+dN-lwnGqCe%5d
zUGmWV8oVqXy6K!3WVu%GDj-*i`AmZ}UQp%QjOdlCMKPl-<tKLylbR1^a@DlDTqv%S
Oa&f`Cm0)b6RsIX3LhbYb

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-001.js b/js/src/jsapi-tests/binast/parser/tester/statement-001.js
deleted file mode 100644
index 087f3f74d8cd..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/statement-001.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          statement-001.js
-   Corresponds To:     12.6.2-9-n.js
-   ECMA Section:       12.6.2 The for Statement
-
-   1. first expression is not present.
-   2. second expression is not present
-   3. third expression is not present
-
-
-   Author:             christine@netscape.com
-   Date:               15 september 1997
-*/
-
-var SECTION = "statement-001.js";
-//     var SECTION = "12.6.2-9-n";
-var VERSION = "ECMA_1";
-var TITLE   = "The for statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("for (i) {\n}");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "for(i) {}" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-002.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-002.binjs
deleted file mode 100644
index cfc1b8b7e7485104438a10e3b4c4581f894de9f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6326
zcmds5&2AGh5Z>~S5E2rC0~dU3RcH$01Zf0KgPJM|6^SY#gpiwc6VuIZ<aL@xz>DxY
zJOxKih__(u^{$<GlQ?N8Kc^^b`?F`}n{UQ0@_sKMrDBI*zqHSyHp5--g6DaMkw5gd
ztM$Fc(?%=m5wBQ~bBY0tdFkt2&$|J$isteI%qTt#$PQ@*m|;$%P(u0of9xI8&>zM6
z4mc~bup%a*sPEB`@(jS-zUq^Z(<4flgbQ(3A3ElYhV9Z-*rrh_H><De#e(`)EGQ5Y
zt0CvtC?^aD67B>CeGBg<;Kdws(uJ)bZf-udQB(AS^jlGFdJz_$U}jG@53!&>zXA3+
z`tzXjy0I*OUWTLZH6FcxVms#i{rKbj{3z^hR-3hoZMR7XM^@euXdQx%BDS$XLzFSp
zMn8jBE2lk1;uw;=k!FCT9m&4uW@#A*fnF+CwBQrbxn)}Hkki+}TCkAuCW-kJ3l*%1
zuFr866NFkS6EJJ{g%rfOraKsO3$O+ZWM>!jn6PG4i`uqLQcAu+j$3KIO+(Cv+AdEB
z4X8J$F(_z2j=0BYyQ2kE>5%|h*BhBm`VEi{j##!*3j>ihFynm=D;!QYC0{e-MDMe|
zIUD```hEqx21(uzauUnrh@&tGxR;m)#Gf3A^Q)6T;WSnPjmKm;eTUE}a@rz2(G%IW
zFW}1CfLM=E28wuxMS~pdjDY`R{~-tk^@g;T$IpEn$4lmClMQu!k-c>gwT`_G4*dX{
z)wHoTS+Ff;j4hhlkiP*YTV&RCKtqX1;4)RZb2lF=(aWrFm&ESSO4~Ug>G=tUEh`+w
zr2uP1%Y#-Cbk>MIKs^M_5AV=;4Sht3jG^@{`Q>fz-81yrK7~@BENN6s)aQ{18CN55
z<m9Tfi{l;2fR7b0GIj1scEw0>O`tO7txh?>{g}vV-Gi%Bck=biT<TD%WVmfRO_aI0
zwhm2&AjQb#Z$YlTfDW=9ik?XW%+s`NY1>Sj96aM%+Z>@Fr*dT|4SD)&o>H4USAPCE
zpUqLn#zaK$a7v%Q6PfWB<cbbIfIqz+6WuExrnxl2Ifu|V@ZSOD8XSm6i4bYRr6Ha9
zo0MKN^5(+|U}x5iLrq$v6{kjc^4>!HI=p!3n}^)=9$<^P>AS<YJCc))@0$KMcVCdJ
zbu!Q^rD`nesw83}u6$)26FVl-uw4);QE}!ajq~N>H{6Z>4M@kDd>@?OjTnKNi$fHJ
z1a(RGkTB?5(+<QAoyj`KeFPWKDzw04fNa1#Iy)r&46(~Ybv&-f!nLKH)3ph9FnL-{
zoX{GX(bAbdS3R4rR5+L+a-KWA2F+;fL?KF~8t#RoGCQT;OP<J|LzLwcc|7IqS&ikq
yC#aEpl`|l%=T|j0fxT)pk2A*5_?_RtjP0j3HEMfZ4dho(H8|tNOX|4QK>q?eX9H9K

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-002.js b/js/src/jsapi-tests/binast/parser/tester/statement-002.js
deleted file mode 100644
index 7ac633058bd5..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/statement-002.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          statement-002.js
-   Corresponds To:     12.6.3-1.js
-   ECMA Section:       12.6.3 The for...in Statement
-   Description:
-   The production IterationStatement : for ( LeftHandSideExpression in Expression )
-   Statement is evaluated as follows:
-
-   1.  Evaluate the Expression.
-   2.  Call GetValue(Result(1)).
-   3.  Call ToObject(Result(2)).
-   4.  Let C be "normal completion".
-   5.  Get the name of the next property of Result(3) that doesn't have the
-   DontEnum attribute. If there is no such property, go to step 14.
-   6.  Evaluate the LeftHandSideExpression ( it may be evaluated repeatedly).
-   7.  Call PutValue(Result(6), Result(5)).  PutValue( V, W ):
-   1.  If Type(V) is not Reference, generate a runtime error.
-   2.  Call GetBase(V).
-   3.  If Result(2) is null, go to step 6.
-   4.  Call the [[Put]] method of Result(2), passing GetPropertyName(V)
-   for the property name and W for the value.
-   5.  Return.
-   6.  Call the [[Put]] method for the global object, passing
-   GetPropertyName(V) for the property name and W for the value.
-   7.  Return.
-   8.  Evaluate Statement.
-   9.  If Result(8) is a value completion, change C to be "normal completion
-   after value V" where V is the value carried by Result(8).
-   10. If Result(8) is a break completion, go to step 14.
-   11. If Result(8) is a continue completion, go to step 5.
-   12. If Result(8) is a return completion, return Result(8).
-   13. Go to step 5.
-   14. Return C.
-
-   Author:             christine@netscape.com
-   Date:               11 september 1997
-*/
-var SECTION = "statement-002";
-var VERSION = "JS1_4";
-var TITLE   = "The for..in statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval(" for ( var i, p in this) { result += this[p]; }");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "more than one member expression" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-003.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-003.binjs
deleted file mode 100644
index c77fa4f7e1e8fb83aa578062499b3b9ca0b78c2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8692
zcmds6-HzKt6n6P5AV8H+Z;%kaY_)2)2r40(u3)oSb*m+<ny5Djp;>!28P;n@<4Ly>
z;t_ZOo`V}Mcn~hRLc9g%jK}tg$MKH6Nhs{i%CYC0^ZT81W_oHqi}+q|%2~MgR3;P2
z&b`+>&pS!Ng|~k+d_4Mc6eKh5^>+0)y-1{L@7GT}?>+dcN0&cmQm~VVAMhYzk|~kI
z8Y(QGQ}0Z~;WE~rfOG9KtVC)k5qcsPssNzdAB8+t;#6>{;bL}P3Y{t`;>q51*k&~7
zkB^=Vd%Nbh-mU?mSR?)Yu~1yHNW;Bg(cHp&AMjGe6hDWp@7%lhnT?vG?`pgC%%-oy
z!WT^1pHm?^+Vc;<-l9F951x(IWzRQ3^v9!5zyI7e%=Yd0*Y@m)dXJCB#{*k$8W4_A
zc@xp5+&@j^-Mb?8iwL#RuVB@|%bDb93Q0c7GeCzOFMhAh(mso#a;aVsz)!r)Evm6Y
zPQL@%f`(F!d8!&TG_VxCl;bKYAX^$0n4HX!3esBD9hA8NSQip#=MnHRm*eC(nb<mM
zD)|L++)DF(5i_|c_41HtfW3i@fk7jFsyrzs(~>|9A0g0Axe+ze1|S^_v2LbD1^rUN
zBJOLV!a=%*d@YbOzAqkYHhT5>{VlK>B>6n5Nh}&8j>Lp;hfG8~T<wYN)ycm>8Y_XS
zK3PxSfgHtO27HD+k*#|NQ+^1D!^AH@eKnQIMGbZlfd9w-0|N@`4G-2ApHEqut~ox(
za#7Y7-CIXVaOO=}97fQr=8ZLtf_?m=vZ%2k{{kopxqclD`E|&OEhPqSlQbv9kYA8`
zh6}FNFT4#1-z=V-{7@S;MY<SoY>$q91G%<jbyr#+LNg;pkdHwiU=gfquv6*PGSJZg
zkkF>FEOw)*QE4F8*?ql%yThPo2c#y?-$6RdLmOz1HUQ~Zps}jJ)ZpKOaw1Y6W{2dq
z|Kq#1J*Y!kU}wFAzw=Pze>?l`K@D~uS{?SlVECy4(qwbKL-9YWjdVkL@`0$?Gjs>p
z;RX+faJ-P3pC7UGKuF+|0R&GGv>Nn2ti|>D;E(Y`2+y?NwF#-$Un`C$a$%{IeWrqG
zKVtKgYxbYPvCH}DqZ_)^q080D*zEh(b!rESl(q+zr6Uu34b$f&#(Ap*XfyCUEOn#O
zI9R6EUk0NC6fmAsF{03=%B|S*-?LeZ9=JmB7>5lt{~)3M$KXnIarb5tCttNFGLqWQ
z!OITu?|_2+hDtJ$ECVjj=1c!KQxjkp+Et;bwv^6Lt?c=jt7SUNTT#8~NAMkfOR0+!
z4Km59yXMby_l~i;-1(tnO%z=Dm<4@;$3=aXQjLtvTCqbQD(nZA8fpi3J0DzZpvwO@
zARYUKkHPpSEcEfv>JH9Iekwu^6K~!fl29~`qcP{W3r2!}3x;QY;oE?9!R!zNmrz|D
zs-w7=kGIz*r|bCapmI}1T+ww=Z*^pdc7?)04a|7e`W*Ri9tU``LodE?7>C=cmDgxg
zdk4Xqr&bEqx+PnHs3`3c({*&nhT4m6C4LMuOsNNGXxB<=I0rA_xv#zmbW6d?{EW%F
zbd87-!QWR_k6*_Sr6#XJ!?!P4aK^hdUM;;+u_4+k?^1Fr<^QQOE6Y}x{)U_BpK&#p
zm20lN2PveXyF2KZ3vI}euBOeJtG=#lF4+#7tPHCCsQWV*`2%!Mnq9WnQ<iyI+a{TJ
zHMc7S((c;`q;(l>-mR#}=51XaG_Npl+~#$%Q)*vFnzwd+F)z?q_LN{=*3gc5bIE<7
K?qsbagnt0_l>w6g

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-003.js b/js/src/jsapi-tests/binast/parser/tester/statement-003.js
deleted file mode 100644
index 7e257675c4ec..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/statement-003.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          statement-003
-   Corresponds To:     12.6.3-7-n.js
-   ECMA Section:       12.6.3 The for...in Statement
-   Description:
-   The production IterationStatement : for ( LeftHandSideExpression in Expression )
-   Statement is evaluated as follows:
-
-   1.  Evaluate the Expression.
-   2.  Call GetValue(Result(1)).
-   3.  Call ToObject(Result(2)).
-   4.  Let C be "normal completion".
-   5.  Get the name of the next property of Result(3) that doesn't have the
-   DontEnum attribute. If there is no such property, go to step 14.
-   6.  Evaluate the LeftHandSideExpression ( it may be evaluated repeatedly).
-   7.  Call PutValue(Result(6), Result(5)).  PutValue( V, W ):
-   1.  If Type(V) is not Reference, generate a runtime error.
-   2.  Call GetBase(V).
-   3.  If Result(2) is null, go to step 6.
-   4.  Call the [[Put]] method of Result(2), passing GetPropertyName(V)
-   for the property name and W for the value.
-   5.  Return.
-   6.  Call the [[Put]] method for the global object, passing
-   GetPropertyName(V) for the property name and W for the value.
-   7.  Return.
-   8.  Evaluate Statement.
-   9.  If Result(8) is a value completion, change C to be "normal completion
-   after value V" where V is the value carried by Result(8).
-   10. If Result(8) is a break completion, go to step 14.
-   11. If Result(8) is a continue completion, go to step 5.
-   12. If Result(8) is a return completion, return Result(8).
-   13. Go to step 5.
-   14. Return C.
-
-   Author:             christine@netscape.com
-   Date:               11 september 1997
-*/
-var SECTION = "statement-003";
-var VERSION = "JS1_4";
-var TITLE   = "The for..in statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var o = new MyObject();
-  var result = 0;
-
-  eval("for ( this in o) {\n"
-       + "result += this[p];\n"
-       + "}\n");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "bad left-hand side expression" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-function MyObject() {
-  this.value = 2;
-  this[0] = 4;
-  return this;
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-004.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-004.binjs
deleted file mode 100644
index f91dfd20bc69d53739f1e0288f1d85f223826a80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8367
zcmds6-HzKt6n6P5AgC%(Z;(J%uUf6zEfQCduF7V!>Q+lyHBoO6LbLX4GOX8*#*=O%
z#3S$myb4dkC0B^I;GD_WKJiSPi8ommt|G^tZ_YV$&Ue0<>8R->;d`AiXYt+(nT;en
z58eub;3SJ@!TwSI+2HFzludZh+11~45|OLD?291y2)^pj;jfq!>?Gj_JW7~kN@S^q
zimT^5I1_2Si1jDn+*pN`New09K%_#I0Cf7Jn5Rmd3NAHV%FZjJb0tMO+PewU40_$+
z(er+1*ZkMnH6RpgpuayBic6MgxYsP1T6iA=Uapwp=P>nyM~}X;Q49249k-5|^lcdU
zno0X}YDCL;{sGum7|&O|mxE2k^Ib6g+2G3`uSFdHy1F=`-@~Kfaj!WcJhSo+qK$cY
zn#qR`MH-eFYNKBwJ9}>?lIJ-T`Jku(op!wZ-&v(ymL%0sJtBg?cvV}p1Uzc`1Mn6+
zlxoOx)!?C{$}2lA;{vj!ae>Lv6saJ0y6)l3ZNR#aKs!%?kGULX$JxmCNmI#hP~%pa
z?~9blS>;!NL<8&%Yzz#V@KY5?F&b9{YWN6&cB+Z!5^Mp|BM_TrYIHEH94zzRkrf`+
zHPmZ~Jm>rJ(J|5W=lAy@YEb0U#8Fr@M?8rM;SQNdc)WZiuC7o14c1r%R9}<L=nmv4
z{wCrR)I_%LEkgMzAojDc1P#?#W)}|ZG6DaO`U4XR`VEgZm!B_Ko^LomhjLc+7p<+6
zEIJFuER7QotA((pS+I{^)CM&Q@>}l&S|D#ikl%!=xT3<qX|m>m=<^HG&v3xy^uqgq
z@ZIeB$xqI#Da*yIMhiNstgRLh&4xrZg2}n$HDR<#RROsXaM-}uf!3t(J6MMXF67P@
z+Wr<GJsZy_;2o&p@LqVA-3>t!XZOROKeWR^OVAS<iFn>3!=1;#!Xp2E^20X{>>{&T
z%z=yZi*0RzXmYfCTufa$AKlMmg3X_y=gqh5JnqA$IX8blW%+@SP$fM`oib&0#(V~2
zb;c0+NXuA%bfer^7nV^|x=cmmZo;NH*CKTSCkE%sPaWt`4}pfpaXVrZWo?Sx0WFO|
zTPTy3#r`d9oJJ{b6)J#rwEE-9H|mo|WPBx^ClrvH7mrdaE0@<I$bT<pYsj}6i(?)(
zw5x-Ru0JMMru$Mbk+^A7v$E`H{5+P%BmX^6uvMyTPJ~s$71g}*cdj_8<&=K_yY#LO
zwQLN!HODySYLT-F6}6O~C>_i#tIt|I)7e|*>Y`}bWG}}x!IO?I%c)1kX6@J^5EZuk
z1)}m;Ztp$!78?0~1JY9yd=9}sVR4A(Ee}xUhq;J3Y}N_^XcrUBInP-z6T*A2@8cJt
z4d_Z{j~rM*buLs-bFp^sZ_G~Lou7xxO&xKGw4$rkk|EY>6drD1#jCZCKo6&BgohIJ
z&IZp6;i6^f4G{I-!?5NJ7X@2elFh(Ww042%S}w?z<VCv{KZJcm<p+3Z_evT#k5#}U
zOMQpsSAu;w$Ce^mdIP3S3W6t=#&<D9<;isreEX6`XS|K@T60xuF?21WD_XT-$eRn7
zkMq#q_6z+>uBNhfLsQ&Rl=6$Fl829l(S{u9=*tScrWmc5?lSw?Um?i1VD932)=gP?
z!zHqL=eQU!Z``_#Kw9^x=G~HxY~H&1pm~LfLpJ4PK>bLc%#_<VY38lnU(5^i%-$uK
Smk!!7Z&qA&X(ekNA^Zcs)|TV|

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-004.js b/js/src/jsapi-tests/binast/parser/tester/statement-004.js
deleted file mode 100644
index 056e0452ede3..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/statement-004.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          statement-004.js
-   Corresponds To:     12.6.3-1.js
-   ECMA Section:       12.6.3 The for...in Statement
-   Description:
-   Author:             christine@netscape.com
-   Date:               11 september 1997
-*/
-var SECTION = "statement-004";
-var VERSION = "JS1_4";
-var TITLE   = "The for..in statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var o = new MyObject();
-
-  eval("for ( \"a\" in o) {\n"
-       + "result += this[p];\n"
-       + "}");
-
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "bad left-hand side expression" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
-function MyObject() {
-  this.value = 2;
-  this[0] = 4;
-  return this;
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-005.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-005.binjs
deleted file mode 100644
index 165dcc1a11393fe53dfd410555fd934845914403..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8644
zcmds6TaOzx6rOS`ATCuAFGz@ycxkn2x0T?9rYqQNR^4hzt0w9TLdZMgP0Y^DL>{Nx
z2=T@%e}G@YU*VA_#J}Ji$DTPEPZDQxQA=K;8IM1o`}u6Q)OeKegVvC<_~5C`29jL{
zZv;Vbmc^6c@TB{=_f0R#Mm%Wk>u*|#$koAbUj)Gi@KuXWf6k;}X9+*zQNkosB1<(?
zTt4T)g-GLBtiJ*0+A^$6YA6v0A{D9tpv#}cJXPXcaH-)^c3BFYD=E^!!F5=s*J<}p
zo^)IL=3Q&wfKaTS{{B=bE?J`CUa(~B;C%>qxnhc6!qRu{-TT@_wdniWZY{Iun=tVO
zlkVqKh=%t33$S-+&*z<Iy-nHkZ4mu&@BU9;xrW)j9sk*#9Z~Q8N&mFt>P-W}Gb%qt
zv>^}AGkN!}NW&sRUGz1q+IcyWJkKG?do}}f*zw|hZI-rKl9W^Rj0j%wGPkJ49y$FU
zXbT!j)#tfdprL`K=%pO%sDRbdsKDf4jHMv2Roz3G8-R5sq3k?@ddy`%JIw~JPP&x*
z0XgoZ`JqUeoRoS6SZJVnLp6p9n(%WKNHG|e1=Q3d1llVXqDI;Rq=z9kU8zyQuvD;!
z`<kfmkZwV~7Rb|jUp&?<^y=65cfe|p<m03!v1p8V7AAx{W+LJ7d{6AIPyP$iI0;ns
z$!2&5)+qim;v?iluI>#?`3WF)v#<aS)lg<vHP}S}{vY`V1{Cxg9&Ii@pRzpPaD4XV
zr0g%6TPIm`5e!)xCqPy$v8GXQh+kADEhOY$LP^3}zX?Kq9kOCaiGj;xixZ;DuSh?`
z3G4BNcLCx1$&<66Yon$}7vqfv<*1albRdcifocd-t;@dyE;UGzJ(K{ewC{(d8EGVW
zbTi*7-vw?XMPzqHpi-fTV>TlKm84W_CA(Az<0jeGTj&+o*p-&Edgx;LCwL7VH<MFa
zphH`L^lZo<gLbe>2yfjFVV{uQ4u5&ywFUK|C+<zao$`io?;*4%k^eCI@qr6%&D~%L
zjDufmq_vPHaf?T@gn3ODq=y`cI(-HrFg?fMaTiV!a`XBT%a4SF($RsqDZ*ce%V#iG
zhYR7<w6^Jwt`)}(Rx&C|o2h8nPS`l-I`v0zjB+{uD27h;$a7tUTqjVJmHW;fG#xbB
zOpY|n^jE(EdKh^TC9y8I|J3rYoy}I@w3QN$ak!v|A7!)yVsK@;SqCGDJ6Sa;(vI5C
z!!;i9?}38+L1oiI=q8hO?cDz<4X2XR`UBX7c2$UZb5N}*#wk~`HOo@Vx%G(?4W^P+
zSGCV{^@g!J%jD3pCJNR*HbI}@@lTuOR3js^R_quG754j?LgnFZ?}Lafbn({%(vuT>
z4#q!YafpXdcX00$<|5{>gSD)fgradAjXBR%FcQLBuo>o8p$k|S%pNhYq}0`+dWws=
zdwXMYF6uqhmL4iE+7ry7R&<4i6=JnU;h_d*yjuBO_;{Q~cv3?zvT$<^w@-7g#i;fk
zf-T;KQm~aN*#tyIX=f^3Lx*gMk~M4beb`5odVq#*ucU_a@B*IW>We+U6s&B3F?naM
z1yLgSed}=ix(ZQhveI^VOCC9tEV|%Lh}Vi<sn`(hWm$@~lKrR7tW29@`Wt?xf5z2V
zR<5lq2PveXt9$5Zg<i73^wrmw6fRkAo&D_ZVC0X`J^A$VyuM_a!CIPR#%gX$2&Bu~
z2&8klY{uqvWHVaV2h9)$4%w8G3DtWJvQq9|FPc%eznB3umb*(ZgEeKxj4ZkT(@fSm
GLii84XY=s@

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-005.js b/js/src/jsapi-tests/binast/parser/tester/statement-005.js
deleted file mode 100644
index 404a157e98e8..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/statement-005.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          statement-005.js
-   Corresponds To:     12.6.3-8-n.js
-   ECMA Section:       12.6.3 The for...in Statement
-   Description:
-   Author:             christine@netscape.com
-   Date:               11 september 1997
-*/
-var SECTION = "statement-005";
-var VERSION = "JS1_4";
-var TITLE   = "The for..in statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var o = new MyObject();
-  result = 0;
-
-  eval("for (1 in o) {\n"
-       + "result += this[p];"
-       + "}\n");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "bad left-hand side expression" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-function MyObject() {
-  this.value = 2;
-  this[0] = 4;
-  return this;
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-006.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-006.binjs
deleted file mode 100644
index f5bc9952a0ecc69d2b3b825803b27bc8c5a1bc2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9022
zcmds7&5k2A5N>`KBtR>zxNvH2pb<NZ1RPL^V6rnJt0BAEM0-V^ZYS|hPdjouJDVFX
zzzcBa4Y=?q962H0f-1-EuB4sBo#}~onM;(|{#;eA`dn3>j-Jml-t9~|OS?~$oG5k`
zy%|N(g-jRGNq_KY`0X%}Gahx0&74jq3f;Z;X%u|`vpRJ7Go}Q)$oNB^WK1zFWNx6+
z>U$AgiacG#`WtZG*o7sPff8vXa-mBAx_v+8xfWx=m4VCIRV8$xmB=UEJFw00v^VNM
z9(0cFZ=GWcLa~Ns{<+XxvCP1|VA;He_aWdFnrVIoTYvH3!8dhOhkk7A*0Gzu1q)v=
zRi93U*wdbW0rmmy`Rw%Ruq}JO1EN0~e);oPb;BIqj{h9aj;QyjKRQ3H>rEXZ&?`Si
zv?-6rQr*8V^0@TSI{FQ)dirvvcu_!*4_yQpx8vpS-YD&{EUT896$$*rtJtC%2gLOI
zpe<;q^oSRFi-s1KqE~X<L<M9^s{&J#IZ{F4RXsqNyMT4AfOdWaKIUp9&*h}9lcAE|
zAjWH9ej;+F7L{HR5)H67urV-b#>YBRVlu4=)bbGm9aS4qBi#aIfFasuYE&?;6fFJT
z;}rqYZHd<sdCB+XSI<VTKEJ;UR)Zj)XP&^KJ`zYw2zSOr#?#FwakzW(Uy!C2K<j7H
zPTqkW#a||ThB;AP_dQH`4-f}3E<s~GRr1<{T{__ZG5<h^g8POi?fK^uRunD!=SVH8
z`^DtenM^LDDa+Fgl2w;jQ!hBd8EcESCggvBDUj>iNXYL%R2(QUa2vTjAO`%J+-JDp
zX8FQ<fbi4e@x^nm*OcL6PvdZO^e4!5AghPc`T&v{B@$N#fq<p6wqU0-srn>$d>hb7
zg0ivxq+zno)`1o0FR)dJsc{ZeoW1}JND^?h$G1z%H7DeNO_2k}(z7i!TVr<l9dxM~
ztcuEtsBjVxvMmg}miqx}hDnZDas?2YrXqPBeOK`XRVu(Zp?-g&SaQj!e7LbRlo8Do
z=F@uNRc<sD1yKuDmDAk0H<Wpo7g;!mZuyFCLYp`~f!xwfYfyqE287$Px5Lu`bXTe>
z$GGw*FwZy%sVS%<`V-<E0*7w?HEfQD<Qgn%X0sxB9l$RawMLKWWZKKvyx_)DXVBfc
z+T0<dO9Q+TMdg)Gdyk`OI&cI$V9Y^fsT}iQ0gJlbe!K=48BZRFDd^6Bt!>tz)M(a<
zc_{ZG#DJp-@c#f5OzX5<7NYfFazVB6b4dd9<lCdobFLfGCZz*EJvl|F#Cyi~YJ!cd
z(N;GL&jh=2JyuYStjtESE)W%Fek*lLz;Ornhi;*L^?E=C_GGYGyv%H3QN+2_amvRc
z_m#lZ*8<Ve1LDu1H^Hyt%~45#1I~U2#rZ-bP+X*<&s&po+nv);WpCnQF>D6q)OMeA
zhdr60*#!}Bav15lahv{Zo+sEiqwk7X=Rj!|R3!!ow!JApP1(41T7al1?Fz%~c_25b
zowlT6`(5qr*E-l%H}9-rA-L9_Km}J`Y2iEmeP6!ty3lZ+^ju%96FFD~x@JSPmuq)8
zE4fc<t+izvOn*1b^iR2-E7A!<H20ELN<()K@H{8<j`A{8-_T@m$9AY$NGbg*O#BFs
zqFDalf}fu3pf?q=W1fd90$I<^2xRSD-;Qm#eeJ04&a*?PJn09J1?x{tWT&G3vTH}{
YcZnT9W7R7GJLsVpJF?^H)tiR@2MHHv{{R30

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-006.js b/js/src/jsapi-tests/binast/parser/tester/statement-006.js
deleted file mode 100644
index 24839d847a9e..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/statement-006.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          statement-006.js
-   Corresponds To:     12.6.3-9-n.js
-   ECMA Section:       12.6.3 The for...in Statement
-   Description:
-
-   Author:             christine@netscape.com
-   Date:               11 september 1997
-*/
-var SECTION = "statement-006";
-var VERSION = "JS1_4";
-var TITLE   = "The for..in statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var o = new MyObject();
-  var result = 0;
-  for ( var o in foo) {
-    result += this[o];
-  }
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "object is not defined" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-function MyObject() {
-  this.value = 2;
-  this[0] = 4;
-  return this;
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-007.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-007.binjs
deleted file mode 100644
index f873474cbea4987859fc239ea04e19ccbabbfd20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6300
zcmds5-EPw`6wdfZ2nh*^3$AhrOsGR3Awj8NUC}yKWg^vXk(YRFAdM@>UDsFP4R|Cj
zxr4Xh*l}VvPE)tb#?MvN*#7Ku{GIO{pC+45BHU_@FbZ0Slnf~vJ69aXIVQo}+3ofZ
zyjPx2CfI2<#GGanCam@Cf#ckPSxtTU5uzbFj_@A#BSaAkNi3iO^*?dGgmJKl^#gFW
zR$&n;pu)fj<B;V5`u5!b$1FSvF%@tz8mmJmjE3>BbrZJnI_*LCL%-RO-<k~xqGNet
zelKL0qDa7<qG)R1-37daA%@4W_0yf5mnLe4-VlCk%1y7r!c#=e>G~ly^yhcLzC?c>
zbv}A^`SUs){lI(n>4oW-%lG5Y%kv|*d(a*9I;Pz^AuL%5vFQv(*!2m-Lp;T9PEiy7
z9B%ELO(;$hh;lCr0l_<*e=iNwHi{y(RIKpf6IQ{cn`{x(x4~Snkg@?zScQcWR!3Lo
zIFAWjE~N>G4yRlTl2X$xjJXF`GYY!14}y&8fb_`Fv`J{mR|s+=&UeEY(YdnA;YtJY
z4RQ<;8sQV>&~P|X3MvJO18u8~bSGT^q=h5umTGRGs|?I}U&0ED(^Uj)j+_d9{<mbK
zzhB^QfY%_%r%_2@=^U|CCJy%=g%J*x-^Ar5%3p9ABY=u`QcvN*H42~kc*2V!)AkKq
zc^?q_#LYonHlk!!f}Ioae=I;ap&;L2zdn8*q9m!Ap94Bq`9&1h5%Iq`BNPV_RI6EK
zt+Qa4&nPUatjM1OlMOPfJfNWXBygEb-KCosQgog9?Hb=5YH2eD1U-*n*s#J<TzHIS
zCC_UUU+PL84$|B5^MdcSR}Vi-`U=`d$zDi-X&pFz=C-Z;^^oD}KyAeQQ9DA@1dBX8
zfmhLZ`O8XQYLSD)MVfZ%C~LE58_ETK-3#x!4O#RKYQtg7t04ujPC4>M*{0iM;ThYk
zWeEk*QYtXnm1n>DDV51<Mc$wD*%}$DAP<~}6&3s*(eIy=iyVIje>xM&>ryt)VrhYM
z7FT1ze+!gba3DrfiBW{hu5{&ZnpE|h*Lx;_om*FgTDC?hP7kxRm4bslG&9tjLTvgF
zu=(7qrBHN7da~lK*?)ca4Y}IKGqqBvMqQ5}ekc4f*G368??f2pfl%>WvMy<?pA{GI
z>iIVyEwk+taDJ9;T{2}!7+{y2xF~i-*NhjsRgDLofR<ZwTDXs(&c!p=q(vFCE#iNL
z?v<fh9+wB?<J!(?Tj^SuT$LV|R7v`6si0pgwXK&mEX?5H&#YQLD{4HRlTy`&$KRsj
zR+N5eBm6DgvS@@S6&+?dR?;+(BjtjpK^jd~Iktqoa<q&y+EDRfuVE%;KTVFBUY7&q
PiBt}*Xln^cH)`qM2JHN_

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-007.js b/js/src/jsapi-tests/binast/parser/tester/statement-007.js
deleted file mode 100644
index bb561b691a5e..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/statement-007.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          statement-007.js
-   Corresponds To:     12.7-1-n.js
-   ECMA Section:       12.7 The continue statement
-   Description:
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "statement-007";
-var VERSION = "JS1_4";
-var TITLE   = "The continue statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("continue;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "continue outside of an iteration statement" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-008.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-008.binjs
deleted file mode 100644
index a2b521f4985583dcc6f6154f9f1af1b8652ce0e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6294
zcmds5O^?$s5Y6(95E2p+2Tr*GTA?ly2Lz>p?G|lURaud0ugGn@t=TlG9Cy3@D_r?i
z9J#^2VC*=t8>gw$?Us*I)!2UajNiN&Pn}IC0dCYs82OE38VxBLJJ%e?=|}$D*>87`
zyw~0!nqa416LabTiCN>@BgeT1v+DZt6GRE>2lxOF0z?rbQ7E8%^*?sbNa!zO{Q#Vu
zRag-fP{emgNLU7-Z{PND$jB+dRKSI3tPUMBO2T2|Hf-ayn!WbNZoMYI)oT(&$MVGd
z4q=$0K){`&U~1sq2fUaehR3k=^S!-SCTfaa6Mn19O|Qekb41PQ`XScz=Xb!~qCZbs
zpS(@^^Cleq$b0emrRkXM`|;=Y{K)O@wR@eGX}3-YOIAW`I=vBg`xK)ymxOLcQ4{_W
zZf#vmD2`)@axV=5!8@FNFAUQr3IerMtQf#2tb$87*&?X#g1KNJWj!3T5(_1)j;_ve
z856i%N)r$rPPrDug{E5=^8m1B6m;hh1R2v_)QN_sO+rh)LXaDAzE46#=gKaJD-Fmu
z$T3K0fKQo2$#A3;R0<LY+Ep9rPPzg}3rB2Ps=0x#GBD$P0V^y{R}!!paw7QI--3<)
zeu2LQUV|W?1_gnobHq}aINS$B0_-opiR~rIUvL^Dfbw^;nZko>6uubX2``FF+t+aA
zLqP0CZU*YI5shXA*ck!;#{z^C3i1seY>uDDD2_MG&mNtt{343$AR3%GBNX}pRI6!a
zt+QaC&&Vw*t;qL)$p)EK9#Bwx61YsJ?!wJ;DSDIn?FQc+YH2eD1U)?%Hms;1E~4al
zV}eUj$znmeT7F(|y!PbbCrO?_hbTTE6lm6hv!_1W$({}=t`5{hY%ppDXc}XYgeUMM
z8ZUoV=}RpVkhn$DP93E(g?6D<;CH?7s9Tdl@1ZaphP)I~099&{x5_r%CJWElrYuV+
z2$e#0Nv}Np)laERt`v5E&Sw?UQ%)N=4@=7TgGj%BPOhl`1^nquC@)IcJdLFV&RJZI
z1^+Ej?!bXql<12hTzaJ|f0K-=-@M*10qo4WJk+u^N^v@vC4Cg^ccGJ^9u#8J$AHb}
zru~GxJCc*-cTNB6yRXUBE}p5CLNzw^0^)bVUvf<pWAjdgVaFg;Jdso-jrE)23Z6Xw
z2Bc-GeFDx;x(m^i#l**Mbn2qe75y?^;+C}>boN>9$2s9Xg$ftXT$2+;w6+NT6{1&!
zYI$59jn6iAPTLyS!sN2txTHkVZ%ajdrMy-xWmuTOW1m?ydsY;9JRv2L4bQ$sxh<*t
zk{0+oxMk4-k4t*Xa;%_TAV-STPJ=Yst8#1!d*x^mXSAXGlU~D&%}$yeHN7qeinFL3
NT+z@HdTtcbzX39A`F8*S

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-008.js b/js/src/jsapi-tests/binast/parser/tester/statement-008.js
deleted file mode 100644
index a71fc266da37..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/statement-008.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          statement-008.js
-   Corresponds To:     12.8-1-n.js
-   ECMA Section:       12.8 The break statement
-   Description:
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "statement-008";
-var VERSION = "JS1_4";
-var TITLE   = "The break in statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("break;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "break outside of an iteration statement" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-009.binjs b/js/src/jsapi-tests/binast/parser/tester/statement-009.binjs
deleted file mode 100644
index 1b521624dfe9c5996172b36505896108f4073533..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6133
zcmdT|&2Q5%6wmmcxFGRyKpb)eO`|F|pj2#K(TYl$XtgWy60Z$Qlgf71^-l$HM&iHV
z*>PewPFuGNMVzX}_V4+9{oZ?Suw)YAW@Chr-#j7lkf5=1!*QIm*q=Fvo!-a(o4yxM
zu+ylCJ&iD+ta;;!<J^Z`4gL5jA^|!J@e%eyL=X$&NI?1OKXopG$e+jh2{=2euwo*h
z0^bRufaL(X_>PYw7Mur|2)GE1)ukyTK{RaM1u^}0YtZ@JYt-boMoog~Sbed-8!${z
zDBvzpm>78X0I&Y)<?H?Weq;h>z%^mAhLm>`&Rim5Zr9~+Xv!aey+u==w!ieNGUXk(
zdb{=M;A`Eq%=QiWYkP*g4Wb5}LAPz{tw)4qL_XqZBkU5)5)!$TA%@407bf^MjM~1M
z5KJlLcR#}yVTbeYr3u<XVW^IZ6CQlRDy?*dEz)@xlm!h58(_LjLkX*+t9x8W1x}Pw
z1w@7kH#99(-9niMfHft+ILAQ6m<-}>JT$!~sALy%+(`4oAVOrO^l~`S0C58m19^t{
zoH-;IjudxFKH@-oN|0_Oi(6OCsE^?`?nVKe$8(9dH>A_=a2dnSMXYKn6Q@7OsU$3k
zW8Ec|G{E6LpdiG)@@&yS+bc`Iw`WIA3HZvx6W)E8x^H00hk)3N-5k_qBN9(buygxv
zt=w-pK7rn`S6zIbAWAEa&jFb!Iu~7R7<(7a2t|GfZDH2J>QQjWcN7jSZGG!y<f~{`
zL2>2)lgUb1D!fn;t1KtCxO8Y*%^VQnIe=w@+APV1bAH-iyfx7!tK`WbZ7n~~Sza41
z_*K$j;~3GSfIytJ;qsZ$cJd}Y!_|RWh<T${h!ToL(VM{VF<v~t=tnIooN%M5r;f6A
z4DCT}=FXlQpEiu418BsC5pO*dz&f@6ozhL$$-*+WHOmqTa;21BGM8t+`Yn~pYvtX)
zv)LN;sXz`q4wtmcN3rgI9$fL+H?XHOA-oA>vn-e9V$Q-f7V&R^!Y5@Grv#${E_3P1
z-?XIap4Xoy06W*N2({>pVw^5!>5B#Sd+=tU8h9b}DPZ%x+4x>GM|!iO)a<`5eZyGo
z;i)<)Sfi?mgZqR}PAx>S=@X$?8;FWml68Z|dMx-0Q_KGWX<2KZf$`-mA190kK6c}C
z7rEz2<W<(<@<4E(Ltl%ht{Dhrv22m?E10ef)zT(B1z%KlPhQ0ql^#8PEmU4s5Et}C
zx&)QxYZbHg>V$<FJmHzui^__wj#r_Sr(tNG=h!99Ui!lP9=t4GnCX(ITe(*9geF(Y
uDNchlo-pOwg6Ng2Wig{I6$g0@lbX*}a@DlDTqrM{a&g70ksxuSd;S9tO2kP3

diff --git a/js/src/jsapi-tests/binast/parser/tester/statement-009.js b/js/src/jsapi-tests/binast/parser/tester/statement-009.js
deleted file mode 100644
index 9be1de747d75..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/statement-009.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          12.9-1-n.js
-   ECMA Section:       12.9 The return statement
-   Description:
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "12.9-1-n";
-var VERSION = "ECMA_1";
-var TITLE   = "The return statement";
-
-startTest();
-writeHeaderToLog( SECTION + " The return statement");
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  eval("return;");
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "return outside of a function" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/string-001.binjs b/js/src/jsapi-tests/binast/parser/tester/string-001.binjs
deleted file mode 100644
index 47330264d8ad85cd782ad6894bcec1085903520c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7914
zcmd^EOK%e~5MJJ|14xJih{JL#s^~-FMAIUg7SXCoD-!jJ+^m}{-R?$Sr)~ZU62F1p
z!-YHIPcZg+*Y4U$CXYrbNRgtf?QcA<Zzi)9-t9zmqtd1%*f?NGi;+|BrssJ_Nzn5)
zcWS%!clBn{p<ZQK?x{p!$~V5h^t?x~t70BMBrGIH5#6HAh%my#B$iNt{+)U!VH{k>
z`UN;QhG8X4LWO}B#vv~NOz}Gbjd^$+QYPVIa;h(#au&v|je8)bzFlqX?AI#G>RDx3
zftXlzxqmO@l#xinosp<(;XMSr4Cc+s%Bl^SLoZ9CRg}bAaO#XOd%JmqF^%~XuxDt@
z!|l)YX&LhlTz$8``sJ-{nAzL$&+P0d^lt1l_O@-k&456L<a0pFwk~y8!V})>&?TN^
zk8BAOSa$oO!)Tg9me)Dq^c1pBh8``RJJYmEqDUW=Cz|kx>f|!DMkMtE&^YCU@di!#
z01XwaiLUQ4i3)-)l?sHly222tQ+0$gPXOzj0q=YQLZ+;d>?JK*CrKyYAkVE--wb2I
zdRi|}kPXl`&@oVGM31@0!d6=|sNy66w5SD{M!Et>gdwI))j~mED_F$6BPtNL8<4XF
za>n_^PlurS=lHu|HAwPq<VY+tMv&wr;69QtqCtO8%&u1chTB*PRQAbq8V|uy^rA^S
zqA9X<AH$SS0kM|&1*p&4EID^z7XkP$_8=mlpx)5t^y2e?r0JC7v%z}0zR2b}N}4BL
zo5Vo`-D=)hn^CYSc9aec?8sv<h2Z*29l5Rp8cIYwm`s&!r|=I@)myQsV;W$TLb9$S
z+|&udtHPiAo4e4WYlu96O{f|@H?AgBnyiPAa*w_`<0zM3{x<KUFEbB@-bzfziGWL_
zZXR@m&<gOL)9X`o4+82w+-i7RYT9_T#&J9wjCTs5t_ZMxJ-DeP0!q}9qP4fvBoEUO
zQE~pr!OP#Ku=&abgh7RGFip-Z0uXs!3`ZiMCUd&#)J)%-10%3%!83#6rAm0SU5!XL
zrLxF$V0LucfBs~OL#Qarot-5n%E+~L5eltf)$3ntF=3A|vdAFXrwtqA`fEoOBlPie
z!WM}5M>u#ch{7Znp;q>LkMeBbOoJMXeD&l-{@-~4`^4US_F6WF`%iivvnET78LO8&
z)oG53giplCt4dO86P#4+)oss%&t;-QxEnouxq{iye+!A6p*#bBX64^s_hWkQ@5|nP
z&9`H~3|}PrdqDRy_+n}da<bEoiSk-`^TKQU9<Fpk-bVzvzW}ohP!tD@2=5^*KEZVb
zy&w&MxaXj<YWfxl)vwsAJ}y@~|28FzNq(c%K!h5C%s6VyKcqR;^#cZe1M0^Q*!UQP
z=Ji9kq}+U`*~>+_RGJ~EB`2R6$FgM5@vW8|Q)ac|=6<y(q**WK)LNg=SF5goGY&fb
fbs7iD;bk05?bkDE)pn>_aCaPPamZT|XHowP9B&ak

diff --git a/js/src/jsapi-tests/binast/parser/tester/string-001.js b/js/src/jsapi-tests/binast/parser/tester/string-001.js
deleted file mode 100644
index 68bfe181c9c7..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/string-001.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          string-001.js
-   Corresponds To:     15.5.4.2-2-n.js
-   ECMA Section:       15.5.4.2 String.prototype.toString()
-
-   Description:        Returns this string value.  Note that, for a String
-   object, the toString() method happens to return the same
-   thing as the valueOf() method.
-
-   The toString function is not generic; it generates a
-   runtime error if its this value is not a String object.
-   Therefore it connot be transferred to the other kinds of
-   objects for use as a method.
-
-   Author:             christine@netscape.com
-   Date:               1 october 1997
-*/
-var SECTION = "string-001";
-var VERSION = "JS1_4";
-var TITLE   = "String.prototype.toString";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  OBJECT = new Object();
-  OBJECT.toString = String.prototype.toString();
-  result = OBJECT.toString();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "OBJECT = new Object; "+
-  " OBJECT.toString = String.prototype.toString; OBJECT.toString()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/string-002.binjs b/js/src/jsapi-tests/binast/parser/tester/string-002.binjs
deleted file mode 100644
index 732b8e6cf1fb5bee1212637e8b8b5afca253d837..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7976
zcmd^E-EI;=6kh+e-k5k}jEP*CHjSkkuPns~#YjV-5z<>TWv8%q*(I|>DX-$o_y9hE
zH{R=0cxHBXXJ7^xU?Ei#60$ox-<;p?oIP8hgT9Z8g)T;J@q~mOf_lzP$8pX=cjT0+
z_2cH-W;^U-r;z8*6nrnD#c$6X=OH{*P`95V;-NDiAK|u-2%=sXa41(^N6v*8xZ_wq
z0q4d%tdMXh&vm@OqbY!TeAUGP_0By^I9z~wQs{^hFX$BS!7<HBxm9h{3wd#`kQX2-
zR+B$p^C%|B=Wv(EA82@6fEUBO+~0q#LnhF9ZnT0p@fPg5L_~jFm0(F@{s8O^8uPUB
zshO2A?||sX%~zk_=!V(69e;1mj!f@XwN<O=daD6p8In%`Eq-*bPeK~fQ6KN|;BB1i
z2drS&%2l7>D1sz!QbchNl8;9oPVXDDw2XXTZsj}La0|=aQkAyI=?9>2L=mAa9MKsX
z3Ro3g%CU+Hj4g!<h;#<b5Rp-J3uPVw){p@0d;~tmq!re}j;<4Dldq8GTBeu00FjZ@
z%VAst><w%T4C>=^>JYEfl>{m%i2?1(gH$7}0n)+{Su-_LFeepE<K7Sz7Shc~*%UdZ
z{Pfar(DkSIyI?g)@_}ziEHy?fxrxDjK%S4?>7LkJsr&`fXbCjwlWh79#!>jHjr*)8
z(sf_Ll#c<i9_CWe9PN^DXuwVb@Ly~}SU^F&!R_qg^8`gv#_`!ABUxW~Z|#Te3#W?$
z*N0{`X{^;KD6uCdHqC6vD_{!7^;tCJTaXnSN(|<}M(G$@^4VEY$3vy4G2vEg8u+<q
zUyOm1W{hyi5{x8el|E!bL#&FP$>{a>&`xy%)<8&rMJo8AG@=?zN1=+x0x;yNJJ29P
zYd}XvVJym^t@kXTSiPUyrLL~jT1^pGLFt1ekW{fPOu>pp+Pdp#OQKpCIKfW-Rmo*Y
zUWb^rup^63o91P)H<GnRkPQ`DXug!M6Q2vZQ(do)ff$X&*U&1(lOF8WVb&twd3dMs
z9G>GvM7&`bxnh2gTt>9rE&FH?Va|ko7%cUs52sYAEeypuSx+$)W#LM^3uTyb>{uoK
zXOqXm$jtLl_^fKJYWcs;W(#!r*MxH{;@`r-_rbw5oL2o(UJ<_4u458VJ+JZ&V5jZL
z<ko3>BuCXSoxxF00bAv$NpqO#DUm`weaToIZ)>w0Br%_`fmj(uSSL8H*o)ha1HW;i
zvT(QcXl4zQqyHAta>DWs{24b9xx-w5hq(st^bd0J&14V^i!q=+BR<fhMGbUIIap@J
zy%!uce)jf`;RsVsSsukAJ+}?x571VZ-2`kA<8!FoglZ`+<CvYy<eXJoRkvBFJgZ$6
zJz=7D@~@t-Bm*v12rblLj7F`#1Z33ceg}`Tv3>G&&(!Ef@#jarG%<A$OGZ*vw#CsU
z<3=nQ2GL^0TmZx(J5Bp^C)TEfzF0K{oU+mI-l}Yzd>d0XM*0^Vv8p>%ESTF4v1oh+
M5^HllvKXuW9~<8ukN^Mx

diff --git a/js/src/jsapi-tests/binast/parser/tester/string-002.js b/js/src/jsapi-tests/binast/parser/tester/string-002.js
deleted file mode 100644
index b68f2a156a95..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/string-002.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          string-002.js
-   Corresponds To:     15.5.4.3-3-n.js
-   ECMA Section:       15.5.4.3 String.prototype.valueOf()
-
-   Description:        Returns this string value.
-
-   The valueOf function is not generic; it generates a
-   runtime error if its this value is not a String object.
-   Therefore it connot be transferred to the other kinds of
-   objects for use as a method.
-
-   Author:             christine@netscape.com
-   Date:               1 october 1997
-*/
-var SECTION = "string-002";
-var VERSION = "JS1_4";
-var TITLE   = "String.prototype.valueOf";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var OBJECT =new Object();
-  OBJECT.valueOf = String.prototype.valueOf;
-  result = OBJECT.valueOf();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "OBJECT = new Object; OBJECT.valueOf = String.prototype.valueOf;"+
-  "result = OBJECT.valueOf();" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-001.binjs b/js/src/jsapi-tests/binast/parser/tester/switch-001.binjs
deleted file mode 100644
index 8fb0718c119783214fd073991c0e492be268cf0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11212
zcmeHNPmdcl6!%j86p&D*_Rd_<0=or4r7GR-CJnG?8>%K-aX?hFGv377$xQIf>~1fJ
zdp`l(`4D^#ZU}MY#DR~%dyYN!WIVGo$u`>3xg<(#|LpgB&(H5YyOX4|fbMiA)b)2B
z@o3E5DS3?$auoT`NOynm_3-Y{i)NH`wnU#!z~W@*`3HpDgkBwU_!E~i_b8wbs28~0
zO;{8PC}01M$q5VnJl0=;vvCnt#03=d2@6@00hrV8`!r10F{50-h3-@@I!-tX$2)Jq
zG{b&xwExYZvnBuQY)KFkYbg33u!M3q5OAk%kQVUX0lfH(CEnzt?d{t|NCmwmNbATM
zufeEOmlwO6D_D}uKLC4;WIpLX9$priZ^F|1y@z{GKPfV^ej@)~ACYgsRHOaTLBA-s
zX%RJT@)n{^s57@qCr;diPGM&h!PigfpX(#_ZJ4Ti_~qd6VYmOdDEkt`qJ4gP`?EWr
z-zmbaKxO}Y#%Uabvm7c_i5*O{|E=Dx=LUfuDn@wl7u7z>6tRYHM8d#Wcrv1Km9a=z
z6J4)k6%p{%ks`Q!oTAOfR?%w+a|5u>IJobx;9R486dgq4qSl00{sr7+!DDt==<;V;
zE`mNAPC+=;;3Nv@aY8s7PxL_~T{{A8>WNH}UI1hbA};&HLjfHvU}pCgtEjQM3eT4z
z&yUXRr)46ormJFp7#9phTwvc!LZ%sXLYvRUPy?`g&O8-)Ky$VQ6a}VHEp$ii<N_5O
zPkws3n*}*C5>Z&{+r)fH>HHBSy@*abKjh#089ycwwa6tcxn)tZFg`-G@iiy+dp)?d
z+~UqA*EK)Q$^A|bZppQfdqeZnoZLrxa7(U*+*_KT=Hz~>2mgP`J+mEX-6#sE8>;xA
zaG-6haFV?etXiY41y=FkQspjNgj6pucqQnZ+KhCN27$8BmP;%=)=CI|w{dw`m54&+
z;Fz5gl`dySE3?tp0q`_pewMFoG|e?y>-Q!VDcp0L#%k8-&~<NTnt93GHZFd(aueES
z(zw#}MH+f|uV7v=AQIdQ%;3sl8kgT&m{CTJ(nPHt`!h^k$T@3(W8H&=v(!>&Yq(4-
zO49Qg^(;^_G%^vpLFAq2DhaN=`l9F8_lT%{<s8S7cN4$CY-l)@SeJ9rgS0?ZH4QAZ
zn0zdp<S;7pq004T-_7rE<|Uv!-9C#w&Zbab3=`NwF<rXGSz$zCssBJl7kS9hJzr7}
z<`ssEJCJx$7}Fn8sJCXqH{?jnw+Xr}sCUU?(jFAV$03%0H9*}OEE@IZJ?&XdS!(Rf
zB~1q<x1>2n^&>MRxuAv2#a!m<S}IwNQR!-RCal$>Gb8W63OX}PsMT4S&YayWg1QPi
zGwO1!&dPMQy{gX8$ypAsmhm#icUNT`&(<YkhLY3BaI~$?%5-KHl2zoOz6ERA@#TM-
z0fmmDbTo=efz&}hKCp*=^h}Qw0pn#|&|iniF|o!-REKKHbqhgmg0W$4my2I(1aP&l
zykEeLe9hedK8O{I`(Xz@Cr%hSN1VDR@rMqk1ddiq?6{mdVLCmcJpR~mMAqoA*eQ}`
z>bnL_73qUgLqo)>TyzPjvixl!ZdQx6WxK}nMYQ($b4JKs=j8+H58#cU&cB4!y$}7c
zuX?O!O$YKDO|8I`(R?|%hN&+Q9^H0{@bkZW?kq{Um5@DH{<{VtB@e4)$<ey`WLsHD
zMK)U=gUA-UvoK~XJVTUiHj6Z7TPVTEmXe21vb9*Zk_{I;Ihvb{_`C;fqDGX7RdHq)
I-M$6>1Ma5_;s5{u

diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-001.js b/js/src/jsapi-tests/binast/parser/tester/switch-001.js
deleted file mode 100644
index 44e72985dae4..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/switch-001.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          switch-001.js
- *  ECMA Section:
- *  Description:        The switch Statement
- *
- *  A simple switch test with no abrupt completions.
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- *
- */
-var SECTION = "switch-001";
-var VERSION = "ECMA_2";
-var TITLE   = "The switch statement";
-
-var BUGNUMBER="315767";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-SwitchTest( 0, 126 );
-SwitchTest( 1, 124 );
-SwitchTest( 2, 120 );
-SwitchTest( 3, 112 );
-SwitchTest( 4, 64 );
-SwitchTest( 5, 96 );
-SwitchTest( true, 96 );
-SwitchTest( false, 96 );
-SwitchTest( null, 96 );
-SwitchTest( void 0, 96 );
-SwitchTest( "0", 96 );
-
-test();
-
-function SwitchTest( input, expect ) {
-  var result = 0;
-
-  switch ( input ) {
-  case 0:
-    result += 2;
-  case 1:
-    result += 4;
-  case 2:
-    result += 8;
-  case 3:
-    result += 16;
-  default:
-    result += 32;
-  case 4:
-    result +=64;
-  }
-
-  new TestCase(
-    SECTION,
-    "switch with no breaks, case expressions are numbers.  input is "+
-    input,
-    expect,
-    result );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-002.binjs b/js/src/jsapi-tests/binast/parser/tester/switch-002.binjs
deleted file mode 100644
index 1906560b1d9b725689ae1af03e40752e1ea40d5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10566
zcmeHN&2rpC5FYazI8dRALvD!5frE>(i(_hIoL!cRQ)WrAOAcHpSsL$7MJp{M$#yQh
z08apK!gFxrzzxn^xYIqFzm-O^v}-30)@8RO&Gbxv{WIO4G|2K*L=OfF>W2qUc{1nz
zlDt6(IZ477WOy`rGJP-&k`*O`Juzkwu{1ll|0y9K!l;2g{h801e-hCzX%P9`&sY)*
zQK7j`$#WKm>$3g?IXjohO1KckLc(H}X#w`~M<I<fcFHIh;$nYkHl1di#q)!AVVUW8
zG&}lcGT4*%276M7Eo&;qAG3^dKN8~3{3x%;dmrSb=PU~rpY88|UKOcC?+MTba>X}c
z)|t<%!|fex2<9Ik`z3<;Z2ax?s=#~)wmu$x{pg1q0p#B=56HJ+soBx&c--s}Eq(GM
zl(wK=;g?>T`59e8WK@N3;hp1)6{l$m5k6J&h1*em-x;DKKZ?v$F(ZIm)C86t0xbgi
zJx~@j<k^g-O&U5v-0Wi;6);sw6?{I=5$M#ZdJARlf~<26Ip;AXW6EdAaWb!3O{9`v
zA;v3VK4h`aUl_dzCK^cHkcuIFM)WizoXr;|d&+!-f_BY9wh695WD6j!I!&X3o>5Ty
zy~8V7?5-hPwd5k->r2N%#!NTG{qQiGio?tuOhTs>3__n@JNPHy_nZalxP-?#1QZ0e
zQ<a9Jb=FQ-oKMKTLwz#K<5S5}|F+E66waSO(aYeh!RMbZG(I*E?ZCa;gIiPD3Ev~c
z;L{!4V>7w;Tt{TzG5B-`_pzDWgX;j-itO&-KD`a#p1X4HFi9fn$La{H<lLPtlI`Jb
zK-F0olu*Uos%Qk)A>Qunx)pFPT~0d5qeyvZk0la1t!mcaU08nC)GI-Ad&(||>gcr7
z%7*DJ5O|ibP`4C2UCZI#`-4S8m+`a9VlDX(Ox^q1GOt<M#?5cXh@fv~oym}|@;E@g
z)~0Sz67a1npmLXKJs)gW87;c!RuTIPEL~}fS_sG1oW-l$K?QZ(CX$i#VnqXoC|P&f
z5{FR|JU5Lz?!B2n|LX%H=$W;|u_5RC8?1(o(<tj|2y}!6h`&5?z+&T3I>}*{&Y>#x
z>HqHBc)?Pv!yU3T;A{yLSe!u!rF3H&uEB}KR-b?iBMxhD7h4*^y25cW0!fg>Dg7}A
zN>D4`5hJnQF4(qW-VOPVN5I+6V`M3ffVMOtI`!^DlUZ$DTEymtu7jF8+8nDv*N!AN
zRB8+DZEkO+n(bI*jIi1FFs_oo4CKajQ6A(ONv1pf<bPu`t2Hg#%r?@HQ{T#^0FZ`7
zPb+eUy0m9sn~5!t>%&qcBu7|!hq~ZW#?k+;z-AWH)Z47iX8YUP40D*{tP_a$iO>-x
zHiMxKE%|S!vKyKRtu)>TRb5coOlrx*rTV0FX*<A%1;d1%o0*~vxvDqRcOcTSZO1y-
z6oM+l3vc)rvH^CEYt?a!^04(g-)nd!-I7`O1k_5!3sMh$7harrCs?bb4?ItFogPcQ
zDlE1|TL96}ekh<jN^I(7HxO0V|CJnBZC2j47qUMq!^5MvhVHkZA80s%Z?{bUCj9DS
z7>8rkM^w&sLX50bAg^%gOO(eJp+@=Q_Q+plId=kbAJ9NDMFHXrAW2x(kuLJF<BJCQ
z#2xVRA+A{Y08Bn}`JA;{iKLNFYQE-?Ppiz9d~nHkGlf%#--obc(U!@XO_;e=cRTri
D!sR^Z

diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-002.js b/js/src/jsapi-tests/binast/parser/tester/switch-002.js
deleted file mode 100644
index 3e08630bebaf..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/switch-002.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          switch-002.js
- *  ECMA Section:
- *  Description:        The switch Statement
- *
- *  A simple switch test with no abrupt completions.
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- *
- */
-var SECTION = "switch-002";
-var VERSION = "ECMA_2";
-var TITLE   = "The switch statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-SwitchTest( 0, 6 );
-SwitchTest( 1, 4 );
-SwitchTest( 2, 56 );
-SwitchTest( 3, 48 );
-SwitchTest( 4, 64 );
-SwitchTest( true, 32 );
-SwitchTest( false, 32 );
-SwitchTest( null, 32 );
-SwitchTest( void 0, 32 );
-SwitchTest( "0", 32 );
-
-test();
-
-function SwitchTest( input, expect ) {
-  var result = 0;
-
-  switch ( input ) {
-  case 0:
-    result += 2;
-  case 1:
-    result += 4;
-    break;
-  case 2:
-    result += 8;
-  case 3:
-    result += 16;
-  default:
-    result += 32;
-    break;
-  case 4:
-    result += 64;
-  }
-
-  new TestCase(
-    SECTION,
-    "switch with no breaks:  input is " + input,
-    expect,
-    result );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-003.binjs b/js/src/jsapi-tests/binast/parser/tester/switch-003.binjs
deleted file mode 100644
index 21fd56d2cc4ac2a0e62963189770566c5049302c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11449
zcmeHNOK;;g5LVxhLs1mHS4GiF7DX2ArC4|aY+M&jk)}m$?6sgJu1!RiTuP3U{UJr)
z{ZYN`p~wD%-aA9lA{~xp#!|e&+Lr(^rH?b;42PUg>=d(U!jC#*&f=r*WHyp)61*G)
z!7z)jg5#63ulo=BQ8wj4=TJS<Nkm>8{d5on@4{0Z`}N063N}pm7d%RsWQE951r?kB
z^Wa>h@iNvwfb-HitV}8>5eFg_MFn6_e-iVw5Kjb`3NB?6V{~3fk&ceufNA=@?%?Fx
zv(BOZt#hbBY^=U|{!|oPvP8jMuw>@oy$yKzTolpxll%8Sb0HVdhl;e0p79lU>w-!5
zaod6o$$SRbTO{*w@B4mRWWElj_qyLa`r%WTne7w#@Aim%4W=5L3{HEl-*!fL=H&Z`
zHs)cOmtkJ8f=^&&xZn*)?OjeK&vRJe{RO^CJ6`=xF3~Pa67#BhBZ8l}Sy;Bi9t-*{
za27n2#enB^9%@({-PqB@1uT`?1tv!`BswQu_izRa>Rdw2`3j0LmxJsy8@W+arQ}yw
z<IXZa7Accg#;*Vi4U}#u#ZW#I{-g+`7>!N!)b$8~?wN^fl5PRggNU}vG&&d>2dlg%
zvcki<n&ny{m-W8-mzc<e>8_+7Zf1S8nbC`>Ogwl9bAD;#_pD492Ihvr&NojaOl&rc
zTr9oOzJSF4(vbL}OV$R&tCQhQ@&0o|-U+fc;2oC^f%M|0`)>_tk6TIiSHX&d9V;|V
znZMXG?>3%Zd+YBFbAH|m^LV_O?^@FT(UAJfR;b4g_;TmC|Fa?YSFLc5J;&AVk^fgi
z@}IUs{+nRM)925=I%PG|Bk;gb+*peEa+XG@mfFH8B7xdD1tE2kuU2F2v!qAw>a`D%
zt%e6U?i?bW&IlpqhGt?R<d;((5m5TfYa<>fS#)mN==JjTv-biejx2St8!E1UgRPi2
zwOH-Q*GLP<ZnK1-#pc7aiv~21s<a4H$>3G*d~?mZR1cN|5sN&MVgk}sT7XiP^Nr=P
zn)Fhpe*8`lU?EuwL}^kN=2fx<uFW9I(wzS|1F4Qw>O9%Qm=o1cnesUdIyteS;`0b(
z)=`SWq5<$#_HZTKduU>8CyB>`ZaLppFjgg;w(eR}YukLg(IgHM`)Fd&$ZuabKrnV^
zqDdUd_tC74Cc)U9i6+t8?xR^7O@gt_qKUH*TjrkrTKW&nuIteLyf-@HBg{UUwb3LP
zbE2v!td7y!JGKyCcJ|S%jV8g^orxy#m1iH#+GrAtt%+t$hhcgw)5hZLphoBmFJ#Yn
z#^>fu)oHeMDFi!O{2q@jth=SC)c6k!M7e0G@%3o$ysuf@!YvTbCi_EhD_3_CLijrl
z(<~fH&d&1(VW_00P~^nT4!ihz5K*HnEHdeah;;(i22iU+pKFP{FqV?Ytec#e&*jZd
zki1IGk;i9nUD8N1Dz83(=kVFZy+u+EP)}C7-ogUgNBa`#7N%a~JW3)foG*XwvS~4s
zBq1Mx`KX{S2q71c*3(ugt$G+!?%JI{Jwh*dJ%}?pcP{l9m2=i?*OXa3vf=`r9(Cnx
ZJ+S7gTA38;??bQ{Irrg=cAZZ0{{b4CgoywE

diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-003.js b/js/src/jsapi-tests/binast/parser/tester/switch-003.js
deleted file mode 100644
index 5ceaade69884..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/switch-003.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          switch-003.js
- *  ECMA Section:
- *  Description:        The switch Statement
- *
- *  Attempt to verify that case statements are evaluated in source order
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- *
- */
-var SECTION = "switch-003";
-var VERSION = "ECMA_2";
-var TITLE   = "The switch statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-SwitchTest( "a", "abc" );
-SwitchTest( "b", "bc" );
-SwitchTest( "c", "c" );
-SwitchTest( "d", "*abc" );
-SwitchTest( "v", "*abc" );
-SwitchTest( "w", "w*abc" );
-SwitchTest( "x", "xw*abc" );
-SwitchTest( "y", "yxw*abc" );
-SwitchTest( "z", "zyxw*abc" );
-//    SwitchTest( new java.lang.String("z"), "*abc" );
-
-test();
-
-function SwitchTest( input, expect ) {
-  var result = "";
-
-  switch ( input ) {
-  case "z": result += "z";
-  case "y": result += "y";
-  case "x": result += "x";
-  case "w": result += "w";
-  default: result += "*";
-  case "a": result += "a";
-  case "b": result += "b";
-  case "c": result += "c";
-  }
-
-  new TestCase(
-    SECTION,
-    "switch with no breaks:  input is " + input,
-    expect,
-    result );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-004.binjs b/js/src/jsapi-tests/binast/parser/tester/switch-004.binjs
deleted file mode 100644
index cc3af70a45719503ae28e8d9e19ba254dc8a589b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26087
zcmeHQy_4HS6xZ<$L%|FTEhZGq5SUBIFmnXwnDfPfV=fMJzDtpY(b;=G5m_>loJ$G{
zhJu2Eh5|B_{6};QLrG0T&wHztw9-DwYxzs|>561*NpE+5@3-&0efw5!2IG;<cAMwS
z?C*Z*xdYD}8qXMpaq9M;7_EcO7u}oPo;zYjbDQ7Ov@Ji_{mC?pD{xm+e*C`aS>~zD
zZnK_kdS+m`4j0u=KKsT)%ju_O{S9)qCdqO=F3Rc~mSY960J-^tK63)=%wirF=a|E!
z(|+Jt&S3XNXr|lVKR&qEX>N<}n%hE%EUU}!KePhonKl>q$h60byjMV;e_;i^^AE0F
zyP=AVL~nD@nxe&L;i*Tar`|62pd^@og6t)NdB1(sofnudK-b&*clW;fP(^0>K>o8l
zAfJb(jt`Cx+v>PwMrd;K4U~4y8X+$meqaV{2s1+!zI;&sS{|q`LsPAj&pIb}TkRut
z>?MFje%`qL(Z@SGs<;`TY(E}(%=f`qb|Y2s8O-AENo%)n+II3Nf1(FpvBXBnL)5U1
z2pEvX3yzszL>3`dmY(!umLZ_m5koM&!5BH~lS9`S%xfU)!UOaDIruf^9lM9_K-C(z
z%1^;uDi*V4Ii~j{8JB@J8@wQRHSk0>I|~fY8k{GNNSJmMbTw&625A8zHGr76$HM_O
zk^#oNCs?7;y8_D>OAcLU{E=uVQPWiP+k;6raFAw+fNAu6D}h1Qv&OKIO!qny%zcMl
zNd21U<Um8#84phx5rS~E_uvL)O28A$vwFEP5j+Eb|9%?BQzGceYA*ULW0nkbO*Hr%
z4D~_#=w3nrYFH~&;SK2EBo(5*qNqOV{uD|p8KFAREv08!S@Q|^v6;P9swfQE)E@9z
z)}d6S8RX@REKhr(4HZ6Wk;{)IE4QUWE1Q+Y&cB5!ml)anl)IMZ_W0;zWgZiwsFv&6
z%yd-7@yT_Qn#|&nT$j0ZDSRacd3W{>yA{?R=`AzbgHg=lE!S?&;d=0-bGv=#pwqss
zvR<~cCq;`TSlymkkBw+a7h@>A5k^vvT&o|qu$9UwW};3~38E`;2qQkrJzP8V5th!$
z;b9C*Y%1hob;h<GSr;8><Y!AllF2*Fb6tYj)Gp7a(kTdTXrIDO*l3C+8fz}Sh+Q-M
z$`_X7q%S$}lbJjP@U*ba1^)MvjGw}QYob3v;^wO0w~{K*41F}=FOasm(0@lkuMwKb
z7IzAK&rI8As?*(Ee7~je)rh)E;EPF%YnKVzSz?vR%Uw-YW2{08+gwurs6lFEV`@_$
zKEt1sz%EJg>z9e*zW`)q!f~xF5KV^X%Gz9l|3JZ>@rnw;lXO!FW}_Jiyz!;-jU>4>
zNr~v2swF6ae2%2eCHK!1xiyyf2-Jk_o+*?^NZMS;XJz{7+?Y;C+FaOYVLGuxRMNN*
zk~SCe_rOXh0n6ex3YWceRDuH7#XdVT$2L{=6>c3bAh*8iMDjaTBf^|Ep=t&|p|{pn
z!mZ^p0L!kz_(OG;e3mV~Af)DoE;p_$pBsfGd8BdBNYiB;`Pvcy)Daa2M<r|WSTt4#
zd;vRkY4e@2)5C)-@|hNt1P4(@aK>fm=O2`rvVU48>sM%6iC#1Yk6Q<pGa3^fe#&m5
z6=RP_tVf6vWRoSfY`6C?DeA<&7oRNJdEekgxT*c!Y<ZyO$)Z1?H6%`<tof80A}mnG
zPsUI(9-0eKkOqYket2pr-ujQDurMeSm$mBo!hQ9$BKnr!^Q<A1x;p_(E}xYyw=bX<
z@9OvO8pi8cMTA}2hjzJ=damQMZ^lrL9hZpkXNQy}E?K-VOUXA<_iFi??>Q5sIA|A)
zi})fFu;npRnvfyU!jpZ`?L|I=muGODAszwPQ-e^P+@L1oah?+SGERX(O#$NYVGd%k
z7KIXIT~t~5MB=AbKI%BNNfn(T#R~*tl~TS&T!O<O60No33l&cwwvLJ?@{YCQ3l&cw
zRw>1AP9BvL5l^!ytF22PdcFiU+hG@toT3sDZ$!LYY51{9K9U)m%oaT$883Dsz%tP{
zC!$*ukqCgX92JR}bGRf1v<iW+Ml6JBCAzkmbKvWm0|W>1L0dQVPbjXg?Lcm1Gy%Cv
z5h3FMlre3^$-a8hE8s+nU!KaRYtgC{ePnb^IeV_;hqYxVEIa0u^Q!Tyq-9OdPDji2
zBrlxgG-#DF=o;!TIJZ;J|6KhSpjIgYXl%lBE!UeE)Eg90{nVMDDp~l9h84!5V^19%
zsr9X36oqbhfjS^lDSfZ*&0A#BD8oM_TT}xRTS88`^xC1$UQz}p%3jiM?~3shd=&rj
z{qd!5o-QtXiNy%OswKYxj&rmw=b%`L<s6vGB;N{HDN<_0ySeA_H~}nh0rjRzY{8`>
zu8mMW=4NQy%C%o-v8m~w588a^er9h;_HHG&H5ccj&{5-ifUww1ErsM{`VUMALYJ!V
z)G$zJZM9wlzkql4YL>&j4P6v(@P?AR^M>O#PO);&zu9Q;Lf(euH&j?;jcNc<P`4Qo
zZ%T<p<-sLH<(1TCh#YlRd@VO5|AYZ9KElsXP#jitvwjDDCm<<&<-B?e?!$YdMGING
z$?uFK?x+VVY<j}r(dXt2KKy#$90g;K1mpoc{H6p5f+H0n2_MGcO*kpO#oZa=MeO1#
zPDPO?SDqv?K;kK!^y#fqae)eK#U&*wk$RvQ14&$$7hx-%%PZFxPh#IQ@AMZ}u<z--
zrno>GJaI8+k4s!d6qTQ1klIT-WO0F-s^Su17sM6php)aRUTO<#f)%tTypKJcOZ?wY
afJLuDBhlQOhHBL&(;^g)GSkYXE#v<IIRM!J

diff --git a/js/src/jsapi-tests/binast/parser/tester/switch-004.js b/js/src/jsapi-tests/binast/parser/tester/switch-004.js
deleted file mode 100644
index 0572874a6b47..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/switch-004.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          switch-003.js
- *  ECMA Section:
- *  Description:        The switch Statement
- *
- *  This uses variables and objects as case expressions in switch statements.
- * This verifies a bunch of bugs:
- *
- * http://scopus.mcom.com/bugsplat/show_bug.cgi?id=315988
- * http://scopus.mcom.com/bugsplat/show_bug.cgi?id=315975
- * http://scopus.mcom.com/bugsplat/show_bug.cgi?id=315954
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- *
- */
-var SECTION = "switch-003";
-var VERSION = "ECMA_2";
-var TITLE   = "The switch statement";
-var BUGNUMBER= "315988";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-ONE = new Number(1);
-ZERO = new Number(0);
-var A = new String("A");
-var B = new String("B");
-TRUE = new Boolean( true );
-FALSE = new Boolean( false );
-UNDEFINED  = void 0;
-NULL = null;
-
-SwitchTest( ZERO, "ZERO" );
-SwitchTest( NULL, "NULL" );
-SwitchTest( UNDEFINED, "UNDEFINED" );
-SwitchTest( FALSE, "FALSE" );
-SwitchTest( false,  "false" );
-SwitchTest( 0,      "0" );
-
-SwitchTest ( TRUE, "TRUE" );
-SwitchTest( 1,     "1" );
-SwitchTest( ONE,   "ONE" );
-SwitchTest( true,  "true" );
-
-SwitchTest( "a",   "a" );
-SwitchTest( A,     "A" );
-SwitchTest( "b",   "b" );
-SwitchTest( B,     "B" );
-
-SwitchTest( new Boolean( true ), "default" );
-SwitchTest( new Boolean(false ), "default" );
-SwitchTest( new String( "A" ),   "default" );
-SwitchTest( new Number( 0 ),     "default" );
-
-test();
-
-function SwitchTest( input, expect ) {
-  var result = "";
-
-  switch ( input ) {
-  default:   result += "default"; break;
-  case "a":  result += "a";       break;
-  case "b":  result += "b";       break;
-  case A:    result += "A";       break;
-  case B:    result += "B";       break;
-  case new Boolean(true): result += "new TRUE";   break;
-  case new Boolean(false): result += "new FALSE"; break;
-  case NULL: result += "NULL";    break;
-  case UNDEFINED: result += "UNDEFINED"; break;
-  case true: result += "true";    break;
-  case false: result += "false";  break;
-  case TRUE:  result += "TRUE";   break;
-  case FALSE: result += "FALSE";  break;
-  case 0:    result += "0";       break;
-  case 1:    result += "1";       break;
-  case new Number(0) : result += "new ZERO";  break;
-  case new Number(1) : result += "new ONE";   break;
-  case ONE:  result += "ONE";     break;
-  case ZERO: result += "ZERO";    break;
-  }
-
-  new TestCase(
-    SECTION,
-    "switch with no breaks:  input is " + input,
-    expect,
-    result );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-001.binjs b/js/src/jsapi-tests/binast/parser/tester/try-001.binjs
deleted file mode 100644
index 6f46fa05719732865f6495f810f59397a41fafc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12926
zcmeHNO>^Tk7<T!F10OTMfs^6Du)}OK%f|sGglW?N>0|@bWP9x>iIRBNwS(-m4YR|6
z3mmxuGyDOLT=^Gp;=+MHz)#?P71>fO#gUyfyY2L{-B|K#>3N^`Q>w<(iBD_QF(rfA
zS1cSca_T(cI8HAd%$)sZ`>^wIryowJQ?2khRo{!^+O1v3c?o7!)z^;+^GMI92ej`K
zMq)1vxTt~r9XSuYV6Z6bFOajdN><3YC~x3+ffuI&)Xz5uG>E;SM;R9vkW;znC}v(T
zsyz#z=``xy=9leiMLerkgb-C$htF?$F=fQ(;?9Ua)#QOVSV~q<BCx`ts*2$!VeT1W
z`gHZXB_aG9WN#6|<Hk{EQxHA_OK;Tg?w!1+BeQ)V|J@#tPs69W&2Foq?^|VrB@<sk
zX=CcfZ01HWiRmdAgD!auL>m_qMxzLfx|7J~oTKS;qgB?4@5@*D8+~|0r7fwuwXosm
zVW+S|7I$fsw?iRTl`hw@&KA%+iY*W}nj+AVaqAYFc^PD#GjKCsfd8ee8@9rct~KsQ
zeg*^AY<%Af2%E`$Ip}4;TZ8unkLlB4>@aUMmJU-mBNX(m{E!OLC5W^DV$+@(H|WX@
zro1<>!eVtfwwg+wJNxvf;X@^z`|BpfXJu_BKE45{HQUE~t>(eW;okAyNweK;eBL-Z
zfk*c?<ESe5i2$OhH*k4Ob%!By?~^mK>yu!#+YDklqRj1w0dRHN2Ock1V~GeWZRK(C
z0o--7S(~080t#aP`kpzzeh2i>|19KPmLUR7?ET$4AKdxyBVD@c0W1unC{cu>@~q=(
zE9N(oVl03}f88c4vQY~;Hwvkxi9ENIo=G8Xh}O*OCwV<gNdtF6P1O)AreAwv*C6_6
z9_L<O)&Xha(7SMw+$cp@Nj+|-4rph=lVt$MAihv{p~4*JzfV(Do3!@WE$-TL<XcdR
z#*xCh%&|NRBCJlou6BU=)r7G{V0aGRYX(E?n#@wGOYKL+d~IP{<2lk{y(01{kPsKH
zA3vK0ee7zf4K9=fU8xB)yiTL#U9*BfzX(zTn}qNXCL$aQZq!1P+@f?o2o<WU-S@-(
z1DPwMo#*!ke}qI+^9Ci2Zx0#{qX0{6DWFJ=`-$A5x+e>Ou;k;hM@ldSn@oEH_r0m!
z0CvW}iT0?W0OH>6a&({UGW&M{zo8@qX0T{V4pwaR>nZ5UAwD!t1L#7f!C!qFdK?~r
zR9vHo?!$*tA*#@_Z3~q7<`SBeRqjEk(iOiD_U_Yu>`WN;X5yI<77J3Mv$;#+v4kMe
zk_v@|AY}K@5A$kkPO&!3E8|{rtS1vCN-TVdS(>0It3gW$y~tR*Z3#Nlh6{V^UrZYA
zj#+pvO&l4ZrSk<9SGYhG@=Xy*IhBHyrN)%tk^EIxSQwY@O}HG<c*-*U?{$I6GnMr*
zNU+!xj3uDoUe;8kllBwn7d>;)#3@HzD&H&|2*!7MF@d<CyK|GeisoV8!2vA>jD;O$
z`^J`Mw10pcEe>R5ZKel}=Q~iY5Z`>hqk_C2hCU@hUOOklf6;@$oaJoQS!|chqzlA1
zdZ+<sOoD+AXUu$!-Z${S<YatdX+^d555TJ-EK?-85}X9I5odA6k3YJs895CroB9S$
ztMFW6T(&NqE<d+P$tSjMvg#5JwNB#xxbBl_M0qX5YtQ9HnTorGTjKoEJ(4P=a4`Mz
zhTQzfJINJFpBJNj&5wI@4Xs@hQeCECtVZO`5?Z}xg!G&LZqaz&XrY5P+~tv&@r`0W
ziF1?dHCfv7Nok)e*}z&Xe*0RmxO{v?h!@)NI~u+T&TDwOM1-oUl5r4@ROOpI+k>_P
zUOidc4za6>`AMBb2CL!R`vI~`E&a0azt%S)%62?ZjoZ8XVR<;MMD1g|Y4?t+J0q15
z7C`1?>L!j^E);79_m;jmlSqq2<`n@2_nVh{E%D>(7o?>W$~A9n?9tz^vZU^nv9VXV
zjk#klc6pWM&s<)6*;!qtD$I#mD*Y{Nbw%V{Vq+^pAuey8??5@7lkdC*^KfpG?<`x4
zMc$*79NYQ&3JB1pE`ebFxK1X}cQdAe6kdK!fyK7X7|kz)n@>l@px$j41KOn>@f<yH
z_QXaE8Kb)LT8FPk5?l;n49i>+79-{iL=3KIgo#<WChaP>7&FBsF@$T%oE<15nU=U1
zQCyF9!A<#Mwsjzekn53t<yVZNnikJ;#Q?W_Bcz!V1TlZbW!$-C@qcfF=ojF#i7^&r
X-BMz0o<O-YK}}wUzD${y(J%cERryIC

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-001.js b/js/src/jsapi-tests/binast/parser/tester/try-001.js
deleted file mode 100644
index 931837cd3f00..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/try-001.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          try-001.js
- *  ECMA Section:
- *  Description:        The try statement
- *
- *  This test contains try, catch, and finally blocks.  An exception is
- *  sometimes thrown by a function called from within the try block.
- *
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "";
-var VERSION = "ECMA_2";
-var TITLE   = "The try statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var INVALID_JAVA_INTEGER_VALUE = "Invalid value for java.lang.Integer constructor";
-
-TryNewJavaInteger( "3.14159", INVALID_JAVA_INTEGER_VALUE );
-TryNewJavaInteger( NaN, INVALID_JAVA_INTEGER_VALUE );
-TryNewJavaInteger( 0,  0 );
-TryNewJavaInteger( -1, -1 );
-TryNewJavaInteger( 1,  1 );
-TryNewJavaInteger( Infinity, Infinity );
-
-test();
-
-/**
- *  Check to see if the input is valid for java.lang.Integer. If it is
- *  not valid, throw INVALID_JAVA_INTEGER_VALUE.  If input is valid,
- *  return Number( v )
- *
- */
-
-function newJavaInteger( v ) {
-  value = Number( v );
-  if ( Math.floor(value) != value || isNaN(value) ) {
-    throw ( INVALID_JAVA_INTEGER_VALUE );
-  } else {
-    return value;
-  }
-}
-
-/**
- *  Call newJavaInteger( value ) from within a try block.  Catch any
- *  exception, and store it in result.  Verify that we got the right
- *  return value from newJavaInteger in cases in which we do not expect
- *  exceptions, and that we got the exception in cases where an exception
- *  was expected.
- */
-function TryNewJavaInteger( value, expect ) {
-  var finalTest = false;
-
-  try {
-    result = newJavaInteger( value );
-  } catch ( e ) {
-    result = String( e );
-  } finally {
-    finalTest = true;
-  }
-  new TestCase(
-    SECTION,
-    "newJavaValue( " + value +" )",
-    expect,
-    result);
-
-  new TestCase(
-    SECTION,
-    "newJavaValue( " + value +" ) hit finally block",
-    true,
-    finalTest);
-
-}
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-003.binjs b/js/src/jsapi-tests/binast/parser/tester/try-003.binjs
deleted file mode 100644
index 22050d00b2cc12240d8c5621574e581a94c67185..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12267
zcmeHNTW=dh6y8#xTq*>wMM$d%BoGh>q9PPI0eiD)46YN!PF0?&i9NAbUGJLRb<^<7
z69|3)4~TdE1kd~gc;t_8&UkibwzHS<HEraF*0FczoSARFbDgP1<B?1Essl=Td&hy_
z56IAX$uNvFzjtZW8?A5JJMFGNqDHmC-l@7y814Q2iDA46Z&l^t4@lsUGnekuu1f+E
zIljk4^~Cqkc<gw+w5)$Y&W$oze!xUIJ;U*wC=np5Z}g}aIp+=ym^hCN#iYY1aJ>HB
zEl|_8txn^pRju&fsueComepqOH=T$E#AV{15O<s@FA6R{-P+n#<;8L<46!O#cN3=Y
zgaqpAvicd3{AaaDKCn;Pi$d~Mn7VD<uRZ!)MP~It{<k_HUjbE}MyF}3>y{azNyv9l
z+JKrsN;8Z|M2BD#s^rxpdK)Z!MMnNQU{F83*E+plw@=iy&w%O|AaM{yqn%161YbA~
zH-}w+xC#F%XXAc2a!FJP2mZw)__o>YJ6}1y-R;k|?|yk#RX+#x_R~>7!w}qRJKkD`
zDNTOQ^otg8T``o6=)zA_crzIi4KIoS1G$2zL&G9+aj~*=F^_qcfboehfdu_Aay-mj
zy2fJO23Z#YIQm0~fHdg%O~0@18gt>lWpTLfcqF(K>oU;6L%f9e2QkZ~=aCUO{ecKs
zJPx2Sd@K~nAT2?p1`vymjkrKlEHL4H1}ijXSKuZS$&)yne9cfKw&{7H-)%st6I{0a
zA&mx*qNsqeRs9IBA?s85mS#+N4aPk+cg>A~v!RMl5zqHsO1wDjfpLjdC8%Cwkbi~s
z&I&Rn!_gq{FU*ZI-=7X=w3JkOc_Yb5dG45?f1Nn}(;RT4vzox2k$4wS`gwpF=P+LY
zei>Ikb?iMDdtI!_<njz9K}|J+a%~vq*L*Uf8qQkNsr>=U6?@YV{|1bsNzPO3(lo@O
ze`H+BbidpJWd!Q3-+e3s2ri+xTE6+7VIX5u-h0MaRD%St?_tU#1Wc22><YZ(HEH04
zyXtrz4GtjXaotNHD0WY>K+WLv0SG;)HJUr-eq-Nk9d*pZM#pTlTK0)~&}h|~&F{>5
z^T_&E)fQ`wKV|KWbFn{|kfF60UEd4o_hW$0ATCt)9@IxkfJ==o?<5qHMiw?TTTa12
zppSU5*@8yuj{#+iMBRb9doo0tTzQvs#opfmrkM6a%Ra_dj%n3S?;Unj9WgVK&q?wk
ztCl-lAU>f(GK9aJ8Z)i^@2z(<o#4dHFbqG(wRU@{TNiJoyoJJd3O|81C&Eg?1bNui
zI$vf^%Xhv<r=9tnFV-_jg95$p85)c+AYRXf=Il9!59bH?D{d*v5Krwc{{jt)yG%`i
z1!y*f1*_g#pj|)HrNKEbs>Oj;Mxnq^t&I7@Hau1U)W`?Q(y*M`B`cwlju~(!6Q_Jg
z!hI*8-N=Ty$6S$0BhH$+$n*6AckpVR!@@JOmHOsol7b~5mP^JVWr;E?cJecJnNJ#4
zfPAH@Wyw;ec4_Ye_Nqm`z$xuI0eYsxv(f};E-tRCk({lItC1a6u}+dEtJbj&b?em<
zp9g*=4tk;;$hR_1Y3C4;B1LBWZPIAcDx$p>oTZBs7M3;Kf$1?HC7ox;ez3exJhfZA
zKEZn7nfywFwM?BE3#k^p5F=R=a8b!FHfHc#(juWuM?Po9%3mP4M!-@H7L8D^eL}W`
z1H2`O)a<(8%?zv_J~WH791Q?VD+azxGQl)wiS?5CkvhZJQ_dhV-=<_?8p|$koN_-N
zPd5IP^$2qjwKdB<lSX(FE#zTWYG^;N4Gpi=X;OG?XoXkuGz_h*=X_1gY#q<o&D6D-
z6<=0eXgn*<U~>$uq+G#pHhb$Yvxd>^A(l)Gd)SkS!NuHkO*Hx0BBN*=#C1}^8YZ`=
z|Advk1v29<K+cWDu;9`%f0l7Aia*KDgZab!1A0lPa=n*7%gf><+1brVX?)hnpfo<4
zUHpZd>xcX)vOIk^f<MSUvE>g-ZUIh;S@!?$ARkeW_b#(2kW{L*2!EKL74jGIqM0;4
L8>b1Il}`EpaW{ZX

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-003.js b/js/src/jsapi-tests/binast/parser/tester/try-003.js
deleted file mode 100644
index 9244fcb5d9a5..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/try-003.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          try-003.js
- *  ECMA Section:
- *  Description:        The try statement
- *
- *  This test has a try with no catch, and a finally.
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "try-003";
-var VERSION = "ECMA_2";
-var TITLE   = "The try statement";
-var BUGNUMBER="http://scopus.mcom.com/bugsplat/show_bug.cgi?id=313585";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-// Tests start here.
-
-TrySomething( "x = \"hi\"", false );
-TrySomething( "throw \"boo\"", true );
-TrySomething( "throw 3", true );
-
-test();
-
-/**
- *  This function contains a try block with no catch block,
- *  but it does have a finally block.  Try to evaluate expressions
- *  that do and do not throw exceptions.
- */
-
-function TrySomething( expression, throwing ) {
-  innerFinally = "FAIL: DID NOT HIT INNER FINALLY BLOCK";
-  if (throwing) {
-    outerCatch = "FAILED: NO EXCEPTION CAUGHT";
-  } else {
-    outerCatch = "PASS";
-  }
-  outerFinally = "FAIL: DID NOT HIT OUTER FINALLY BLOCK";
-
-  try {
-    try {
-      eval( expression );
-    } finally {
-      innerFinally = "PASS";
-    }
-  } catch ( e  ) {
-    if (throwing) {
-      outerCatch = "PASS";
-    } else {
-      outerCatch = "FAIL: HIT OUTER CATCH BLOCK";
-    }
-  } finally {
-    outerFinally = "PASS";
-  }
-
-
-  new TestCase(
-    SECTION,
-    "eval( " + expression +" )",
-    "PASS",
-    innerFinally );
-  new TestCase(
-    SECTION,
-    "eval( " + expression +" )",
-    "PASS",
-    outerCatch );
-  new TestCase(
-    SECTION,
-    "eval( " + expression +" )",
-    "PASS",
-    outerFinally );
-
-
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-004.binjs b/js/src/jsapi-tests/binast/parser/tester/try-004.binjs
deleted file mode 100644
index aad744afd13e0a8bcfbad0dc7540f88c43dc60af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7554
zcmds6OK%e~5Z>~B9Dpn0u<EG@l~zD6C{$|Gpr&d=MWTuuauYXMy4j7qPTSo08*t(X
zSAGf-7dY}qnDKhoPVH=+M+@quRo3gz^ZaJUTjKp*NLNc8N?NPCEN(N>^{#lHw;#6#
z-g>pRRexD;#y#qlmc%=yFi807_lKT$7v3uA+xG|y$bLvSXfq^?@F0!^R7?F%yu%=B
z4P*TVoVl~GVkV%1mKQ_;&jIw~t1TMw;2@w(z(u61gibgMqW0=dIHq1HH>z)Hr6u{S
zv?M`vth#uAJK&U&P{19Luy4iVY_Pbz{KCY`aF>L|O7gg?Ai@!0=Ii?L6I$}u#aeQ&
z^0q!JOWpv{E9ITF_s>krT)ZLwT$~}V!%>ZDW4mJNtw)4oKt4dU4)q}@{e%-vyO0wm
z@)Q=Wob(t?63Fd(hA;Ai=FhFkStenqwu&81ctll7>DoG^@@>!*G-SL%lOhcztd6ea
zm_`L8NvQ&1?LHbhv8wK%%zeN*X23R^K*N+Z;_bL?dQI@iXP`=hE!TsHuz}LcLzV&3
z1`-D14Cw*)SkUe$-jrm7Ku^>`x{=NS(!mh3CTLX9R|@8FZ;1*A=?Zc+M^4E;|7kf$
zx#@oizdK;11{*ZuGU3gRX)dADJlGOreyHR-(h|CLhw#qR-KvSMN8Luum3hQ*@%{(e
z<X(?qIP<}z8Fo!dP<*^Y44?^YTI3$Tv;puHG@mp8M1*x%d`#KG%Hv`uIL6d15T{J~
zz-s=A2`HPc+$)zS4}VPI1|Rk|q#NdwxJ!LTqE_7X=}D9JuwkE{jdLC;=U9*VhYrJ%
zFkS0`T*AlhI$rmqCR$jZjt~h(njTC`-DLF0r8A@hMIqZtFPnB2^t1(UpdE&|+yNQ)
z9GRFh*>o}2!?<~<>KpP#@kF@@*oH_#3x$H~S+8X+1n1DSII<DiT(XgAAKfrhSXsj4
zoR(G^9bBK+L7?15`4;)|w0kZtmYrIYPoSz%nH&s_{hXNVr*;{Ruk@q`or(!Hi|qIY
z)y~imS~is%BEvB0ybe%$2$vw)h0Tz&$4$$hwzO0&nmQkI6D%NSL+jydFgCU$9F!Em
zIFrgNWm{b*2S=lOK(c;lagPplYDz_$&T7O%s;3ZaN{1{dMH<&&*`PlM%?d(zL<^K1
zYYR*5x(|g(>12~68v%pRu7LQNW9RZ~vkY(8jxa}*L()&EaIh$FqYHq()j?+wYNj1^
zl(Eata{x8$ufp__#rfn$&b*!fpM4Qhk+)5G+AYym4Q_MQ^@=zYuAozwX_pyP3yV~;
zTu>Pv*>62sCiHWS9;=;#o@YfCINRX8R+%KaMp9;>*he5I<dkt+IOiLdbLgec0n)KO
z6ZIMBYr)q7M4D5N1c$^ZVq6QNqkvdye9P=*3s(mri~5l<^)0HMqe@IMDX0XWptR^M
z?$|(Q)I7X3P4VFa%rNt$kISUT`z&Llg7TPtCHn#b-oqS~42AiM*I+6J<pO$Nzf_Ws
zt+^`KEO(J|#ZDd?q%j-HwNbscw$=FLBiC&4rY)WBz2wq}JAAo{)*2qO<pR20n?mJN
iOJ2&AGj7+@U=@Gg0Wt<b=CC3M6q?zZG~x)Oarz5PaDpfR

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-004.js b/js/src/jsapi-tests/binast/parser/tester/try-004.js
deleted file mode 100644
index dbc5545596d5..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/try-004.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          try-004.js
- *  ECMA Section:
- *  Description:        The try statement
- *
- *  This test has a try with one catch block but no finally.
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "try-004";
-var VERSION = "ECMA_2";
-var TITLE   = "The try statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-TryToCatch( "Math.PI", Math.PI );
-TryToCatch( "Thrower(5)",   "Caught 5" );
-TryToCatch( "Thrower(\"some random exception\")", "Caught some random exception" );
-
-test();
-
-function Thrower( v ) {
-  throw "Caught " + v;
-}
-
-/**
- *  Evaluate a string.  Catch any exceptions thrown.  If no exception is
- *  expected, verify the result of the evaluation.  If an exception is
- *  expected, verify that we got the right exception.
- */
-
-function TryToCatch( value, expect ) {
-  try {
-    result = eval( value );
-  } catch ( e ) {
-    result = e;
-  }
-
-  new TestCase(
-    SECTION,
-    "eval( " + value +" )",
-    expect,
-    result );
-}
-
-
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-005.binjs b/js/src/jsapi-tests/binast/parser/tester/try-005.binjs
deleted file mode 100644
index e1320df37a93baf488a0f25bdb68dc66499e5de3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8284
zcmd^E&5jdC5FQc|2;z`j5lF+Hh!8AF#08m^Sg#|D7K5<GA(yDvZtQ{ajOl6bu5WpW
zT;K`v3VDr4xg^KDNUC~zrpwzsvpwq{A#&N3r>DQJ-><7`T5>*%`Ce<n*=X;jNXLRr
zgD-+0I7&y0V87dY)_>F=rZXP2cGWwrILhSS&$oi$I=t1Q+g~#gv7?wD@L|jZlTn%|
zsFC@d1@EF{w2bu+;9NQnD-{YV8U;}j$r6Ab-yQKpMsFf66kNilM(9k6C>ifvfn)le
z_MrQs*V@(3TDuyAV)fPghmquh#R~42#d9Z~6pMQg9z3-13fx^~v6epWOAz6h3Hx<=
z`~@xf_jWD$y7Q{PE=zt5qIcTQpZxNJZJF&G^55+l@+&xM&>b9hY`tkjcn0Kmh&JIN
z1Z9{>CixU{!bV=fqMg&3;8_N_-7oM}e(>_SGdbHVj?GrJV+fD9NhzwWM=E~<nu3Nx
z4tQ3lp@yaCMvhffK$6rdFfpE^p);rI9?E<RSSJG5<|)uH7lZUL9ot@0Jn|8!(qhZ~
zC}Cn@^a_w=fV6>xfjDFSMg}4pPYiErGD4uc<{)aM4M2JrV%-Fd3Wi3(GVUEw;UQg3
zu9nC-*_S^Z2N^egD&cnxtTYgdLE2_=II+#8blL%1V$3gH`JS|dZhg+=<o?U9jZUNP
zAeF{E>bUgiEg#BYCNP}k;-VRLSxZoVyhjY630zu~9{+3u;CImcq5+^HY$DPVF77=1
zzTOF*F?AKhX|p-7TIediK3g~Zxq=%)*gMc}*vZl<4+Tp`=``f0Lq5ZTeP=z+xoMo^
zJjRXyT_u-kv@znuD`B<L1Gz*tt~!32CquL_?T!!$TACSjOVg~n<)RGfK~c!I+RL_`
zRbD)UH_#4CT<(F4dyZ{P?K>*wew+^9nfncSqrRiO2iTTKN(+O6>qV{Qya+Z>w0N=+
z+FY}dZ69iw6|Agb$`r{dj)K#E9Rw<ERBq8PuexV@v5Xngf!^CT>ZcmWw_Sn!ip#k;
z(=pXX@|k`K^JiVn2AY&_+oWeB&_x+!*o2v$2lG>w9Yg|3K#YPSpf8m}n*z5gqE`ai
zUYL7T;2*#!RsrV0C)l>A@s*uK)NCF|IHlpIGw_BD<??9LOW-#s>MRYRGci|yx=0W<
zm_X$c!>q5EOHx%D-#&l2lGb!0=6sANuz((cI1hgU(~)t4^8f?Tq#=K7Y)f_WbPq^2
zj~(uzP#Y$f8ous<`Ot(-3y+!*t|%M}VsM2eAsUdSbYi(h+iKZl&>6R5HqW^7r7GE~
zOB%Y>!*MFAjN1!AC`#jy{_%em(ib;!VeIn%`pYVGZ+@E{a+%lveAI*Q6J}tj4!r^I
zsq7%*IZnbNm#h?2hez?7MvGydM%2~gCuXN&;&l}r*sbHFw#_oCk(OC0_A78Z)+SB4
z!Fy)7f$m@fke&^Px{BdezY~%G(dML);E@=0<my256cBIf&@oMLg{y~<b)`o`eG#ha
znyk7_)=vr`MCHwM&ZULZ{hUwWL*X)?<d55I2K`3CF*SvB{x$axARYV!QGBDcn=VaA
zxPWt96LNY1olU2r`mr-L^_pXtu2<Y#K_IQ+hF+_xqRCe4o26cJg%?>m8!mdO;v<w^
zMQbh3iSz<;JQ<_tr;aq#E9ZP3%41XgeGkZrLx~8><(OWm^GvP%oynulwwkj40I>{b
A3IG5A

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-005.js b/js/src/jsapi-tests/binast/parser/tester/try-005.js
deleted file mode 100644
index b50c5bf53665..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/try-005.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          try-005.js
- *  ECMA Section:
- *  Description:        The try statement
- *
- *  This test has a try with one catch block but no finally.  Same
- *  as try-004, but the eval statement is called from a function, not
- *  directly from within the try block.
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "try-005";
-var VERSION = "ECMA_2";
-var TITLE   = "The try statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-TryToCatch( "Math.PI", Math.PI );
-TryToCatch( "Thrower(5)",   "Caught 5" );
-TryToCatch( "Thrower(\"some random exception\")", "Caught some random exception" );
-
-test();
-
-function Thrower( v ) {
-  throw "Caught " + v;
-}
-function Eval( v ) {
-  return eval( v );
-}
-
-/**
- *  Evaluate a string.  Catch any exceptions thrown.  If no exception is
- *  expected, verify the result of the evaluation.  If an exception is
- *  expected, verify that we got the right exception.
- */
-
-function TryToCatch( value, expect ) {
-  try {
-    result = Eval( value );
-  } catch ( e ) {
-    result = e;
-  }
-
-  new TestCase(
-    SECTION,
-    "eval( " + value +" )",
-    expect,
-    result );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-006.binjs b/js/src/jsapi-tests/binast/parser/tester/try-006.binjs
deleted file mode 100644
index 237641e6393ba1f5ef525bd576e91490e294d554..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12542
zcmeHNPjB2r6nFVkKnMg9Cr*1Tf|3d(B%*DkX1hSDkW|@K;Y2m@PIgTkdpn+On*#^F
z2A_iu!WoWm<}>i#c*cI-89U?Mb(+v#vWmxke}C`a%=G1A9`l|4jI+tkLy=AeI}2V5
zg5WrvoCmvm2M<QuqcENGpueTw>BmtfckbQ}g7@I9KK=X=6A?R(`F$S7OfVUxi6S*A
z|IdQcD4A4g{RMPxTtq7sic~ZSq9l?90m^=F!V?*tL|iCx2|Fu=&ZLNv>CRigW;7g(
z_YM#GTl!glOB12AM(X|jNOHkqMeZq!7fyOooZr54=PR3@p}VCl*4OM_2N9k!VZTn<
zuV~3XFV~WfhDW1KS@I@`J{)|1@9`J5WiH>4e_x&<-vn0Uz489g)|(>26ObPwwHfaL
zD0`V?lAl3L*p%0>=<xYm@GOJa9vS*7K6vrm8Jq(a$K|K$ix3|1GNh=s9-;gWXbKt%
zIp$fDhMFv;UdpkK3Ya9d3QSBFXz0wTx`#3!0Ig>NvdwpphPfE0`{~s7n#v=;L8`Q}
z<!+QPabD^bV3vWT4M`XhXUtDzAfoB4%$qtHA)!x8M$||hkn}LbrV}(O*eew*aPL5c
zhjb0GT2RiDeeth@(Km}E#M(&9B>D?#TW!&$p79X$eIO@iB7HV|9`ZRdvu!|0?#5|&
zS_Z?#_5W9R#X{j2IhIs#-9&~nFgk!(2P8erjo~}|aWH&{jm6{9_-OCo+h&7%rgL<}
zwkLkuW!U?vB<TYAq{lz=PzG~>c|)E%JvN?28TkypDqb^)r?B!c9R|E=tqxCYiy4}=
zzj?4xmb7DaiDyWy`^}0S+P@%^6*tSYHq+~N21@KPioDWOX(rija9;cN_YyMXyP!mp
z7HZhyR{+vBJ$?p0w%mNg<w7iVO^x~SWs2w*7s+KltClX_s-eXUx~XmubK+Q>{}9QU
zjZ0;yUtIV);85;ObFQZ4O$mg(HVAa6DnyM)IK^WZQ`r&lEOXdb&3GKAHf<V)9_6HU
z<CCT_XG!g#f1}tP&{MprAItx0IjOj%Gp-M?#MJ}VA8P>X4Fpyiv$b*6u3S_>1u|G&
z(lUJV^jCnZGc;jQ(pkam=TXRdL>QV>wjQ}%6&)$T%rl3r!n15+qmNIn`Uf~$xynO#
z%u}jaT^mox{bX^$ROTTOYRl_qJPkAI;?|?y*HDhoRh7iPVs5(!8%NUww@OL^ZT2ee
zmWHP~U6o;`0Usu`sn{O=^`PjYTw1qP>G_|#=b~WIzG>+qPpYrnq>hg~Fz>Y`K%LZG
z<NG$`JyW{M)MH$!iuO<NiZ$wa_Psbs3pEwO7#(Gw*VLBfW<l$2#Gs~l75J`WKg^=x
zjEAST4_!v|z-Vp#HuQ?$7dO}%;L?5OZhEeZ2i8MZlz7+~j|KCMNr&qkrfs`Xa}x$e
z9NjC;4UD>F*~HajBpb|FGKt}E+0{6=?y54NYo!gG_^X`trmQ*_aPeK!gfw-uR^iMw
zD_*Sx<Y^u_&|JihLquwxcAIe?j6IT4kwi?!cOahJ&;X<s;IuwnpG4IfGMo)!w#c~Z
z-_;Peu^A2ngWCa51!#@dFJCIOdf>0d$QE!`$6Uo<1gFS3Kd0H}GOtd2asbzL%JXx@
z^kaAr-!)ffmL<+5vjo;`Dfbn#Qn!sIUR)Tk%mH+z*w{69d-xTLvDY1^4$ewDAnDmk
z>un#bptpL>sbjU>0uReKH7gX29;8;B`#p_?Jx%Wu+e#*ssIY@HnM8PlfYJLq*#F`#
zV8CLyBA38LqaaL^j6Yex-cC`3D4pwIb<a_rs@1M7xDH0}8oymg=^*$!An6f&ot>Ox
z++C&X93HmVU`}fVECVp}OJmMc?7FVLZaZc3jSjfG$c09c;<uR{LM88!;C4v0N6H@$
z*c`4CIQymt@bO2;I?Hc8H{)5q<lgGii_V@xuVJZLy1+_E+D(pL)CGI_OqnpWj=;&9
zb@f=UIfg32&v8<sSFQaV{k-<vPp`YegDfpWP%okGnSFOvui_p}^@L3?G#zg1R~&tV
oUU5dBUPFL1TtCf`s{Z~CZ=%kZ11-d4Er9A>jRG!P-W~M+0S43LH2?qr

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-006.js b/js/src/jsapi-tests/binast/parser/tester/try-006.js
deleted file mode 100644
index 0a85200a1522..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/try-006.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          try-006.js
- *  ECMA Section:
- *  Description:        The try statement
- *
- *  Throw an exception from within a With block in a try block.  Verify
- *  that any expected exceptions are caught.
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "try-006";
-var VERSION = "ECMA_2";
-var TITLE   = "The try statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-/**
- *  This is the "check" function for test objects that will
- *  throw an exception.
- */
-function throwException() {
-  throw EXCEPTION_STRING +": " + this.valueOf();
-}
-var EXCEPTION_STRING = "Exception thrown:";
-
-/**
- *  This is the "check" function for test objects that do not
- *  throw an exception
- */
-function noException() {
-  return this.valueOf();
-}
-
-/**
- *  Add test cases here
- */
-TryWith( new TryObject( "hello", throwException, true ));
-TryWith( new TryObject( "hola",  noException, false ));
-
-/**
- *  Run the test.
- */
-
-test();
-
-/**
- *  This is the object that will be the "this" in a with block.
- */
-function TryObject( value, fun, exception ) {
-  this.value = value;
-  this.exception = exception;
-
-  this.valueOf = new Function ( "return this.value" );
-  this.check = fun;
-}
-
-/**
- *  This function has the try block that has a with block within it.
- *  Test cases are added in this function.  Within the with block, the
- *  object's "check" function is called.  If the test object's exception
- *  property is true, we expect the result to be the exception value.
- *  If exception is false, then we expect the result to be the value of
- *  the object.
- */
-function TryWith( object ) {
-  try {
-    with ( object ) {
-      result = check();
-    }
-  } catch ( e ) {
-    result = e;
-  }
-
-  new TestCase(
-    SECTION,
-    "TryWith( " + object.value +" )",
-    (object.exception ? EXCEPTION_STRING +": " + object.valueOf() : object.valueOf()),
-    result );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-007.binjs b/js/src/jsapi-tests/binast/parser/tester/try-007.binjs
deleted file mode 100644
index 1a7d5b74195dc3106bc2097b90c53930f6888e8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13660
zcmeHO&2Jk;6yNauArOcg7kmUkNr6M9$c>b^E*OQRicQ4@Rh#wLUb5LWv+FiK^uT|C
z_^UX>l_Tm2apt|*nVo0P?0VMrrfuk@u06Z&^Y=dH&7_^prV-n3PnbX4zsHj?_b<Gc
zJkL8zhI8+*cl>RCuOB2+=CyalGwmo$v;8Muc-}kkRGYqj-{+x!7O^`lh<xs6VG;{c
zL;XGV&ck@PNb66av$Kj;!Ud^t=!J2Z6$B{z-jKyvI0_jT<YNCq3!P>>jK}-01Dk%g
zGw7Whw|C`l?OjQP(&~%nkHU;`KN92~`q9ivFXQtYH*elD=_$Iq!eVX7?qv|+q0i07
zDf=}o`N!2-@_zTUzb#9?2BLR6-yJ;o(zMLg8}jd~GvuqlYS0@Tbxpk~A{+tvAyS*L
z7J#yqW`4#lASU)&tx>{ngt5tD1Jiadr<|oJ1bJUE5`n^s->p&F@uNt;D&7d-C#GYI
zs_hWdZ-UC8D$fQi%_=mMWGQtm$0jOZwv;OPd^|&or&iS+lz9(mJ>rmdzJYwq_#in-
z#->gpq5K9p(@2|#VeIp{*2}|m1KAt0F=Wt)jWUmi<B3k7GAkjWPc<WIqy|Vj7-HL*
z8Wn751q<9;P~jk5MbH+M^Q>QdwJ^Fnivui@v|ggWpvaY0U+NhLLEi;(*@P#Lx|ac)
zA~Vwll;mNQ1m`*!RyP8_z#|3<2gp%V!F3fG*1%{0VhxaVFgJ#8_lHjR9(EWH`h(Nn
z@z>P`cg*YPh&@OA*2}PWl8mGa<ddBJ#DdJ5a?Bgq-0HExBuvR`@K*7dLOg|)gXu8f
zMUQndGA*WPmVV~JMp@F<)h3=Iwdp%+wrWp6CL?Z^X>F(JZ48v}gAPSrX^Auw?^QUj
zejj`V8S-sVB2Ef5Oz{^0Qa3$*20k|2e9E#JU+S7F^W*<1qMu$Q>wLCYx>&7-7BlF!
zy1_Sq)_~9NCcI~<+rm<hZ2&uFQ14ZDF80mak_ek^kmy8|2s2iMNVuQJHfCWq;8^Fd
zv6`?bN=(``4jt-A?an7jBId`XTmGG5P9XR5s(>tim2y&XwKJY0WbtPYS-)?9tXB|O
zN#t(~ta=4w5mg|A(I+kACr^L{x*CHMmL-`M)M$@l)*-~uq*?7vx2>ilCD`>$VQP4h
zZf*19lC1s$&PK9w&>a(%XjeDJ6LKHTEcv~rH&9zvzRQy^qeN?O_CA7wgsxi1>}w{s
z0~j5RV;q)f0(GVpx3%G^PS47ArUD--w5iyeAx=?LpOmt;ZmrsL&E2yqSfmB1Ast-g
zNcDxA#7UBaK{1Mg2@B43uq)%K&zdeO&9;i3`lNJU#8BB`+RBLyHKVHh+MLxVjr85x
zwdx;$&gMJs=ct@0;Mxj3ImQLEm@TNZ^n$@1-znJ2m#>&T6<Ohn&eNOeEFCuHCpP>!
zq&z$b%_p#yoM#!1)SXBjz|;<B6bn5ZZ0U7(fU9Rn)|>e8FoNTB+y0<-Kn9?h5s+fE
zp;@E1$RX9XPC=0E)HEl>&W4_$q-tB{S5VuqOmC#kf*!$*mKP*(%6^_f(`@(2nx}tA
z|8_}3{e9JeBFvaZ;iY-FBTp3(%h`O&5<Sx2S-{;P_k(jrcK|4g%K^j|{pCQa1VGEV
zkD|bF;Dwn4c7Ng=&_t+WKnd4|*S{dW0WV#HHO%lKrssyXsBdUn;NSwp65KbKMV2#u
zYMy$t@@ob_g_q*fQZVY)_4P?mx6tD_#996w4!rVW&4$NtT}xk^5KQqhivX@nC-{Gw
z#&gLET_w8}4M?-hsmdKc3nrb&pQTI;HpFymYr`$ngP9qF3Q#*!d<8_2?m~{fwwb~q
z>693`Cgi}PMY&#nb-`aGG?8;2BS$Q&86y-HB{3q|QtoT|xw*3@(PTr{)A3WPk(5~|
z_9IjUV<73^SLfSB4O}B>fTUxu@fKi89VdR=s?Hq_M#PF-x>K<L%u!1009&7!(y7Ry
znC&F-FvMF;KD|?jGak_{`w`sVjo}vLs>XS}ZT^NfqKY_>avUyFs?UR3H3#JlL{9@G
z9o*U2tsIOW*Q;XJ1RyFks81RL4z8%$TF7ovQ7%67x=I;cU5ER0xUT4{5q2d_eg1RD
zpTe~#Yoq@;y!-*Yul`1&IyU5Pz*@uQ8YY#cOZ9Ta-c-;<<Gzht#QbZy`XX0R8sqOF
z<eKFagV3~`*~(SptU~@?dILeO+X^#TTHZy=CDbo9@6pRu?6MZm`sG5^JsbImCB@4X
v>!nY*h9Ic83ZDm{`1dh9DY`)NX8A2#!rJ&#Ah}iv5^J`|r75yQ9-;pMso6zK

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-007.js b/js/src/jsapi-tests/binast/parser/tester/try-007.js
deleted file mode 100644
index 93e08a0a1765..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/try-007.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          try-007.js
- *  ECMA Section:
- *  Description:        The try statement
- *
- *  This test has a for-in statement within a try block.
- *
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "try-007";
-var VERSION = "ECMA_2";
-var TITLE   = "The try statement:  for-in";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-/**
- *  This is the "check" function for test objects that will
- *  throw an exception.
- */
-function throwException() {
-  throw EXCEPTION_STRING +": " + this.valueOf();
-}
-var EXCEPTION_STRING = "Exception thrown:";
-
-/**
- *  This is the "check" function for test objects that do not
- *  throw an exception
- */
-function noException() {
-  return this.valueOf();
-}
-
-/**
- *  Add test cases here
- */
-TryForIn( new TryObject( "hello", throwException, true ));
-TryForIn( new TryObject( "hola",  noException, false ));
-
-/**
- *  Run the test.
- */
-
-test();
-
-/**
- *  This is the object that will be the "this" in a with block.
- *  The check function is either throwException() or noException().
- *  See above.
- *
- */
-function TryObject( value, fun, exception ) {
-  this.value = value;
-  this.exception = exception;
-
-  this.check = fun;
-  this.valueOf = function () { return this.value; }
-}
-
-/**
- *  This function has a for-in statement within a try block.  Test cases
- *  are added after the try-catch-finally statement.  Within the for-in
- *  block, call a function that can throw an exception.  Verify that any
- *  exceptions are properly caught.
- */
-
-function TryForIn( object ) {
-  try {
-    for ( p in object ) {
-      if ( typeof object[p] == "function" ) {
-	result = object[p]();
-      }
-    }
-  } catch ( e ) {
-    result = e;
-  }
-
-  new TestCase(
-    SECTION,
-    "TryForIn( " + object+ " )",
-    (object.exception ? EXCEPTION_STRING +": " + object.value : object.value),
-    result );
-
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-008.binjs b/js/src/jsapi-tests/binast/parser/tester/try-008.binjs
deleted file mode 100644
index 0c3174f12fef9a2fc9ae0c9f8c4f00fed8bb614f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11748
zcmeHN&2J+$6rb|hMM8iO7fwMOSU|g3aY9w7Xw$F+Wdk(Xo{)+=agy0iXM)FR8)*-S
z3rFq<@qcjTpFn~We*{R}c+c^Sov|}<KBnEW>|v{k?dSJ?@6*q&@$o36yR{)Dz1=TZ
zJYeL^d&cv;lejnW_M7d`Iy)Ud9#OAW6?1A~knr8cd!F|S%&O_jj|dCMNk|W<9}-4*
z5J!SkPkkreX%O{hY5f6owieNfnIIMPydVmAMnK=b*`pB;`T=EvTtv<k(+OumG}wI+
zw&^tL-R9@*T2=m5t4bm|t&W)A3OHpX6y(lHIJVN`Y;xz`y$?-#Dc!0-tR}a67FakZ
z%$%-ozao;qUoDbHjl<5SkbD7HZ`2>`9e-dVbM-*}b9F#I4_kGc-B!btTek>DgM0_6
z4QU08vXXGZ=^6OMj`$3s3aR*U1a>&~d2F%3HE?cRju=f6@c2%;tMD3{{cd&HItfFy
zRIKpfC#oDx$H2kCZ-M+EH{)HJa1+r?LP=JquJ~9-1Pq;01i}Vmgg>#0?jX#oK<k1*
z4Ehv;GiBYl6%S0AM0EKP0;mx~_k)PAiIU61*aM*)LNkQZkoLL9g27NlQyHR=(EDm5
z9i$RSIsmchu#Ey%lz>H6;lN#i2WOP0DIoi_nBOPk$j6MSC(q}APsn&9NTz4W{EVzC
z$bnx(vl($Zpq3aQ82t%mpdrs>cL&OdgvgU7woCGeeoQZYIzmWHYBHtjMEAqkKUJQ)
zxP<xgWs8tqHp$UIvfhwHy%6e(v<6yh<NLsy;j79^)&4k%76;Hhh`ECZql_Z3jGKR?
zu+?Qch;@31Wqk68`rI2aj30brMWQ<l5{(U5l}$@6U*BXsgR)V~r4!_PQ?d9Zq&1}e
z=@Hg}3bm9C;WurVWN3CxG3}8f-PYy^TFnmp7%E7Y>Z+&{?horB87EX&kBB%M3pm1#
zO~`ZxmiFGS|92vB99z@6qz-gd<eUhVC!NR^{Z@+<4qQ7JjRTc!;GW0R;@Pyo)D`Cb
zojRY6j(#F`^)7u4iZ%UiQ9jM}wAY5Cs;Uyjrf<SLoSPmS^KcZ01)XCRk(bIWZF-?r
zifUj}p%it3<$0YX^8)G5P)T6%vupw4Tqu@M$Cg0S@z96Gk}T+MS4=C{jlscX3W~VY
zPjrfoJYp`cylXONBUz85UVw!k(GQ1sc;R3+9toi<6T#Wm!_zGNW(?I&mgRKT9E4p^
zXX?~ei*(ms6O~|=C6IJb)f;H#?W4U`^WeDI?l$f>4v*pM;bs~qXrDV4=dszR1G5fJ
zWTSk8Y)n?3sTA4Y&8JMzOy=I%HqtY72VJpg`WmEGk!g!)ZKnNPt_fGsK_WPR2fd0o
zg;)A9t2`p-<Zei!!CjdmO6vh$T?gZu4`aHaEPZg<h8o2%w`O0}W?7!ovYSeIwi+DT
zf&mm~TDj)f=)<7*__0dLGlH$yJVcsr&1oy-jutr8si<5nEINc~tT7)DK2#8-0Y-<y
zfe^;~ei#>Z)kR<|zeBJB<8xYeHYirrpd*Aq(k7OhxhsOsCh*e!{iiLRbcZayP%e)C
zpWY5+sZCd02^CfeBpsAmZpOR5qHRNcx23J?d$1fMdmK_eX1R;ELi2J^oJ#?_da0Ls
z+NNM!q2;Nv<*Z-Q;)Z*9ZIQ*-G9yqvn*2;xqz!kBEb!+(Re<^MZ~J5GGl%^+4k?M!
z#W*u9Fmfu&K4qBFqty+B@;i{!fYQM&u&}bGC>@U+s_3sG#irP9WxAMih|-DOKyXiN
z;O6WUrlfFWXy{_+FtknoZ-VzNh`NepVpp{p_3?Goq_~`YYN7qj2JOS5Hxlrur5{|H
zwVL)&;!Xzk)>3i#@7rJf@atcmipyz)E%1V;E|S~=i4A9X@=t@9C0gx*muyd(j&sL4
zv@>}yPs;(FV~0G62WxEBXU>rY`P9s_zr|G~YJYlP2JOAs`?BfJbuxnL*LsKcHY|P}
z)~9!94u=ux*!Ey52d#yg95Xa8e>WQq+Jc#aLfgc6sVc{?HqSj7lq2@5HI1b4WK)jK
z>!``$IoBj|)YAOWMsjC*jbdUx)RUv8`N#nj(7eypcFXlL<j8`TbW;-)|NjCT;9Jz?
ZZDy{D(O%}MvQS|Ql!CD5z_ph|{{oew)8_yH

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-008.js b/js/src/jsapi-tests/binast/parser/tester/try-008.js
deleted file mode 100644
index d47ced0ae331..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/try-008.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          try-008.js
- *  ECMA Section:
- *  Description:        The try statement
- *
- *  This test has a try block in a constructor.
- *
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "try-008";
-var VERSION = "ECMA_2";
-var TITLE   = "The try statement: try in a constructor";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-function Integer( value, exception ) {
-  try {
-    this.value = checkValue( value );
-  } catch ( e ) {
-    this.value = e.toString();
-  }
-
-  new TestCase(
-    SECTION,
-    "Integer( " + value +" )",
-    (exception ? INVALID_INTEGER_VALUE +": " + value : this.value),
-    this.value );
-}
-
-var INVALID_INTEGER_VALUE = "Invalid value for java.lang.Integer constructor";
-
-function checkValue( value ) {
-  if ( Math.floor(value) != value || isNaN(value) ) {
-    throw ( INVALID_INTEGER_VALUE +": " + value );
-  } else {
-    return value;
-  }
-}
-
-// add test cases
-
-new Integer( 3, false );
-new Integer( NaN, true );
-new Integer( 0, false );
-new Integer( Infinity, false );
-new Integer( -2.12, true );
-new Integer( Math.LN2, true );
-
-
-test();
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-009.binjs b/js/src/jsapi-tests/binast/parser/tester/try-009.binjs
deleted file mode 100644
index de1e54faa0038e1717d16bff228cc06b1781a049..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12910
zcmeHNOOGQp5bou*yoDBV;glP@Aa+*V7=@8`vH^mI%xV%X+(u5~O`7#|2X|*@=Kw#1
zD?<Dgu3UkC0EiO@ZdAG5-PLKg$DP+?MsrD&*e<)uUwu_ByBW`>g6}maoQ?J#%5W^%
ziT9l6d4q6t=IwX7U-Wi+!*I&I=8o#q6n+%%{c+dx-h^IFI{XonJ{t)BfDZ+eEcU}d
zi5lg<BkzeHjEb^;2RS#+lNCxO${%@t;K!K&I(=uvgV=xUbE(7y>?B`w6iYuC@7;uH
zdhJ%fbJ%U}=>M8KS_qZZQ~eM8m`f&<xTj3ajPhc6_TjyIAD88&a(9%)ntHnDVF^!}
zEO)2VFKEf%Hfza8?W5kREcp^Fz1{lq{_#g;%WU3||835YFTzy)PXC}?)|(>25s>ep
zv<YtjC>v4CVtxWXv8#UiL4!3;C%)i~fe43B%JVH@=k~Ly<WU43-%DpzUc<BhjV{|_
zLgYi$h#~yNb4Q~#aB%QfK!4C%#(f^e77evnDm`DvGAbZ-Y899q&(QplQFRAp-U3;t
z5;*8{AZIT7;Xybq>!jG_2O!WAhwl3UlV`bJ9&!&*IZ!juso;-ePx|9Y&Ze58P|yeY
zMAS%Y5b0ouRns;q*vJ*kaBo0`!|E&^oJmeXK=#ux(Snr!52#Yw_<32Y37!bY_SdcU
zLkyqCz5Y?B`&rqD6fKUVbqfVQ8}cb;42^gq!_#2bvOk*(sQ+%xx^Kf&-NWOx82BBO
z9X9xSZJZO$wh-v6pm$%Mb%L)j?3J;qyz)D6pOOc4`Dw0>$~;#^>KLJ5O^1VT_|Ooc
z)RHhGMy@Vo*N)DFY&79Qgk^Q9YdY{6=J$Pc#>_YEBKN~ka28Z1%{Q`4TRU(@hv&0n
zz8RMaThaDm>(?c*#Y8w^b|5%l>or(KH(U%@Ff_}ksvxu}L?Ll3m$AM865`s)>Zh|{
zh|!WBwNVnBkEd|-K8dQ&?=@M#g|GgEnM-`-fCA(yb*^3-Pj8?Vk*iX}EG-caq;RB}
z2?I%M{-T!L$0JqFP3Koo{)X);*=#|YyALO?ae!xyTtJ;<|C8KWRHp|am4_;YDr$LC
ziKmG8EOSFTsz31~vJ4oNbxXaKc3%!A>yv1boU4`ZG%^6UpK`DG_TcGE`5re^wM=Go
z*m4JdP9>+`6jaw6WvYH!DNUP?TG3&jTtucDWMWNHUp5g%I+U)8)}&p>q)~x}OC(<i
zmz8yHI;VprYG=!J1ICZ0TvFxdMKVguP8sV`MJ}d(Q@?U>i9%0`(d;|PJquR9Ixw%7
zxYxz_&nAo?@pvZZ>dIRP@`VaG*EnAlov-Kg<5WR9gh+yEV4+;&5Hc`$CK+{}f7@83
zt~dPxyu0N`3`Z+f9mFWfc4tDQwI?ua7XC7e>dxtJI#$&O^Dv4>9XyjK$w7MYO$WHw
zx(cJ}?%?;3TbGap)x+Xa)pedXVZlhi-M4YMbtnD{aI-4tv}#@QEyjqBII8kCx=9YA
zoK8F`&eCr>$9A1h95lA&`Bbrs$uBn;dL3=GBA{6cWGSqwz6-k|IU~g>BRj4pYi+T3
zIB5wsi@4$sRg7HO84Ib<aE((?wJy^QKq&HkA$VU||8#(Fg^}lRRxtX;@I|vlTxjz9
zfXB(no{zfl>MMV6p+NmE^uxaC3#@qs&36TvzKc6XDuSA7L1eA(KJsO-3_g}=vB=<B
zN_ijHAJglCi#Q<3`Ps%AqQ)9TI$ppcncQxaGkS^w2jf`}2U->t>A1SrVRd(Pwf6R%
z#+~vyO{i^!!N|w^CPtrYVS=dAWG3L9WB{+tykQtb{M#AaL>TkX%aGjJQXP|R)_^nz
zcwDDEdj&eWm|fUZVbcK+Hol-d;UH>(th43}Rv)W~$BV~dx;UCZ0DWaFm3nseZJ!QF
zJ`n|P?TWca@^_0(p=xQ&N8X3Q_~b3kN9-Vql9%h}`n&E|S)bMI#+a<zaNp;iBI_1&
zlAs%HHy^r7RT)h;SG+OMt+?dUQ*+&BLOp4kuN#s1qVg+Y-HNGB@kNGiuv|*&9>&6e
nZZmk5Zb1N8-uWg-RG&XVPn5G3=-8lP1%T0;lT~N#l=$HP>#kmC

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-009.js b/js/src/jsapi-tests/binast/parser/tester/try-009.js
deleted file mode 100644
index d3e0ebaa23b0..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/try-009.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          try-009.js
- *  ECMA Section:
- *  Description:        The try statement
- *
- *  This test has a try block within a while block.  Verify that an exception
- *  breaks out of the while.  I don't really know why this is an interesting
- *  test case but Mike Shaver had two of these so what the hey.
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "try-009";
-var VERSION = "ECMA_2";
-var TITLE   = "The try statement: try in a while block";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var EXCEPTION_STRING = "Exception thrown: ";
-var NO_EXCEPTION_STRING = "No exception thrown: ";
-
-
-TryInWhile( new TryObject( "hello", ThrowException, true ) );
-TryInWhile( new TryObject( "aloha", NoException, false ));
-
-test();
-
-function TryObject( value, throwFunction, result ) {
-  this.value = value;
-  this.thrower = throwFunction;
-  this.result = result;
-}
-function ThrowException() {
-  throw EXCEPTION_STRING + this.value;
-}
-function NoException() {
-  return NO_EXCEPTION_STRING + this.value;
-}
-function TryInWhile( object ) {
-  result = null;
-  while ( true ) {
-    try {
-      object.thrower();
-      result = NO_EXCEPTION_STRING + object.value;
-      break;
-    } catch ( e ) {
-      result = e;
-      break;
-    }
-  }
-
-  new TestCase(
-    SECTION,
-    "( "+ object  +".thrower() )",
-    (object.result
-     ? EXCEPTION_STRING + object.value :
-     NO_EXCEPTION_STRING + object.value),
-    result );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-010.binjs b/js/src/jsapi-tests/binast/parser/tester/try-010.binjs
deleted file mode 100644
index 182f449ab696c139a86b558f5be543e3d99f328a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15697
zcmeHO&2Q^O5I5f-B=iJ`1LEKVw+gi&ai9vJZC)M?3dvIwJ#nktWSf}h+R=LR`of97
zfg@Lh;BSHpcO*V8oSE6Iz3X`GtP?v;+w{;jS$n)Q^PAty&aP{0I`K%oHYU!n{+I?M
z>ReebT9$PY3}@C!tMgUwur~-M#H#J{Yigbwvih%|S=Ix%s;1ul#G$Tp;gN@A;5pP`
zZs2oKL-{$hp1S@pDeHHT^TIM&0p+6Hq2>B6iv_5UZw-mh+)I~GF3xwZ<fKDJU4K-6
z4Ia~LHu|k@r?xM?tL+ORs;nNrzU?wX9gmB9=6F-BJVs|99ejL{mKVw0=N7Ap$Grqo
zc;?Xb<?7>CwB&D_wd9lLS+6Whz6w)sHoiVS|0Hdh%^UK+%^C6)cvQdDZ#UC=tB5cJ
z<cBD2Ol$z99WsZJD~O3h{?YYq2miV7g2B`D!`3iz^ZA65FobaLMUUhmL*nnX@!D`a
zPu|M!7{FIVMww~=gXn$(ln13L>ywb>Xeh+0(&aqXQ2}{VsNm4i6m1`BRX0!u+4Y(N
z0i6Of6WR~j!6>a0r<NaqJyQgF;`$DqNxdv29^i4{W#CeeTr!Kgqp_q?!A~e?Pd-RB
zQUxLn3{f^`qk^_nFvh(G6$Z1*3Ex=qod4sGng^}O_kV*bDaS9$DkpOy9Gl-XnvXGe
zp7;7^t<INeBdTaIWURMQ@bdwgV7XwkF%7Q$!yNx?E}L#J3A_VF=ycC3G4OjRJFrR0
z#^oAWGR?LyD5irBWCAkm(^(p;JSzWy@JU5bhg?f-c-dJNspFJjGTn=B$v~5#_>}4}
zpO@jfL}_gpOz+Np9mi8>_jy32wO1q6fac!hf@8UxmDhnxO5H(bH4byLtnZsgaV0M}
zB4*s>1T6i1o6!5`_Mx}626{gLH*&n%G0<$NTDwzNh1uE|E{Ni{q6ftCw-CtI=?=)e
z({QsiTmg_<zF!iM%ckR^fnmnTkM19k|JpuAZkNx<CjlEHA%|<zXHno8lqy9<8ew@G
zNE!SXbr+&uY{C48WhE=z8+kPK2e>#>+qx(Tda)B|^InD7z2buNGbxWh)xp^S7D$;x
z5)P=#SDI@h7aNugN_n4@C8~cNlp+dxaZ^vTx)4>d>XQ@f1<HzddEfsBP&>6aS+RIN
zhL+*T$0nH+P^3%sxwMw5)5AcOhbjepxn)f#w!hfS(nU{y?1suT;I8<xXc?hCqzu4S
zEmtRBswlmVyh8F@wRhZAd9kdsqJj5KMCwHE9HiT~6V}u+q|S=w4$2j&6TNd#mV+|$
zjv&s0{E0qaCNgr6F10CJ*E%+jZdGTcZg-pBqpOZ^s|Bi~%q?{FnFdfTTG1BH>OVmW
zz$}nxIr2_SGD}38T5)Pr6}g$+q2l`z+fpCk&JjOUAj_BtlbL_#jm(7A?+(lhH8l!j
z{1+X@&j_2+g<b0{1o=waLpz+8Md#Hmc9(5Wb%7&N#B7i;Fn7*ZJsNV+kVw&G;2|Iq
zlUyQUY*%GuXr-(QL*>|o4iV@bC%`PGR&R$!nM|W-HGTre8aw{bgR^Rva8Sc@zk~mD
z>(atJ_b)V2%5qJy6FRFAj-j8j(5xETP*hge#>AI5fN|_#>}B*i3^iT><j6XSBaiSI
ze*XDFZn6r~M`lw!v02D7FcDg*3^uy6kT+WB>U??MA#WXJLcXMBXTxEGal><_A>q``
zyXvK_9x;-a^r#CbnLS-GecyrdpmLz71ueRD{<%%qd~1dbJ8<S*o;c-&-urMJUK^c1
zUxdT*voSk#q>E@Z*)5cZXkbm|v@1bJMA$nfQay6tndqPrtf>~>F%f^?!F0QFt7`b8
zO3)E8k&2QP<FLAeU#|l<<I5opC)AWgJQbdTuTneQ2J0;2*A#BUGI{A?37xlZgJLF|
zN-Ba49G@#vUtN`ytyK~RU|UiDC~{8xcRmYMFZEU=r}<}ibtG9y&cALr6KIobtIK1!
z8N1U_b(y~%BVI9D+Rhf&WgOraqnX<UVq6=LVodYaju_E1gc!`*h!dA&9AOfpIH%NG
zlVU70=ES(Jr>hJt_ISh)&L>R26DLNI=#mG*6p4#{vgA;rpCE=bTUugd$=hsmfb!oz
V!<0}?C5XzyM6TzxL9Pw%{{c6e-3R~x

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-010.js b/js/src/jsapi-tests/binast/parser/tester/try-010.js
deleted file mode 100644
index 5ee472c3b73e..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/try-010.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          try-010.js
- *  ECMA Section:
- *  Description:        The try statement
- *
- *  This has a try block nested in the try block.  Verify that the
- *  exception is caught by the right try block, and all finally blocks
- *  are executed.
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "try-010";
-var VERSION = "ECMA_2";
-var TITLE   = "The try statement: try in a tryblock";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var EXCEPTION_STRING = "Exception thrown: ";
-var NO_EXCEPTION_STRING = "No exception thrown:  ";
-
-
-NestedTry( new TryObject( "No Exceptions Thrown",  NoException, NoException, 43 ) );
-NestedTry( new TryObject( "Throw Exception in Outer Try", ThrowException, NoException, 48 ));
-NestedTry( new TryObject( "Throw Exception in Inner Try", NoException, ThrowException, 45 ));
-NestedTry( new TryObject( "Throw Exception in Both Trys", ThrowException, ThrowException, 48 ));
-
-test();
-
-function TryObject( description, tryOne, tryTwo, result ) {
-  this.description = description;
-  this.tryOne = tryOne;
-  this.tryTwo = tryTwo;
-  this.result = result;
-}
-function ThrowException() {
-  throw EXCEPTION_STRING + this.value;
-}
-function NoException() {
-  return NO_EXCEPTION_STRING + this.value;
-}
-function NestedTry( object ) {
-  result = 0;
-  try {
-    object.tryOne();
-    result += 1;
-    try {
-      object.tryTwo();
-      result += 2;
-    } catch ( e ) {
-      result +=4;
-    } finally {
-      result += 8;
-    }
-  } catch ( e ) {
-    result += 16;
-  } finally {
-    result += 32;
-  }
-
-  new TestCase(
-    SECTION,
-    object.description,
-    object.result,
-    result );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/try-012.binjs b/js/src/jsapi-tests/binast/parser/tester/try-012.binjs
deleted file mode 100644
index 7974cc3db15e2a835305ff4ec9d52af0da448127..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12422
zcmeHN-EQMV6!!A}Cj_@3BvXL^p;duOfU0ao;=0>FHmw?W1y^XAOcSfFUB=FK!y|yi
z18{-3MZk0L4!|8R!a3uyXS}xKaemsS%1zV6o^xi-eCInqGmU6`;nAJOh?2q1Aq$3#
zoEuLWhH(-MCPu5>{j#^+>jxLqXl(L#8lD?QJM^w$ybNzO)Zq^abIFNEcWK`vj6`nW
zb5R5NJv7c-e~^{+56HPwB`aWDlshn7-;GiMs`~bT`jLC;QpUyk<XlcVjF{^Wcb*3|
zJ==2H2i?Y|_^q)igs8H5{QZs_QARv2?h*0Eh4Lacx%<(_pXB8wayPlf8baOEFoj2i
z<zH9T&uGcNuhx<e?W5kJEcqNv-L@Vyzr7KL{O{@v`7Ee%+D^xwjtEUazK+sH)C5qP
zVMHQ&4nC2WeD%=$_v$SABB*K|-|rqjXxT^kwX1%nX;lR0*4C$=f3{d~+K(?74MU*G
zUb0o3YH0d<A<tRF^W;!Iq7Oe&$xiALHCPc124G>4L&Irc5n@&8avt+60ppEW0%5~3
zVm2&Xy2fH&16h|0h<hI*8f8w<35IzPa7z9eqE0UGv|OLCiCmX~gbncz;u*vskDf*b
zbB7}tf&{Olpbw=Y)ksSasbPpk$2we~DHoVhNC7G|W;ccQQps`LOurT=lG}7s;P(nx
z$zhXTa89EUq#SvJ@m2i@uOaF)`I9Cay#V7LoA=C(k-L!>p8;MFc$E01Y0RB8_YpbD
zt+e$|bJ!Yl+-SstOLOBS2-fD-fc6h_m>W4OHuu)bAshK|zBv30uD*5%-W&UUEVb0C
z3nf9RbOBY^d01Y`sa&DK*_zz;D=5!#n}+z8U>r?TpXvLrAr5JhW2umZ1>va{Xn8^Z
zOvaJwBKWVj3<D9HA@LbQQWNsPp^ur56i_GixF_wUu1UjAxT~)3Q?>`0kLOLKpd=co
z0ySgQyC8J0+3swcyX{@Gd*GP+ZO3ePyY`W}*X}kuoo~!m=fL_ZuPxD<e5%^pr*eNV
zFGFuJ`hg$P@5W#{gLqJ|`%w1GnmtYjjXIUuXgLOgK#o{#w4jp)W3aMCqW&nqd#Z^v
zvGS(CioLrHNHOiNE&C8VG^W)&zQ6C}btK40KjTDERjoFzKzs^^bclF4Gp4Tp@2qze
zT3H2cF$_P4&0cS*TbFF5x`mQEB~PHw$*__lK^=Cz<jdV@`Q&?W?94~LnER!D3S{3C
zbQohq{DB8O*Ha81?)UIt(kWI=T$?W60}$otGBX7pp!pOQtojVrmRF5cfLuR5PkI%F
z3+_T2gSq{r_JY^b*AnEWpV!1+9#}A!sI8<6Ej)kGXD}7yGurNnh8}LoqPk(Y4hkHd
zXJU@I9z4z=T_b0#O4Uo+2}Mb_a>9f&i39gO33pva`;iTEPy9ydRtTeOI#6x7>YnmE
z$MVQHq&y$zHPymODx4b4Z;m>F+RXV*5p%9`=Dg0c@W}AG@~pYAxGs81wk|1pws~P3
z=Vn&ZvG#S#;tDPWUP*XUHhJsO<}?u*P!v*lhemNniVnJP5--nlc;I;hg!90ooSvvW
z7-vK&zYBF4t#zxlFF+qxsY;nKV&AfYK|kAB0O}TC{w}?g8^=@FMdeG_|G`sGi-am1
z#hf`R|A71q4VLNSXyi=V=W$CoE?k00&E^gsonr#}zBxV1(J)|T(kXUH1(@b6--cP5
zA8eaA(=oIU2PUs5OkP-e6O&iE`2{5WG=s)+ms5plSf#psTat{cdZagHD_okk<I`ZG
z4!c%A{B7-rcxO)&;j7_?X3h_JbIj~xvpM#{0v@>uZdlb9zokz2=h_KxofB>dCsd+g
z?1d{54X5|hOB}HxvBkonR%=QPlj>nqZ9x?i!#;d0AMOli3$FNQi(EuwmK0%A)(~Ip
z{v9UxD#%Q(E0<iR6lGgsPAi@j-0%`lij!>du>6vNqBD2%SUf9B5f$0Rtzu<7htCtI
zo67iNbcq*AZc>V;nDb@tcZdhYr_SPG#f8SWQs#eu0r_b4WbdZ!PURjf$4)VtbDiA(
E0hRT(U;qFB

diff --git a/js/src/jsapi-tests/binast/parser/tester/try-012.js b/js/src/jsapi-tests/binast/parser/tester/try-012.js
deleted file mode 100644
index 3ee7d10266ba..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/try-012.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          try-012.js
- *  ECMA Section:
- *  Description:        The try statement
- *
- *  This test has a try with no catch, and a finally.  This is like try-003,
- *  but throws from a finally block, not the try block.
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "try-012";
-var VERSION = "ECMA_2";
-var TITLE   = "The try statement";
-var BUGNUMBER="336872";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-// Tests start here.
-
-TrySomething( "x = \"hi\"", true );
-TrySomething( "throw \"boo\"", true );
-TrySomething( "throw 3", true );
-
-test();
-
-/**
- *  This function contains a try block with no catch block,
- *  but it does have a finally block.  Try to evaluate expressions
- *  that do and do not throw exceptions.
- *
- * The productioni TryStatement Block Finally is evaluated as follows:
- * 1. Evaluate Block
- * 2. Evaluate Finally
- * 3. If Result(2).type is normal return result 1 (in the test case, result 1 has
- *    the completion type throw)
- * 4. return result 2 (does not get hit in this case)
- *
- */
-
-function TrySomething( expression, throwing ) {
-  innerFinally = "FAIL: DID NOT HIT INNER FINALLY BLOCK";
-  if (throwing) {
-    outerCatch = "FAILED: NO EXCEPTION CAUGHT";
-  } else {
-    outerCatch = "PASS";
-  }
-  outerFinally = "FAIL: DID NOT HIT OUTER FINALLY BLOCK";
-
-
-  // If the inner finally does not throw an exception, the result
-  // of the try block should be returned.  (Type of inner return
-  // value should be throw if finally executes correctly
-
-  try {
-    try {
-      throw 0;
-    } finally {
-      innerFinally = "PASS";
-      eval( expression );
-    }
-  } catch ( e  ) {
-    if (throwing) {
-      outerCatch = "PASS";
-    } else {
-      outerCatch = "FAIL: HIT OUTER CATCH BLOCK";
-    }
-  } finally {
-    outerFinally = "PASS";
-  }
-
-
-  new TestCase(
-    SECTION,
-    "eval( " + expression +" ): evaluated inner finally block",
-    "PASS",
-    innerFinally );
-  new TestCase(
-    SECTION,
-    "eval( " + expression +" ): evaluated outer catch block ",
-    "PASS",
-    outerCatch );
-  new TestCase(
-    SECTION,
-    "eval( " + expression +" ):  evaluated outer finally block",
-    "PASS",
-    outerFinally );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/unicode-001.binjs b/js/src/jsapi-tests/binast/parser/tester/unicode-001.binjs
deleted file mode 100644
index 537e8e34c2bb7819af0fbd313189daee41993b1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17042
zcmeHO&2A$_5FY;j1mePtgONCFv=ApNPAkhRC!3Xmmh2LTNQj@%ndvyQ8IP@=@sdcq
z2!bc!DLBIua6vo*RWsew?fFaD(*!#^ImEJirn<VizOSmQyL<6$8t{JaoHMWgR7^&K
zjh&Yr$2pyNSI*A<!RN#KLw7RePOqCh(+m74?*I9~ao&TcdgklLO!(|H;19VQFu`Jf
z5+<TN{XKFn{Lq`1^%ux_={i{xk%;m=#}EBD6JU0~@9{A9&wMTtaUmOPrK4E*;i&%x
zbTi!BJ=%YA(Cf<IdR-~Rlr>DAf9%IxupklloCULjybnO$As_8sPP?<vcPAeIbZcvS
z^I24su6pSv_Up;cUjYHnnJ7MPDzl_r{{Y!HXxHPt!=Wv^z7DGI?S3&hxmUEz%^ULX
zn=|BV(AClY(c``1xJ{2By61-=E#yCTQWw3`nX(uhI{c(_7O+v&*(i3>z_<Vc!J`O3
zKa5$-#{kB}{do3!DQb6F5a?HvH(dCMYpj_ACt&<77<3df5g+j=t{I^eYf9I8G#LW2
zryK$kqZt|^DjhmuFvzh3&r2t8mqomUSrS6|8hS-`n<M1(HN|46m-GN9aez!INk)je
zZ)aOupKWWi$tGxlr{$L>jQJ)A>ZYA^tq4Sh8{Cwn1DH+WyUL>2_gq|n@9_7}gHj9S
zUdAU?OjWQmopB%pyV4$+Vkt;)rQIo+`vZ_vAbKK2RG3djDWzBb>+QnM_ZF~&*h}5o
z2wAqlgVZL$bI%TXkP`-m#%jV%M<jX@MN|#~D}tXV4e(Pn>O5l7tWTL&eVS(0P+z;?
z(*npwXsmK2(@9zYrOVY@1|SY|Z!3G-9_ehzb^yw<x9yRg_=D>m$T&@%%chnXf{4;q
z6GVp%qEOAiU#LKIWC2IHjMz4Wu;SAl*g;QD)dt8ZTl$rWTTSS+3m~Vg+DR@R9KTqw
zp(I+wh*P@kYk||x3LyFLbGs@BHmYuUZ?qk7UQGhd>eUO@96D{$0QMG2w%Eu)=gT(e
z;Kr-Dx+eymJY%%+=6{Gcn0q(ds6t|n7v7_KGz(qaSvNP?Q4;KoPhr!2998e!o33Va
z@9Cp5BojKoMTg)cemT_@i!xs(h<Y1DLEt>GBo1Sf+$w9V+B;G;Tk_Cq0S`y<d1KYE
zYyihG_+?{B?}DT;i`{b`oiN<EDoT`@py`A=!Nk4L)o$dq`eP>?cC^vi=U8*~3g<ZG
zuxpDO(70z?v_-NT@GFc2s{wO^+3`ar%xyn>0*>FnaT+)R6Y#Ux5&r00pMa6+BGS=a
z-O-$t*FvOakP|~G0==`zFS&b18&7eN`ZSG6Q1e>Am&qmSiv`$?%_{hp2_`5^Wt4}L
zSYs_Yjx{-b#@*PN3iQzUD%;OCEtWgrfgmTHj##cY;&3g+3FIPlo@(Dokp2`NLx9d9
zouFxL7|N}zO_LKu*Uh<dqg)T_XR{~m51Phtq!82PVIZqMK^Pc~dw*`Z*Esh{FzX@-
z7Lm)=jeAkwjm?UDsSF$hvl26~<+!kA-u?<QZ_Sh|C%VPN`%6o_E%B=R1`7lVB;M()
z<~*;Nl@N%xHnlQkwbYwsa8Y`RVttd|lzMC3h(NuMCPF8>sYtkyf|WdHHud1>dvy`R
zbgU(Bb^KPgmdMMpcUwjlb&3ldb11n}0ia>#Gg(NJ&rADCS0Y`1X;KpDX~j*2i3C9!
z{Bi_A(11`=TX0OIMW2*uivB8bYrWP>*Z!&~r7k&Sb1o+rSNeA=YEp#ZBSTkCfO0ES
z%Z00nKR_3SWw{=u2KhRyXn%sqZL5hYvuMH@6)yW9h$Nt(U3d49M>f9EM6R%}K1~iF
zSae}tA!eya65r9Z+!4&Z;L8+K3FEULHWs$n^5bhu7OPmYAUQxq<}80UL2BMA2he1B
zg95brta=BLmdb#<H{A#4-T|CN$=!?Vz;j7_mkCMvFv@S{T%-0)sIbDrM@p`kf%NBH
zHjQVZbXI-`+r1C(t1Iwz2ZrRtRo3*4i7i~~mu<K}%iX9p-YQ&Lmu<y0t|2a00-kG`
zTU^SPvb0+^)sVG(0-d&Sbifdt-^r3q6}O;eYvmTDY_G~XWHVYPcXA~~QS$#|Xf<J1
JIeX=d@h`)hd>Q}%

diff --git a/js/src/jsapi-tests/binast/parser/tester/unicode-001.js b/js/src/jsapi-tests/binast/parser/tester/unicode-001.js
deleted file mode 100644
index ab6fbd372ee9..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/unicode-001.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          RegExp/unicode-001.js
- *  ECMA Section:       15.7.3.1
- *  Description:        Based on ECMA 2 Draft 7 February 1999
- *  Positive test cases for constructing a RegExp object
- *  Author:             christine@netscape.com
- *  Date:               19 February 1999
- */
-var SECTION = "RegExp/unicode-001.js";
-var VERSION = "ECMA_2";
-var TITLE   = "new RegExp( pattern, flags )";
-
-startTest();
-
-// These examples come from 15.7.1, UnicodeEscapeSequence
-
-AddRegExpCases( /\u0041/, "/\\u0041/",   "A", "A", 1, 0, ["A"] );
-AddRegExpCases( /\u00412/, "/\\u00412/", "A2", "A2", 1, 0, ["A2"] );
-AddRegExpCases( /\u00412/, "/\\u00412/", "A2", "A2", 1, 0, ["A2"] );
-AddRegExpCases( /\u001g/, "/\\u001g/", "u001g", "u001g", 1, 0, ["u001g"] );
-
-AddRegExpCases( /A/,  "/A/",  "\u0041", "\\u0041",   1, 0, ["A"] );
-AddRegExpCases( /A/,  "/A/",  "\u00412", "\\u00412", 1, 0, ["A"] );
-AddRegExpCases( /A2/, "/A2/", "\u00412", "\\u00412", 1, 0, ["A2"]);
-AddRegExpCases( /A/,  "/A/",  "A2",      "A2",       1, 0, ["A"] );
-
-test();
-
-function AddRegExpCases(
-  regexp, str_regexp, pattern, str_pattern, length, index, matches_array ) {
-
-  AddTestCase(
-    str_regexp + " .exec(" + str_pattern +").length",
-    length,
-    regexp.exec(pattern).length );
-
-  AddTestCase(
-    str_regexp + " .exec(" + str_pattern +").index",
-    index,
-    regexp.exec(pattern).index );
-
-  AddTestCase(
-    str_regexp + " .exec(" + str_pattern +").input",
-    pattern,
-    regexp.exec(pattern).input );
-
-  for ( var matches = 0; matches < matches_array.length; matches++ ) {
-    AddTestCase(
-      str_regexp + " .exec(" + str_pattern +")[" + matches +"]",
-      matches_array[matches],
-      regexp.exec(pattern)[matches] );
-  }
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/while-001.binjs b/js/src/jsapi-tests/binast/parser/tester/while-001.binjs
deleted file mode 100644
index 8ca95ad2805f27e8aa7e69554aadb6a20c8bc72c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4573
zcmeHK&2AGh5MKTYoZu01<A6{K$7+da(jbCDKqM;MkehW9tL|>FotC}|&%$ePLE^xh
zFypn?4(o0<O^7&fNwn+rXMZ!_d>+SYG3T@u&nQV+??g5g<Se=wMbSx?Tt@BQ;Pvoe
zIL_uYikteIm@}zb-yTHKJ@_j2rymo+$O)%Mbj*n$ie;&WO5C%IPFb2PWBml28>_G~
zp`ln3v6QI-z+b+X&{VMrqe8=_<jieaD#6le>n<!a>~==Iw}ZH8-o;G=;$sc<_kE_Q
zAY8+p6TT?n-3Ppj8RPWH{{GW4qD5}%n8jwnTQKRIi1O$D2Cf;)AAr5XSRQxZ54RP|
zJ=l7;^XBl=vvOp1AIM+33*;SGYSbI`yJg<KB5Fz!3Nx2vLn@-^8Pr4>cY}C#zsv=d
z5^8&B@wMV;@jh6b9m2Vrs%MPh6?G-$bFERzSbD%vs1cP_3=OQ0?)I?>1vE)Rfr#k>
z11*EpYmj+}NfY2UufT?>7-juzTF#nwk*`qRr3!Del!!~mD?*O}(*_d;<K%RrBEhCJ
z=bOfg5a_X6$PdzAfUFUSZ5uQaY&e32?gOf*vAc>&Es%4oFCGI6xioDeKV-I91!1g@
zvJZHCT^%7y#FxguLf|$KP-|EJ%SAfI*2M2puw0<ExU%Q*+1JoXWn_J<HqXYVP6ey`
zuJ0g0-0V`{b<KPnf{Ra6^eqRlj&VG9s_{A1hz}n1aEL5;z_@*=nnxb$U{0iT`?0G1
z^WO*8!e5R(iYXU?ZFc<$?JVPzq_!!9MGL#P>nwe~Zf+TrG%DbKZs96on`O-HgfPBd
zZrg$qudYI=GClcH#=P53aEkdjlx<f+PEu&mw7M-C&<i(HXMbBQ1>VlEHR=!<uy=h*
zeTEHUe3t}QqkOl0NWXwR=v$O)Sq~aXmOfGqiq|e^W8FxD$%YFmK1~P@QS>vrv61*-
zH6m1Ha7K7mM8$vJIQR?sw{Hkh$!+Y^>&#gpfApbzdANw?CnZe=aHE#yb%)H=LfCiK
zE;WZekQH|4wuFPHp=m&aQZi$KZp(~>we3Nc?xkidlovB}#eKqzmRk)ou%dI%ld69|
TLP+${ZDv+cuOt{E5f;^Nl_Sf1

diff --git a/js/src/jsapi-tests/binast/parser/tester/while-001.js b/js/src/jsapi-tests/binast/parser/tester/while-001.js
deleted file mode 100644
index 88fd8dfe840f..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/while-001.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          while-001
- *  ECMA Section:
- *  Description:        while statement
- *
- *  Verify that the while statement is not executed if the while expression is
- *  false
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "while-001";
-var VERSION = "ECMA_2";
-var TITLE   = "while statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-DoWhile();
-test();
-
-function DoWhile() {
-  result = "pass";
-
-  while (false) {
-    result = "fail";
-    break;
-  }
-
-  new TestCase(
-    SECTION,
-    "while statement: don't evaluate statement is expression is false",
-    "pass",
-    result );
-
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/while-002.binjs b/js/src/jsapi-tests/binast/parser/tester/while-002.binjs
deleted file mode 100644
index 19ca8c9db45f7ed60477891c24c917320f46ff12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13384
zcmeHOTW{k;6n42^ga8Qy4<K1ZtQH~E3JD~3)1Yk{v|YL>kh1%@n#7Z2sA~t0({82x
z13ayG<p=N|c;pfB&I5vn72<_o!8!JfXB>~6$*oOy`;sWWd_L#Qcdp~q;?dBj_1b_E
zul`jO_9JrSJmok}C-hF8?cLU`_O*6598#yYkz7;r8IS8fZ#vE^a8*se{SJv3>G*Vq
zc6}0&n1w+C<*DD?Ib?yC$NC#^)+S+vQ3Az0hXpLo0QAT2dNhbxkI^WB3&@cYn#U0f
z`t|4GG3{pKV0XV&+YrZU8v;bfYA4t4v6x20PvDM;KPuq82zVz0=F^WhH$N^SO5}~i
zW;OA^r{Sh!5*07k1(?y6e**Ry+VW2GoA#n?`5cJeY}~$aZzT-*=<E#nEIjI9_h7GC
z%?L|Mz6xjwC0!nqm>z*o6mjPuX7m0qqMU<ow<UhUIGP<dI%k9UzPdHJqYH<qaw(nt
z7Osr02O3840p(R18k}3nF^>uuB!vnj>W|RS+^D*RGOyvHMG$RnLKvpeLAV$8i>sDI
zk)Oc53m(4B0ur4ny&Q}&5VRo(L*VpjFLol<AE>w~LJ<Oes2-#*!4e=X46*0{jS9L-
z!Ho9?R#-?^;i(yN8tSv3h6kx-S{3@C)px?Xn8=E@N)-Cd#JUzeQMx4Qc~Sm=rG*e^
zzw;gK8XP<k>pc()sh%rCECc1+a9<iIX%@O%#@%4#`$a40uF--kWN82(nbXTf*RQn{
zW*1-}td9KH-E!A^g!$K8J_tv?=LTWy4#+WeDV87*(mfT~xyu4KRifjE-NWmhh?2vi
z^r8Tf0*?QDOi20(gk*I192?G`qz~sH>ARqgiKL^zqdgW-uejDa`@XG83y{Zq?7kzD
zS4Lxz8=iqjABRjmVJ&Z0$aoR!R{4RXn=X;1Kipc7Ke$h{L;Sv)QTzQl9OBIqhuExk
zgw|xX&cM<y7s}G>MHR*a_2XGw{IHsF`=2>z`c4T=F^6AWU;m)E)H?mfnx#c{8W`14
zh@t=qw{F8}P&=POEn_y^2027zk8G+kMqyn|OWey`U^m#RuHgS&&0O&L98UHY5YAK_
zwaA3&o<*yNUByJ4C!D|-DCQgDU^I%Sp5J^i3c5I4*5}NK1jFGW%$<*T`S4l~KNc*o
z?L+^7rx*HA3w*SoDzLMdIi-|{VrblFK;fnFTL;_5R#VL`Fg;c87W@aRQ!tMj9Vn<o
zldK!hIuiZiH(>VI4{+M10HzstZ7CIX*qu<vLzTj0@Zbz1oTJ63Mqv&HjB8@RUD;)(
z=Es5&F9U=}c{gH1q_`4R;>mAacnjPTrb#sUt)nW%E*HqF%iWu7zOKx(&_yyhvRoYb
zeYr@J_W51{FXD20!W7hm33W?aI#C6hTpv;L>friDswqmyTj#y!>{8?8nejd-ieV==
zHnOlXZUm;m*Wg%b2b?q0wAtwE*BuATg`8Z<n^z&&Sz0Nb7#FRio5!+7MS~0pw_vvp
zeiye4l)*4<VmX(V1M-Cd{e~rFZwq^2NT6A1QEju?iUA8Ds;I4-$pUJsJY)<n)B4RX
z;LHVop3!g4Z^H2x@Svc@MObj#oHjOakxM@zDWOTyBz2SU9Tvf!TNB1avYcJZdXo%K
z@KvYnjAU5e7R?Kw6}}(PAly(_CAs7wTvNyf7XD|wQ@w<Z^d&%Ario9%pvSQ9(>rzJ
z0g1)lql&BU3E|pC<yEnV*`e-b#I0M}7+ujYAeN4&JDeqAd2-jm8e!luY&wblrVjS)
zNlqs|ybKq>{<G5!15UpmK?^R!L#~v9cUKsUg;X%GZO^fMc<?|GMHg;X$|L61LVJFT
z*l=EHUN@M9n3GB(6XWJu+$&eii@U^X0AJZ*+&IZi!v7;Ue<90(>FU3<Z89zBIoiH$
zvi%}>o7YxqEx&aynIeGVOF4?ZbAnB1wag0Wf~)AN+Arj>O2x+5e6FR|uOQ%3ORbAg
z#?Lh1or0!jX6e+i@GwkZWy6It>MwMO_30Use7Z&@b*3^rtZ!00c;!CbQKDW8{yV_M
z;RYGTqbPsO*dwL?jQ9*HjyC{P&Wnw6GM@e&p<;VUT!GT%l9xDc>^{Uf!&|E2jJX}s
zAPevFi*smnZJ$aUEv2${m)3TPqh(cxIBiJS;*6=P(oT)@Rh&Z6wW*dkTJrX|I9t|g
yi_;jx^1GJeL}gAE*GzcTJ0)xK`6E0At)Vli@aGkQTDh`wS$y2Asrwh^0sjL=(-{c>

diff --git a/js/src/jsapi-tests/binast/parser/tester/while-002.js b/js/src/jsapi-tests/binast/parser/tester/while-002.js
deleted file mode 100644
index a3c315bf2064..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/while-002.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          while-002
- *  ECMA Section:
- *  Description:        while statement
- *
- *  Verify that the while statement is not executed if the while expression is
- *  false
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "while-002";
-var VERSION = "ECMA_2";
-var TITLE   = "while statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-DoWhile( new DoWhileObject(
-	   "while expression is null",
-	   null,
-	   "result = \"fail: should not have evaluated statements in while block;break"
-	   ) );
-
-DoWhile( new DoWhileObject(
-	   "while expression is undefined",
-	   void 0,
-	   "result = \"fail: should not have evaluated statements in while block; break"
-	   ));
-
-DoWhile( new DoWhileObject(
-	   "while expression is 0",
-	   0,
-	   "result = \"fail: should not have evaluated statements in while block; break;"
-	   ));
-
-DoWhile( new DoWhileObject(
-	   "while expression is eval(\"\")",
-	   eval(""),
-	   "result = \"fail: should not have evaluated statements in while block; break"
-	   ));
-
-DoWhile( new DoWhileObject(
-	   "while expression is NaN",
-	   NaN,
-	   "result = \"fail: should not have evaluated statements in while block; break"
-	   ));
-
-test();
-
-function DoWhileObject( d, e, s ) {
-  this.description = d;
-  this.whileExpression = e;
-  this.statements = s;
-}
-
-function DoWhile( object ) {
-  result = "pass";
-
-  while ( expression = object.whileExpression ) {
-    eval( object.statements );
-  }
-
-  // verify that the while expression was evaluated
-
-  new TestCase(
-    SECTION,
-    "verify that while expression was evaluated (should be "+
-    object.whileExpression +")",
-    "pass",
-    (object.whileExpression == expression ||
-     ( isNaN(object.whileExpression) && isNaN(expression) )
-      ) ? "pass" : "fail" );
-
-  new TestCase(
-    SECTION,
-    object.description,
-    "pass",
-    result );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/while-003.binjs b/js/src/jsapi-tests/binast/parser/tester/while-003.binjs
deleted file mode 100644
index accc07368888cd6033498c6374bf77404c2883cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13218
zcmeHO&2A$_5T50KK?pb?aUA6k1tFA$l{hSpQQ~;DLBT=T+U15io{rt@WX5!l6C&+9
zAg&<s3i}Ma1P26%y&=Sb0|$;&&2&$<(>-?EW9J8D4{PoGd{bTZ)z{V4y^U-<ifOYk
zq$Fy7&eH)W$H8+!5FDn_S+KL$`Luhl+fPR{Xl&-sG-4*Q=CjQpcpaW<n6E!1oRPzr
z?$UltILTO=<WQ0Rw+J4yB$~wf9dK^V!b*7##iD>EEGq%b&+kPv$=DI2Jcmoju{K&{
zoF#+i%kY_QyVct}=rlIvwZ^6dF|oS&^ZP8LoWwcY35mxR-fh4;9kQ6df9K9!8&M%|
z=00o44?Yhsoe*w6ZW^$lFMkE>3-sl~_7~k{`SK+&z1{k3`>PLa&s@ACpIw|IUxZKf
z_Imqmd)y`?JSq7GpyiYdMMg4u3^`%r*6?Th+YzTiKyG&xe$F^rUUw#Ei^Q>hHGiWI
zm#9uDbF3bzjHw4B<XMl3X(N=dCc3tx&Ja)}<q!xTjM34;IdqS~yoo{Mpf(RchAHo*
z`{}@rTCO5LKzdslzQYp2&-Azg)EE$L5MdC`m>y*TXM>^EO({hP^q&5Z>7*4vdN^X)
z0*wO<^#DuWJ6Pdi-IPo%kqfCW|LORU4%1bkA9{T^eS{O4?W=0mb?B)cOFlg>D<815
zkOmzbeogz11kcU-2cAQ!Pn02^LirB7R|q97r7L72%=p;hg^AQi)0mQ^vO2g`r=&nB
z0D&FHS-2IhjffCyAKO8Z6-7z2|0nBya%tV=v+my-tb4nHbsyL<HYwME`GvE7CFKAW
z{`~#P4fC2FIzC(PwqbU+X4%VU-j86@qI$Ou1aawILQlh;LeVykNG#~PGpM*S)yJ?%
zOKcNzg}Vz+SYeT`sN8@@$}+4%AI;42oGor-Id2o>QTXd>%JTgh$q@o+s*<CqKsM$|
z3nXd1^$jkEt7;!b>l+@===Dr5YM)+B9^bCP<Eo-|ZOGPaO<jOLxau9Ur9fS6Nv)s3
zFMzAExtkOB$4MVMr)Cosk)ZQAf~M-RsP4>~;q<72d>2{2z}Ky!!vh~Z7)@u2C(4ZV
zm?w&`ZIR0;({Vd-+JCGU=CfPje?oLD_vm%8hC+YnrDj>9m>=JU#@ZmkR+0wD!99C9
zTY88l>~3n};gHgNRUM2t0%vDVV|qg-3^U-Z@-f#0<Pn9}03xEI&)Enmu8mcA>en>h
z1Gj={3Qhf*sCr;G0g9SxYocr(YxgWQNRC8S!BM|AL7KIR^(thMP`!7Ts7V)^p7czj
zDQGG_F3B`@30*3oUNsFecNTr$xwxruc7xymj7Hg+=sbFO8O!=Yd>x5ZbnzzKH1BNm
z^sOMka$&+Qoy}K4>^!|xG(l}IneOpiykpzoh_Luxs5iw#$da&F@*Sd+!&Ay>n50=q
zajO@$&K$LiVzT-*ZFz+4bM0T8WwH7z$~ColZoaUh$=<`gs35d#dQW%pVzq;Z5z{ik
zbdv|vT+@~-c5@efe?abIgqM+Kt;wxXgk9D?3Mv88*$#0oHNU}aOT?~2z<sB{^V=kn
zS0=r7I3-5C4<50q+!<3Ida#(z9uTq1IBZw7!RHD_?*=L6sbABK1tofQE$LTaRJgU?
zBEnI%<@EUup0VZ{k95V^)$0__3ihB^0O>gieFUREflZvFvoITyOwK)8hQm`L^xP9}
zh+#U8qwtW1cJ`XgxeobSTcACCjH&48)4CGQ6A}51o3PVk&`Oht;gXh^hg`5Lke2`?
zhI3>IloUZfO$7aB3=4cE4-+#89Q$CP{aOrs7ymeEJb9vxGzqdO<q>mhsT~CmZMdwe
zz;u|0nX@V=7vpLLcYWO*+!YoNc-n=D4sjfn%;o<X+`pF9!+dH~EXrH~y+q%4UA|ui
zZzo5qMy-C$ESW<<aqXq)TNBK!#tPJ<;?wG?S8K>)Jrz5(`BF=*pTWSDmRi@Lidd+9
zJO@qP%rZIekzqK2RkbcE$hqwGg=w+bXG4<Dw@@k6pb8J`n*t9`s~7uKH0r>ydm%5k
z$S520$!pFvQt_V(zJ!Vc&qt|lwDUZO&?ot=-CcQa%Ep#_0)upZbKL;87ANwa<NT+*
z<6bQpkk(0gc@JY^G@9hqN~Rlc8LKjRwW=tQw;l7jyyGgmj9cgFEN`LdMqMngR-DV0
zcdHie@-|A`<d&(tF?Gt8&&)VPU2r-7`+N8ddc!1IRm`VGwwA}wyS0!3t6lIPFAdg`

diff --git a/js/src/jsapi-tests/binast/parser/tester/while-003.js b/js/src/jsapi-tests/binast/parser/tester/while-003.js
deleted file mode 100644
index b47d09a7a0a9..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/while-003.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          while-003
- *  ECMA Section:
- *  Description:        while statement
- *
- *  The while expression evaluates to true, Statement returns abrupt completion.
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "while-003";
-var VERSION = "ECMA_2";
-var TITLE   = "while statement";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-DoWhile( new DoWhileObject(
-	   "while expression is true",
-	   true,
-	   "result = \"pass\";" ));
-
-DoWhile( new DoWhileObject(
-	   "while expression is 1",
-	   1,
-	   "result = \"pass\";" ));
-
-DoWhile( new DoWhileObject(
-	   "while expression is new Boolean(false)",
-	   new Boolean(false),
-	   "result = \"pass\";" ));
-
-DoWhile( new DoWhileObject(
-	   "while expression is new Object()",
-	   new Object(),
-	   "result = \"pass\";" ));
-
-DoWhile( new DoWhileObject(
-	   "while expression is \"hi\"",
-	   "hi",
-	   "result = \"pass\";" ));
-/*
-  DoWhile( new DoWhileObject(
-  "while expression has a continue in it",
-  "true",
-  "if ( i == void 0 ) i = 0; result=\"pass\"; if ( ++i == 1 ) {continue;} else {break;} result=\"fail\";"
-  ));
-*/
-test();
-
-function DoWhileObject( d, e, s ) {
-  this.description = d;
-  this.whileExpression = e;
-  this.statements = s;
-}
-
-function DoWhile( object ) {
-  result = "fail:  statements in while block were not evaluated";
-
-  while ( expression = object.whileExpression ) {
-    eval( object.statements );
-    break;
-  }
-
-  // verify that the while expression was evaluated
-
-  new TestCase(
-    SECTION,
-    "verify that while expression was evaluated (should be "+
-    object.whileExpression +")",
-    "pass",
-    (object.whileExpression == expression ||
-     ( isNaN(object.whileExpression) && isNaN(expression) )
-      ) ? "pass" : "fail" );
-
-  new TestCase(
-    SECTION,
-    object.description,
-    "pass",
-    result );
-}
diff --git a/js/src/jsapi-tests/binast/parser/tester/while-004.binjs b/js/src/jsapi-tests/binast/parser/tester/while-004.binjs
deleted file mode 100644
index 81253bbc76fee0f6129e5689f5db17f4eb5718b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34266
zcmeHQ&5z{76>kWT@F9p2DM~~nyb=+RT{7$!M5|_CXBc3j*&*7Q-5hd2?sm<zv)*>g
zcJJ(-kaFS}2~No$0GHfyM?n4t6a_eN;GQcIQSzQ$<$89N-DQv4{juJ|wx->FuJ`JF
z|EkLUXgcxOW`D$NXY==ge;nAidk^+{y@BuC>uv4s|L)+*!O)+uUVkJ0P2Y3FX!G#T
zz1~mYSABZ>O*?SyfydrpL(dNE$o0oDDM$Vt_HMajCrj&Vp!2{iT7D3da-E(#cB7O4
zef+M&#*usEvLGfmwr|Tphf&~;k2ik^k2%=cKHPn0zrVr1>u+!(l-5D~`#m>ef$hcQ
z?%3W`q4y}zI~lnid-0{0E~yj+<&9Woeg427z)g4TK>ax#KuuZx8)&yE%bPpb51NwY
zBQW%x?Q2)xy`V~_eL;THo**BFM;-1S?(L|2Q;jfG$)|u?tddq3*%7-9HlfmOU!GsJ
zCr>oWts8Ic-?+B5b6w@VhD=d4FP?w-l?#_ua;FgG&fQ7C!Vui#ftae;cv<?r*3WI*
zo+odO?-;^YOnN8EqJdXLfq}9F(IE@Vl!cR})a5u%!ve+|&Vn5rPf=$>E$ar%{1|AR
z1mL*ehKR<3Lx0adR%b1C$bSV-sW{6mcWejuBwsyr*AV|8o<R)q*iqCA+~bi9LENh&
zp|kQqR7i6mX&{KEV;wSRNd{BB*Jy>o=t`VkN;!#|>7SYh$!R)``XOhhx1cxtKVT;C
z?)hRF30A0bEF%kL5qL#r;o|DgLRmt&BC}8yFPE5whrl63m1E(X)A0~%9$Nlj@PL}7
zu$ZErz`$#wPj~z{y;Jp@(%SO;;VtPCXBTvrfM@(wrl70oo327mb3Dc<E(uf#qpwQd
zC{G6R!9)#Gs;Q?*V<;)ZTpIOYVuzs|kMQ96Pf9!v16kRlG9^kNs%Uz{mhXGa9v4=d
z4`@r&%2WI#%rEL=W{R(~Xd2}5PmzPwO~J}$K?siWFSSHU4P!DZ&x6-S&3*;E9@(yU
z#TvPhHS`^3*+<ZMu!4AUj0!m}Pb$`}fZ4<cz(djr6|=w_6Pde6%SU?)|8WB(>O7X-
z(}Kgr(x@b{qob*8kMBbctk~nq*}~%>A%}&-z@1?5Q(YyMk)hu`12prxZ@FX3wvx`q
z0Hd4wq*NvOBk7Y@POfE6lrq+MH=s1f$ctF~O-EEy)cfp2-Wlg2O|=Am1nPvXjcq$*
zs@B9+=C=@UFxqEgqd~%9Tx8Fo2ViJS6<nAB!!ylYrxAuDEl#(ndKnC|%yxLl6T?hD
zlV$^b5CuO#HPqnAe|*||S`K5H;y%Mc)ym<6U-Wv9<xQt1eDOb^gPC8(4D+;_fr4f#
zG8KxU0zU^sPa@Qb8;u}bdG>&L%z>N^kg4&M8KrWGCWZ-Og$csEz@mS(CvEhTNnxgG
zkJXTLv8%`#bPHm995l8irIliwVa0|D`wC1;Qh7M8V~zdDVt3ha8Zlahc)mY5XAPzi
zq+p>7#YwEyY9MW2^8aX0fpLOem1nBD`v6=7?ogERa6@6pXb%u>Sww$Yq=@zsZ!4P!
z*wBiVwYc|UkWHY`MI(l0P|jWT#?L9RroJ2tRl*w+2T<Q!BAvolN@s_=M-<fA0`$s2
zLIuVl90DC*&Pedi%*qP*8~#1}dfM{R5vg2i|5Mlcl0uRigX3Z4ZKs7vSYum4IO3B^
zdYk7QS>_UR&~+gV=DE}obYrL~;>C6LWPoiZPx&?I69!o3T(R=qy-G<TpV=lFcAON|
zl@*?+W)dNTe6l&QEwt0|7hn~+&6HS%wr{j_ZVsJ}`<A3(8vg{$r|42&07oNJ1D#Vg
znCzLwv5v0cV6VbptrwF5gBKK#U0J-!U`KwyEc`;c$B{qv9BaTtapG9ds~qY^WWXr~
z{F1;*ounauNbv=;@zn(WYG#d?<h@!STP=_jl~C>EuAnJLY1a%<3-z_1fyg^wyJ=`R
zE9J#56EBv4wQ**h>GdUk3%e@BcbRzxLy;AyE!1=j++b<myQbFpd1sxt>BCUfR?0eG
zR;?4dH%brF3YFAi+09c^?i85kj8YN9d4g~OzLG3iW6nP8nUO26V<6&v_#H0R6}wjo
zQ^PO;ERZf~l#*{rn#I4>dL88&WjVn{M6M@3sk5V~-MaGFGGeG%OPi5+RmAX*KkM}n
zmClr)d6ds^^Vs)52dBA|*772T&%)5Ph~WSiZ*_2C)Jz+$I8PETgnLWweAW(ir9PC~
zE;Zo;v+a({B*yRBGkh7QW_UtFG0OFx0(CuRkrnwF&=s+);$)<Ty3Pq5!?iXizCZGP
zb+lB)Dq}WhLEErpk@4)+A+~nbR(}C8NEvKy0WOBAQ^7A~q85IPio9maWPQ+=XF%e~
z@`ht5!m|cuTXBe0l~zbH{j9$-OpsWUNogjCT+mL6KaJwGCH_&|306wAZk|leHb|CO
zH4~)_f<4#k2Go0@ZQ75zMo@)D5H<h=*mUvAa$`+T!&m`px&!O7j_xH6-vUo#aW7Ns
zRH#ZDW_88(LWy;~SYBeK3w+}6`f+E1YifeOEHT0I8i$(A;%rcp^b|B)>3D0V-U|(b
zfA4H?O>OW@#s-Ie5U?RG^@iQ1M}dEP)`D)T*o!knO;%fAi2Q3h>^i8xU62|EbyMU+
zwuwm7l1DpvjrbGg8f9@lNXN4C)H1T6IbtKDHC2&~_Zmbt{tK$N!pH_TImMC)ig1jr
z=~#R}s{@nR05_Ah>&X)@p=%VK+S3Z6HG0K0!MKHNC?gJ4a7=A@1;vPF-;(9axI|+Q
zmtPGro&&4TZ79R-9k3-uVwwDKi`WSiSKu|Yc5goWe-Nrp5RQR=PaQCoQe}|i+$w<_
zUxHH39psoHZJmkNEVkAM=QxvEor-hdQtDZ8maFiLycr%+yrEI!GFEt6nu#gDNvCBH
z__vtoJjU5jvY{5&hKhb<c{4=leK$v9BY86ctGH{MO1wGM?%F$xKRMMfAEYS9r6or>
z(ES&n97*M+-?}UmoF*`a(kZqYO02^=!emWshjnl{Q0*{OwN*024(s42&d22|E8j=I
z&|vsUhjrA%I+i^cUd#l;Xk<sS^AOV3gJr`;Q^va!j#}3*S9sK9ySx+-<4ixx*Q;S;
z$z<QhvLglSi0HJ8erQhTrUANgGi&nm=Js`TC&6v@YqUUDsd2x4_(yjVT=FupTqxpI
z&^!UWmXA3j8yp3%)N|&}L4b%`+&FCw<7`<(WVdJgBAOEtglL)3NpO`z=ieGU3w%`$
zD677gr{=*YnDTbV<)yC}LkO?%g(R^%`T!)R0DbCtazID%Yt#*{FaXp{ZnA`@zpcsq
zGy~8Tx3NXYN<YhsYMmvdw{np;Ao+#1%wC854F#6jk7?NAU!#NLYP78{FFAhnTbR}O
zL^g3qxjeW?90whW=m9OXfqy4Cq0Jmtx<3y(`_F4B@RK@&#E+zZu8D8>v}>o=Y^N`~
zZ|KfB%f!2yDeXc7cXtY5{NnmG4BXu@XK9n1X4iF~q3)P7^6EC;u*JR!>2#8BNpp{X
zD;JWJ(pkAi%Qk%`G-G`ub|nhX%jD~Adjc=C)ShIw0XP2?3m85uTxqO%PdvFQwz;b;
z;l1K2VM=o^0d6%{$p$3NRRYlQt0-ornBv#)l)l5=!@V7eW%Dcg7oZW6H+QZd?7p+F
z+&Js7KOBzoK3Yy!_Yy9C38e=WMgE2J{3;fi*|+bKkt*$1^0fRhMC56j_51wljQ7PS
aS{ncVA&d)UEcB;rE=ncdv{dyA0sar<K%R^M

diff --git a/js/src/jsapi-tests/binast/parser/tester/while-004.js b/js/src/jsapi-tests/binast/parser/tester/while-004.js
deleted file mode 100644
index 393e680e518b..000000000000
--- a/js/src/jsapi-tests/binast/parser/tester/while-004.js
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
- *  File Name:          while-004
- *  ECMA Section:
- *  Description:        while statement
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "while-004";
-var VERSION = "ECMA_2";
-var TITLE   = "while statement";
-var BUGNUMBER="316725";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-DoWhile_1();
-DoWhile_2();
-DoWhile_3();
-DoWhile_4();
-DoWhile_5();
-
-test();
-
-/**
- *  Break out of a while by calling return.
- *
- *  Tests:  12.6.2 step 6.
- */
-function dowhile() {
-  result = "pass";
-
-  while (true) {
-    return result;
-    result = "fail: hit code after return statement";
-    break;
-  }
-}
-
-function DoWhile_1() {
-  description = "return statement in a while block";
-
-  result = dowhile();
-
-  new TestCase(
-    SECTION,
-    "DoWhile_1" + description,
-    "pass",
-    result );
-}
-
-/**
- *  While with a labeled continue statement.  Verify that statements
- *  after the continue statement are not evaluated.
- *
- *  Tests: 12.6.2 step 8.
- *
- */
-function DoWhile_2() {
-  var description = "while with a labeled continue statement";
-  var result1 = "pass";
-  var result2 = "fail: did not execute code after loop, but inside label";
-  var i = 0;
-  var j = 0;
-
-theloop:
-  while( i++ < 10  ) {
-    j++;
-    continue theloop;
-    result1 = "failed:  hit code after continue statement";
-  }
-  result2 = "pass";
-
-  new TestCase(
-    SECTION,
-    "DoWhile_2:  " +description + " - code inside the loop, before the continue should be executed ("+j+")",
-    true,
-    j == 10 );
-
-  new TestCase(
-    SECTION,
-    "DoWhile_2:  " +description +" - code after labeled continue should not be executed",
-    "pass",
-    result1 );
-
-  new TestCase(
-    SECTION,
-    "DoWhile_2:  " +description +" - code after loop but inside label should be executed",
-    "pass",
-    result2 );
-}
-
-/**
- *  While with a labeled break.
- *
- */
-function DoWhile_3() {
-  var description = "while with a labeled break statement";
-  var result1 = "pass";
-  var result2 = "pass";
-  var result3 = "fail: did not get to code after label";
-
-woohoo: {
-    while( true ) {
-      break woohoo;
-      result1 = "fail: got to code after a break";
-    }
-    result2 = "fail: got to code outside of loop but inside label";
-  }
-
-  result3 = "pass";
-
-  new TestCase(
-    SECTION,
-    "DoWhile_3: " +description +" - verify break out of loop",
-    "pass",
-    result1 );
-
-
-  new TestCase(
-    SECTION,
-    "DoWhile_3: " +description +" - verify break out of label",
-    "pass",
-    result2 );
-
-  new TestCase(
-    SECTION,
-    "DoWhile_3: " +description + " - verify correct exit from label",
-    "pass",
-    result3 );
-}
-
-
-/**
- *  Labled while with an unlabeled break
- *
- */
-function DoWhile_4() {
-  var description = "labeled while with an unlabeled break";
-  var result1 = "pass";
-  var result2 = "pass";
-  var result3 = "fail: did not evaluate statement after label";
-
-woohooboy: {
-    while( true ) {
-      break woohooboy;
-      result1 = "fail: got to code after the break";
-    }
-    result2 = "fail: broke out of while, but not out of label";
-  }
-  result3 = "pass";
-
-  new TestCase(
-    SECTION,
-    "DoWhile_4: " +description +" - verify break out of while loop",
-    "pass",
-    result1 );
-
-  new TestCase(
-    SECTION,
-    "DoWhile_4: " +description + " - verify break out of label",
-    "pass",
-    result2 );
-
-  new TestCase(
-    SECTION,
-    "DoWhile_4: " +description +" - verify that statements after label are evaluated",
-    "pass",
-    result3 );
-}
-
-/**
- *  in this case, should behave the same way as
- *
- *
- */
-function DoWhile_5() {
-  var description = "while with a labeled continue statement";
-  var result1 = "pass";
-  var result2 = "fail: did not execute code after loop, but inside label";
-  var i = 0;
-  var j = 0;
-
-theloop: {
-    j++;
-    while( i++ < 10  ) {
-      continue;
-      result1 = "failed:  hit code after continue statement";
-    }
-    result2 = "pass";
-  }
-
-  new TestCase(
-    SECTION,
-    "DoWhile_5: " +description + " - continue should not execute statements above the loop",
-    true,
-    ( j == 1 ) );
-
-  new TestCase(
-    SECTION,
-    "DoWhile_5: " +description +" - code after labeled continue should not be executed",
-    "pass",
-    result1 );
-
-  new TestCase(
-    SECTION,
-    "DoWhile_5: " +description +" - code after loop but inside label should be executed",
-    "pass",
-    result2 );
-}
-
diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-empty-list.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-empty-list.binjs
deleted file mode 100644
index da01d11ad0fa16a02f162d329fb3cd7ba3977eb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21
UcmcD?$t*6hV_|>*8+|Yr05Ts0pa1{>

diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-empty-untagged-tuple.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-empty-untagged-tuple.binjs
deleted file mode 100644
index a4386f1d20cd..000000000000
--- a/js/src/jsapi-tests/binast/tokenizer/tester/test-empty-untagged-tuple.binjs
+++ /dev/null
@@ -1 +0,0 @@
-<tuple></tuple>
\ No newline at end of file
diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-nested-lists.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-nested-lists.binjs
deleted file mode 100644
index d20681c3cc1dd283dee8568cfaa854af41335d5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmcD?$t*6h^JHLPU<6_tFwX?YVgm7sONuh{((Ram?6mxR8+|ArSv)DR2qCTy)@}o#
E0Px}%*Z=?k

diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-simple-string.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-simple-string.binjs
deleted file mode 100644
index 4dd9869685ebb23c52fa3f61a299fb94df82428b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34
fcmcC1E-A{)OSj`?U|=ZD%q_@CRe*@t=tE@y!tV>9

diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-simple-tagged-tuple.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-simple-tagged-tuple.binjs
deleted file mode 100644
index 395fdb4476b5632e0445b8e17aa76c3f91c31a57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 81
zcmcC1DJ{rJwX?}cO-!*1NGvHyEy`nHVqjp%OkpTX%qdM}u+az0*%X%)W#*;ZF$3k&
X^7C!<q5OQI<^!h`IUQ{DAtnI;9z+@$

diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-string-with-escapes.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-string-with-escapes.binjs
deleted file mode 100644
index b895cf16b7e053f6e50dff48f37d62b6f9d30126..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44
pcmcC1E-A{)OScneU|@hS70NS9G89salM@S4ixn6c8Eo{SY5+ZI4gmlF

diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-trivial-list.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-trivial-list.binjs
deleted file mode 100644
index b92d59df5ea358770349b9bd2cb1f0b1c14eb9d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69
vcmcD?$t*6hGhtw0U;<*B;*z4wymUKeAUiET-$ozGM;1>?EJBFugS7(yf`AkA

diff --git a/js/src/jsapi-tests/binast/tokenizer/tester/test-trivial-untagged-tuple.binjs b/js/src/jsapi-tests/binast/tokenizer/tester/test-trivial-untagged-tuple.binjs
deleted file mode 100644
index 7100fae76b620b7ecce0e6b7304c10ecaccd0823..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 63
qcmcC1DJ{rJwX-QMDay=Cw_|2tU`Wf)x6z04k;Rh|ixA@a5PblXG8CBr

diff --git a/js/src/jsapi-tests/moz.build b/js/src/jsapi-tests/moz.build
index 61a5217d3d2b..9ea1ddf5d1a7 100644
--- a/js/src/jsapi-tests/moz.build
+++ b/js/src/jsapi-tests/moz.build
@@ -137,12 +137,6 @@ if CONFIG['ENABLE_STREAMS']:
         'testReadableStream.cpp',
     ]
 
-if CONFIG['JS_BUILD_BINAST']:
-    UNIFIED_SOURCES += [
-        'testBinASTReader.cpp',
-        'testBinTokenReaderTester.cpp'
-    ]
-
 DEFINES['EXPORT_JS_API'] = True
 
 LOCAL_INCLUDES += [
diff --git a/js/src/jsapi-tests/testBinASTReader.cpp b/js/src/jsapi-tests/testBinASTReader.cpp
deleted file mode 100644
index 0a8200988e0d..000000000000
--- a/js/src/jsapi-tests/testBinASTReader.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-#if defined(XP_UNIX)
-
-#include <dirent.h>
-#include <sys/stat.h>
-
-#elif defined(XP_WIN)
-
-#include <windows.h>
-
-#endif
-
-#include "jsapi.h"
-
-
-#include "frontend/BinSource.h"
-#include "frontend/FullParseHandler.h"
-#include "frontend/ParseContext.h"
-#include "frontend/Parser.h"
-#include "gc/Zone.h"
-#include "js/Vector.h"
-
-#include "jsapi-tests/tests.h"
-
-#include "vm/Interpreter.h"
-
-using UsedNameTracker = js::frontend::UsedNameTracker;
-using namespace JS;
-using namespace js;
-
-extern void enterJsDirectory();
-extern void exitJsDirectory();
-extern void readFull(const char* path, js::Vector<uint8_t>& buf);
-
-void
-readFull(JSContext* cx, const char* path, js::Vector<char16_t>& buf)
-{
-    buf.shrinkTo(0);
-
-    js::Vector<uint8_t> intermediate(cx);
-    readFull(path, intermediate);
-
-    if (!buf.appendAll(intermediate))
-        MOZ_CRASH("Couldn't read data");
-}
-
-BEGIN_TEST(testBinASTReaderECMAScript2)
-{
-    const char BIN_SUFFIX[] = ".binjs";
-    const char TXT_SUFFIX[] = ".js";
-
-    CompileOptions options(cx);
-    options.setIntroductionType("unit test parse")
-           .setFileAndLine("<string>", 1);
-
-#if defined(XP_UNIX)
-
-    const char PATH[] = "jsapi-tests/binast/parser/tester/";
-
-    // Read the list of files in the directory.
-    enterJsDirectory();
-    DIR* dir = opendir(PATH);
-    exitJsDirectory();
-    if (!dir)
-        MOZ_CRASH("Couldn't open directory");
-
-
-    while (auto entry = readdir(dir)) {
-        // Find files whose name ends with ".binjs".
-        const char* d_name = entry->d_name;
-
-#elif defined(XP_WIN)
-
-    const char PATH[] = "jsapi-tests\\binast\\parser\\tester\\*.binjs";
-
-    WIN32_FIND_DATA FindFileData;
-    enterJsDirectory();
-    HANDLE hFind = FindFirstFile(PATH, &FindFileData);
-    exitJsDirectory();
-    for (bool found = (hFind != INVALID_HANDLE_VALUE);
-            found;
-            found = FindNextFile(hFind, &FindFileData))
-    {
-        const char* d_name = FindFileData.cFileName;
-
-#endif // defined(XP_UNIX) || defined(XP_WIN)
-
-        const size_t namlen = strlen(d_name);
-        if (namlen < sizeof(BIN_SUFFIX))
-            continue;
-        if (strncmp(d_name + namlen - (sizeof(BIN_SUFFIX) - 1), BIN_SUFFIX, sizeof(BIN_SUFFIX)) != 0)
-            continue;
-
-        // Find text file.
-        UniqueChars txtPath(static_cast<char*>(js_malloc(namlen + sizeof(PATH) + 1)));
-        strncpy(txtPath.get(), PATH, sizeof(PATH));
-        strncpy(txtPath.get() + sizeof(PATH) - 1, d_name, namlen);
-        strncpy(txtPath.get() + sizeof(PATH) + namlen - sizeof(BIN_SUFFIX), TXT_SUFFIX, sizeof(TXT_SUFFIX));
-        txtPath[sizeof(PATH) + namlen - sizeof(BIN_SUFFIX) + sizeof(TXT_SUFFIX) - 1] = 0;
-        fprintf(stderr, "Testing %s\n", txtPath.get());
-
-        // Read text file.
-        js::Vector<char16_t> txtSource(cx);
-        readFull(cx, txtPath.get(), txtSource);
-
-        // Parse text file.
-        UsedNameTracker txtUsedNames(cx);
-        if (!txtUsedNames.init())
-            MOZ_CRASH("Couldn't initialize used names");
-        js::frontend::Parser<js::frontend::FullParseHandler, char16_t> parser(cx, cx->tempLifoAlloc(), options, txtSource.begin(), txtSource.length(),
-                                                  /* foldConstants = */ false, txtUsedNames, nullptr,
-                                                  nullptr);
-        if (!parser.checkOptions())
-            MOZ_CRASH("Bad options");
-
-        auto txtParsed = parser.parse(); // Will be deallocated once `parser` goes out of scope.
-        RootedValue txtExn(cx);
-        if (!txtParsed) {
-            // Save exception for more detailed error message, if necessary.
-            if (!js::GetAndClearException(cx, &txtExn))
-                MOZ_CRASH("Couldn't clear exception");
-        }
-
-        // Read binary file.
-        UniqueChars binPath(static_cast<char*>(js_malloc(namlen + sizeof(PATH) + 1)));
-        strncpy(binPath.get(), PATH, sizeof(PATH));
-        strncpy(binPath.get() + sizeof(PATH) - 1, d_name, namlen);
-        binPath[namlen + sizeof(PATH) - 1] = 0;
-
-        js::Vector<uint8_t> binSource(cx);
-        readFull(binPath.get(), binSource);
-
-        // Parse binary file.
-        js::frontend::UsedNameTracker binUsedNames(cx);
-        if (!binUsedNames.init())
-            MOZ_CRASH("Couldn't initialized binUsedNames");
-
-        js::frontend::BinASTParser reader(cx, cx->tempLifoAlloc(), binUsedNames, options);
-
-        auto binParsed = reader.parse(binSource); // Will be deallocated once `reader` goes out of scope.
-        RootedValue binExn(cx);
-        if (binParsed.isErr()) {
-            // Save exception for more detailed error message, if necessary.
-            if (!js::GetAndClearException(cx, &binExn))
-                MOZ_CRASH("Couldn't clear binExn");
-        }
-
-        // The binary parser should accept the file iff the text parser has.
-        if (binParsed.isOk() && !txtParsed) {
-            fprintf(stderr, "Text file parsing failed: ");
-
-            js::ErrorReport report(cx);
-            if (!report.init(cx, txtExn, js::ErrorReport::WithSideEffects))
-                MOZ_CRASH("Couldn't report txtExn");
-
-            PrintError(cx, stderr, report.toStringResult(), report.report(), /* reportWarnings */ true);
-            MOZ_CRASH("Binary parser accepted a file that text parser rejected");
-        }
-
-        if (binParsed.isErr() && txtParsed) {
-            fprintf(stderr, "Binary file parsing failed: ");
-
-            js::ErrorReport report(cx);
-            if (!report.init(cx, binExn, js::ErrorReport::WithSideEffects))
-                MOZ_CRASH("Couldn't report binExn");
-
-            PrintError(cx, stderr, report.toStringResult(), report.report(), /* reportWarnings */ true);
-            MOZ_CRASH("Binary parser rejected a file that text parser accepted");
-        }
-
-        if (binParsed.isErr()) {
-            fprintf(stderr, "Binary parser and text parser agree that %s is invalid\n", txtPath.get());
-            continue;
-        }
-
-#if defined(DEBUG) // Dumping an AST is only defined in DEBUG builds
-        // Compare ASTs.
-        Sprinter binPrinter(cx);
-        if (!binPrinter.init())
-            MOZ_CRASH("Couldn't display binParsed");
-        DumpParseTree(binParsed.unwrap(), binPrinter);
-
-        Sprinter txtPrinter(cx);
-        if (!txtPrinter.init())
-            MOZ_CRASH("Couldn't display txtParsed");
-        DumpParseTree(txtParsed, txtPrinter);
-
-        if (strcmp(binPrinter.string(), txtPrinter.string()) != 0) {
-            fprintf(stderr, "Got distinct ASTs when parsing %s:\n\tBINARY\n%s\n\n\tTEXT\n%s\n", txtPath.get(), binPrinter.string(), txtPrinter.string());
-            MOZ_CRASH("Got distinct ASTs");
-        }
-        fprintf(stderr, "Got the same AST when parsing %s\n", txtPath.get());
-
-#endif // defined(DEBUG)
-    }
-
-#if defined(XP_WIN)
-    if (!FindClose(hFind))
-        MOZ_CRASH("Could not close Find");
-#elif defined(XP_UNIX)
-    if (closedir(dir) != 0)
-        MOZ_CRASH("Could not close dir");
-#endif // defined(XP_WIN)
-
-    return true;
-}
-END_TEST(testBinASTReaderECMAScript2)
-
diff --git a/js/src/jsapi-tests/testBinTokenReaderTester.cpp b/js/src/jsapi-tests/testBinTokenReaderTester.cpp
deleted file mode 100644
index f7ab1e5a0621..000000000000
--- a/js/src/jsapi-tests/testBinTokenReaderTester.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include <string.h>
-#include <sys/stat.h>
-
-#if defined (XP_WIN)
-#include <windows.h>
-#elif defined(XP_UNIX)
-#include <fcntl.h>
-#include <unistd.h>
-#endif // defined (XP_WIN) || defined (XP_UNIX)
-
-#include "frontend/BinTokenReaderTester.h"
-#include "gc/Zone.h"
-
-#include "js/Vector.h"
-
-#include "jsapi-tests/tests.h"
-
-using Tokenizer = js::frontend::BinTokenReaderTester;
-using Chars = Tokenizer::Chars;
-
-// Hack: These tests need access to resources, which are present in the source dir
-// but not copied by our build system. To simplify things, we chdir to the source
-// dir at the start of each test and return to the previous directory afterwards.
-
-#if defined(XP_UNIX)
-
-static int gJsDirectory(0);
-void enterJsDirectory() {
-// Save current directory.
-    MOZ_ASSERT(gJsDirectory == 0);
-    gJsDirectory = open(".", O_RDONLY);
-    MOZ_ASSERT(gJsDirectory != 0, "Could not open directory '.'");
-// Go to the directory provided by autospider, if any.
-    const char* destination = getenv("AUTOSPIDER_DIR");
-    if (destination) {
-        if (chdir(destination) == -1)
-            MOZ_CRASH_UNSAFE_PRINTF("Could not chdir to %s", destination);
-    }
-}
-void exitJsDirectory() {
-    MOZ_ASSERT(gJsDirectory);
-    if (fchdir(gJsDirectory) == -1)
-        MOZ_CRASH("Could not return to original directory");
-    if (close(gJsDirectory) != 0)
-        MOZ_CRASH("Could not close js directory");
-    gJsDirectory = 0;
-}
-
-#else
-
-char gJsDirectory[MAX_PATH] = { 0 };
-
-void enterJsDirectory() {
-    // Save current directory.
-    MOZ_ASSERT(strlen(gJsDirectory) == 0);
-    auto result = GetCurrentDirectory(MAX_PATH, gJsDirectory);
-    if (result <= 0)
-        MOZ_CRASH("Could not get current directory");
-    if (result > MAX_PATH)
-        MOZ_CRASH_UNSAFE_PRINTF("Could not get current directory: needed %ld bytes, got %ld\n", result, MAX_PATH);
-
-    // Find destination directory, if any.
-    char destination[MAX_PATH];
-    if (!GetEnvironmentVariable("AUTOSPIDER_DIR", destination, MAX_PATH)) {
-        if (GetLastError() != ERROR_ENVVAR_NOT_FOUND)
-            MOZ_CRASH("Could not get AUTOSPIDER_DIR");
-        else
-            return;
-    }
-
-    // Go to the directory.
-    if (SetCurrentDirectory(destination) != 0)
-        MOZ_CRASH_UNSAFE_PRINTF("Could not chdir to %s", destination);
-}
-
-void exitJsDirectory() {
-    MOZ_ASSERT(strlen(gJsDirectory) > 0);
-    if (SetCurrentDirectory(gJsDirectory) != 0)
-        MOZ_CRASH("Could not return to original directory");
-    gJsDirectory[0] = 0;
-}
-
-#endif // defined(XP_UNIX) || defined(XP_WIN)
-
-void readFull(const char* path, js::Vector<uint8_t>& buf) {
-    enterJsDirectory();
-    buf.shrinkTo(0);
-    FILE* in = fopen(path, "r");
-    if (!in)
-        MOZ_CRASH_UNSAFE_PRINTF("Could not open %s: %s", path, strerror(errno));
-
-    struct stat info;
-    if (stat(path, &info) < 0)
-        MOZ_CRASH_UNSAFE_PRINTF("Could not get stat on %s", path);
-
-    if (!buf.growBy(info.st_size))
-        MOZ_CRASH("OOM");
-
-    int result = fread(buf.begin(), 1, info.st_size, in);
-    if (fclose(in) != 0)
-        MOZ_CRASH("Could not close input file");
-    if (result != info.st_size)
-        MOZ_CRASH("Read error");
-    exitJsDirectory();
-}
-
-
-// Reading a simple string.
-BEGIN_TEST(testBinTokenReaderTesterSimpleString)
-{
-    js::Vector<uint8_t> contents(cx);
-    readFull("jsapi-tests/binast/tokenizer/tester/test-simple-string.binjs", contents);
-    Tokenizer tokenizer(cx, contents);
-
-    Maybe<Chars> found;
-    CHECK(tokenizer.readMaybeChars(found));
-
-    CHECK(Tokenizer::equals(*found, "simple string")); // FIXME: Find a way to make CHECK_EQUAL use `Tokenizer::equals`.
-
-    return true;
-}
-END_TEST(testBinTokenReaderTesterSimpleString)
-
-// Reading a string with embedded 0.
-BEGIN_TEST(testBinTokenReaderTesterStringWithEscapes)
-{
-    js::Vector<uint8_t> contents(cx);
-    readFull("jsapi-tests/binast/tokenizer/tester/test-string-with-escapes.binjs", contents);
-    Tokenizer tokenizer(cx, contents);
-
-    Maybe<Chars> found;
-    CHECK(tokenizer.readMaybeChars(found));
-
-    CHECK(Tokenizer::equals(*found, "string with escapes \0\1\0")); // FIXME: Find a way to make CHECK_EQUAL use `Tokenizer::equals`.
-
-    return true;
-}
-END_TEST(testBinTokenReaderTesterStringWithEscapes)
-
-// Reading an empty untagged tuple
-BEGIN_TEST(testBinTokenReaderTesterEmptyUntaggedTuple)
-{
-    js::Vector<uint8_t> contents(cx);
-    readFull("jsapi-tests/binast/tokenizer/tester/test-empty-untagged-tuple.binjs", contents);
-    Tokenizer tokenizer(cx, contents);
-
-    {
-        Tokenizer::AutoTuple guard(tokenizer);
-        CHECK(tokenizer.enterUntaggedTuple(guard));
-        CHECK(guard.done());
-    }
-
-    return true;
-}
-END_TEST(testBinTokenReaderTesterEmptyUntaggedTuple)
-
-// Reading a untagged tuple with two strings
-BEGIN_TEST(testBinTokenReaderTesterTwoStringsInTuple)
-{
-    js::Vector<uint8_t> contents(cx);
-    readFull("jsapi-tests/binast/tokenizer/tester/test-trivial-untagged-tuple.binjs", contents);
-    Tokenizer tokenizer(cx, contents);
-
-    {
-        Tokenizer::AutoTuple guard(tokenizer);
-        CHECK(tokenizer.enterUntaggedTuple(guard));
-
-        Maybe<Chars> found_0;
-        CHECK(tokenizer.readMaybeChars(found_0));
-        CHECK(Tokenizer::equals(*found_0, "foo")); // FIXME: Find a way to make CHECK_EQUAL use `Tokenizer::equals`.
-
-        Maybe<Chars> found_1;
-        CHECK(tokenizer.readMaybeChars(found_1));
-        CHECK(Tokenizer::equals(*found_1, "bar")); // FIXME: Find a way to make CHECK_EQUAL use `Tokenizer::equals`.
-
-        CHECK(guard.done());
-    }
-
-    return true;
-}
-END_TEST(testBinTokenReaderTesterTwoStringsInTuple)
-
-// Reading a tagged tuple `Pattern { id: "foo", value: 3.1415}`
-BEGIN_TEST(testBinTokenReaderTesterSimpleTaggedTuple)
-{
-    js::Vector<uint8_t> contents(cx);
-    readFull("jsapi-tests/binast/tokenizer/tester/test-simple-tagged-tuple.binjs", contents);
-    Tokenizer tokenizer(cx, contents);
-
-    {
-        js::frontend::BinKind tag;
-        Tokenizer::BinFields fields(cx);
-        Tokenizer::AutoTaggedTuple guard(tokenizer);
-        CHECK(tokenizer.enterTaggedTuple(tag, fields, guard));
-
-        CHECK(tag == js::frontend::BinKind::Pattern);
-
-        Maybe<Chars> found_id;
-        const double EXPECTED_value = 3.1415;
-        Maybe<double> found_value;
-
-        // Order of fields is not deterministic in the encoder (we could make
-        // it deterministic for the test, though, since we already know the binary).
-        if (fields[0] == js::frontend::BinField::Id) {
-            CHECK(fields[1] == js::frontend::BinField::Value);
-            CHECK(tokenizer.readMaybeChars(found_id));
-            CHECK(tokenizer.readMaybeDouble(found_value));
-        } else if (fields[0] == js::frontend::BinField::Value) {
-            CHECK(fields[1] == js::frontend::BinField::Id);
-            CHECK(tokenizer.readMaybeDouble(found_value));
-            CHECK(tokenizer.readMaybeChars(found_id));
-        } else {
-            CHECK(false);
-        }
-
-        CHECK(EXPECTED_value == *found_value); // Apparently, CHECK_EQUAL doesn't work on `double`.
-        CHECK(Tokenizer::equals(*found_id, "foo"));
-        CHECK(guard.done());
-    }
-
-    return true;
-}
-END_TEST(testBinTokenReaderTesterSimpleTaggedTuple)
-
-
-// Reading an empty list
-BEGIN_TEST(testBinTokenReaderTesterEmptyList)
-{
-    js::Vector<uint8_t> contents(cx);
-    readFull("jsapi-tests/binast/tokenizer/tester/test-empty-list.binjs", contents);
-    Tokenizer tokenizer(cx, contents);
-
-    {
-        uint32_t length;
-        Tokenizer::AutoList guard(tokenizer);
-        CHECK(tokenizer.enterList(length, guard));
-
-        CHECK(length == 0);
-        CHECK(guard.done());
-    }
-
-    return true;
-}
-END_TEST(testBinTokenReaderTesterEmptyList)
-
-// Reading `["foo", "bar"]`
-BEGIN_TEST(testBinTokenReaderTesterSimpleList)
-{
-    js::Vector<uint8_t> contents(cx);
-    readFull("jsapi-tests/binast/tokenizer/tester/test-trivial-list.binjs", contents);
-    Tokenizer tokenizer(cx, contents);
-
-    {
-        uint32_t length;
-        Tokenizer::AutoList guard(tokenizer);
-        CHECK(tokenizer.enterList(length, guard));
-
-        CHECK(length == 2);
-
-        Maybe<Chars> found_0;
-        CHECK(tokenizer.readMaybeChars(found_0));
-        CHECK(Tokenizer::equals(*found_0, "foo"));
-
-        Maybe<Chars> found_1;
-        CHECK(tokenizer.readMaybeChars(found_1));
-        CHECK(Tokenizer::equals(*found_1, "bar"));
-
-        CHECK(guard.done());
-    }
-
-    return true;
-}
-END_TEST(testBinTokenReaderTesterSimpleList)
-
-
-// Reading `[["foo", "bar"]]`
-BEGIN_TEST(testBinTokenReaderTesterNestedList)
-{
-    js::Vector<uint8_t> contents(cx);
-    readFull("jsapi-tests/binast/tokenizer/tester/test-nested-lists.binjs", contents);
-    Tokenizer tokenizer(cx, contents);
-
-    {
-        uint32_t outerLength;
-        Tokenizer::AutoList outerGuard(tokenizer);
-        CHECK(tokenizer.enterList(outerLength, outerGuard));
-        CHECK(outerLength == 1);
-
-        {
-            uint32_t innerLength;
-            Tokenizer::AutoList innerGuard(tokenizer);
-            CHECK(tokenizer.enterList(innerLength, innerGuard));
-            CHECK(innerLength == 2);
-
-            Maybe<Chars> found_0;
-            CHECK(tokenizer.readMaybeChars(found_0));
-            CHECK(Tokenizer::equals(*found_0, "foo"));
-
-            Maybe<Chars> found_1;
-            CHECK(tokenizer.readMaybeChars(found_1));
-            CHECK(Tokenizer::equals(*found_1, "bar"));
-
-            CHECK(innerGuard.done());
-        }
-
-        CHECK(outerGuard.done());
-    }
-
-    return true;
-}
-END_TEST(testBinTokenReaderTesterNestedList)
diff --git a/js/src/moz.build b/js/src/moz.build
index bc1c8216de8f..ddd98e0185df 100755
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -642,16 +642,6 @@ if CONFIG['NIGHTLY_BUILD']:
     DEFINES['ENABLE_SIMD'] = True
     DEFINES['ENABLE_WASM_THREAD_OPS'] = True
 
-if CONFIG['JS_BUILD_BINAST']:
-    # Some parts of BinAST are designed only to test evolutions of the
-    # specification:
-    UNIFIED_SOURCES += ['frontend/BinTokenReaderTester.cpp']
-    # The rest of BinAST should eventually move to release.
-    UNIFIED_SOURCES += [
-        'frontend/BinSource.cpp',
-        'frontend/BinToken.cpp'
-    ]
-
 # Wasm code should use WASM_HUGE_MEMORY instead of JS_CODEGEN_X64
 # so that it is easy to use the huge-mapping optimization for other
 # 64-bit platforms in the future.
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 8794f40880a2..649352ed3b54 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -74,11 +74,6 @@
 #include "builtin/ModuleObject.h"
 #include "builtin/RegExp.h"
 #include "builtin/TestingFunctions.h"
-
-#if defined(JS_BUILD_BINAST)
-#include "frontend/BinSource.h"
-#endif // defined(JS_BUILD_BINAST)
-
 #include "frontend/Parser.h"
 #include "gc/GCInternals.h"
 #include "jit/arm/Simulator-arm.h"
@@ -4397,64 +4392,6 @@ GetModuleLoadPath(JSContext* cx, unsigned argc, Value* vp)
     return true;
 }
 
-#if defined(JS_BUILD_BINAST)
-
-static bool
-BinParse(JSContext* cx, unsigned argc, Value* vp)
-{
-    using namespace js::frontend;
-
-    CallArgs args = CallArgsFromVp(argc, vp);
-
-    if (args.length() < 1) {
-        JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
-                                  "parse", "0", "s");
-        return false;
-    }
-    if (!args[0].isObject()) {
-        const char* typeName = InformalValueTypeName(args[0]);
-        JS_ReportErrorASCII(cx, "expected object (typed array) to parse, got %s", typeName);
-        return false;
-    }
-
-    RootedObject obj(cx, &args[0].toObject());
-    if (!JS_IsTypedArrayObject(obj)) {
-        const char* typeName = InformalValueTypeName(args[0]);
-        JS_ReportErrorASCII(cx, "expected typed array to parse, got %s", typeName);
-        return false;
-    }
-
-    uint32_t buf_length = 0;
-    bool buf_isSharedMemory = false;
-    uint8_t* buf_data = nullptr;
-    GetArrayBufferViewLengthAndData(obj, &buf_length, &buf_isSharedMemory, &buf_data);
-    MOZ_ASSERT(buf_data);
-
-    CompileOptions options(cx);
-    options.setIntroductionType("js shell bin parse")
-           .setFileAndLine("<ArrayBuffer>", 1);
-
-    UsedNameTracker usedNames(cx);
-    if (!usedNames.init())
-        return false;
-
-    BinASTParser reader(cx, cx->tempLifoAlloc(), usedNames, options);
-
-    JS::Result<ParseNode*> parsed = reader.parse(buf_data, buf_length);
-    if (parsed.isErr())
-        return false;
-
-#ifdef DEBUG
-    Fprinter out(stderr);
-    DumpParseTree(parsed.unwrap(), out);
-#endif
-
-    args.rval().setUndefined();
-    return true;
-}
-
-#endif // defined(JS_BUILD_BINAST)
-
 static bool
 Parse(JSContext* cx, unsigned argc, Value* vp)
 {
@@ -4487,22 +4424,22 @@ Parse(JSContext* cx, unsigned argc, Value* vp)
     CompileOptions options(cx);
     options.setIntroductionType("js shell parse")
            .setFileAndLine("<string>", 1);
-
     UsedNameTracker usedNames(cx);
     if (!usedNames.init())
         return false;
     Parser<FullParseHandler, char16_t> parser(cx, cx->tempLifoAlloc(), options, chars, length,
-                                              /* foldConstants = */ false, usedNames, nullptr,
+                                              /* foldConstants = */ true, usedNames, nullptr,
                                               nullptr);
     if (!parser.checkOptions())
         return false;
 
-    ParseNode* pn = parser.parse(); // Deallocated once `parser` goes out of scope.
+    ParseNode* pn = parser.parse();
     if (!pn)
         return false;
 #ifdef DEBUG
     js::Fprinter out(stderr);
     DumpParseTree(pn, out);
+    out.putChar('\n');
 #endif
     args.rval().setUndefined();
     return true;
@@ -6809,14 +6746,6 @@ static const JSFunctionSpecWithHelp shell_functions[] = {
 "  Return any --module-load-path argument passed to the shell.  Used by the\n"
 "  module loader.\n"),
 
-#if defined(JS_BUILD_BINAST)
-
-JS_FN_HELP("parseBin", BinParse, 1, 0,
-"parseBin(arraybuffer)",
-"  Parses a Binary AST, potentially throwing."),
-
-#endif // defined(JS_BUILD_BINAST)
-
     JS_FN_HELP("parse", Parse, 1, 0,
 "parse(code)",
 "  Parses a string, potentially throwing."),

From 616150b4ff145be3090f4c5e73731fd8d2d044ac Mon Sep 17 00:00:00 2001
From: Johann Hofmann <jhofmann@mozilla.com>
Date: Mon, 4 Dec 2017 15:39:53 +0100
Subject: [PATCH 200/219] Bug 1422811 - Move reportTLS functionality for cert
 error pages into content.js. r=Gijs,mgoodwin

This also ensures that we consider certificate error pages in frames as well as top-level.

MozReview-Commit-ID: IA4vT8yZnuN

--HG--
extra : rebase_source : c8825d4fc3e4a3ca018f27b2ada3a6bba2685a65
---
 browser/base/content/browser.js | 24 ------------------------
 browser/base/content/content.js | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 4a3662be1910..87b8e9aaeb49 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2902,7 +2902,6 @@ var BrowserOnClick = {
     mm.addMessageListener("Browser:OpenCaptivePortalPage", this);
     mm.addMessageListener("Browser:SiteBlockedError", this);
     mm.addMessageListener("Browser:EnableOnlineMode", this);
-    mm.addMessageListener("Browser:SendSSLErrorReport", this);
     mm.addMessageListener("Browser:SetSSLErrorReportAuto", this);
     mm.addMessageListener("Browser:ResetSSLPreferences", this);
     mm.addMessageListener("Browser:SSLErrorReportTelemetry", this);
@@ -2917,7 +2916,6 @@ var BrowserOnClick = {
     mm.removeMessageListener("Browser:CertExceptionError", this);
     mm.removeMessageListener("Browser:SiteBlockedError", this);
     mm.removeMessageListener("Browser:EnableOnlineMode", this);
-    mm.removeMessageListener("Browser:SendSSLErrorReport", this);
     mm.removeMessageListener("Browser:SetSSLErrorReportAuto", this);
     mm.removeMessageListener("Browser:ResetSSLPreferences", this);
     mm.removeMessageListener("Browser:SSLErrorReportTelemetry", this);
@@ -2960,11 +2958,6 @@ var BrowserOnClick = {
           msg.target.reload();
         }
       break;
-      case "Browser:SendSSLErrorReport":
-        this.onSSLErrorReport(msg.target,
-                              msg.data.uri,
-                              msg.data.securityInfo);
-      break;
       case "Browser:ResetSSLPreferences":
         let prefSSLImpact = PREF_SSL_IMPACT_ROOTS.reduce((prefs, root) => {
                 return prefs.concat(Services.prefs.getChildList(root));
@@ -2993,23 +2986,6 @@ var BrowserOnClick = {
     }
   },
 
-  onSSLErrorReport(browser, uri, securityInfo) {
-    if (!Services.prefs.getBoolPref("security.ssl.errorReporting.enabled")) {
-      Cu.reportError("User requested certificate error report sending, but certificate error reporting is disabled");
-      return;
-    }
-
-    let serhelper = Cc["@mozilla.org/network/serialization-helper;1"]
-                           .getService(Ci.nsISerializationHelper);
-    let transportSecurityInfo = serhelper.deserializeObject(securityInfo);
-    transportSecurityInfo.QueryInterface(Ci.nsITransportSecurityInfo);
-
-    let errorReporter = Cc["@mozilla.org/securityreporter;1"]
-                          .getService(Ci.nsISecurityReporter);
-    errorReporter.reportTLSError(transportSecurityInfo,
-                                 uri.host, uri.port);
-  },
-
   onCertError(browser, elementId, isTopFrame, location, securityInfoAsString) {
     let secHistogram = Services.telemetry.getHistogramById("SECURITY_UI");
     let securityInfo;
diff --git a/browser/base/content/content.js b/browser/base/content/content.js
index 92b566915d3d..7fb1b5bcaba4 100644
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -442,14 +442,20 @@ var AboutNetAndCertErrorListener = {
       automatic: evt.detail
     });
 
-    // if we're enabling reports, send a report for this failure
+    // If we're enabling reports, send a report for this failure.
     if (evt.detail) {
-      let {host, port} = content.document.mozDocumentURIIfNotForErrorPages;
-      sendAsyncMessage("Browser:SendSSLErrorReport", {
-        uri: { host, port },
-        securityInfo: getSerializedSecurityInfo(docShell),
-      });
+      let win = evt.originalTarget.ownerGlobal;
+      let docShell = win.QueryInterface(Ci.nsIInterfaceRequestor)
+                        .getInterface(Ci.nsIWebNavigation)
+                        .QueryInterface(Ci.nsIDocShell);
 
+      let {securityInfo} = docShell.failedChannel;
+      securityInfo.QueryInterface(Ci.nsITransportSecurityInfo);
+      let {host, port} = win.document.mozDocumentURIIfNotForErrorPages;
+
+      let errorReporter = Cc["@mozilla.org/securityreporter;1"]
+                            .getService(Ci.nsISecurityReporter);
+      errorReporter.reportTLSError(securityInfo, host, port);
     }
   },
 };

From 5d8fa6f3518f8e3edc7bed4a9af9b3c23c59d73a Mon Sep 17 00:00:00 2001
From: Francois Marier <francois@mozilla.com>
Date: Fri, 24 Nov 2017 17:35:05 -0800
Subject: [PATCH 201/219] Bug 446344 - Implement Origin header CSRF mitigation.
 r=ckerschb,dragana

MozReview-Commit-ID: EZpGo0UfmUP

--HG--
extra : rebase_source : dce83c8314148c104e47ae322c4d578e96986ea3
extra : source : d4747fd86a331aed7b524b509f915f0c9dd6044f
---
 modules/libpref/init/all.js                   |   4 +
 netwerk/protocol/http/HttpBaseChannel.cpp     |  36 +-
 netwerk/protocol/http/HttpBaseChannel.h       |   2 +
 netwerk/protocol/http/nsHttpAtomList.h        |   1 +
 netwerk/protocol/http/nsHttpChannel.cpp       |  53 +++
 netwerk/protocol/http/nsHttpChannel.h         |   1 +
 netwerk/test/mochitests/mochitest.ini         |   4 +
 netwerk/test/mochitests/origin_header.sjs     |  10 +
 .../mochitests/origin_header_form_post.html   |  19 +
 .../origin_header_form_post_xorigin.html      |  19 +
 .../test/mochitests/test_origin_header.html   | 341 ++++++++++++++++++
 11 files changed, 475 insertions(+), 15 deletions(-)
 create mode 100644 netwerk/test/mochitests/origin_header.sjs
 create mode 100644 netwerk/test/mochitests/origin_header_form_post.html
 create mode 100644 netwerk/test/mochitests/origin_header_form_post_xorigin.html
 create mode 100644 netwerk/test/mochitests/test_origin_header.html

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index c6b0b5a6342b..6952304dc101 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1690,6 +1690,10 @@ pref("network.http.referer.XOriginTrimmingPolicy", 0);
 // 0=always send, 1=send iff base domains match, 2=send iff hosts match
 pref("network.http.referer.XOriginPolicy", 0);
 
+// Include an origin header on non-GET and non-HEAD requests regardless of CORS
+// 0=never send, 1=send when same-origin only, 2=always send
+pref("network.http.sendOriginHeader", 0);
+
 // Maximum number of consecutive redirects before aborting.
 pref("network.http.redirection-limit", 20);
 
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
index 1d3a49f5d72e..2b35c0214542 100644
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -1687,22 +1687,10 @@ HttpBaseChannel::SetReferrerWithPolicy(nsIURI *referrer,
     referrer = referrerGrip.get();
   }
 
-  //
-  // block referrer if not on our white list...
-  //
-  static const char *const referrerWhiteList[] = {
-    "http",
-    "https",
-    "ftp",
-    nullptr
-  };
-  match = false;
-  const char *const *scheme = referrerWhiteList;
-  for (; *scheme && !match; ++scheme) {
-    rv = referrer->SchemeIs(*scheme, &match);
-    if (NS_FAILED(rv)) return rv;
+  // Enforce Referrer whitelist
+  if (!IsReferrerSchemeAllowed(referrer)) {
+    return NS_OK; // kick out....
   }
-  if (!match) return NS_OK; // kick out....
 
   //
   // Handle secure referrals.
@@ -3322,6 +3310,24 @@ HttpBaseChannel::AddCookiesToRequest()
   SetRequestHeader(nsDependentCString(nsHttp::Cookie), cookie, false);
 }
 
+/* static */
+bool
+HttpBaseChannel::IsReferrerSchemeAllowed(nsIURI *aReferrer)
+{
+  NS_ENSURE_TRUE(aReferrer, false);
+
+  nsAutoCString scheme;
+  nsresult rv = aReferrer->GetScheme(scheme);
+  NS_ENSURE_SUCCESS(rv, false);
+
+  if (scheme.EqualsIgnoreCase("https") ||
+      scheme.EqualsIgnoreCase("http") ||
+      scheme.EqualsIgnoreCase("ftp")) {
+    return true;
+  }
+  return false;
+}
+
 bool
 HttpBaseChannel::ShouldRewriteRedirectToGET(uint32_t httpStatus,
                                             nsHttpRequestHead::ParsedMethodType method)
diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h
index 6782ee269a40..9e652a745c92 100644
--- a/netwerk/protocol/http/HttpBaseChannel.h
+++ b/netwerk/protocol/http/HttpBaseChannel.h
@@ -348,6 +348,8 @@ public: /* Necko internal use only... */
     int64_t GetAltDataLength() { return mAltDataLength; }
     bool IsNavigation();
 
+    static bool IsReferrerSchemeAllowed(nsIURI *aReferrer);
+
     // Return whether upon a redirect code of httpStatus for method, the
     // request method should be rewritten to GET.
     static bool ShouldRewriteRedirectToGET(uint32_t httpStatus,
diff --git a/netwerk/protocol/http/nsHttpAtomList.h b/netwerk/protocol/http/nsHttpAtomList.h
index fc55c905f4dd..c26fd77e2dc4 100644
--- a/netwerk/protocol/http/nsHttpAtomList.h
+++ b/netwerk/protocol/http/nsHttpAtomList.h
@@ -63,6 +63,7 @@ HTTP_ATOM(Lock_Token,                "Lock-Token")
 HTTP_ATOM(Link,                      "Link")
 HTTP_ATOM(Location,                  "Location")
 HTTP_ATOM(Max_Forwards,              "Max-Forwards")
+HTTP_ATOM(Origin,                    "Origin")
 HTTP_ATOM(Overwrite,                 "Overwrite")
 HTTP_ATOM(Pragma,                    "Pragma")
 HTTP_ATOM(Prefer,                    "Prefer")
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 98613e930cee..639bcbe0edfa 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -6208,6 +6208,7 @@ nsHttpChannel::BeginConnect()
     mRequestHead.SetHTTPS(isHttps);
     mRequestHead.SetOrigin(scheme, host, port);
 
+    SetOriginHeader();
     SetDoNotTrack();
 
     OriginAttributes originAttributes;
@@ -8955,6 +8956,58 @@ nsHttpChannel::SetLoadGroupUserAgentOverride()
     }
 }
 
+// Step 10 of HTTP-network-or-cache fetch
+void
+nsHttpChannel::SetOriginHeader()
+{
+    if (mRequestHead.IsGet() || mRequestHead.IsHead()) {
+        return;
+    }
+    nsAutoCString existingHeader;
+    Unused << mRequestHead.GetHeader(nsHttp::Origin, existingHeader);
+    if (!existingHeader.IsEmpty()) {
+        LOG(("nsHttpChannel::SetOriginHeader Origin header already present"));
+        return;
+    }
+
+    DebugOnly<nsresult> rv;
+
+    // Instead of consulting Preferences::GetInt() all the time we
+    // can cache the result to speed things up.
+    static int32_t sSendOriginHeader = 0;
+    static bool sIsInited = false;
+    if (!sIsInited) {
+        sIsInited = true;
+        Preferences::AddIntVarCache(&sSendOriginHeader,
+                                    "network.http.sendOriginHeader");
+    }
+    if (sSendOriginHeader == 0) {
+        // Origin header suppressed by user setting
+        return;
+    }
+
+    nsCOMPtr<nsIURI> referrer;
+    mLoadInfo->TriggeringPrincipal()->GetURI(getter_AddRefs(referrer));
+
+    nsAutoCString origin("null");
+    if (referrer && IsReferrerSchemeAllowed(referrer)) {
+        nsContentUtils::GetASCIIOrigin(referrer, origin);
+    }
+
+    // Restrict Origin to same-origin loads if requested by user
+    if (sSendOriginHeader == 1) {
+        nsAutoCString currentOrigin;
+        nsContentUtils::GetASCIIOrigin(mURI, currentOrigin);
+        if (!origin.EqualsIgnoreCase(currentOrigin.get())) {
+            // Origin header suppressed by user setting
+            return;
+        }
+    }
+
+    rv = mRequestHead.SetHeader(nsHttp::Origin, origin, false /* merge */);
+    MOZ_ASSERT(NS_SUCCEEDED(rv));
+}
+
 void
 nsHttpChannel::SetDoNotTrack()
 {
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index 050168ebf832..b792d7647151 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -490,6 +490,7 @@ private:
 
     void SetLoadGroupUserAgentOverride();
 
+    void SetOriginHeader();
     void SetDoNotTrack();
 
     already_AddRefed<nsChannelClassifier> GetOrCreateChannelClassifier();
diff --git a/netwerk/test/mochitests/mochitest.ini b/netwerk/test/mochitests/mochitest.ini
index a35469315b0e..7560c3e4148e 100644
--- a/netwerk/test/mochitests/mochitest.ini
+++ b/netwerk/test/mochitests/mochitest.ini
@@ -15,6 +15,9 @@ support-files =
   redirect_idn.html
   empty.html
   redirect.sjs
+  origin_header.sjs
+  origin_header_form_post.html
+  origin_header_form_post_xorigin.html
 
 [test_arraybufferinputstream.html]
 [test_idn_redirect.html]
@@ -32,3 +35,4 @@ support-files =
 [test_1331680_iframe.html]
 [test_1331680_xhr.html]
 [test_1396395.html]
+[test_origin_header.html]
diff --git a/netwerk/test/mochitests/origin_header.sjs b/netwerk/test/mochitests/origin_header.sjs
new file mode 100644
index 000000000000..a3e1551b6625
--- /dev/null
+++ b/netwerk/test/mochitests/origin_header.sjs
@@ -0,0 +1,10 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function handleRequest(request, response) {
+    response.setHeader("Content-Type", "text/plain", false);
+    response.setHeader("Cache-Control", "no-cache", false);
+
+    var origin = request.hasHeader("Origin") ? request.getHeader("Origin") : "";
+    response.write("Origin: " + origin);
+}
diff --git a/netwerk/test/mochitests/origin_header_form_post.html b/netwerk/test/mochitests/origin_header_form_post.html
new file mode 100644
index 000000000000..01c2df5ef2c0
--- /dev/null
+++ b/netwerk/test/mochitests/origin_header_form_post.html
@@ -0,0 +1,19 @@
+<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html>
+<head>
+    <script>
+     function submitForm() {
+         document.getElementById("form").submit();
+     }
+    </script>
+</head>
+<body onload="submitForm()">
+    <form action="http://Mochi.test:8888/tests/netwerk/test/mochitests/origin_header.sjs"
+          method="POST"
+          id="form">
+        <input type="submit" value="Submit POST">
+    </form>
+</body>
+</html>
diff --git a/netwerk/test/mochitests/origin_header_form_post_xorigin.html b/netwerk/test/mochitests/origin_header_form_post_xorigin.html
new file mode 100644
index 000000000000..52e173747bf1
--- /dev/null
+++ b/netwerk/test/mochitests/origin_header_form_post_xorigin.html
@@ -0,0 +1,19 @@
+<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html>
+<head>
+    <script>
+     function submitForm() {
+         document.getElementById("form").submit();
+     }
+    </script>
+</head>
+<body onload="submitForm()">
+    <form action="http://test1.mochi.test:8888/tests/netwerk/test/mochitests/origin_header.sjs"
+          method="POST"
+          id="form">
+        <input type="submit" value="Submit POST">
+    </form>
+</body>
+</html>
diff --git a/netwerk/test/mochitests/test_origin_header.html b/netwerk/test/mochitests/test_origin_header.html
new file mode 100644
index 000000000000..f113ae88d111
--- /dev/null
+++ b/netwerk/test/mochitests/test_origin_header.html
@@ -0,0 +1,341 @@
+<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html>
+<head>
+    <title> Bug 446344 - Test Origin Header</title>
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+    <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+</head>
+<body>
+
+<p><a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=446344">Mozilla Bug 446344</a></p>
+
+<p id="display"></p>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+const EMPTY_ORIGIN = "Origin: ";
+
+let testsToRun = [
+    {
+        name: "sendOriginHeader=0 (never)",
+        prefs: [
+            ["network.http.sendOriginHeader", 0],
+        ],
+        results: {
+            framePost: EMPTY_ORIGIN,
+            framePostXOrigin: EMPTY_ORIGIN,
+            frameGet: EMPTY_ORIGIN,
+            framePostNonSandboxed: EMPTY_ORIGIN,
+            framePostNonSandboxedXOrigin: EMPTY_ORIGIN,
+            framePostSandboxed: EMPTY_ORIGIN,
+            framePostSrcDoc: EMPTY_ORIGIN,
+            framePostSrcDocXOrigin: EMPTY_ORIGIN,
+            framePostDataURI: EMPTY_ORIGIN,
+        },
+    },
+    {
+        name: "sendOriginHeader=1 (same-origin)",
+        prefs: [
+            ["network.http.sendOriginHeader", 1],
+        ],
+        results: {
+            framePost: "Origin: http://mochi.test:8888",
+            framePostXOrigin: EMPTY_ORIGIN,
+            frameGet: EMPTY_ORIGIN,
+            framePostNonSandboxed: "Origin: http://mochi.test:8888",
+            framePostNonSandboxedXOrigin: EMPTY_ORIGIN,
+            framePostSandboxed: EMPTY_ORIGIN,
+            framePostSrcDoc: "Origin: http://mochi.test:8888",
+            framePostSrcDocXOrigin: EMPTY_ORIGIN,
+            framePostDataURI: EMPTY_ORIGIN,
+        },
+    },
+    {
+        name: "sendOriginHeader=2 (always)",
+        prefs: [
+            ["network.http.sendOriginHeader", 2],
+        ],
+        results: {
+            framePost: "Origin: http://mochi.test:8888",
+            framePostXOrigin: "Origin: http://mochi.test:8888",
+            frameGet: EMPTY_ORIGIN,
+            framePostNonSandboxed: "Origin: http://mochi.test:8888",
+            framePostNonSandboxedXOrigin: "Origin: http://mochi.test:8888",
+            framePostSandboxed: "Origin: null",
+            framePostSrcDoc: "Origin: http://mochi.test:8888",
+            framePostSrcDocXOrigin: "Origin: http://mochi.test:8888",
+            framePostDataURI: "Origin: null",
+        },
+    },
+    {
+        name: "sendRefererHeader=0 (never)",
+        prefs: [
+            ["network.http.sendRefererHeader", 0],
+        ],
+        results: {
+            framePost: "Origin: http://mochi.test:8888",
+            framePostXOrigin: "Origin: http://mochi.test:8888",
+            frameGet: EMPTY_ORIGIN,
+            framePostNonSandboxed: "Origin: http://mochi.test:8888",
+            framePostNonSandboxedXOrigin: "Origin: http://mochi.test:8888",
+            framePostSandboxed: "Origin: null",
+            framePostSrcDoc: "Origin: http://mochi.test:8888",
+            framePostSrcDocXOrigin: "Origin: http://mochi.test:8888",
+            framePostDataURI: "Origin: null",
+        },
+    },
+    {
+        name: "userControlPolicy=0 (no-referrer)",
+        prefs: [
+            ["network.http.sendRefererHeader", 2],
+            ["network.http.referer.userControlPolicy", 0],
+        ],
+        results: {
+            framePost: "Origin: http://mochi.test:8888",
+            framePostXOrigin: "Origin: http://mochi.test:8888",
+            frameGet: EMPTY_ORIGIN,
+            framePostNonSandboxed: "Origin: http://mochi.test:8888",
+            framePostNonSandboxedXOrigin: "Origin: http://mochi.test:8888",
+            framePostSandboxed: "Origin: null",
+            framePostSrcDoc: "Origin: http://mochi.test:8888",
+            framePostSrcDocXOrigin: "Origin: http://mochi.test:8888",
+            framePostDataURI: "Origin: null",
+        },
+    },
+];
+
+let checksToRun = [
+    {
+        name: "POST",
+        frameID: "framePost",
+        formID: "formPost",
+    },
+    {
+        name: "cross-origin POST",
+        frameID: "framePostXOrigin",
+        formID: "formPostXOrigin",
+    },
+    {
+        name: "GET",
+        frameID: "frameGet",
+        formID: "formGet",
+    },
+    {
+        name: "POST inside iframe",
+        frameID: "framePostNonSandboxed",
+        frameSrc: "HTTP://mochi.test:8888/tests/netwerk/test/mochitests/origin_header_form_post.html",
+    },
+    {
+        name: "cross-origin POST inside iframe",
+        frameID: "framePostNonSandboxedXOrigin",
+        frameSrc: "Http://mochi.test:8888/tests/netwerk/test/mochitests/origin_header_form_post_xorigin.html",
+    },
+    {
+        name: "POST inside sandboxed iframe",
+        frameID: "framePostSandboxed",
+        frameSrc: "http://mochi.test:8888/tests/netwerk/test/mochitests/origin_header_form_post.html",
+    },
+    {
+        name: "POST inside a srcdoc iframe",
+        frameID: "framePostSrcDoc",
+        srcdoc: "origin_header_form_post.html",
+    },
+    {
+        name: "cross-origin POST inside a srcdoc iframe",
+        frameID: "framePostSrcDocXOrigin",
+        srcdoc: "origin_header_form_post_xorigin.html",
+    },
+    {
+        name: "POST inside a data: iframe",
+        frameID: "framePostDataURI",
+        dataURI: "origin_header_form_post.html",
+    },
+];
+
+function frameLoaded(test, check)
+{
+    let frame = window.document.getElementById(check.frameID);
+    frame.onload = null;
+    let result = SpecialPowers.wrap(frame).contentDocument.documentElement.textContent;
+    is(result, test.results[check.frameID], check.name + " with " + test.name);
+}
+
+function submitForm(test, check)
+{
+     return new Promise((resolve, reject) => {
+         document.getElementById(check.frameID).onload = () => {
+             frameLoaded(test, check);
+             resolve();
+         };
+         document.getElementById(check.formID).submit();
+     });
+}
+
+function loadIframe(test, check)
+{
+    return new Promise((resolve, reject) => {
+        let frame = SpecialPowers.wrap(window.document.getElementById(check.frameID));
+        frame.onload = function () {
+            // Ignore the first load and wait for the submitted form instead.
+            let location = frame.contentWindow.location + "";
+            if (location.endsWith("origin_header.sjs")) {
+                frameLoaded(test, check);
+                resolve();
+            }
+        }
+        frame.src = check.frameSrc;
+    });
+}
+
+function loadSrcDocFrame(test, check)
+{
+    return new Promise((resolve, reject) => {
+        let frame = SpecialPowers.wrap(window.document.getElementById(check.frameID));
+        frame.onload = function () {
+            // Ignore the first load and wait for the submitted form instead.
+            let location = frame.contentWindow.location + "";
+            if (location.endsWith("origin_header.sjs")) {
+                frameLoaded(test, check);
+                resolve();
+            }
+        }
+        fetch(check.srcdoc).then((response) => {
+            response.text().then((body) => {
+                frame.srcdoc = body;
+            });;
+        });
+    });
+ }
+
+function loadDataURIFrame(test, check)
+{
+    return new Promise((resolve, reject) => {
+        let frame = SpecialPowers.wrap(window.document.getElementById(check.frameID));
+        frame.onload = function () {
+            // Ignore the first load and wait for the submitted form instead.
+            let location = frame.contentWindow.location + "";
+            if (location.endsWith("origin_header.sjs")) {
+                frameLoaded(test, check);
+                resolve();
+            }
+        }
+        fetch(check.dataURI).then((response) => {
+            response.text().then((body) => {
+                frame.src = "data:text/html," + encodeURIComponent(body);
+            });;
+        });
+    });
+}
+
+async function resetFrames()
+{
+    let checkPromises = [];
+    for (check of checksToRun) {
+        checkPromises.push(new Promise((resolve, reject) => {
+            let frame = document.getElementById(check.frameID);
+            frame.onload = () => resolve();
+            if (check.srcdoc) {
+                frame.srcdoc = "";
+            } else {
+                frame.src = "about:blank";
+            }
+        }));
+    }
+    await Promise.all(checkPromises);
+}
+
+async function runTests()
+{
+    for (test of testsToRun) {
+        await resetFrames();
+        await SpecialPowers.pushPrefEnv({"set": test.prefs});
+
+        let checkPromises = [];
+        for (check of checksToRun) {
+            if (check.formID) {
+                checkPromises.push(submitForm(test, check));
+            } else if (check.frameSrc) {
+                checkPromises.push(loadIframe(test, check));
+            } else if (check.srcdoc) {
+                checkPromises.push(loadSrcDocFrame(test, check));
+            } else if (check.dataURI) {
+                checkPromises.push(loadDataURIFrame(test, check));
+            } else {
+                ok(false, "Unsupported check");
+                break;
+            }
+        }
+        await Promise.all(checkPromises);
+    };
+    SimpleTest.finish();
+}
+
+SimpleTest.waitForExplicitFinish();
+SimpleTest.requestLongerTimeout(5); // work around Android timeouts
+addLoadEvent(runTests);
+
+</script>
+</pre>
+<table>
+<tr>
+    <td>
+        <iframe src="about:blank" name="framePost" id="framePost"></iframe>
+        <form action="origin_header.sjs"
+              method="POST"
+              id="formPost"
+              target="framePost">
+            <input type="submit" value="Submit POST">
+        </form>
+    </td>
+    <td>
+        <iframe src="about:blank" name="framePostXOrigin" id="framePostXOrigin"></iframe>
+        <form action="http://test1.mochi.test:8888/tests/netwerk/test/mochitests/origin_header.sjs"
+              method="POST"
+              id="formPostXOrigin"
+              target="framePostXOrigin">
+            <input type="submit" value="Submit XOrigin POST">
+        </form>
+    </td>
+    <td>
+        <iframe src="about:blank" name="frameGet" id="frameGet"></iframe>
+        <form action="origin_header.sjs"
+              method="GET"
+              id="formGet"
+              target="frameGet">
+            <input type="submit" value="Submit GET">
+        </form>
+    </td>
+</tr>
+<tr>
+    <td>
+        <iframe src="about:blank" id="framePostNonSandboxed"></iframe>
+        <div>Non-sandboxed iframe</div>
+    </td>
+    <td>
+        <iframe src="about:blank" id="framePostNonSandboxedXOrigin"></iframe>
+        <div>Non-sandboxed cross-origin iframe</div>
+    </td>
+    <td>
+        <iframe src="about:blank" id="framePostSandboxed" sandbox="allow-forms allow-scripts"></iframe>
+        <div>Sandboxed iframe</div>
+    </td>
+</tr>
+<tr>
+    <td>
+        <iframe id="framePostSrcDoc" src="about:blank"></iframe>
+        <div>Srcdoc iframe</div>
+    </td>
+    <td>
+        <iframe id="framePostSrcDocXOrigin" src="about:blank"></iframe>
+        <div>Srcdoc cross-origin iframe</div>
+    </td>
+    <td>
+        <iframe id="framePostDataURI" src="about:blank"></iframe>
+        <div>data: URI iframe</div>
+    </td>
+</tr>
+</table>
+
+</body>
+</html>

From 4c73da7933a409c655abf6f58b634a7c5fe43e93 Mon Sep 17 00:00:00 2001
From: Oriol Brufau <oriol-bugzilla@hotmail.com>
Date: Wed, 18 Oct 2017 04:38:13 +0200
Subject: [PATCH 202/219] Bug 1403536 - Protect all protocol request methods
 against unsafe objects r=ochameau

MozReview-Commit-ID: 4fDaap9QCdF

--HG--
extra : rebase_source : bec3bcbf422b51cef12005b035eec94203d5027d
---
 .../test/mochitest/browser_console.js         |  40 +-
 .../mochitest/browser_console_dead_objects.js |   4 +-
 .../client/webconsole/test/browser_console.js |  40 +-
 .../test/browser_console_dead_objects.js      |   4 +-
 devtools/server/actors/object.js              | 217 ++++++----
 .../server/tests/unit/test_objectgrips-12.js  |   2 +-
 .../server/tests/unit/test_objectgrips-17.js  |  18 +-
 .../server/tests/unit/test_objectgrips-21.js  | 388 ++++++++++++++++++
 devtools/server/tests/unit/xpcshell.ini       |   1 +
 devtools/shared/DevToolsUtils.js              |  92 ++++-
 .../webconsole/test/test_consoleapi.html      |   2 +-
 11 files changed, 693 insertions(+), 115 deletions(-)
 create mode 100644 devtools/server/tests/unit/test_objectgrips-21.js

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console.js
index 236619d6a91f..5bcddbcba6d7 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console.js
@@ -204,9 +204,43 @@ function* testCPOWInspection(hud) {
   // But it's only a CPOW in e10s.
   let e10sCheck = yield hud.jsterm.requestEvaluation(
     "Cu.isCrossProcessWrapper(gBrowser.selectedBrowser._contentWindow)");
-  if (e10sCheck.result) {
-    is(cpow.class, "CPOW: Window", "The CPOW grip has the right class.");
-  } else {
+  if (!e10sCheck.result) {
     is(cpow.class, "Window", "The object is not a CPOW.");
+    return;
   }
+
+  is(cpow.class, "CPOW: Window", "The CPOW grip has the right class.");
+
+  // Check that various protocol request methods work for the CPOW.
+  let response, slice;
+  let objClient = new ObjectClient(hud.jsterm.hud.proxy.client, cpow);
+
+  response = yield objClient.getPrototypeAndProperties();
+  is(Reflect.ownKeys(response.ownProperties).length, 0, "No property was retrieved.");
+  is(response.ownSymbols.length, 0, "No symbol property was retrieved.");
+  is(response.prototype.type, "null", "The prototype is null.");
+
+  response = yield objClient.enumProperties({ignoreIndexedProperties: true});
+  slice = yield response.iterator.slice(0, response.iterator.count);
+  is(Reflect.ownKeys(slice.ownProperties).length, 0, "No property was retrieved.");
+
+  response = yield objClient.enumProperties({});
+  slice = yield response.iterator.slice(0, response.iterator.count);
+  is(Reflect.ownKeys(slice.ownProperties).length, 0, "No property was retrieved.");
+
+  response = yield objClient.getOwnPropertyNames();
+  is(response.ownPropertyNames.length, 0, "No property was retrieved.");
+
+  response = yield objClient.getProperty("x");
+  is(response.descriptor, undefined, "The property does not exist.");
+
+  response = yield objClient.enumSymbols();
+  slice = yield response.iterator.slice(0, response.iterator.count);
+  is(slice.ownSymbols.length, 0, "No symbol property was retrieved.");
+
+  response = yield objClient.getPrototype();
+  is(response.prototype.type, "null", "The prototype is null.");
+
+  response = yield objClient.getDisplayString();
+  is(response.displayString, "<cpow>", "The CPOW stringifies to <cpow>");
 }
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_dead_objects.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_dead_objects.js
index fb8d0e2f54c8..637aa77c9f27 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_dead_objects.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_dead_objects.js
@@ -59,7 +59,7 @@ function test() {
 
     let msg = yield jsterm.execute("foobarzTezt");
 
-    isnot(hud.outputNode.textContent.indexOf("[object DeadObject]"), -1,
+    isnot(hud.outputNode.textContent.indexOf("DeadObject"), -1,
           "dead object found");
 
     jsterm.setInputValue("foobarzTezt");
@@ -76,7 +76,7 @@ function test() {
     // Click the second execute output.
     let clickable = msg.querySelector("a");
     ok(clickable, "clickable object found");
-    isnot(clickable.textContent.indexOf("[object DeadObject]"), -1,
+    isnot(clickable.textContent.indexOf("DeadObject"), -1,
           "message text check");
 
     msg.scrollIntoView();
diff --git a/devtools/client/webconsole/test/browser_console.js b/devtools/client/webconsole/test/browser_console.js
index 236619d6a91f..5bcddbcba6d7 100644
--- a/devtools/client/webconsole/test/browser_console.js
+++ b/devtools/client/webconsole/test/browser_console.js
@@ -204,9 +204,43 @@ function* testCPOWInspection(hud) {
   // But it's only a CPOW in e10s.
   let e10sCheck = yield hud.jsterm.requestEvaluation(
     "Cu.isCrossProcessWrapper(gBrowser.selectedBrowser._contentWindow)");
-  if (e10sCheck.result) {
-    is(cpow.class, "CPOW: Window", "The CPOW grip has the right class.");
-  } else {
+  if (!e10sCheck.result) {
     is(cpow.class, "Window", "The object is not a CPOW.");
+    return;
   }
+
+  is(cpow.class, "CPOW: Window", "The CPOW grip has the right class.");
+
+  // Check that various protocol request methods work for the CPOW.
+  let response, slice;
+  let objClient = new ObjectClient(hud.jsterm.hud.proxy.client, cpow);
+
+  response = yield objClient.getPrototypeAndProperties();
+  is(Reflect.ownKeys(response.ownProperties).length, 0, "No property was retrieved.");
+  is(response.ownSymbols.length, 0, "No symbol property was retrieved.");
+  is(response.prototype.type, "null", "The prototype is null.");
+
+  response = yield objClient.enumProperties({ignoreIndexedProperties: true});
+  slice = yield response.iterator.slice(0, response.iterator.count);
+  is(Reflect.ownKeys(slice.ownProperties).length, 0, "No property was retrieved.");
+
+  response = yield objClient.enumProperties({});
+  slice = yield response.iterator.slice(0, response.iterator.count);
+  is(Reflect.ownKeys(slice.ownProperties).length, 0, "No property was retrieved.");
+
+  response = yield objClient.getOwnPropertyNames();
+  is(response.ownPropertyNames.length, 0, "No property was retrieved.");
+
+  response = yield objClient.getProperty("x");
+  is(response.descriptor, undefined, "The property does not exist.");
+
+  response = yield objClient.enumSymbols();
+  slice = yield response.iterator.slice(0, response.iterator.count);
+  is(slice.ownSymbols.length, 0, "No symbol property was retrieved.");
+
+  response = yield objClient.getPrototype();
+  is(response.prototype.type, "null", "The prototype is null.");
+
+  response = yield objClient.getDisplayString();
+  is(response.displayString, "<cpow>", "The CPOW stringifies to <cpow>");
 }
diff --git a/devtools/client/webconsole/test/browser_console_dead_objects.js b/devtools/client/webconsole/test/browser_console_dead_objects.js
index fb8d0e2f54c8..637aa77c9f27 100644
--- a/devtools/client/webconsole/test/browser_console_dead_objects.js
+++ b/devtools/client/webconsole/test/browser_console_dead_objects.js
@@ -59,7 +59,7 @@ function test() {
 
     let msg = yield jsterm.execute("foobarzTezt");
 
-    isnot(hud.outputNode.textContent.indexOf("[object DeadObject]"), -1,
+    isnot(hud.outputNode.textContent.indexOf("DeadObject"), -1,
           "dead object found");
 
     jsterm.setInputValue("foobarzTezt");
@@ -76,7 +76,7 @@ function test() {
     // Click the second execute output.
     let clickable = msg.querySelector("a");
     ok(clickable, "clickable object found");
-    isnot(clickable.textContent.indexOf("[object DeadObject]"), -1,
+    isnot(clickable.textContent.indexOf("DeadObject"), -1,
           "message text check");
 
     msg.scrollIntoView();
diff --git a/devtools/server/actors/object.js b/devtools/server/actors/object.js
index 5c1d42f9ab8c..5e246c885275 100644
--- a/devtools/server/actors/object.js
+++ b/devtools/server/actors/object.js
@@ -10,7 +10,7 @@ const { Cu, Ci } = require("chrome");
 const { GeneratedLocation } = require("devtools/server/actors/common");
 const { DebuggerServer } = require("devtools/server/main");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
-const { assert, dumpn } = DevToolsUtils;
+const { assert } = DevToolsUtils;
 
 loader.lazyRequireGetter(this, "ChromeUtils");
 
@@ -75,40 +75,44 @@ ObjectActor.prototype = {
   grip: function () {
     let g = {
       "type": "object",
-      "actor": this.actorID
+      "actor": this.actorID,
+      "class": this.obj.class,
     };
 
-    // Check if the object has a wrapper which denies access. It may be a CPOW or a
-    // security wrapper. Change the class so that this will be visible in the UI.
     let unwrapped = DevToolsUtils.unwrap(this.obj);
-    if (!unwrapped) {
+
+    // Unsafe objects must be treated carefully.
+    if (!DevToolsUtils.isSafeDebuggerObject(this.obj)) {
       if (DevToolsUtils.isCPOW(this.obj)) {
-        g.class = "CPOW: " + this.obj.class;
-      } else {
-        g.class = "Inaccessible";
+        // Cross-process object wrappers can't be accessed.
+        g.class = "CPOW: " + g.class;
+      } else if (unwrapped === undefined) {
+        // Objects belonging to an invisible-to-debugger compartment might be proxies,
+        // so just in case they shouldn't be accessed.
+        g.class = "InvisibleToDebugger: " + g.class;
+      } else if (unwrapped.isProxy) {
+        // Proxy objects can run traps when accessed, so just create a preview with
+        // the target and the handler.
+        g.class = "Proxy";
+        this.hooks.incrementGripDepth();
+        DebuggerServer.ObjectActorPreviewers.Proxy[0](this, g, null);
+        this.hooks.decrementGripDepth();
       }
       return g;
     }
 
-    // Dead objects also deny access.
-    if (this.obj.class == "DeadObject") {
-      g.class = "DeadObject";
-      return g;
+    // If the debuggee does not subsume the object's compartment, most properties won't
+    // be accessible. Cross-orgin Window and Location objects might expose some, though.
+    // Change the displayed class, but when creating the preview use the original one.
+    if (unwrapped === null) {
+      g.class = "Restricted";
     }
 
-    // Otherwise, increment grip depth and attempt to create a preview.
     this.hooks.incrementGripDepth();
 
-    // The `isProxy` getter is called on `unwrapped` instead of `this.obj` in order
-    // to detect proxies behind transparent wrappers, and thus avoid running traps.
-    if (unwrapped.isProxy) {
-      g.class = "Proxy";
-    } else {
-      g.class = this.obj.class;
-      g.extensible = this.obj.isExtensible();
-      g.frozen = this.obj.isFrozen();
-      g.sealed = this.obj.isSealed();
-    }
+    g.extensible = this.obj.isExtensible();
+    g.frozen = this.obj.isFrozen();
+    g.sealed = this.obj.isSealed();
 
     if (g.class == "Promise") {
       g.promiseState = this._createPromiseState();
@@ -119,8 +123,13 @@ ObjectActor.prototype = {
     if (isTypedArray(g)) {
       // Bug 1348761: getOwnPropertyNames is unnecessary slow on TypedArrays
       g.ownPropertyLength = getArrayLength(this.obj);
-    } else if (g.class != "Proxy") {
-      g.ownPropertyLength = this.obj.getOwnPropertyNames().length;
+    } else {
+      try {
+        g.ownPropertyLength = this.obj.getOwnPropertyNames().length;
+      } catch (err) {
+        // The above can throw when the debuggee does not subsume the object's
+        // compartment, or for some WrappedNatives like Cu.Sandbox.
+      }
     }
 
     let raw = this.obj.unsafeDereference();
@@ -135,7 +144,7 @@ ObjectActor.prototype = {
       raw = null;
     }
 
-    let previewers = DebuggerServer.ObjectActorPreviewers[g.class] ||
+    let previewers = DebuggerServer.ObjectActorPreviewers[this.obj.class] ||
                      DebuggerServer.ObjectActorPreviewers.Object;
     for (let fn of previewers) {
       try {
@@ -226,8 +235,16 @@ ObjectActor.prototype = {
    * the object and not its prototype.
    */
   onOwnPropertyNames: function () {
-    return { from: this.actorID,
-             ownPropertyNames: this.obj.getOwnPropertyNames() };
+    let props = [];
+    if (DevToolsUtils.isSafeDebuggerObject(this.obj)) {
+      try {
+        props = this.obj.getOwnPropertyNames();
+      } catch (err) {
+        // The above can throw when the debuggee does not subsume the object's
+        // compartment, or for some WrappedNatives like Cu.Sandbox.
+      }
+    }
+    return { from: this.actorID, ownPropertyNames: props };
   },
 
   /**
@@ -282,21 +299,22 @@ ObjectActor.prototype = {
    *                     with safe getters descriptors.
    */
   onPrototypeAndProperties: function () {
-    let ownProperties = Object.create(null);
-    let ownSymbols = [];
-
-    // Inaccessible, proxy and dead objects should not be accessed.
-    let unwrapped = DevToolsUtils.unwrap(this.obj);
-    if (!unwrapped || unwrapped.isProxy || this.obj.class == "DeadObject") {
-      return { from: this.actorID,
-               prototype: this.hooks.createValueGrip(null),
-               ownProperties,
-               ownSymbols,
-               safeGetterValues: Object.create(null) };
+    let proto = null;
+    let names = [];
+    let symbols = [];
+    if (DevToolsUtils.isSafeDebuggerObject(this.obj)) {
+      try {
+        proto = this.obj.proto;
+        names = this.obj.getOwnPropertyNames();
+        symbols = this.obj.getOwnPropertySymbols();
+      } catch (err) {
+        // The above can throw when the debuggee does not subsume the object's
+        // compartment, or for some WrappedNatives like Cu.Sandbox.
+      }
     }
 
-    let names = this.obj.getOwnPropertyNames();
-    let symbols = this.obj.getOwnPropertySymbols();
+    let ownProperties = Object.create(null);
+    let ownSymbols = [];
 
     for (let name of names) {
       ownProperties[name] = this._propertyDescriptor(name);
@@ -310,7 +328,7 @@ ObjectActor.prototype = {
     }
 
     return { from: this.actorID,
-             prototype: this.hooks.createValueGrip(this.obj.proto),
+             prototype: this.hooks.createValueGrip(proto),
              ownProperties,
              ownSymbols,
              safeGetterValues: this._findSafeGetterValues(names) };
@@ -334,9 +352,8 @@ ObjectActor.prototype = {
     let obj = this.obj;
     let level = 0, i = 0;
 
-    // Do not search safe getters in inaccessible nor proxy objects.
-    let unwrapped = DevToolsUtils.unwrap(obj);
-    if (!unwrapped || unwrapped.isProxy) {
+    // Do not search safe getters in unsafe objects.
+    if (!DevToolsUtils.isSafeDebuggerObject(obj)) {
       return safeGetterValues;
     }
 
@@ -349,13 +366,7 @@ ObjectActor.prototype = {
       level++;
     }
 
-    while (obj) {
-      // Stop iterating when an inaccessible or a proxy object is found.
-      unwrapped = DevToolsUtils.unwrap(obj);
-      if (!unwrapped || unwrapped.isProxy) {
-        break;
-      }
-
+    while (obj && DevToolsUtils.isSafeDebuggerObject(obj)) {
       let getters = this._findSafeGetters(obj);
       for (let name of getters) {
         // Avoid overwriting properties from prototypes closer to this.obj. Also
@@ -434,6 +445,12 @@ ObjectActor.prototype = {
     }
 
     let getters = new Set();
+
+    if (!DevToolsUtils.isSafeDebuggerObject(object)) {
+      object._safeGetters = getters;
+      return getters;
+    }
+
     let names = [];
     try {
       names = object.getOwnPropertyNames();
@@ -467,8 +484,12 @@ ObjectActor.prototype = {
    * Handle a protocol request to provide the prototype of the object.
    */
   onPrototype: function () {
+    let proto = null;
+    if (DevToolsUtils.isSafeDebuggerObject(this.obj)) {
+      proto = this.obj.proto;
+    }
     return { from: this.actorID,
-             prototype: this.hooks.createValueGrip(this.obj.proto) };
+             prototype: this.hooks.createValueGrip(proto) };
   },
 
   /**
@@ -512,6 +533,10 @@ ObjectActor.prototype = {
    *         property and onlyEnumerable=true.
    */
   _propertyDescriptor: function (name, onlyEnumerable) {
+    if (!DevToolsUtils.isSafeDebuggerObject(this.obj)) {
+      return undefined;
+    }
+
     let desc;
     try {
       desc = this.obj.getOwnPropertyDescriptor(name);
@@ -801,7 +826,13 @@ ObjectActor.prototype.requestTypes = {
  *          of the property value.
  */
 function PropertyIteratorActor(objectActor, options) {
-  if (options.enumEntries) {
+  if (!DevToolsUtils.isSafeDebuggerObject(objectActor.obj)) {
+    this.iterator = {
+      size: 0,
+      propertyName: index => undefined,
+      propertyDescription: index => undefined,
+    };
+  } else if (options.enumEntries) {
     let cls = objectActor.obj.class;
     if (cls == "Map") {
       this.iterator = enumMapEntries(objectActor);
@@ -1161,7 +1192,15 @@ function enumWeakSetEntries(objectActor) {
  *        The object actor.
  */
 function SymbolIteratorActor(objectActor) {
-  const symbols =  objectActor.obj.getOwnPropertySymbols();
+  let symbols = [];
+  if (DevToolsUtils.isSafeDebuggerObject(objectActor.obj)) {
+    try {
+      symbols = objectActor.obj.getOwnPropertySymbols();
+    } catch (err) {
+      // The above can throw when the debuggee does not subsume the object's
+      // compartment, or for some WrappedNatives like Cu.Sandbox.
+    }
+  }
 
   this.iterator = {
     size: symbols.length,
@@ -1258,9 +1297,8 @@ DebuggerServer.ObjectActorPreviewers = {
     try {
       userDisplayName = obj.getOwnPropertyDescriptor("displayName");
     } catch (e) {
-      // Calling getOwnPropertyDescriptor with displayName might throw
-      // with "permission denied" errors for some functions.
-      dumpn(e);
+      // The above can throw "permission denied" errors when the debuggee
+      // does not subsume the function's compartment.
     }
 
     if (userDisplayName && typeof userDisplayName.value == "string" &&
@@ -1940,7 +1978,14 @@ DebuggerServer.ObjectActorPreviewers.Object = [
     // - The array indices are consecutive.
     // - The value of "length", if present, is the number of array indices.
 
-    let keys = obj.getOwnPropertyNames();
+    let keys;
+    try {
+      keys = obj.getOwnPropertyNames();
+    } catch (err) {
+      // The above can throw when the debuggee does not subsume the object's
+      // compartment, or for some WrappedNatives like Cu.Sandbox.
+      return false;
+    }
     let {length} = keys;
     if (length === 0) {
       return false;
@@ -2039,7 +2084,16 @@ function isObject(value) {
  *         The stringifier for the class.
  */
 function createBuiltinStringifier(ctor) {
-  return obj => ctor.prototype.toString.call(obj.unsafeDereference());
+  return obj => {
+    try {
+      return ctor.prototype.toString.call(obj.unsafeDereference());
+    } catch (err) {
+      // The debuggee will see a "Function" class if the object is callable and
+      // its compartment is not subsumed. The above will throw if it's not really
+      // a function, e.g. if it's a callable proxy.
+      return "[object " + obj.class + "]";
+    }
+  };
 }
 
 /**
@@ -2078,9 +2132,20 @@ function errorStringify(obj) {
  *         The stringification for the object.
  */
 function stringify(obj) {
-  if (obj.class == "DeadObject") {
-    const error = new Error("Dead object encountered.");
-    DevToolsUtils.reportException("stringify", error);
+  if (!DevToolsUtils.isSafeDebuggerObject(obj)) {
+    if (DevToolsUtils.isCPOW(obj)) {
+      return "<cpow>";
+    }
+    let unwrapped = DevToolsUtils.unwrap(obj);
+    if (unwrapped === undefined) {
+      return "<invisibleToDebugger>";
+    } else if (unwrapped.isProxy) {
+      return "<proxy>";
+    }
+    // The following line should not be reached. It's there just in case somebody
+    // modifies isSafeDebuggerObject to return false for additional kinds of objects.
+    return "[object " + obj.class + "]";
+  } else if (obj.class == "DeadObject") {
     return "<dead object>";
   }
 
@@ -2123,25 +2188,21 @@ var stringifiers = {
 
     seen.add(obj);
 
-    const len = DevToolsUtils.getProperty(obj, "length");
+    const len = getArrayLength(obj);
     let string = "";
 
-    // The following check is only required because the debuggee could possibly
-    // be a Proxy and return any value. For normal objects, array.length is
-    // always a non-negative integer.
-    if (typeof len == "number" && len > 0) {
-      for (let i = 0; i < len; i++) {
-        const desc = obj.getOwnPropertyDescriptor(i);
-        if (desc) {
-          const { value } = desc;
-          if (value != null) {
-            string += isObject(value) ? stringify(value) : value;
-          }
+    // Array.length is always a non-negative safe integer.
+    for (let i = 0; i < len; i++) {
+      const desc = obj.getOwnPropertyDescriptor(i);
+      if (desc) {
+        const { value } = desc;
+        if (value != null) {
+          string += isObject(value) ? stringify(value) : value;
         }
+      }
 
-        if (i < len - 1) {
-          string += ",";
-        }
+      if (i < len - 1) {
+        string += ",";
       }
     }
 
diff --git a/devtools/server/tests/unit/test_objectgrips-12.js b/devtools/server/tests/unit/test_objectgrips-12.js
index 419a4fe2ec90..4f3f53c87280 100644
--- a/devtools/server/tests/unit/test_objectgrips-12.js
+++ b/devtools/server/tests/unit/test_objectgrips-12.js
@@ -122,7 +122,7 @@ function test_display_string() {
     },
     {
       input: "new Proxy({}, {})",
-      output: "[object Object]"
+      output: "<proxy>"
     },
     {
       input: "Promise.resolve(5)",
diff --git a/devtools/server/tests/unit/test_objectgrips-17.js b/devtools/server/tests/unit/test_objectgrips-17.js
index a56ef7b6b4d6..574c48afdb5b 100644
--- a/devtools/server/tests/unit/test_objectgrips-17.js
+++ b/devtools/server/tests/unit/test_objectgrips-17.js
@@ -172,7 +172,16 @@ function check_proxy_grip(grip) {
     // The proxy has opaque security wrappers.
     strictEqual(grip.class, "Opaque", "The grip has an Opaque class.");
     strictEqual(grip.ownPropertyLength, 0, "The grip has no properties.");
-  } else if (gSubsumes && !gGlobalIsInvisible) {
+  } else if (!gSubsumes) {
+    // The proxy belongs to compartment not subsumed by the debuggee.
+    strictEqual(grip.class, "Restricted", "The grip has an Restricted class.");
+    ok(!("ownPropertyLength" in grip), "The grip doesn't know the number of properties.");
+  } else if (gGlobalIsInvisible) {
+    // The proxy belongs to an invisible-to-debugger compartment.
+    strictEqual(grip.class, "InvisibleToDebugger: Object",
+                "The grip has an InvisibleToDebugger class.");
+    ok(!("ownPropertyLength" in grip), "The grip doesn't know the number of properties.");
+  } else {
     // The proxy has non-opaque security wrappers.
     strictEqual(grip.class, "Proxy", "The grip has a Proxy class.");
     ok(!("proxyTarget" in grip), "There is no [[ProxyTarget]] grip.");
@@ -180,10 +189,6 @@ function check_proxy_grip(grip) {
     strictEqual(preview.ownPropertiesLength, 0, "The preview has no properties.");
     ok(!("<target>" in preview), "The preview has no <target> property.");
     ok(!("<handler>" in preview), "The preview has no <handler> property.");
-  } else {
-    // The debuggee is not allowed to remove the security wrappers.
-    strictEqual(grip.class, "Inaccessible", "The grip has an Inaccessible class.");
-    ok(!("ownPropertyLength" in grip), "The grip doesn't know the number of properties.");
   }
 }
 
@@ -208,7 +213,8 @@ function check_prototype(proto, isProxy, createdInDebuggee) {
   } else if (isProxy && gIsOpaque && gGlobalIsInvisible) {
     // The object is a proxy with opaque security wrappers in an invisible global.
     // The debuggee sees an inaccessible `Object.prototype` when retrieving the prototype.
-    strictEqual(proto.class, "Inaccessible", "The prototype has an Inaccessible class.");
+    strictEqual(proto.class, "InvisibleToDebugger: Object",
+                "The prototype has an InvisibleToDebugger class.");
   } else if (createdInDebuggee || !isProxy && gSubsumes && !gGlobalIsInvisible) {
     // The object inherits from a proxy and has no security wrappers or non-opaque ones.
     // The debuggee sees the proxy when retrieving the prototype.
diff --git a/devtools/server/tests/unit/test_objectgrips-21.js b/devtools/server/tests/unit/test_objectgrips-21.js
new file mode 100644
index 000000000000..f1a1d1ba0a9c
--- /dev/null
+++ b/devtools/server/tests/unit/test_objectgrips-21.js
@@ -0,0 +1,388 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+/* eslint-disable no-shadow, max-nested-callbacks */
+
+"use strict";
+
+var gDebuggee;
+var gThreadClient;
+
+function run_test() {
+  run_test_with_server(DebuggerServer, function () {
+    run_test_with_server(WorkerDebuggerServer, do_test_finished);
+  });
+  do_test_pending();
+}
+
+async function run_test_with_server(server, callback) {
+  initTestDebuggerServer(server);
+  let principals = [
+    ["test-grips-system-principal", systemPrincipal, systemPrincipalTests],
+    ["test-grips-null-principal", null, nullPrincipalTests],
+  ];
+  for (let [title, principal, tests] of principals) {
+    gDebuggee = Cu.Sandbox(principal);
+    gDebuggee.__name = title;
+    server.addTestGlobal(gDebuggee);
+    gDebuggee.eval(function stopMe(arg1, arg2) {
+      debugger;
+    }.toString());
+    let client = new DebuggerClient(server.connectPipe());
+    await client.connect();
+    const [,, threadClient] = await attachTestTabAndResume(client, title);
+    gThreadClient = threadClient;
+    await test_unsafe_grips(principal, tests);
+    await client.close();
+  }
+  callback();
+}
+
+// The following tests work like this:
+// - The specified code is evaluated in a system principal.
+//   `Cu`, `systemPrincipal` and `Services` are provided as global variables.
+// - The resulting object is debugged in a system or null principal debuggee,
+//   depending on in which list the test is placed.
+//   It is tested according to the specified test parameters.
+// - An ordinary object that inherits from the resulting one is also debugged.
+//   This is just to check that it can be normally debugged even with an unsafe
+//   object in the prototype. The specified test parameters do not apply.
+
+// The following tests are defined via properties with the following defaults.
+let defaults = {
+  // The class of the grip.
+  class: "Restricted",
+
+  // The stringification of the object
+  string: "",
+
+  // Whether the object (not its grip) has class "Function".
+  isFunction: false,
+
+  // Whether the grip has a preview property.
+  hasPreview: true,
+
+  // Code that assigns the object to be tested into the obj variable.
+  code: "var obj = {}",
+
+  // The type of the grip of the prototype.
+  protoType: "null",
+
+  // Whether the object has some own string properties.
+  hasOwnPropertyNames: false,
+
+  // Whether the object has some own symbol properties.
+  hasOwnPropertySymbols: false,
+
+  // The descriptor obtained when retrieving property "x" or Symbol("x").
+  property: undefined,
+
+  // Code evaluated after the test, whose result is expected to be true.
+  afterTest: "true == true",
+};
+
+// Obtaining a CPOW here does not seem possible, so the CPOW test is in
+// devtools/client/webconsole/test/browser_console.js
+
+// The following tests use a system principal debuggee.
+let systemPrincipalTests = [{
+  // Dead objects throw a TypeError when accessing properties.
+  class: "DeadObject",
+  string: "<dead object>",
+  code: `
+    var obj = Cu.Sandbox(null);
+    Cu.nukeSandbox(obj);
+  `,
+  property: descriptor({value: "TypeError"}),
+}, {
+  // This proxy checks that no trap runs (using a second proxy as the handler
+  // there is no need to maintain a list of all possible traps).
+  class: "Proxy",
+  string: "<proxy>",
+  code: `
+    var trapDidRun = false;
+    var obj = new Proxy({}, new Proxy({}, {get: (_, trap) => {
+      trapDidRun = true;
+      throw new Error("proxy trap '" + trap + "' was called.");
+    }}));
+  `,
+  afterTest: "trapDidRun === false",
+}, {
+  // Like the previous test, but now the proxy has a Function class.
+  class: "Proxy",
+  string: "<proxy>",
+  isFunction: true,
+  code: `
+    var trapDidRun = false;
+    var obj = new Proxy(function(){}, new Proxy({}, {get: (_, trap) => {
+      trapDidRun = true;
+      throw new Error("proxy trap '" + trap + "' was called.");
+    }}));
+  `,
+  afterTest: "trapDidRun === false",
+}, {
+  // Invisisible-to-debugger objects can't be unwrapped, so we don't know if
+  // they are proxies. Thus they shouldn't be accessed.
+  class: "InvisibleToDebugger: Array",
+  string: "<invisibleToDebugger>",
+  hasPreview: false,
+  code: `
+    var s = Cu.Sandbox(systemPrincipal, {invisibleToDebugger: true});
+    var obj = s.eval("[1, 2, 3]");
+  `,
+}, {
+  // Like the previous test, but now the object has a Function class.
+  class: "InvisibleToDebugger: Function",
+  string: "<invisibleToDebugger>",
+  isFunction: true,
+  hasPreview: false,
+  code: `
+    var s = Cu.Sandbox(systemPrincipal, {invisibleToDebugger: true});
+    var obj = s.eval("(function func(arg){})");
+  `,
+}, {
+  // Cu.Sandbox is a WrappedNative that throws when accessing properties.
+  class: "nsXPCComponents_utils_Sandbox",
+  string: "[object nsXPCComponents_utils_Sandbox]",
+  code: `var obj = Cu.Sandbox;`,
+  protoType: "object",
+}];
+
+// The following tests run code in a system principal, but the resulting object
+// is debugged in a null principal.
+let nullPrincipalTests = [{
+  // The null principal gets undefined when attempting to access properties.
+  string: "[object Object]",
+  code: `var obj = {x: -1};`,
+}, {
+  // For arrays it's an error instead of undefined.
+  string: "[object Object]",
+  code: `var obj = [1, 2, 3];`,
+  property: descriptor({value: "Error"}),
+}, {
+  // For functions it's also an error.
+  string: "function func(arg){}",
+  isFunction: true,
+  hasPreview: false,
+  code: `var obj = function func(arg){};`,
+  property: descriptor({value: "Error"}),
+}, {
+  // Check that no proxy trap runs.
+  string: "[object Object]",
+  code: `
+    var trapDidRun = false;
+    var obj = new Proxy([], new Proxy({}, {get: (_, trap) => {
+      trapDidRun = true;
+      throw new Error("proxy trap '" + trap + "' was called.");
+    }}));
+  `,
+  property: descriptor({value: "Error"}),
+  afterTest: `trapDidRun === false`,
+}, {
+  // Like the previous test, but now the object has a Function class.
+  string: "[object Function]",
+  isFunction: true,
+  hasPreview: false,
+  code: `
+    var trapDidRun = false;
+    var obj = new Proxy(function(){}, new Proxy({}, {get: (_, trap) => {
+      trapDidRun = true;
+      throw new Error("proxy trap '" + trap + "' was called.");
+    }}));
+  `,
+  property: descriptor({value: "Error"}),
+  afterTest: `trapDidRun === false`,
+}, {
+  // Cross-origin Window objects do expose some properties and have a preview.
+  string: "[object Object]",
+  code: `var obj = Services.appShell.createWindowlessBrowser().document.defaultView;`,
+  hasOwnPropertyNames: true,
+  hasOwnPropertySymbols: true,
+  property: descriptor({value: "SecurityError"}),
+}, {
+  // Cross-origin Location objects do expose some properties and have a preview.
+  string: "[object Object]",
+  code: `var obj = Services.appShell.createWindowlessBrowser().document.defaultView
+                   .location;`,
+  hasOwnPropertyNames: true,
+  hasOwnPropertySymbols: true,
+  property: descriptor({value: "SecurityError"}),
+}];
+
+function descriptor(descr) {
+  return Object.assign({
+    configurable: false,
+    writable: false,
+    enumerable: false,
+    value: undefined
+  }, descr);
+}
+
+async function test_unsafe_grips(principal, tests) {
+  for (let data of tests) {
+    await new Promise(function (resolve) {
+      gThreadClient.addOneTimeListener("paused", async function (event, packet) {
+        let [objGrip, inheritsGrip] = packet.frame.arguments;
+        for (let grip of [objGrip, inheritsGrip]) {
+          let isUnsafe = grip === objGrip;
+          // If `isUnsafe` is true, the parameters in `data` will be used to assert
+          // against `objGrip`, the grip of the object `obj` created by the test.
+          // Otherwise, the grip will refer to `inherits`, an ordinary object which
+          // inherits from `obj`. Then all checks are hardcoded because in every test
+          // all methods are expected to work the same on `inheritsGrip`.
+
+          check_grip(grip, data, isUnsafe);
+
+          let objClient = gThreadClient.pauseGrip(grip);
+          let response, slice;
+
+          response = await objClient.getPrototypeAndProperties();
+          check_properties(response.ownProperties, data, isUnsafe);
+          check_symbols(response.ownSymbols, data, isUnsafe);
+          check_prototype(response.prototype, data, isUnsafe);
+
+          response = await objClient.enumProperties({ignoreIndexedProperties: true});
+          slice = await response.iterator.slice(0, response.iterator.count);
+          check_properties(slice.ownProperties, data, isUnsafe);
+
+          response = await objClient.enumProperties({});
+          slice = await response.iterator.slice(0, response.iterator.count);
+          check_properties(slice.ownProperties, data, isUnsafe);
+
+          response = await objClient.getOwnPropertyNames();
+          check_property_names(response.ownPropertyNames, data, isUnsafe);
+
+          response = await objClient.getProperty("x");
+          check_property(response.descriptor, data, isUnsafe);
+
+          response = await objClient.enumSymbols();
+          slice = await response.iterator.slice(0, response.iterator.count);
+          check_symbol_names(slice.ownSymbols, data, isUnsafe);
+
+          response = await objClient.getProperty(Symbol.for("x"));
+          check_symbol(response.descriptor, data, isUnsafe);
+
+          response = await objClient.getPrototype();
+          check_prototype(response.prototype, data, isUnsafe);
+
+          response = await objClient.getDisplayString();
+          check_display_string(response.displayString, data, isUnsafe);
+
+          if (data.isFunction && isUnsafe) {
+            // For function-related methods, object-client.js checks that the class
+            // of the grip is "Function", and if it's not, the method in object.js
+            // is not called. But some tests have a grip with a class that is not
+            // "Function" (e.g. it's "Proxy") but the DebuggerObject has a "Function"
+            // class because the object is callable (despite not being a Function object).
+            // So the grip class is changed in order to test the object.js method.
+            grip.class = "Function";
+            objClient = gThreadClient.pauseGrip(grip);
+            try {
+              response = await objClient.getParameterNames();
+              ok(true, "getParameterNames passed. DebuggerObject.class is 'Function'"
+                + "on the object actor");
+            } catch (e) {
+              ok(false, "getParameterNames failed. DebuggerObject.class may not be"
+                + " 'Function' on the object actor");
+            }
+          }
+        }
+
+        await gThreadClient.resume();
+        resolve();
+      });
+
+      data = {...defaults, ...data};
+
+      // Run the code and test the results.
+      let sandbox = Cu.Sandbox(systemPrincipal);
+      Object.assign(sandbox, {Services, systemPrincipal, Cu});
+      sandbox.eval(data.code);
+      gDebuggee.obj = sandbox.obj;
+      let inherits = `Object.create(obj, {
+        x: {value: 1},
+        [Symbol.for("x")]: {value: 2}
+      })`;
+      gDebuggee.eval(`stopMe(obj, ${inherits});`);
+      ok(sandbox.eval(data.afterTest), "Check after test passes");
+    });
+  }
+}
+
+function check_grip(grip, data, isUnsafe) {
+  if (isUnsafe) {
+    strictEqual(grip.class, data.class, "The grip has the proper class.");
+    strictEqual("preview" in grip, data.hasPreview, "Check preview presence.");
+  } else {
+    strictEqual(grip.class, "Object", "The grip has 'Object' class.");
+    ok("preview" in grip, "The grip has a preview.");
+  }
+}
+
+function check_properties(props, data, isUnsafe) {
+  let propNames = Reflect.ownKeys(props);
+  check_property_names(propNames, data, isUnsafe);
+  if (isUnsafe) {
+    deepEqual(props.x, undefined, "The property does not exist.");
+  } else {
+    strictEqual(props.x.value, 1, "The property has the right value.");
+  }
+}
+
+function check_property_names(props, data, isUnsafe) {
+  if (isUnsafe) {
+    strictEqual(props.length > 0, data.hasOwnPropertyNames,
+                "Check presence of own string properties.");
+  } else {
+    strictEqual(props.length, 1, "1 own property was retrieved.");
+    strictEqual(props[0], "x", "The property has the right name.");
+  }
+}
+
+function check_property(descr, data, isUnsafe) {
+  if (isUnsafe) {
+    deepEqual(descr, data.property, "Got the right property descriptor.");
+  } else {
+    strictEqual(descr.value, 1, "The property has the right value.");
+  }
+}
+
+function check_symbols(symbols, data, isUnsafe) {
+  check_symbol_names(symbols, data, isUnsafe);
+  if (!isUnsafe) {
+    check_symbol(symbols[0].descriptor, data, isUnsafe);
+  }
+}
+
+function check_symbol_names(props, data, isUnsafe) {
+  if (isUnsafe) {
+    strictEqual(props.length > 0, data.hasOwnPropertySymbols,
+                "Check presence of own symbol properties.");
+  } else {
+    strictEqual(props.length, 1, "1 own symbol property was retrieved.");
+    strictEqual(props[0].name, "Symbol(x)", "The symbol has the right name.");
+  }
+}
+
+function check_symbol(descr, data, isUnsafe) {
+  if (isUnsafe) {
+    deepEqual(descr, data.property, "Got the right symbol property descriptor.");
+  } else {
+    strictEqual(descr.value, 2, "The symbol property has the right value.");
+  }
+}
+
+function check_prototype(proto, data, isUnsafe) {
+  if (isUnsafe) {
+    deepEqual(proto.type, data.protoType, "Got the right prototype type.");
+  } else {
+    check_grip(proto, data, true);
+  }
+}
+
+function check_display_string(str, data, isUnsafe) {
+  if (isUnsafe) {
+    strictEqual(str, data.string, "The object stringifies correctly.");
+  } else {
+    strictEqual(str, "[object Object]", "The object stringifies correctly.");
+  }
+}
diff --git a/devtools/server/tests/unit/xpcshell.ini b/devtools/server/tests/unit/xpcshell.ini
index 3b19430f6243..9fddbe4a31d0 100644
--- a/devtools/server/tests/unit/xpcshell.ini
+++ b/devtools/server/tests/unit/xpcshell.ini
@@ -177,6 +177,7 @@ reason = only ran on B2G
 [test_objectgrips-18.js]
 [test_objectgrips-19.js]
 [test_objectgrips-20.js]
+[test_objectgrips-21.js]
 [test_objectgrips-array-like-object.js]
 [test_promise_state-01.js]
 [test_promise_state-02.js]
diff --git a/devtools/shared/DevToolsUtils.js b/devtools/shared/DevToolsUtils.js
index 44b3bb15f155..774ada944706 100644
--- a/devtools/shared/DevToolsUtils.js
+++ b/devtools/shared/DevToolsUtils.js
@@ -184,33 +184,47 @@ exports.defineLazyPrototypeGetter = function (object, key, callback) {
  */
 exports.getProperty = function (object, key) {
   let root = object;
-  try {
-    do {
-      const desc = object.getOwnPropertyDescriptor(key);
-      if (desc) {
-        if ("value" in desc) {
-          return desc.value;
-        }
-        // Call the getter if it's safe.
-        return exports.hasSafeGetter(desc) ? desc.get.call(root).return : undefined;
+  while (object && exports.isSafeDebuggerObject(object)) {
+    let desc;
+    try {
+      desc = object.getOwnPropertyDescriptor(key);
+    } catch (e) {
+      // The above can throw when the debuggee does not subsume the object's
+      // compartment, or for some WrappedNatives like Cu.Sandbox.
+      return undefined;
+    }
+    if (desc) {
+      if ("value" in desc) {
+        return desc.value;
       }
-      object = object.proto;
-    } while (object);
-  } catch (e) {
-    // If anything goes wrong report the error and return undefined.
-    exports.reportException("getProperty", e);
+      // Call the getter if it's safe.
+      if (exports.hasSafeGetter(desc)) {
+        try {
+          return desc.get.call(root).return;
+        } catch (e) {
+          // If anything goes wrong report the error and return undefined.
+          exports.reportException("getProperty", e);
+        }
+      }
+      return undefined;
+    }
+    object = object.proto;
   }
   return undefined;
 };
 
 /**
  * Removes all the non-opaque security wrappers of a debuggee object.
- * Returns null if some wrapper can't be removed.
  *
  * @param obj Debugger.Object
  *        The debuggee object to be unwrapped.
- * @return Debugger.Object|null
- *        The unwrapped object, or null if some wrapper couldn't be removed.
+ * @return Debugger.Object|null|undefined
+ *      - If the object has no wrapper, the same `obj` is returned. Note DeadObject
+ *        objects belong to this case.
+ *      - Otherwise, if the debuggee doesn't subsume object's compartment, returns `null`.
+ *      - Otherwise, if the object belongs to an invisible-to-debugger compartment,
+ *        returns `undefined`. Note CPOW objects belong to this case.
+ *      - Otherwise, returns the unwrapped object.
  */
 exports.unwrap = function unwrap(obj) {
   // Check if `obj` has an opaque wrapper.
@@ -218,12 +232,16 @@ exports.unwrap = function unwrap(obj) {
     return obj;
   }
 
-  // Attempt to unwrap. If this operation is not allowed, it may return null or throw.
+  // Attempt to unwrap via `obj.unwrap()`. Note that:
+  // - This will return `null` if the debuggee does not subsume object's compartment.
+  // - This will throw if the object belongs to an invisible-to-debugger compartment.
+  //   This case includes CPOWs (see bug 1391449).
+  // - This will return `obj` if there is no wrapper.
   let unwrapped;
   try {
     unwrapped = obj.unwrap();
   } catch (err) {
-    unwrapped = null;
+    return undefined;
   }
 
   // Check if further unwrapping is not possible.
@@ -235,6 +253,42 @@ exports.unwrap = function unwrap(obj) {
   return unwrap(unwrapped);
 };
 
+/**
+ * Checks whether a debuggee object is safe. Unsafe objects may run proxy traps or throw
+ * when using `proto`, `isExtensible`, `isFrozen` or `isSealed`. Note that safe objects
+ * may still throw when calling `getOwnPropertyNames`, `getOwnPropertyDescriptor`, etc.
+ * Also note CPOW objects are considered to be unsafe, and DeadObject objects to be safe.
+ *
+ * @param obj Debugger.Object
+ *        The debuggee object to be checked.
+ * @return boolean
+ */
+exports.isSafeDebuggerObject = function (obj) {
+  let unwrapped = exports.unwrap(obj);
+
+  // Objects belonging to an invisible-to-debugger compartment might be proxies,
+  // so just in case consider them unsafe. CPOWs are included in this case.
+  if (unwrapped === undefined) {
+    return false;
+  }
+
+  // If the debuggee does not subsume the object's compartment, most properties won't
+  // be accessible. Cross-origin Window and Location objects might expose some, though.
+  // Therefore, it must be considered safe. Note that proxy objects have fully opaque
+  // security wrappers, so proxy traps won't run in this case.
+  if (unwrapped === null) {
+    return true;
+  }
+
+  // Proxy objects can run traps when accessed. `isProxy` getter is called on `unwrapped`
+  // instead of on `obj` in order to detect proxies behind transparent wrappers.
+  if (unwrapped.isProxy) {
+    return false;
+  }
+
+  return true;
+};
+
 /**
  * Determines if a descriptor has a getter which doesn't call into JavaScript.
  *
diff --git a/devtools/shared/webconsole/test/test_consoleapi.html b/devtools/shared/webconsole/test/test_consoleapi.html
index d99cb01a38f4..5c6fa90a8d0c 100644
--- a/devtools/shared/webconsole/test/test_consoleapi.html
+++ b/devtools/shared/webconsole/test/test_consoleapi.html
@@ -149,7 +149,7 @@ function doConsoleCalls(aState)
         {
           type: "object",
           actor: /[a-z]/,
-          class: "Inaccessible",
+          class: "InvisibleToDebugger: Object",
         },
       ],
     },

From 008a43e2979d5253aec8a13c73b136aabe3350c0 Mon Sep 17 00:00:00 2001
From: "bechen@mozilla.com" <bechen@mozilla.com>
Date: Wed, 29 Nov 2017 16:16:40 +0800
Subject: [PATCH 203/219] Bug 1420357 - fix postion testcase. r=rillian

1. The default value of position is "auto".
2. follow the spec to parse the position value.

MozReview-Commit-ID: HO7sQ0go5A6

--HG--
extra : rebase_source : ab6066f260abac25d71a1c35511c5389444e000a
---
 dom/media/webvtt/vtt.jsm                      | 26 ++++++++++++++-----
 .../tests/settings-position.html.ini          |  5 ----
 2 files changed, 19 insertions(+), 12 deletions(-)
 delete mode 100644 testing/web-platform/meta/webvtt/parsing/file-parsing/tests/settings-position.html.ini

diff --git a/dom/media/webvtt/vtt.jsm b/dom/media/webvtt/vtt.jsm
index cf9fb8573794..5146b00a38bf 100644
--- a/dom/media/webvtt/vtt.jsm
+++ b/dom/media/webvtt/vtt.jsm
@@ -127,9 +127,10 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
       for (var n = 0; n < a.length; ++n) {
         if (v === a[n]) {
           this.set(k, v);
-          break;
+          return true;
         }
       }
+      return false;
     },
     // Accept a setting if its a valid digits value (int or float)
     digitsValue: function(k, v) {
@@ -150,7 +151,13 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
         }
       }
       return false;
-    }
+    },
+    // Delete a setting
+    del: function (k) {
+      if (this.has(k)) {
+        delete this.values[k];
+      }
+    },
   };
 
   // Helper function to parse input into groups separated by 'groupDelim', and
@@ -189,7 +196,6 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
     // 4.4.2 WebVTT cue settings
     function consumeCueSettings(input, cue) {
       var settings = new Settings();
-
       parseOptions(input, function (k, v) {
         switch (k) {
         case "region":
@@ -216,9 +222,14 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
           break;
         case "position":
           vals = v.split(",");
-          settings.percent(k, vals[0]);
-          if (vals.length === 2) {
-            settings.alt("positionAlign", vals[1], ["line-left", "center", "line-right", "auto"]);
+          if (settings.percent(k, vals[0])) {
+            if (vals.length === 2) {
+              if (!settings.alt("positionAlign", vals[1], ["line-left", "center", "line-right"])) {
+                // Remove the "position" value because the "positionAlign" is not expected value.
+                // It will be set to default value below.
+                settings.del(k);
+              }
+            }
           }
           break;
         case "size":
@@ -231,6 +242,7 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
       }, /:/, /\t|\n|\f|\r| /); // groupDelim is ASCII whitespace
 
       // Apply default values for any missing fields.
+      // https://w3c.github.io/webvtt/#collect-a-webvtt-block step 11.4.1.3
       cue.region = settings.get("region", null);
       cue.vertical = settings.get("vertical", "");
       cue.line = settings.get("line", "auto");
@@ -239,7 +251,7 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
       cue.size = settings.get("size", 100);
       cue.align = settings.get("align", "center");
       cue.position = settings.get("position", "auto");
-      cue.positionAlign = settings.get("positionAlign", "center");
+      cue.positionAlign = settings.get("positionAlign", "auto");
     }
 
     function skipWhitespace() {
diff --git a/testing/web-platform/meta/webvtt/parsing/file-parsing/tests/settings-position.html.ini b/testing/web-platform/meta/webvtt/parsing/file-parsing/tests/settings-position.html.ini
deleted file mode 100644
index 344418669459..000000000000
--- a/testing/web-platform/meta/webvtt/parsing/file-parsing/tests/settings-position.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[settings-position.html]
-  type: testharness
-  [settings, position]
-    expected: FAIL
-

From 90589ae7f32916e7e3c014742896a80d0f00249c Mon Sep 17 00:00:00 2001
From: "bechen@mozilla.com" <bechen@mozilla.com>
Date: Thu, 30 Nov 2017 11:17:28 +0800
Subject: [PATCH 204/219] Bug 1420357 - The default value of positionAlign is
 "auto". r=rillian

MozReview-Commit-ID: KkRzI3B5mfZ

--HG--
extra : rebase_source : 56b6cd5befbb7c76384290f2f0d8915231ee27f6
---
 dom/media/test/test_texttrackcue.html         | 2 +-
 dom/media/test/test_webvtt_positionalign.html | 2 +-
 dom/media/test/vttPositionAlign.vtt           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dom/media/test/test_texttrackcue.html b/dom/media/test/test_texttrackcue.html
index 2edf1b7ecead..8e8669ec891f 100644
--- a/dom/media/test/test_texttrackcue.html
+++ b/dom/media/test/test_texttrackcue.html
@@ -144,7 +144,7 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.regions.enabled", true]]},
       is(cue.lineAlign, "end", "Cue's line align should be end.");
 
       // Check that cue position align works properly
-      is(cue.positionAlign, "center", "Cue's default position alignment should be center.");
+      is(cue.positionAlign, "auto", "Cue's default position alignment should be auto.");
 
       cue.positionAlign = "line-left";
       is(cue.positionAlign, "line-left", "Cue's position align should be line-left.");
diff --git a/dom/media/test/test_webvtt_positionalign.html b/dom/media/test/test_webvtt_positionalign.html
index 09ea0efc9a42..203aaed793f8 100644
--- a/dom/media/test/test_webvtt_positionalign.html
+++ b/dom/media/test/test_webvtt_positionalign.html
@@ -43,7 +43,7 @@ function runTest() {
   ok(cues[0] instanceof VTTCue, "Cue should be an instanceof VTTCue.");
 
   info("--- check the cue's position alignment ---");
-  is(cues[0].positionAlign, "center",     cues[0].text);
+  is(cues[0].positionAlign, "auto",     cues[0].text);
   is(cues[1].positionAlign, "line-left",  cues[1].text);
   is(cues[2].positionAlign, "center",     cues[2].text);
   is(cues[3].positionAlign, "line-right", cues[3].text);
diff --git a/dom/media/test/vttPositionAlign.vtt b/dom/media/test/vttPositionAlign.vtt
index 79f7c49f8c33..a49b62467081 100644
--- a/dom/media/test/vttPositionAlign.vtt
+++ b/dom/media/test/vttPositionAlign.vtt
@@ -1,7 +1,7 @@
 WEBVTT
 
 00:00.000 --> 00:00.500
-Cue 0 : PositionAlign should be "center".
+Cue 0 : PositionAlign should be "auto".
 
 00:00.700 --> 00:00.800 position:50%,line-left
 Cue 1 : PositionAlign should be "line-left".

From 91fbb20d80432092ec6556d7991807c67bca82b2 Mon Sep 17 00:00:00 2001
From: Scott Wu <scottcwwu@gmail.com>
Date: Tue, 28 Nov 2017 15:21:47 +0800
Subject: [PATCH 205/219] Bug 1420883 - Change setting width to min-width for
 manage addresses dialog. r=lchang

MozReview-Commit-ID: E1jjtfSdjZs

--HG--
extra : rebase_source : f2e2ddef43f27eb7358cbf5fb153162c54ae925e
---
 browser/extensions/formautofill/content/manageDialog.css | 5 +++++
 browser/extensions/formautofill/content/manageDialog.js  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/browser/extensions/formautofill/content/manageDialog.css b/browser/extensions/formautofill/content/manageDialog.css
index 573b6a5aaf87..787cb6f4e0ff 100644
--- a/browser/extensions/formautofill/content/manageDialog.css
+++ b/browser/extensions/formautofill/content/manageDialog.css
@@ -2,6 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+html {
+  /* Prevent unnecessary horizontal scroll bar from showing */
+  overflow-x: hidden;
+}
+
 div {
   display: flex;
 }
diff --git a/browser/extensions/formautofill/content/manageDialog.js b/browser/extensions/formautofill/content/manageDialog.js
index 7d65d3fedf7b..6ba19b154808 100644
--- a/browser/extensions/formautofill/content/manageDialog.js
+++ b/browser/extensions/formautofill/content/manageDialog.js
@@ -49,7 +49,7 @@ class ManageRecords {
   }
 
   localizeDocument() {
-    document.documentElement.style.width = FormAutofillUtils.stringBundle.GetStringFromName("manageDialogsWidth");
+    document.documentElement.style.minWidth = FormAutofillUtils.stringBundle.GetStringFromName("manageDialogsWidth");
     FormAutofillUtils.localizeMarkup(AUTOFILL_BUNDLE_URI, document);
   }
 

From 04c1b906049dd3d29c401d1b5af9dd9abeb70505 Mon Sep 17 00:00:00 2001
From: Oriol Brufau <oriol-bugzilla@hotmail.com>
Date: Tue, 28 Nov 2017 16:28:21 +0100
Subject: [PATCH 206/219] Bug 1417039 - Do not defer loading JSON Viewer.
 r=Honza

MozReview-Commit-ID: BtnH41N1w8P

--HG--
extra : rebase_source : 7c6e416f9130fbd9bb6deff2bee9a24fc1a937c0
---
 .../client/jsonview/components/LiveText.js    |  45 ++++++++
 .../jsonview/components/MainTabbedArea.js     |  11 +-
 .../client/jsonview/components/TextPanel.js   |  10 +-
 devtools/client/jsonview/components/moz.build |   1 +
 devtools/client/jsonview/converter-child.js   |  15 +--
 devtools/client/jsonview/json-viewer.js       |  74 +++++++++----
 devtools/client/jsonview/test/browser.ini     |  13 ++-
 .../test/browser_jsonview_chunked_json.js     |  84 ++++++++++++++
 .../jsonview/test/browser_jsonview_nojs.js    |  18 +--
 .../client/jsonview/test/chunked_json.sjs     |  38 +++++++
 .../client/jsonview/test/doc_frame_script.js  |  25 +++--
 devtools/client/jsonview/test/head.js         | 104 ++++++++++++------
 devtools/client/jsonview/viewer-config.js     |   4 +
 13 files changed, 344 insertions(+), 98 deletions(-)
 create mode 100644 devtools/client/jsonview/components/LiveText.js
 create mode 100644 devtools/client/jsonview/test/browser_jsonview_chunked_json.js
 create mode 100644 devtools/client/jsonview/test/chunked_json.sjs

diff --git a/devtools/client/jsonview/components/LiveText.js b/devtools/client/jsonview/components/LiveText.js
new file mode 100644
index 000000000000..fce2b7a9cab5
--- /dev/null
+++ b/devtools/client/jsonview/components/LiveText.js
@@ -0,0 +1,45 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+define(function (require, exports, module) {
+  const { Component } = require("devtools/client/shared/vendor/react");
+  const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
+  const { findDOMNode } = require("devtools/client/shared/vendor/react-dom");
+  const { pre } = require("devtools/client/shared/vendor/react-dom-factories");
+
+  /**
+   * This object represents a live DOM text node in a <pre>.
+   */
+  class LiveText extends Component {
+    static get propTypes() {
+      return {
+        data: PropTypes.instanceOf(Text),
+      };
+    }
+
+    componentDidMount() {
+      this.componentDidUpdate();
+    }
+
+    componentDidUpdate() {
+      let el = findDOMNode(this);
+      if (el.firstChild === this.props.data) {
+        return;
+      }
+      el.textContent = "";
+      el.append(this.props.data);
+    }
+
+    render() {
+      return pre({className: "data"});
+    }
+  }
+
+  // Exports from this module
+  exports.LiveText = LiveText;
+});
diff --git a/devtools/client/jsonview/components/MainTabbedArea.js b/devtools/client/jsonview/components/MainTabbedArea.js
index b3b4f2eaec2f..431ed4ad80fd 100644
--- a/devtools/client/jsonview/components/MainTabbedArea.js
+++ b/devtools/client/jsonview/components/MainTabbedArea.js
@@ -22,7 +22,7 @@ define(function (require, exports, module) {
   class MainTabbedArea extends Component {
     static get propTypes() {
       return {
-        jsonText: PropTypes.string,
+        jsonText: PropTypes.instanceOf(Text),
         tabActive: PropTypes.number,
         actions: PropTypes.object,
         headers: PropTypes.object,
@@ -42,8 +42,8 @@ define(function (require, exports, module) {
       super(props);
 
       this.state = {
-        json: {},
-        headers: {},
+        json: props.json,
+        expandedNodes: props.expandedNodes,
         jsonText: props.jsonText,
         tabActive: props.tabActive
       };
@@ -64,7 +64,7 @@ define(function (require, exports, module) {
             className: "json",
             title: JSONView.Locale.$STR("jsonViewer.tab.JSON")},
             JsonPanel({
-              data: this.props.json,
+              data: this.state.json,
               expandedNodes: this.props.expandedNodes,
               actions: this.props.actions,
               searchFilter: this.state.searchFilter
@@ -74,7 +74,8 @@ define(function (require, exports, module) {
             className: "rawdata",
             title: JSONView.Locale.$STR("jsonViewer.tab.RawData")},
             TextPanel({
-              isValidJson: !(this.props.json instanceof Error),
+              isValidJson: !(this.state.json instanceof Error) &&
+                           document.readyState != "loading",
               data: this.state.jsonText,
               actions: this.props.actions
             })
diff --git a/devtools/client/jsonview/components/TextPanel.js b/devtools/client/jsonview/components/TextPanel.js
index 694702c310a4..62a568893204 100644
--- a/devtools/client/jsonview/components/TextPanel.js
+++ b/devtools/client/jsonview/components/TextPanel.js
@@ -12,8 +12,8 @@ define(function (require, exports, module) {
   const dom = require("devtools/client/shared/vendor/react-dom-factories");
   const { createFactories } = require("devtools/client/shared/react-utils");
   const { TextToolbar } = createFactories(require("./TextToolbar"));
-
-  const { div, pre } = dom;
+  const { LiveText } = createFactories(require("./LiveText"));
+  const { div } = dom;
 
   /**
    * This template represents the 'Raw Data' panel displaying
@@ -24,7 +24,7 @@ define(function (require, exports, module) {
       return {
         isValidJson: PropTypes.bool,
         actions: PropTypes.object,
-        data: PropTypes.string
+        data: PropTypes.instanceOf(Text),
       };
     }
 
@@ -41,9 +41,7 @@ define(function (require, exports, module) {
             isValidJson: this.props.isValidJson
           }),
           div({className: "panelContent"},
-            pre({className: "data"},
-              this.props.data
-            )
+            LiveText({data: this.props.data})
           )
         )
       );
diff --git a/devtools/client/jsonview/components/moz.build b/devtools/client/jsonview/components/moz.build
index 826e3019baca..55f3bbe8619e 100644
--- a/devtools/client/jsonview/components/moz.build
+++ b/devtools/client/jsonview/components/moz.build
@@ -14,6 +14,7 @@ DevToolsModules(
     'HeadersToolbar.js',
     'JsonPanel.js',
     'JsonToolbar.js',
+    'LiveText.js',
     'MainTabbedArea.js',
     'SearchBox.js',
     'TextPanel.js',
diff --git a/devtools/client/jsonview/converter-child.js b/devtools/client/jsonview/converter-child.js
index d8b2b03f3e06..f40562cdad50 100644
--- a/devtools/client/jsonview/converter-child.js
+++ b/devtools/client/jsonview/converter-child.js
@@ -168,6 +168,8 @@ function exportData(win, request) {
 
   data.json = new win.Text();
 
+  data.readyState = "uninitialized";
+
   let Locale = {
     $STR: key => {
       try {
@@ -241,17 +243,16 @@ function initialHTML(doc) {
           type: "text/css",
           href: baseURI + "css/main.css",
         }),
-        element("script", {
-          src: baseURI + "lib/require.js",
-          "data-main": baseURI + "viewer-config.js",
-          defer: true,
-        })
       ]),
       element("body", {}, [
         element("div", {"id": "content"}, [
           element("div", {"id": "json"})
-        ])
-      ])
+        ]),
+        element("script", {
+          src: baseURI + "lib/require.js",
+          "data-main": baseURI + "viewer-config.js",
+        }),
+      ]),
     ]).outerHTML;
 }
 
diff --git a/devtools/client/jsonview/json-viewer.js b/devtools/client/jsonview/json-viewer.js
index e82d71dccac2..0aada466d264 100644
--- a/devtools/client/jsonview/json-viewer.js
+++ b/devtools/client/jsonview/json-viewer.js
@@ -19,41 +19,26 @@ define(function (require, exports, module) {
 
   // Application state object.
   let input = {
-    jsonText: JSONView.json.textContent,
+    jsonText: JSONView.json,
     jsonPretty: null,
     headers: JSONView.headers,
     tabActive: 0,
     prettified: false
   };
 
-  try {
-    input.json = JSON.parse(input.jsonText);
-  } catch (err) {
-    input.json = err;
-  }
-
-  // Expand the document by default if its size isn't bigger than 100KB.
-  if (!(input.json instanceof Error) && input.jsonText.length <= AUTO_EXPAND_MAX_SIZE) {
-    input.expandedNodes = TreeViewClass.getExpandedNodes(
-      input.json,
-      {maxLevel: AUTO_EXPAND_MAX_LEVEL}
-    );
-  } else {
-    input.expandedNodes = new Set();
-  }
-
   /**
    * Application actions/commands. This list implements all commands
    * available for the JSON viewer.
    */
   input.actions = {
     onCopyJson: function () {
-      copyString(input.prettified ? input.jsonPretty : input.jsonText);
+      let text = input.prettified ? input.jsonPretty : input.jsonText;
+      copyString(text.textContent);
     },
 
     onSaveJson: function () {
       if (input.prettified && !prettyURL) {
-        prettyURL = URL.createObjectURL(new window.Blob([input.jsonPretty]));
+        prettyURL = URL.createObjectURL(new window.Blob([input.jsonPretty.textContent]));
       }
       dispatchEvent("save", input.prettified ? prettyURL : null);
     },
@@ -93,7 +78,7 @@ define(function (require, exports, module) {
         theApp.setState({jsonText: input.jsonText});
       } else {
         if (!input.jsonPretty) {
-          input.jsonPretty = JSON.stringify(input.json, null, "  ");
+          input.jsonPretty = new Text(JSON.stringify(input.json, null, "  "));
         }
         theApp.setState({jsonText: input.jsonPretty});
       }
@@ -139,11 +124,52 @@ define(function (require, exports, module) {
    * at the top of the window. This component also represents ReacJS root.
    */
   let content = document.getElementById("content");
+  let promise = (async function parseJSON() {
+    if (document.readyState == "loading") {
+      // If the JSON has not been loaded yet, render the Raw Data tab first.
+      input.json = {};
+      input.expandedNodes = new Set();
+      input.tabActive = 1;
+      return new Promise(resolve => {
+        document.addEventListener("DOMContentLoaded", resolve, {once: true});
+      }).then(parseJSON).then(() => {
+        // Now update the state and switch to the JSON tab.
+        theApp.setState({
+          tabActive: 0,
+          json: input.json,
+          expandedNodes: input.expandedNodes,
+        });
+      });
+    }
+
+    // If the JSON has been loaded, parse it immediately before loading the app.
+    let jsonString = input.jsonText.textContent;
+    try {
+      input.json = JSON.parse(jsonString);
+    } catch (err) {
+      input.json = err;
+    }
+
+    // Expand the document by default if its size isn't bigger than 100KB.
+    if (!(input.json instanceof Error) && jsonString.length <= AUTO_EXPAND_MAX_SIZE) {
+      input.expandedNodes = TreeViewClass.getExpandedNodes(
+        input.json,
+        {maxLevel: AUTO_EXPAND_MAX_LEVEL}
+      );
+    }
+    return undefined;
+  })();
+
   let theApp = render(MainTabbedArea(input), content);
 
-  // Send notification event to the window. Can be useful for
+  // Send readyState change notification event to the window. Can be useful for
   // tests as well as extensions.
-  let event = new CustomEvent("JSONViewInitialized", {});
-  JSONView.initialized = true;
-  window.dispatchEvent(event);
+  JSONView.readyState = "interactive";
+  window.dispatchEvent(new CustomEvent("AppReadyStateChange"));
+
+  promise.then(() => {
+    // Another readyState change notification event.
+    JSONView.readyState = "complete";
+    window.dispatchEvent(new CustomEvent("AppReadyStateChange"));
+  });
 });
diff --git a/devtools/client/jsonview/test/browser.ini b/devtools/client/jsonview/test/browser.ini
index 6a9085f21fdf..36c1d015f183 100644
--- a/devtools/client/jsonview/test/browser.ini
+++ b/devtools/client/jsonview/test/browser.ini
@@ -22,8 +22,11 @@ support-files =
   !/devtools/client/framework/test/head.js
   !/devtools/client/framework/test/shared-head.js
 
+[browser_json_refresh.js]
 [browser_jsonview_bug_1380828.js]
-[browser_jsonview_ignore_charset.js]
+[browser_jsonview_chunked_json.js]
+support-files =
+  chunked_json.sjs
 [browser_jsonview_content_type.js]
 [browser_jsonview_copy_headers.js]
 subsuite = clipboard
@@ -38,6 +41,7 @@ skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32
 [browser_jsonview_empty_object.js]
 [browser_jsonview_encoding.js]
 [browser_jsonview_filter.js]
+[browser_jsonview_ignore_charset.js]
 [browser_jsonview_invalid_json.js]
 [browser_jsonview_manifest.js]
 [browser_jsonview_nojs.js]
@@ -47,8 +51,7 @@ skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32
 [browser_jsonview_save_json.js]
 support-files =
   !/toolkit/content/tests/browser/common/mockTransfer.js
-[browser_jsonview_theme.js]
-[browser_jsonview_slash.js]
-[browser_jsonview_valid_json.js]
-[browser_json_refresh.js]
 [browser_jsonview_serviceworker.js]
+[browser_jsonview_slash.js]
+[browser_jsonview_theme.js]
+[browser_jsonview_valid_json.js]
diff --git a/devtools/client/jsonview/test/browser_jsonview_chunked_json.js b/devtools/client/jsonview/test/browser_jsonview_chunked_json.js
new file mode 100644
index 000000000000..59f38a6e9444
--- /dev/null
+++ b/devtools/client/jsonview/test/browser_jsonview_chunked_json.js
@@ -0,0 +1,84 @@
+/* -*- 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 + "chunked_json.sjs";
+
+add_task(async function () {
+  info("Test chunked JSON started");
+
+  await addJsonViewTab(TEST_JSON_URL, {
+    appReadyState: "interactive",
+    docReadyState: "loading",
+  });
+
+  is(await getElementCount(".rawdata.is-active"), 1,
+    "The Raw Data tab is selected.");
+
+  // Write some text and check that it is displayed.
+  await write("[");
+  await checkText();
+
+  // Repeat just in case.
+  await write("1,");
+  await checkText();
+
+  is(await getElementCount("button.prettyprint"), 0,
+    "There is no pretty print button during load");
+
+  await selectJsonViewContentTab("json");
+  is(await getElementText(".jsonPanelBox > .panelContent"), "", "There is no JSON tree");
+
+  await selectJsonViewContentTab("headers");
+  ok(await getElementText(".headersPanelBox .netInfoHeadersTable"),
+    "The headers table has been filled.");
+
+  // Write some text without being in Raw Data, then switch tab and check.
+  await write("2");
+  await selectJsonViewContentTab("rawdata");
+  await checkText();
+
+  // Another text check.
+  await write("]");
+  await checkText();
+
+  // Close the connection.
+  let appReady = waitForContentMessage("Test:JsonView:AppReadyStateChange");
+  await server("close");
+  await appReady;
+
+  is(await getElementCount(".json.is-active"), 1, "The JSON tab is selected.");
+
+  is(await getElementCount(".jsonPanelBox .treeTable .treeRow"), 2,
+    "There is a tree with 2 rows.");
+
+  await selectJsonViewContentTab("rawdata");
+  await checkText();
+
+  is(await getElementCount("button.prettyprint"), 1, "There is a pretty print button.");
+  await clickJsonNode("button.prettyprint");
+  await checkText(JSON.stringify(JSON.parse(data), null, 2));
+});
+
+let data = " ";
+async function write(text) {
+  data += text;
+  let dataReceived = waitForContentMessage("Test:JsonView:NewDataReceived");
+  await server("write", text);
+  await dataReceived;
+}
+async function checkText(text = data) {
+  is(await getElementText(".textPanelBox .data"), text, "Got the right text.");
+}
+
+function server(action, value) {
+  return new Promise(resolve => {
+    let xhr = new XMLHttpRequest();
+    xhr.open("GET", TEST_JSON_URL + "?" + action + "=" + value);
+    xhr.addEventListener("load", resolve, {once: true});
+    xhr.send();
+  });
+}
diff --git a/devtools/client/jsonview/test/browser_jsonview_nojs.js b/devtools/client/jsonview/test/browser_jsonview_nojs.js
index a42a84f5ab61..f1d686621f3e 100644
--- a/devtools/client/jsonview/test/browser_jsonview_nojs.js
+++ b/devtools/client/jsonview/test/browser_jsonview_nojs.js
@@ -5,21 +5,21 @@
 
 "use strict";
 
-add_task(function* () {
+add_task(async function () {
   info("Test JSON without JavaScript started.");
 
   let oldPref = SpecialPowers.getBoolPref("javascript.enabled");
   SpecialPowers.setBoolPref("javascript.enabled", false);
 
   const TEST_JSON_URL = "data:application/json,[1,2,3]";
-  yield addJsonViewTab(TEST_JSON_URL, 0).catch(() => {
-    info("JSON Viewer did not load");
-    return executeInContent("Test:JsonView:GetElementVisibleText", {selector: "html"})
-    .then(result => {
-      info("Checking visible text contents.");
-      is(result.text, "[1,2,3]", "The raw source should be visible.");
-    });
-  });
+
+  // "uninitialized" will be the last app readyState because JS is disabled.
+  await addJsonViewTab(TEST_JSON_URL, {appReadyState: "uninitialized"});
+
+  info("Checking visible text contents.");
+  let {text} = await executeInContent("Test:JsonView:GetElementVisibleText",
+    {selector: "html"});
+  is(text, "[1,2,3]", "The raw source should be visible.");
 
   SpecialPowers.setBoolPref("javascript.enabled", oldPref);
 });
diff --git a/devtools/client/jsonview/test/chunked_json.sjs b/devtools/client/jsonview/test/chunked_json.sjs
new file mode 100644
index 000000000000..11b7934eb404
--- /dev/null
+++ b/devtools/client/jsonview/test/chunked_json.sjs
@@ -0,0 +1,38 @@
+/* -*- 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/ */
+
+const key = "json-viewer-chunked-response";
+function setResponse(response) {
+  setObjectState(key, response);
+}
+function getResponse() {
+  let response;
+  getObjectState(key, v => { response = v });
+  return response;
+}
+
+function handleRequest(request, response) {
+  let {queryString} = request;
+  if (!queryString) {
+    response.processAsync();
+    setResponse(response);
+    response.setHeader("Content-Type", "application/json");
+    // Write something so that the JSON viewer app starts loading.
+    response.write(" ");
+    return;
+  }
+  let [command, value] = queryString.split('=');
+  switch (command) {
+    case "write":
+      getResponse().write(value);
+      break;
+    case "close":
+      getResponse().finish();
+      setResponse(null);
+      break;
+  }
+  response.setHeader("Content-Type", "text/plain");
+  response.write("ok");
+}
diff --git a/devtools/client/jsonview/test/doc_frame_script.js b/devtools/client/jsonview/test/doc_frame_script.js
index 02379117b5ed..d1691daf8f50 100644
--- a/devtools/client/jsonview/test/doc_frame_script.js
+++ b/devtools/client/jsonview/test/doc_frame_script.js
@@ -25,19 +25,28 @@ Services.scriptloader.loadSubScript(
   "chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);
 
 /**
- * When the JSON View is done rendering it triggers custom event
- * "JSONViewInitialized", then the Test:TestPageProcessingDone message
- * will be sent to the parent process for tests to wait for this event
- * if needed.
+ * When the ready state of the JSON View app changes, it triggers custom event
+ * "AppReadyStateChange", then the "Test:JsonView:AppReadyStateChange" message
+ * will be sent to the parent process for tests to wait for this event if needed.
  */
-content.addEventListener("JSONViewInitialized", () => {
-  sendAsyncMessage("Test:JsonView:JSONViewInitialized");
+content.addEventListener("AppReadyStateChange", () => {
+  sendAsyncMessage("Test:JsonView:AppReadyStateChange");
 });
 
-content.addEventListener("load", () => {
-  sendAsyncMessage("Test:JsonView:load");
+/**
+ * Analogous for the standard "readystatechange" event of the document.
+ */
+content.document.addEventListener("readystatechange", () => {
+  sendAsyncMessage("Test:JsonView:DocReadyStateChange");
 });
 
+/**
+ * Send a message whenever the server sends a new chunk of JSON data.
+ */
+new content.MutationObserver(function (mutations, observer) {
+  sendAsyncMessage("Test:JsonView:NewDataReceived");
+}).observe(content.wrappedJSObject.JSONView.json, {characterData: true});
+
 addMessageListener("Test:JsonView:GetElementCount", function (msg) {
   let {selector} = msg.data;
   let nodeList = content.document.querySelectorAll(selector);
diff --git a/devtools/client/jsonview/test/head.js b/devtools/client/jsonview/test/head.js
index 40f8abf99f54..9c4bebce9633 100644
--- a/devtools/client/jsonview/test/head.js
+++ b/devtools/client/jsonview/test/head.js
@@ -26,53 +26,89 @@ registerCleanupFunction(() => {
  * Add a new test tab in the browser and load the given url.
  * @param {String} url
  *   The url to be loaded in the new tab.
- * @param {Number} timeout [optional]
- *   The maximum number of milliseconds allowed before the initialization of the
- *   JSON Viewer once the tab has been loaded. If exceeded, the initialization
- *   will be considered to have failed, and the returned promise will be rejected.
- *   If this parameter is not passed or is negative, it will be ignored.
+ *
+ * @param {Object} [optional]
+ *   An object with the following optional properties:
+ *   - appReadyState: The readyState of the JSON Viewer app that you want to
+ *     wait for. Its value can be one of:
+ *      - "uninitialized": The converter has started the request.
+ *        If JavaScript is disabled, there will be no more readyState changes.
+ *      - "loading": RequireJS started loading the scripts for the JSON Viewer.
+ *        If the load timeouts, there will be no more readyState changes.
+ *      - "interactive": The JSON Viewer app loaded, but possibly not all the JSON
+ *        data has been received.
+ *      - "complete" (default): The app is fully loaded with all the JSON.
+ *   - docReadyState: The standard readyState of the document that you want to
+ *     wait for. Its value can be one of:
+ *      - "loading": The JSON data has not been completely loaded (but the app might).
+ *      - "interactive": All the JSON data has been received.
+ *      - "complete" (default): Since there aren't sub-resources like images,
+ *        behaves as "interactive". Note the app might not be loaded yet.
  */
-async function addJsonViewTab(url, timeout = -1) {
+async function addJsonViewTab(url, {
+  appReadyState = "complete",
+  docReadyState = "complete",
+} = {}) {
   info("Adding a new JSON tab with URL: '" + url + "'");
-
-  let tab = await addTab(url);
+  let tabLoaded = addTab(url);
+  let tab = gBrowser.selectedTab;
   let browser = tab.linkedBrowser;
+  await Promise.race([tabLoaded, new Promise(resolve => {
+    browser.webProgress.addProgressListener({
+      QueryInterface: XPCOMUtils.generateQI(["nsIWebProgressListener",
+                                             "nsISupportsWeakReference"]),
+      onLocationChange(webProgress) {
+        // Fires when the tab is ready but before completely loaded.
+        webProgress.removeProgressListener(this);
+        resolve();
+      },
+    }, Ci.nsIWebProgress.NOTIFY_LOCATION);
+  })]);
 
   // Load devtools/shared/frame-script-utils.js
   getFrameScript();
-
-  // Load frame script with helpers for JSON View tests.
   let rootDir = getRootDirectory(gTestPath);
-  let frameScriptUrl = rootDir + "doc_frame_script.js";
-  browser.messageManager.loadFrameScript(frameScriptUrl, false);
 
-  // Check if there is a JSONView object.
-  if (!content.window.wrappedJSObject.JSONView) {
-    throw new Error("JSON Viewer did not load.");
-  }
+  let data = {rootDir, appReadyState, docReadyState};
+  // eslint-disable-next-line no-shadow
+  await ContentTask.spawn(browser, data, async function (data) {
+    // Check if there is a JSONView object.
+    let {JSONView} = content.window.wrappedJSObject;
+    if (!JSONView) {
+      throw new Error("The JSON Viewer did not load.");
+    }
 
-  // Resolve if the JSONView is fully loaded.
-  if (content.window.wrappedJSObject.JSONView.initialized) {
-    return tab;
-  }
+    // Load frame script with helpers for JSON View tests.
+    let frameScriptUrl = data.rootDir + "doc_frame_script.js";
+    Services.scriptloader.loadSubScript(frameScriptUrl, {}, "UTF-8");
 
-  // Otherwise wait for an initialization event, possibly with a time limit.
-  const onJSONViewInitialized =
-    waitForContentMessage("Test:JsonView:JSONViewInitialized")
-    .then(() => tab);
+    let docReadyStates = ["loading", "interactive", "complete"];
+    let docReadyIndex = docReadyStates.indexOf(data.docReadyState);
+    let appReadyStates = ["uninitialized", ...docReadyStates];
+    let appReadyIndex = appReadyStates.indexOf(data.appReadyState);
+    if (docReadyIndex < 0 || appReadyIndex < 0) {
+      throw new Error("Invalid app or doc readyState parameter.");
+    }
 
-  if (!(timeout >= 0)) {
-    return onJSONViewInitialized;
-  }
+    // Wait until the document readyState suffices.
+    let {document} = content.window;
+    while (docReadyStates.indexOf(document.readyState) < docReadyIndex) {
+      info(`DocReadyState is "${document.readyState}". Await "${data.docReadyState}"`);
+      await new Promise(resolve => {
+        document.addEventListener("readystatechange", resolve, {once: true});
+      });
+    }
 
-  if (content.window.document.readyState !== "complete") {
-    await waitForContentMessage("Test:JsonView:load");
-  }
+    // Wait until the app readyState suffices.
+    while (appReadyStates.indexOf(JSONView.readyState) < appReadyIndex) {
+      info(`AppReadyState is "${JSONView.readyState}". Await "${data.appReadyState}"`);
+      await new Promise(resolve => {
+        content.addEventListener("AppReadyStateChange", resolve, {once: true});
+      });
+    }
+  });
 
-  let onTimeout = new Promise((_, reject) =>
-    setTimeout(() => reject(new Error("JSON Viewer did not load.")), timeout));
-
-  return Promise.race([onJSONViewInitialized, onTimeout]);
+  return tab;
 }
 
 /**
diff --git a/devtools/client/jsonview/viewer-config.js b/devtools/client/jsonview/viewer-config.js
index c2bf8723245a..d9232c01d05b 100644
--- a/devtools/client/jsonview/viewer-config.js
+++ b/devtools/client/jsonview/viewer-config.js
@@ -7,6 +7,10 @@
 
 "use strict";
 
+// Send readyState change notification event to the window. It's useful for tests.
+JSONView.readyState = "loading";
+window.dispatchEvent(new CustomEvent("AppReadyStateChange"));
+
 /**
  * RequireJS configuration for JSON Viewer.
  *

From 1e487450bdddd937c75141d116962f8f45cee9bf Mon Sep 17 00:00:00 2001
From: Francois Marier <francois@mozilla.com>
Date: Tue, 28 Nov 2017 12:10:37 -0800
Subject: [PATCH 207/219] Bug 1421803 - Send ThreatHit requests and telemetry
 at the right time. r=dimi

The ThreatHit requests were never being sent because SetMatchedInfo() was
called on the channel _after_ calling SendThreatHitReport().

Additionally, the telemetry was sent in OnStartRequest() and so errors
returned in OnStopRequest() would not be caught.

This patch also includes some improvements to the logging of these
requests which can be toggled using:

    MOZ_LOG="UrlClassifierDbService:5,nsChannelClassifier:5"

MozReview-Commit-ID: 9dtRgEPVS3g

--HG--
extra : rebase_source : 6d0e4b745e203a54489ddd479935d008ab9a82d7
---
 netwerk/base/nsChannelClassifier.cpp          |  13 +-
 netwerk/base/nsChannelClassifier.h            |   6 +-
 netwerk/base/nsIURIClassifier.idl             |   9 +-
 .../nsUrlClassifierDBService.cpp              | 167 ++++++++++--------
 .../nsUrlClassifierHashCompleter.js           |   1 -
 5 files changed, 116 insertions(+), 80 deletions(-)

diff --git a/netwerk/base/nsChannelClassifier.cpp b/netwerk/base/nsChannelClassifier.cpp
index efe9fe6cab4a..49510f11a714 100644
--- a/netwerk/base/nsChannelClassifier.cpp
+++ b/netwerk/base/nsChannelClassifier.cpp
@@ -1099,15 +1099,21 @@ nsChannelClassifier::IsTrackerWhitelisted(nsIURI* aWhiteListURI,
   return uriClassifier->AsyncClassifyLocalWithTables(aWhiteListURI, trackingWhitelist, aCallback);
 }
 
+/* static */
 nsresult
 nsChannelClassifier::SendThreatHitReport(nsIChannel *aChannel,
-                                         const nsACString& aProvider)
+                                         const nsACString& aProvider,
+                                         const nsACString& aList,
+                                         const nsACString& aFullHash)
 {
+  NS_ENSURE_ARG_POINTER(aChannel);
 
   nsAutoCString provider(aProvider);
   nsPrintfCString reportEnablePref("browser.safebrowsing.provider.%s.dataSharing.enabled",
                                    provider.get());
   if (!Preferences::GetBool(reportEnablePref.get(), false)) {
+    LOG(("nsChannelClassifier::SendThreatHitReport data sharing disabled for %s",
+         provider.get()));
     return NS_OK;
   }
 
@@ -1117,7 +1123,8 @@ nsChannelClassifier::SendThreatHitReport(nsIChannel *aChannel,
     return NS_ERROR_UNEXPECTED;
   }
 
-  nsresult rv = uriClassifier->SendThreatHitReport(mChannel);
+  nsresult rv = uriClassifier->SendThreatHitReport(aChannel, aProvider, aList,
+                                                   aFullHash);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
@@ -1160,7 +1167,7 @@ nsChannelClassifier::OnClassifyComplete(nsresult aErrorCode,
           aErrorCode == NS_ERROR_PHISHING_URI ||
           aErrorCode == NS_ERROR_UNWANTED_URI ||
           aErrorCode == NS_ERROR_HARMFUL_URI) {
-        SendThreatHitReport(mChannel, aProvider);
+        SendThreatHitReport(mChannel, aProvider, aList, aFullHash);
       }
 
       mChannel->Cancel(aErrorCode);
diff --git a/netwerk/base/nsChannelClassifier.h b/netwerk/base/nsChannelClassifier.h
index d4926e48eb90..8e15aececf84 100644
--- a/netwerk/base/nsChannelClassifier.h
+++ b/netwerk/base/nsChannelClassifier.h
@@ -91,8 +91,10 @@ private:
     bool AddonMayLoad(nsIChannel *aChannel, nsIURI *aUri);
     void AddShutdownObserver();
     void RemoveShutdownObserver();
-    nsresult SendThreatHitReport(nsIChannel *aChannel,
-                                 const nsACString& aProvider);
+    static nsresult SendThreatHitReport(nsIChannel *aChannel,
+                                        const nsACString& aProvider,
+                                        const nsACString& aList,
+                                        const nsACString& aFullHash);
 public:
     // If we are blocking content, update the corresponding flag in the respective
     // docshell and call nsISecurityEventSink::onSecurityChange.
diff --git a/netwerk/base/nsIURIClassifier.idl b/netwerk/base/nsIURIClassifier.idl
index 5c0888d17724..dd01238cd782 100644
--- a/netwerk/base/nsIURIClassifier.idl
+++ b/netwerk/base/nsIURIClassifier.idl
@@ -107,7 +107,14 @@ interface nsIURIClassifier : nsISupports
    *
    * @param aChannel
    *        Channel for which the URL matched something on the threat list.
+   * @param aProvider
+   *        Provider to notify.
+   * @param aList
+   *        List where the full hash was found.
+   * @param aFullHash
+   *        Full URL hash that triggered the warning.
    */
 
-  void sendThreatHitReport(in nsIChannel aChannel);
+  void sendThreatHitReport(in nsIChannel aChannel, in ACString aProvider,
+                           in ACString aList, in ACString aFullHash);
 };
diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
index a108812a1792..0e78102e42b6 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
@@ -1,4 +1,4 @@
-//* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1966,103 +1966,120 @@ private:
 NS_IMPL_ISUPPORTS(ThreatHitReportListener, nsIStreamListener, nsIRequestObserver)
 
 NS_IMETHODIMP
-ThreatHitReportListener::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext)
+ThreatHitReportListener::OnStartRequest(nsIRequest* aRequest,
+                                        nsISupports* aContext)
 {
-  nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aRequest);
-  if (httpChannel) {
-    nsresult rv;
-    nsresult status = NS_OK;
-    rv = httpChannel->GetStatus(&status);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    uint8_t netErrCode = NS_FAILED(status) ?
-      mozilla::safebrowsing::NetworkErrorToBucket(status) : 0;
-    mozilla::Telemetry::Accumulate(
-      mozilla::Telemetry::URLCLASSIFIER_THREATHIT_NETWORK_ERROR, netErrCode);
-
-    uint32_t requestStatus;
-    rv = httpChannel->GetResponseStatus(&requestStatus);
-    NS_ENSURE_SUCCESS(rv, rv);
-    mozilla::Telemetry::Accumulate(mozilla::Telemetry::URLCLASSIFIER_THREATHIT_REMOTE_STATUS,
-                                   mozilla::safebrowsing::HTTPStatusToBucket(requestStatus));
-    if (LOG_ENABLED()) {
-      nsAutoCString errorName, spec;
-      mozilla::GetErrorName(status, errorName);
-      nsCOMPtr<nsIURI> uri;
-      rv = httpChannel->GetURI(getter_AddRefs(uri));
-      if (NS_SUCCEEDED(rv) && uri) {
-        uri->GetAsciiSpec(spec);
-      }
-
-      nsCOMPtr<nsIURLFormatter> urlFormatter =
-      do_GetService("@mozilla.org/toolkit/URLFormatterService;1");
-
-      // Trim sensitive log data
-      nsString trimmedSpec;
-      rv = urlFormatter->TrimSensitiveURLs(NS_ConvertUTF8toUTF16(spec), trimmedSpec);
-      if (NS_SUCCEEDED(rv)) {
-        LOG(("ThreatHitReportListener::OnStartRequest "
-             "(status=%s, uri=%s, this=%p)", errorName.get(),
-             NS_ConvertUTF16toUTF8(trimmedSpec).get(), this));
-
-      }
-    }
-
-    LOG(("ThreatHit report response %d %d", requestStatus, netErrCode));
+  if (!LOG_ENABLED()) {
+    return NS_OK; // Nothing to do!
   }
 
+  nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aRequest);
+  NS_ENSURE_TRUE(httpChannel, NS_OK);
+
+  nsresult rv, status;
+  rv = httpChannel->GetStatus(&status);
+  NS_ENSURE_SUCCESS(rv, NS_OK);
+  nsAutoCString errorName;
+  mozilla::GetErrorName(status, errorName);
+
+  uint32_t requestStatus;
+  rv = httpChannel->GetResponseStatus(&requestStatus);
+  NS_ENSURE_SUCCESS(rv, NS_OK);
+
+  nsAutoCString spec;
+  nsCOMPtr<nsIURI> uri;
+  rv = httpChannel->GetURI(getter_AddRefs(uri));
+  if (NS_SUCCEEDED(rv) && uri) {
+    uri->GetAsciiSpec(spec);
+  }
+  nsCOMPtr<nsIURLFormatter> urlFormatter =
+    do_GetService("@mozilla.org/toolkit/URLFormatterService;1");
+  nsAutoString trimmed;
+  rv = urlFormatter->TrimSensitiveURLs(NS_ConvertUTF8toUTF16(spec), trimmed);
+  NS_ENSURE_SUCCESS(rv, NS_OK);
+
+  LOG(("ThreatHitReportListener::OnStartRequest "
+       "(status=%s, code=%d, uri=%s, this=%p)", errorName.get(),
+       requestStatus, NS_ConvertUTF16toUTF8(trimmed).get(), this));
+
   return NS_OK;
 }
 
 NS_IMETHODIMP
 ThreatHitReportListener::OnDataAvailable(nsIRequest* aRequest,
-                                           nsISupports* aContext,
-                                           nsIInputStream* aInputStream,
-                                           uint64_t aOffset,
-                                           uint32_t aCount)
+                                         nsISupports* aContext,
+                                         nsIInputStream* aInputStream,
+                                         uint64_t aOffset,
+                                         uint32_t aCount)
 {
   return NS_OK;
 }
+
 NS_IMETHODIMP
-ThreatHitReportListener::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
-                                         nsresult aStatus)
+ThreatHitReportListener::OnStopRequest(nsIRequest* aRequest,
+                                       nsISupports* aContext,
+                                       nsresult aStatus)
 {
+  nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aRequest);
+  NS_ENSURE_TRUE(httpChannel, aStatus);
+
+  uint8_t netErrCode = NS_FAILED(aStatus) ?
+    mozilla::safebrowsing::NetworkErrorToBucket(aStatus) : 0;
+  mozilla::Telemetry::Accumulate(mozilla::Telemetry::URLCLASSIFIER_THREATHIT_NETWORK_ERROR, netErrCode);
+
+  uint32_t requestStatus;
+  nsresult rv = httpChannel->GetResponseStatus(&requestStatus);
+  NS_ENSURE_SUCCESS(rv, aStatus);
+  mozilla::Telemetry::Accumulate(mozilla::Telemetry::URLCLASSIFIER_THREATHIT_REMOTE_STATUS,
+                                 mozilla::safebrowsing::HTTPStatusToBucket(requestStatus));
+
+  if (LOG_ENABLED()) {
+    nsAutoCString errorName;
+    mozilla::GetErrorName(aStatus, errorName);
+
+    nsAutoCString spec;
+    nsCOMPtr<nsIURI> uri;
+    rv = httpChannel->GetURI(getter_AddRefs(uri));
+    if (NS_SUCCEEDED(rv) && uri) {
+      uri->GetAsciiSpec(spec);
+    }
+    nsCOMPtr<nsIURLFormatter> urlFormatter =
+      do_GetService("@mozilla.org/toolkit/URLFormatterService;1");
+    nsString trimmed;
+    rv = urlFormatter->TrimSensitiveURLs(NS_ConvertUTF8toUTF16(spec), trimmed);
+    NS_ENSURE_SUCCESS(rv, aStatus);
+
+    LOG(("ThreatHitReportListener::OnStopRequest "
+         "(status=%s, code=%d, uri=%s, this=%p)", errorName.get(),
+         requestStatus, NS_ConvertUTF16toUTF8(trimmed).get(), this));
+  }
+
   return aStatus;
 }
 
 NS_IMETHODIMP
-nsUrlClassifierDBService::SendThreatHitReport(nsIChannel *aChannel)
+nsUrlClassifierDBService::SendThreatHitReport(nsIChannel *aChannel,
+                                              const nsACString& aProvider,
+                                              const nsACString& aList,
+                                              const nsACString& aFullHash)
 {
   NS_ENSURE_ARG_POINTER(aChannel);
-  nsresult rv;
 
-  nsCOMPtr<nsIClassifiedChannel> classifiedChannel =
-    do_QueryInterface(aChannel, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!classifiedChannel) {
+  if (aProvider.IsEmpty()) {
+    LOG(("nsUrlClassifierDBService::SendThreatHitReport missing provider"));
     return NS_ERROR_FAILURE;
   }
-
-  nsAutoCString provider;
-  rv = classifiedChannel->GetMatchedProvider(provider);
-  if (NS_FAILED(rv) || provider.IsEmpty()) {
+  if (aList.IsEmpty()) {
+    LOG(("nsUrlClassifierDBService::SendThreatHitReport missing list"));
     return NS_ERROR_FAILURE;
   }
-
-  nsAutoCString listName;
-  rv = classifiedChannel->GetMatchedList(listName);
-  if (NS_FAILED(rv) || listName.IsEmpty()) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsAutoCString fullHash;
-  rv = classifiedChannel->GetMatchedFullHash(fullHash);
-  if (NS_FAILED(rv) || fullHash.IsEmpty()) {
+  if (aFullHash.IsEmpty()) {
+    LOG(("nsUrlClassifierDBService::SendThreatHitReport missing fullhash"));
     return NS_ERROR_FAILURE;
   }
 
   nsPrintfCString reportUrlPref("browser.safebrowsing.provider.%s.dataSharingURL",
-                                provider.get());
+                                PromiseFlatCString(aProvider).get());
 
   nsCOMPtr<nsIURLFormatter> formatter(
     do_GetService("@mozilla.org/toolkit/URLFormatterService;1"));
@@ -2071,11 +2088,11 @@ nsUrlClassifierDBService::SendThreatHitReport(nsIChannel *aChannel)
   }
 
   nsString urlStr;
-  rv = formatter->FormatURLPref(NS_ConvertUTF8toUTF16(reportUrlPref), urlStr);
+  nsresult rv = formatter->FormatURLPref(NS_ConvertUTF8toUTF16(reportUrlPref), urlStr);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (urlStr.IsEmpty() || NS_LITERAL_STRING("about:blank").Equals(urlStr)) {
-    LOG(("%s is missing a ThreatHit data reporting URL.", provider.get()));
+    LOG(("%s is missing a ThreatHit data reporting URL.", PromiseFlatCString(aProvider).get()));
     return NS_OK;
   }
 
@@ -2086,13 +2103,17 @@ nsUrlClassifierDBService::SendThreatHitReport(nsIChannel *aChannel)
   }
 
   nsAutoCString reportBody;
-  rv = utilsService->MakeThreatHitReport(aChannel, listName, fullHash, reportBody);
+  rv = utilsService->MakeThreatHitReport(aChannel, aList, aFullHash, reportBody);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsAutoCString reportUriStr = NS_ConvertUTF16toUTF8(urlStr);
   reportUriStr.Append("&$req=");
   reportUriStr.Append(reportBody);
 
+  LOG(("Sending the following ThreatHit report to %s about %s: %s",
+       PromiseFlatCString(aProvider).get(), PromiseFlatCString(aList).get(),
+       reportBody.get()));
+
   nsCOMPtr<nsIURI> reportURI;
   rv = NS_NewURI(getter_AddRefs(reportURI), reportUriStr);
   NS_ENSURE_SUCCESS(rv, rv);
diff --git a/toolkit/components/url-classifier/nsUrlClassifierHashCompleter.js b/toolkit/components/url-classifier/nsUrlClassifierHashCompleter.js
index 2504f1fdf600..5d02752f797d 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierHashCompleter.js
+++ b/toolkit/components/url-classifier/nsUrlClassifierHashCompleter.js
@@ -579,7 +579,6 @@ HashCompleterRequest.prototype = {
                             aTableNames,
                             aPerHashCacheDuration) => {
         log("V4 fullhash response complete hash found callback: " +
-            JSON.stringify(aCompleteHash) + ", " +
             aTableNames + ", CacheDuration(" + aPerHashCacheDuration + ")");
 
         // Filter table names which we didn't requested.

From 6ad1d8bbfb879a7e474cf6844105af867ff5ab95 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Mon, 4 Dec 2017 11:50:20 -0500
Subject: [PATCH 208/219] Bug 1416330 - 1. Add CompositorController; r=rbarker

Add CompositorController and LayerSession.getCompositorController for
accessing miscellaneous compositor-related methods such as adding draw
callbacks and getting pixels.

A simple Runnable is used for draw callbacks instead of using the
DrawListener interface from LayerView. A first-paint callback is added
to implement the "clear surface background on first paint" requirement
when switching between documents in Fennec.

MozReview-Commit-ID: 8pE1B5HYe2w

--HG--
extra : rebase_source : abd35b189d04073c203b542fb9f9ef763027e117
---
 mobile/android/base/moz.build                 |   1 +
 .../gecko/gfx/CompositorController.java       | 167 ++++++++++++++++++
 .../org/mozilla/gecko/gfx/LayerSession.java   |  53 ++++--
 3 files changed, 205 insertions(+), 16 deletions(-)
 create mode 100644 mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/CompositorController.java

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 5060a038a44b..1f0345e51870 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -394,6 +394,7 @@ gvjar.sources += [geckoview_source_dir + 'java/org/mozilla/gecko/' + x
     'gfx/BitmapUtils.java',
     'gfx/BufferedImage.java',
     'gfx/BufferedImageGLInfo.java',
+    'gfx/CompositorController.java',
     'gfx/DynamicToolbarAnimator.java',
     'gfx/FloatSize.java',
     'gfx/FullScreenState.java',
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/CompositorController.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/CompositorController.java
new file mode 100644
index 000000000000..6e0b5cb7c8d0
--- /dev/null
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/CompositorController.java
@@ -0,0 +1,167 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.gfx;
+
+import org.mozilla.gecko.annotation.RobocopTarget;
+import org.mozilla.gecko.util.ThreadUtils;
+
+import android.graphics.Color;
+import android.support.annotation.NonNull;
+
+import java.nio.IntBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CompositorController {
+    private final LayerSession.Compositor mCompositor;
+
+    public interface GetPixelsCallback {
+        void onPixelsResult(int width, int height, IntBuffer pixels);
+    }
+
+    private List<Runnable> mDrawCallbacks;
+    private GetPixelsCallback mGetPixelsCallback;
+    private int mDefaultClearColor = Color.WHITE;
+    private Runnable mFirstPaintCallback;
+
+    /* package */ CompositorController(final LayerSession session) {
+        mCompositor = session.mCompositor;
+    }
+
+    /* package */ void onCompositorReady() {
+        mCompositor.setDefaultClearColor(mDefaultClearColor);
+        mCompositor.enableLayerUpdateNotifications(
+                mDrawCallbacks != null && !mDrawCallbacks.isEmpty());
+    }
+
+    /* package */ void onCompositorDetached() {
+        if (mDrawCallbacks != null) {
+            mDrawCallbacks.clear();
+        }
+    }
+
+    /* package */ void notifyDrawCallbacks() {
+        if (mDrawCallbacks != null) {
+            for (final Runnable callback : mDrawCallbacks) {
+                callback.run();
+            }
+        }
+    }
+
+    /**
+     * Add a callback to run when drawing (layer update) occurs.
+     *
+     * @param callback Callback to add.
+     */
+    @RobocopTarget
+    public void addDrawCallback(final @NonNull Runnable callback) {
+        ThreadUtils.assertOnUiThread();
+
+        if (mDrawCallbacks == null) {
+            mDrawCallbacks = new ArrayList<Runnable>(2);
+        }
+
+        if (mDrawCallbacks.add(callback) && mDrawCallbacks.size() == 1 &&
+                mCompositor.isReady()) {
+            mCompositor.enableLayerUpdateNotifications(true);
+        }
+    }
+
+    /**
+     * Remove a previous draw callback.
+     *
+     * @param callback Callback to remove.
+     */
+    @RobocopTarget
+    public void removeDrawCallback(final @NonNull Runnable callback) {
+        ThreadUtils.assertOnUiThread();
+
+        if (mDrawCallbacks == null) {
+            return;
+        }
+
+        if (mDrawCallbacks.remove(callback) && mDrawCallbacks.isEmpty() &&
+                mCompositor.isReady()) {
+            mCompositor.enableLayerUpdateNotifications(false);
+        }
+    }
+
+    /* package */ void recvScreenPixels(final int width, final int height,
+                                        final int[] pixels) {
+        if (mGetPixelsCallback != null) {
+            mGetPixelsCallback.onPixelsResult(width, height, IntBuffer.wrap(pixels));
+            mGetPixelsCallback = null;
+        }
+    }
+
+    /**
+     * Request current pixel values from the compositor. May be called on any thread. Must
+     * not be called again until the callback is invoked.
+     *
+     * @param callback Callback for getting pixels.
+     */
+    @RobocopTarget
+    public void getPixels(final @NonNull GetPixelsCallback callback) {
+        ThreadUtils.assertOnUiThread();
+
+        if (mCompositor.isReady()) {
+            mGetPixelsCallback = callback;
+            mCompositor.requestScreenPixels();
+        } else {
+            callback.onPixelsResult(0, 0, null);
+        }
+    }
+
+    /**
+     * Get the current clear color when drawing.
+     *
+     * @return Curent clear color.
+     */
+    public int getClearColor() {
+        ThreadUtils.assertOnUiThread();
+        return mDefaultClearColor;
+    }
+
+    /**
+     * Set the clear color when drawing. Default is Color.WHITE.
+     *
+     * @param color Clear color.
+     */
+    public void setClearColor(final int color) {
+        ThreadUtils.assertOnUiThread();
+
+        mDefaultClearColor = color;
+        if (mCompositor.isReady()) {
+            mCompositor.setDefaultClearColor(mDefaultClearColor);
+        }
+    }
+
+    /**
+     * Get the current first paint callback.
+     *
+     * @return Current first paint callback or null if not set.
+     */
+    public Runnable getFirstPaintCallback() {
+        ThreadUtils.assertOnUiThread();
+        return mFirstPaintCallback;
+    }
+
+    /**
+     * Set a callback to run when a document is first drawn.
+     *
+     * @param callback First paint callback.
+     */
+    public void setFirstPaintCallback(final Runnable callback) {
+        ThreadUtils.assertOnUiThread();
+        mFirstPaintCallback = callback;
+    }
+
+    /* package */ void onFirstPaint() {
+        if (mFirstPaintCallback != null) {
+            mFirstPaintCallback.run();
+        }
+    }
+}
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java
index e5f90291b504..ed134d69265c 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java
@@ -59,8 +59,6 @@ public class LayerSession {
     /* package */ final static int IS_COMPOSITOR_CONTROLLER_OPEN    = 21;
 
     protected class Compositor extends JNIObject {
-        public LayerView layerView;
-
         public boolean isReady() {
             return LayerSession.this.isCompositorReady();
         }
@@ -72,10 +70,6 @@ public class LayerSession {
 
         @WrapForJNI(calledFrom = "ui")
         private void onCompositorDetached() {
-            if (layerView != null) {
-                layerView.clearDrawListeners();
-                layerView = null;
-            }
             // Clear out any pending calls on the UI thread.
             LayerSession.this.onCompositorDetached();
             disposeNative();
@@ -124,9 +118,7 @@ public class LayerSession {
 
         @WrapForJNI(calledFrom = "ui")
         private void recvScreenPixels(int width, int height, int[] pixels) {
-            if (layerView != null) {
-                layerView.recvScreenPixels(width, height, pixels);
-            }
+            LayerSession.this.recvScreenPixels(width, height, pixels);
         }
 
         @WrapForJNI(calledFrom = "ui", dispatchTo = "current")
@@ -170,6 +162,7 @@ public class LayerSession {
     private NativePanZoomController mNPZC;
     private OverscrollEdgeEffect mOverscroll;
     private DynamicToolbarAnimator mToolbar;
+    private CompositorController mController;
 
     private boolean mAttachedCompositor;
     private boolean mCalledCreateCompositor;
@@ -239,6 +232,23 @@ public class LayerSession {
         return mToolbar;
     }
 
+    /**
+     * Get the CompositorController instance for this session.
+     *
+     * @return CompositorController instance.
+     */
+    public @NonNull CompositorController getCompositorController() {
+        ThreadUtils.assertOnUiThread();
+
+        if (mController == null) {
+            mController = new CompositorController(this);
+            if (mCompositorReady) {
+                mController.onCompositorReady();
+            }
+        }
+        return mController;
+    }
+
     /**
      * Get a matrix for transforming from client coordinates to screen coordinates. The
      * client coordinates are in CSS pixels and are relative to the viewport origin; their
@@ -354,6 +364,10 @@ public class LayerSession {
             ThreadUtils.assertOnUiThread();
         }
 
+        if (mController != null) {
+            mController.onCompositorDetached();
+        }
+
         mAttachedCompositor = false;
         mCalledCreateCompositor = false;
         mCompositorReady = false;
@@ -376,24 +390,21 @@ public class LayerSession {
                     @Override
                     public void run() {
                         onCompositorReady();
-                        if (mCompositor.layerView != null) {
-                            mCompositor.layerView.onCompositorReady();
-                        }
                     }
                 });
                 break;
             }
 
             case FIRST_PAINT: {
-                if (mCompositor.layerView != null) {
-                    mCompositor.layerView.setSurfaceBackgroundColor(Color.TRANSPARENT);
+                if (mController != null) {
+                    mController.onFirstPaint();
                 }
                 break;
             }
 
             case LAYERS_UPDATED: {
-                if (mCompositor.layerView != null) {
-                    mCompositor.layerView.notifyDrawListeners();
+                if (mController != null) {
+                    mController.notifyDrawCallbacks();
                 }
                 break;
             }
@@ -419,6 +430,12 @@ public class LayerSession {
         }
     }
 
+    /* package */ void recvScreenPixels(int width, int height, int[] pixels) {
+        if (mController != null) {
+            mController.recvScreenPixels(width, height, pixels);
+        }
+    }
+
     /* package */ boolean isCompositorReady() {
         return mCompositorReady;
     }
@@ -430,6 +447,10 @@ public class LayerSession {
 
         mCompositorReady = true;
 
+        if (mController != null) {
+            mController.onCompositorReady();
+        }
+
         if (mSurface != null) {
             // If we have a valid surface, resume the
             // compositor now that the compositor is ready.

From 5477ffbc1910cdfaa6f7abdd5d0b7eb22dad6e7b Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Mon, 4 Dec 2017 11:50:20 -0500
Subject: [PATCH 209/219] Bug 1416330 - 2. Stop using LayerView in GeckoView;
 r=rbarker

Implement the setSurfaceBackgroundColor functionality in a new
coverUntilFirstPaint method. Because we no longer rely on any LayerView
functionality, GeckoView now inherits directly from FrameLayout.

MozReview-Commit-ID: 3xgWsgk64GM

--HG--
extra : rebase_source : 1185e40456ffce6c40676230e6f921dd0f3cbc3e
---
 .../java/org/mozilla/gecko/GeckoView.java     | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoView.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoView.java
index e8a7b077c56f..c834d404ca39 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoView.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoView.java
@@ -7,8 +7,8 @@
 package org.mozilla.gecko;
 
 import org.mozilla.gecko.gfx.DynamicToolbarAnimator;
+import org.mozilla.gecko.gfx.NativePanZoomController;
 import org.mozilla.gecko.gfx.GeckoDisplay;
-import org.mozilla.gecko.gfx.LayerView;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -32,8 +32,9 @@ import android.view.accessibility.AccessibilityManager;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.FrameLayout;
 
-public class GeckoView extends LayerView {
+public class GeckoView extends FrameLayout {
     private static final String LOGTAG = "GeckoView";
     private static final boolean DEBUG = false;
 
@@ -178,10 +179,16 @@ public class GeckoView extends LayerView {
         mSurfaceView.getHolder().addCallback(mDisplay);
     }
 
-    @Override
-    public void setSurfaceBackgroundColor(final int newColor) {
+    /**
+     * Set a color to cover the display surface while a document is being shown. The color
+     * is automatically cleared once the new document starts painting. Set to
+     * Color.TRANSPARENT to undo the cover.
+     *
+     * @param color Cover color.
+     */
+    public void coverUntilFirstPaint(final int color) {
         if (mSurfaceView != null) {
-            mSurfaceView.setBackgroundColor(newColor);
+            mSurfaceView.setBackgroundColor(color);
         }
     }
 
@@ -219,6 +226,13 @@ public class GeckoView extends LayerView {
             session.getPanZoomController().setScrollFactor(0.075f * metrics.densityDpi);
         }
 
+        session.getCompositorController().setFirstPaintCallback(new Runnable() {
+            @Override
+            public void run() {
+                coverUntilFirstPaint(Color.TRANSPARENT);
+            }
+        });
+
         mSession = session;
     }
 
@@ -234,6 +248,10 @@ public class GeckoView extends LayerView {
         return mSession.getSettings();
     }
 
+    public NativePanZoomController getPanZoomController() {
+        return mSession.getPanZoomController();
+    }
+
     public DynamicToolbarAnimator getDynamicToolbarAnimator() {
         return mSession.getDynamicToolbarAnimator();
     }
@@ -248,7 +266,6 @@ public class GeckoView extends LayerView {
             mSession.openWindow(getContext().getApplicationContext());
         }
         mSession.attachView(this);
-        attachCompositor(mSession);
 
         super.onAttachedToWindow();
     }
@@ -410,12 +427,6 @@ public class GeckoView extends LayerView {
                 mInputConnectionListener.onKeyMultiple(keyCode, repeatCount, event);
     }
 
-    @Override
-    public boolean isIMEEnabled() {
-        return mInputConnectionListener != null &&
-                mInputConnectionListener.isIMEEnabled();
-    }
-
     @Override
     public void dispatchDraw(final Canvas canvas) {
         super.dispatchDraw(canvas);

From 203776418e9aebd53c8b4929bdc1edbf60d66e81 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Mon, 4 Dec 2017 11:50:20 -0500
Subject: [PATCH 210/219] Bug 1416330 - 3. Update Fennec code to not use
 LayerView; r=rbarker

Use GeckoSession/LayerSession or GeckoView in Fennec code instead of
using LayerView.

MozReview-Commit-ID: Iod7XsqKy1e

--HG--
extra : rebase_source : 5917540422698f5526ca373f17c4358a712cdcef
---
 .../base/java/org/mozilla/gecko/GeckoApp.java | 20 +++++--------------
 .../gecko/PresentationMediaPlayerManager.java |  8 ++++----
 .../base/java/org/mozilla/gecko/Tabs.java     | 20 +++++++++----------
 .../org/mozilla/gecko/prompts/Prompt.java     |  1 -
 .../org/mozilla/gecko/gfx/LayerSession.java   |  6 ++++++
 widget/android/GeneratedJNIWrappers.cpp       |  8 ++++++++
 widget/android/nsWindow.cpp                   | 14 ++++++-------
 7 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
index dff7d5c833e6..376a864f7ec7 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -10,8 +10,6 @@ import org.mozilla.gecko.GeckoProfileDirectories.NoMozillaDirectoryException;
 import org.mozilla.gecko.annotation.RobocopTarget;
 import org.mozilla.gecko.annotation.WrapForJNI;
 import org.mozilla.gecko.db.BrowserDB;
-import org.mozilla.gecko.gfx.FullScreenState;
-import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.health.HealthRecorder;
 import org.mozilla.gecko.health.SessionInformation;
 import org.mozilla.gecko.health.StubbedHealthRecorder;
@@ -327,6 +325,7 @@ public abstract class GeckoApp extends GeckoActivity
     private boolean mRestartOnShutdown;
 
     private boolean mWasFirstTabShownAfterActivityUnhidden;
+    private boolean mIsFullscreen;
 
     abstract public int getLayout();
 
@@ -527,7 +526,7 @@ public abstract class GeckoApp extends GeckoActivity
     @Override
     public boolean onMenuOpened(int featureId, Menu menu) {
         // exit full-screen mode whenever the menu is opened
-        if (mLayerView != null && mLayerView.isFullScreen()) {
+        if (mIsFullscreen) {
             EventDispatcher.getInstance().dispatch("FullScreen:Exit", null);
         }
 
@@ -684,19 +683,10 @@ public abstract class GeckoApp extends GeckoActivity
             DevToolsAuthHelper.scan(this, callback);
 
         } else if ("DOMFullScreen:Start".equals(event)) {
-            // Local ref to layerView for thread safety
-            LayerView layerView = mLayerView;
-            if (layerView != null) {
-                layerView.setFullScreenState(message.getBoolean("rootElement")
-                        ? FullScreenState.ROOT_ELEMENT : FullScreenState.NON_ROOT_ELEMENT);
-            }
+            mIsFullscreen = true;
 
         } else if ("DOMFullScreen:Stop".equals(event)) {
-            // Local ref to layerView for thread safety
-            LayerView layerView = mLayerView;
-            if (layerView != null) {
-                layerView.setFullScreenState(FullScreenState.NONE);
-            }
+            mIsFullscreen = false;
 
         } else if ("Locale:Set".equals(event)) {
             setLocale(message.getString("locale"));
@@ -2247,7 +2237,7 @@ public abstract class GeckoApp extends GeckoActivity
             return;
         }
 
-        if (mLayerView != null && mLayerView.isFullScreen()) {
+        if (mIsFullscreen) {
             EventDispatcher.getInstance().dispatch("FullScreen:Exit", null);
             return;
         }
diff --git a/mobile/android/base/java/org/mozilla/gecko/PresentationMediaPlayerManager.java b/mobile/android/base/java/org/mozilla/gecko/PresentationMediaPlayerManager.java
index e44096489b82..46be429cd0b9 100644
--- a/mobile/android/base/java/org/mozilla/gecko/PresentationMediaPlayerManager.java
+++ b/mobile/android/base/java/org/mozilla/gecko/PresentationMediaPlayerManager.java
@@ -86,10 +86,10 @@ public class PresentationMediaPlayerManager extends MediaPlayerManager {
     }
 
     @WrapForJNI(calledFrom = "ui")
-    /* protected */ static native void invalidateAndScheduleComposite(GeckoView geckoView);
+    /* protected */ static native void invalidateAndScheduleComposite(GeckoSession session);
 
     @WrapForJNI(calledFrom = "ui")
-    /* protected */ static native void addPresentationSurface(GeckoView geckoView, Surface surface);
+    /* protected */ static native void addPresentationSurface(GeckoSession session, Surface surface);
 
     @WrapForJNI(calledFrom = "ui")
     /* protected */ static native void removePresentationSurface();
@@ -128,14 +128,14 @@ public class PresentationMediaPlayerManager extends MediaPlayerManager {
                                    int height) {
             // Surface changed so force a composite
             if (GeckoThread.isStateAtLeast(GeckoThread.State.PROFILE_READY)) {
-                invalidateAndScheduleComposite(mGeckoView);
+                invalidateAndScheduleComposite(mGeckoView.getSession());
             }
         }
 
         @Override
         public void surfaceCreated(SurfaceHolder holder) {
             if (GeckoThread.isStateAtLeast(GeckoThread.State.PROFILE_READY)) {
-                addPresentationSurface(mGeckoView, holder.getSurface());
+                addPresentationSurface(mGeckoView.getSession(), holder.getSurface());
             }
         }
 
diff --git a/mobile/android/base/java/org/mozilla/gecko/Tabs.java b/mobile/android/base/java/org/mozilla/gecko/Tabs.java
index a0fc0c590a31..d167c0c3b89e 100644
--- a/mobile/android/base/java/org/mozilla/gecko/Tabs.java
+++ b/mobile/android/base/java/org/mozilla/gecko/Tabs.java
@@ -19,7 +19,6 @@ import android.support.annotation.Nullable;
 import org.mozilla.gecko.annotation.RobocopTarget;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.distribution.PartnerBrowserCustomizationsClient;
-import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.mozglue.SafeIntent;
 import org.mozilla.gecko.notifications.WhatsNewReceiver;
 import org.mozilla.gecko.preferences.GeckoPreferences;
@@ -97,7 +96,7 @@ public class Tabs implements BundleEventListener {
 
     private Context mAppContext;
     private EventDispatcher mEventDispatcher;
-    private LayerView mLayerView;
+    private GeckoView mGeckoView;
     private ContentObserver mBookmarksContentObserver;
     private PersistTabsRunnable mPersistTabsRunnable;
     private int mPrivateClearColor;
@@ -178,12 +177,13 @@ public class Tabs implements BundleEventListener {
         mPrivateClearColor = Color.RED;
     }
 
-    public synchronized void attachToContext(Context context, LayerView layerView, EventDispatcher eventDispatcher) {
+    public synchronized void attachToContext(Context context, GeckoView geckoView,
+                                             EventDispatcher eventDispatcher) {
         final Context appContext = context.getApplicationContext();
 
         mAppContext = appContext;
         mEventDispatcher = eventDispatcher;
-        mLayerView = layerView;
+        mGeckoView = geckoView;
         mPrivateClearColor = ContextCompat.getColor(context, R.color.tabs_tray_grey_pressed);
         mAccountManager = AccountManager.get(appContext);
 
@@ -205,7 +205,7 @@ public class Tabs implements BundleEventListener {
     }
 
     public void detachFromContext() {
-        mLayerView = null;
+        mGeckoView = null;
     }
 
     /**
@@ -332,10 +332,6 @@ public class Tabs implements BundleEventListener {
 
         notifyListeners(tab, TabEvents.SELECTED);
 
-        if (mLayerView != null) {
-            mLayerView.setClearColor(getTabColor(tab));
-        }
-
         if (oldTab != null) {
             notifyListeners(oldTab, TabEvents.UNSELECTED);
         }
@@ -815,8 +811,10 @@ public class Tabs implements BundleEventListener {
             // are also selected/unselected, so it would be redundant to also listen
             // for ADDED/CLOSED events.
             case SELECTED:
-                if (mLayerView != null) {
-                    mLayerView.setSurfaceBackgroundColor(getTabColor(tab));
+                if (mGeckoView != null) {
+                    final int color = getTabColor(tab);
+                    mGeckoView.getSession().getCompositorController().setClearColor(color);
+                    mGeckoView.coverUntilFirstPaint(color);
                 }
                 queuePersistAllTabs();
             case UNSELECTED:
diff --git a/mobile/android/base/java/org/mozilla/gecko/prompts/Prompt.java b/mobile/android/base/java/org/mozilla/gecko/prompts/Prompt.java
index 74ec6b79ebd9..9b61fd0c9f4d 100644
--- a/mobile/android/base/java/org/mozilla/gecko/prompts/Prompt.java
+++ b/mobile/android/base/java/org/mozilla/gecko/prompts/Prompt.java
@@ -7,7 +7,6 @@ package org.mozilla.gecko.prompts;
 
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.R;
-import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.util.GeckoBundle;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.Tab;
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java
index ed134d69265c..70d1ca6a4685 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java
@@ -341,6 +341,12 @@ public class LayerSession {
         rect.set(0, mClientTop - mTop, mWidth, mHeight);
     }
 
+    @WrapForJNI(stubName = "GetCompositor", calledFrom = "ui")
+    private Object getCompositorFromNative() {
+        // Only used by native code.
+        return mCompositorReady ? mCompositor : null;
+    }
+
     /* package */ void onCompositorAttached() {
         if (DEBUG) {
             ThreadUtils.assertOnUiThread();
diff --git a/widget/android/GeneratedJNIWrappers.cpp b/widget/android/GeneratedJNIWrappers.cpp
index d5662a01f9b4..d3014aa65272 100644
--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -1256,6 +1256,14 @@ auto GeckoSurfaceTexture::UpdateTexImage() const -> void
 const char LayerSession::name[] =
         "org/mozilla/gecko/gfx/LayerSession";
 
+constexpr char LayerSession::GetCompositor_t::name[];
+constexpr char LayerSession::GetCompositor_t::signature[];
+
+auto LayerSession::GetCompositor() const -> mozilla::jni::Object::LocalRef
+{
+    return mozilla::jni::Method<GetCompositor_t>::Call(LayerSession::mCtx, nullptr);
+}
+
 const char LayerSession::Compositor::name[] =
         "org/mozilla/gecko/gfx/LayerSession$Compositor";
 
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index 67613b762efe..04ea803d8b34 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -1151,11 +1151,11 @@ class nsWindow::PMPMSupport final
 {
     PMPMSupport() = delete;
 
-    static LayerViewSupport* GetLayerViewSupport(jni::Object::Param aView)
+    static LayerViewSupport* GetLayerViewSupport(jni::Object::Param aSession)
     {
-        const auto& layerView = LayerView::Ref::From(aView);
+        const auto& session = LayerSession::Ref::From(aSession);
 
-        LayerSession::Compositor::LocalRef compositor = layerView->GetCompositor();
+        LayerSession::Compositor::LocalRef compositor = session->GetCompositor();
         if (!compositor) {
             return nullptr;
         }
@@ -1172,21 +1172,21 @@ public:
     static ANativeWindow* sWindow;
     static EGLSurface sSurface;
 
-    static void InvalidateAndScheduleComposite(jni::Object::Param aView)
+    static void InvalidateAndScheduleComposite(jni::Object::Param aSession)
     {
-        LayerViewSupport* const lvs = GetLayerViewSupport(aView);
+        LayerViewSupport* const lvs = GetLayerViewSupport(aSession);
         if (lvs) {
             lvs->SyncInvalidateAndScheduleComposite();
         }
     }
 
     static void AddPresentationSurface(const jni::Class::LocalRef& aCls,
-                                       jni::Object::Param aView,
+                                       jni::Object::Param aSession,
                                        jni::Object::Param aSurface)
     {
         RemovePresentationSurface();
 
-        LayerViewSupport* const lvs = GetLayerViewSupport(aView);
+        LayerViewSupport* const lvs = GetLayerViewSupport(aSession);
         if (!lvs) {
             return;
         }

From be7056007ee153c648ebc550d4dd8e7617053006 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Mon, 4 Dec 2017 11:50:20 -0500
Subject: [PATCH 211/219] Bug 1416330 - 4. Use CompositorController in Robocop;
 r=gbrown

Use the new CompositorController to access draw callbacks and pixel
getter. These methods now require calling on the UI thread, so the code
in Robocop now explicitly post runnables to the UI thread. Prior to
this, we were implicitly posting to the UI thread anyways, so the end
result is the same as before.

MozReview-Commit-ID: 7Mkjdc9hUNr

--HG--
extra : rebase_source : 821f72573200021604cdacf158d0989d1ecabf32
---
 .../mozilla/gecko/FennecNativeActions.java    | 27 ++++++++++++-------
 .../org/mozilla/gecko/FennecNativeDriver.java | 24 ++++++++++-------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/FennecNativeActions.java b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/FennecNativeActions.java
index 86405acc9855..00dcdf9d6d32 100644
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/FennecNativeActions.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/FennecNativeActions.java
@@ -10,8 +10,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
 import org.mozilla.gecko.FennecNativeDriver.LogLevel;
-import org.mozilla.gecko.gfx.LayerView;
-import org.mozilla.gecko.gfx.LayerView.DrawListener;
+import org.mozilla.gecko.GeckoView;
 import org.mozilla.gecko.mozglue.GeckoLoader;
 import org.mozilla.gecko.sqlite.SQLiteBridge;
 import org.mozilla.gecko.util.BundleEventListener;
@@ -351,21 +350,26 @@ public class FennecNativeActions implements Actions {
         private boolean mPaintDone;
         private boolean mListening;
 
-        private final LayerView mLayerView;
-        private final DrawListener mDrawListener;
+        private final GeckoView mGeckoView;
+        private final Runnable mDrawCallback;
 
         PaintExpecter() {
             final PaintExpecter expecter = this;
-            mLayerView = (LayerView) mSolo.getView(R.id.layer_view);
-            mDrawListener = new DrawListener() {
+            mGeckoView = (GeckoView) mSolo.getView(R.id.layer_view);
+            mDrawCallback = new Runnable() {
                 @Override
-                public void drawFinished() {
+                public void run() {
                     FennecNativeDriver.log(FennecNativeDriver.LogLevel.DEBUG,
                             "Received drawFinished notification");
                     expecter.notifyOfEvent();
                 }
             };
-            mLayerView.addDrawListener(mDrawListener);
+            mGeckoView.post(new Runnable() {
+                @Override
+                public void run() {
+                    mGeckoView.getSession().getCompositorController().addDrawCallback(mDrawCallback);
+                }
+            });
             mListening = true;
         }
 
@@ -476,7 +480,12 @@ public class FennecNativeActions implements Actions {
 
             FennecNativeDriver.log(LogLevel.INFO,
                     "PaintExpecter: no longer listening for events");
-            mLayerView.removeDrawListener(mDrawListener);
+            mGeckoView.post(new Runnable() {
+                @Override
+                public void run() {
+                    mGeckoView.getSession().getCompositorController().removeDrawCallback(mDrawCallback);
+                }
+            });
             mListening = false;
         }
     }
diff --git a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/FennecNativeDriver.java b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/FennecNativeDriver.java
index 43893813c9e3..0e3b8e336d5c 100644
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/FennecNativeDriver.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/FennecNativeDriver.java
@@ -21,7 +21,8 @@ import java.lang.StringBuffer;
 import java.lang.Math;
 
 import org.mozilla.gecko.GeckoThread;
-import org.mozilla.gecko.gfx.LayerView;
+import org.mozilla.gecko.GeckoView;
+import org.mozilla.gecko.gfx.CompositorController;
 import org.mozilla.gecko.gfx.PanningPerfAPI;
 import org.mozilla.gecko.util.BundleEventListener;
 import org.mozilla.gecko.util.EventCallback;
@@ -33,7 +34,7 @@ import android.view.View;
 
 import com.robotium.solo.Solo;
 
-public class FennecNativeDriver implements Driver, LayerView.GetPixelsResult {
+public class FennecNativeDriver implements Driver, CompositorController.GetPixelsCallback {
     private static final int FRAME_TIME_THRESHOLD = 25;     // allow 25ms per frame (40fps)
 
     private final Activity mActivity;
@@ -177,16 +178,16 @@ public class FennecNativeDriver implements Driver, LayerView.GetPixelsResult {
         return total * 100.0f;
     }
 
-    private LayerView getSurfaceView() {
-        final LayerView layerView = mSolo.getView(LayerView.class, 0);
+    private GeckoView getSurfaceView() {
+        final GeckoView geckoView = mSolo.getView(GeckoView.class, 0);
 
-        if (layerView == null) {
-            log(LogLevel.WARN, "getSurfaceView could not find LayerView");
+        if (geckoView == null) {
+            log(LogLevel.WARN, "getSurfaceView could not find GeckoView");
             for (final View v : mSolo.getViews()) {
                 log(LogLevel.WARN, "  View: " + v);
             }
         }
-        return layerView;
+        return geckoView;
     }
 
     private volatile boolean mGotPixelsResult;
@@ -250,12 +251,17 @@ public class FennecNativeDriver implements Driver, LayerView.GetPixelsResult {
 
     @Override
     public PaintedSurface getPaintedSurface() {
-        final LayerView view = getSurfaceView();
+        final GeckoView view = getSurfaceView();
         if (view == null) {
             return null;
         }
 
-        view.getPixels(this);
+        view.post(new Runnable() {
+            @Override
+            public void run() {
+                view.getSession().getCompositorController().getPixels(FennecNativeDriver.this);
+            }
+        });
 
         synchronized (this) {
             while (!mGotPixelsResult) {

From d9c1816b684cdaa9dc356f45e46e675825e5a09d Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Mon, 4 Dec 2017 11:50:20 -0500
Subject: [PATCH 212/219] Bug 1416330 - 5. Remove LayerView; r=rbarker

Remove LayerView now that it's no longer used. FullScreenState is
obsolete as well and is removed.

MozReview-Commit-ID: Jt7OMAoarOJ

--HG--
extra : rebase_source : da9285999fe093c41ea6d7693cf9255c0db1d688
---
 mobile/android/base/moz.build                 |   2 -
 .../mozilla/gecko/gfx/FullScreenState.java    |  12 -
 .../java/org/mozilla/gecko/gfx/LayerView.java | 220 ------------------
 3 files changed, 234 deletions(-)
 delete mode 100644 mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/FullScreenState.java
 delete mode 100644 mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerView.java

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 1f0345e51870..864ef4e10893 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -397,13 +397,11 @@ gvjar.sources += [geckoview_source_dir + 'java/org/mozilla/gecko/' + x
     'gfx/CompositorController.java',
     'gfx/DynamicToolbarAnimator.java',
     'gfx/FloatSize.java',
-    'gfx/FullScreenState.java',
     'gfx/GeckoDisplay.java',
     'gfx/GeckoSurface.java',
     'gfx/GeckoSurfaceTexture.java',
     'gfx/IntSize.java',
     'gfx/LayerSession.java',
-    'gfx/LayerView.java',
     'gfx/NativePanZoomController.java',
     'gfx/OverscrollEdgeEffect.java',
     'gfx/PanningPerfAPI.java',
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/FullScreenState.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/FullScreenState.java
deleted file mode 100644
index 9574bbe0e562..000000000000
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/FullScreenState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko.gfx;
-
-public enum FullScreenState {
-    NONE,
-    ROOT_ELEMENT,
-    NON_ROOT_ELEMENT
-}
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerView.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerView.java
deleted file mode 100644
index f3259b109e66..000000000000
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerView.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko.gfx;
-
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-
-import org.mozilla.gecko.AndroidGamepadManager;
-import org.mozilla.gecko.annotation.RobocopTarget;
-import org.mozilla.gecko.annotation.WrapForJNI;
-import org.mozilla.gecko.GeckoThread;
-import org.mozilla.gecko.mozglue.JNIObject;
-import org.mozilla.gecko.util.ThreadUtils;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.Point;
-import android.graphics.PointF;
-import android.graphics.Rect;
-import android.graphics.SurfaceTexture;
-import android.support.v4.util.SimpleArrayMap;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.TextureView;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.InputDevice;
-import android.widget.FrameLayout;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A view rendered by the layer compositor.
- */
-public class LayerView extends FrameLayout {
-    private static final String LOGTAG = "GeckoLayerView";
-
-    private FullScreenState mFullScreenState;
-
-    private int mDefaultClearColor = Color.WHITE;
-    /* package */ GetPixelsResult mGetPixelsResult;
-    private final List<DrawListener> mDrawListeners;
-
-    private void postCompositorMessage(final int message) {
-        ThreadUtils.postToUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mCompositor.sendToolbarAnimatorMessage(message);
-            }
-        });
-    }
-
-    /* package */ boolean isCompositorReady() {
-        ThreadUtils.assertOnUiThread();
-        return mCompositor != null && mCompositor.isReady();
-    }
-
-    /* package */ void onCompositorReady() {
-        mCompositor.setDefaultClearColor(mDefaultClearColor);
-        mCompositor.enableLayerUpdateNotifications(!mDrawListeners.isEmpty());
-    }
-
-    /* protected */ LayerSession mSession;
-    private LayerSession.Compositor mCompositor;
-
-    public LayerView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        mFullScreenState = FullScreenState.NONE;
-
-        mDrawListeners = new ArrayList<DrawListener>();
-    }
-
-    public LayerView(Context context) {
-        this(context, null);
-    }
-
-    private static Point getEventRadius(MotionEvent event) {
-        return new Point((int)event.getToolMajor() / 2,
-                         (int)event.getToolMinor() / 2);
-    }
-
-    public void setSurfaceBackgroundColor(int newColor) {
-    }
-
-    public interface GetPixelsResult {
-        public void onPixelsResult(int width, int height, IntBuffer pixels);
-    }
-
-    @RobocopTarget
-    public void getPixels(final GetPixelsResult getPixelsResult) {
-        if (!ThreadUtils.isOnUiThread()) {
-            ThreadUtils.postToUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    getPixels(getPixelsResult);
-                }
-            });
-            return;
-        }
-
-        if (isCompositorReady()) {
-            mGetPixelsResult = getPixelsResult;
-            mCompositor.requestScreenPixels();
-        } else {
-            getPixelsResult.onPixelsResult(0, 0, null);
-        }
-    }
-
-    /* package */ void recvScreenPixels(int width, int height, int[] pixels) {
-        if (mGetPixelsResult != null) {
-            mGetPixelsResult.onPixelsResult(width, height, IntBuffer.wrap(pixels));
-            mGetPixelsResult = null;
-        }
-    }
-
-    protected void attachCompositor(final LayerSession session) {
-        mSession = session;
-        mCompositor = session.mCompositor;
-        mCompositor.layerView = this;
-    }
-
-    @WrapForJNI(calledFrom = "ui")
-    private Object getCompositor() {
-        return isCompositorReady() ? mCompositor : null;
-    }
-
-    @RobocopTarget
-    public void addDrawListener(final DrawListener listener) {
-        if (!ThreadUtils.isOnUiThread()) {
-            ThreadUtils.postToUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    addDrawListener(listener);
-                }
-            });
-            return;
-        }
-
-        boolean wasEmpty = mDrawListeners.isEmpty();
-        mDrawListeners.add(listener);
-        if (isCompositorReady() && wasEmpty) {
-            mCompositor.enableLayerUpdateNotifications(true);
-        }
-    }
-
-    @RobocopTarget
-    public void removeDrawListener(final DrawListener listener) {
-        if (!ThreadUtils.isOnUiThread()) {
-            ThreadUtils.postToUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    removeDrawListener(listener);
-                }
-            });
-            return;
-        }
-
-        boolean notEmpty = mDrawListeners.isEmpty();
-        mDrawListeners.remove(listener);
-        if (isCompositorReady() && notEmpty && mDrawListeners.isEmpty()) {
-            mCompositor.enableLayerUpdateNotifications(false);
-        }
-    }
-
-    /* package */ void clearDrawListeners() {
-        mDrawListeners.clear();
-    }
-
-    /* package */ void notifyDrawListeners() {
-        for (final DrawListener listener : mDrawListeners) {
-            listener.drawFinished();
-        }
-    }
-
-    @RobocopTarget
-    public static interface DrawListener {
-        public void drawFinished();
-    }
-
-    public void setFullScreenState(FullScreenState state) {
-        mFullScreenState = state;
-    }
-
-    public boolean isFullScreen() {
-        return mFullScreenState != FullScreenState.NONE;
-    }
-
-    public void setClearColor(final int color) {
-        if (!ThreadUtils.isOnUiThread()) {
-            ThreadUtils.postToUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    setClearColor(color);
-                }
-            });
-            return;
-        }
-
-        mDefaultClearColor = color;
-        if (isCompositorReady()) {
-            mCompositor.setDefaultClearColor(mDefaultClearColor);
-        }
-    }
-
-    public boolean isIMEEnabled() {
-        return false;
-    }
-}

From e696707755de23bb602b0d45748887f7258aa836 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Mon, 4 Dec 2017 11:50:21 -0500
Subject: [PATCH 213/219] Bug 1416330 - 6. Update bindings; r=jchen

MozReview-Commit-ID: FjpC2Tlu2OF

--HG--
extra : rebase_source : 91d793ef49a663c299416a465d2e30d65ae71306
---
 widget/android/GeneratedJNIWrappers.cpp   | 11 -----
 widget/android/GeneratedJNIWrappers.h     | 52 +++++++++--------------
 widget/android/fennec/FennecJNIWrappers.h |  4 +-
 3 files changed, 22 insertions(+), 45 deletions(-)

diff --git a/widget/android/GeneratedJNIWrappers.cpp b/widget/android/GeneratedJNIWrappers.cpp
index d3014aa65272..313de1e67c40 100644
--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -1370,17 +1370,6 @@ auto LayerSession::Compositor::UpdateRootFrameMetrics(float a0, float a1, float
     return mozilla::jni::Method<UpdateRootFrameMetrics_t>::Call(Compositor::mCtx, nullptr, a0, a1, a2);
 }
 
-const char LayerView::name[] =
-        "org/mozilla/gecko/gfx/LayerView";
-
-constexpr char LayerView::GetCompositor_t::name[];
-constexpr char LayerView::GetCompositor_t::signature[];
-
-auto LayerView::GetCompositor() const -> mozilla::jni::Object::LocalRef
-{
-    return mozilla::jni::Method<GetCompositor_t>::Call(LayerView::mCtx, nullptr);
-}
-
 const char NativePanZoomController::name[] =
         "org/mozilla/gecko/gfx/NativePanZoomController";
 
diff --git a/widget/android/GeneratedJNIWrappers.h b/widget/android/GeneratedJNIWrappers.h
index 899eb789dd1e..44088c1ffd21 100644
--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -3802,8 +3802,27 @@ public:
 
     class Compositor;
 
+    struct GetCompositor_t {
+        typedef LayerSession Owner;
+        typedef mozilla::jni::Object::LocalRef ReturnType;
+        typedef mozilla::jni::Object::Param SetterType;
+        typedef mozilla::jni::Args<> Args;
+        static constexpr char name[] = "getCompositorFromNative";
+        static constexpr char signature[] =
+                "()Ljava/lang/Object;";
+        static const bool isStatic = false;
+        static const mozilla::jni::ExceptionMode exceptionMode =
+                mozilla::jni::ExceptionMode::ABORT;
+        static const mozilla::jni::CallingThread callingThread =
+                mozilla::jni::CallingThread::UI;
+        static const mozilla::jni::DispatchTarget dispatchTarget =
+                mozilla::jni::DispatchTarget::CURRENT;
+    };
+
+    auto GetCompositor() const -> mozilla::jni::Object::LocalRef;
+
     static const mozilla::jni::CallingThread callingThread =
-            mozilla::jni::CallingThread::ANY;
+            mozilla::jni::CallingThread::UI;
 
 };
 
@@ -4225,37 +4244,6 @@ public:
     template<class Impl> class Natives;
 };
 
-class LayerView : public mozilla::jni::ObjectBase<LayerView>
-{
-public:
-    static const char name[];
-
-    explicit LayerView(const Context& ctx) : ObjectBase<LayerView>(ctx) {}
-
-    struct GetCompositor_t {
-        typedef LayerView Owner;
-        typedef mozilla::jni::Object::LocalRef ReturnType;
-        typedef mozilla::jni::Object::Param SetterType;
-        typedef mozilla::jni::Args<> Args;
-        static constexpr char name[] = "getCompositor";
-        static constexpr char signature[] =
-                "()Ljava/lang/Object;";
-        static const bool isStatic = false;
-        static const mozilla::jni::ExceptionMode exceptionMode =
-                mozilla::jni::ExceptionMode::ABORT;
-        static const mozilla::jni::CallingThread callingThread =
-                mozilla::jni::CallingThread::UI;
-        static const mozilla::jni::DispatchTarget dispatchTarget =
-                mozilla::jni::DispatchTarget::CURRENT;
-    };
-
-    auto GetCompositor() const -> mozilla::jni::Object::LocalRef;
-
-    static const mozilla::jni::CallingThread callingThread =
-            mozilla::jni::CallingThread::UI;
-
-};
-
 class NativePanZoomController : public mozilla::jni::ObjectBase<NativePanZoomController>
 {
 public:
diff --git a/widget/android/fennec/FennecJNIWrappers.h b/widget/android/fennec/FennecJNIWrappers.h
index 4d7a958e53cb..22f545c02847 100644
--- a/widget/android/fennec/FennecJNIWrappers.h
+++ b/widget/android/fennec/FennecJNIWrappers.h
@@ -534,7 +534,7 @@ public:
                 mozilla::jni::Object::Param> Args;
         static constexpr char name[] = "addPresentationSurface";
         static constexpr char signature[] =
-                "(Lorg/mozilla/gecko/GeckoView;Landroid/view/Surface;)V";
+                "(Lorg/mozilla/gecko/GeckoSession;Landroid/view/Surface;)V";
         static const bool isStatic = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
@@ -552,7 +552,7 @@ public:
                 mozilla::jni::Object::Param> Args;
         static constexpr char name[] = "invalidateAndScheduleComposite";
         static constexpr char signature[] =
-                "(Lorg/mozilla/gecko/GeckoView;)V";
+                "(Lorg/mozilla/gecko/GeckoSession;)V";
         static const bool isStatic = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;

From 4e5c9eebce4a8c1d0f85a8e249281cb848ac86de Mon Sep 17 00:00:00 2001
From: Christian Holler <choller@mozilla.com>
Date: Fri, 1 Dec 2017 12:43:09 +0100
Subject: [PATCH 214/219] Bug 1422269 - Allow asan-reporter to report crashed
 tabs immediately. r=mconley

MozReview-Commit-ID: BsO3LID1J9s

--HG--
extra : rebase_source : 6c12ad3b416dce4f134c5fde5736efa4a894a0a6
---
 browser/extensions/asan-reporter/bootstrap.js | 25 +++++++++++++++++++
 .../asan-reporter/clone_asan_reporter.sh      |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/browser/extensions/asan-reporter/bootstrap.js b/browser/extensions/asan-reporter/bootstrap.js
index b30af38f1225..78682a8901a9 100644
--- a/browser/extensions/asan-reporter/bootstrap.js
+++ b/browser/extensions/asan-reporter/bootstrap.js
@@ -31,12 +31,37 @@ logger.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter()));
 logger.addAppender(new Log.DumpAppender(new Log.BasicFormatter()));
 logger.level = Preferences.get(PREF_LOG_LEVEL, Log.Level.Info);
 
+this.TabCrashObserver = {
+  init() {
+    if (this.initialized)
+      return;
+    this.initialized = true;
+
+    Services.obs.addObserver(this, "ipc:content-shutdown");
+  },
+
+  observe(aSubject, aTopic, aData) {
+    if (aTopic == "ipc:content-shutdown") {
+        aSubject.QueryInterface(Ci.nsIPropertyBag2);
+        if (!aSubject.get("abnormal")) {
+          return;
+        }
+        processDirectory("/tmp");
+    }
+  },
+};
+
 function install(aData, aReason) {}
 
 function uninstall(aData, aReason) {}
 
 function startup(aData, aReason) {
   logger.info("Starting up...");
+
+  // Install a handler to observe tab crashes, so we can report those right
+  // after they happen instead of relying on the user to restart the browser.
+  TabCrashObserver.init();
+
   // We could use OS.Constants.Path.tmpDir here, but unfortunately there is
   // no way in C++ to get the same value *prior* to xpcom initialization.
   // Since ASan needs its options, including the "log_path" option already
diff --git a/browser/extensions/asan-reporter/clone_asan_reporter.sh b/browser/extensions/asan-reporter/clone_asan_reporter.sh
index 5faffd1b743c..f34e61ef3fd8 100755
--- a/browser/extensions/asan-reporter/clone_asan_reporter.sh
+++ b/browser/extensions/asan-reporter/clone_asan_reporter.sh
@@ -2,7 +2,7 @@
 
 mkdir tmp/
 git clone --no-checkout --depth 1 https://github.com/choller/firefox-asan-reporter tmp/
-(cd tmp && git reset --hard e1a5d7dc5a2706af72bac0f11eab34b3afdb48ba)
+(cd tmp && git reset --hard d508c6e3f5df752a9a7a2d6f1e4e7261ec2290e7)
 
 # Copy only whitelisted files
 cp tmp/bootstrap.js tmp/install.rdf.in tmp/moz.build tmp/README.md tmp/LICENSE .

From bd575904fee7440b21a1a34fc2a9d89ebaca0fda Mon Sep 17 00:00:00 2001
From: Michael Ratcliffe <mratcliffe@mozilla.com>
Date: Fri, 1 Dec 2017 10:23:27 +0000
Subject: [PATCH 215/219] Bug 1422265 - Remove react-addons-shallow-compare
 r=Honza

MozReview-Commit-ID: 8avniQlO6NV

--HG--
extra : rebase_source : e9727d59d0f54bfc9a23f4ea46de71deadae924c
---
 devtools/client/shared/vendor/moz.build                  | 1 -
 .../client/shared/vendor/react-addons-shallow-compare.js | 9 ---------
 2 files changed, 10 deletions(-)
 delete mode 100644 devtools/client/shared/vendor/react-addons-shallow-compare.js

diff --git a/devtools/client/shared/vendor/moz.build b/devtools/client/shared/vendor/moz.build
index de40ab4b6518..d695d9a9d64c 100644
--- a/devtools/client/shared/vendor/moz.build
+++ b/devtools/client/shared/vendor/moz.build
@@ -13,7 +13,6 @@ DevToolsModules(
     'jsol.js',
     'jszip.js',
     'lodash.js',
-    'react-addons-shallow-compare.js',
     'react-dom-factories.js',
     'react-dom-server.js',
     'react-dom.js',
diff --git a/devtools/client/shared/vendor/react-addons-shallow-compare.js b/devtools/client/shared/vendor/react-addons-shallow-compare.js
deleted file mode 100644
index 6a1c723cc51d..000000000000
--- a/devtools/client/shared/vendor/react-addons-shallow-compare.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-module.exports = require("devtools/client/shared/vendor/react").addons.shallowCompare;

From f96f69cd64c8ffacea9dac5cacbab2ba6c434382 Mon Sep 17 00:00:00 2001
From: Michael Ratcliffe <mratcliffe@mozilla.com>
Date: Fri, 1 Dec 2017 12:49:12 +0000
Subject: [PATCH 216/219] Bug 1422282 - Upgrade react-redux to v5.0.6
 r=nchevobbe

MozReview-Commit-ID: CB6z40VY4Ho

--HG--
rename : devtools/client/shared/vendor/REACT_REDUX_UPGRADING => devtools/client/shared/vendor/REACT_REDUX_UPGRADING.md
extra : rebase_source : 97a80962f36a94464a20a11824faf436ecdd8102
---
 .../shared/vendor/REACT_REDUX_UPGRADING       |   25 -
 .../shared/vendor/REACT_REDUX_UPGRADING.md    |   34 +
 devtools/client/shared/vendor/react-redux.js  | 3415 ++++++++++-------
 3 files changed, 2018 insertions(+), 1456 deletions(-)
 delete mode 100644 devtools/client/shared/vendor/REACT_REDUX_UPGRADING
 create mode 100644 devtools/client/shared/vendor/REACT_REDUX_UPGRADING.md

diff --git a/devtools/client/shared/vendor/REACT_REDUX_UPGRADING b/devtools/client/shared/vendor/REACT_REDUX_UPGRADING
deleted file mode 100644
index ee0d67614b81..000000000000
--- a/devtools/client/shared/vendor/REACT_REDUX_UPGRADING
+++ /dev/null
@@ -1,25 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-Current version of react-redux: 5.0.1 (last upgrade in bug 1326137)
-
-How to upgrade:
-1. git clone https://github.com/reactjs/react-redux - clone the repo
-2. git checkout v5.0.1 - checkout the right version tag
-3. npm install - compile the sources to a JS module file
-4. cp dist/react-redux.js devtools/client/shared/vendor - copy the unminified JS file
-5. update the import path in the react-redux.js file - see below
-6. update the current version in this file
-
-UPDATING THE IMPORT PATHS
-
-"react-redux" uses UMD style loading to work in many different environments.
-It assumes that "react" and "redux" are both included via `require("react")`
-as in node or browserify, but the paths to our react and redux installation are different.
-
-If upgrading react-redux, define the correct paths and replace the require statements
-for the module.exports case with the correct paths.
-
-Path to react: "devtools/client/shared/vendor/react"
-Path to redux: "devtools/client/shared/vendor/redux"
diff --git a/devtools/client/shared/vendor/REACT_REDUX_UPGRADING.md b/devtools/client/shared/vendor/REACT_REDUX_UPGRADING.md
new file mode 100644
index 000000000000..c19e4f351e86
--- /dev/null
+++ b/devtools/client/shared/vendor/REACT_REDUX_UPGRADING.md
@@ -0,0 +1,34 @@
+[//]: # (
+  This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+)
+
+# Upgrading react-redux
+
+## Getting the Source
+
+```bash
+git clone https://github.com/reactjs/react-redux
+cd react-redux
+git checkout v5.0.6 # checkout the right version tag
+```
+
+## Building
+
+```bash
+npm install
+cp dist/react-redux.js <gecko-dev>/devtools/client/shared/vendor/react-redux.js
+```
+
+We no longer need the react-redux repo so feel free to delete it.
+
+## Patching react-redux
+
+- open `react-redux.js`
+- Add the version number to the top of the file:
+  ```
+  /**
+    * react-redux v5.0.6
+    */
+  ```
+- Replace all instances of `'react'` with `'devtools/client/shared/vendor/react'` (including the quotes).
+- Replace all instances of `'redux'` with `'devtools/client/shared/vendor/redux'` (including the quotes).
diff --git a/devtools/client/shared/vendor/react-redux.js b/devtools/client/shared/vendor/react-redux.js
index 1d598ea5adb2..b83f52522cf9 100644
--- a/devtools/client/shared/vendor/react-redux.js
+++ b/devtools/client/shared/vendor/react-redux.js
@@ -1,1432 +1,1985 @@
-const REACT_PATH = "devtools/client/shared/vendor/react";
-const REDUX_PATH = "devtools/client/shared/vendor/redux";
-
-(function webpackUniversalModuleDefinition(root, factory) {
-	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require(REACT_PATH), require(REDUX_PATH));
-	else if(typeof define === 'function' && define.amd)
-		define(["react", "redux"], factory);
-	else if(typeof exports === 'object')
-		exports["ReactRedux"] = factory(require(REACT_PATH), require(REDUX_PATH));
-	else
-		root["ReactRedux"] = factory(root["React"], root["Redux"]);
-})(this, function(__WEBPACK_EXTERNAL_MODULE_2__, __WEBPACK_EXTERNAL_MODULE_22__) {
-return /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId])
-/******/ 			return installedModules[moduleId].exports;
-
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			exports: {},
-/******/ 			id: moduleId,
-/******/ 			loaded: false
-/******/ 		};
-
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-
-/******/ 		// Flag the module as loaded
-/******/ 		module.loaded = true;
-
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-
-
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.__esModule = true;
-	exports.connect = exports.connectAdvanced = exports.Provider = undefined;
-
-	var _Provider = __webpack_require__(7);
-
-	var _Provider2 = _interopRequireDefault(_Provider);
-
-	var _connectAdvanced = __webpack_require__(3);
-
-	var _connectAdvanced2 = _interopRequireDefault(_connectAdvanced);
-
-	var _connect = __webpack_require__(8);
-
-	var _connect2 = _interopRequireDefault(_connect);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	exports.Provider = _Provider2.default;
-	exports.connectAdvanced = _connectAdvanced2.default;
-	exports.connect = _connect2.default;
-
-/***/ },
-/* 1 */
-/***/ function(module, exports) {
-
-	'use strict';
-
-	exports.__esModule = true;
-	exports.default = warning;
-	/**
-	 * Prints a warning in the console if it exists.
-	 *
-	 * @param {String} message The warning message.
-	 * @returns {void}
-	 */
-	function warning(message) {
-	  /* eslint-disable no-console */
-	  if (typeof console !== 'undefined' && typeof console.error === 'function') {
-	    console.error(message);
-	  }
-	  /* eslint-enable no-console */
-	  try {
-	    // This error was thrown as a convenience so that if you enable
-	    // "break on all exceptions" in your console,
-	    // it would pause the execution at this line.
-	    throw new Error(message);
-	    /* eslint-disable no-empty */
-	  } catch (e) {}
-	  /* eslint-enable no-empty */
-	}
-
-/***/ },
-/* 2 */
-/***/ function(module, exports) {
-
-	module.exports = __WEBPACK_EXTERNAL_MODULE_2__;
-
-/***/ },
-/* 3 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.__esModule = true;
-
-	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
-	exports.default = connectAdvanced;
-
-	var _hoistNonReactStatics = __webpack_require__(16);
-
-	var _hoistNonReactStatics2 = _interopRequireDefault(_hoistNonReactStatics);
-
-	var _invariant = __webpack_require__(17);
-
-	var _invariant2 = _interopRequireDefault(_invariant);
-
-	var _react = __webpack_require__(2);
-
-	var _Subscription = __webpack_require__(14);
-
-	var _Subscription2 = _interopRequireDefault(_Subscription);
-
-	var _storeShape = __webpack_require__(5);
-
-	var _storeShape2 = _interopRequireDefault(_storeShape);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-	function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
-
-	var hotReloadingVersion = 0;
-	function connectAdvanced(
-	/*
-	  selectorFactory is a func that is responsible for returning the selector function used to
-	  compute new props from state, props, and dispatch. For example:
-	     export default connectAdvanced((dispatch, options) => (state, props) => ({
-	      thing: state.things[props.thingId],
-	      saveThing: fields => dispatch(actionCreators.saveThing(props.thingId, fields)),
-	    }))(YourComponent)
-	   Access to dispatch is provided to the factory so selectorFactories can bind actionCreators
-	  outside of their selector as an optimization. Options passed to connectAdvanced are passed to
-	  the selectorFactory, along with displayName and WrappedComponent, as the second argument.
-	   Note that selectorFactory is responsible for all caching/memoization of inbound and outbound
-	  props. Do not use connectAdvanced directly without memoizing results between calls to your
-	  selector, otherwise the Connect component will re-render on every state or props change.
-	*/
-	selectorFactory) {
-	  var _contextTypes, _childContextTypes;
-
-	  var _ref = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
-
-	  var _ref$getDisplayName = _ref.getDisplayName;
-	  var
-	  // the func used to compute this HOC's displayName from the wrapped component's displayName.
-	  // probably overridden by wrapper functions such as connect()
-	  getDisplayName = _ref$getDisplayName === undefined ? function (name) {
-	    return 'ConnectAdvanced(' + name + ')';
-	  } : _ref$getDisplayName;
-	  var _ref$methodName = _ref.methodName;
-	  var
-
-	  // shown in error messages
-	  // probably overridden by wrapper functions such as connect()
-	  methodName = _ref$methodName === undefined ? 'connectAdvanced' : _ref$methodName;
-	  var _ref$renderCountProp = _ref.renderCountProp;
-	  var
-
-	  // if defined, the name of the property passed to the wrapped element indicating the number of
-	  // calls to render. useful for watching in react devtools for unnecessary re-renders.
-	  renderCountProp = _ref$renderCountProp === undefined ? undefined : _ref$renderCountProp;
-	  var _ref$shouldHandleStat = _ref.shouldHandleStateChanges;
-	  var
-
-	  // determines whether this HOC subscribes to store changes
-	  shouldHandleStateChanges = _ref$shouldHandleStat === undefined ? true : _ref$shouldHandleStat;
-	  var _ref$storeKey = _ref.storeKey;
-	  var
-
-	  // the key of props/context to get the store
-	  storeKey = _ref$storeKey === undefined ? 'store' : _ref$storeKey;
-	  var _ref$withRef = _ref.withRef;
-	  var
-
-	  // if true, the wrapped element is exposed by this HOC via the getWrappedInstance() function.
-	  withRef = _ref$withRef === undefined ? false : _ref$withRef;
-
-	  var connectOptions = _objectWithoutProperties(_ref, ['getDisplayName', 'methodName', 'renderCountProp', 'shouldHandleStateChanges', 'storeKey', 'withRef']);
-
-	  var subscriptionKey = storeKey + 'Subscription';
-	  var version = hotReloadingVersion++;
-
-	  var contextTypes = (_contextTypes = {}, _contextTypes[storeKey] = _storeShape2.default, _contextTypes[subscriptionKey] = _react.PropTypes.instanceOf(_Subscription2.default), _contextTypes);
-	  var childContextTypes = (_childContextTypes = {}, _childContextTypes[subscriptionKey] = _react.PropTypes.instanceOf(_Subscription2.default), _childContextTypes);
-
-	  return function wrapWithConnect(WrappedComponent) {
-	    (0, _invariant2.default)(typeof WrappedComponent == 'function', 'You must pass a component to the function returned by ' + ('connect. Instead received ' + WrappedComponent));
-
-	    var wrappedComponentName = WrappedComponent.displayName || WrappedComponent.name || 'Component';
-
-	    var displayName = getDisplayName(wrappedComponentName);
-
-	    var selectorFactoryOptions = _extends({}, connectOptions, {
-	      getDisplayName: getDisplayName,
-	      methodName: methodName,
-	      renderCountProp: renderCountProp,
-	      shouldHandleStateChanges: shouldHandleStateChanges,
-	      storeKey: storeKey,
-	      withRef: withRef,
-	      displayName: displayName,
-	      wrappedComponentName: wrappedComponentName,
-	      WrappedComponent: WrappedComponent
-	    });
-
-	    var Connect = function (_Component) {
-	      _inherits(Connect, _Component);
-
-	      function Connect(props, context) {
-	        _classCallCheck(this, Connect);
-
-	        var _this = _possibleConstructorReturn(this, _Component.call(this, props, context));
-
-	        _this.version = version;
-	        _this.state = {};
-	        _this.renderCount = 0;
-	        _this.store = _this.props[storeKey] || _this.context[storeKey];
-	        _this.parentSub = props[subscriptionKey] || context[subscriptionKey];
-
-	        _this.setWrappedInstance = _this.setWrappedInstance.bind(_this);
-
-	        (0, _invariant2.default)(_this.store, 'Could not find "' + storeKey + '" in either the context or ' + ('props of "' + displayName + '". ') + 'Either wrap the root component in a <Provider>, ' + ('or explicitly pass "' + storeKey + '" as a prop to "' + displayName + '".'));
-
-	        // make sure `getState` is properly bound in order to avoid breaking
-	        // custom store implementations that rely on the store's context
-	        _this.getState = _this.store.getState.bind(_this.store);
-
-	        _this.initSelector();
-	        _this.initSubscription();
-	        return _this;
-	      }
-
-	      Connect.prototype.getChildContext = function getChildContext() {
-	        var _ref2;
-
-	        return _ref2 = {}, _ref2[subscriptionKey] = this.subscription, _ref2;
-	      };
-
-	      Connect.prototype.componentDidMount = function componentDidMount() {
-	        if (!shouldHandleStateChanges) return;
-
-	        // componentWillMount fires during server side rendering, but componentDidMount and
-	        // componentWillUnmount do not. Because of this, trySubscribe happens during ...didMount.
-	        // Otherwise, unsubscription would never take place during SSR, causing a memory leak.
-	        // To handle the case where a child component may have triggered a state change by
-	        // dispatching an action in its componentWillMount, we have to re-run the select and maybe
-	        // re-render.
-	        this.subscription.trySubscribe();
-	        this.selector.run(this.props);
-	        if (this.selector.shouldComponentUpdate) this.forceUpdate();
-	      };
-
-	      Connect.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
-	        this.selector.run(nextProps);
-	      };
-
-	      Connect.prototype.shouldComponentUpdate = function shouldComponentUpdate() {
-	        return this.selector.shouldComponentUpdate;
-	      };
-
-	      Connect.prototype.componentWillUnmount = function componentWillUnmount() {
-	        if (this.subscription) this.subscription.tryUnsubscribe();
-	        // these are just to guard against extra memory leakage if a parent element doesn't
-	        // dereference this instance properly, such as an async callback that never finishes
-	        this.subscription = null;
-	        this.store = null;
-	        this.parentSub = null;
-	        this.selector.run = function () {};
-	      };
-
-	      Connect.prototype.getWrappedInstance = function getWrappedInstance() {
-	        (0, _invariant2.default)(withRef, 'To access the wrapped instance, you need to specify ' + ('{ withRef: true } in the options argument of the ' + methodName + '() call.'));
-	        return this.wrappedInstance;
-	      };
-
-	      Connect.prototype.setWrappedInstance = function setWrappedInstance(ref) {
-	        this.wrappedInstance = ref;
-	      };
-
-	      Connect.prototype.initSelector = function initSelector() {
-	        var dispatch = this.store.dispatch;
-	        var getState = this.getState;
-
-	        var sourceSelector = selectorFactory(dispatch, selectorFactoryOptions);
-
-	        // wrap the selector in an object that tracks its results between runs
-	        var selector = this.selector = {
-	          shouldComponentUpdate: true,
-	          props: sourceSelector(getState(), this.props),
-	          run: function runComponentSelector(props) {
-	            try {
-	              var nextProps = sourceSelector(getState(), props);
-	              if (selector.error || nextProps !== selector.props) {
-	                selector.shouldComponentUpdate = true;
-	                selector.props = nextProps;
-	                selector.error = null;
-	              }
-	            } catch (error) {
-	              selector.shouldComponentUpdate = true;
-	              selector.error = error;
-	            }
-	          }
-	        };
-	      };
-
-	      Connect.prototype.initSubscription = function initSubscription() {
-	        var _this2 = this;
-
-	        if (shouldHandleStateChanges) {
-	          (function () {
-	            var subscription = _this2.subscription = new _Subscription2.default(_this2.store, _this2.parentSub);
-	            var dummyState = {};
-
-	            subscription.onStateChange = function onStateChange() {
-	              this.selector.run(this.props);
-
-	              if (!this.selector.shouldComponentUpdate) {
-	                subscription.notifyNestedSubs();
-	              } else {
-	                this.componentDidUpdate = function componentDidUpdate() {
-	                  this.componentDidUpdate = undefined;
-	                  subscription.notifyNestedSubs();
-	                };
-
-	                this.setState(dummyState);
-	              }
-	            }.bind(_this2);
-	          })();
-	        }
-	      };
-
-	      Connect.prototype.isSubscribed = function isSubscribed() {
-	        return Boolean(this.subscription) && this.subscription.isSubscribed();
-	      };
-
-	      Connect.prototype.addExtraProps = function addExtraProps(props) {
-	        if (!withRef && !renderCountProp) return props;
-	        // make a shallow copy so that fields added don't leak to the original selector.
-	        // this is especially important for 'ref' since that's a reference back to the component
-	        // instance. a singleton memoized selector would then be holding a reference to the
-	        // instance, preventing the instance from being garbage collected, and that would be bad
-	        var withExtras = _extends({}, props);
-	        if (withRef) withExtras.ref = this.setWrappedInstance;
-	        if (renderCountProp) withExtras[renderCountProp] = this.renderCount++;
-	        return withExtras;
-	      };
-
-	      Connect.prototype.render = function render() {
-	        var selector = this.selector;
-	        selector.shouldComponentUpdate = false;
-
-	        if (selector.error) {
-	          throw selector.error;
-	        } else {
-	          return (0, _react.createElement)(WrappedComponent, this.addExtraProps(selector.props));
-	        }
-	      };
-
-	      return Connect;
-	    }(_react.Component);
-
-	    Connect.WrappedComponent = WrappedComponent;
-	    Connect.displayName = displayName;
-	    Connect.childContextTypes = childContextTypes;
-	    Connect.contextTypes = contextTypes;
-	    Connect.propTypes = contextTypes;
-
-	    if (true) {
-	      Connect.prototype.componentWillUpdate = function componentWillUpdate() {
-	        // We are hot reloading!
-	        if (this.version !== version) {
-	          this.version = version;
-	          this.initSelector();
-
-	          if (this.subscription) this.subscription.tryUnsubscribe();
-	          this.initSubscription();
-	          if (shouldHandleStateChanges) this.subscription.trySubscribe();
-	        }
-	      };
-	    }
-
-	    return (0, _hoistNonReactStatics2.default)(Connect, WrappedComponent);
-	  };
-	}
-
-/***/ },
-/* 4 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.__esModule = true;
-	exports.wrapMapToPropsConstant = wrapMapToPropsConstant;
-	exports.getDependsOnOwnProps = getDependsOnOwnProps;
-	exports.wrapMapToPropsFunc = wrapMapToPropsFunc;
-
-	var _verifyPlainObject = __webpack_require__(6);
-
-	var _verifyPlainObject2 = _interopRequireDefault(_verifyPlainObject);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function wrapMapToPropsConstant(getConstant) {
-	  return function initConstantSelector(dispatch, options) {
-	    var constant = getConstant(dispatch, options);
-
-	    function constantSelector() {
-	      return constant;
-	    }
-	    constantSelector.dependsOnOwnProps = false;
-	    return constantSelector;
-	  };
-	}
-
-	// dependsOnOwnProps is used by createMapToPropsProxy to determine whether to pass props as args
-	// to the mapToProps function being wrapped. It is also used by makePurePropsSelector to determine
-	// whether mapToProps needs to be invoked when props have changed.
-	//
-	// A length of one signals that mapToProps does not depend on props from the parent component.
-	// A length of zero is assumed to mean mapToProps is getting args via arguments or ...args and
-	// therefore not reporting its length accurately..
-	function getDependsOnOwnProps(mapToProps) {
-	  return mapToProps.dependsOnOwnProps !== null && mapToProps.dependsOnOwnProps !== undefined ? Boolean(mapToProps.dependsOnOwnProps) : mapToProps.length !== 1;
-	}
-
-	// Used by whenMapStateToPropsIsFunction and whenMapDispatchToPropsIsFunction,
-	// this function wraps mapToProps in a proxy function which does several things:
-	//
-	//  * Detects whether the mapToProps function being called depends on props, which
-	//    is used by selectorFactory to decide if it should reinvoke on props changes.
-	//
-	//  * On first call, handles mapToProps if returns another function, and treats that
-	//    new function as the true mapToProps for subsequent calls.
-	//
-	//  * On first call, verifies the first result is a plain object, in order to warn
-	//    the developer that their mapToProps function is not returning a valid result.
-	//
-	function wrapMapToPropsFunc(mapToProps, methodName) {
-	  return function initProxySelector(dispatch, _ref) {
-	    var displayName = _ref.displayName;
-
-	    var proxy = function mapToPropsProxy(stateOrDispatch, ownProps) {
-	      return proxy.dependsOnOwnProps ? proxy.mapToProps(stateOrDispatch, ownProps) : proxy.mapToProps(stateOrDispatch);
-	    };
-
-	    proxy.dependsOnOwnProps = getDependsOnOwnProps(mapToProps);
-
-	    proxy.mapToProps = function detectFactoryAndVerify(stateOrDispatch, ownProps) {
-	      proxy.mapToProps = mapToProps;
-	      var props = proxy(stateOrDispatch, ownProps);
-
-	      if (typeof props === 'function') {
-	        proxy.mapToProps = props;
-	        proxy.dependsOnOwnProps = getDependsOnOwnProps(props);
-	        props = proxy(stateOrDispatch, ownProps);
-	      }
-
-	      if (true) (0, _verifyPlainObject2.default)(props, displayName, methodName);
-
-	      return props;
-	    };
-
-	    return proxy;
-	  };
-	}
-
-/***/ },
-/* 5 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.__esModule = true;
-
-	var _react = __webpack_require__(2);
-
-	exports.default = _react.PropTypes.shape({
-	  subscribe: _react.PropTypes.func.isRequired,
-	  dispatch: _react.PropTypes.func.isRequired,
-	  getState: _react.PropTypes.func.isRequired
-	});
-
-/***/ },
-/* 6 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.__esModule = true;
-	exports.default = verifyPlainObject;
-
-	var _isPlainObject = __webpack_require__(21);
-
-	var _isPlainObject2 = _interopRequireDefault(_isPlainObject);
-
-	var _warning = __webpack_require__(1);
-
-	var _warning2 = _interopRequireDefault(_warning);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function verifyPlainObject(value, displayName, methodName) {
-	  if (!(0, _isPlainObject2.default)(value)) {
-	    (0, _warning2.default)(methodName + '() in ' + displayName + ' must return a plain object. Instead received ' + value + '.');
-	  }
-	}
-
-/***/ },
-/* 7 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.__esModule = true;
-	exports.default = undefined;
-
-	var _react = __webpack_require__(2);
-
-	var _storeShape = __webpack_require__(5);
-
-	var _storeShape2 = _interopRequireDefault(_storeShape);
-
-	var _warning = __webpack_require__(1);
-
-	var _warning2 = _interopRequireDefault(_warning);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-	var didWarnAboutReceivingStore = false;
-	function warnAboutReceivingStore() {
-	  if (didWarnAboutReceivingStore) {
-	    return;
-	  }
-	  didWarnAboutReceivingStore = true;
-
-	  (0, _warning2.default)('<Provider> does not support changing `store` on the fly. ' + 'It is most likely that you see this error because you updated to ' + 'Redux 2.x and React Redux 2.x which no longer hot reload reducers ' + 'automatically. See https://github.com/reactjs/react-redux/releases/' + 'tag/v2.0.0 for the migration instructions.');
-	}
-
-	var Provider = function (_Component) {
-	  _inherits(Provider, _Component);
-
-	  Provider.prototype.getChildContext = function getChildContext() {
-	    return { store: this.store };
-	  };
-
-	  function Provider(props, context) {
-	    _classCallCheck(this, Provider);
-
-	    var _this = _possibleConstructorReturn(this, _Component.call(this, props, context));
-
-	    _this.store = props.store;
-	    return _this;
-	  }
-
-	  Provider.prototype.render = function render() {
-	    return _react.Children.only(this.props.children);
-	  };
-
-	  return Provider;
-	}(_react.Component);
-
-	exports.default = Provider;
-
-
-	if (true) {
-	  Provider.prototype.componentWillReceiveProps = function (nextProps) {
-	    var store = this.store;
-	    var nextStore = nextProps.store;
-
-
-	    if (store !== nextStore) {
-	      warnAboutReceivingStore();
-	    }
-	  };
-	}
-
-	Provider.propTypes = {
-	  store: _storeShape2.default.isRequired,
-	  children: _react.PropTypes.element.isRequired
-	};
-	Provider.childContextTypes = {
-	  store: _storeShape2.default.isRequired
-	};
-	Provider.displayName = 'Provider';
-
-/***/ },
-/* 8 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.__esModule = true;
-
-	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
-	exports.createConnect = createConnect;
-
-	var _connectAdvanced = __webpack_require__(3);
-
-	var _connectAdvanced2 = _interopRequireDefault(_connectAdvanced);
-
-	var _shallowEqual = __webpack_require__(15);
-
-	var _shallowEqual2 = _interopRequireDefault(_shallowEqual);
-
-	var _mapDispatchToProps = __webpack_require__(9);
-
-	var _mapDispatchToProps2 = _interopRequireDefault(_mapDispatchToProps);
-
-	var _mapStateToProps = __webpack_require__(10);
-
-	var _mapStateToProps2 = _interopRequireDefault(_mapStateToProps);
-
-	var _mergeProps = __webpack_require__(11);
-
-	var _mergeProps2 = _interopRequireDefault(_mergeProps);
-
-	var _selectorFactory = __webpack_require__(12);
-
-	var _selectorFactory2 = _interopRequireDefault(_selectorFactory);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
-
-	/*
-	  connect is a facade over connectAdvanced. It turns its args into a compatible
-	  selectorFactory, which has the signature:
-
-	    (dispatch, options) => (nextState, nextOwnProps) => nextFinalProps
-
-	  connect passes its args to connectAdvanced as options, which will in turn pass them to
-	  selectorFactory each time a Connect component instance is instantiated or hot reloaded.
-
-	  selectorFactory returns a final props selector from its mapStateToProps,
-	  mapStateToPropsFactories, mapDispatchToProps, mapDispatchToPropsFactories, mergeProps,
-	  mergePropsFactories, and pure args.
-
-	  The resulting final props selector is called by the Connect component instance whenever
-	  it receives new props or store state.
-	 */
-
-	function match(arg, factories, name) {
-	  for (var i = factories.length - 1; i >= 0; i--) {
-	    var result = factories[i](arg);
-	    if (result) return result;
-	  }
-
-	  return function (dispatch, options) {
-	    throw new Error('Invalid value of type ' + typeof arg + ' for ' + name + ' argument when connecting component ' + options.wrappedComponentName + '.');
-	  };
-	}
-
-	function strictEqual(a, b) {
-	  return a === b;
-	}
-
-	// createConnect with default args builds the 'official' connect behavior. Calling it with
-	// different options opens up some testing and extensibility scenarios
-	function createConnect() {
-	  var _ref = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-	  var _ref$connectHOC = _ref.connectHOC;
-	  var connectHOC = _ref$connectHOC === undefined ? _connectAdvanced2.default : _ref$connectHOC;
-	  var _ref$mapStateToPropsF = _ref.mapStateToPropsFactories;
-	  var mapStateToPropsFactories = _ref$mapStateToPropsF === undefined ? _mapStateToProps2.default : _ref$mapStateToPropsF;
-	  var _ref$mapDispatchToPro = _ref.mapDispatchToPropsFactories;
-	  var mapDispatchToPropsFactories = _ref$mapDispatchToPro === undefined ? _mapDispatchToProps2.default : _ref$mapDispatchToPro;
-	  var _ref$mergePropsFactor = _ref.mergePropsFactories;
-	  var mergePropsFactories = _ref$mergePropsFactor === undefined ? _mergeProps2.default : _ref$mergePropsFactor;
-	  var _ref$selectorFactory = _ref.selectorFactory;
-	  var selectorFactory = _ref$selectorFactory === undefined ? _selectorFactory2.default : _ref$selectorFactory;
-
-	  return function connect(mapStateToProps, mapDispatchToProps, mergeProps) {
-	    var _ref2 = arguments.length <= 3 || arguments[3] === undefined ? {} : arguments[3];
-
-	    var _ref2$pure = _ref2.pure;
-	    var pure = _ref2$pure === undefined ? true : _ref2$pure;
-	    var _ref2$areStatesEqual = _ref2.areStatesEqual;
-	    var areStatesEqual = _ref2$areStatesEqual === undefined ? strictEqual : _ref2$areStatesEqual;
-	    var _ref2$areOwnPropsEqua = _ref2.areOwnPropsEqual;
-	    var areOwnPropsEqual = _ref2$areOwnPropsEqua === undefined ? _shallowEqual2.default : _ref2$areOwnPropsEqua;
-	    var _ref2$areStatePropsEq = _ref2.areStatePropsEqual;
-	    var areStatePropsEqual = _ref2$areStatePropsEq === undefined ? _shallowEqual2.default : _ref2$areStatePropsEq;
-	    var _ref2$areMergedPropsE = _ref2.areMergedPropsEqual;
-	    var areMergedPropsEqual = _ref2$areMergedPropsE === undefined ? _shallowEqual2.default : _ref2$areMergedPropsE;
-
-	    var extraOptions = _objectWithoutProperties(_ref2, ['pure', 'areStatesEqual', 'areOwnPropsEqual', 'areStatePropsEqual', 'areMergedPropsEqual']);
-
-	    var initMapStateToProps = match(mapStateToProps, mapStateToPropsFactories, 'mapStateToProps');
-	    var initMapDispatchToProps = match(mapDispatchToProps, mapDispatchToPropsFactories, 'mapDispatchToProps');
-	    var initMergeProps = match(mergeProps, mergePropsFactories, 'mergeProps');
-
-	    return connectHOC(selectorFactory, _extends({
-	      // used in error messages
-	      methodName: 'connect',
-
-	      // used to compute Connect's displayName from the wrapped component's displayName.
-	      getDisplayName: function getDisplayName(name) {
-	        return 'Connect(' + name + ')';
-	      },
-
-	      // if mapStateToProps is falsy, the Connect component doesn't subscribe to store state changes
-	      shouldHandleStateChanges: Boolean(mapStateToProps),
-
-	      // passed through to selectorFactory
-	      initMapStateToProps: initMapStateToProps,
-	      initMapDispatchToProps: initMapDispatchToProps,
-	      initMergeProps: initMergeProps,
-	      pure: pure,
-	      areStatesEqual: areStatesEqual,
-	      areOwnPropsEqual: areOwnPropsEqual,
-	      areStatePropsEqual: areStatePropsEqual,
-	      areMergedPropsEqual: areMergedPropsEqual
-
-	    }, extraOptions));
-	  };
-	}
-
-	exports.default = createConnect();
-
-/***/ },
-/* 9 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.__esModule = true;
-	exports.whenMapDispatchToPropsIsFunction = whenMapDispatchToPropsIsFunction;
-	exports.whenMapDispatchToPropsIsMissing = whenMapDispatchToPropsIsMissing;
-	exports.whenMapDispatchToPropsIsObject = whenMapDispatchToPropsIsObject;
-
-	var _redux = __webpack_require__(22);
-
-	var _wrapMapToProps = __webpack_require__(4);
-
-	function whenMapDispatchToPropsIsFunction(mapDispatchToProps) {
-	  return typeof mapDispatchToProps === 'function' ? (0, _wrapMapToProps.wrapMapToPropsFunc)(mapDispatchToProps, 'mapDispatchToProps') : undefined;
-	}
-
-	function whenMapDispatchToPropsIsMissing(mapDispatchToProps) {
-	  return !mapDispatchToProps ? (0, _wrapMapToProps.wrapMapToPropsConstant)(function (dispatch) {
-	    return { dispatch: dispatch };
-	  }) : undefined;
-	}
-
-	function whenMapDispatchToPropsIsObject(mapDispatchToProps) {
-	  return mapDispatchToProps && typeof mapDispatchToProps === 'object' ? (0, _wrapMapToProps.wrapMapToPropsConstant)(function (dispatch) {
-	    return (0, _redux.bindActionCreators)(mapDispatchToProps, dispatch);
-	  }) : undefined;
-	}
-
-	exports.default = [whenMapDispatchToPropsIsFunction, whenMapDispatchToPropsIsMissing, whenMapDispatchToPropsIsObject];
-
-/***/ },
-/* 10 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.__esModule = true;
-	exports.whenMapStateToPropsIsFunction = whenMapStateToPropsIsFunction;
-	exports.whenMapStateToPropsIsMissing = whenMapStateToPropsIsMissing;
-
-	var _wrapMapToProps = __webpack_require__(4);
-
-	function whenMapStateToPropsIsFunction(mapStateToProps) {
-	  return typeof mapStateToProps === 'function' ? (0, _wrapMapToProps.wrapMapToPropsFunc)(mapStateToProps, 'mapStateToProps') : undefined;
-	}
-
-	function whenMapStateToPropsIsMissing(mapStateToProps) {
-	  return !mapStateToProps ? (0, _wrapMapToProps.wrapMapToPropsConstant)(function () {
-	    return {};
-	  }) : undefined;
-	}
-
-	exports.default = [whenMapStateToPropsIsFunction, whenMapStateToPropsIsMissing];
-
-/***/ },
-/* 11 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.__esModule = true;
-
-	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
-	exports.defaultMergeProps = defaultMergeProps;
-	exports.wrapMergePropsFunc = wrapMergePropsFunc;
-	exports.whenMergePropsIsFunction = whenMergePropsIsFunction;
-	exports.whenMergePropsIsOmitted = whenMergePropsIsOmitted;
-
-	var _verifyPlainObject = __webpack_require__(6);
-
-	var _verifyPlainObject2 = _interopRequireDefault(_verifyPlainObject);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function defaultMergeProps(stateProps, dispatchProps, ownProps) {
-	  return _extends({}, ownProps, stateProps, dispatchProps);
-	}
-
-	function wrapMergePropsFunc(mergeProps) {
-	  return function initMergePropsProxy(dispatch, _ref) {
-	    var displayName = _ref.displayName;
-	    var pure = _ref.pure;
-	    var areMergedPropsEqual = _ref.areMergedPropsEqual;
-
-	    var hasRunOnce = false;
-	    var mergedProps = void 0;
-
-	    return function mergePropsProxy(stateProps, dispatchProps, ownProps) {
-	      var nextMergedProps = mergeProps(stateProps, dispatchProps, ownProps);
-
-	      if (hasRunOnce) {
-	        if (!pure || !areMergedPropsEqual(nextMergedProps, mergedProps)) mergedProps = nextMergedProps;
-	      } else {
-	        hasRunOnce = true;
-	        mergedProps = nextMergedProps;
-
-	        if (true) (0, _verifyPlainObject2.default)(mergedProps, displayName, 'mergeProps');
-	      }
-
-	      return mergedProps;
-	    };
-	  };
-	}
-
-	function whenMergePropsIsFunction(mergeProps) {
-	  return typeof mergeProps === 'function' ? wrapMergePropsFunc(mergeProps) : undefined;
-	}
-
-	function whenMergePropsIsOmitted(mergeProps) {
-	  return !mergeProps ? function () {
-	    return defaultMergeProps;
-	  } : undefined;
-	}
-
-	exports.default = [whenMergePropsIsFunction, whenMergePropsIsOmitted];
-
-/***/ },
-/* 12 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.__esModule = true;
-	exports.impureFinalPropsSelectorFactory = impureFinalPropsSelectorFactory;
-	exports.pureFinalPropsSelectorFactory = pureFinalPropsSelectorFactory;
-	exports.default = finalPropsSelectorFactory;
-
-	var _verifySubselectors = __webpack_require__(13);
-
-	var _verifySubselectors2 = _interopRequireDefault(_verifySubselectors);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
-
-	function impureFinalPropsSelectorFactory(mapStateToProps, mapDispatchToProps, mergeProps, dispatch) {
-	  return function impureFinalPropsSelector(state, ownProps) {
-	    return mergeProps(mapStateToProps(state, ownProps), mapDispatchToProps(dispatch, ownProps), ownProps);
-	  };
-	}
-
-	function pureFinalPropsSelectorFactory(mapStateToProps, mapDispatchToProps, mergeProps, dispatch, _ref) {
-	  var areStatesEqual = _ref.areStatesEqual;
-	  var areOwnPropsEqual = _ref.areOwnPropsEqual;
-	  var areStatePropsEqual = _ref.areStatePropsEqual;
-
-	  var hasRunAtLeastOnce = false;
-	  var state = void 0;
-	  var ownProps = void 0;
-	  var stateProps = void 0;
-	  var dispatchProps = void 0;
-	  var mergedProps = void 0;
-
-	  function handleFirstCall(firstState, firstOwnProps) {
-	    state = firstState;
-	    ownProps = firstOwnProps;
-	    stateProps = mapStateToProps(state, ownProps);
-	    dispatchProps = mapDispatchToProps(dispatch, ownProps);
-	    mergedProps = mergeProps(stateProps, dispatchProps, ownProps);
-	    hasRunAtLeastOnce = true;
-	    return mergedProps;
-	  }
-
-	  function handleNewPropsAndNewState() {
-	    stateProps = mapStateToProps(state, ownProps);
-
-	    if (mapDispatchToProps.dependsOnOwnProps) dispatchProps = mapDispatchToProps(dispatch, ownProps);
-
-	    mergedProps = mergeProps(stateProps, dispatchProps, ownProps);
-	    return mergedProps;
-	  }
-
-	  function handleNewProps() {
-	    if (mapStateToProps.dependsOnOwnProps) stateProps = mapStateToProps(state, ownProps);
-
-	    if (mapDispatchToProps.dependsOnOwnProps) dispatchProps = mapDispatchToProps(dispatch, ownProps);
-
-	    mergedProps = mergeProps(stateProps, dispatchProps, ownProps);
-	    return mergedProps;
-	  }
-
-	  function handleNewState() {
-	    var nextStateProps = mapStateToProps(state, ownProps);
-	    var statePropsChanged = !areStatePropsEqual(nextStateProps, stateProps);
-	    stateProps = nextStateProps;
-
-	    if (statePropsChanged) mergedProps = mergeProps(stateProps, dispatchProps, ownProps);
-
-	    return mergedProps;
-	  }
-
-	  function handleSubsequentCalls(nextState, nextOwnProps) {
-	    var propsChanged = !areOwnPropsEqual(nextOwnProps, ownProps);
-	    var stateChanged = !areStatesEqual(nextState, state);
-	    state = nextState;
-	    ownProps = nextOwnProps;
-
-	    if (propsChanged && stateChanged) return handleNewPropsAndNewState();
-	    if (propsChanged) return handleNewProps();
-	    if (stateChanged) return handleNewState();
-	    return mergedProps;
-	  }
-
-	  return function pureFinalPropsSelector(nextState, nextOwnProps) {
-	    return hasRunAtLeastOnce ? handleSubsequentCalls(nextState, nextOwnProps) : handleFirstCall(nextState, nextOwnProps);
-	  };
-	}
-
-	// TODO: Add more comments
-
-	// If pure is true, the selector returned by selectorFactory will memoize its results,
-	// allowing connectAdvanced's shouldComponentUpdate to return false if final
-	// props have not changed. If false, the selector will always return a new
-	// object and shouldComponentUpdate will always return true.
-
-	function finalPropsSelectorFactory(dispatch, _ref2) {
-	  var initMapStateToProps = _ref2.initMapStateToProps;
-	  var initMapDispatchToProps = _ref2.initMapDispatchToProps;
-	  var initMergeProps = _ref2.initMergeProps;
-
-	  var options = _objectWithoutProperties(_ref2, ['initMapStateToProps', 'initMapDispatchToProps', 'initMergeProps']);
-
-	  var mapStateToProps = initMapStateToProps(dispatch, options);
-	  var mapDispatchToProps = initMapDispatchToProps(dispatch, options);
-	  var mergeProps = initMergeProps(dispatch, options);
-
-	  if (true) {
-	    (0, _verifySubselectors2.default)(mapStateToProps, mapDispatchToProps, mergeProps, options.displayName);
-	  }
-
-	  var selectorFactory = options.pure ? pureFinalPropsSelectorFactory : impureFinalPropsSelectorFactory;
-
-	  return selectorFactory(mapStateToProps, mapDispatchToProps, mergeProps, dispatch, options);
-	}
-
-/***/ },
-/* 13 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.__esModule = true;
-	exports.default = verifySubselectors;
-
-	var _warning = __webpack_require__(1);
-
-	var _warning2 = _interopRequireDefault(_warning);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function verify(selector, methodName, displayName) {
-	  if (!selector) {
-	    throw new Error('Unexpected value for ' + methodName + ' in ' + displayName + '.');
-	  } else if (methodName === 'mapStateToProps' || methodName === 'mapDispatchToProps') {
-	    if (!selector.hasOwnProperty('dependsOnOwnProps')) {
-	      (0, _warning2.default)('The selector for ' + methodName + ' of ' + displayName + ' did not specify a value for dependsOnOwnProps.');
-	    }
-	  }
-	}
-
-	function verifySubselectors(mapStateToProps, mapDispatchToProps, mergeProps, displayName) {
-	  verify(mapStateToProps, 'mapStateToProps', displayName);
-	  verify(mapDispatchToProps, 'mapDispatchToProps', displayName);
-	  verify(mergeProps, 'mergeProps', displayName);
-	}
-
-/***/ },
-/* 14 */
-/***/ function(module, exports) {
-
-	"use strict";
-
-	exports.__esModule = true;
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	// encapsulates the subscription logic for connecting a component to the redux store, as
-	// well as nesting subscriptions of descendant components, so that we can ensure the
-	// ancestor components re-render before descendants
-
-	var CLEARED = null;
-	var nullListeners = {
-	  notify: function notify() {}
-	};
-
-	function createListenerCollection() {
-	  // the current/next pattern is copied from redux's createStore code.
-	  // TODO: refactor+expose that code to be reusable here?
-	  var current = [];
-	  var next = [];
-
-	  return {
-	    clear: function clear() {
-	      next = CLEARED;
-	      current = CLEARED;
-	    },
-	    notify: function notify() {
-	      var listeners = current = next;
-	      for (var i = 0; i < listeners.length; i++) {
-	        listeners[i]();
-	      }
-	    },
-	    subscribe: function subscribe(listener) {
-	      var isSubscribed = true;
-	      if (next === current) next = current.slice();
-	      next.push(listener);
-
-	      return function unsubscribe() {
-	        if (!isSubscribed || current === CLEARED) return;
-	        isSubscribed = false;
-
-	        if (next === current) next = current.slice();
-	        next.splice(next.indexOf(listener), 1);
-	      };
-	    }
-	  };
-	}
-
-	var Subscription = function () {
-	  function Subscription(store, parentSub) {
-	    _classCallCheck(this, Subscription);
-
-	    this.store = store;
-	    this.parentSub = parentSub;
-	    this.unsubscribe = null;
-	    this.listeners = nullListeners;
-	  }
-
-	  Subscription.prototype.addNestedSub = function addNestedSub(listener) {
-	    this.trySubscribe();
-	    return this.listeners.subscribe(listener);
-	  };
-
-	  Subscription.prototype.notifyNestedSubs = function notifyNestedSubs() {
-	    this.listeners.notify();
-	  };
-
-	  Subscription.prototype.isSubscribed = function isSubscribed() {
-	    return Boolean(this.unsubscribe);
-	  };
-
-	  Subscription.prototype.trySubscribe = function trySubscribe() {
-	    if (!this.unsubscribe) {
-	      // this.onStateChange is set by connectAdvanced.initSubscription()
-	      this.unsubscribe = this.parentSub ? this.parentSub.addNestedSub(this.onStateChange) : this.store.subscribe(this.onStateChange);
-
-	      this.listeners = createListenerCollection();
-	    }
-	  };
-
-	  Subscription.prototype.tryUnsubscribe = function tryUnsubscribe() {
-	    if (this.unsubscribe) {
-	      this.unsubscribe();
-	      this.unsubscribe = null;
-	      this.listeners.clear();
-	      this.listeners = nullListeners;
-	    }
-	  };
-
-	  return Subscription;
-	}();
-
-	exports.default = Subscription;
-
-/***/ },
-/* 15 */
-/***/ function(module, exports) {
-
-	"use strict";
-
-	exports.__esModule = true;
-	exports.default = shallowEqual;
-	var hasOwn = Object.prototype.hasOwnProperty;
-
-	function shallowEqual(a, b) {
-	  if (a === b) return true;
-
-	  var countA = 0;
-	  var countB = 0;
-
-	  for (var key in a) {
-	    if (hasOwn.call(a, key) && a[key] !== b[key]) return false;
-	    countA++;
-	  }
-
-	  for (var _key in b) {
-	    if (hasOwn.call(b, _key)) countB++;
-	  }
-
-	  return countA === countB;
-	}
-
-/***/ },
-/* 16 */
-/***/ function(module, exports) {
-
-	/**
-	 * Copyright 2015, Yahoo! Inc.
-	 * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
-	 */
-	'use strict';
-
-	var REACT_STATICS = {
-	    childContextTypes: true,
-	    contextTypes: true,
-	    defaultProps: true,
-	    displayName: true,
-	    getDefaultProps: true,
-	    mixins: true,
-	    propTypes: true,
-	    type: true
-	};
-
-	var KNOWN_STATICS = {
-	    name: true,
-	    length: true,
-	    prototype: true,
-	    caller: true,
-	    arguments: true,
-	    arity: true
-	};
-
-	module.exports = function hoistNonReactStatics(targetComponent, sourceComponent) {
-	    if (typeof sourceComponent !== 'string') { // don't hoist over string (html) components
-	        var keys = Object.getOwnPropertyNames(sourceComponent);
-	        for (var i=0; i<keys.length; ++i) {
-	            if (!REACT_STATICS[keys[i]] && !KNOWN_STATICS[keys[i]]) {
-	                try {
-	                    targetComponent[keys[i]] = sourceComponent[keys[i]];
-	                } catch (error) {
-
-	                }
-	            }
-	        }
-	    }
-
-	    return targetComponent;
-	};
-
-
-/***/ },
-/* 17 */
-/***/ function(module, exports, __webpack_require__) {
-
-	/**
-	 * Copyright 2013-2015, Facebook, Inc.
-	 * All rights reserved.
-	 *
-	 * This source code is licensed under the BSD-style license found in the
-	 * LICENSE file in the root directory of this source tree. An additional grant
-	 * of patent rights can be found in the PATENTS file in the same directory.
-	 */
-
-	'use strict';
-
-	/**
-	 * Use invariant() to assert state which your program assumes to be true.
-	 *
-	 * Provide sprintf-style format (only %s is supported) and arguments
-	 * to provide information about what broke and what you were
-	 * expecting.
-	 *
-	 * The invariant message will be stripped in production, but the invariant
-	 * will remain to ensure logic does not differ in production.
-	 */
-
-	var invariant = function(condition, format, a, b, c, d, e, f) {
-	  if (true) {
-	    if (format === undefined) {
-	      throw new Error('invariant requires an error message argument');
-	    }
-	  }
-
-	  if (!condition) {
-	    var error;
-	    if (format === undefined) {
-	      error = new Error(
-	        'Minified exception occurred; use the non-minified dev environment ' +
-	        'for the full error message and additional helpful warnings.'
-	      );
-	    } else {
-	      var args = [a, b, c, d, e, f];
-	      var argIndex = 0;
-	      error = new Error(
-	        format.replace(/%s/g, function() { return args[argIndex++]; })
-	      );
-	      error.name = 'Invariant Violation';
-	    }
-
-	    error.framesToPop = 1; // we don't care about invariant's own frame
-	    throw error;
-	  }
-	};
-
-	module.exports = invariant;
-
-
-/***/ },
-/* 18 */
-/***/ function(module, exports) {
-
-	/* Built-in method references for those with the same name as other `lodash` methods. */
-	var nativeGetPrototype = Object.getPrototypeOf;
-
-	/**
-	 * Gets the `[[Prototype]]` of `value`.
-	 *
-	 * @private
-	 * @param {*} value The value to query.
-	 * @returns {null|Object} Returns the `[[Prototype]]`.
-	 */
-	function getPrototype(value) {
-	  return nativeGetPrototype(Object(value));
-	}
-
-	module.exports = getPrototype;
-
-
-/***/ },
-/* 19 */
-/***/ function(module, exports) {
-
-	/**
-	 * Checks if `value` is a host object in IE < 9.
-	 *
-	 * @private
-	 * @param {*} value The value to check.
-	 * @returns {boolean} Returns `true` if `value` is a host object, else `false`.
-	 */
-	function isHostObject(value) {
-	  // Many host objects are `Object` objects that can coerce to strings
-	  // despite having improperly defined `toString` methods.
-	  var result = false;
-	  if (value != null && typeof value.toString != 'function') {
-	    try {
-	      result = !!(value + '');
-	    } catch (e) {}
-	  }
-	  return result;
-	}
-
-	module.exports = isHostObject;
-
-
-/***/ },
-/* 20 */
-/***/ function(module, exports) {
-
-	/**
-	 * Checks if `value` is object-like. A value is object-like if it's not `null`
-	 * and has a `typeof` result of "object".
-	 *
-	 * @static
-	 * @memberOf _
-	 * @since 4.0.0
-	 * @category Lang
-	 * @param {*} value The value to check.
-	 * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
-	 * @example
-	 *
-	 * _.isObjectLike({});
-	 * // => true
-	 *
-	 * _.isObjectLike([1, 2, 3]);
-	 * // => true
-	 *
-	 * _.isObjectLike(_.noop);
-	 * // => false
-	 *
-	 * _.isObjectLike(null);
-	 * // => false
-	 */
-	function isObjectLike(value) {
-	  return !!value && typeof value == 'object';
-	}
-
-	module.exports = isObjectLike;
-
-
-/***/ },
-/* 21 */
-/***/ function(module, exports, __webpack_require__) {
-
-	var getPrototype = __webpack_require__(18),
-	    isHostObject = __webpack_require__(19),
-	    isObjectLike = __webpack_require__(20);
-
-	/** `Object#toString` result references. */
-	var objectTag = '[object Object]';
-
-	/** Used for built-in method references. */
-	var objectProto = Object.prototype;
-
-	/** Used to resolve the decompiled source of functions. */
-	var funcToString = Function.prototype.toString;
-
-	/** Used to check objects for own properties. */
-	var hasOwnProperty = objectProto.hasOwnProperty;
-
-	/** Used to infer the `Object` constructor. */
-	var objectCtorString = funcToString.call(Object);
-
-	/**
-	 * Used to resolve the
-	 * [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
-	 * of values.
-	 */
-	var objectToString = objectProto.toString;
-
-	/**
-	 * Checks if `value` is a plain object, that is, an object created by the
-	 * `Object` constructor or one with a `[[Prototype]]` of `null`.
-	 *
-	 * @static
-	 * @memberOf _
-	 * @since 0.8.0
-	 * @category Lang
-	 * @param {*} value The value to check.
-	 * @returns {boolean} Returns `true` if `value` is a plain object,
-	 *  else `false`.
-	 * @example
-	 *
-	 * function Foo() {
-	 *   this.a = 1;
-	 * }
-	 *
-	 * _.isPlainObject(new Foo);
-	 * // => false
-	 *
-	 * _.isPlainObject([1, 2, 3]);
-	 * // => false
-	 *
-	 * _.isPlainObject({ 'x': 0, 'y': 0 });
-	 * // => true
-	 *
-	 * _.isPlainObject(Object.create(null));
-	 * // => true
-	 */
-	function isPlainObject(value) {
-	  if (!isObjectLike(value) ||
-	      objectToString.call(value) != objectTag || isHostObject(value)) {
-	    return false;
-	  }
-	  var proto = getPrototype(value);
-	  if (proto === null) {
-	    return true;
-	  }
-	  var Ctor = hasOwnProperty.call(proto, 'constructor') && proto.constructor;
-	  return (typeof Ctor == 'function' &&
-	    Ctor instanceof Ctor && funcToString.call(Ctor) == objectCtorString);
-	}
-
-	module.exports = isPlainObject;
-
-
-/***/ },
-/* 22 */
-/***/ function(module, exports) {
-
-	module.exports = __WEBPACK_EXTERNAL_MODULE_22__;
-
-/***/ }
-/******/ ])
+ /**
+  * react-redux v5.0.6
+  */
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('devtools/client/shared/vendor/react'), require('devtools/client/shared/vendor/redux')) :
+	typeof define === 'function' && define.amd ? define(['exports', 'devtools/client/shared/vendor/react', 'devtools/client/shared/vendor/redux'], factory) :
+	(factory((global.ReactRedux = global.ReactRedux || {}),global.React,global.Redux));
+}(this, (function (exports,react,redux) { 'use strict';
+
+function createCommonjsModule(fn, module) {
+	return module = { exports: {} }, fn(module, module.exports), module.exports;
+}
+
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * 
+ */
+
+function makeEmptyFunction(arg) {
+  return function () {
+    return arg;
+  };
+}
+
+/**
+ * This function accepts and discards inputs; it has no side effects. This is
+ * primarily useful idiomatically for overridable function endpoints which
+ * always need to be callable, since JS lacks a null-call idiom ala Cocoa.
+ */
+var emptyFunction = function emptyFunction() {};
+
+emptyFunction.thatReturns = makeEmptyFunction;
+emptyFunction.thatReturnsFalse = makeEmptyFunction(false);
+emptyFunction.thatReturnsTrue = makeEmptyFunction(true);
+emptyFunction.thatReturnsNull = makeEmptyFunction(null);
+emptyFunction.thatReturnsThis = function () {
+  return this;
+};
+emptyFunction.thatReturnsArgument = function (arg) {
+  return arg;
+};
+
+var emptyFunction_1 = emptyFunction;
+
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+
+/**
+ * Use invariant() to assert state which your program assumes to be true.
+ *
+ * Provide sprintf-style format (only %s is supported) and arguments
+ * to provide information about what broke and what you were
+ * expecting.
+ *
+ * The invariant message will be stripped in production, but the invariant
+ * will remain to ensure logic does not differ in production.
+ */
+
+var validateFormat = function validateFormat(format) {};
+
+{
+  validateFormat = function validateFormat(format) {
+    if (format === undefined) {
+      throw new Error('invariant requires an error message argument');
+    }
+  };
+}
+
+function invariant(condition, format, a, b, c, d, e, f) {
+  validateFormat(format);
+
+  if (!condition) {
+    var error;
+    if (format === undefined) {
+      error = new Error('Minified exception occurred; use the non-minified dev environment ' + 'for the full error message and additional helpful warnings.');
+    } else {
+      var args = [a, b, c, d, e, f];
+      var argIndex = 0;
+      error = new Error(format.replace(/%s/g, function () {
+        return args[argIndex++];
+      }));
+      error.name = 'Invariant Violation';
+    }
+
+    error.framesToPop = 1; // we don't care about invariant's own frame
+    throw error;
+  }
+}
+
+var invariant_1 = invariant;
+
+/**
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
+
+var warning = emptyFunction_1;
+
+{
+  var printWarning = function printWarning(format) {
+    for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
+    }
+
+    var argIndex = 0;
+    var message = 'Warning: ' + format.replace(/%s/g, function () {
+      return args[argIndex++];
+    });
+    if (typeof console !== 'undefined') {
+      console.error(message);
+    }
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      throw new Error(message);
+    } catch (x) {}
+  };
+
+  warning = function warning(condition, format) {
+    if (format === undefined) {
+      throw new Error('`warning(condition, format, ...args)` requires a warning ' + 'message argument');
+    }
+
+    if (format.indexOf('Failed Composite propType: ') === 0) {
+      return; // Ignore CompositeComponent proptype check.
+    }
+
+    if (!condition) {
+      for (var _len2 = arguments.length, args = Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
+        args[_key2 - 2] = arguments[_key2];
+      }
+
+      printWarning.apply(undefined, [format].concat(args));
+    }
+  };
+}
+
+var warning_1 = warning;
+
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+var ReactPropTypesSecret = 'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED';
+
+var ReactPropTypesSecret_1 = ReactPropTypesSecret;
+
+{
+  var invariant$1 = invariant_1;
+  var warning$1 = warning_1;
+  var ReactPropTypesSecret$1 = ReactPropTypesSecret_1;
+  var loggedTypeFailures = {};
+}
+
+/**
+ * Assert that the values match with the type specs.
+ * Error messages are memorized and will only be shown once.
+ *
+ * @param {object} typeSpecs Map of name to a ReactPropType
+ * @param {object} values Runtime values that need to be type-checked
+ * @param {string} location e.g. "prop", "context", "child context"
+ * @param {string} componentName Name of the component for error messages.
+ * @param {?Function} getStack Returns the component stack.
+ * @private
+ */
+function checkPropTypes(typeSpecs, values, location, componentName, getStack) {
+  {
+    for (var typeSpecName in typeSpecs) {
+      if (typeSpecs.hasOwnProperty(typeSpecName)) {
+        var error;
+        // Prop type validation may throw. In case they do, we don't want to
+        // fail the render phase where it didn't fail before. So we log it.
+        // After these have been cleaned up, we'll let them throw.
+        try {
+          // This is intentionally an invariant that gets caught. It's the same
+          // behavior as without this statement except with a better message.
+          invariant$1(typeof typeSpecs[typeSpecName] === 'function', '%s: %s type `%s` is invalid; it must be a function, usually from ' + 'React.PropTypes.', componentName || 'React class', location, typeSpecName);
+          error = typeSpecs[typeSpecName](values, typeSpecName, componentName, location, null, ReactPropTypesSecret$1);
+        } catch (ex) {
+          error = ex;
+        }
+        warning$1(!error || error instanceof Error, '%s: type specification of %s `%s` is invalid; the type checker ' + 'function must return `null` or an `Error` but returned a %s. ' + 'You may have forgotten to pass an argument to the type checker ' + 'creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and ' + 'shape all require an argument).', componentName || 'React class', location, typeSpecName, typeof error);
+        if (error instanceof Error && !(error.message in loggedTypeFailures)) {
+          // Only monitor this failure once because there tends to be a lot of the
+          // same error.
+          loggedTypeFailures[error.message] = true;
+
+          var stack = getStack ? getStack() : '';
+
+          warning$1(false, 'Failed %s type: %s%s', location, error.message, stack != null ? stack : '');
+        }
+      }
+    }
+  }
+}
+
+var checkPropTypes_1 = checkPropTypes;
+
+var factoryWithTypeCheckers = function(isValidElement, throwOnDirectAccess) {
+  /* global Symbol */
+  var ITERATOR_SYMBOL = typeof Symbol === 'function' && Symbol.iterator;
+  var FAUX_ITERATOR_SYMBOL = '@@iterator'; // Before Symbol spec.
+
+  /**
+   * Returns the iterator method function contained on the iterable object.
+   *
+   * Be sure to invoke the function with the iterable as context:
+   *
+   *     var iteratorFn = getIteratorFn(myIterable);
+   *     if (iteratorFn) {
+   *       var iterator = iteratorFn.call(myIterable);
+   *       ...
+   *     }
+   *
+   * @param {?object} maybeIterable
+   * @return {?function}
+   */
+  function getIteratorFn(maybeIterable) {
+    var iteratorFn = maybeIterable && (ITERATOR_SYMBOL && maybeIterable[ITERATOR_SYMBOL] || maybeIterable[FAUX_ITERATOR_SYMBOL]);
+    if (typeof iteratorFn === 'function') {
+      return iteratorFn;
+    }
+  }
+
+  /**
+   * Collection of methods that allow declaration and validation of props that are
+   * supplied to React components. Example usage:
+   *
+   *   var Props = require('ReactPropTypes');
+   *   var MyArticle = React.createClass({
+   *     propTypes: {
+   *       // An optional string prop named "description".
+   *       description: Props.string,
+   *
+   *       // A required enum prop named "category".
+   *       category: Props.oneOf(['News','Photos']).isRequired,
+   *
+   *       // A prop named "dialog" that requires an instance of Dialog.
+   *       dialog: Props.instanceOf(Dialog).isRequired
+   *     },
+   *     render: function() { ... }
+   *   });
+   *
+   * A more formal specification of how these methods are used:
+   *
+   *   type := array|bool|func|object|number|string|oneOf([...])|instanceOf(...)
+   *   decl := ReactPropTypes.{type}(.isRequired)?
+   *
+   * Each and every declaration produces a function with the same signature. This
+   * allows the creation of custom validation functions. For example:
+   *
+   *  var MyLink = React.createClass({
+   *    propTypes: {
+   *      // An optional string or URI prop named "href".
+   *      href: function(props, propName, componentName) {
+   *        var propValue = props[propName];
+   *        if (propValue != null && typeof propValue !== 'string' &&
+   *            !(propValue instanceof URI)) {
+   *          return new Error(
+   *            'Expected a string or an URI for ' + propName + ' in ' +
+   *            componentName
+   *          );
+   *        }
+   *      }
+   *    },
+   *    render: function() {...}
+   *  });
+   *
+   * @internal
+   */
+
+  var ANONYMOUS = '<<anonymous>>';
+
+  // Important!
+  // Keep this list in sync with production version in `./factoryWithThrowingShims.js`.
+  var ReactPropTypes = {
+    array: createPrimitiveTypeChecker('array'),
+    bool: createPrimitiveTypeChecker('boolean'),
+    func: createPrimitiveTypeChecker('function'),
+    number: createPrimitiveTypeChecker('number'),
+    object: createPrimitiveTypeChecker('object'),
+    string: createPrimitiveTypeChecker('string'),
+    symbol: createPrimitiveTypeChecker('symbol'),
+
+    any: createAnyTypeChecker(),
+    arrayOf: createArrayOfTypeChecker,
+    element: createElementTypeChecker(),
+    instanceOf: createInstanceTypeChecker,
+    node: createNodeChecker(),
+    objectOf: createObjectOfTypeChecker,
+    oneOf: createEnumTypeChecker,
+    oneOfType: createUnionTypeChecker,
+    shape: createShapeTypeChecker
+  };
+
+  /**
+   * inlined Object.is polyfill to avoid requiring consumers ship their own
+   * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
+   */
+  /*eslint-disable no-self-compare*/
+  function is(x, y) {
+    // SameValue algorithm
+    if (x === y) {
+      // Steps 1-5, 7-10
+      // Steps 6.b-6.e: +0 != -0
+      return x !== 0 || 1 / x === 1 / y;
+    } else {
+      // Step 6.a: NaN == NaN
+      return x !== x && y !== y;
+    }
+  }
+  /*eslint-enable no-self-compare*/
+
+  /**
+   * We use an Error-like object for backward compatibility as people may call
+   * PropTypes directly and inspect their output. However, we don't use real
+   * Errors anymore. We don't inspect their stack anyway, and creating them
+   * is prohibitively expensive if they are created too often, such as what
+   * happens in oneOfType() for any type before the one that matched.
+   */
+  function PropTypeError(message) {
+    this.message = message;
+    this.stack = '';
+  }
+  // Make `instanceof Error` still work for returned errors.
+  PropTypeError.prototype = Error.prototype;
+
+  function createChainableTypeChecker(validate) {
+    {
+      var manualPropTypeCallCache = {};
+      var manualPropTypeWarningCount = 0;
+    }
+    function checkType(isRequired, props, propName, componentName, location, propFullName, secret) {
+      componentName = componentName || ANONYMOUS;
+      propFullName = propFullName || propName;
+
+      if (secret !== ReactPropTypesSecret_1) {
+        if (throwOnDirectAccess) {
+          // New behavior only for users of `prop-types` package
+          invariant_1(
+            false,
+            'Calling PropTypes validators directly is not supported by the `prop-types` package. ' +
+            'Use `PropTypes.checkPropTypes()` to call them. ' +
+            'Read more at http://fb.me/use-check-prop-types'
+          );
+        } else if ("development" !== 'production' && typeof console !== 'undefined') {
+          // Old behavior for people using React.PropTypes
+          var cacheKey = componentName + ':' + propName;
+          if (
+            !manualPropTypeCallCache[cacheKey] &&
+            // Avoid spamming the console because they are often not actionable except for lib authors
+            manualPropTypeWarningCount < 3
+          ) {
+            warning_1(
+              false,
+              'You are manually calling a React.PropTypes validation ' +
+              'function for the `%s` prop on `%s`. This is deprecated ' +
+              'and will throw in the standalone `prop-types` package. ' +
+              'You may be seeing this warning due to a third-party PropTypes ' +
+              'library. See https://fb.me/react-warning-dont-call-proptypes ' + 'for details.',
+              propFullName,
+              componentName
+            );
+            manualPropTypeCallCache[cacheKey] = true;
+            manualPropTypeWarningCount++;
+          }
+        }
+      }
+      if (props[propName] == null) {
+        if (isRequired) {
+          if (props[propName] === null) {
+            return new PropTypeError('The ' + location + ' `' + propFullName + '` is marked as required ' + ('in `' + componentName + '`, but its value is `null`.'));
+          }
+          return new PropTypeError('The ' + location + ' `' + propFullName + '` is marked as required in ' + ('`' + componentName + '`, but its value is `undefined`.'));
+        }
+        return null;
+      } else {
+        return validate(props, propName, componentName, location, propFullName);
+      }
+    }
+
+    var chainedCheckType = checkType.bind(null, false);
+    chainedCheckType.isRequired = checkType.bind(null, true);
+
+    return chainedCheckType;
+  }
+
+  function createPrimitiveTypeChecker(expectedType) {
+    function validate(props, propName, componentName, location, propFullName, secret) {
+      var propValue = props[propName];
+      var propType = getPropType(propValue);
+      if (propType !== expectedType) {
+        // `propValue` being instance of, say, date/regexp, pass the 'object'
+        // check, but we can offer a more precise error message here rather than
+        // 'of type `object`'.
+        var preciseType = getPreciseType(propValue);
+
+        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + preciseType + '` supplied to `' + componentName + '`, expected ') + ('`' + expectedType + '`.'));
+      }
+      return null;
+    }
+    return createChainableTypeChecker(validate);
+  }
+
+  function createAnyTypeChecker() {
+    return createChainableTypeChecker(emptyFunction_1.thatReturnsNull);
+  }
+
+  function createArrayOfTypeChecker(typeChecker) {
+    function validate(props, propName, componentName, location, propFullName) {
+      if (typeof typeChecker !== 'function') {
+        return new PropTypeError('Property `' + propFullName + '` of component `' + componentName + '` has invalid PropType notation inside arrayOf.');
+      }
+      var propValue = props[propName];
+      if (!Array.isArray(propValue)) {
+        var propType = getPropType(propValue);
+        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + propType + '` supplied to `' + componentName + '`, expected an array.'));
+      }
+      for (var i = 0; i < propValue.length; i++) {
+        var error = typeChecker(propValue, i, componentName, location, propFullName + '[' + i + ']', ReactPropTypesSecret_1);
+        if (error instanceof Error) {
+          return error;
+        }
+      }
+      return null;
+    }
+    return createChainableTypeChecker(validate);
+  }
+
+  function createElementTypeChecker() {
+    function validate(props, propName, componentName, location, propFullName) {
+      var propValue = props[propName];
+      if (!isValidElement(propValue)) {
+        var propType = getPropType(propValue);
+        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + propType + '` supplied to `' + componentName + '`, expected a single ReactElement.'));
+      }
+      return null;
+    }
+    return createChainableTypeChecker(validate);
+  }
+
+  function createInstanceTypeChecker(expectedClass) {
+    function validate(props, propName, componentName, location, propFullName) {
+      if (!(props[propName] instanceof expectedClass)) {
+        var expectedClassName = expectedClass.name || ANONYMOUS;
+        var actualClassName = getClassName(props[propName]);
+        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + actualClassName + '` supplied to `' + componentName + '`, expected ') + ('instance of `' + expectedClassName + '`.'));
+      }
+      return null;
+    }
+    return createChainableTypeChecker(validate);
+  }
+
+  function createEnumTypeChecker(expectedValues) {
+    if (!Array.isArray(expectedValues)) {
+      warning_1(false, 'Invalid argument supplied to oneOf, expected an instance of array.');
+      return emptyFunction_1.thatReturnsNull;
+    }
+
+    function validate(props, propName, componentName, location, propFullName) {
+      var propValue = props[propName];
+      for (var i = 0; i < expectedValues.length; i++) {
+        if (is(propValue, expectedValues[i])) {
+          return null;
+        }
+      }
+
+      var valuesString = JSON.stringify(expectedValues);
+      return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of value `' + propValue + '` ' + ('supplied to `' + componentName + '`, expected one of ' + valuesString + '.'));
+    }
+    return createChainableTypeChecker(validate);
+  }
+
+  function createObjectOfTypeChecker(typeChecker) {
+    function validate(props, propName, componentName, location, propFullName) {
+      if (typeof typeChecker !== 'function') {
+        return new PropTypeError('Property `' + propFullName + '` of component `' + componentName + '` has invalid PropType notation inside objectOf.');
+      }
+      var propValue = props[propName];
+      var propType = getPropType(propValue);
+      if (propType !== 'object') {
+        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type ' + ('`' + propType + '` supplied to `' + componentName + '`, expected an object.'));
+      }
+      for (var key in propValue) {
+        if (propValue.hasOwnProperty(key)) {
+          var error = typeChecker(propValue, key, componentName, location, propFullName + '.' + key, ReactPropTypesSecret_1);
+          if (error instanceof Error) {
+            return error;
+          }
+        }
+      }
+      return null;
+    }
+    return createChainableTypeChecker(validate);
+  }
+
+  function createUnionTypeChecker(arrayOfTypeCheckers) {
+    if (!Array.isArray(arrayOfTypeCheckers)) {
+      warning_1(false, 'Invalid argument supplied to oneOfType, expected an instance of array.');
+      return emptyFunction_1.thatReturnsNull;
+    }
+
+    for (var i = 0; i < arrayOfTypeCheckers.length; i++) {
+      var checker = arrayOfTypeCheckers[i];
+      if (typeof checker !== 'function') {
+        warning_1(
+          false,
+          'Invalid argument supplid to oneOfType. Expected an array of check functions, but ' +
+          'received %s at index %s.',
+          getPostfixForTypeWarning(checker),
+          i
+        );
+        return emptyFunction_1.thatReturnsNull;
+      }
+    }
+
+    function validate(props, propName, componentName, location, propFullName) {
+      for (var i = 0; i < arrayOfTypeCheckers.length; i++) {
+        var checker = arrayOfTypeCheckers[i];
+        if (checker(props, propName, componentName, location, propFullName, ReactPropTypesSecret_1) == null) {
+          return null;
+        }
+      }
+
+      return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` supplied to ' + ('`' + componentName + '`.'));
+    }
+    return createChainableTypeChecker(validate);
+  }
+
+  function createNodeChecker() {
+    function validate(props, propName, componentName, location, propFullName) {
+      if (!isNode(props[propName])) {
+        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` supplied to ' + ('`' + componentName + '`, expected a ReactNode.'));
+      }
+      return null;
+    }
+    return createChainableTypeChecker(validate);
+  }
+
+  function createShapeTypeChecker(shapeTypes) {
+    function validate(props, propName, componentName, location, propFullName) {
+      var propValue = props[propName];
+      var propType = getPropType(propValue);
+      if (propType !== 'object') {
+        return new PropTypeError('Invalid ' + location + ' `' + propFullName + '` of type `' + propType + '` ' + ('supplied to `' + componentName + '`, expected `object`.'));
+      }
+      for (var key in shapeTypes) {
+        var checker = shapeTypes[key];
+        if (!checker) {
+          continue;
+        }
+        var error = checker(propValue, key, componentName, location, propFullName + '.' + key, ReactPropTypesSecret_1);
+        if (error) {
+          return error;
+        }
+      }
+      return null;
+    }
+    return createChainableTypeChecker(validate);
+  }
+
+  function isNode(propValue) {
+    switch (typeof propValue) {
+      case 'number':
+      case 'string':
+      case 'undefined':
+        return true;
+      case 'boolean':
+        return !propValue;
+      case 'object':
+        if (Array.isArray(propValue)) {
+          return propValue.every(isNode);
+        }
+        if (propValue === null || isValidElement(propValue)) {
+          return true;
+        }
+
+        var iteratorFn = getIteratorFn(propValue);
+        if (iteratorFn) {
+          var iterator = iteratorFn.call(propValue);
+          var step;
+          if (iteratorFn !== propValue.entries) {
+            while (!(step = iterator.next()).done) {
+              if (!isNode(step.value)) {
+                return false;
+              }
+            }
+          } else {
+            // Iterator will provide entry [k,v] tuples rather than values.
+            while (!(step = iterator.next()).done) {
+              var entry = step.value;
+              if (entry) {
+                if (!isNode(entry[1])) {
+                  return false;
+                }
+              }
+            }
+          }
+        } else {
+          return false;
+        }
+
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  function isSymbol(propType, propValue) {
+    // Native Symbol.
+    if (propType === 'symbol') {
+      return true;
+    }
+
+    // 19.4.3.5 Symbol.prototype[@@toStringTag] === 'Symbol'
+    if (propValue['@@toStringTag'] === 'Symbol') {
+      return true;
+    }
+
+    // Fallback for non-spec compliant Symbols which are polyfilled.
+    if (typeof Symbol === 'function' && propValue instanceof Symbol) {
+      return true;
+    }
+
+    return false;
+  }
+
+  // Equivalent of `typeof` but with special handling for array and regexp.
+  function getPropType(propValue) {
+    var propType = typeof propValue;
+    if (Array.isArray(propValue)) {
+      return 'array';
+    }
+    if (propValue instanceof RegExp) {
+      // Old webkits (at least until Android 4.0) return 'function' rather than
+      // 'object' for typeof a RegExp. We'll normalize this here so that /bla/
+      // passes PropTypes.object.
+      return 'object';
+    }
+    if (isSymbol(propType, propValue)) {
+      return 'symbol';
+    }
+    return propType;
+  }
+
+  // This handles more types than `getPropType`. Only used for error messages.
+  // See `createPrimitiveTypeChecker`.
+  function getPreciseType(propValue) {
+    if (typeof propValue === 'undefined' || propValue === null) {
+      return '' + propValue;
+    }
+    var propType = getPropType(propValue);
+    if (propType === 'object') {
+      if (propValue instanceof Date) {
+        return 'date';
+      } else if (propValue instanceof RegExp) {
+        return 'regexp';
+      }
+    }
+    return propType;
+  }
+
+  // Returns a string that is postfixed to a warning about an invalid type.
+  // For example, "undefined" or "of type array"
+  function getPostfixForTypeWarning(value) {
+    var type = getPreciseType(value);
+    switch (type) {
+      case 'array':
+      case 'object':
+        return 'an ' + type;
+      case 'boolean':
+      case 'date':
+      case 'regexp':
+        return 'a ' + type;
+      default:
+        return type;
+    }
+  }
+
+  // Returns class name of the object, if any.
+  function getClassName(propValue) {
+    if (!propValue.constructor || !propValue.constructor.name) {
+      return ANONYMOUS;
+    }
+    return propValue.constructor.name;
+  }
+
+  ReactPropTypes.checkPropTypes = checkPropTypes_1;
+  ReactPropTypes.PropTypes = ReactPropTypes;
+
+  return ReactPropTypes;
+};
+
+var index = createCommonjsModule(function (module) {
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+{
+  var REACT_ELEMENT_TYPE = (typeof Symbol === 'function' &&
+    Symbol.for &&
+    Symbol.for('react.element')) ||
+    0xeac7;
+
+  var isValidElement = function(object) {
+    return typeof object === 'object' &&
+      object !== null &&
+      object.$$typeof === REACT_ELEMENT_TYPE;
+  };
+
+  // By explicitly using `prop-types` you are opting into new development behavior.
+  // http://fb.me/prop-types-in-prod
+  var throwOnDirectAccess = true;
+  module.exports = factoryWithTypeCheckers(isValidElement, throwOnDirectAccess);
+}
 });
-;
+
+var subscriptionShape = index.shape({
+  trySubscribe: index.func.isRequired,
+  tryUnsubscribe: index.func.isRequired,
+  notifyNestedSubs: index.func.isRequired,
+  isSubscribed: index.func.isRequired
+});
+
+var storeShape = index.shape({
+  subscribe: index.func.isRequired,
+  dispatch: index.func.isRequired,
+  getState: index.func.isRequired
+});
+
+/**
+ * Prints a warning in the console if it exists.
+ *
+ * @param {String} message The warning message.
+ * @returns {void}
+ */
+function warning$2(message) {
+  /* eslint-disable no-console */
+  if (typeof console !== 'undefined' && typeof console.error === 'function') {
+    console.error(message);
+  }
+  /* eslint-enable no-console */
+  try {
+    // This error was thrown as a convenience so that if you enable
+    // "break on all exceptions" in your console,
+    // it would pause the execution at this line.
+    throw new Error(message);
+    /* eslint-disable no-empty */
+  } catch (e) {}
+  /* eslint-enable no-empty */
+}
+
+var classCallCheck = function (instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+};
+
+
+
+
+
+
+
+
+
+var _extends = Object.assign || function (target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i];
+
+    for (var key in source) {
+      if (Object.prototype.hasOwnProperty.call(source, key)) {
+        target[key] = source[key];
+      }
+    }
+  }
+
+  return target;
+};
+
+
+
+var inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+};
+
+
+
+
+
+
+
+
+
+var objectWithoutProperties = function (obj, keys) {
+  var target = {};
+
+  for (var i in obj) {
+    if (keys.indexOf(i) >= 0) continue;
+    if (!Object.prototype.hasOwnProperty.call(obj, i)) continue;
+    target[i] = obj[i];
+  }
+
+  return target;
+};
+
+var possibleConstructorReturn = function (self, call) {
+  if (!self) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+
+  return call && (typeof call === "object" || typeof call === "function") ? call : self;
+};
+
+var didWarnAboutReceivingStore = false;
+function warnAboutReceivingStore() {
+  if (didWarnAboutReceivingStore) {
+    return;
+  }
+  didWarnAboutReceivingStore = true;
+
+  warning$2('<Provider> does not support changing `store` on the fly. ' + 'It is most likely that you see this error because you updated to ' + 'Redux 2.x and React Redux 2.x which no longer hot reload reducers ' + 'automatically. See https://github.com/reactjs/react-redux/releases/' + 'tag/v2.0.0 for the migration instructions.');
+}
+
+function createProvider() {
+  var _Provider$childContex;
+
+  var storeKey = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'store';
+  var subKey = arguments[1];
+
+  var subscriptionKey = subKey || storeKey + 'Subscription';
+
+  var Provider = function (_Component) {
+    inherits(Provider, _Component);
+
+    Provider.prototype.getChildContext = function getChildContext() {
+      var _ref;
+
+      return _ref = {}, _ref[storeKey] = this[storeKey], _ref[subscriptionKey] = null, _ref;
+    };
+
+    function Provider(props, context) {
+      classCallCheck(this, Provider);
+
+      var _this = possibleConstructorReturn(this, _Component.call(this, props, context));
+
+      _this[storeKey] = props.store;
+      return _this;
+    }
+
+    Provider.prototype.render = function render() {
+      return react.Children.only(this.props.children);
+    };
+
+    return Provider;
+  }(react.Component);
+
+  {
+    Provider.prototype.componentWillReceiveProps = function (nextProps) {
+      if (this[storeKey] !== nextProps.store) {
+        warnAboutReceivingStore();
+      }
+    };
+  }
+
+  Provider.propTypes = {
+    store: storeShape.isRequired,
+    children: index.element.isRequired
+  };
+  Provider.childContextTypes = (_Provider$childContex = {}, _Provider$childContex[storeKey] = storeShape.isRequired, _Provider$childContex[subscriptionKey] = subscriptionShape, _Provider$childContex);
+
+  return Provider;
+}
+
+var Provider = createProvider();
+
+/**
+ * Copyright 2015, Yahoo! Inc.
+ * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
+ */
+var REACT_STATICS = {
+    childContextTypes: true,
+    contextTypes: true,
+    defaultProps: true,
+    displayName: true,
+    getDefaultProps: true,
+    mixins: true,
+    propTypes: true,
+    type: true
+};
+
+var KNOWN_STATICS = {
+  name: true,
+  length: true,
+  prototype: true,
+  caller: true,
+  callee: true,
+  arguments: true,
+  arity: true
+};
+
+var getOwnPropertySymbols = Object.getOwnPropertySymbols;
+var propIsEnumerable = Object.prototype.propertyIsEnumerable;
+var getPrototypeOf = Object.getPrototypeOf;
+var objectPrototype = getPrototypeOf && getPrototypeOf(Object);
+var getOwnPropertyNames = Object.getOwnPropertyNames;
+
+var index$1 = function hoistNonReactStatics(targetComponent, sourceComponent, blacklist) {
+    if (typeof sourceComponent !== 'string') { // don't hoist over string (html) components
+
+        if (objectPrototype) {
+            var inheritedComponent = getPrototypeOf(sourceComponent);
+            if (inheritedComponent && inheritedComponent !== objectPrototype) {
+                hoistNonReactStatics(targetComponent, inheritedComponent, blacklist);
+            }
+        }
+
+        var keys = getOwnPropertyNames(sourceComponent);
+
+        if (getOwnPropertySymbols) {
+            keys = keys.concat(getOwnPropertySymbols(sourceComponent));
+        }
+
+        for (var i = 0; i < keys.length; ++i) {
+            var key = keys[i];
+            if (!REACT_STATICS[key] && !KNOWN_STATICS[key] && (!blacklist || !blacklist[key])) {
+                // Only hoist enumerables and non-enumerable functions
+                if(propIsEnumerable.call(sourceComponent, key) || typeof sourceComponent[key] === 'function') {
+                    try { // Avoid failures from read-only properties
+                        targetComponent[key] = sourceComponent[key];
+                    } catch (e) {}
+                }
+            }
+        }
+
+        return targetComponent;
+    }
+
+    return targetComponent;
+};
+
+/**
+ * Copyright 2013-2015, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/**
+ * Use invariant() to assert state which your program assumes to be true.
+ *
+ * Provide sprintf-style format (only %s is supported) and arguments
+ * to provide information about what broke and what you were
+ * expecting.
+ *
+ * The invariant message will be stripped in production, but the invariant
+ * will remain to ensure logic does not differ in production.
+ */
+
+var NODE_ENV = "development";
+
+var invariant$2 = function(condition, format, a, b, c, d, e, f) {
+  if (NODE_ENV !== 'production') {
+    if (format === undefined) {
+      throw new Error('invariant requires an error message argument');
+    }
+  }
+
+  if (!condition) {
+    var error;
+    if (format === undefined) {
+      error = new Error(
+        'Minified exception occurred; use the non-minified dev environment ' +
+        'for the full error message and additional helpful warnings.'
+      );
+    } else {
+      var args = [a, b, c, d, e, f];
+      var argIndex = 0;
+      error = new Error(
+        format.replace(/%s/g, function() { return args[argIndex++]; })
+      );
+      error.name = 'Invariant Violation';
+    }
+
+    error.framesToPop = 1; // we don't care about invariant's own frame
+    throw error;
+  }
+};
+
+var invariant_1$2 = invariant$2;
+
+// encapsulates the subscription logic for connecting a component to the redux store, as
+// well as nesting subscriptions of descendant components, so that we can ensure the
+// ancestor components re-render before descendants
+
+var CLEARED = null;
+var nullListeners = {
+  notify: function notify() {}
+};
+
+function createListenerCollection() {
+  // the current/next pattern is copied from redux's createStore code.
+  // TODO: refactor+expose that code to be reusable here?
+  var current = [];
+  var next = [];
+
+  return {
+    clear: function clear() {
+      next = CLEARED;
+      current = CLEARED;
+    },
+    notify: function notify() {
+      var listeners = current = next;
+      for (var i = 0; i < listeners.length; i++) {
+        listeners[i]();
+      }
+    },
+    get: function get$$1() {
+      return next;
+    },
+    subscribe: function subscribe(listener) {
+      var isSubscribed = true;
+      if (next === current) next = current.slice();
+      next.push(listener);
+
+      return function unsubscribe() {
+        if (!isSubscribed || current === CLEARED) return;
+        isSubscribed = false;
+
+        if (next === current) next = current.slice();
+        next.splice(next.indexOf(listener), 1);
+      };
+    }
+  };
+}
+
+var Subscription = function () {
+  function Subscription(store, parentSub, onStateChange) {
+    classCallCheck(this, Subscription);
+
+    this.store = store;
+    this.parentSub = parentSub;
+    this.onStateChange = onStateChange;
+    this.unsubscribe = null;
+    this.listeners = nullListeners;
+  }
+
+  Subscription.prototype.addNestedSub = function addNestedSub(listener) {
+    this.trySubscribe();
+    return this.listeners.subscribe(listener);
+  };
+
+  Subscription.prototype.notifyNestedSubs = function notifyNestedSubs() {
+    this.listeners.notify();
+  };
+
+  Subscription.prototype.isSubscribed = function isSubscribed() {
+    return Boolean(this.unsubscribe);
+  };
+
+  Subscription.prototype.trySubscribe = function trySubscribe() {
+    if (!this.unsubscribe) {
+      this.unsubscribe = this.parentSub ? this.parentSub.addNestedSub(this.onStateChange) : this.store.subscribe(this.onStateChange);
+
+      this.listeners = createListenerCollection();
+    }
+  };
+
+  Subscription.prototype.tryUnsubscribe = function tryUnsubscribe() {
+    if (this.unsubscribe) {
+      this.unsubscribe();
+      this.unsubscribe = null;
+      this.listeners.clear();
+      this.listeners = nullListeners;
+    }
+  };
+
+  return Subscription;
+}();
+
+var hotReloadingVersion = 0;
+var dummyState = {};
+function noop() {}
+function makeSelectorStateful(sourceSelector, store) {
+  // wrap the selector in an object that tracks its results between runs.
+  var selector = {
+    run: function runComponentSelector(props) {
+      try {
+        var nextProps = sourceSelector(store.getState(), props);
+        if (nextProps !== selector.props || selector.error) {
+          selector.shouldComponentUpdate = true;
+          selector.props = nextProps;
+          selector.error = null;
+        }
+      } catch (error) {
+        selector.shouldComponentUpdate = true;
+        selector.error = error;
+      }
+    }
+  };
+
+  return selector;
+}
+
+function connectAdvanced(
+/*
+  selectorFactory is a func that is responsible for returning the selector function used to
+  compute new props from state, props, and dispatch. For example:
+     export default connectAdvanced((dispatch, options) => (state, props) => ({
+      thing: state.things[props.thingId],
+      saveThing: fields => dispatch(actionCreators.saveThing(props.thingId, fields)),
+    }))(YourComponent)
+   Access to dispatch is provided to the factory so selectorFactories can bind actionCreators
+  outside of their selector as an optimization. Options passed to connectAdvanced are passed to
+  the selectorFactory, along with displayName and WrappedComponent, as the second argument.
+   Note that selectorFactory is responsible for all caching/memoization of inbound and outbound
+  props. Do not use connectAdvanced directly without memoizing results between calls to your
+  selector, otherwise the Connect component will re-render on every state or props change.
+*/
+selectorFactory) {
+  var _contextTypes, _childContextTypes;
+
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+      _ref$getDisplayName = _ref.getDisplayName,
+      getDisplayName = _ref$getDisplayName === undefined ? function (name) {
+    return 'ConnectAdvanced(' + name + ')';
+  } : _ref$getDisplayName,
+      _ref$methodName = _ref.methodName,
+      methodName = _ref$methodName === undefined ? 'connectAdvanced' : _ref$methodName,
+      _ref$renderCountProp = _ref.renderCountProp,
+      renderCountProp = _ref$renderCountProp === undefined ? undefined : _ref$renderCountProp,
+      _ref$shouldHandleStat = _ref.shouldHandleStateChanges,
+      shouldHandleStateChanges = _ref$shouldHandleStat === undefined ? true : _ref$shouldHandleStat,
+      _ref$storeKey = _ref.storeKey,
+      storeKey = _ref$storeKey === undefined ? 'store' : _ref$storeKey,
+      _ref$withRef = _ref.withRef,
+      withRef = _ref$withRef === undefined ? false : _ref$withRef,
+      connectOptions = objectWithoutProperties(_ref, ['getDisplayName', 'methodName', 'renderCountProp', 'shouldHandleStateChanges', 'storeKey', 'withRef']);
+
+  var subscriptionKey = storeKey + 'Subscription';
+  var version = hotReloadingVersion++;
+
+  var contextTypes = (_contextTypes = {}, _contextTypes[storeKey] = storeShape, _contextTypes[subscriptionKey] = subscriptionShape, _contextTypes);
+  var childContextTypes = (_childContextTypes = {}, _childContextTypes[subscriptionKey] = subscriptionShape, _childContextTypes);
+
+  return function wrapWithConnect(WrappedComponent) {
+    invariant_1$2(typeof WrappedComponent == 'function', 'You must pass a component to the function returned by ' + ('connect. Instead received ' + JSON.stringify(WrappedComponent)));
+
+    var wrappedComponentName = WrappedComponent.displayName || WrappedComponent.name || 'Component';
+
+    var displayName = getDisplayName(wrappedComponentName);
+
+    var selectorFactoryOptions = _extends({}, connectOptions, {
+      getDisplayName: getDisplayName,
+      methodName: methodName,
+      renderCountProp: renderCountProp,
+      shouldHandleStateChanges: shouldHandleStateChanges,
+      storeKey: storeKey,
+      withRef: withRef,
+      displayName: displayName,
+      wrappedComponentName: wrappedComponentName,
+      WrappedComponent: WrappedComponent
+    });
+
+    var Connect = function (_Component) {
+      inherits(Connect, _Component);
+
+      function Connect(props, context) {
+        classCallCheck(this, Connect);
+
+        var _this = possibleConstructorReturn(this, _Component.call(this, props, context));
+
+        _this.version = version;
+        _this.state = {};
+        _this.renderCount = 0;
+        _this.store = props[storeKey] || context[storeKey];
+        _this.propsMode = Boolean(props[storeKey]);
+        _this.setWrappedInstance = _this.setWrappedInstance.bind(_this);
+
+        invariant_1$2(_this.store, 'Could not find "' + storeKey + '" in either the context or props of ' + ('"' + displayName + '". Either wrap the root component in a <Provider>, ') + ('or explicitly pass "' + storeKey + '" as a prop to "' + displayName + '".'));
+
+        _this.initSelector();
+        _this.initSubscription();
+        return _this;
+      }
+
+      Connect.prototype.getChildContext = function getChildContext() {
+        var _ref2;
+
+        // If this component received store from props, its subscription should be transparent
+        // to any descendants receiving store+subscription from context; it passes along
+        // subscription passed to it. Otherwise, it shadows the parent subscription, which allows
+        // Connect to control ordering of notifications to flow top-down.
+        var subscription = this.propsMode ? null : this.subscription;
+        return _ref2 = {}, _ref2[subscriptionKey] = subscription || this.context[subscriptionKey], _ref2;
+      };
+
+      Connect.prototype.componentDidMount = function componentDidMount() {
+        if (!shouldHandleStateChanges) return;
+
+        // componentWillMount fires during server side rendering, but componentDidMount and
+        // componentWillUnmount do not. Because of this, trySubscribe happens during ...didMount.
+        // Otherwise, unsubscription would never take place during SSR, causing a memory leak.
+        // To handle the case where a child component may have triggered a state change by
+        // dispatching an action in its componentWillMount, we have to re-run the select and maybe
+        // re-render.
+        this.subscription.trySubscribe();
+        this.selector.run(this.props);
+        if (this.selector.shouldComponentUpdate) this.forceUpdate();
+      };
+
+      Connect.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
+        this.selector.run(nextProps);
+      };
+
+      Connect.prototype.shouldComponentUpdate = function shouldComponentUpdate() {
+        return this.selector.shouldComponentUpdate;
+      };
+
+      Connect.prototype.componentWillUnmount = function componentWillUnmount() {
+        if (this.subscription) this.subscription.tryUnsubscribe();
+        this.subscription = null;
+        this.notifyNestedSubs = noop;
+        this.store = null;
+        this.selector.run = noop;
+        this.selector.shouldComponentUpdate = false;
+      };
+
+      Connect.prototype.getWrappedInstance = function getWrappedInstance() {
+        invariant_1$2(withRef, 'To access the wrapped instance, you need to specify ' + ('{ withRef: true } in the options argument of the ' + methodName + '() call.'));
+        return this.wrappedInstance;
+      };
+
+      Connect.prototype.setWrappedInstance = function setWrappedInstance(ref) {
+        this.wrappedInstance = ref;
+      };
+
+      Connect.prototype.initSelector = function initSelector() {
+        var sourceSelector = selectorFactory(this.store.dispatch, selectorFactoryOptions);
+        this.selector = makeSelectorStateful(sourceSelector, this.store);
+        this.selector.run(this.props);
+      };
+
+      Connect.prototype.initSubscription = function initSubscription() {
+        if (!shouldHandleStateChanges) return;
+
+        // parentSub's source should match where store came from: props vs. context. A component
+        // connected to the store via props shouldn't use subscription from context, or vice versa.
+        var parentSub = (this.propsMode ? this.props : this.context)[subscriptionKey];
+        this.subscription = new Subscription(this.store, parentSub, this.onStateChange.bind(this));
+
+        // `notifyNestedSubs` is duplicated to handle the case where the component is  unmounted in
+        // the middle of the notification loop, where `this.subscription` will then be null. An
+        // extra null check every change can be avoided by copying the method onto `this` and then
+        // replacing it with a no-op on unmount. This can probably be avoided if Subscription's
+        // listeners logic is changed to not call listeners that have been unsubscribed in the
+        // middle of the notification loop.
+        this.notifyNestedSubs = this.subscription.notifyNestedSubs.bind(this.subscription);
+      };
+
+      Connect.prototype.onStateChange = function onStateChange() {
+        this.selector.run(this.props);
+
+        if (!this.selector.shouldComponentUpdate) {
+          this.notifyNestedSubs();
+        } else {
+          this.componentDidUpdate = this.notifyNestedSubsOnComponentDidUpdate;
+          this.setState(dummyState);
+        }
+      };
+
+      Connect.prototype.notifyNestedSubsOnComponentDidUpdate = function notifyNestedSubsOnComponentDidUpdate() {
+        // `componentDidUpdate` is conditionally implemented when `onStateChange` determines it
+        // needs to notify nested subs. Once called, it unimplements itself until further state
+        // changes occur. Doing it this way vs having a permanent `componentDidUpdate` that does
+        // a boolean check every time avoids an extra method call most of the time, resulting
+        // in some perf boost.
+        this.componentDidUpdate = undefined;
+        this.notifyNestedSubs();
+      };
+
+      Connect.prototype.isSubscribed = function isSubscribed() {
+        return Boolean(this.subscription) && this.subscription.isSubscribed();
+      };
+
+      Connect.prototype.addExtraProps = function addExtraProps(props) {
+        if (!withRef && !renderCountProp && !(this.propsMode && this.subscription)) return props;
+        // make a shallow copy so that fields added don't leak to the original selector.
+        // this is especially important for 'ref' since that's a reference back to the component
+        // instance. a singleton memoized selector would then be holding a reference to the
+        // instance, preventing the instance from being garbage collected, and that would be bad
+        var withExtras = _extends({}, props);
+        if (withRef) withExtras.ref = this.setWrappedInstance;
+        if (renderCountProp) withExtras[renderCountProp] = this.renderCount++;
+        if (this.propsMode && this.subscription) withExtras[subscriptionKey] = this.subscription;
+        return withExtras;
+      };
+
+      Connect.prototype.render = function render() {
+        var selector = this.selector;
+        selector.shouldComponentUpdate = false;
+
+        if (selector.error) {
+          throw selector.error;
+        } else {
+          return react.createElement(WrappedComponent, this.addExtraProps(selector.props));
+        }
+      };
+
+      return Connect;
+    }(react.Component);
+
+    Connect.WrappedComponent = WrappedComponent;
+    Connect.displayName = displayName;
+    Connect.childContextTypes = childContextTypes;
+    Connect.contextTypes = contextTypes;
+    Connect.propTypes = contextTypes;
+
+    {
+      Connect.prototype.componentWillUpdate = function componentWillUpdate() {
+        var _this2 = this;
+
+        // We are hot reloading!
+        if (this.version !== version) {
+          this.version = version;
+          this.initSelector();
+
+          // If any connected descendants don't hot reload (and resubscribe in the process), their
+          // listeners will be lost when we unsubscribe. Unfortunately, by copying over all
+          // listeners, this does mean that the old versions of connected descendants will still be
+          // notified of state changes; however, their onStateChange function is a no-op so this
+          // isn't a huge deal.
+          var oldListeners = [];
+
+          if (this.subscription) {
+            oldListeners = this.subscription.listeners.get();
+            this.subscription.tryUnsubscribe();
+          }
+          this.initSubscription();
+          if (shouldHandleStateChanges) {
+            this.subscription.trySubscribe();
+            oldListeners.forEach(function (listener) {
+              return _this2.subscription.listeners.subscribe(listener);
+            });
+          }
+        }
+      };
+    }
+
+    return index$1(Connect, WrappedComponent);
+  };
+}
+
+var hasOwn = Object.prototype.hasOwnProperty;
+
+function is(x, y) {
+  if (x === y) {
+    return x !== 0 || y !== 0 || 1 / x === 1 / y;
+  } else {
+    return x !== x && y !== y;
+  }
+}
+
+function shallowEqual(objA, objB) {
+  if (is(objA, objB)) return true;
+
+  if (typeof objA !== 'object' || objA === null || typeof objB !== 'object' || objB === null) {
+    return false;
+  }
+
+  var keysA = Object.keys(objA);
+  var keysB = Object.keys(objB);
+
+  if (keysA.length !== keysB.length) return false;
+
+  for (var i = 0; i < keysA.length; i++) {
+    if (!hasOwn.call(objB, keysA[i]) || !is(objA[keysA[i]], objB[keysA[i]])) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+/** Detect free variable `global` from Node.js. */
+var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
+
+/** Detect free variable `self`. */
+var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
+
+/** Used as a reference to the global object. */
+var root = freeGlobal || freeSelf || Function('return this')();
+
+/** Built-in value references. */
+var Symbol$1 = root.Symbol;
+
+/** Used for built-in method references. */
+var objectProto$1 = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty$2 = objectProto$1.hasOwnProperty;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var nativeObjectToString = objectProto$1.toString;
+
+/** Built-in value references. */
+var symToStringTag$1 = Symbol$1 ? Symbol$1.toStringTag : undefined;
+
+/**
+ * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the raw `toStringTag`.
+ */
+function getRawTag(value) {
+  var isOwn = hasOwnProperty$2.call(value, symToStringTag$1),
+      tag = value[symToStringTag$1];
+
+  try {
+    value[symToStringTag$1] = undefined;
+    var unmasked = true;
+  } catch (e) {}
+
+  var result = nativeObjectToString.call(value);
+  if (unmasked) {
+    if (isOwn) {
+      value[symToStringTag$1] = tag;
+    } else {
+      delete value[symToStringTag$1];
+    }
+  }
+  return result;
+}
+
+/** Used for built-in method references. */
+var objectProto$2 = Object.prototype;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var nativeObjectToString$1 = objectProto$2.toString;
+
+/**
+ * Converts `value` to a string using `Object.prototype.toString`.
+ *
+ * @private
+ * @param {*} value The value to convert.
+ * @returns {string} Returns the converted string.
+ */
+function objectToString(value) {
+  return nativeObjectToString$1.call(value);
+}
+
+/** `Object#toString` result references. */
+var nullTag = '[object Null]';
+var undefinedTag = '[object Undefined]';
+
+/** Built-in value references. */
+var symToStringTag = Symbol$1 ? Symbol$1.toStringTag : undefined;
+
+/**
+ * The base implementation of `getTag` without fallbacks for buggy environments.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the `toStringTag`.
+ */
+function baseGetTag(value) {
+  if (value == null) {
+    return value === undefined ? undefinedTag : nullTag;
+  }
+  return (symToStringTag && symToStringTag in Object(value))
+    ? getRawTag(value)
+    : objectToString(value);
+}
+
+/**
+ * Creates a unary function that invokes `func` with its argument transformed.
+ *
+ * @private
+ * @param {Function} func The function to wrap.
+ * @param {Function} transform The argument transform.
+ * @returns {Function} Returns the new function.
+ */
+function overArg(func, transform) {
+  return function(arg) {
+    return func(transform(arg));
+  };
+}
+
+/** Built-in value references. */
+var getPrototype = overArg(Object.getPrototypeOf, Object);
+
+/**
+ * Checks if `value` is object-like. A value is object-like if it's not `null`
+ * and has a `typeof` result of "object".
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ * @example
+ *
+ * _.isObjectLike({});
+ * // => true
+ *
+ * _.isObjectLike([1, 2, 3]);
+ * // => true
+ *
+ * _.isObjectLike(_.noop);
+ * // => false
+ *
+ * _.isObjectLike(null);
+ * // => false
+ */
+function isObjectLike(value) {
+  return value != null && typeof value == 'object';
+}
+
+/** `Object#toString` result references. */
+var objectTag = '[object Object]';
+
+/** Used for built-in method references. */
+var funcProto = Function.prototype;
+var objectProto = Object.prototype;
+
+/** Used to resolve the decompiled source of functions. */
+var funcToString = funcProto.toString;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty$1 = objectProto.hasOwnProperty;
+
+/** Used to infer the `Object` constructor. */
+var objectCtorString = funcToString.call(Object);
+
+/**
+ * Checks if `value` is a plain object, that is, an object created by the
+ * `Object` constructor or one with a `[[Prototype]]` of `null`.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.8.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a plain object, else `false`.
+ * @example
+ *
+ * function Foo() {
+ *   this.a = 1;
+ * }
+ *
+ * _.isPlainObject(new Foo);
+ * // => false
+ *
+ * _.isPlainObject([1, 2, 3]);
+ * // => false
+ *
+ * _.isPlainObject({ 'x': 0, 'y': 0 });
+ * // => true
+ *
+ * _.isPlainObject(Object.create(null));
+ * // => true
+ */
+function isPlainObject(value) {
+  if (!isObjectLike(value) || baseGetTag(value) != objectTag) {
+    return false;
+  }
+  var proto = getPrototype(value);
+  if (proto === null) {
+    return true;
+  }
+  var Ctor = hasOwnProperty$1.call(proto, 'constructor') && proto.constructor;
+  return typeof Ctor == 'function' && Ctor instanceof Ctor &&
+    funcToString.call(Ctor) == objectCtorString;
+}
+
+function verifyPlainObject(value, displayName, methodName) {
+  if (!isPlainObject(value)) {
+    warning$2(methodName + '() in ' + displayName + ' must return a plain object. Instead received ' + value + '.');
+  }
+}
+
+function wrapMapToPropsConstant(getConstant) {
+  return function initConstantSelector(dispatch, options) {
+    var constant = getConstant(dispatch, options);
+
+    function constantSelector() {
+      return constant;
+    }
+    constantSelector.dependsOnOwnProps = false;
+    return constantSelector;
+  };
+}
+
+// dependsOnOwnProps is used by createMapToPropsProxy to determine whether to pass props as args
+// to the mapToProps function being wrapped. It is also used by makePurePropsSelector to determine
+// whether mapToProps needs to be invoked when props have changed.
+// 
+// A length of one signals that mapToProps does not depend on props from the parent component.
+// A length of zero is assumed to mean mapToProps is getting args via arguments or ...args and
+// therefore not reporting its length accurately..
+function getDependsOnOwnProps(mapToProps) {
+  return mapToProps.dependsOnOwnProps !== null && mapToProps.dependsOnOwnProps !== undefined ? Boolean(mapToProps.dependsOnOwnProps) : mapToProps.length !== 1;
+}
+
+// Used by whenMapStateToPropsIsFunction and whenMapDispatchToPropsIsFunction,
+// this function wraps mapToProps in a proxy function which does several things:
+// 
+//  * Detects whether the mapToProps function being called depends on props, which
+//    is used by selectorFactory to decide if it should reinvoke on props changes.
+//    
+//  * On first call, handles mapToProps if returns another function, and treats that
+//    new function as the true mapToProps for subsequent calls.
+//    
+//  * On first call, verifies the first result is a plain object, in order to warn
+//    the developer that their mapToProps function is not returning a valid result.
+//    
+function wrapMapToPropsFunc(mapToProps, methodName) {
+  return function initProxySelector(dispatch, _ref) {
+    var displayName = _ref.displayName;
+
+    var proxy = function mapToPropsProxy(stateOrDispatch, ownProps) {
+      return proxy.dependsOnOwnProps ? proxy.mapToProps(stateOrDispatch, ownProps) : proxy.mapToProps(stateOrDispatch);
+    };
+
+    // allow detectFactoryAndVerify to get ownProps
+    proxy.dependsOnOwnProps = true;
+
+    proxy.mapToProps = function detectFactoryAndVerify(stateOrDispatch, ownProps) {
+      proxy.mapToProps = mapToProps;
+      proxy.dependsOnOwnProps = getDependsOnOwnProps(mapToProps);
+      var props = proxy(stateOrDispatch, ownProps);
+
+      if (typeof props === 'function') {
+        proxy.mapToProps = props;
+        proxy.dependsOnOwnProps = getDependsOnOwnProps(props);
+        props = proxy(stateOrDispatch, ownProps);
+      }
+
+      verifyPlainObject(props, displayName, methodName);
+
+      return props;
+    };
+
+    return proxy;
+  };
+}
+
+function whenMapDispatchToPropsIsFunction(mapDispatchToProps) {
+  return typeof mapDispatchToProps === 'function' ? wrapMapToPropsFunc(mapDispatchToProps, 'mapDispatchToProps') : undefined;
+}
+
+function whenMapDispatchToPropsIsMissing(mapDispatchToProps) {
+  return !mapDispatchToProps ? wrapMapToPropsConstant(function (dispatch) {
+    return { dispatch: dispatch };
+  }) : undefined;
+}
+
+function whenMapDispatchToPropsIsObject(mapDispatchToProps) {
+  return mapDispatchToProps && typeof mapDispatchToProps === 'object' ? wrapMapToPropsConstant(function (dispatch) {
+    return redux.bindActionCreators(mapDispatchToProps, dispatch);
+  }) : undefined;
+}
+
+var defaultMapDispatchToPropsFactories = [whenMapDispatchToPropsIsFunction, whenMapDispatchToPropsIsMissing, whenMapDispatchToPropsIsObject];
+
+function whenMapStateToPropsIsFunction(mapStateToProps) {
+  return typeof mapStateToProps === 'function' ? wrapMapToPropsFunc(mapStateToProps, 'mapStateToProps') : undefined;
+}
+
+function whenMapStateToPropsIsMissing(mapStateToProps) {
+  return !mapStateToProps ? wrapMapToPropsConstant(function () {
+    return {};
+  }) : undefined;
+}
+
+var defaultMapStateToPropsFactories = [whenMapStateToPropsIsFunction, whenMapStateToPropsIsMissing];
+
+function defaultMergeProps(stateProps, dispatchProps, ownProps) {
+  return _extends({}, ownProps, stateProps, dispatchProps);
+}
+
+function wrapMergePropsFunc(mergeProps) {
+  return function initMergePropsProxy(dispatch, _ref) {
+    var displayName = _ref.displayName,
+        pure = _ref.pure,
+        areMergedPropsEqual = _ref.areMergedPropsEqual;
+
+    var hasRunOnce = false;
+    var mergedProps = void 0;
+
+    return function mergePropsProxy(stateProps, dispatchProps, ownProps) {
+      var nextMergedProps = mergeProps(stateProps, dispatchProps, ownProps);
+
+      if (hasRunOnce) {
+        if (!pure || !areMergedPropsEqual(nextMergedProps, mergedProps)) mergedProps = nextMergedProps;
+      } else {
+        hasRunOnce = true;
+        mergedProps = nextMergedProps;
+
+        verifyPlainObject(mergedProps, displayName, 'mergeProps');
+      }
+
+      return mergedProps;
+    };
+  };
+}
+
+function whenMergePropsIsFunction(mergeProps) {
+  return typeof mergeProps === 'function' ? wrapMergePropsFunc(mergeProps) : undefined;
+}
+
+function whenMergePropsIsOmitted(mergeProps) {
+  return !mergeProps ? function () {
+    return defaultMergeProps;
+  } : undefined;
+}
+
+var defaultMergePropsFactories = [whenMergePropsIsFunction, whenMergePropsIsOmitted];
+
+function verify(selector, methodName, displayName) {
+  if (!selector) {
+    throw new Error('Unexpected value for ' + methodName + ' in ' + displayName + '.');
+  } else if (methodName === 'mapStateToProps' || methodName === 'mapDispatchToProps') {
+    if (!selector.hasOwnProperty('dependsOnOwnProps')) {
+      warning$2('The selector for ' + methodName + ' of ' + displayName + ' did not specify a value for dependsOnOwnProps.');
+    }
+  }
+}
+
+function verifySubselectors(mapStateToProps, mapDispatchToProps, mergeProps, displayName) {
+  verify(mapStateToProps, 'mapStateToProps', displayName);
+  verify(mapDispatchToProps, 'mapDispatchToProps', displayName);
+  verify(mergeProps, 'mergeProps', displayName);
+}
+
+function impureFinalPropsSelectorFactory(mapStateToProps, mapDispatchToProps, mergeProps, dispatch) {
+  return function impureFinalPropsSelector(state, ownProps) {
+    return mergeProps(mapStateToProps(state, ownProps), mapDispatchToProps(dispatch, ownProps), ownProps);
+  };
+}
+
+function pureFinalPropsSelectorFactory(mapStateToProps, mapDispatchToProps, mergeProps, dispatch, _ref) {
+  var areStatesEqual = _ref.areStatesEqual,
+      areOwnPropsEqual = _ref.areOwnPropsEqual,
+      areStatePropsEqual = _ref.areStatePropsEqual;
+
+  var hasRunAtLeastOnce = false;
+  var state = void 0;
+  var ownProps = void 0;
+  var stateProps = void 0;
+  var dispatchProps = void 0;
+  var mergedProps = void 0;
+
+  function handleFirstCall(firstState, firstOwnProps) {
+    state = firstState;
+    ownProps = firstOwnProps;
+    stateProps = mapStateToProps(state, ownProps);
+    dispatchProps = mapDispatchToProps(dispatch, ownProps);
+    mergedProps = mergeProps(stateProps, dispatchProps, ownProps);
+    hasRunAtLeastOnce = true;
+    return mergedProps;
+  }
+
+  function handleNewPropsAndNewState() {
+    stateProps = mapStateToProps(state, ownProps);
+
+    if (mapDispatchToProps.dependsOnOwnProps) dispatchProps = mapDispatchToProps(dispatch, ownProps);
+
+    mergedProps = mergeProps(stateProps, dispatchProps, ownProps);
+    return mergedProps;
+  }
+
+  function handleNewProps() {
+    if (mapStateToProps.dependsOnOwnProps) stateProps = mapStateToProps(state, ownProps);
+
+    if (mapDispatchToProps.dependsOnOwnProps) dispatchProps = mapDispatchToProps(dispatch, ownProps);
+
+    mergedProps = mergeProps(stateProps, dispatchProps, ownProps);
+    return mergedProps;
+  }
+
+  function handleNewState() {
+    var nextStateProps = mapStateToProps(state, ownProps);
+    var statePropsChanged = !areStatePropsEqual(nextStateProps, stateProps);
+    stateProps = nextStateProps;
+
+    if (statePropsChanged) mergedProps = mergeProps(stateProps, dispatchProps, ownProps);
+
+    return mergedProps;
+  }
+
+  function handleSubsequentCalls(nextState, nextOwnProps) {
+    var propsChanged = !areOwnPropsEqual(nextOwnProps, ownProps);
+    var stateChanged = !areStatesEqual(nextState, state);
+    state = nextState;
+    ownProps = nextOwnProps;
+
+    if (propsChanged && stateChanged) return handleNewPropsAndNewState();
+    if (propsChanged) return handleNewProps();
+    if (stateChanged) return handleNewState();
+    return mergedProps;
+  }
+
+  return function pureFinalPropsSelector(nextState, nextOwnProps) {
+    return hasRunAtLeastOnce ? handleSubsequentCalls(nextState, nextOwnProps) : handleFirstCall(nextState, nextOwnProps);
+  };
+}
+
+// TODO: Add more comments
+
+// If pure is true, the selector returned by selectorFactory will memoize its results,
+// allowing connectAdvanced's shouldComponentUpdate to return false if final
+// props have not changed. If false, the selector will always return a new
+// object and shouldComponentUpdate will always return true.
+
+function finalPropsSelectorFactory(dispatch, _ref2) {
+  var initMapStateToProps = _ref2.initMapStateToProps,
+      initMapDispatchToProps = _ref2.initMapDispatchToProps,
+      initMergeProps = _ref2.initMergeProps,
+      options = objectWithoutProperties(_ref2, ['initMapStateToProps', 'initMapDispatchToProps', 'initMergeProps']);
+
+  var mapStateToProps = initMapStateToProps(dispatch, options);
+  var mapDispatchToProps = initMapDispatchToProps(dispatch, options);
+  var mergeProps = initMergeProps(dispatch, options);
+
+  {
+    verifySubselectors(mapStateToProps, mapDispatchToProps, mergeProps, options.displayName);
+  }
+
+  var selectorFactory = options.pure ? pureFinalPropsSelectorFactory : impureFinalPropsSelectorFactory;
+
+  return selectorFactory(mapStateToProps, mapDispatchToProps, mergeProps, dispatch, options);
+}
+
+/*
+  connect is a facade over connectAdvanced. It turns its args into a compatible
+  selectorFactory, which has the signature:
+
+    (dispatch, options) => (nextState, nextOwnProps) => nextFinalProps
+  
+  connect passes its args to connectAdvanced as options, which will in turn pass them to
+  selectorFactory each time a Connect component instance is instantiated or hot reloaded.
+
+  selectorFactory returns a final props selector from its mapStateToProps,
+  mapStateToPropsFactories, mapDispatchToProps, mapDispatchToPropsFactories, mergeProps,
+  mergePropsFactories, and pure args.
+
+  The resulting final props selector is called by the Connect component instance whenever
+  it receives new props or store state.
+ */
+
+function match(arg, factories, name) {
+  for (var i = factories.length - 1; i >= 0; i--) {
+    var result = factories[i](arg);
+    if (result) return result;
+  }
+
+  return function (dispatch, options) {
+    throw new Error('Invalid value of type ' + typeof arg + ' for ' + name + ' argument when connecting component ' + options.wrappedComponentName + '.');
+  };
+}
+
+function strictEqual(a, b) {
+  return a === b;
+}
+
+// createConnect with default args builds the 'official' connect behavior. Calling it with
+// different options opens up some testing and extensibility scenarios
+function createConnect() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      _ref$connectHOC = _ref.connectHOC,
+      connectHOC = _ref$connectHOC === undefined ? connectAdvanced : _ref$connectHOC,
+      _ref$mapStateToPropsF = _ref.mapStateToPropsFactories,
+      mapStateToPropsFactories = _ref$mapStateToPropsF === undefined ? defaultMapStateToPropsFactories : _ref$mapStateToPropsF,
+      _ref$mapDispatchToPro = _ref.mapDispatchToPropsFactories,
+      mapDispatchToPropsFactories = _ref$mapDispatchToPro === undefined ? defaultMapDispatchToPropsFactories : _ref$mapDispatchToPro,
+      _ref$mergePropsFactor = _ref.mergePropsFactories,
+      mergePropsFactories = _ref$mergePropsFactor === undefined ? defaultMergePropsFactories : _ref$mergePropsFactor,
+      _ref$selectorFactory = _ref.selectorFactory,
+      selectorFactory = _ref$selectorFactory === undefined ? finalPropsSelectorFactory : _ref$selectorFactory;
+
+  return function connect(mapStateToProps, mapDispatchToProps, mergeProps) {
+    var _ref2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
+        _ref2$pure = _ref2.pure,
+        pure = _ref2$pure === undefined ? true : _ref2$pure,
+        _ref2$areStatesEqual = _ref2.areStatesEqual,
+        areStatesEqual = _ref2$areStatesEqual === undefined ? strictEqual : _ref2$areStatesEqual,
+        _ref2$areOwnPropsEqua = _ref2.areOwnPropsEqual,
+        areOwnPropsEqual = _ref2$areOwnPropsEqua === undefined ? shallowEqual : _ref2$areOwnPropsEqua,
+        _ref2$areStatePropsEq = _ref2.areStatePropsEqual,
+        areStatePropsEqual = _ref2$areStatePropsEq === undefined ? shallowEqual : _ref2$areStatePropsEq,
+        _ref2$areMergedPropsE = _ref2.areMergedPropsEqual,
+        areMergedPropsEqual = _ref2$areMergedPropsE === undefined ? shallowEqual : _ref2$areMergedPropsE,
+        extraOptions = objectWithoutProperties(_ref2, ['pure', 'areStatesEqual', 'areOwnPropsEqual', 'areStatePropsEqual', 'areMergedPropsEqual']);
+
+    var initMapStateToProps = match(mapStateToProps, mapStateToPropsFactories, 'mapStateToProps');
+    var initMapDispatchToProps = match(mapDispatchToProps, mapDispatchToPropsFactories, 'mapDispatchToProps');
+    var initMergeProps = match(mergeProps, mergePropsFactories, 'mergeProps');
+
+    return connectHOC(selectorFactory, _extends({
+      // used in error messages
+      methodName: 'connect',
+
+      // used to compute Connect's displayName from the wrapped component's displayName.
+      getDisplayName: function getDisplayName(name) {
+        return 'Connect(' + name + ')';
+      },
+
+      // if mapStateToProps is falsy, the Connect component doesn't subscribe to store state changes
+      shouldHandleStateChanges: Boolean(mapStateToProps),
+
+      // passed through to selectorFactory
+      initMapStateToProps: initMapStateToProps,
+      initMapDispatchToProps: initMapDispatchToProps,
+      initMergeProps: initMergeProps,
+      pure: pure,
+      areStatesEqual: areStatesEqual,
+      areOwnPropsEqual: areOwnPropsEqual,
+      areStatePropsEqual: areStatePropsEqual,
+      areMergedPropsEqual: areMergedPropsEqual
+
+    }, extraOptions));
+  };
+}
+
+var connect = createConnect();
+
+exports.Provider = Provider;
+exports.createProvider = createProvider;
+exports.connectAdvanced = connectAdvanced;
+exports.connect = connect;
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+})));

From 28bd5a677fa3311af1c3bade8171e1cd693279e4 Mon Sep 17 00:00:00 2001
From: ffxbld <none@none>
Date: Mon, 4 Dec 2017 11:15:40 -0800
Subject: [PATCH 217/219] No bug, Automated HSTS preload list update from host
 bld-linux64-spot-030 - a=hsts-update

---
 security/manager/ssl/nsSTSPreloadList.errors | 227 +++++++++++--------
 security/manager/ssl/nsSTSPreloadList.inc    |  67 ++----
 2 files changed, 150 insertions(+), 144 deletions(-)

diff --git a/security/manager/ssl/nsSTSPreloadList.errors b/security/manager/ssl/nsSTSPreloadList.errors
index 55bb7a0d8639..078b202c63df 100644
--- a/security/manager/ssl/nsSTSPreloadList.errors
+++ b/security/manager/ssl/nsSTSPreloadList.errors
@@ -11,8 +11,8 @@
 1nian.vip: could not connect to host
 1q365a.com: could not connect to host
 24hrs.shopping: could not connect to host
-256pages.com: could not connect to host
 28spots.net: could not connect to host
+3ags.de: could not connect to host
 439191.com: could not connect to host
 47tech.com: could not connect to host
 4d2.xyz: could not connect to host
@@ -34,10 +34,11 @@ aaronmcguire.me: could not connect to host
 abloop.com: could not connect to host
 abolition.co: could not connect to host
 accwing.com: could not connect to host
-aciksite.com: could not connect to host
 acrossgw.com: could not connect to host
 ad-disruptio.fr: could not connect to host
 adamgold.net: could not connect to host
+aetoscg.com: could not connect to host
+aetoscg.com.au: could not connect to host
 aevpn.org: could not connect to host
 affily.io: could not connect to host
 afterstack.net: could not connect to host
@@ -45,17 +46,19 @@ ahxxm.com: could not connect to host
 akiba-server.info: could not connect to host
 akita-stream.com: could not connect to host
 akoww.de: could not connect to host
-akstudentsfirst.org: could not connect to host
 akul.co.in: could not connect to host
 al-f.net: could not connect to host
 alasta.info: could not connect to host
 alauda-home.de: could not connect to host
+alcatraz.online: could not connect to host
+alexei.su: could not connect to host
 alexey-shamara.ru: could not connect to host
 alexhaydock.co.uk: could not connect to host
 alexmol.tk: could not connect to host
 alexperry.io: could not connect to host
 alilialili.ga: could not connect to host
 allo-credit.ch: could not connect to host
+allthingssquared.com: could not connect to host
 alphie.me: could not connect to host
 altahrim.net: could not connect to host
 amdouglas.uk: could not connect to host
@@ -65,7 +68,6 @@ amua.fr: could not connect to host
 amunoz.org: could not connect to host
 analyzemyfriends.com: could not connect to host
 anastasia-shamara.ru: could not connect to host
-ancientcraft.eu: could not connect to host
 andreas-kluge.eu: could not connect to host
 andreaskluge.eu: could not connect to host
 andrei-coman.com: could not connect to host
@@ -82,7 +84,6 @@ arawaza.info: could not connect to host
 arcadiaeng.com: could not connect to host
 arent.kz: could not connect to host
 argh.io: could not connect to host
-aristilabs.com: could not connect to host
 arksan.com.tr: could not connect to host
 armenians.online: could not connect to host
 arne-petersen.net: could not connect to host
@@ -102,6 +103,7 @@ auroraassociationofrealtors.com: could not connect to host
 ausec.ch: could not connect to host
 austinsutphin.com: could not connect to host
 australiancattle.dog: could not connect to host
+austromorph.space: could not connect to host
 authland.com: could not connect to host
 authsrv.nl.eu.org: could not connect to host
 autostop-occasions.be: could not connect to host
@@ -142,7 +144,6 @@ bey.io: could not connect to host
 bierochs.org: could not connect to host
 bingcheung.com: could not connect to host
 binimo.com: could not connect to host
-biosafe.ch: could not connect to host
 bip.gov.sa: could not connect to host
 bitmessage.ch: could not connect to host
 bizeau.ch: could not connect to host
@@ -157,7 +158,6 @@ bluezonehealth.co.uk: could not connect to host
 blumen-garage.de: could not connect to host
 bm-i.ch: could not connect to host
 bodrumfarm.com: could not connect to host
-boilesen.com: could not connect to host
 bolwerk.com.br: could not connect to host
 bomberus.de: could not connect to host
 bonesserver.com: could not connect to host
@@ -166,6 +166,7 @@ borisbesemer.com: could not connect to host
 brage.info: could not connect to host
 brain-e.co: could not connect to host
 braintensive.com: could not connect to host
+brandontaylor-black.com: could not connect to host
 brettabel.com: could not connect to host
 brickwerks.io: could not connect to host
 brookframework.org: could not connect to host
@@ -173,6 +174,8 @@ brrr.fr: could not connect to host
 bruun.co: could not connect to host
 bsktweetup.info: could not connect to host
 bsuess.de: could not connect to host
+budgetlovers.nl: could not connect to host
+bugsmashed.com: could not connect to host
 buka.jp: could not connect to host
 burlesquemakeup.com: could not connect to host
 businessfurs.info: could not connect to host
@@ -184,6 +187,8 @@ bvexplained.co.uk: could not connect to host
 bwilkinson.co.uk: could not connect to host
 by1898.com: could not connect to host
 bypass.kr: could not connect to host
+bytejail.com: could not connect to host
+cacao.supply: could not connect to host
 cafesg.net: could not connect to host
 calculatoaresecondhand.xyz: could not connect to host
 callabs.net: could not connect to host
@@ -192,9 +197,11 @@ campingcarlovers.com: could not connect to host
 cancelmyprofile.com: could not connect to host
 carloshmm.stream: could not connect to host
 casinoreal.com: could not connect to host
+catalyst-ecommerce.com: could not connect to host
 caughtredhanded.co.nz: could not connect to host
 cctld.com: could not connect to host
 cee.io: could not connect to host
+cegfw.com: could not connect to host
 cencalvia.org: could not connect to host
 centos.pub: could not connect to host
 cgtx.us: could not connect to host
@@ -207,12 +214,13 @@ cheesefusion.com: could not connect to host
 childrendeservebetter.org: could not connect to host
 china-line.org: could not connect to host
 chinternet.xyz: could not connect to host
+chiru.no: could not connect to host
 chopperforums.com: could not connect to host
-chosenplaintext.org: could not connect to host
 christianhoffmann.info: could not connect to host
-ciancode.com: could not connect to host
+chromaryu.net: could not connect to host
 cinemysticism.com: could not connect to host
 cio.gov: could not connect to host
+cirujanooral.com: could not connect to host
 cjtkfan.club: could not connect to host
 clearchatsandbox.com: could not connect to host
 clearviewwealthprojector.com.au: could not connect to host
@@ -231,15 +239,13 @@ codercross.com: could not connect to host
 coffeetocode.me: could not connect to host
 coincoin.eu.org: could not connect to host
 colleencornez.com: could not connect to host
+comalia.com: could not connect to host
 complt.xyz: could not connect to host
 comprehensiveihc.com: could not connect to host
 compsmag.com: could not connect to host
 conception.sk: could not connect to host
-connectingconcepts.com: could not connect to host
 conniesacademy.com: could not connect to host
-conservatoriesincornwall.com: could not connect to host
 corecdn.org: could not connect to host
-corex.io: could not connect to host
 corinnanese.de: could not connect to host
 cosmeticosdelivery.com.br: could not connect to host
 cosplayer.com: could not connect to host
@@ -248,10 +254,8 @@ coverdat.com: could not connect to host
 cpaneltips.com: could not connect to host
 crackpfer.de: could not connect to host
 creativecommonscatpictures.com: could not connect to host
-crgm.net: could not connect to host
 cristianhares.com: could not connect to host
 criticalaim.com: could not connect to host
-crosssellguide.com: could not connect to host
 cryptopartynewcastle.org: could not connect to host
 crystalmachine.net: could not connect to host
 csgo77.com: could not connect to host
@@ -281,8 +285,8 @@ daw.nz: could not connect to host
 dawnsonb.com: could not connect to host
 days.one: could not connect to host
 dbcom.ru: could not connect to host
+dblx.io: could not connect to host
 dbox.ga: could not connect to host
-dcc.moe: could not connect to host
 de-servers.de: could not connect to host
 decoyrouting.com: could not connect to host
 deloittequant.com: could not connect to host
@@ -314,17 +318,16 @@ domengrad.ru: could not connect to host
 dostavkakurierom.ru: could not connect to host
 doyoulyft.com: could not connect to host
 dreaming.solutions: could not connect to host
+dreizwosechs.de: could not connect to host
 drinkplanet.eu: could not connect to host
 driving-lessons.co.uk: could not connect to host
-drixn.cn: could not connect to host
-drixn.com: could not connect to host
-drixn.info: could not connect to host
-drixn.net: could not connect to host
+drivinghorror.com: could not connect to host
 drizz.com.br: could not connect to host
 drogoz.moe: could not connect to host
 dronexpertos.com: could not connect to host
 droomhuis-in-zuid-holland-kopen.nl: could not connect to host
 drtti.io: could not connect to host
+dtx.sk: could not connect to host
 dubrovskiy.net: could not connect to host
 dubrovskiy.pro: could not connect to host
 duch.cloud: could not connect to host
@@ -344,14 +347,12 @@ elisabeth-strunz.de: could not connect to host
 elonbase.com: could not connect to host
 elsword.moe: could not connect to host
 endspamwith.us: could not connect to host
-engg.ca: could not connect to host
 er-music.com: could not connect to host
 erspro.net: could not connect to host
 estan.cn: could not connect to host
 eurostrategy.vn.ua: could not connect to host
 ev-zertifikate.de: could not connect to host
 eveshaiwu.com: could not connect to host
-evion.nl: could not connect to host
 expxkcd.com: could not connect to host
 eytosh.net: could not connect to host
 f8842.com: could not connect to host
@@ -367,19 +368,23 @@ falkus.net: could not connect to host
 familie-sander.rocks: could not connect to host
 faretravel.co.uk: could not connect to host
 farm24.co.uk: could not connect to host
+farsil.eu: could not connect to host
 faxreader.net: could not connect to host
 feedstringer.com: could not connect to host
 feirlane.org: could not connect to host
 fernangp.com: could not connect to host
 fetclips.se: could not connect to host
+fifieldtech.com: could not connect to host
 findmybottleshop.com.au: could not connect to host
 finstererlebnis.de: could not connect to host
 firebaseio.com: could not connect to host
 firexarxa.de: could not connect to host
 first-time-offender.com: could not connect to host
+fistu.la: could not connect to host
 fixmyglitch.com: could not connect to host
 fjharcu.com: could not connect to host
 flikmsg.co: could not connect to host
+flopy.club: could not connect to host
 florian-schlachter.de: could not connect to host
 floriantanner.ch: could not connect to host
 flow.su: could not connect to host
@@ -415,12 +420,15 @@ frusky.net: could not connect to host
 fs-gamenet.de: could not connect to host
 fsfi.is: could not connect to host
 fsradio.eu: could not connect to host
+fuchsy.com: could not connect to host
+fucklife.ch: could not connect to host
 fugle.de: could not connect to host
 fuitedeau.ch: could not connect to host
 fukuko.biz: could not connect to host
 fukuko.xyz: could not connect to host
 funksteckdosen24.de: could not connect to host
 futos.de: could not connect to host
+g1jeu.com: could not connect to host
 g4w.co: could not connect to host
 gabriele-kluge.de: could not connect to host
 gaiserik.com: could not connect to host
@@ -440,6 +448,7 @@ geeks.berlin: could not connect to host
 gehrke.nrw: could not connect to host
 geigr.de: could not connect to host
 geldteveel.eu: could not connect to host
+geneau.net: could not connect to host
 generationnext.pl: could not connect to host
 geneve-naturisme.ch: could not connect to host
 geneve.guide: could not connect to host
@@ -454,6 +463,7 @@ getgeek.io: could not connect to host
 getgeek.no: could not connect to host
 getgeek.nu: could not connect to host
 getgeek.pl: could not connect to host
+getupandbounce.co.uk: could not connect to host
 getwarden.net: could not connect to host
 gevaulug.fr: could not connect to host
 gfoss.gr: could not connect to host
@@ -490,7 +500,6 @@ gvt3.com: could not connect to host
 h2cdn.cloud: could not connect to host
 h3artbl33d.nl: could not connect to host
 hackbarth.guru: could not connect to host
-hackerchai.com: could not connect to host
 halcyonsbastion.com: could not connect to host
 hapijs.cn: could not connect to host
 harrypottereditor.net: could not connect to host
@@ -499,13 +508,13 @@ hasalittle.wang: could not connect to host
 haze.network: could not connect to host
 hbbet.com: could not connect to host
 hbvip.com: could not connect to host
-hd-only.org: could not connect to host
 hdy.nz: could not connect to host
 hearty.ink: could not connect to host
 heisenberg.co: could not connect to host
 hejsupport.se: could not connect to host
 hellofilters.com: could not connect to host
 hellomouse.tk: could not connect to host
+helpekwendenihospital.com: could not connect to host
 helsingfors.guide: could not connect to host
 henriknoerr.com: could not connect to host
 hentai.design: could not connect to host
@@ -541,6 +550,7 @@ iemb.cf: could not connect to host
 iewar.com: could not connect to host
 ifoss.me: could not connect to host
 ifxnet.com: could not connect to host
+ihkk.net: could not connect to host
 iiong.com: could not connect to host
 ikenmeyer.com: could not connect to host
 ikenmeyer.eu: could not connect to host
@@ -549,7 +559,6 @@ immersionwealth.com: could not connect to host
 imperdintechnologies.com: could not connect to host
 inexpensivecomputers.net: could not connect to host
 informatik.zone: could not connect to host
-injust.eu.org: could not connect to host
 injust.me: could not connect to host
 innerform.com: could not connect to host
 inoa8.com: could not connect to host
@@ -562,7 +571,6 @@ iphonechina.net: could not connect to host
 irinkeby.nu: could not connect to host
 isamiok.com: could not connect to host
 iservicio.mx: could not connect to host
-itbrief.co.nz: could not connect to host
 itpro-mg.de: could not connect to host
 itproject.guru: could not connect to host
 its-schindler.de: could not connect to host
@@ -570,6 +578,7 @@ ivanpolchenko.com: could not connect to host
 j0ng.xyz: could not connect to host
 jaaxypro.com: could not connect to host
 jakincode.army: could not connect to host
+jamesandanneke.com: could not connect to host
 jan-cermak.cz: could not connect to host
 japan4you.org: could not connect to host
 jaredfraser.com: could not connect to host
@@ -580,6 +589,7 @@ jean-remy.ch: could not connect to host
 jeffersonregan.org: could not connect to host
 jens.hk: could not connect to host
 jhburton.co.uk: could not connect to host
+jhe.li: could not connect to host
 jiaqiang.vip: could not connect to host
 jie.dance: could not connect to host
 jimmycn.com: could not connect to host
@@ -588,7 +598,6 @@ jobmedic.com: could not connect to host
 joecod.es: could not connect to host
 johnmcintosh.pro: could not connect to host
 jonathansanchez.pro: could not connect to host
-joostbovee.nl: could not connect to host
 josc.com.au: could not connect to host
 jtcat.com: could not connect to host
 juice.codes: could not connect to host
@@ -597,6 +606,7 @@ just-pools.co.za: could not connect to host
 justice.gov: could not connect to host
 justmy.website: could not connect to host
 juventusmania1897.com: could not connect to host
+kabus.org: could not connect to host
 kaika-facilitymanagement.de: could not connect to host
 kaileymslusser.com: could not connect to host
 kamikaichimaru.com: could not connect to host
@@ -606,6 +616,8 @@ karanlyons.com: could not connect to host
 karuneshjohri.com: could not connect to host
 kawaiiku.com: could not connect to host
 kawaiiku.de: could not connect to host
+kenvix.com: could not connect to host
+kevindekoninck.com: could not connect to host
 kiedys.net: could not connect to host
 kieranweightman.me: could not connect to host
 kinepolis-studio.ga: could not connect to host
@@ -615,7 +627,6 @@ kj1396.net: could not connect to host
 kjchernov.info: could not connect to host
 kjoglum.me: could not connect to host
 klingeletest.de: could not connect to host
-klotz-labs.com: could not connect to host
 kngk-azs.ru: could not connect to host
 knownsec.cf: could not connect to host
 kollawat.me: could not connect to host
@@ -626,6 +637,7 @@ kopfsalat.eu: could not connect to host
 kotorimusic.ga: could not connect to host
 kousaku.jp: could not connect to host
 kozmik.co: could not connect to host
+kraynik.com: could not connect to host
 kriptosec.com: could not connect to host
 kteen.info: could not connect to host
 kyle.place: could not connect to host
@@ -645,13 +657,15 @@ lathamlabs.com: could not connect to host
 lathamlabs.net: could not connect to host
 lathamlabs.org: could not connect to host
 lavapot.com: could not connect to host
-lavval.com: could not connect to host
 lazulu.com: could not connect to host
 lcti.biz: could not connect to host
 ldcraft.pw: could not connect to host
 lebal.se: could not connect to host
+leebiblestudycentre.net: could not connect to host
+leebiblestudycentre.org: could not connect to host
 legaltip.eu: could not connect to host
 leonardcamacho.me: could not connect to host
+lesdouceursdeliyana.com: could not connect to host
 lessets-graphiques.com: could not connect to host
 leticiagomeztagle.com: could not connect to host
 leveredge.net: could not connect to host
@@ -674,24 +688,20 @@ lipo.lol: could not connect to host
 lissabon.guide: could not connect to host
 littlelundgrenladies.com: could not connect to host
 littleservice.cn: could not connect to host
-litz.ca: could not connect to host
-litzenberger.ca: could not connect to host
 liukang.tech: could not connect to host
 livnev.me: could not connect to host
+lnoldan.com: could not connect to host
 lobosdomain.no-ip.info: could not connect to host
 locker3.com: could not connect to host
 logcat.info: could not connect to host
 logic8.ml: could not connect to host
-logimagine.com: could not connect to host
 lojavirtualfct.com.br: could not connect to host
-louduniverse.net: could not connect to host
 lovelytimes.net: could not connect to host
 ltransferts.com: could not connect to host
 lukasunger.cz: could not connect to host
 lukasunger.net: could not connect to host
 lukeng.net: could not connect to host
 luxonetwork.com: could not connect to host
-m132.eu: could not connect to host
 m4g.ru: could not connect to host
 maartenderaedemaeker.be: could not connect to host
 maartenterpstra.xyz: could not connect to host
@@ -701,8 +711,10 @@ mail4geek.com: could not connect to host
 makeyourlaws.org: could not connect to host
 malesbdsm.com: could not connect to host
 malgraph.net: could not connect to host
+malikussa.id: could not connect to host
 mallach.net: could not connect to host
 marcelmarnitz.com: could not connect to host
+marcelsiegert.com: could not connect to host
 mare92.cz: could not connect to host
 mariehane.com: could not connect to host
 marketingdesignu.cz: could not connect to host
@@ -719,7 +731,6 @@ mbwemmel-usedcars.be: could not connect to host
 mcdanieldevelopmentservices.com: could not connect to host
 mcsnovatamabayan.com: could not connect to host
 me-dc.com: could not connect to host
-meadowviewfarms.org: could not connect to host
 meanevo.com: could not connect to host
 meathealth.com: could not connect to host
 mecanicadom.com: could not connect to host
@@ -728,6 +739,7 @@ medy-me.com: could not connect to host
 melhorproduto.com.br: could not connect to host
 melitopol.co.ua: could not connect to host
 melonstudios.net: could not connect to host
+melvinlow.com: could not connect to host
 menchez.me: could not connect to host
 mentax.net: could not connect to host
 menzaijia.com: could not connect to host
@@ -741,6 +753,7 @@ michaelsulzer.eu: could not connect to host
 mikek.work: could not connect to host
 mimeit.de: could not connect to host
 mingy.ddns.net: could not connect to host
+minis-hip.de: could not connect to host
 minitruckin.net: could not connect to host
 miyugirls.com: could not connect to host
 mkfs.fr: could not connect to host
@@ -770,7 +783,6 @@ muslimbanter.co.za: could not connect to host
 mybeautyjobs.de: could not connect to host
 mycustomwriting.com: could not connect to host
 myfappening.org: could not connect to host
-myfloridadeferredcomp.com: could not connect to host
 mynewleaf.co: could not connect to host
 mysterysear.ch: could not connect to host
 mytravelblog.de: could not connect to host
@@ -778,7 +790,6 @@ naano.org: could not connect to host
 naphex.rocks: could not connect to host
 narodsovety.ru: could not connect to host
 nassi.me: could not connect to host
-nate.sh: could not connect to host
 nba2k.cn: could not connect to host
 nba2k.com.cn: could not connect to host
 nbalive.cn: could not connect to host
@@ -786,7 +797,7 @@ ncdesigns-studio.com: could not connect to host
 neartothesky.com: could not connect to host
 nedcf.org.uk: could not connect to host
 neer.io: could not connect to host
-nekoku.io: could not connect to host
+nejnamc.org: could not connect to host
 nephy.jp: could not connect to host
 netica.fr: could not connect to host
 netlocal.ru: could not connect to host
@@ -798,7 +809,6 @@ newtonhaus.com: could not connect to host
 nexusbyte.de: could not connect to host
 nexuscorporation.in: could not connect to host
 nfluence.org: could not connect to host
-niceguyit.biz: could not connect to host
 nico.st: could not connect to host
 nienfun.com: could not connect to host
 nikksno.io: could not connect to host
@@ -808,7 +818,6 @@ nippon-oku.com: could not connect to host
 nirada.info: could not connect to host
 nishikino-maki.com: could not connect to host
 niva.synology.me: could not connect to host
-nkb.in.th: could not connect to host
 note7forever.com: could not connect to host
 notesforpebble.com: could not connect to host
 novascan.net: could not connect to host
@@ -818,7 +827,6 @@ nsbfalconacademy.org: could not connect to host
 nudel.ninja: could not connect to host
 nup.pw: could not connect to host
 nyanpasu.tv: could not connect to host
-nys-hk.com: could not connect to host
 obdolbacca.ru: could not connect to host
 oberhof.co: could not connect to host
 ofer.site: could not connect to host
@@ -834,6 +842,7 @@ opatut.de: could not connect to host
 opengg.me: could not connect to host
 openspace.xxx: could not connect to host
 orhideous.name: could not connect to host
+orovillelaw.com: could not connect to host
 oscsdp.cz: could not connect to host
 oskuro.net: could not connect to host
 otinane.eu: could not connect to host
@@ -860,13 +869,14 @@ pbytes.com: could not connect to host
 pcmr.info: could not connect to host
 pcvirusclear.com: could not connect to host
 pear2pear.de: could not connect to host
+peippo.at: could not connect to host
+pencillab.cn: could not connect to host
 persjrp.ca: could not connect to host
 persoform.ch: could not connect to host
 pervacio.hu: could not connect to host
 peykezamin.ir: could not connect to host
 phdwuda.com: could not connect to host
 philippa.cool: could not connect to host
-photo.org.il: could not connect to host
 picallo.es: could not connect to host
 picone.com.au: could not connect to host
 pinebaylibrary.org: could not connect to host
@@ -885,7 +895,6 @@ poolinstallers.co.za: could not connect to host
 pouets.ovh: could not connect to host
 powerentertainment.tv: could not connect to host
 printsos.com: could not connect to host
-privacyinternational.org: could not connect to host
 privcloud.org: could not connect to host
 projectasterk.com: could not connect to host
 prokop.ovh: could not connect to host
@@ -913,11 +922,13 @@ quantumwebs.co: could not connect to host
 r0t.co: could not connect to host
 radical.org: could not connect to host
 rainbin.com: could not connect to host
+ranyeh.com: could not connect to host
 rapdogg.com: could not connect to host
 raspberry.us: could not connect to host
 rcoliveira.com: could not connect to host
 rdfz.tech: could not connect to host
 readityourself.net: could not connect to host
+readysell.net: could not connect to host
 real-compare.com: could not connect to host
 realcli.com: could not connect to host
 realraghavgupta.com: could not connect to host
@@ -925,6 +936,7 @@ realwoo.com: could not connect to host
 regendevices.eu: could not connect to host
 reignsphere.net: could not connect to host
 reismil.ch: could not connect to host
+renscreations.com: could not connect to host
 repaik.com: could not connect to host
 report-to.io: could not connect to host
 report-url.com: could not connect to host
@@ -942,7 +954,6 @@ retube.ga: could not connect to host
 reykjavik.guide: could not connect to host
 ribopierre.fr: could not connect to host
 richeza.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 119"  data: no]
-robin.co.kr: could not connect to host
 robomonkey.org: could not connect to host
 robust.ga: could not connect to host
 rocketgnomes.com: could not connect to host
@@ -952,7 +963,6 @@ roguesignal.net: could not connect to host
 rohanbassett.com: could not connect to host
 ronghexx.com: could not connect to host
 roolevoi.ru: could not connect to host
-rootbsd.at: could not connect to host
 royzez.com: could not connect to host
 rrom.me: could not connect to host
 rs-devdemo.host: could not connect to host
@@ -971,7 +981,6 @@ sallysubs.com: could not connect to host
 salzamt.tk: could not connect to host
 samaritan.tech: could not connect to host
 sanatrans.com: could not connect to host
-santmark.eu: could not connect to host
 sarndipity.com: could not connect to host
 sayprepay.com: could not connect to host
 sbiewald.de: could not connect to host
@@ -993,14 +1002,13 @@ servfefe.com: could not connect to host
 servpanel.de: could not connect to host
 seryovpn.com: could not connect to host
 sesha.co.za: could not connect to host
-sgtsnookums.net: could not connect to host
+sexgarage.de: could not connect to host
 shadex.net: could not connect to host
 shadowplus.net: could not connect to host
 shadowrocket.net: could not connect to host
 shadowsu.info: could not connect to host
 shadowsu.top: could not connect to host
 shag-shag.ru: could not connect to host
-shamka.ru: could not connect to host
 shanxiapark.com: could not connect to host
 sharevari.com: could not connect to host
 shavingks.com: could not connect to host
@@ -1011,6 +1019,7 @@ shoppingreview.org: could not connect to host
 shortr.li: could not connect to host
 shred.ch: could not connect to host
 shredoptics.ch: could not connect to host
+sijmenschoon.nl: could not connect to host
 siku.pro: could not connect to host
 silvistefi.com: could not connect to host
 simbolo.co.uk: could not connect to host
@@ -1038,7 +1047,6 @@ socketize.com: could not connect to host
 sogravatas.net.br: could not connect to host
 sojingle.net: could not connect to host
 solos.im: could not connect to host
-somali-derp.com: could not connect to host
 sotadb.info: could not connect to host
 soundhunter.xyz: could not connect to host
 sowingseasons.com: could not connect to host
@@ -1051,21 +1059,21 @@ srvonfire.com: could not connect to host
 stadionmanager.com: could not connect to host
 stadtgartenla.com: could not connect to host
 stamonicatourandtravel.com: could not connect to host
-startup.melbourne: could not connect to host
 statgram.me: could not connect to host
 static-assets.io: could not connect to host
 static.hosting: could not connect to host
-stcable.net: could not connect to host
 steffi-in-australien.com: could not connect to host
 steven-bennett.com: could not connect to host
 stickswag.cf: could not connect to host
 stilettomoda.com.br: could not connect to host
 stonemanbrasil.com.br: could not connect to host
 stpip.com: could not connect to host
+streamchan.org: could not connect to host
 stressfreehousehold.com: could not connect to host
 stupendous.net: could not connect to host
 stylle.me: could not connect to host
 sudo.im: could not connect to host
+sudosu.fr: could not connect to host
 sulek.eu: could not connect to host
 suneilpatel.com: could not connect to host
 sunfireshop.com.br: could not connect to host
@@ -1076,8 +1084,8 @@ suspiciousdarknet.xyz: could not connect to host
 sussexwebdesigns.com: could not connect to host
 t3rror.net: could not connect to host
 takusan.ru: could not connect to host
-taler.net: could not connect to host
 talktwincities.com: could not connect to host
+tangyue.date: could not connect to host
 tangzhao.net: could not connect to host
 tcpweb.net: could not connect to host
 tdsb.cf: could not connect to host
@@ -1104,14 +1112,13 @@ thestory.ie: could not connect to host
 thierryhayoz.ch: could not connect to host
 thinkcash.nl: could not connect to host
 ticfleet.com: could not connect to host
-timysewyn.be: could not connect to host
 tnb-plattform.de: could not connect to host
 todosrv.com: could not connect to host
 tofilmhub.com: could not connect to host
 tokaido.com: could not connect to host
-tokoindo.top: could not connect to host
 topdetoxcleanse.com: could not connect to host
 topnotchendings.com: could not connect to host
+toptec.net.br: could not connect to host
 totallynotaserver.com: could not connect to host
 totch.de: could not connect to host
 totot.net: could not connect to host
@@ -1136,6 +1143,7 @@ twitter.ax: could not connect to host
 twotube.ie: could not connect to host
 tykoon.com: could not connect to host
 typecodes.com: could not connect to host
+u.nu: could not connect to host
 ubicv.com: could not connect to host
 udo-luetkemeier.de: could not connect to host
 umsapi.com: could not connect to host
@@ -1152,6 +1160,7 @@ vanouwerkerk.net: could not connect to host
 vante.me: could not connect to host
 vapehour.com: could not connect to host
 varela-electricite.fr: could not connect to host
+vc.gg: could not connect to host
 velen.io: could not connect to host
 venmos.com: could not connect to host
 venturavwparts.com: could not connect to host
@@ -1175,7 +1184,6 @@ vsx.ch: could not connect to host
 vxapps.com: could not connect to host
 w4.no: could not connect to host
 waixingrenfuli.vip: could not connect to host
-wak.io: could not connect to host
 wanashi.com: could not connect to host
 wanda76.com: could not connect to host
 wanda78.com: could not connect to host
@@ -1185,6 +1193,7 @@ wanda97.com: could not connect to host
 wanda98.com: could not connect to host
 warlions.info: could not connect to host
 watchweasel.com: could not connect to host
+waxdramatic.com: could not connect to host
 we.serveftp.net: could not connect to host
 weareincognito.org: could not connect to host
 webart-factory.de: could not connect to host
@@ -1211,6 +1220,7 @@ whereismyorigin.cf: could not connect to host
 whilsttraveling.com: could not connect to host
 wibuw.com: could not connect to host
 wilhelm-nathan.de: could not connect to host
+willkommen-fuerstenberg.de: could not connect to host
 winnersports.co: could not connect to host
 winsufi.biz: could not connect to host
 wipc.net: could not connect to host
@@ -1219,7 +1229,7 @@ wireframesoftware.com: could not connect to host
 wisak.eu: could not connect to host
 wissl.org: could not connect to host
 wizznab.tk: could not connect to host
-wkennington.com: could not connect to host
+wm-talk.net: could not connect to host
 wolfenland.net: could not connect to host
 wollongongbaptist.hopto.org: could not connect to host
 wonderbooks.club: could not connect to host
@@ -1231,7 +1241,6 @@ wp-stack.pro: could not connect to host
 wp6.pw: could not connect to host
 wuchipc.com: could not connect to host
 wufupay.com: could not connect to host
-wv-n.de: could not connect to host
 www-68277.com: could not connect to host
 www-8887999.com: could not connect to host
 www.makeyourlaws.org: could not connect to host
@@ -1248,7 +1257,6 @@ xn--8mr166hf6s.xn--fiqs8s: could not connect to host
 xn--srenpind-54a.dk: could not connect to host
 xn--yj8h0m.ws: could not connect to host
 xpwn.cz: could not connect to host
-xqin.net: could not connect to host
 xuntaosms.com: could not connect to host
 xwaretech.info: could not connect to host
 y3451.com: could not connect to host
@@ -1265,15 +1273,12 @@ yobst.tk: could not connect to host
 yoga.is-an-engineer.com: could not connect to host
 yogananda-roma.org: could not connect to host
 youftp.tk: could not connect to host
-youmonit.me: could not connect to host
 yousite.by: could not connect to host
-youyoulemon.com: could not connect to host
 yum.beer: could not connect to host
 yuna.tg: could not connect to host
 yux.fr: could not connect to host
 zaoext.com: could not connect to host
 zbchen.com: could not connect to host
-zenfusion.fr: could not connect to host
 zenghx.tk: could not connect to host
 zerosource.net: could not connect to host
 zevelev.net: could not connect to host
@@ -1288,6 +1293,7 @@ zudomc.me: could not connect to host
 zuefle.net: could not connect to host
 zuehlcke.de: could not connect to host
 zuviel.space: could not connect to host
+zypr.pw: could not connect to host
 zyx.im: could not connect to host
 zzb510.com: could not connect to host
 zzb6688.com: could not connect to host
@@ -1375,7 +1381,7 @@ zzw.ca: could not connect to host
 2intermediate.co.uk: did not receive HSTS header
 2or3.tk: could not connect to host
 2smart4food.com: did not receive HSTS header
-2ss.jp: did not receive HSTS header
+2ss.jp: could not connect to host
 300651.ru: did not receive HSTS header
 300mbmovie24.com: did not receive HSTS header
 300mbmovies4u.cc: could not connect to host
@@ -1690,7 +1696,6 @@ altmv.com: max-age too low: 7776000
 aluminium-scaffolding.co.uk: could not connect to host
 alunjam.es: did not receive HSTS header
 alusta.co: could not connect to host
-alvcs.com: did not receive HSTS header
 am8888.top: could not connect to host
 amandaonishi.com: could not connect to host
 amavis.org: did not receive HSTS header
@@ -1723,6 +1728,7 @@ anagra.ms: could not connect to host
 analytic-s.ml: did not receive HSTS header
 analyticsinmotion.net: could not connect to host
 anankecosmetics.com: did not receive HSTS header
+ancientcraft.eu: did not receive HSTS header
 ancientkarma.com: could not connect to host
 andere-gedanken.net: max-age too low: 10
 anderslind.dk: could not connect to host
@@ -1733,7 +1739,7 @@ andreastoneman.com: could not connect to host
 andreigec.net: did not receive HSTS header
 andrerose.ca: did not receive HSTS header
 andrew.london: did not receive HSTS header
-andrewbroekman.com: could not connect to host
+andrewbroekman.com: did not receive HSTS header
 andrewmichaud.beer: could not connect to host
 andrewregan.me: could not connect to host
 andrewx.net: could not connect to host
@@ -1851,6 +1857,7 @@ armory.consulting: could not connect to host
 armory.supplies: could not connect to host
 armsday.com: could not connect to host
 armytricka.cz: did not receive HSTS header
+arnetdigital.eu: did not receive HSTS header
 aromaclub.nl: did not receive HSTS header
 aroundme.org: did not receive HSTS header
 arpa.ph: did not receive HSTS header
@@ -2061,7 +2068,7 @@ bccx.com: could not connect to host
 bcheng.cf: did not receive HSTS header
 bchep.com: could not connect to host
 bckp.de: could not connect to host
-bcm.com.au: max-age too low: 0
+bcm.com.au: did not receive HSTS header
 bcnx.de: max-age too low: 0
 bcsytv.com: could not connect to host
 bcweightlifting.ca: could not connect to host
@@ -2801,6 +2808,7 @@ comparejewelleryprices.co.uk: could not connect to host
 comparetravelinsurance.com.au: did not receive HSTS header
 compassionate-biology.com: could not connect to host
 compiledworks.com: could not connect to host
+completesportperformance.com: did not receive HSTS header
 completionist.audio: could not connect to host
 complymd.com: did not receive HSTS header
 compraneta.com: did not receive HSTS header
@@ -2816,6 +2824,7 @@ conjugacao.com.br: did not receive HSTS header
 connect.ua: could not connect to host
 connected-verhuurservice.nl: did not receive HSTS header
 connectfss.com: could not connect to host
+connectingconcepts.com: did not receive HSTS header
 consciousandglamorous.com: could not connect to host
 consciousbrand.org.au: could not connect to host
 consciousbranding.org.au: could not connect to host
@@ -2848,6 +2857,7 @@ cordial-restaurant.com: did not receive HSTS header
 core.mx: could not connect to host
 core4system.de: could not connect to host
 corenetworking.de: could not connect to host
+corex.io: did not receive HSTS header
 corgicloud.com: could not connect to host
 corkyoga.site: could not connect to host
 cormactagging.ie: could not connect to host
@@ -2856,6 +2866,7 @@ coroasdefloresonline.com.br: could not connect to host
 corozanu.ro: did not receive HSTS header
 corpoatletico.com.br: could not connect to host
 corporateencryption.com: could not connect to host
+corporatesubscriptions.com.au: did not receive HSTS header
 correctpaardbatterijnietje.nl: did not receive HSTS header
 corruption-mc.net: could not connect to host
 corruption-rsps.net: could not connect to host
@@ -2897,6 +2908,7 @@ crestoncottage.com: could not connect to host
 crimewatch.net.za: could not connect to host
 crisissurvivalspecialists.com: could not connect to host
 cristiandeluxe.com: did not receive HSTS header
+critcola.com: did not receive HSTS header
 crizk.com: could not connect to host
 crmdemo.website: did not receive HSTS header
 crockett.io: did not receive HSTS header
@@ -3020,6 +3032,7 @@ danielcowie.me: could not connect to host
 danieldk.eu: did not receive HSTS header
 danielheal.net: could not connect to host
 danieliancu.com: could not connect to host
+danielmarquard.com: did not receive HSTS header
 danielworthy.com: did not receive HSTS header
 danijobs.com: could not connect to host
 danishenanigans.com: could not connect to host
@@ -3176,10 +3189,12 @@ diablotine.rocks: could not connect to host
 diagnosia.com: did not receive HSTS header
 diamondcare.com.br: could not connect to host
 dianlujitao.com: did not receive HSTS header
+diannaobos.com: did not receive HSTS header
 dicando.com: max-age too low: 2592000
 dicelab.co.uk: could not connect to host
 dicionariofinanceiro.com: did not receive HSTS header
 dicionariopopular.com: did not receive HSTS header
+dicoding.com: did not receive HSTS header
 dieb.photo: could not connect to host
 dierenkruiden.nl: could not connect to host
 diewebstube.de: could not connect to host
@@ -3208,6 +3223,7 @@ directhskincream.com: could not connect to host
 directorinegocis.cat: could not connect to host
 direnv.net: did not receive HSTS header
 dirk-weise.de: did not receive HSTS header
+disclosure.io: did not receive HSTS header
 discovery.lookout.com: did not receive HSTS header
 discoveryottawa.ca: could not connect to host
 dise-online.de: did not receive HSTS header
@@ -3520,6 +3536,7 @@ email.lookout.com: could not connect to host
 email2rss.net: could not connect to host
 emanatepixels.com: could not connect to host
 emanga.su: did not receive HSTS header
+embracethedarkness.co.uk: did not receive HSTS header
 embroidered-stuff.com: could not connect to host
 emeldi-commerce.com: max-age too low: 0
 emesolutions.net: did not receive HSTS header
@@ -3553,7 +3570,6 @@ endohaus.com: could not connect to host
 endohaus.eu: could not connect to host
 enecoshop.nl: did not receive HSTS header
 enefan.jp: could not connect to host
-enfield-kitchens.co.uk: did not receive HSTS header
 engelwerbung.com: did not receive HSTS header
 enginsight.com: did not receive HSTS header
 englishyamal.ru: did not receive HSTS header
@@ -3581,7 +3597,7 @@ epanurse.com: could not connect to host
 ephry.com: could not connect to host
 epicmc.games: could not connect to host
 epoxate.com: could not connect to host
-epulsar.ru: did not receive HSTS header
+epulsar.ru: could not connect to host
 eq-serve.com: did not receive HSTS header
 eq8.net.au: could not connect to host
 eqim.me: could not connect to host
@@ -3968,13 +3984,14 @@ fsinf.at: did not receive HSTS header
 fspphoto.com: could not connect to host
 fstfy.de: could not connect to host
 ftctele.com: could not connect to host
+fteproxy.org: did not receive HSTS header
 ftpi.ml: could not connect to host
 fuckbilibili.com: could not connect to host
 fuckgfw233.org: could not connect to host
 fukushima-web.com: did not receive HSTS header
 fulilingyu.info: could not connect to host
 fuliydys.com: did not receive HSTS header
-fullytrained.co.uk: could not connect to host
+fullytrained.co.uk: did not receive HSTS header
 fumiware.com: could not connect to host
 fundacionhijosdelsol.org: could not connect to host
 funkyweddingideas.com.au: could not connect to host
@@ -3986,7 +4003,7 @@ furiffic.com: did not receive HSTS header
 furnation.com: could not connect to host
 furry.be: did not receive HSTS header
 fusedrops.com: could not connect to host
-fusionmate.com: could not connect to host
+fusionmate.com: did not receive HSTS header
 futbol11.com: did not receive HSTS header
 futurestarsusa.org: did not receive HSTS header
 futuretechnologi.es: could not connect to host
@@ -4081,6 +4098,7 @@ genyhitch.com: did not receive HSTS header
 geoffdev.com: could not connect to host
 geoffreyrichard.com: could not connect to host
 geopals.net: could not connect to host
+geoponika.gr: did not receive HSTS header
 george-brighton.co.uk: could not connect to host
 georgebrighton.co.uk: could not connect to host
 georgesonarthurs.com.au: did not receive HSTS header
@@ -4112,6 +4130,7 @@ getlolaccount.com: did not receive HSTS header
 getmassage.com.ng: could not connect to host
 getmondo.co.uk: could not connect to host
 getpake.com: could not connect to host
+getpop.org: did not receive HSTS header
 getremembrall.com: could not connect to host
 getronics.care: could not connect to host
 getsello.com: could not connect to host
@@ -4179,7 +4198,7 @@ goalsetup.com: did not receive HSTS header
 goaltree.ch: did not receive HSTS header
 goarmy.eu: could not connect to host
 goat.chat: did not receive HSTS header
-goat.xyz: max-age too low: 86400
+goat.xyz: did not receive HSTS header
 goben.ch: could not connect to host
 goblins.net: did not receive HSTS header
 goedeke.ml: could not connect to host
@@ -4218,6 +4237,7 @@ gostream.asia: did not receive HSTS header
 gotgenes.com: could not connect to host
 goto.google.com: did not receive HSTS header (error ignored - included regardless)
 goto.msk.ru: did not receive HSTS header
+gotobrno.cz: did not receive HSTS header
 gotocloud.ru: did not receive HSTS header
 gotowned.org: max-age too low: 0
 gotspot.com: could not connect to host
@@ -4697,7 +4717,6 @@ ifx.ee: could not connect to host
 igforums.com: could not connect to host
 igiftcards.nl: did not receive HSTS header
 ignatisd.gr: did not receive HSTS header
-igotoffer.com: did not receive HSTS header
 igule.net: could not connect to host
 ihotel.io: did not receive HSTS header
 ihrlotto.de: could not connect to host
@@ -4707,7 +4726,7 @@ ihsbsd.tk: could not connect to host
 iispeed.com: did not receive HSTS header
 ijn-dd.nl: did not receive HSTS header
 ijoda.com: could not connect to host
-ikon.name: could not connect to host
+ikon.name: did not receive HSTS header
 ikwilguidobellen.nl: could not connect to host
 ilbuongiorno.it: did not receive HSTS header
 ilgi.work: could not connect to host
@@ -4803,7 +4822,7 @@ innovamag.ca: did not receive HSTS header
 inplacers.ru: did not receive HSTS header
 inquisitive.io: did not receive HSTS header
 insane-bullets.com: could not connect to host
-insite-feedback.com: did not receive HSTS header
+insite-feedback.com: could not connect to host
 inspire-av.com: did not receive HSTS header
 inspiroinc.com: could not connect to host
 instacart.com: did not receive HSTS header
@@ -4894,7 +4913,7 @@ isitamor.pm: could not connect to host
 iskai.net: did not receive HSTS header
 iskaz.rs: did not receive HSTS header
 islandzero.net: could not connect to host
-islief.com: did not receive HSTS header
+islief.com: could not connect to host
 ismetroonfiretoday.com: could not connect to host
 isogen5.com: could not connect to host
 isogram.nl: could not connect to host
@@ -5011,6 +5030,7 @@ jcor.me: did not receive HSTS header
 jcoscia.com: could not connect to host
 jctf.io: could not connect to host
 jdav-leipzig.de: could not connect to host
+jdoiron.me: did not receive HSTS header
 jebengotai.com: did not receive HSTS header
 jeff393.com: could not connect to host
 jeffreymagee.com: could not connect to host
@@ -5092,6 +5112,7 @@ jongha.me: could not connect to host
 jonn.me: could not connect to host
 jonnichols.info: did not receive HSTS header
 jonsno.ws: could not connect to host
+joostbovee.nl: did not receive HSTS header
 jordanstrustcompany.cn: could not connect to host
 jordanstrustcompany.ru: could not connect to host
 jordikroon.nl: did not receive HSTS header
@@ -5327,6 +5348,7 @@ kotonehoko.net: could not connect to host
 kotovstyle.ru: could not connect to host
 koukni.cz: did not receive HSTS header
 kourpe.online: could not connect to host
+kpdyer.com: did not receive HSTS header
 kprog.net: could not connect to host
 kraigwalker.com: could not connect to host
 kralik.xyz: could not connect to host
@@ -5356,7 +5378,6 @@ ksfh-mail.de: could not connect to host
 kstan.me: could not connect to host
 ksukelife.com: did not receive HSTS header
 kswriter.com: could not connect to host
-kts-thueringen.de: did not receive HSTS header
 kuba.guide: could not connect to host
 kucom.it: could not connect to host
 kudo.co.id: did not receive HSTS header
@@ -5508,6 +5529,7 @@ levelum.com: did not receive HSTS header
 levert.ch: could not connect to host
 lexpierce.social: could not connect to host
 lez-cuties.com: could not connect to host
+lfashion.eu: did not receive HSTS header
 lfullerdesign.com: could not connect to host
 lg21.co: could not connect to host
 lgiswa.com.au: did not receive HSTS header
@@ -5521,6 +5543,7 @@ lianyexiuchang.in: could not connect to host
 liaoshuma.com: could not connect to host
 libanco.com: could not connect to host
 libertyrp.org: did not receive HSTS header
+libfte.org: did not receive HSTS header
 library.linode.com: did not receive HSTS header
 librechan.net: could not connect to host
 libreduca.com: could not connect to host
@@ -5535,7 +5558,7 @@ lifecoachproviders.com: did not receive HSTS header
 lifeguard.aecom.com: did not receive HSTS header
 lifeinitsownway.com: could not connect to host
 lifeskillsdirect.com: did not receive HSTS header
-lifetimemoneymachine.com: could not connect to host
+lifetimemoneymachine.com: did not receive HSTS header
 lightarmory.com: could not connect to host
 lightning-ashe.com: did not receive HSTS header
 lightnovelsekai.com: did not receive HSTS header
@@ -5584,8 +5607,10 @@ little.pw: did not receive HSTS header
 littlefreelibrary.org: did not receive HSTS header
 littleqiu.net: could not connect to host
 liujunyang.com: could not connect to host
+livecards.co.uk: did not receive HSTS header
 livedemo.io: could not connect to host
 livej.am: could not connect to host
+livekort.dk: did not receive HSTS header
 liverewrite.com: could not connect to host
 liviababynet.com.br: could not connect to host
 livrariahugodesaovitor.com.br: did not receive HSTS header
@@ -5724,7 +5749,7 @@ madars.org: did not receive HSTS header
 maddin.ga: could not connect to host
 madebyfalcon.co.uk: did not receive HSTS header
 madebymagnitude.com: did not receive HSTS header
-madeinorder.com: did not receive HSTS header
+madeinorder.com: could not connect to host
 mademoiselle-emma.be: did not receive HSTS header
 mademoiselle-emma.fr: did not receive HSTS header
 maderwin.com: did not receive HSTS header
@@ -6169,7 +6194,7 @@ montonicms.com: could not connect to host
 moon.lc: could not connect to host
 moonless.net: could not connect to host
 moonloupe.com: could not connect to host
-moosemanstudios.com: could not connect to host
+moosemanstudios.com: did not receive HSTS header
 moov.is: could not connect to host
 moparisthebest.biz: could not connect to host
 moparisthebest.info: could not connect to host
@@ -6256,7 +6281,6 @@ mvanmarketing.nl: did not receive HSTS header
 mvnet.com.br: did not receive HSTS header
 mvsecurity.nl: could not connect to host
 mwohlfarth.de: did not receive HSTS header
-mxlife.org: max-age too low: 86400
 my-owncloud.com: could not connect to host
 my.alfresco.com: did not receive HSTS header
 my.swedbank.se: did not receive HSTS header
@@ -6295,14 +6319,13 @@ mypagella.it: could not connect to host
 mypension.ca: could not connect to host
 myphonebox.de: could not connect to host
 myraytech.net: did not receive HSTS header
-myrig.com: did not receive HSTS header
 myrig.net: could not connect to host
 myrsa.in: did not receive HSTS header
 mysecretrewards.com: could not connect to host
 myspa.asia: did not receive HSTS header
 mystery-science-theater-3000.de: did not receive HSTS header
 mysteryblog.de: did not receive HSTS header
-mythlogic.com: could not connect to host
+mythlogic.com: did not receive HSTS header
 mythslegendscollection.com: did not receive HSTS header
 myweb360.de: did not receive HSTS header
 myzone.com: did not receive HSTS header
@@ -6378,7 +6401,7 @@ nedwave.com: could not connect to host
 nedzad.me: could not connect to host
 neftaly.com: did not receive HSTS header
 negativzinsen.info: did not receive HSTS header
-neilgreen.net: did not receive HSTS header
+neilgreen.net: could not connect to host
 neko-life.com: did not receive HSTS header
 neko-system.com: did not receive HSTS header
 nemno.de: could not connect to host
@@ -6468,6 +6491,7 @@ nipponcareers.com: did not receive HSTS header
 nixien.fr: could not connect to host
 nixmag.net: could not connect to host
 nkautoservice.nl: did not receive HSTS header
+nkb.in.th: did not receive HSTS header
 nll.fi: could not connect to host
 nmadda.com: could not connect to host
 nmctest.net: could not connect to host
@@ -6808,7 +6832,7 @@ panascais.net: did not receive HSTS header
 panelomix.net: did not receive HSTS header
 panicparts.com: max-age too low: 10540800
 panni.me: could not connect to host
-panoranordic.net: did not receive HSTS header
+panoranordic.net: could not connect to host
 pansu.space: could not connect to host
 pants-off.xyz: could not connect to host
 pantsu.cat: did not receive HSTS header
@@ -6855,7 +6879,6 @@ pastenib.com: could not connect to host
 paster.li: did not receive HSTS header
 pataua.kiwi: did not receive HSTS header
 paternitydnatest.com: could not connect to host
-paterno-gaming.com: could not connect to host
 patfs.com: did not receive HSTS header
 patientinsight.net: did not receive HSTS header
 patt.us: could not connect to host
@@ -7132,6 +7155,7 @@ press-anime-nenkan.com: did not receive HSTS header
 pressenews.net: did not receive HSTS header
 pressfreedomfoundation.org: did not receive HSTS header
 prettygrouse.com: did not receive HSTS header
+prettyphotoart.de: did not receive HSTS header
 pretzlaff.info: did not receive HSTS header
 preworkout.me: could not connect to host
 prezola.com: did not receive HSTS header
@@ -7226,7 +7250,7 @@ pwnsdx.pw: could not connect to host
 pyol.org: could not connect to host
 pypi-mirrors.org: did not receive HSTS header
 pypi-status.org: could not connect to host
-pyplo.org: could not connect to host
+pyplo.org: did not receive HSTS header
 pypt.lt: did not receive HSTS header
 pyrrhonism.org: could not connect to host
 pythonic.guru: could not connect to host
@@ -7357,7 +7381,7 @@ reagir43.fr: did not receive HSTS header
 realmic.net: could not connect to host
 realmofespionage.com: could not connect to host
 reapdrive.net: did not receive HSTS header
-reaper.rip: did not receive HSTS header
+reaper.rip: could not connect to host
 reardenporn.com: could not connect to host
 rebekaesgabor.online: could not connect to host
 rebootmc.com: did not receive HSTS header
@@ -7690,7 +7714,7 @@ schulterglatzen-altenwalde.de: could not connect to host
 schultzflorists.com: could not connect to host
 schwarzkopfforyou.de: did not receive HSTS header
 schweiz.guide: could not connect to host
-schweizerbolzonello.net: did not receive HSTS header
+schweizerbolzonello.net: could not connect to host
 schwetz.net: could not connect to host
 scicasts.com: max-age too low: 7776000
 scienceathome.org: did not receive HSTS header
@@ -7836,6 +7860,7 @@ seyahatsagliksigortalari.com: could not connect to host
 sfashion.si: did not receive HSTS header
 sfhobbies.com.br: could not connect to host
 sfsltd.com: did not receive HSTS header
+sgovaard.nl: did not receive HSTS header
 sh11.pp.ua: did not receive HSTS header
 sha2017.org: did not receive HSTS header
 shadoom.com: did not receive HSTS header
@@ -8142,6 +8167,7 @@ spititout.it: could not connect to host
 spittersberger.recipes: did not receive HSTS header
 spokonline.com: could not connect to host
 sponsortobias.com: could not connect to host
+sport-socken.net: did not receive HSTS header
 sportchirp-internal.azurewebsites.net: did not receive HSTS header
 sporthit.ru: could not connect to host
 sportifik.com: did not receive HSTS header
@@ -8270,6 +8296,7 @@ studentskydenik.cz: could not connect to host
 studenttravel.cz: did not receive HSTS header
 studinf.xyz: could not connect to host
 studio-panic.com: did not receive HSTS header
+studiograou.com: did not receive HSTS header
 studiozelden.com: did not receive HSTS header
 studybay.com: did not receive HSTS header
 studydrive.net: did not receive HSTS header
@@ -8396,7 +8423,6 @@ talkitup.online: did not receive HSTS header
 talklifestyle.nl: could not connect to host
 tallr.se: could not connect to host
 tallshoe.com: could not connect to host
-tamasszabo.net: did not receive HSTS header
 tamex.xyz: could not connect to host
 tandarts-haarlem.nl: did not receive HSTS header
 tangel.me: could not connect to host
@@ -8437,7 +8463,6 @@ tcl.ath.cx: did not receive HSTS header
 tcomms.org: max-age too low: 0
 tcp.expert: did not receive HSTS header
 tcwebvn.com: could not connect to host
-tdelmas.eu: did not receive HSTS header
 tdsb.ga: could not connect to host
 tdsb.gq: could not connect to host
 tdsb.ml: could not connect to host
@@ -8527,8 +8552,8 @@ th3nd.com: did not receive HSTS header
 thaihostcool.com: did not receive HSTS header
 thailandpropertylisting.com: did not receive HSTS header
 thailandpropertylistings.com: did not receive HSTS header
+thaimooc.org: max-age too low: 0
 thalmann.fr: did not receive HSTS header
-thanhthinhbui.com: did not receive HSTS header
 thatvizsla.life: did not receive HSTS header
 the-construct.com: could not connect to host
 the-delta.net.eu.org: could not connect to host
@@ -8580,6 +8605,7 @@ thehotfix.net: could not connect to host
 theimagesalon.com: max-age too low: 43200
 theinvisibletrailer.com: could not connect to host
 theitsage.com: did not receive HSTS header
+thejobauction.com: did not receive HSTS header
 thejserver.de: could not connect to host
 thelapine.ca: did not receive HSTS header
 themadmechanic.net: could not connect to host
@@ -8650,7 +8676,6 @@ thundercampaign.com: could not connect to host
 ti.blog.br: could not connect to host
 tianxing.pro: did not receive HSTS header
 tianxingvpn.pro: could not connect to host
-tibbitshall.ca: did not receive HSTS header
 ticketoplichting.nl: did not receive HSTS header
 tickopa.co.uk: could not connect to host
 tickreport.com: did not receive HSTS header
@@ -8791,6 +8816,7 @@ toyotamotala.se: could not connect to host
 tpbcdn.com: could not connect to host
 tpe-edu.com: could not connect to host
 tpms4u.at: did not receive HSTS header
+tppdebate.org: did not receive HSTS header
 tracetracker.com: did not receive HSTS header
 tracker-gps.ch: could not connect to host
 tracktivity.com.au: could not connect to host
@@ -8801,6 +8827,7 @@ traditional-knowledge.tk: did not receive HSTS header
 trafficquality.org: could not connect to host
 traindb.nl: did not receive HSTS header
 training4girls.ru: could not connect to host
+traininglist.org: did not receive HSTS header
 trainingproviderresults.gov: could not connect to host
 trainut.com: could not connect to host
 trakfusion.com: could not connect to host
@@ -8930,7 +8957,8 @@ uber.com.au: did not receive HSTS header
 uberfunction.com: did not receive HSTS header
 ubicloud.de: did not receive HSTS header
 ublox.com: did not receive HSTS header
-uddi.ng: could not connect to host
+uddi.ng: did not receive HSTS header
+uefeng.com: did not receive HSTS header
 uega.net: did not receive HSTS header
 ufgaming.com: did not receive HSTS header
 ufotable.uk: did not receive HSTS header
@@ -8993,6 +9021,7 @@ uniformecomgas.com.br: could not connect to host
 uniformehumboldt.com.br: did not receive HSTS header
 unikitty-on-tour.com: could not connect to host
 unionstationapp.com: could not connect to host
+uniq.site: did not receive HSTS header
 unison.com: did not receive HSTS header
 unisyssecurity.com: did not receive HSTS header
 unitlabs.net: could not connect to host
@@ -9025,7 +9054,6 @@ ur-lauber.de: did not receive HSTS header
 urandom.eu.org: did not receive HSTS header
 urban-garden.lt: could not connect to host
 urban-garden.lv: could not connect to host
-urbanstylestaging.com: did not receive HSTS header
 urbpic.com: could not connect to host
 urlchomp.com: did not receive HSTS header
 urphp.com: could not connect to host
@@ -9043,6 +9071,7 @@ userify.com: max-age too low: 0
 uslab.io: could not connect to host
 usr.nz: did not receive HSTS header
 ustr.gov: max-age too low: 86400
+utdscanner.com: did not receive HSTS header
 utilitronium-shockwave.com: could not connect to host
 utleieplassen.no: could not connect to host
 utopiagalaxy.space: could not connect to host
@@ -9081,7 +9110,7 @@ valethound.com: could not connect to host
 valhalla-agency.com: max-age too low: 0
 valhallacostarica.com: could not connect to host
 valhallamovement.com: did not receive HSTS header
-valitron.se: did not receive HSTS header
+valitron.se: could not connect to host
 valkyrja.xyz: could not connect to host
 valleyridgepta.org: could not connect to host
 vallis.net: did not receive HSTS header
@@ -9297,10 +9326,10 @@ waterforlife.net.au: did not receive HSTS header
 waterpoint.com.br: could not connect to host
 watersportmarkt.net: did not receive HSTS header
 watsonhall.uk: could not connect to host
-wattechweb.com: did not receive HSTS header
 wave.is: could not connect to host
 wavefloatrooms.com: did not receive HSTS header
 wavefrontsystemstech.com: could not connect to host
+waytt.cf: did not receive HSTS header
 wear2work.nl: did not receive HSTS header
 wearesouthafricans.com: did not receive HSTS header
 weaverhairextensions.nl: could not connect to host
@@ -9352,7 +9381,7 @@ wegenaer.nl: could not connect to host
 weiji.ga: could not connect to host
 wein.co.kr: could not connect to host
 welkers.org: could not connect to host
-wellastore.ru: did not receive HSTS header
+wellastore.ru: could not connect to host
 wellcomp.com.br: did not receive HSTS header
 wellies.com.au: max-age too low: 7889238
 wellness.so: could not connect to host
@@ -9521,7 +9550,7 @@ www-8003.com: did not receive HSTS header
 www-88599.com: did not receive HSTS header
 www-9995.com: did not receive HSTS header
 www-djbet.com: did not receive HSTS header
-www-jinshavip.com: could not connect to host
+www-jinshavip.com: did not receive HSTS header
 www.cueup.com: could not connect to host
 www.cyveillance.com: did not receive HSTS header
 www.developer.mydigipass.com: could not connect to host
@@ -9551,9 +9580,8 @@ wygluszanie.eu: did not receive HSTS header
 wyzphoto.nl: did not receive HSTS header
 x-power-detox.com: could not connect to host
 x-ripped-hd.com: could not connect to host
-x23.eu: did not receive HSTS header
+x23.eu: could not connect to host
 x2c0.net: did not receive HSTS header
-x2d2.de: did not receive HSTS header
 x2w.io: could not connect to host
 x3led.com: could not connect to host
 x509.pub: could not connect to host
@@ -9695,6 +9723,7 @@ yoloboatrentals.com: did not receive HSTS header
 yoloprod.fr: could not connect to host
 yoloseo.com: could not connect to host
 yomepre.com: could not connect to host
+yopers.com: did not receive HSTS header
 yoru.me: did not receive HSTS header
 youcontrol.ru: could not connect to host
 youfencun.com: did not receive HSTS header
@@ -9705,6 +9734,7 @@ yourbapp.ch: could not connect to host
 yourcomputer.expert: did not receive HSTS header
 yoursecondphone.co: could not connect to host
 yourstrongbox.com: could not connect to host
+youyoulemon.com: did not receive HSTS header
 ypiresia.fr: could not connect to host
 ytcuber.xyz: could not connect to host
 ytvwld.de: did not receive HSTS header
@@ -9740,7 +9770,6 @@ zaoshanghao-dajia.rhcloud.com: could not connect to host
 zap.yt: did not receive HSTS header
 zarmarket.org: did not receive HSTS header
 zarooba.com: could not connect to host
-zary.me: did not receive HSTS header
 zavca.com: did not receive HSTS header
 zbigniewgalucki.eu: did not receive HSTS header
 zdravotnickasluzba.eu: could not connect to host
diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc
index 52a904405185..6e6c4fa5670d 100644
--- a/security/manager/ssl/nsSTSPreloadList.inc
+++ b/security/manager/ssl/nsSTSPreloadList.inc
@@ -8,7 +8,7 @@
 /*****************************************************************************/
 
 #include <stdint.h>
-const PRTime gPreloadListExpirationTime = INT64_C(1523216355536000);
+const PRTime gPreloadListExpirationTime = INT64_C(1523301126028000);
 %%
 0-1.party, 1
 0.me.uk, 1
@@ -1422,6 +1422,7 @@ alumni-kusa.jp, 1
 alunonaescola.com.br, 1
 alupferd.de, 1
 aluroof.eu, 1
+alvcs.com, 1
 alviano.com, 1
 alvicom.hu, 1
 alvosec.com, 0
@@ -1566,7 +1567,6 @@ anchorgrounds.com, 1
 anchorinmarinainc.com, 1
 anchovy.nz, 0
 ancient-gates.de, 1
-ancientcraft.eu, 1
 ancolies-andre.com, 1
 anconaswine.com, 1
 and-stuff.nl, 1
@@ -2051,7 +2051,7 @@ arijitdg.net, 1
 arikar.eu, 1
 arima.co.ke, 1
 arinflatablefun.co.uk, 1
-aristilabs.com, 0
+aristilabs.com, 1
 aristocrates.co, 1
 aristocratps.com, 1
 aritec-la.com, 1
@@ -2092,7 +2092,6 @@ arnaudfeld.de, 1
 arnaudminable.net, 1
 arne-petersen.net, 1
 arnesolutions.com, 1
-arnetdigital.eu, 0
 arniescastles.co.uk, 1
 arnoldkontz-occasions.lu, 1
 arnor.org, 1
@@ -6156,7 +6155,6 @@ compilenix.org, 1
 completefloorcoverings.com, 1
 completesecurityessex.co.uk, 1
 completesecurityessex.com, 1
-completesportperformance.com, 1
 completionist.me, 1
 complex-organization.com, 1
 complexart.ro, 1
@@ -6233,7 +6231,6 @@ connect-me.com, 1
 connect.dating, 1
 connect.facebook.net, 1
 connectedcare.md, 1
-connectingconcepts.com, 1
 connectmath.com, 1
 connectmy.car, 1
 connectum.eu, 1
@@ -6359,7 +6356,6 @@ corepartners.com.ua, 1
 coresolutions.ca, 1
 coresos.com, 1
 coreum.ca, 1
-corex.io, 1
 coreyjmahler.com, 1
 corgi.party, 1
 coribi.com, 1
@@ -6380,7 +6376,6 @@ corpio.nl, 1
 corpkitnw.com, 1
 corporatecomputingsolutions.com, 1
 corporateinfluencers.com, 1
-corporatesubscriptions.com.au, 1
 corpulant.coffee, 1
 corpulantcoffee.com, 1
 corpulent.coffee, 1
@@ -6597,7 +6592,6 @@ crisp.im, 1
 cristarta.com, 1
 cristau.org, 1
 cristianhares.com, 1
-critcola.com, 1
 critical.today, 0
 criticalaim.com, 1
 criticalsurveys.co.uk, 1
@@ -7030,7 +7024,6 @@ danieljamesscott.org, 1
 danieljireh.com, 1
 danielkoster.nl, 1
 danielkratz.com, 1
-danielmarquard.com, 1
 danielmoch.com, 1
 danielmostertman.com, 0
 danielmostertman.nl, 0
@@ -7578,7 +7571,7 @@ desmaakvanplanten.be, 1
 desmo.gg, 1
 despertadoronline.com.es, 1
 desplats.com.ar, 1
-despora.de, 0
+despora.de, 1
 despotika.de, 1
 dessinemoilademocratie.ch, 1
 desterman.ru, 1
@@ -7721,7 +7714,6 @@ diamondyze.nl, 1
 diamorphine.com, 1
 diamsmedia.ch, 1
 dianefriedli.ch, 1
-diannaobos.com, 1
 dianurse.com, 1
 diare-na-miru.cz, 1
 diario-egipto.com, 1
@@ -7747,7 +7739,6 @@ dicionarioetimologico.com.br, 1
 dick.red, 1
 dickieslife.com, 1
 dickpics.ru, 1
-dicoding.com, 1
 didacte.com, 1
 didche.net, 1
 diddens.de, 1
@@ -7914,7 +7905,6 @@ discarica.roma.it, 1
 discha.net, 1
 disciples.io, 1
 discipul.nl, 1
-disclosure.io, 1
 disco-crazy-world.de, 1
 discofitta.com, 1
 disconformity.net, 1
@@ -9112,7 +9102,6 @@ embellir-aroma.com, 1
 embellir-kyujin.com, 1
 embox.net, 1
 embraceni.org, 1
-embracethedarkness.co.uk, 1
 embroideryexpress.co.uk, 1
 emcspotlight.com, 1
 emeliefalk.se, 1
@@ -9224,6 +9213,7 @@ enersaveapp.org, 1
 enersec.co.uk, 1
 enet-navigator.de, 1
 enfantsdelarue.ch, 1
+enfield-kitchens.co.uk, 1
 enflow.nl, 1
 enfoqueseguro.com, 1
 enfu.se, 1
@@ -11040,7 +11030,6 @@ ftang.de, 1
 ftc.gov, 0
 ftccomplaintassistant.gov, 1
 ftcefile.gov, 1
-fteproxy.org, 1
 ftgho.com, 1
 ftng.se, 1
 ftrsecure.com, 1
@@ -11516,7 +11505,6 @@ geoip.fedoraproject.org, 1
 geoip.stg.fedoraproject.org, 1
 geolad.com, 0
 geometra.roma.it, 1
-geoponika.gr, 1
 geoport.al, 1
 george-orwell.com, 1
 georgehalachev.com, 1
@@ -11598,7 +11586,6 @@ getnib.com, 1
 getnikola.com, 1
 geto.ml, 1
 getoutofdebt.org, 1
-getpop.org, 1
 getpost.online, 1
 getpublii.com, 1
 getpuck.com, 1
@@ -11967,7 +11954,6 @@ gothic.dating, 1
 gotirupati.com, 0
 goto.google.com, 1
 goto.world, 1
-gotobrno.cz, 1
 gotomi.info, 1
 gotoxy.at, 1
 gottfridsberg.org, 1
@@ -13726,6 +13712,7 @@ ignatovich.me, 1
 ignet.gov, 1
 ignitedmindz.in, 1
 igorw.org, 1
+igotoffer.com, 0
 igrivi.com, 1
 igsmgmt.com, 1
 iguana.com.ec, 0
@@ -14848,7 +14835,6 @@ jdh8.org, 1
 jdheysupplies.co.uk, 1
 jdjohnsonmedia.com, 1
 jdoi.pw, 1
-jdoiron.me, 1
 jdpleisure.co.uk, 1
 jdscastlehire.co.uk, 1
 jdsf.tk, 1
@@ -15179,7 +15165,6 @@ jons.org, 1
 jonscaife.com, 1
 jooksuratas.ee, 1
 joomlant.org, 1
-joostbovee.nl, 1
 joostrijneveld.nl, 1
 joostvanderlaan.nl, 1
 jooto.com, 1
@@ -16225,7 +16210,6 @@ kowshiksundararajan.com, 1
 koyaanis.com, 1
 kozmik.co, 1
 kozuch.biz, 1
-kpdyer.com, 1
 kpebetka.net, 1
 kpfanworld.com, 1
 kpinvest.eu, 1
@@ -16320,6 +16304,7 @@ kswcosmetics.com, 1
 ktbnetbank.com, 1
 kteen.info, 1
 kthnxbai.xyz, 1
+kts-thueringen.de, 1
 ktsee.eu.org, 1
 ktube.yt, 1
 ktw.lv, 1
@@ -17015,7 +17000,6 @@ lexway.pk, 1
 lexxyn.nl, 1
 lezard-com.fr, 1
 lezdomsm.com, 1
-lfashion.eu, 1
 lfaz.org, 1
 lfgss.com, 1
 lfrconseil.com, 1
@@ -17051,7 +17035,6 @@ libble.eu, 1
 libdeer.so, 1
 liberapay.com, 1
 libertas-tech.com, 1
-libfte.org, 1
 libmpq.org, 1
 libnull.com, 1
 librairie-asie.com, 1
@@ -17306,7 +17289,6 @@ liul.in, 1
 liushuyu.tk, 1
 liv3ly.com, 1
 livebetterwith.com, 1
-livecards.co.uk, 1
 livedesign.at, 1
 livedesign24.de, 1
 liveflightapp.com, 1
@@ -17315,7 +17297,6 @@ livejasmin.dk, 1
 livekaarten.be, 1
 livekaarten.nl, 1
 livekort.com, 1
-livekort.dk, 1
 livekort.no, 1
 livekort.se, 1
 livekortti.com, 1
@@ -17616,7 +17597,7 @@ ltls.org, 1
 ltn-tom-morel.fr, 1
 ltransferts.com, 1
 lu.search.yahoo.com, 0
-luav.org, 0
+luav.org, 1
 lubar.me, 1
 lubbockyounglawyers.org, 1
 lubomirkazakov.com, 1
@@ -19787,6 +19768,7 @@ mx.search.yahoo.com, 0
 mx5international.com, 1
 mxawei.cn, 1
 mxihan.xyz, 1
+mxlife.org, 1
 mxp.tw, 1
 my-cdn.de, 1
 my-contract.ch, 1
@@ -19960,6 +19942,7 @@ myrent.quebec, 1
 myrepublic.co.id, 1
 myresearchapp.com, 1
 myriadof.com, 1
+myrig.com, 1
 myrig.com.ua, 1
 myrig.io, 1
 myrig.ru, 1
@@ -20739,7 +20722,6 @@ nja.id.au, 1
 njguardtraining.com, 1
 njpjanssen.nl, 1
 nkadvertising.online, 1
-nkb.in.th, 1
 nkinka.de, 1
 nkp-media.de, 1
 nl-ix.net, 1
@@ -22013,6 +21995,7 @@ patbatesremodeling.com, 0
 patdorf.com, 1
 patechmasters.com, 1
 patentfamily.de, 1
+paterno-gaming.com, 1
 patflix.com, 1
 pathagoras.com, 1
 pathwaystoresilience.org, 1
@@ -23124,7 +23107,6 @@ pretachique.com.br, 1
 pretix.eu, 1
 pretrialservices.gov, 1
 pretty.hu, 1
-prettyphotoart.de, 1
 prettytunesapp.com, 1
 pretwolk.nl, 1
 pretzelx.com, 1
@@ -25085,7 +25067,7 @@ samirnassar.com, 1
 samizdat.cz, 1
 samkelleher.com, 1
 saml-gateway.org, 1
-samm.com.au, 1
+samm.com.au, 0
 sammyjohnson.com, 0
 sammyservers.com, 1
 samp.im, 1
@@ -25887,7 +25869,6 @@ sg-elektro.de, 1
 sg.search.yahoo.com, 0
 sgb.co, 1
 sgcaccounts.co.uk, 1
-sgovaard.nl, 1
 sgroup-hitoduma.com, 1
 sgroup-rec.com, 1
 sgtcodfish.com, 1
@@ -27099,7 +27080,6 @@ spornkuller.de, 1
 sport-in-sundern.de, 1
 sport-potreby.cz, 1
 sport-potreby.sk, 1
-sport-socken.net, 1
 sporter.com, 1
 sportflash.info, 1
 sportnesia.com, 1
@@ -27611,7 +27591,6 @@ studio-fotografico.ru, 1
 studiodentisticosanmarco.it, 1
 studiodewit.nl, 1
 studiodoprazer.com.br, 1
-studiograou.com, 1
 studiokicca.com, 1
 studiomarcella.com, 1
 studioriehl.com, 1
@@ -28089,6 +28068,7 @@ talon.rip, 1
 talsi.eu, 1
 talun.de, 1
 tam7t.com, 1
+tamasszabo.net, 1
 tamchunho.com, 1
 tamindir.com, 1
 tammy.pro, 1
@@ -28195,6 +28175,7 @@ tcnapplications.com, 1
 tcptun.com, 1
 tcpweb.net, 1
 tdchrom.com, 1
+tdelmas.eu, 1
 tdelmas.ovh, 1
 tdfbfoundation.org, 1
 tdrcartuchos.com.br, 1
@@ -28529,7 +28510,6 @@ thaiforest.ch, 1
 thaigirls.xyz, 1
 thaihomecooking.com, 1
 thailandpharmacy.net, 1
-thaimooc.org, 0
 thairehabassociation.com, 1
 thajskyraj.com, 1
 thalan.fr, 1
@@ -28539,6 +28519,7 @@ thalskarth.com, 1
 thamesfamilydentistry.com, 1
 thanabh.at, 1
 thanatoid.net, 1
+thanhthinhbui.com, 1
 thatgudstuff.com, 1
 thatpodcast.io, 1
 thatquiz.org, 1
@@ -28660,7 +28641,6 @@ theinitium.com, 1
 theintercept.com, 1
 theinternationalgeekconspiracy.eu, 1
 thejacksoninstitute.com.au, 1
-thejobauction.com, 1
 thekev.in, 1
 thekeymusic.com, 1
 thekingofhate.com, 1
@@ -28926,6 +28906,7 @@ tianshili.me, 1
 tianxicaipiao.com, 1
 tianxicaipiao.win, 1
 tianxicp.com, 1
+tibbitshall.ca, 1
 tibipg.com, 1
 tibovanheule.site, 1
 ticfleet.com, 1
@@ -29420,7 +29401,6 @@ tpbunblocked.org, 1
 tpidg.us, 1
 tpolemis.com, 1
 tpp.chat, 1
-tppdebate.org, 1
 tppleague.me, 0
 tqdev.com, 1
 tr.search.yahoo.com, 0
@@ -29474,7 +29454,6 @@ train-track.co.uk, 1
 trainex.org, 1
 trainhornforums.com, 1
 trainiac.com.au, 1
-traininglist.org, 1
 trainings-handschuhe-test.de, 1
 trainline.at, 1
 trainline.cn, 1
@@ -29954,7 +29933,6 @@ udruga-point.hr, 1
 ueba1085.jp, 1
 ueberwachungspaket.at, 1
 uedaviolin.com, 1
-uefeng.com, 1
 ueni.com, 1
 uerdingen.info, 1
 uesociedadlimitada.com, 1
@@ -30087,7 +30065,6 @@ unila.edu.br, 1
 unionplat.ru, 1
 unipig.de, 1
 uniprimebr.com.br, 1
-uniq.site, 1
 unique-bouncy-castles.co.uk, 1
 unique-pathways.ch, 1
 unique-pathways.com, 1
@@ -30199,6 +30176,7 @@ urbanietz-immobilien.de, 1
 urbanmelbourne.info, 1
 urbannewsservice.com, 1
 urbansparrow.in, 1
+urbanstylestaging.com, 1
 urbanwildlifealliance.org, 1
 urbexdk.nl, 1
 urcentral.com, 1
@@ -30263,7 +30241,6 @@ usualbeings.com, 1
 uswitch.com, 1
 ut-addicted.com, 1
 utahlocal.net, 1
-utdscanner.com, 1
 utdsgda.com, 1
 utepils.de, 1
 utilia.tools, 1
@@ -30882,7 +30859,7 @@ vorodevops.com, 1
 vos-fleurs.ch, 1
 vos-fleurs.com, 1
 vosgym.jp, 1
-voshod.org, 1
+voshod.org, 0
 vosky.fr, 1
 vostronet.com, 1
 voter-info.uk, 1
@@ -31102,6 +31079,7 @@ waterschaplimburg.nl, 1
 watertrails.io, 1
 waterworkscondos.com, 1
 watsonwork.me, 1
+wattechweb.com, 1
 wave-ola.es, 1
 wavesboardshop.com, 1
 wavesoftime.com, 1
@@ -31112,7 +31090,6 @@ waylaydesign.com, 1
 wayne.cloud, 0
 wayohoo.com, 1
 wayohoo.net, 1
-waytt.cf, 1
 waze.com, 1
 wbci.us, 1
 wbg-vs.de, 1
@@ -32103,6 +32080,7 @@ x.st, 1
 x0r.be, 1
 x13.com, 1
 x1616.tk, 1
+x2d2.de, 1
 x378.ch, 1
 x509.io, 1
 x64architecture.com, 1
@@ -32144,7 +32122,7 @@ xenoworld.de, 1
 xeonlab.com, 1
 xeonlab.de, 1
 xerblade.com, 1
-xerhost.de, 0
+xerhost.de, 1
 xetown.com, 1
 xfce.space, 1
 xferion.com, 1
@@ -32569,7 +32547,6 @@ yombo.net, 1
 yomena.in, 1
 yoonas.com, 1
 yooooex.com, 1
-yopers.com, 1
 yoramvandevelde.net, 1
 yorcom.nl, 0
 yorcool.nl, 1
@@ -32632,7 +32609,6 @@ youtsuu-raku.com, 1
 youtube.com, 1
 youtubedownloader.com, 1
 youwatchporn.com, 1
-youyoulemon.com, 1
 yoxall.me.uk, 1
 yoyoost.duckdns.org, 1
 ypart.eu, 1
@@ -32784,6 +32760,7 @@ zappbuildapps.com, 1
 zaratan.fr, 1
 zargaripour.com, 1
 zarpo.com.br, 1
+zary.me, 1
 zaufanatrzeciastrona.pl, 1
 zavec.com.ec, 1
 zavetaji.lv, 1

From 2dd6a8b4ce1cd5ea0a84a6b00a71402c7fdf468a Mon Sep 17 00:00:00 2001
From: ffxbld <none@none>
Date: Mon, 4 Dec 2017 11:15:44 -0800
Subject: [PATCH 218/219] No bug, Automated HPKP preload list update from host
 bld-linux64-spot-030 - a=hpkp-update

---
 security/manager/ssl/StaticHPKPins.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h
index 856e409a2bf2..69ee309027af 100644
--- a/security/manager/ssl/StaticHPKPins.h
+++ b/security/manager/ssl/StaticHPKPins.h
@@ -1159,4 +1159,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1520797169259000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1520881940301000);

From d9b3452d661f3a58b058dccbb853861be207a400 Mon Sep 17 00:00:00 2001
From: L10n Bumper Bot <release+l10nbumper@mozilla.com>
Date: Mon, 4 Dec 2017 12:40:52 -0800
Subject: [PATCH 219/219] no bug - Bumping Fennec l10n changesets DONTBUILD
 r=release a=l10n-bump

vi -> ['android', 'android-api-16', 'android-multilocale']
---
 mobile/locales/l10n-changesets.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/locales/l10n-changesets.json b/mobile/locales/l10n-changesets.json
index 80a5900415a0..243bfd9097f4 100644
--- a/mobile/locales/l10n-changesets.json
+++ b/mobile/locales/l10n-changesets.json
@@ -724,7 +724,8 @@
     "vi": {
         "platforms": [
             "android", 
-            "android-api-16"
+            "android-api-16", 
+            "android-multilocale"
         ], 
         "revision": "default"
     },