Commit 1f1d9438 authored by Oana Pop Rus's avatar Oana Pop Rus
Browse files

Merge mozilla-central to inbound. a=merge CLOSED TREE

parents a1a4cd6d 47e94b5d
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ jobs:
          type: decision-task
          treeherder-symbol: Nd
          target-tasks-method: nightly_desktop
          include-push-tasks: true
      run-on-projects:
          - mozilla-central
      when:
@@ -23,6 +24,7 @@ jobs:
          type: decision-task
          treeherder-symbol: Nd-Ln
          target-tasks-method: nightly_linux
          include-push-tasks: true
      run-on-projects:
          - mozilla-central
      when: []  # never (hook only)
@@ -32,6 +34,7 @@ jobs:
          type: decision-task
          treeherder-symbol: Nd-OSX
          target-tasks-method: nightly_macosx
          include-push-tasks: true
      run-on-projects:
          - mozilla-central
      when: []  # never (hook only)
@@ -41,6 +44,7 @@ jobs:
          type: decision-task
          treeherder-symbol: Nd-win32
          target-tasks-method: nightly_win32
          include-push-tasks: true
      run-on-projects:
          - mozilla-central
      when: []  # never (hook only)
@@ -50,6 +54,7 @@ jobs:
          type: decision-task
          treeherder-symbol: Nd-win64
          target-tasks-method: nightly_win64
          include-push-tasks: true
      run-on-projects:
          - mozilla-central
      when: []  # never (hook only)
@@ -59,6 +64,7 @@ jobs:
          type: decision-task
          treeherder-symbol: Nd-win64-aarch64
          target-tasks-method: nightly_win64_aarch64
          include-push-tasks: true
      run-on-projects:
          - mozilla-central
      when: []  # never (hook only)
@@ -68,6 +74,7 @@ jobs:
          type: decision-task
          treeherder-symbol: Na
          target-tasks-method: nightly_fennec
          include-push-tasks: true
      run-on-projects:
          - mozilla-central
      when:
@@ -81,6 +88,8 @@ jobs:
          type: decision-task
          treeherder-symbol: Vg
          target-tasks-method: mochitest_valgrind
          include-push-tasks: true
          rebuild-kinds: [test]
      run-on-projects:
          - mozilla-central
      when:
