Differential Revision: https://phabricator.services.mozilla.com/D36959

--HG--
extra : moz-landing-system : lando

# ignore-this-changeset

Depends on D28954

Differential Revision: https://phabricator.services.mozilla.com/D28956

--HG--
extra : moz-landing-system : lando

# ignore-this-changeset

Differential Revision: https://phabricator.services.mozilla.com/D17139

--HG--
extra : histedit_source : 084f340503d2e1a2d9e1753c38b2c4ee9c7819f3

Differential Revision: https://phabricator.services.mozilla.com/D21109

--HG--
extra : rebase_source : d56eacdaeefd5bde104fb24eecffa3d2890a7869

Bug 1521000 - Part 2: Adjust our clang-format rules to include spaces after the hash for nested preprocessor directives r=sylvestre

# ignore-this-changeset

--HG--
extra : amend_source : 7221c8d15a765df71171099468e7c7faa648f37c
extra : histedit_source : a0cce6015636202bff09e35a13f72e03257a7695

# ignore-this-changeset

--HG--
extra : amend_source : 4d301d3b0b8711c4692392aa76088ba7fd7d1022

Reviewers: gsvelto

Reviewed By: gsvelto

Bug #: 1470994

Differential Revision: https://phabricator.services.mozilla.com/D1817

--HG--
extra : rebase_source : 03e1aee4934bcba96968578ba92d6c2ec6275747
extra : amend_source : 6f6e69fb6e18d092090e99db765e12c16021f265

Bug 1426936 - When reading the battery capacity on Mac do not assume that a battery is always present; r=dhylands

MozReview-Commit-ID: ArLSxMUE66e

--HG--
extra : source : edc74a4258f9d3b7944058abfd0051bb3655476a

MozReview-Commit-ID: Kdz2xtTF9EG

--HG--
extra : rebase_source : 7235b3802f25bab29a8c6ba40a181a722f3df0ce

Bug 13772225 - Eliminate nsITimer::InitWithFuncCallback in favor of InitWithNamedFuncCallback (r=froydnj)

MozReview-Commit-ID: 9zN9aAd7daA

--HG--
extra : rebase_source : 34ca0c1e1b7fcc312b5d7c97d5bd2086af2bc7ce

Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj

This patch was automatically generated using the following script:

function convert() {
echo "Converting $1 to $2..."
find . \
       ! -wholename "*/.git*" \
       ! -wholename "obj-ff-dbg*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_OVERRIDE override
convert MOZ_FINAL final

--HG--
extra : rebase_source : 1da3cd8bce051b3b77a015b54ce337f393ea51bf

Bug 1028588 - Fix dangerous public destructors of Mac-specific reference-counted classes - r=mstange

The bulk of this commit was generated by running:

  run-clang-tidy.py \
    -checks='-*,llvm-namespace-comment' \
    -header-filter=^/.../mozilla-central/.* \
    -fix

Bug 900908 - Part 3: Change uses of numbered macros in nsIClassInfoImpl.h/nsISupportsImpl.h to the variadic variants. r=froydnj

--HG--
extra : rebase_source : cd5aa136075086a10cfa03d937743d8a5471fd6c

Bug 1001075 - Account for possible re-entry in MacPowerInformationService::StopListening to avoid crash with e10s. r=BenWa, feedback=reuben.

CLOSED TREE

This patch was automatically generated by the following script:

#!/bin/bash
# Command to convert PRUnichar to char16_t

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*modules/libmar*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name prtypes.h \
       ! -name Char16.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert PRUnichar char16_t

--HG--
extra : rebase_source : b3fae3b4456bfa8ef9920038668b403cc7c8accf

Backed out changeset a4a029c13179 (bug 914826)
Backed out changeset d16460fc0518 (bug 914826)
Backed out changeset b28cb0ae1853 (bug 914826)
Backed out changeset 5b4ce1d4d09b (bug 914826)
Backed out changeset 58d96448609a (bug 914826)
Backed out changeset 52b319afe965 (bug 914826)

Bug 914826 - part 4 - fix source files that were bootlegging XPCOM do_* functions via generated ipdl headers; r=ehsan

Bug 914826 - part 4 - fix source files that were bootlegging XPCOM do_* functions via generated ipdl headers; r=ehsan