--HG--
extra : rebase_source : 841e8eece32e10d6d2c3443d5bcbf7ac935dd157

--HG--
rename : embedding/android/geckoview_example/AndroidManifest.xml => embedding/android/geckoview_example/AndroidManifest.xml.in
rename : mobile/android/geckoview_library/AndroidManifest.xml => mobile/android/geckoview_library/AndroidManifest.xml.in
rename : mobile/android/geckoview_library/project.properties => mobile/android/geckoview_library/project.properties.in

--HG--
rename : dom/events/nsEventListenerManager.cpp => dom/events/EventListenerManager.cpp
rename : dom/events/nsEventListenerManager.h => dom/events/EventListenerManager.h

--HG--
extra : rebase_source : f8fb50de9292320eb7589dd28dc566d0f5044da6

Backed out changeset 2a015b45d808 (bug 514280)
Backed out changeset a01f97c1ed02 (bug 514280)

Backed out changeset 88425ad0f06a (bug 982828) for introducing various mochitest-5 failures on a CLOSED TREE
* * *
Backed out changeset 94f9ebdc6662 (bug 982828)

--HG--
rename : profile/dirserviceprovider/standalone/Makefile.in => profile/dirserviceprovider/src/Makefile.in

--HG--
rename : dom/events/nsDOMEvent.cpp => dom/events/Event.cpp
rename : dom/events/nsDOMEvent.h => dom/events/Event.h

Bug 970925 - convert testing/mochitest/android.json into skip-if statements in mochitest.ini files; r=jmaher

Bug 962608 - Make PL_DHashTableInit infallible by default. r=briansmith,bsmedberg,ehsan,froydnj,jduell,jfkthame,roc,smaug

CLOSED TREE

Bug 967999, part 2 - Convert nsControllerCommandTable::mCommandsTable to use nsInterfaceHashtable. r=ehsan

Bug 969757 - Remove the dead code in our tree which pretends to support OS/2; r=roc,mcmanus,gps,jorendorf,bsmedberg sr=bsmedberg

Bug 785310 - HTML5 sandboxed iframe should not be able to perform top navigation when scripts are allowed. r=bholley, r=smaug

--HG--
extra : rebase_source : eaca8b2925eaffb49e29a617cd72c0d6686e6d9e

Backed out changeset 8c3aa9973da0 (bug 939294)
Backed out changeset 37098c13e59e (bug 939294)
Backed out changeset 7c9ade6c871c (bug 939294)
Backed out changeset fed59539afc1 (bug 939294)
Backed out changeset 89e9d3fa16fc (bug 939294)
Backed out changeset c97e58ebc5f4 (bug 939294)

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

bug 978847 - check for overflow in nsWindowWatcher coordinate calculations when constraining position. r=roc