+2 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ dom/security/test/mixedcontentblocker/**
dom/security/test/sri/**
dom/serviceworkers/**
dom/smil/**
dom/svg/**

dom/tests/html/**
dom/tests/mochitest/**
@@ -213,6 +212,8 @@ dom/canvas/test/webgl-conf/**
dom/imptests/**
dom/media/webaudio/test/blink/**
dom/media/webvtt/**
dom/svg/test/test_nonAnimStrings.xhtml
dom/svg/test/test_SVG_namespace_ids.html

# Third-party
editor/libeditor/tests/browserscope/**
+7 −5
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ tasks:
                kind: cron-task

        routes:
          $flatten:
          $flattenDeep:
            - "tc-treeherder.v2.${repository.project}.${push.revision}.${push.pushlog_id}"
            - $if: 'tasks_for == "hg-push"'
              then:
@@ -140,6 +140,8 @@ tasks:
                # list each cron task on this revision, so actions can find them
                - 'index.gecko.v2.${repository.project}.revision.${push.revision}.cron.${ownTaskId}'
                # BUG 1500166 Notify ciduty by email if a nightly hook fails
                - $if: 'repository.project != "try"'
                  then:
                  - "notify.email.ciduty+failedcron@mozilla.com.on-failed"
                  - "notify.email.ciduty+exceptioncron@mozilla.com.on-exception"
                  - "notify.email.sheriffs+failedcron@mozilla.org.on-failed"
+33 −14
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ dependencies = [
name = "baldrdash"
version = "0.1.0"
dependencies = [
 "bindgen 0.43.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cranelift-codegen 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cranelift-wasm 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -227,19 +227,21 @@ dependencies = [

[[package]]
name = "bindgen"
version = "0.43.2"
version = "0.49.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "cexpr 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "clang-sys 0.26.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "clang-sys 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "which 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
]

@@ -434,7 +436,7 @@ dependencies = [
 "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "nserror 0.1.0",
 "nsstring 0.1.0",
 "rkv 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "rkv 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "style 0.0.1",
 "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -466,7 +468,7 @@ dependencies = [

[[package]]
name = "clang-sys"
version = "0.26.1"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
 "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1316,6 +1318,15 @@ dependencies = [
 "tokio-io 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "hashbrown"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "scopeguard 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "hashglobe"
version = "0.1.0"
@@ -1417,7 +1428,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "js"
version = "0.1.4"
dependencies = [
 "bindgen 0.43.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1470,8 +1481,9 @@ dependencies = [
 "moz_task 0.1.0",
 "nserror 0.1.0",
 "nsstring 0.1.0",
 "rkv 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "rkv 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "storage_variant 0.1.0",
 "thin-vec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "xpcom 0.1.0",
]

@@ -2336,7 +2348,7 @@ dependencies = [

[[package]]
name = "rkv"
version = "0.9.3"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
 "arrayref 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2558,6 +2570,11 @@ dependencies = [
 "opaque-debug 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "shlex"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "siphasher"
version = "0.2.1"
@@ -2670,7 +2687,7 @@ dependencies = [
 "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bindgen 0.43.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "cssparser 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3465,7 +3482,7 @@ dependencies = [
"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
"checksum binary-space-partition 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88ceb0d16c4fd0e42876e298d7d3ce3780dd9ebdcbe4199816a32c77e08597ff"
"checksum bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bda13183df33055cbb84b847becce220d392df502ebe7a4a78d7021771ed94d0"
"checksum bindgen 0.43.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d52d263eacd15d26cbcf215d254b410bd58212aaa2d3c453a04b2d3b3adcf41"
"checksum bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33e1b67a27bca31fd12a683b2a3618e275311117f48cfcc892e18403ff889026"
"checksum binjs_meta 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "430239e4551e42b80fa5d92322ac80ea38c9dda56e5d5582e057e2288352b71a"
"checksum bit-set 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1efcc46c18245a69c38fcc5cc650f16d3a59d034f3106e9ed63748f695730a"
"checksum bit-vec 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4440d5cb623bb7390ae27fec0bb6c61111969860f8e3ae198bfa0663645e67cf"
@@ -3488,7 +3505,7 @@ dependencies = [
"checksum cexpr 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8fc0086be9ca82f7fc89fc873435531cb898b86e850005850de1f820e2db6e9b"
"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
"checksum clang-sys 0.26.1 (registry+https://github.com/rust-lang/crates.io-index)" = "481e42017c1416b1c0856ece45658ecbb7c93d8a93455f7e5fa77f3b35455557"
"checksum clang-sys 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4227269cec09f5f83ff160be12a1e9b0262dd1aa305302d5ba296c2ebd291055"
"checksum clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0f16b89cbb9ee36d87483dc939fe9f1e13c05898d56d7b230a0d4dff033a536"
"checksum cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "56d741ea7a69e577f6d06b36b7dff4738f680593dc27a701ffa8506b73ce28bb"
"checksum comedy 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4f03fbb05a4df3523a44cda10340e6ae6bea03ee9d01240a1a2c1ef6c73e95"
@@ -3568,6 +3585,7 @@ dependencies = [
"checksum goblin 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "5911d7df7b8f65ab676c5327b50acea29d3c6a1a4ad05e444cf5dce321b26db2"
"checksum guid_win 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "87261686cc5e35b6584f4c2a430c2b153d8a92ab1ef820c16be34c1df8f5f58b"
"checksum h2 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "a27e7ed946e8335bdf9a191bc1b9b14a03ba822d013d2f58437f4fabcbd7fc2c"
"checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
"checksum http 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "dca621d0fa606a5ff2850b6e337b57ad6137ee4d67e940449643ff45af6874c6"
"checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07"
"checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e"
@@ -3660,7 +3678,7 @@ dependencies = [
"checksum regex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75ecf88252dce580404a22444fc7d626c01815debba56a7f4f536772a5ff19d3"
"checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
"checksum regex-syntax 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1ac0f60d675cc6cf13a20ec076568254472551051ad5dd050364d70671bf6b"
"checksum rkv 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "becd7f5278be3b97250a8035455116f9fc63f5fc68cc8293213051d7d751c373"
"checksum rkv 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "238764bd8750927754d91e4a27155ac672ba88934a2bf698c992d55e5ae25e5b"
"checksum ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "da06feaa07f69125ab9ddc769b11de29090122170b402547f64b86fe16ebc399"
"checksum runloop 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d79b4b604167921892e84afbbaad9d5ad74e091bf6c511d9dbfb0593f09fabd"
"checksum rust-ini 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8a654c5bda722c699be6b0fe4c0d90de218928da5b724c3e467fc48865c37263"
@@ -3683,6 +3701,7 @@ dependencies = [
"checksum serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "44dd2cfde475037451fa99b7e5df77aa3cfd1536575fa8e7a538ab36dcde49ae"
"checksum sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9eb6be24e4c23a84d7184280d2722f7f2731fcdd4a9d886efbfe4413e4847ea0"
"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d"
"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
"checksum siphasher 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ffc669b726f2bc9a3bcff66e5e23b56ba6bf70e22a34c3d7b6d0b3450b65b84"
"checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
"checksum slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5f9776d6b986f77b35c6cf846c11ad986ff128fe0b2b63a3628e3755e8d3102d"
+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ void nsCoreUtils::ScrollFrameToPoint(nsIFrame *aScrollableFrame,
  nsPoint scrollPoint = scrollableFrame->GetScrollPosition();
  scrollPoint -= deltaPoint;

  scrollableFrame->ScrollTo(scrollPoint, nsIScrollableFrame::INSTANT);
  scrollableFrame->ScrollTo(scrollPoint, ScrollMode::eInstant);
}

void nsCoreUtils::ConvertScrollTypeToPercents(
Loading