New upstream version 89.0~b2

74911c77 · Carsten Schoenert · 7af1a0b8 · 74911c77 · 74911c77 · 74911c77
Commit 74911c77 authored Apr 30, 2021 by Carsten Schoenert
--- a/.babel-eslint.rc.js
+++ b/.babel-eslint.rc.js
@@ -4,5 +4,7 @@

 module.exports = {
  plugins: [
+    "@babel/plugin-syntax-class-properties",
+    "@babel/plugin-syntax-jsx",
  ],
 };
--- a/.cargo/config.in
+++ b/.cargo/config.in
@@ -2,6 +2,11 @@
 # It was generated by `mach vendor rust`.
 # Please do not edit.

+[source."https://github.com/zakarumych/gpu-alloc.git"]
+git = "https://github.com/zakarumych/gpu-alloc.git"
+replace-with = "vendored-sources"
+rev = "2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6"
+
 [source."https://github.com/shravanrn/nix/"]
 git = "https://github.com/shravanrn/nix/"
 replace-with = "vendored-sources"
@@ -10,7 +15,7 @@ rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
 [source."https://github.com/msirringhaus/minidump_writer_linux.git"]
 git = "https://github.com/msirringhaus/minidump_writer_linux.git"
 replace-with = "vendored-sources"
-rev = "01c7a0da8d34059f7dae8ab9e7512529ff16347a"
+rev = "667c38bf1d9a8ea0c2c0a219d13006a39847b3f2"

 [source."https://github.com/mozilla/neqo"]
 git = "https://github.com/mozilla/neqo"
@@ -77,6 +82,11 @@ git = "https://github.com/jfkthame/mapped_hyph.git"
 replace-with = "vendored-sources"
 rev = "578d7058a638c955a597f035ce1a11049c3021d7"

+[source."https://github.com/hsivonen/xmldecl"]
+git = "https://github.com/hsivonen/xmldecl"
+replace-with = "vendored-sources"
+rev = "a74f7df5bf6cb11194fb74daa0c3cf42f326fd90"
+
 [source."https://github.com/hsivonen/packed_simd"]
 git = "https://github.com/hsivonen/packed_simd"
 replace-with = "vendored-sources"
@@ -90,12 +100,12 @@ rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570"
 [source."https://github.com/hsivonen/chardetng"]
 git = "https://github.com/hsivonen/chardetng"
 replace-with = "vendored-sources"
-rev = "fd4ed671ef495af4dcda4c4cba3ef8d426db8af1"
+rev = "39f95e2f7cd6e632a379cdeee62c68e8cedd7810"

 [source."https://github.com/gfx-rs/naga"]
 git = "https://github.com/gfx-rs/naga"
 replace-with = "vendored-sources"
-tag = "gfx-12"
+tag = "gfx-20"

 [source."https://github.com/gfx-rs/metal-rs"]
 git = "https://github.com/gfx-rs/metal-rs"
@@ -105,7 +115,7 @@ rev = "439c986eb7a9b91e88b61def2daa66e4043fcbef"
 [source."https://github.com/gfx-rs/gfx"]
 git = "https://github.com/gfx-rs/gfx"
 replace-with = "vendored-sources"
-rev = "0a201d1c406b5119ec11068293a40e50ec0be4c8"
+rev = "3ee1ca9ba486b166a52765024d8d149cbb28d486"

 [source."https://github.com/gfx-rs/d3d12-rs"]
 git = "https://github.com/gfx-rs/d3d12-rs"

--- a/.cron.yml
+++ b/.cron.yml
@@ -96,17 +96,6 @@ jobs:
          by-project:
              mozilla-central: [{hour: 10, minute: 0}]

-    - name: tp6m-fennec-v68
-      job:
-          type: decision-task
-          treeherder-symbol: f68
-          target-tasks-method: fennec_v68
-          include-push-tasks: true
-      run-on-projects:
-          - mozilla-central
-      when:
-          - {weekday: 'Saturday', hour: 5, minute: 0}
-
    - name: live-site-perf-testing
      job:
          type: decision-task
@@ -173,6 +162,30 @@ jobs:
      when:
          - {hour: 10, minute: 0}

+    - name: linux64-bp-clang-trunk
+      job:
+          type: decision-task
+          treeherder-symbol: linux64-bp-clang-trunk
+          target-tasks-method: linux64_bp_clang_trunk
+      run-on-projects:
+          - mozilla-central
+          - mozilla-release
+      when:
+          - {hour: 2, minute: 0}
+
+    - name: updatebot-cron-job
+      job:
+          type: decision-task
+          treeherder-symbol: updatebot
+          target-tasks-method: updatebot_cron
+      run-on-projects:
+          - mozilla-central
+      when:
+          - {hour: 0, minute: 0}
+          - {hour: 6, minute: 0}
+          - {hour: 12, minute: 0}
+          - {hour: 18, minute: 0}
+
    - name: customv8-update
      job:
          type: decision-task
@@ -234,21 +247,8 @@ jobs:
          - mozilla-release
          - mozilla-esr78
      when:
-          - {weekday: 'Monday', hour: 10, minute: 0}
-          - {weekday: 'Thursday', hour: 10, minute: 0}
-
-    - name: python-dependency-update
-      job:
-          type: decision-task
-          treeherder-symbol: Nfile
-          target-tasks-method: python_dependency_update
-      run-on-projects:
-          - mozilla-central
-      when:
-          by-project:
-              # No default branch
-              mozilla-central:
-                  - {weekday: 'Monday', hour: 10, minute: 0}
+          - {weekday: 'Monday', hour: 8, minute: 0}
+          - {weekday: 'Thursday', hour: 8, minute: 0}

    - name: raptor-tp6m
      job:

--- a/.eslintignore
+++ b/.eslintignore
@@ -133,7 +133,6 @@ js/public/
 js/xpconnect/
 js/src/devtools/
 js/src/jit-test/
-js/src/jsapi-tests/binast/
 js/src/tests/
 js/src/Y.js


--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -55,7 +55,7 @@ const ignorePatterns = [
 ];

 module.exports = {
-  parser: "babel-eslint",
+  parser: "@babel/eslint-parser",
  parserOptions: {
    sourceType: "script",
    babelOptions: {
@@ -127,20 +127,15 @@ module.exports = {
    {
      ...browserTestConfig,
      files: browserTestPaths.map(path => `${path}**`),
-      excludedFiles: "devtools/**",
    },
    {
      ...removeOverrides(mochitestTestConfig),
      files: mochitestTestPaths.map(path => `${path}**`),
-      excludedFiles: [
-        "devtools/**",
-        "security/manager/ssl/tests/mochitest/browser/**",
-      ],
+      excludedFiles: ["security/manager/ssl/tests/mochitest/browser/**"],
    },
    {
      ...removeOverrides(chromeTestConfig),
      files: chromeTestPaths.map(path => `${path}**`),
-      excludedFiles: ["devtools/**"],
    },
    {
      env: {
@@ -244,12 +239,7 @@ module.exports = {
        "dom/quota/**",
        "dom/security/test/cors/**",
        "dom/security/test/csp/**",
-        "dom/security/test/general/**",
-        "dom/security/test/https-only/**",
        "dom/security/test/mixedcontentblocker/**",
-        "dom/security/test/sec-fetch/**",
-        "dom/security/test/sri/**",
-        "dom/security/test/referrer-policy/**",
        "dom/serviceworkers/**",
        "dom/smil/**",
        "dom/tests/mochitest/**",
@@ -617,7 +607,6 @@ module.exports = {
        "toolkit/components/passwordmgr/test/unit/test_getUserNameAndPasswordFields.js",
        "toolkit/components/processsingleton/MainProcessSingleton.jsm",
        "toolkit/components/telemetry/tests/unit/head.js",
-        "toolkit/components/telemetry/tests/unit/test_EcosystemTelemetry.js",
        "toolkit/components/telemetry/tests/unit/test_EventPing.js",
        "toolkit/components/telemetry/tests/unit/test_HealthPing.js",
        "toolkit/components/telemetry/tests/unit/test_PingAPI.js",

--- a/.flake8
+++ b/.flake8
@@ -3,7 +3,6 @@ max-line-length = 99
 exclude =
    # These paths should be triaged and either fixed or moved to the list below.
    devtools/shared,
-    dom/base,
    dom/bindings,
    gfx/tests,
    ipc/ipdl/ipdl,

--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -19,6 +19,8 @@
    // IDL language support
    "mythmon.idl",
    // Mercurial support
-    "mrcrowl.hg"
+    "mrcrowl.hg",
+    // VSCode Remote Development over SSH
+    "ms-vscode-remote.remote-ssh",
  ]
 }
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -85,11 +85,11 @@ dependencies = [

 [[package]]
 name = "ash"
-version = "0.31.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c69a8137596e84c22d57f3da1b5de1d4230b1742a710091c85f4d7ce50f00f38"
+checksum = "06063a002a77d2734631db74e8f4ce7148b77fe522e6bca46f2ae7774fd48112"
 dependencies = [
- "libloading 0.6.2",
+ "libloading 0.7.0",
 ]

 [[package]]
@@ -572,7 +572,7 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 [[package]]
 name = "chardetng"
 version = "0.1.9"
-source = "git+https://github.com/hsivonen/chardetng?rev=fd4ed671ef495af4dcda4c4cba3ef8d426db8af1#fd4ed671ef495af4dcda4c4cba3ef8d426db8af1"
+source = "git+https://github.com/hsivonen/chardetng?rev=39f95e2f7cd6e632a379cdeee62c68e8cedd7810#39f95e2f7cd6e632a379cdeee62c68e8cedd7810"
 dependencies = [
 "encoding_rs",
 "memchr",
@@ -647,6 +647,16 @@ dependencies = [
 "objc",
 ]

+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
 [[package]]
 name = "comedy"
 version = "0.2.0"
@@ -1281,6 +1291,7 @@ dependencies = [
 "encoding_rs",
 "nserror",
 "nsstring",
+ "xmldecl",
 ]

 [[package]]
@@ -1766,7 +1777,7 @@ dependencies = [

 [[package]]
 name = "geckodriver"
-version = "0.29.0"
+version = "0.29.1"
 dependencies = [
 "base64 0.12.0",
 "chrono",
@@ -1833,7 +1844,7 @@ dependencies = [
 [[package]]
 name = "gfx-auxil"
 version = "0.8.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=0a201d1c406b5119ec11068293a40e50ec0be4c8#0a201d1c406b5119ec11068293a40e50ec0be4c8"
+source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486"
 dependencies = [
 "fxhash",
 "gfx-hal",
@@ -1843,7 +1854,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-dx11"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=0a201d1c406b5119ec11068293a40e50ec0be4c8#0a201d1c406b5119ec11068293a40e50ec0be4c8"
+source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486"
 dependencies = [
 "arrayvec",
 "bitflags",
@@ -1864,7 +1875,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-dx12"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=0a201d1c406b5119ec11068293a40e50ec0be4c8#0a201d1c406b5119ec11068293a40e50ec0be4c8"
+source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486"
 dependencies = [
 "arrayvec",
 "bit-set",
@@ -1878,13 +1889,14 @@ dependencies = [
 "raw-window-handle",
 "smallvec",
 "spirv_cross",
+ "thunderdome",
 "winapi 0.3.9",
 ]

 [[package]]
 name = "gfx-backend-empty"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=0a201d1c406b5119ec11068293a40e50ec0be4c8#0a201d1c406b5119ec11068293a40e50ec0be4c8"
+source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486"
 dependencies = [
 "gfx-hal",
 "log",
@@ -1894,7 +1906,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-metal"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=0a201d1c406b5119ec11068293a40e50ec0be4c8#0a201d1c406b5119ec11068293a40e50ec0be4c8"
+source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486"
 dependencies = [
 "arrayvec",
 "bitflags",
@@ -1919,7 +1931,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-vulkan"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=0a201d1c406b5119ec11068293a40e50ec0be4c8#0a201d1c406b5119ec11068293a40e50ec0be4c8"
+source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486"
 dependencies = [
 "arrayvec",
 "ash",
@@ -1939,7 +1951,7 @@ dependencies = [
 [[package]]
 name = "gfx-hal"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=0a201d1c406b5119ec11068293a40e50ec0be4c8#0a201d1c406b5119ec11068293a40e50ec0be4c8"
+source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486"
 dependencies = [
 "bitflags",
 "naga",
@@ -2071,9 +2083,9 @@ dependencies = [

 [[package]]
 name = "glean"
-version = "36.0.0"
+version = "36.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27c487254df8abcae3b3ff1a8d5ceb8f7d39b05e67d58f0b89898c20844da41d"
+checksum = "189c370f4d17144dc0af5b9640de2ac1016b603e583d3eb1050a142dba3df9dd"
 dependencies = [
 "chrono",
 "crossbeam-channel 0.5.0",
@@ -2091,9 +2103,9 @@ dependencies = [

 [[package]]
 name = "glean-core"
-version = "36.0.0"
+version = "36.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a249ed8bd8588cf97d03de14e0a8ebe4e637c52581fb497bfa0f2bbf7e85018"
+checksum = "66d4e6fd10f9824bb8f46587536bcc20d858087513d7f913d4d9db2c18c2fe2f"
 dependencies = [
 "bincode",
 "chrono",
@@ -2170,20 +2182,17 @@ dependencies = [

 [[package]]
 name = "gpu-alloc"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7724b9aef57ea36d70faf54e0ee6265f86e41de16bed8333efdeab5b00e16b"
+version = "0.4.2"
+source = "git+https://github.com/zakarumych/gpu-alloc.git?rev=2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6#2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6"
 dependencies = [
 "bitflags",
 "gpu-alloc-types",
- "tracing",
 ]

 [[package]]
 name = "gpu-alloc-types"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
+version = "0.2.1"
+source = "git+https://github.com/zakarumych/gpu-alloc.git?rev=2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6#2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6"
 dependencies = [
 "bitflags",
 ]
@@ -2197,7 +2206,6 @@ dependencies = [
 "bitflags",
 "gpu-descriptor-types",
 "hashbrown",
- "tracing",
 ]

 [[package]]
@@ -3079,7 +3087,7 @@ dependencies = [
 [[package]]
 name = "minidump_writer_linux"
 version = "0.1.0"
-source = "git+https://github.com/msirringhaus/minidump_writer_linux.git?rev=01c7a0da8d34059f7dae8ab9e7512529ff16347a#01c7a0da8d34059f7dae8ab9e7512529ff16347a"
+source = "git+https://github.com/msirringhaus/minidump_writer_linux.git?rev=667c38bf1d9a8ea0c2c0a219d13006a39847b3f2#667c38bf1d9a8ea0c2c0a219d13006a39847b3f2"
 dependencies = [
 "byteorder",
 "goblin",
@@ -3204,7 +3212,7 @@ dependencies = [

 [[package]]
 name = "mozdevice"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
 "log",
 "once_cell",
@@ -3238,7 +3246,7 @@ dependencies = [

 [[package]]
 name = "mozprofile"
-version = "0.7.1"
+version = "0.7.2"
 dependencies = [
 "tempfile",
 ]
@@ -3274,6 +3282,19 @@ dependencies = [
 "semver",
 ]

+[[package]]
+name = "mozwer_s"
+version = "0.1.0"
+dependencies = [
+ "libc",
+ "mozilla-central-workspace-hack",
+ "rust-ini",
+ "serde",
+ "serde_json",
+ "uuid",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "mp4parse"
 version = "0.11.5"
@@ -3324,10 +3345,11 @@ checksum = "a2983372caf4480544083767bf2d27defafe32af49ab4df3a0b7fc90793a3664"
 [[package]]
 name = "naga"
 version = "0.3.1"
-source = "git+https://github.com/gfx-rs/naga?tag=gfx-12#fa7d4d8b51d4eeffe9f648d285466637f733a4a1"
+source = "git+https://github.com/gfx-rs/naga?tag=gfx-20#0369ee181ed9cd315635fc0e3d99deecdbc72246"
 dependencies = [
 "bit-set",
 "bitflags",
+ "codespan-reporting",
 "fxhash",
 "log",
 "num-traits",
@@ -4018,6 +4040,12 @@ dependencies = [
 "uuid",
 ]

+[[package]]
+name = "profiling"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c71198452babfbba7419e716d29853c462d59da73c41485ab7dc8b4dc0c4be"
+
 [[package]]
 name = "prost"
 version = "0.6.1"
@@ -4156,7 +4184,7 @@ dependencies = [
 [[package]]
 name = "range-alloc"
 version = "0.1.2"
-source = "git+https://github.com/gfx-rs/gfx?rev=0a201d1c406b5119ec11068293a40e50ec0be4c8#0a201d1c406b5119ec11068293a40e50ec0be4c8"
+source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486"

 [[package]]
 name = "raw-cpuid"
@@ -5433,38 +5461,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"

-[[package]]
-name = "tracing"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27"
-dependencies = [
- "cfg-if 0.1.10",
- "pin-project-lite 0.1.4",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a9bd1db7706f2373a190b0d067146caa39350c486f3d455b0e33b431f94c07"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
-dependencies = [
- "lazy_static",
-]
-
 [[package]]
 name = "tracy-rs"
 version = "0.1.2"
@@ -5734,7 +5730,7 @@ dependencies = [

 [[package]]
 name = "webdriver"
-version = "0.43.0"
+version = "0.43.1"
 dependencies = [
 "base64 0.12.0",
 "bytes 0.5.3",
@@ -5924,13 +5920,14 @@ dependencies = [
 "gfx-hal",
 "gpu-alloc",
 "gpu-descriptor",
+ "log",
 "naga",
 "parking_lot",
+ "profiling",
 "ron",
 "serde",
 "smallvec",
 "thiserror",
- "tracing",
 "wgpu-types",
 ]

@@ -6093,6 +6090,14 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"

+[[package]]
+name = "xmldecl"
+version = "0.1.1"
+source = "git+https://github.com/hsivonen/xmldecl?rev=a74f7df5bf6cb11194fb74daa0c3cf42f326fd90#a74f7df5bf6cb11194fb74daa0c3cf42f326fd90"
+dependencies = [
+ "encoding_rs",
+]
+
 [[package]]
 name = "xpcom"
 version = "0.1.0"

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,7 @@ members = [
  "security/manager/ssl/osclientcerts",
  "testing/geckodriver",
  "toolkit/crashreporter/rust_minidump_writer_linux",
+  "toolkit/crashreporter/mozwer-rust",
  "toolkit/library/gtest/rust",
  "toolkit/library/rust/",
  "toolkit/mozapps/defaultagent/rust",
@@ -74,7 +75,7 @@ opt-level = 2
 opt-level = 2

 [patch.crates-io]
-chardetng = { git = "https://github.com/hsivonen/chardetng", rev="fd4ed671ef495af4dcda4c4cba3ef8d426db8af1" }
+chardetng = { git = "https://github.com/hsivonen/chardetng", rev="39f95e2f7cd6e632a379cdeee62c68e8cedd7810" }
 chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" }
 libudev-sys = { path = "dom/webauthn/libudev-sys" }
 packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" }
@@ -84,7 +85,8 @@ spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu5" }
 # failure's backtrace feature might break our builds, see bug 1608157.
 failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
 failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
-minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "01c7a0da8d34059f7dae8ab9e7512529ff16347a" }
+minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "667c38bf1d9a8ea0c2c0a219d13006a39847b3f2" }
+xmldecl = { git = "https://github.com/hsivonen/xmldecl", rev="a74f7df5bf6cb11194fb74daa0c3cf42f326fd90" }

 [patch.crates-io.cranelift-codegen]
 git = "https://github.com/mozilla-spidermonkey/wasmtime"

--- a/accessible/base/DocManager.cpp
+++ b/accessible/base/DocManager.cpp
@@ -76,8 +76,7 @@ DocAccessible* DocManager::GetDocAccessible(const PresShell* aPresShell) {
 }

 LocalAccessible* DocManager::FindAccessibleInCache(nsINode* aNode) const {
-  for (const auto& entry : mDocAccessibleCache) {
-    DocAccessible* docAccessible = entry.GetData().get();
+  for (const auto& docAccessible : mDocAccessibleCache.Values()) {
    NS_ASSERTION(docAccessible,
                 "No doc accessible for the object in doc accessible cache!");

@@ -284,8 +283,7 @@ DocManager::OnStateChange(nsIWebProgress* aWebProgress, nsIRequest* aRequest,
  docShell->GetLoadType(&loadType);
  if (loadType == LOAD_RELOAD_NORMAL || loadType == LOAD_RELOAD_BYPASS_CACHE ||
      loadType == LOAD_RELOAD_BYPASS_PROXY ||
-      loadType == LOAD_RELOAD_BYPASS_PROXY_AND_CACHE ||
-      loadType == LOAD_RELOAD_ALLOW_MIXED_CONTENT) {
+      loadType == LOAD_RELOAD_BYPASS_PROXY_AND_CACHE) {
    isReloading = true;
  }


--- a/accessible/base/HTMLMarkupMap.h
+++ b/accessible/base/HTMLMarkupMap.h
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+MARKUPMAP(
+    a,
+    [](Element* aElement, LocalAccessible* aContext) -> LocalAccessible* {
+      // Only some roles truly enjoy life as HTMLLinkAccessibles, for
+      // details see closed bug 494807.
+      const nsRoleMapEntry* roleMapEntry = aria::GetRoleMap(aElement);
+      if (roleMapEntry && roleMapEntry->role != roles::NOTHING &&
+          roleMapEntry->role != roles::LINK) {
+        return new HyperTextAccessibleWrap(aElement, aContext->Document());
+      }
+
+      return new HTMLLinkAccessible(aElement, aContext->Document());
+    },
+    roles::LINK)
+
+MARKUPMAP(abbr, New_HyperText, 0)
+
+MARKUPMAP(acronym, New_HyperText, 0)
+
+MARKUPMAP(article, New_HyperText, roles::ARTICLE, Attr(xmlroles, article))
+
+MARKUPMAP(aside, New_HyperText, roles::LANDMARK)
+
+MARKUPMAP(blockquote, New_HyperText, roles::BLOCKQUOTE)
+
+MARKUPMAP(
+    button,
+    [](Element* aElement, LocalAccessible* aContext) -> LocalAccessible* {
+      return new HTMLButtonAccessible(aElement, aContext->Document());
+    },
+    0)
+
+MARKUPMAP(
+    caption,
+    [](Element* aElement, LocalAccessible* aContext) -> LocalAccessible* {
+      if (aContext->IsTable()) {
+        dom::HTMLTableElement* tableEl =
+            dom::HTMLTableElement::FromNode(aContext->GetContent());
+        if (tableEl && tableEl == aElement->GetParent() &&
+            tableEl->GetCaption() == aElement) {
+          return new HTMLCaptionAccessible(aElement, aContext->Document());
+        }
+      }
+      return nullptr;
+    },
+    0)
+
+// XXX: Uncomment this once HTML-aam agrees to map to same as ARIA.
+// MARKUPMAP(code, New_HyperText, roles::CODE)
+
+MARKUPMAP(dd, New_HTMLDtOrDd<HyperTextAccessibleWrap>, roles::DEFINITION)
+